From cf3995f1a52404f11a0776d358e0f1d43dc855ea Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Wed, 6 Nov 2013 22:11:01 +0100
Subject: [PATCH] Update to NRefactory commit
 'a99a93972cc4e82c969af72568f015019a4d8a96'

---
 SharpDevelop.Tests.sln                        |   14 +
 SharpDevelop.sln                              |   14 +
 .../PortSD4AddInToSD5.csproj                  |    5 +
 .../WorkbenchSingletonIssueProvider.cs        |   11 +-
 .../Analysis/CodeQuality/CodeQuality.csproj   |    5 +
 .../UnitTesting/Test/UnitTesting.Tests.csproj |    4 +
 .../CSharpBinding/Project/CSharpBinding.addin |  258 +-
 .../Project/CSharpBinding.csproj              |    5 +
 .../Completion/CSharpCompletionDataFactory.cs |   14 +-
 .../Project/Src/Parser/Parser.cs              |    2 +-
 .../CSharpCodeActionProviderDoozer.cs         |    8 +-
 .../Src/Refactoring/CSharpSyntaxIssue.cs      |    9 +-
 .../Project/Src/Refactoring/EditorScript.cs   |    2 +
 .../Project/Src/Refactoring/IssueManager.cs   |   24 +-
 .../Src/Refactoring/SDRedundantUsingIssue.cs  |    2 +-
 .../Src/Refactoring/SDRefactoringContext.cs   |    6 +
 .../Tests/CSharpBinding.Tests.csproj          |    8 +
 .../CSharpBinding/Tests/RegistrationTests.cs  |   27 +-
 .../XamlBinding.Tests.csproj                  |    4 +
 .../Debugger.Core/Debugger.Core.csproj        |    5 +
 .../AvalonEdit.AddIn/Src/TextMarkerService.cs |   17 +-
 .../Transforms/IntroduceUsingDeclarations.cs  |    8 +-
 src/Libraries/NRefactory/.gitattributes       |    5 +-
 ...pCode.NRefactory.CSharp.AstVerifier.csproj |  136 +-
 .../AbstractAndVirtualConversionAction.cs     |  198 +
 .../CodeActions/AddAnotherAccessorAction.cs   |   89 +
 .../CodeActions/AddArgumentNameAction.cs      |  205 +
 .../CodeActions/AddBracesAction.cs            |   57 +
 .../CodeActions/AddCatchTypeAction.cs         |   60 +
 .../AddExceptionDescriptionAction.cs          |   84 +
 .../AddOptionalParameterToInvocationAction.cs |  134 +
 .../CodeActions/AddUsingAction.cs             |  156 +
 .../CodeActions/AutoLinqSumAction.cs          |  435 +
 .../CS1520MethodMustHaveAReturnTypeAction.cs  |   71 +
 .../CodeActions/ChangeAccessModifierAction.cs |  175 +
 .../CheckIfParameterIsNullAction.cs           |   94 +
 .../CodeActions/ComputeConstantValueAction.cs |   53 +
 .../ConvertAnonymousDelegateToLambdaAction.cs |   95 +
 .../CodeActions/ConvertAsToCastAction.cs      |   58 +
 .../ConvertAssignmentToIfAction.cs            |   81 +
 ...rtBitwiseFlagComparisonToHasFlagsAction.cs |  110 +
 .../CodeActions/ConvertCastToAsAction.cs      |    0
 .../CodeActions/ConvertDecToHexAction.cs      |   52 +
 .../ConvertDoWhileToWhileLoopAction.cs        |   70 +
 .../ConvertEqualityOperatorToEqualsAction.cs  |   88 +
 .../ConvertEqualsToEqualityOperatorAction.cs  |   83 +
 ...tExplicitToImplicitImplementationAction.cs |    0
 .../CodeActions/ConvertForToWhileAction.cs    |   56 +
 .../CodeActions/ConvertForeachToForAction.cs  |  218 +
 ...rtHasFlagsToBitwiseFlagComparisonAction.cs |   78 +
 .../CodeActions/ConvertHexToDecAction.cs      |   53 +
 ...entToConditionalTernaryExpressionAction.cs |   89 +
 ...atementToNullCoalescingExpressionAction.cs |  165 +
 ...nvertIfStatementToReturnStatementAction.cs |  115 +
 ...nvertIfStatementToSwitchStatementAction.cs |  196 +
 ...tImplicitToExplicitImplementationAction.cs |    0
 ...rtLambdaBodyExpressionToStatementAction.cs |   63 +
 ...rtLambdaBodyStatementToExpressionAction.cs |   74 +
 .../ConvertLambdaToAnonymousDelegateAction.cs |   99 +
 ...nvertMethodGroupToAnonymousMethodAction.cs |   78 +
 .../ConvertMethodGroupToLambdaAction.cs       |   77 +
 .../ConvertMultiplyToShiftAction.cs           |   67 +
 ...CoalescingToConditionalExpressionAction.cs |   54 +
 .../ConvertReturnStatementToIfAction.cs       |   78 +
 .../ConvertShiftToMultiplyAction.cs           |   61 +
 .../CodeActions/ConvertSwitchToIfAction.cs    |  147 +
 .../ConvertToInitializer/AccessPath.cs        |    0
 ...tializerToExplicitInitializationsAction.cs |  207 +
 .../ConvertToInitializerAction.cs             |  109 +
 .../StatementsToInitializerConverter.cs       |    0
 .../ConvertWhileToDoWhileLoopAction.cs        |   60 +
 .../CodeActions/CopyCommentsFromBase.cs       |   69 +
 .../CodeActions/CopyCommentsFromInterface.cs  |   82 +
 .../CodeActions/CreateBackingStoreAction.cs   |   80 +
 .../CodeActions/CreateChangedEventAction.cs   |   86 +
 .../CreateClassDeclarationAction.cs           |  330 +
 .../CreateConstructorDeclarationAction.cs     |   64 +
 .../CreateCustomEventImplementationAction.cs  |    0
 .../CodeActions/CreateDelegateAction.cs       |   71 +
 .../CodeActions/CreateEnumValue.cs            |   85 +
 .../CodeActions/CreateEventInvocatorAction.cs |  144 +
 .../CodeActions/CreateFieldAction.cs          |   98 +
 .../CodeActions/CreateIndexerAction.cs        |  102 +
 .../CodeActions/CreateLocalVariableAction.cs  |   73 +
 .../CreateMethodDeclarationAction.cs          |  379 +
 .../CreateOverloadWithoutParameterAction.cs   |  154 +
 .../CodeActions/CreatePropertyAction.cs       |  131 +
 .../CodeActions/DeclareLocalVariableAction.cs |  188 +
 ...nvocationToStaticMethodInvocationAction.cs |   69 +
 .../ExtractAnonymousMethodAction.cs           |  120 +
 .../CodeActions/ExtractFieldAction.cs         |  125 +
 .../ExtractMethod/ExtractMethodAction.cs      |  243 +
 .../ExtractMethod/StaticVisitor.cs            |   85 +
 .../ExtractMethod/VariableLookupVisitor.cs    |  135 +
 .../ExtractMethod/VariableUsageAnalyzation.cs |    0
 ...ileConditionToInternalIfStatementAction.cs |   68 +
 .../FlipEqualsTargetAndArgumentAction.cs      |   96 +
 .../FlipOperatorArgumentsAction.cs            |   61 +
 .../CodeActions/GenerateGetterAction.cs       |  101 +
 .../CodeActions/GeneratePropertyAction.cs     |  108 +
 .../CodeActions/GenerateSwitchLabelsAction.cs |  123 +
 .../ImplementAbstractMembersAction.cs         |   93 +
 .../CodeActions/ImplementInterfaceAction.cs   |  204 +
 .../ImplementInterfaceExplicitAction.cs       |   74 +
 .../ImplementNotImplementedProperty.cs        |  103 +
 .../CodeActions/InlineLocalVariableAction.cs  |  104 +
 .../InsertAnonymousMethodSignatureAction.cs   |   94 +
 .../CodeActions/IntroduceConstantAction.cs    |  153 +
 .../CodeActions/IntroduceFormatItemAction.cs  |  105 +
 .../InvertConditionalOperatorAction.cs        |   53 +
 .../CodeActions/InvertIfAction.cs             |   62 +
 .../CodeActions/InvertIfAndSimplify.cs        |   91 +
 .../InvertLogicalExpressionAction.cs          |   73 +
 .../CodeActions/IterateViaForeachAction.cs    |  168 +
 .../JoinDeclarationAndAssignmentAction.cs     |    0
 .../CodeActions/JoinStringAction.cs           |    0
 .../CodeActions/LinqFluentToQueryAction.cs    |  132 +
 .../CodeActions/LinqQueryToFluentAction.cs    |  119 +
 .../CodeActions/MergeNestedIfAction.cs        |    0
 .../CodeActions/MoveToOuterScopeAction.cs     |  153 +
 .../CodeActions/NegateIsExpressionAction.cs   |   58 +
 .../NegateRelationalExpressionAction.cs       |   70 +
 .../CodeActions/PutInsideUsingAction.cs       |    0
 .../CodeActions/RemoveBackingStoreAction.cs   |  141 +
 .../CodeActions/RemoveBracesAction.cs         |  140 +
 .../RemoveRedundantCatchTypeAction.cs         |   80 +
 .../CodeActions/RemoveRegionAction.cs         |  104 +
 ...ceAssignmentWithPostfixExpressionAction.cs |   58 +
 .../CodeActions/ReplaceEmptyStringAction.cs   |   54 +
 ...eOperatorAssignmentWithAssignmentAction.cs |   87 +
 ...cePostfixExpressionWithAssignmentAction.cs |   54 +
 .../ReplaceWithOperatorAssignmentAction.cs    |  103 +
 .../ReverseDirectionForForLoopAction.cs       |  254 +
 .../CodeActions/SimplifyIfFlowAction.cs       |  100 +
 .../SimplifyIfInLoopsFlowAction.cs            |   84 +
 .../CodeActions/SortUsingsAction.cs           |   98 +
 .../CodeActions/SpecializedCodeAction.cs      |   38 +
 .../SplitDeclarationAndAssignmentAction.cs    |   90 +
 .../CodeActions/SplitDeclarationListAction.cs |   93 +
 .../CodeActions/SplitIfAction.cs              |  114 +
 .../CodeActions/SplitStringAction.cs          |   61 +
 .../CodeActions/UseAsAndNullCheckAction.cs    |  281 +
 .../CodeActions/UseExplicitTypeAction.cs      |   97 +
 .../CodeActions/UseStringFormatAction.cs      |  220 +
 .../CodeActions/UseVarKeywordAction.cs        |   75 +
 .../Custom/AdditionalOfTypeIssues.cs          |  104 +
 .../BaseMethodParameterNameMismatchIssue.cs   |  129 +
 .../CS0029InvalidConversionIssue.cs           |  192 +
 ...0126ReturnMustBeFollowedByAnyExpression.cs |  191 +
 ...7ReturnMustNotBeFollowedByAnyExpression.cs |  138 +
 .../CS0152DuplicateCaseLabelValueIssue.cs     |   81 +
 .../CS0759RedundantPartialMethodIssue.cs      |   91 +
 ...ssingInterfaceMemberImplementationIssue.cs |   73 +
 .../StaticConstructorParameterIssue.cs        |   70 +
 .../Custom/ConvertIfToAndExpressionIssue.cs   |  131 +
 .../CodeIssues/Custom/LockThisIssue.cs        |  389 +
 .../Custom/MixedUseOfFieldsAndGettersIssue.cs |   75 +
 .../NegativeRelationalExpressionIssue.cs      |  107 +
 .../Custom/NotImplementedExceptionIssue.cs    |   64 +
 .../Custom/RedundantInternalIssue.cs          |   76 +
 .../Custom/RedundantPrivateIssue.cs           |  126 +
 .../CodeIssues/Custom/XmlDocIssue.cs          |  307 +
 .../CodeIssues/GatherVisitorBase.cs           |  269 +
 .../CodeIssues/IssueCategories.cs             |   45 +
 .../AccessToClosureIssue.cs                   |  324 +
 .../AccessToDisposedClosureIssue.cs           |   93 +
 .../AccessToModifiedClosureIssue.cs           |  116 +
 .../LocalVariableNamePicker.cs                |    0
 .../NotWorking/DuplicateBodyMethodIssue.cs    |  176 +
 .../DuplicateExpressionsInConditionsIssue.cs  |  125 +
 .../NotWorking/DuplicateIfInIfChainIssue.cs   |  111 +
 .../ParameterCanBeIEnumerableIssue.cs         |  155 +
 .../VariableDeclaredInWideScopeIssue.cs       |  383 +
 .../CodeIssues/RefactoringExtensions.cs       |   62 +
 ...BaseMethodCallWithDefaultParameterIssue.cs |  142 +
 .../BitwiseOperatorOnEnumWithoutFlagsIssue.cs |  119 +
 ...ReplacedWithTryCastAndCheckForNullIssue.cs |   72 +
 ...mpareNonConstrainedGenericWithNullIssue.cs |  100 +
 .../CompareOfFloatsByEqualityOperatorIssue.cs |  267 +
 .../ConditionalTernaryEqualBranchIssue.cs     |   66 +
 .../CodeQuality/DelegateSubtractionIssue.cs   |   72 +
 ...allOverridableMethodsInConstructorIssue.cs |  169 +
 .../EmptyGeneralCatchClauseIssue.cs           |   76 +
 .../EqualExpressionComparisonIssue.cs         |  130 +
 ...UnsubscriptionViaAnonymousDelegateIssue.cs |   71 +
 .../ForControlVariableIsNeverModifiedIssue.cs |  133 +
 .../CodeQuality/FormatStringProblemIssue.cs   |  134 +
 .../CodeQuality/FunctionNeverReturnsIssue.cs  |  207 +
 .../LocalVariableHidesMemberIssue.cs          |  219 +
 .../LongLiteralEndingLowerLIssue.cs           |   88 +
 .../MemberHidesStaticFromOuterClassIssue.cs   |  135 +
 ...ethodOverloadWithOptionalParameterIssue.cs |  122 +
 ...NonReadonlyReferencedInGetHashCodeIssue.cs |  130 +
 .../CodeQuality/NotResolvedInTextIssue.cs     |  256 +
 .../ObjectCreationAsStatementIssue.cs         |   62 +
 .../CodeQuality/OperatorIsCanBeUsedIssue.cs   |  105 +
 ...OptionalParameterHierarchyMismatchIssue.cs |  154 +
 .../OptionalParameterRefOutIssue.cs           |   72 +
 .../CodeQuality/ParameterHidesMemberIssue.cs  |   92 +
 ...PartialMethodParameterNameMismatchIssue.cs |  135 +
 ...olymorphicFieldLikeEventInvocationIssue.cs |   77 +
 .../PossibleAssignmentToReadonlyFieldIssue.cs |  122 +
 .../PossibleMultipleEnumerationIssue.cs       |  417 +
 .../StaticFieldInGenericTypeIssue.cs          |  107 +
 .../ThreadStaticAtInstanceFieldIssue.cs       |  108 +
 .../CodeQuality/ValueParameterNotUsedIssue.cs |  109 +
 .../ProhibitedModifiersIssue.cs               |  233 +
 ...83ExpressionIsAlwaysOfProvidedTypeIssue.cs |   88 +
 ...1573ParameterHasNoMatchingParamTagIssue.cs |  282 +
 ...CS1717AssignmentMadeToSameVariableIssue.cs |  103 +
 .../UnassignedReadonlyFieldIssue.cs           |  132 +
 .../InconsistentNamingIssue/AffectedEntity.cs |    0
 .../InconsistentNamingIssue/DefaultRules.cs   |    0
 .../InconsistentNamingIssue.cs                |  374 +
 .../NamingConventionService.cs                |    0
 .../InconsistentNamingIssue/NamingRule.cs     |  709 ++
 .../InconsistentNamingIssue/NamingStyle.cs    |   80 +
 .../NonPublicMethodWithTestAttributeIssue.cs  |   84 +
 .../ConvertClosureToMethodGroupIssue.cs       |  179 +
 ...ConditionalTernaryToNullCoalescingIssue.cs |  114 +
 ...mentToConditionalTernaryExpressionIssue.cs |  107 +
 ...tatementToNullCoalescingExpressionIssue.cs |   74 +
 ...onvertIfStatementToSwitchStatementIssue.cs |   71 +
 .../ConvertNullableToShortFormIssue.cs        |   83 +
 .../ConvertToAutoPropertyIssue.cs             |   74 +
 .../ConvertToLambdaExpressionIssue.cs         |  114 +
 .../Opportunities/ConvertToStaticTypeIssue.cs |   83 +
 .../ForCanBeConvertedToForeachIssue.cs        |  225 +
 .../InvokeAsExtensionMethodIssue.cs           |   91 +
 .../RewriteIfReturnToReturnIssue.cs           |   73 +
 .../SuggestUseVarKeywordEvidentIssue.cs       |  108 +
 ...AccessToStaticMemberViaDerivedTypeIssue.cs |  140 +
 .../BaseMemberHasParamsIssue.cs               |   83 +
 .../ConvertIfDoToWhileIssue.cs                |   88 +
 .../ConvertIfToOrExpressionIssue.cs           |  128 +
 .../ConvertToConstantIssue.cs                 |  323 +
 .../EmptyEmbeddedStatementIssue.cs            |   99 +
 .../FieldCanBeMadeReadOnlyIssue.cs            |  128 +
 .../MemberCanBeMadeStaticIssue.cs             |  209 +
 ...ParameterCanBeDeclaredWithBaseTypeIssue.cs |  565 ++
 .../PossibleMistakenCallToGetTypeIssue.cs     |   71 +
 .../PublicConstructorInAbstractClass.cs       |   79 +
 .../ReferenceEqualsWithValueTypeIssue.cs      |   85 +
 .../ReplaceWithFirstOrDefaultIssue.cs         |   97 +
 .../ReplaceWithLastOrDefaultIssue.cs          |   97 +
 .../ReplaceWithOfTypeAny.cs                   |  203 +
 .../ReplaceWithOfTypeCountIssue.cs            |   43 +
 .../ReplaceWithOfTypeFirstIssue.cs            |   42 +
 .../ReplaceWithOfTypeFirstOrDefaultIssue.cs   |   43 +
 .../ReplaceWithOfTypeIssue.cs                 |  146 +
 .../ReplaceWithOfTypeLastIssue.cs             |   42 +
 .../ReplaceWithOfTypeLastOrDefaultIssue.cs    |   42 +
 .../ReplaceWithOfTypeLongCountIssue.cs        |   43 +
 .../ReplaceWithOfTypeSingleIssue.cs           |   42 +
 .../ReplaceWithOfTypeSingleOrDefaultIssue.cs  |   42 +
 .../ReplaceWithOfTypeWhereIssue.cs            |   42 +
 .../ReplaceWithSimpleAssignmentIssue.cs       |   97 +
 .../ReplaceWithSingleCallToAnyIssue.cs        |  124 +
 .../ReplaceWithSingleCallToCountIssue.cs      |   43 +
 .../ReplaceWithSingleCallToFirstIssue.cs      |   43 +
 ...laceWithSingleCallToFirstOrDefaultIssue.cs |   43 +
 .../ReplaceWithSingleCallToLastIssue.cs       |   43 +
 ...placeWithSingleCallToLastOrDefaultIssue.cs |   43 +
 .../ReplaceWithSingleCallToLongCountIssue.cs  |   43 +
 .../ReplaceWithSingleCallToSingleIssue.cs     |   43 +
 ...aceWithSingleCallToSingleOrDefaultIssue.cs |   43 +
 .../ReplaceWithStringIsNullOrEmptyIssue.cs    |  152 +
 ...mplifyConditionalTernaryExpressionIssue.cs |  137 +
 .../SimplifyLinqExpressionIssue.cs            |  117 +
 .../StringCompareIsCultureSpecificIssue.cs    |  145 +
 .../StringCompareToIsCultureSpecificIssue.cs  |   97 +
 .../StringEndsWithIsCultureSpecificIssue.cs   |   42 +
 .../StringIndexOfIsCultureSpecificIssue.cs    |  104 +
 ...StringLastIndexOfIsCultureSpecificIssue.cs |   42 +
 .../StringStartsWithIsCultureSpecificIssue.cs |   42 +
 .../UseArrayCreationExpressionIssue.cs        |   91 +
 .../UseIsOperatorIssue.cs                     |  125 +
 .../UseMethodAnyIssue.cs                      |  163 +
 .../UseMethodIsInstanceOfTypeIssue.cs         |   88 +
 ...nCanBeReplacedWithArrayInitializerIssue.cs |  100 +
 .../ConditionIsAlwaysTrueOrFalseIssue.cs      |  139 +
 .../ConstantNullCoalescingConditionIssue.cs   |  143 +
 .../DoubleNegationOperatorIssue.cs            |   79 +
 .../RedundanciesInCode/EmptyStatementIssue.cs |   68 +
 .../ForStatementConditionIsTrueIssue.cs       |   70 +
 ...RedundantAnonymousTypePropertyNameIssue.cs |   84 +
 .../RedundantArgumentDefaultValueIssue.cs     |  130 +
 .../RedundantArgumentNameIssue.cs             |  105 +
 .../RedundantAttributeParenthesesIssue.cs     |   63 +
 .../RedundantBaseQualifierIssue.cs            |  147 +
 .../RedundantBoolCompareIssue.cs              |   97 +
 .../RedundantCaseLabelIssue.cs                |   77 +
 .../RedundanciesInCode/RedundantCastIssue.cs  |  204 +
 .../RedundantCatchClauseIssue.cs              |  159 +
 .../RedundantCheckBeforeAssignmentIssue.cs    |   80 +
 .../RedundantCommaInArrayInitializerIssue.cs  |   77 +
 .../RedundantComparisonWithNullIssue.cs       |  100 +
 .../RedundantDelegateCreationIssue.cs         |   76 +
 .../RedundantEmptyDefaultSwitchBranchIssue.cs |   69 +
 .../RedundantEmptyFinallyBlockIssue.cs        |   90 +
 ...dantEmptyObjectCreationArgumentListssue.cs |   72 +
 .../RedundantEnumerableCastCallIssue.cs       |  113 +
 .../RedundantExplicitArrayCreationIssue.cs    |  100 +
 .../RedundantExplicitArraySizeIssue.cs        |   76 +
 .../RedundantExplicitNullableCreationIssue.cs |   78 +
 .../RedundantExtendsListEntryIssue.cs         |  147 +
 .../RedundantIfElseBlockIssue.cs              |  116 +
 .../RedundantLambdaParameterTypeIssue.cs      |  104 +
 ...edundantLambdaSignatureParenthesesIssue.cs |   79 +
 ...ogicalConditionalExpressionOperandIssue.cs |   78 +
 .../RedundantNameQualifierIssue.cs            |  104 +
 ...ndantObjectOrCollectionInitializerIssue.cs |   66 +
 .../RedundantStringToCharArrayCallIssue.cs    |   92 +
 .../RedundantTernaryExpressionIssue.cs        |   76 +
 .../RedundantThisQualifierIssue.cs            |  203 +
 ...RedundantToStringCallForValueTypesIssue.cs |  228 +
 .../RedundantToStringCallIssue.cs             |  243 +
 .../RedundantUnsafeContextIssue.cs            |  149 +
 .../RedundantUsingDirectiveIssue.cs           |  178 +
 .../RemoveRedundantOrStatementIssue.cs        |   76 +
 .../UnusedAnonymousMethodSignatureIssue.cs    |   94 +
 .../EmptyConstructorIssue.cs                  |   87 +
 .../EmptyDestructorIssue.cs                   |  123 +
 .../EmptyNamespaceIssue.cs                    |   80 +
 .../EnumUnderlyingTypeIsIntIssue.cs           |   99 +
 .../LocalVariableNotUsedIssue.cs              |  111 +
 .../PartialTypeWithSinglePartIssue.cs         |   99 +
 .../RedundantBaseConstructorCallIssue.cs      |   86 +
 .../RedundantDefaultFieldInitializerIssue.cs  |  124 +
 .../RedundantOverridenMemberIssue.cs          |  277 +
 .../RedundantParamsIssue.cs                   |   86 +
 .../SealedMemberInSealedClassIssue.cs         |  141 +
 .../UnusedLabelIssue.cs                       |  156 +
 .../UnusedParameterIssue.cs                   |  168 +
 .../UnusedTypeParameterIssue.cs               |   98 +
 .../ConvertTailRecursiveCallToLoopIssue.cs    |   58 +
 .../TODO/LoopCanBeConvertedToQueryIssue.cs    |   51 +
 .../PartOfBodyCanBeConvertedToQueryIssue.cs   |   50 +
 .../RedundantTypeArgumentsOfMethodIssue.cs    |   51 +
 .../Uncategorized/AutoAsyncIssue.cs           |  636 ++
 .../CallToObjectEqualsViaBaseIssue.cs         |   92 +
 .../CastExpressionOfIncompatibleTypeIssue.cs  |   82 +
 .../Uncategorized/CheckNamespaceIssue.cs      |   88 +
 .../CS0659OverrideEqualWithoutGetHashCode.cs  |  125 +
 ...TypeHasNoConstructorWithNArgumentsIssue.cs |  138 +
 .../Uncategorized/ConstantConditionIssue.cs   |  149 +
 .../DisposeMethodInNonIDisposableTypeIssue.cs |  214 +
 ...seLinqWhenItsVerboseAndInefficientIssue.cs |  306 +
 .../DuplicatedLinqToListOrArrayIssue.cs       |  120 +
 .../Uncategorized/ExceptionRethrowIssue.cs    |  132 +
 .../ExplicitConversionInForEachIssue.cs       |   77 +
 .../ExpressionIsNeverOfProvidedTypeIssue.cs   |   92 +
 .../IncorrectCallToObjectGetHashCodeIssue.cs  |   79 +
 ...thodOverloadHidesOptionalParameterIssue.cs |   85 +
 .../OptionalParameterCouldBeSkippedIssue.cs   |  175 +
 .../Uncategorized/RedundantAssignmentIssue.cs |  470 +
 .../RedundantBlockInDifferentBranchesIssue.cs |  106 +
 ...tNotNullAttributeInNonNullableTypeIssue.cs |  101 +
 ...esultOfAsyncCallShouldNotBeIgnoredIssue.cs |   68 +
 ...onditionExpressionInIfelseBranchesIssue.cs |  101 +
 ...edSizeSpecificationInArrayCreationIssue.cs |   87 +
 .../Uncategorized/UnreachableCodeIssue.cs     |  217 +
 .../UseOfMemberOfNullReference.cs             |  108 +
 .../ParameterOnlyAssignedIssue.cs             |   67 +
 .../VariableOnlyAssignedIssue.cs              |   85 +
 ...pCode.NRefactory.CSharp.Refactoring.csproj |  460 +
 .../Properties/AssemblyInfo.cs                |   30 +
 .../Analysis/AnnotationNames.cs               |   48 +
 .../DeclarationSpace/LocalDeclarationSpace.cs |  157 +
 .../LocalDeclarationSpaceVisitor.cs           |  138 +
 .../Analysis/NullValueAnalysis.cs             | 2203 +++++
 .../Analysis/NullValueStatus.cs               |   84 +
 .../Analysis/ReachabilityAnalysis.cs          |  123 +-
 .../Analysis/SemanticHighlightingVisitor.cs   |   78 +-
 .../Ast/AstNode.cs                            |    7 +-
 .../Ast/AstType.cs                            |    5 +
 .../Ast/CSharpUtil.cs                         |  111 +-
 .../Expressions/AnonymousMethodExpression.cs  |    2 +-
 .../Ast/Expressions/AsExpression.cs           |   70 +-
 .../Ast/Expressions/AssignmentExpression.cs   |   67 +
 .../Expressions/BinaryOperatorExpression.cs   |   66 +
 .../Ast/Expressions/CastExpression.cs         |   72 +-
 .../Ast/Expressions/ConditionalExpression.cs  |   67 +
 .../Ast/Expressions/Expression.cs             |   22 +-
 .../Ast/Expressions/IsExpression.cs           |   78 +
 .../Ast/Expressions/LambdaExpression.cs       |    8 +
 .../Ast/Expressions/PrimitiveExpression.cs    |   26 +-
 .../Ast/Expressions/QueryExpression.cs        |   66 +
 .../Ast/GeneralScope/Attribute.cs             |   12 +-
 .../Ast/GeneralScope/NamespaceDeclaration.cs  |  111 +-
 .../Ast/GeneralScope/NewLineNode.cs           |  124 +-
 .../Ast/GeneralScope/PreProcessorDirective.cs |   62 +-
 .../Ast/GeneralScope/TypeDeclaration.cs       |   18 +-
 .../Ast/Statements/BlockStatement.cs          |    5 -
 .../Ast/Statements/DoWhileStatement.cs        |   10 +
 .../Ast/Statements/LabelStatement.cs          |    2 +-
 .../Ast/Statements/Statement.cs               |    5 +
 .../Ast/Statements/WhileStatement.cs          |   10 +
 .../Ast/TypeMembers/ConstructorDeclaration.cs |    9 +
 .../Ast/TypeMembers/IndexerDeclaration.cs     |    6 +-
 .../Ast/TypeMembers/ParameterDeclaration.cs   |   17 +-
 .../CombineQueryExpressions.cs                |  216 +
 .../Completion/CSharpCompletionEngine.cs      | 1480 ++-
 .../Completion/CSharpCompletionEngineBase.cs  |  128 +-
 .../CSharpParameterCompletionEngine.cs        |   38 +-
 .../Completion/CompletionDataWrapper.cs       |   82 +-
 .../Completion/ICompletionContextProvider.cs  |    9 +-
 .../Completion/ICompletionDataFactory.cs      |   10 +-
 .../Formatter/CSharpFormattingOptions.cs      |   78 +-
 .../Formatter/CSharpIndentEngine.cs           |  692 --
 .../Formatter/FormattingChanges.cs            |   14 +
 .../Formatter/FormattingOptionsFactory.cs     |   50 +-
 .../Formatter/FormattingVisitor.cs            |  254 +-
 .../FormattingVisitor_Expressions.cs          |  307 +-
 .../Formatter/FormattingVisitor_Global.cs     |   70 +-
 .../Formatter/FormattingVisitor_Query.cs      |  124 +
 .../Formatter/FormattingVisitor_Statements.cs |  121 +-
 .../FormattingVisitor_TypeMembers.cs          |  291 +-
 .../Formatter/GeneratedCodeSettings.cs        |    4 +-
 .../Formatter/Indent.cs                       |  102 +-
 .../ICSharpCode.NRefactory.CSharp.csproj      |  984 +-
 .../IndentEngine/CSharpIndentEngine.cs        |  559 ++
 .../IndentEngine/CacheIndentEngine.cs         |  627 ++
 .../IndentEngine/IDocumentIndentEngine.cs     |  108 +
 .../IndentEngine/IStateMachineIndentEngine.cs |   60 +
 .../IndentEngine/IndentState.cs               | 1990 ++++
 .../NullIStateMachineIndentEngine.cs          |  215 +
 .../IndentEngine/TextPasteIndentEngine.cs     |  523 +
 .../IntroduceQueryExpressions.cs              |  386 +
 .../OutputVisitor/CSharpAmbience.cs           |    2 +-
 .../OutputVisitor/CSharpOutputVisitor.cs      |   29 +-
 .../Parser/CSharpParser.cs                    | 3315 ++++---
 .../Parser/mcs/anonymous.cs                   |   67 +-
 .../Parser/mcs/assembly.cs                    |   24 +-
 .../Parser/mcs/assign.cs                      |   13 +-
 .../Parser/mcs/async.cs                       |   56 +-
 .../Parser/mcs/attribute.cs                   |   27 +-
 .../Parser/mcs/cfold.cs                       |   46 +-
 .../Parser/mcs/class.cs                       |   75 +-
 .../Parser/mcs/codegen.cs                     |   24 +-
 .../Parser/mcs/complete.cs                    |   50 +-
 .../Parser/mcs/constant.cs                    |    6 +-
 .../Parser/mcs/convert.cs                     |   59 +-
 .../Parser/mcs/cs-parser.cs                   | 6633 ++++++-------
 .../Parser/mcs/cs-parser.jay                  |   61 +-
 .../Parser/mcs/cs-tokenizer.cs                |  151 +-
 .../Parser/mcs/delegate.cs                    |    4 +-
 .../Parser/mcs/ecore.cs                       |  134 +-
 .../Parser/mcs/eval.cs                        |  106 +-
 .../Parser/mcs/expression.cs                  | 1524 ++-
 .../Parser/mcs/flowanalysis.cs                |    2 +-
 .../Parser/mcs/import.cs                      |   30 +-
 .../Parser/mcs/location.cs                    |   62 +-
 .../Parser/mcs/module.cs                      |   31 +-
 .../Parser/mcs/namespace.cs                   |   12 +-
 .../Parser/mcs/nullable.cs                    |  744 +-
 .../Parser/mcs/property.cs                    |    4 +-
 .../Parser/mcs/statement.cs                   |  281 +-
 .../Parser/mcs/support.cs                     |   34 +
 .../Parser/mcs/typemanager.cs                 |   21 +-
 .../Parser/mcs/typespec.cs                    |   39 +
 .../Parser/mcs/visit.cs                       |    6 +-
 .../PatternMatching/AnyType.cs                |   37 +
 .../Properties/AssemblyInfo.cs                |    2 +
 .../QueryExpressionExpander.cs                |   69 +-
 .../Refactoring/BaseRefactoringContext.cs     |   92 +-
 .../Refactoring/CodeAction.cs                 |   84 +-
 .../Refactoring/CodeActionProvider.cs         |   37 +
 .../CodeActions/AddAnotherAccessorAction.cs   |   97 -
 .../CodeActions/AddCatchTypeAction.cs         |   60 -
 .../Refactoring/CodeActions/AddUsingAction.cs |  156 -
 .../CheckIfParameterIsNullAction.cs           |   92 -
 .../ConvertAnonymousDelegateToLambdaAction.cs |   61 -
 .../CodeActions/ConvertAsToCastAction.cs      |   58 -
 .../ConvertConditionalToIfAction.cs           |  146 -
 .../CodeActions/ConvertDecToHexAction.cs      |   52 -
 .../CodeActions/ConvertForeachToForAction.cs  |  144 -
 .../CodeActions/ConvertHexToDecAction.cs      |   53 -
 .../ConvertIfToConditionalAction.cs           |  137 -
 .../CodeActions/ConvertIfToSwitchAction.cs    |  189 -
 ...rtLambdaBodyExpressionToStatementAction.cs |   63 -
 ...rtLambdaBodyStatementToExpressionAction.cs |   57 -
 .../ConvertLambdaToAnonymousDelegateAction.cs |   99 -
 .../CodeActions/ConvertSwitchToIfAction.cs    |  147 -
 ...tializerToExplicitInitializationsAction.cs |  208 -
 .../ConvertToInitializerAction.cs             |  109 -
 .../CodeActions/CreateBackingStoreAction.cs   |   78 -
 .../CreateClassDeclarationAction.cs           |  330 -
 .../CreateConstructorDeclarationAction.cs     |   63 -
 .../CodeActions/CreateDelegateAction.cs       |   71 -
 .../CodeActions/CreateEnumValue.cs            |   86 -
 .../CodeActions/CreateEventInvocatorAction.cs |  144 -
 .../CodeActions/CreateFieldAction.cs          |  326 -
 .../CodeActions/CreateIndexerAction.cs        |  102 -
 .../CodeActions/CreateLocalVariableAction.cs  |   73 -
 .../CreateMethodDeclarationAction.cs          |  369 -
 .../CreateOverloadWithoutParameterAction.cs   |  152 -
 .../CodeActions/CreatePropertyAction.cs       |  131 -
 .../CodeActions/DeclareLocalVariableAction.cs |  177 -
 ...nvocationToStaticMethodInvocationAction.cs |   69 -
 .../ExtractAnonymousMethodAction.cs           |  117 -
 .../CodeActions/ExtractFieldAction.cs         |  121 -
 .../ExtractMethod/ExtractMethodAction.cs      |  233 -
 .../ExtractMethod/StaticVisitor.cs            |   85 -
 .../ExtractMethod/VariableLookupVisitor.cs    |  102 -
 .../FlipOperatorArgumentsAction.cs            |   61 -
 .../CodeActions/GenerateGetterAction.cs       |  101 -
 .../CodeActions/GeneratePropertyAction.cs     |  108 -
 .../CodeActions/GenerateSwitchLabelsAction.cs |   86 -
 .../ImplementAbstractMembersAction.cs         |  120 -
 .../CodeActions/ImplementInterfaceAction.cs   |  193 -
 .../ImplementInterfaceExplicitAction.cs       |   68 -
 .../CodeActions/InlineLocalVariableAction.cs  |   99 -
 .../InsertAnonymousMethodSignatureAction.cs   |   94 -
 .../CodeActions/IntroduceConstantAction.cs    |  146 -
 .../CodeActions/IntroduceFormatItemAction.cs  |  105 -
 .../Refactoring/CodeActions/InvertIfAction.cs |   62 -
 .../CodeActions/InvertIfAndSimplify.cs        |   91 -
 .../CodeActions/IterateViaForeachAction.cs    |  165 -
 .../CodeActions/MoveToOuterScopeAction.cs     |  149 -
 .../NegateRelationalExpressionAction.cs       |   48 -
 .../CodeActions/RemoveBackingStoreAction.cs   |  125 -
 .../CodeActions/RemoveBracesAction.cs         |   69 -
 .../RemoveRedundantCatchTypeAction.cs         |   80 -
 .../CodeActions/RemoveRegionAction.cs         |  112 -
 .../CodeActions/ReplaceEmptyStringAction.cs   |   54 -
 .../CodeActions/SimplifyIfFlowAction.cs       |  103 -
 .../SimplifyIfInLoopsFlowAction.cs            |   88 -
 .../CodeActions/SortUsingsAction.cs           |   98 -
 .../CodeActions/SpecializedCodeAction.cs      |   38 -
 .../SplitDeclarationAndAssignmentAction.cs    |   82 -
 .../CodeActions/SplitDeclarationListAction.cs |   93 -
 .../CodeActions/SplitStringAction.cs          |   61 -
 ...cationToExtensionMethodInvocationAction.cs |   68 -
 .../CodeActions/UseExplicitTypeAction.cs      |   97 -
 .../CodeActions/UseStringFormatAction.cs      |  144 -
 .../CodeActions/UseVarKeywordAction.cs        |   72 -
 .../Refactoring/CodeGenerationService.cs      |   64 +
 .../Refactoring/CodeIssue.cs                  |  126 +-
 .../Refactoring/CodeIssueProvider.cs          |   76 +
 .../AccessToClosureIssue.cs                   |  319 -
 .../AccessToDisposedClosureIssue.cs           |   94 -
 .../AccessToModifiedClosureIssue.cs           |  116 -
 .../AssignmentMadeToSameVariableIssue.cs      |  100 -
 .../BitwiseOperationOnNonFlagsEnumIssue.cs    |  121 -
 .../CallToObjectEqualsViaBaseIssue.cs         |   92 -
 ...llToVirtualFunctionFromConstructorIssue.cs |  162 -
 .../CastExpressionOfIncompatibleTypeIssue.cs  |   83 -
 .../CompareBooleanWithTrueOrFalseIssue.cs     |   91 -
 .../CompareFloatWithEqualityOperatorIssue.cs  |  144 -
 .../CS0029InvalidConversionIssue.cs           |  119 -
 ...7ReturnMustNotBeFollowedByAnyExpression.cs |  117 -
 .../ConditionalToNullCoalescingIssue.cs       |   89 -
 .../CodeIssues/ConstantConditionIssue.cs      |  150 -
 .../PublicConstructorInAbstractClass.cs       |   80 -
 .../RedudantConstructorIssue.cs               |   86 -
 .../StaticConstructorAccessModifierIssue.cs   |   71 -
 .../StaticConstructorParameterIssue.cs        |   68 -
 .../CodeIssues/ConvertToStaticMethodIssue.cs  |  127 -
 .../CodeIssues/DoubleNegationIssue.cs         |   80 -
 .../CodeIssues/DuplicateBodyMethodIssue.cs    |  176 -
 .../DuplicateExpressionsInConditionsIssue.cs  |  123 -
 .../CodeIssues/DuplicateIfInIfChainIssue.cs   |  112 -
 .../CodeIssues/ExceptionRethrowIssue.cs       |  132 -
 .../ExplicitConversionInForEachIssue.cs       |   77 -
 .../ExpressionIsAlwaysOfProvidedTypeIssue.cs  |   84 -
 .../ExpressionIsNeverOfProvidedTypeIssue.cs   |   92 -
 .../ForControlVariableNotModifiedIssue.cs     |  132 -
 .../FormatStringIssues/FormatStringHelper.cs  |   76 -
 .../FormatStringIssues/FormatStringIssue.cs   |  119 -
 .../CodeIssues/GatherVisitorBase.cs           |  210 -
 .../IdenticalConditionalBranchIssue.cs        |   67 -
 .../InconsistentNamingIssue.cs                |  369 -
 .../InconsistentNamingIssue/NamingRule.cs     |  397 -
 .../InconsistentNamingIssue/NamingStyle.cs    |   59 -
 .../IncorrectCallToObjectGetHashCodeIssue.cs  |   79 -
 ...ncorrectExceptionParameterOrderingIssue.cs |   98 -
 .../Refactoring/CodeIssues/IssueCategories.cs |   43 -
 .../CodeIssues/MethodNeverReturnsIssue.cs     |   75 -
 ...thodOverloadHidesOptionalParameterIssue.cs |   86 -
 .../MissingStringComparisonIssue.cs           |  107 -
 .../CodeIssues/MultipleEnumerationIssue.cs    |  366 -
 .../NegativeRelationalExpressionIssue.cs      |  100 -
 .../CodeIssues/NoDefaultConstructorIssue.cs   |  102 -
 .../NotImplementedExceptionIssue.cs           |   64 -
 .../OptionalParameterCouldBeSkippedIssue.cs   |  174 -
 .../HasMemberCriterion.cs                     |   88 -
 .../ITypeCriterion.cs                         |   44 -
 .../IsArrayTypeCriterion.cs                   |   43 -
 .../IsTypeCriterion.cs                        |   50 -
 .../ParameterCanBeDemotedIssue.cs             |  220 -
 .../ParameterCanBeIEnumerableIssue.cs         |  156 -
 .../SupportsIndexingCriterion.cs              |  107 -
 .../TypeCriteriaCollector.cs                  |  212 -
 .../RedundantArrayInitializerCommaIssue.cs    |   77 -
 .../CodeIssues/RedundantAssignmentIssue.cs    |  464 -
 .../RedundantAttributeParenthesesIssue.cs     |   65 -
 .../RedundantBaseConstructorIssue.cs          |   86 -
 .../CodeIssues/RedundantCaseLabelIssue.cs     |   72 -
 .../CodeIssues/RedundantCatchIssue.cs         |  160 -
 .../CodeIssues/RedundantElseIssue.cs          |   97 -
 .../RedundantFieldInitializerIssue.cs         |  124 -
 .../CodeIssues/RedundantInternalIssue.cs      |   72 -
 .../RedundantNamespaceUsageIssue.cs           |   99 -
 .../CodeIssues/RedundantNullCheckIssue.cs     |  104 -
 ...edundantObjectCreationArgumentListIssue.cs |   73 -
 ...ndantObjectOrCollectionInitializerIssue.cs |   67 -
 .../CodeIssues/RedundantPrivateIssue.cs       |  133 -
 .../CodeIssues/RedundantThisIssue.cs          |  130 -
 .../CodeIssues/RedundantToStringIssue.cs      |  241 -
 .../CodeIssues/RedundantTypeCastIssue.cs      |  137 -
 .../CodeIssues/RedundantUsingIssue.cs         |  155 -
 .../RedundantWhereWithPredicateIssue.cs       |  102 -
 ...ReferenceEqualsCalledWithValueTypeIssue.cs |   80 -
 ...erenceToStaticMemberViaDerivedTypeIssue.cs |  136 -
 ...esultOfAsyncCallShouldNotBeIgnoredIssue.cs |   68 -
 .../SimplifyAnonymousMethodToDelegateIssue.cs |  147 -
 .../StaticFieldInGenericTypeIssue.cs          |  106 -
 .../CodeIssues/StringIsNullOrEmptyIssue.cs    |  134 -
 .../ThreadStaticOnInstanceFieldIssue.cs       |  105 -
 .../CodeIssues/TypeParameterNotUsedIssue.cs   |   99 -
 .../CodeIssues/Uncategorized/.DS_Store        |  Bin 0 -> 6148 bytes
 .../CodeIssues/UnreachableCodeIssue.cs        |  189 -
 .../CodeIssues/UseBlockInsteadColonIssue.cs   |  106 -
 .../CodeIssues/UseVarKeywordIssue.cs          |  104 -
 .../CodeIssues/ValueParameterUnusedIssue.cs   |  108 -
 .../VariableDeclaredInWideScopeIssue.cs       |  383 -
 .../LocalVariableHidesMemberIssue.cs          |   73 -
 .../ParameterHidesMemberIssue.cs              |   61 -
 .../VariableHidesMemberIssue.cs               |  100 -
 .../LocalVariableNotUsedIssue.cs              |  110 -
 .../ParameterNotUsedIssue.cs                  |  158 -
 .../ParameterOnlyAssignedIssue.cs             |   68 -
 .../VariableOnlyAssignedIssue.cs              |   86 -
 .../Refactoring/CommonSubIssues.cs            |   37 +
 .../Refactoring/ContextActionAttribute.cs     |    7 -
 .../Refactoring/CreateChangedEvent.cs         |   92 -
 .../Refactoring/FormatStringHelper.cs         |   76 +
 .../Refactoring/ICodeActionProvider.cs        |   37 -
 .../Refactoring/ICodeIssueProvider.cs         |   45 -
 .../Refactoring/IssueAttribute.cs             |   49 +-
 .../Refactoring/LambdaHelper.cs               |   29 +-
 .../Refactoring/LocalReferenceFinder.cs       |    5 +
 .../Refactoring/PatternHelper.cs              |  108 +
 .../Refactoring/RefactoringContext.cs         |   69 +-
 .../Refactoring/Script.cs                     |  231 +-
 .../Refactoring/TypeGuessing.cs               |  323 +
 .../Refactoring/VariableReferenceGraph.cs     |   10 +-
 .../WordParser.cs                             |    0
 .../Resolver/CSharpAstResolver.cs             |    2 +-
 .../Resolver/CSharpConversions.cs             |   25 +-
 .../Resolver/CSharpResolver.cs                |  102 +-
 .../Resolver/CastResolveResult.cs             |   63 +
 .../Resolver/FindReferences.cs                |  172 +-
 .../Resolver/IResolveVisitorNavigator.cs      |    2 +-
 .../Resolver/LambdaResolveResult.cs           |   11 +
 .../Resolver/OverloadResolution.cs            |    8 +-
 .../Resolver/ResolveAtLocation.cs             |    6 +-
 .../Resolver/ResolveVisitor.cs                |   95 +-
 .../Resolver/TypeInference.cs                 |   39 +-
 .../TypeSystem/ConstantValues.cs              |   15 +-
 .../MemberTypeOrNamespaceReference.cs         |    9 +-
 .../TypeSystem/TypeSystemConvertVisitor.cs    |   38 +-
 .../CecilLoader.cs                            | 1765 ++++
 .../ICSharpCode.NRefactory.Cecil.csproj       |   77 +
 .../Properties/AssemblyInfo.cs                |   36 +
 ...arpCode.NRefactory.ConsistencyCheck.csproj |  276 +-
 .../PatternMatchingTest.cs                    |    2 +
 .../ResolverTest.cs                           |    4 +-
 .../Solution.cs                               |    2 +-
 .../Xml/IncrementalXmlParserTests.cs          |    2 +-
 .../ICSharpCode.NRefactory.Demo/CSDemo.cs     |    2 +-
 .../ICSharpCode.NRefactory.Demo.csproj        |  260 +-
 .../ICSharpCode.NRefactory.GtkDemo.csproj     |  240 +-
 .../MainWindow.cs                             |    4 +-
 .../ICSharpCode.NRefactory.IKVM.csproj        |   60 +
 .../ICSharpCode.NRefactory.IKVM/IkvmLoader.cs | 1507 +++
 .../IntConstantValue.cs                       |   65 +
 .../NonFrozenInterningProvider.cs             |  136 +
 .../Properties/AssemblyInfo.cs                |   37 +
 .../ShortConstantValue.cs                     |   65 +
 .../StringConstantValue.cs                    |   65 +
 .../StructConstantValue.cs                    |   73 +
 .../Analysis/SymbolCollectorTests.cs          |   28 +-
 .../LocalDeclarationSpaceTests.cs             |  170 +
 .../LocalDeclarationSpaceVisitorTests.cs      |  118 +
 .../CSharp/Analysis/NullValueAnalysisTests.cs | 2190 +++++
 .../Analysis/SemanticHighlightingTests.cs     |   77 +-
 .../CSharp/AstStructureTests.cs               |   11 +-
 .../CSharp/CSharpOutputVisitorTests.cs        |   44 +
 ...AbstractAndVirtualConversionActionTests.cs |  289 +
 .../CodeActions/AddAnotherAccessorTests.cs    |    9 +-
 .../CodeActions/AddArgumentNameTests.cs       |  218 +
 .../CodeActions/AddBracesActionTests.cs       |  240 +
 .../AddExceptionDescriptionActionTests.cs     |  101 +
 .../AddOptionalParameterToInvocationTests.cs  |  169 +
 .../CSharp/CodeActions/AutoLinqSumTests.cs    |  775 ++
 .../CS1520MethodMustHaveAReturnTypeTests.cs   |   91 +
 .../CodeActions/ChangeAccessModifierTests.cs  |  239 +
 .../CodeActions/ComputeConstantValueTests.cs  |  280 +
 .../CodeActions/ContextActionTestBase.cs      |   34 +-
 .../ConvertAnonymousDelegateToLambdaTests.cs  |   22 +-
 .../ConvertAssignmentToIfActionTests.cs       |  165 +
 ...wiseFlagComparisonToHasFlagsActionTests.cs |  259 +
 .../ConvertConditionalToIfTests.cs            |  273 -
 .../ConvertDoWhileToWhileLoopTests.cs         |   70 +
 ...vertEqualityOperatorToEqualsActionTests.cs |  103 +
 ...vertEqualsToEqualityOperatorActionTests.cs |  143 +
 .../ConvertForToWhileActionTests.cs           |  176 +
 .../CodeActions/ConvertForeachToForTests.cs   |   78 +-
 ...FlagsToBitwiseFlagComparisonActionTests.cs |  138 +
 ...ConditionalTernaryExpressionActionTests.cs |  192 +
 ...ntToNullCoalescingExpressionActionTests.cs |  276 +
 ...IfStatementToReturnStatementActionTests.cs |  105 +
 ...IfStatementToSwitchStatementActionTests.cs |  552 ++
 .../ConvertIfToConditionalTests.cs            |  237 -
 .../CodeActions/ConvertIfToSwtichTests.cs     |  506 -
 ...MethodGroupToAnonymousMethodActionTests.cs |  147 +
 .../ConvertMethodGroupToLambdaActionTests.cs  |  139 +
 .../ConvertMultiplyToShiftActionTests.cs      |   89 +
 ...scingToConditionalExpressionActionTests.cs |   57 +
 .../ConvertReturnStatementToIfActionTests.cs  |   81 +
 .../ConvertShiftToMultiplyActionTests.cs      |   75 +
 .../ConvertToInitializerTests.cs              |    2 +-
 .../ConvertWhileToDoWhileLoopTests.cs         |   81 +
 .../CodeActions/CopyCommentsFromBaseTests.cs  |  167 +
 .../CopyCommentsFromIntefaceTests.cs          |  122 +
 .../CodeActions/CreateBackingStoreTests.cs    |   28 +
 .../CodeActions/CreateChangedEventTests.cs    |   49 +-
 .../CreateClassDeclarationTests.cs            |    1 +
 .../CodeActions/DeclareLocalVariableTests.cs  |   24 +
 .../CSharp/CodeActions/ExtractMethodTests.cs  |   75 +-
 ...nditionToInternalIfStatementActionTests.cs |  125 +
 .../FlipEqualsTargetAndArgumentActionTests.cs |  177 +
 .../CodeActions/GenerateSwitchLabelsTests.cs  |   44 +-
 .../ImplementAbstractMembersTest.cs           |  296 +-
 .../CodeActions/ImplementInterfaceTests.cs    |   33 +-
 .../ImplementNotImplementedPropertyTests.cs   |  122 +
 .../CodeActions/IntroduceConstantTests.cs     |   43 +-
 .../InvertConditionalOperatorActionTests.cs   |  157 +
 .../InvertLogicalExpressionTests.cs           |  274 +
 .../CodeActions/IterateViaForeachTests.cs     |   10 +-
 .../CodeActions/LinqFluentToQueryTests.cs     |  627 ++
 .../CodeActions/LinqQueryToFluentTests.cs     |  690 ++
 .../CSharp/CodeActions/MetaTests.cs           |  283 +
 .../CodeActions/MoveToOuterScopeTests.cs      |    4 +-
 .../NegateIsExpressionActionTests.cs          |   76 +
 .../NegateRelationalExpressionTests.cs        |   24 +
 .../CodeActions/RemoveBackingStoreTests.cs    |   45 +-
 .../CSharp/CodeActions/RemoveBracesTests.cs   |  203 +-
 .../CSharp/CodeActions/RemoveRegionTests.cs   |   95 +-
 ...ignmentWithPostfixExpressionActionTests.cs |   98 +
 ...atorAssignmentWithAssignmentActionTests.cs |   58 +
 ...tfixExpressionWithAssignmentActionTests.cs |   77 +
 ...eplaceWithOperatorAssignmentActionTests.cs |   58 +
 .../ReverseDirectionForForLoopTests.cs        |  423 +
 .../SplitDeclarationAndAssignmentTests.cs     |   92 +-
 .../CSharp/CodeActions/SplitIfActionTests.cs  |  231 +
 ...ocationToExtensionMethodInvocationTests.cs |  175 -
 .../CodeActions/TestRefactoringContext.cs     |  211 +-
 .../UseAsAndNullCheckActionTests.cs           |  433 +
 .../CodeActions/UseStringFormatTests.cs       |  154 +
 .../CodeCompletion/BrowsableAttributeTests.cs |   60 +
 .../CodeCompletion/CodeCompletionBugTests.cs  |  558 +-
 .../CodeCompletionOperatorTests.cs            |  674 ++
 .../CodeComplteionOperatorTests.cs            |  673 --
 .../CodeCompletion/CompletionDataList.cs      |    4 +-
 .../CSharp/CodeCompletion/FormatItemTests.cs  |  181 +
 .../CodeCompletion/ImportCompletionTests.cs   |   81 +-
 .../CSharp/CodeCompletion/KeywordTests.cs     |    2 +
 .../CSharp/CodeCompletion/NameContextTests.cs |   44 +-
 .../ParameterCompletionTests.cs               |  118 +-
 .../AccessToDisposedClosureTests.cs           |    1 +
 ...sToStaticMemberViaDerivedTypeIssueTests.cs |  346 +
 .../CodeIssues/AdditionalOfTypeIssuesTests.cs |   77 +
 ...eReplacedWithArrayInitializerIssueTests.cs |  116 +
 .../AssignmentMadeToSameVariableIssueTests.cs |  230 -
 .../CSharp/CodeIssues/AutoAsyncTests.cs       |  730 ++
 .../BaseMemberHasParamsIssueTests.cs          |  111 +
 ...ethodCallWithDefaultParameterIssueTests.cs |  155 +
 ...seMethodParameterNameMismatchIssueTests.cs |   91 +
 ...itwiseOperationOnNonFlagsEnumIssueTests.cs |  105 -
 ...iseOperatorOnEnumWithoutFlagsIssueTests.cs |  126 +
 .../CS0029InvalidConversionIssueTests.cs      |  306 +-
 ...turnMustBeFollowedByAnyExpressionTestes.cs |  335 +
 ...rnMustNotBeFollowedByAnyExpressionTests.cs |  116 +-
 ...CS0152DuplicateCaseLabelValueIssueTests.cs |  136 +
 ...ressionIsAlwaysOfProvidedTypeIssueTests.cs |  154 +
 ...59OverrideEqualsWithoutGetHashCodeTests.cs |  171 +
 .../CS0759RedundantPartialMethodIssueTests.cs |   86 +
 ...arameterHasNoMatchingParamTagIssueTests.cs |  111 +
 ...7AssignmentMadeToSameVariableIssueTests.cs |  266 +
 ...asNoConstructorWithNArgumentsIssueTests.cs |  271 +
 ...llToVirtualFunctionFromConstructorTests.cs |  137 -
 ...cedWithTryCastAndCheckForNullIssueTests.cs |  228 +
 ...tExpressionOfIncompatibleTypeIssueTests.cs |   15 +
 .../CodeIssues/CheckNamespaceIssueTests.cs    |   70 +
 ...CompareBooleanWithTrueOrFalseIssueTests.cs |  101 -
 ...pareFloatWithEqualityOperatorIssueTests.cs |  133 -
 ...NonConstrainedGenericWithNullIssueTests.cs |  104 +
 ...areOfFloatsByEqualityOperatorIssueTests.cs |  194 +
 .../ConditionIsAlwaysTrueOrFalseIssueTests.cs |  276 +
 .../ConditionalTernaryEqualBranchTests.cs     |  142 +
 ...nditionalToNullCoalescingInspectorTests.cs |  133 -
 ...nstantNullCoalescingConditionIssueTests.cs |  148 +
 .../ConvertClosureToMethodGroupIssueTests.cs  |  378 +
 ...tionalTernaryToNullCoalescingIssueTests.cs |  185 +
 .../ConvertIfDoToWhileIssueTests.cs           |  117 +
 ...oConditionalTernaryExpressionIssueTests.cs |  164 +
 ...entToNullCoalescingExpressionIssueTests.cs |   98 +
 ...tIfStatementToSwitchStatementIssueTests.cs |  398 +
 .../ConvertIfToAndExpressionIssueTests.cs     |  120 +
 .../ConvertIfToOrExpressionIssueTests.cs      |  116 +
 .../ConvertNullableToShortFormIssueTests.cs   |  137 +
 ...onvertTailRecursiveCallToLoopIssueTests.cs |   95 +
 .../ConvertToAutoPropertyIssueTests.cs        |  102 +
 .../CodeIssues/ConvertToConstantIssueTests.cs |  445 +
 .../ConvertToLambdaExpressionIssueTests.cs    |  180 +
 .../ConvertToStaticMethodIssueTests.cs        |  164 -
 .../CodeIssues/ConvertToStaticTypeTests.cs    |  197 +
 .../DelegateSubtractionIssueTests.cs          |   82 +
 .../DisposeMethodInNonIDisposableTypeTests.cs |  327 +
 ...erridableMethodsInConstructorIssueTests.cs |  176 +
 ...seLinqWhenItsVerboseAndInefficientTests.cs |  309 +
 .../CodeIssues/DoubleNegationIssueTests.cs    |   63 -
 .../DoubleNegationOperatorIssueTests.cs       |   63 +
 .../DuplicatedLinqToListOrArrayTests.cs       |  159 +
 .../CodeIssues/EmptyConstructorIssueTests.cs  |  106 +
 .../CSharp/CodeIssues/EmptyDestructorTests.cs |  111 +
 .../EmptyEmbeddedStatementIssueTests.cs       |   96 +
 .../EmptyGeneralCatchClauseTests.cs           |  122 +
 .../CSharp/CodeIssues/EmptyNamespaceTests.cs  |  148 +
 .../CodeIssues/EmptyStatementIssueTests.cs    |  105 +
 .../EnumUnderlyingTypeIsIntTests.cs           |  102 +
 .../EqualExpressionComparisonIssueTests.cs    |  188 +
 ...scriptionViaAnonymousDelegateIssueTests.cs |   99 +
 ...ressionIsAlwaysOfProvidedTypeIssueTests.cs |  108 -
 .../FieldCanBeMadeReadOnlyIssueTests.cs       |  199 +
 .../ForCanBeConvertedToForeachIssueTests.cs   |  228 +
 ...ontrolVariableIsNeverModifiedIssueTests.cs |  133 +
 ...ForControlVariableNotModifiedIssueTests.cs |  133 -
 .../ForStatementConditionIsTrueTests.cs       |  131 +
 .../FormatStringIssues/FormatStringTests.cs   |  227 -
 .../FormatStringProblemIssueTests.cs          |  285 +
 .../FunctionNeverReturnsIssueTests.cs         |  493 +
 .../IdenticalConditionalBranchIssueTests.cs   |   59 -
 .../CodeIssues/InconsistentNamingTests.cs     |  186 +
 ...ncorrectExceptionParameterOrderingTests.cs |   90 -
 .../CodeIssues/InspectionActionTestBase.cs    |   86 +-
 .../InvokeAsExtensionMethodIssueTests.cs      |  201 +
 .../LocalVariableHidesMemberIssueTests.cs     |   36 +-
 .../CSharp/CodeIssues/LockThisTests.cs        |  742 ++
 .../LongLiteralEndingLowerLIssueTests.cs      |  106 +
 .../LoopCanBeConvertedToQueryIssueTests.cs    |  562 ++
 .../MemberCanBeMadeStaticIssueTests.cs        |  340 +
 ...mberHidesStaticFromOuterClassIssueTests.cs |   71 +
 .../MethodNeverReturnsIssueTests.cs           |  105 -
 ...OverloadWithOptionalParameterIssueTests.cs |  125 +
 ...InterfaceMemberImplementationIssueTests.cs |  193 +
 .../MissingStringComparisonIssueTests.cs      |   93 -
 .../MultipleEnumerationIssueTests.cs          |  679 --
 .../NegativeRelationalExpressionIssueTests.cs |   15 +
 .../NoDefaultConstructorIssueTests.cs         |  169 -
 ...PublicMethodWithTestAttributeIssueTests.cs |  170 +
 ...NonReadonlyReferencedInGetHashCodeTests.cs |  219 +
 ...onReadonlyReferencedInGetHashCodeTetsts.cs |  185 +
 .../CodeIssues/NotResolvedInTextIssueTests.cs |  412 +
 .../ObjectCreationAsStatementIssueTests.cs    |   80 +
 .../OperatorIsCanBeUsedIssueTests.cs          |  252 +
 ...nalParameterHierarchyMismatchIssueTests.cs |  306 +
 .../OptionalParameterRefOutIssueTests.cs      |   86 +
 ...eterCanBeDeclaredWithBaseTypeIssueTests.cs | 1043 ++
 .../ParameterCanBeDemotedTests.cs             |  954 --
 .../ParameterHidesMemberIssueTests.cs         |   76 +
 .../CodeIssues/ParameterNotUsedIssueTests.cs  |  220 -
 ...rtOfBodyCanBeConvertedToQueryIssueTests.cs |  139 +
 ...alMethodParameterNameMismatchIssueTests.cs |   86 +
 .../PartialTypeWithSinglePartIssueTests.cs    |  167 +
 ...rphicFieldLikeEventInvocationIssueTests.cs |  112 +
 ...ibleAssignmentToReadonlyFieldIssueTests.cs |  197 +
 ...PossibleMistakenCallToGetTypeIssueTests.cs |   98 +
 .../PossibleMultipleEnumerationIssueTests.cs  |  733 ++
 .../ProhibitedModifiersIssueTests.cs          |  221 +
 ...blicConstructorInAbstractClassIssueTest.cs |    2 +
 ...dantAnonymousTypePropertyNameIssueTests.cs |   86 +
 ...RedundantArgumentDefaultValueIssueTests.cs |  218 +
 .../CodeIssues/RedundantArgumentNameTests.cs  |  274 +
 ...edundantArrayInitializerCommaIssueTests.cs |  110 -
 .../RedundantAssignmentIssueTests.cs          |   28 +
 ...RedundantAttributeParenthesesIssueTests.cs |   12 +
 .../RedundantBaseConstructorIssueTests.cs     |   21 +-
 .../CodeIssues/RedundantBaseQualifierTests.cs |  211 +
 .../RedundantBlockInDifferentBranchesTests.cs |  177 +
 .../RedundantBoolCompareIssueTests.cs         |  118 +
 .../RedundantCaseLabelIssueTests.cs           |   51 +
 .../CodeIssues/RedundantCastIssueTests.cs     |  323 +
 .../RedundantCatchClauseIssueTests.cs         |  335 +
 .../CSharp/CodeIssues/RedundantCatchTests.cs  |  296 -
 .../RedundantCheckBeforeAssignmentTests.cs    |  167 +
 ...undantCommaInArrayInitializerIssueTests.cs |  122 +
 .../RedundantComparisonWithNullIssueTests.cs  |  163 +
 .../CodeIssues/RedundantConstructorTests.cs   |   96 -
 ...undantDefaultFieldInitializerIssueTests.cs |  204 +
 .../RedundantDelegateCreationIssueTests.cs    |  130 +
 .../CodeIssues/RedundantElseIssueTests.cs     |  229 -
 ...ndantEmptyDefaultSwitchBranchIssueTests.cs |  110 +
 .../RedundantEmptyFinallyBlockIssueTests.cs   |  139 +
 .../RedundantEnumerableCastCallIssueTests.cs  |  197 +
 ...edundantExplicitArrayCreationIssueTests.cs |  103 +
 .../RedundantExplicitArraySizeIssueTests.cs   |  116 +
 ...ndantExplicitNullableCreationIssueTests.cs |  110 +
 .../RedundantExtendsListEntryIssueTests.cs    |  222 +
 .../RedundantFieldInitializerIssueTests.cs    |  182 -
 .../RedundantIfElseBlockIssueTests.cs         |  321 +
 .../RedundantInternalInspectorTests.cs        |   12 +
 .../RedundantLambdaParameterTypeTests.cs      |  216 +
 ...antLambdaSignatureParenthesesIssueTests.cs |  133 +
 ...lConditionalExpressionOperandIssueTests.cs |  169 +
 .../RedundantNameQualifierIssueTests.cs       |  114 +
 .../RedundantNamespaceUsageInspectorTests.cs  |   95 -
 ...tNotNullAttributeInNonNullableTypeTests.cs |  220 +
 .../CodeIssues/RedundantNullCheckTests.cs     |  142 -
 ...antObjectCreationArgumentListIssueTests.cs |   19 +
 ...ObjectOrCollectionInitializerIssueTests.cs |   16 +-
 .../RedundantOverridenMemberTests.cs          |  450 +
 .../CodeIssues/RedundantParamsIssueTests.cs   |  109 +
 .../RedundantPrivateInspectorTests.cs         |   17 +
 ...edundantStringToCharArrayCallIssueTests.cs |  137 +
 .../RedundantTernaryExpressionIssueTests.cs   |   73 +
 .../CodeIssues/RedundantThisInspectorTests.cs |   79 -
 .../RedundantThisQualifierIssueTests.cs       |  377 +
 ...RedundantToStringCallForValueTypesIssue.cs |  257 +
 .../RedundantToStringCallIssueTests.cs        |  285 +
 .../CodeIssues/RedundantToStringTests.cs      |  271 -
 ...edundantTypeArgumentsOfMethodIssueTests.cs |   96 +
 .../CodeIssues/RedundantTypeCastIssueTests.cs |  174 -
 .../RedundantUnsafeContextIssueTests.cs       |  140 +
 .../RedundantUsingDirectiveIssueTests.cs      |  274 +
 .../RedundantUsingInspectorTests.cs           |  156 -
 .../RedundantWhereWithPredicateIssueTests.cs  |   64 +-
 ...renceEqualsCalledWithValueTypeIssueTest.cs |   74 -
 .../ReferenceEqualsWithValueTypeIssueTests.cs |  107 +
 ...erenceToStaticMemberViaDerivedTypeTests.cs |  326 -
 .../RemoveRedundantOrStatementIssueTests.cs   |   99 +
 .../ReplaceWithFirstOrDefaultIssueTests.cs    |  111 +
 .../ReplaceWithLastOrDefaultIssueTests.cs     |  111 +
 .../ReplaceWithOfTypeAnyIssueTests.cs         |  114 +
 .../ReplaceWithOfTypeCountIssueTests.cs       |  113 +
 .../ReplaceWithOfTypeFirstIssueTests.cs       |  114 +
 ...placeWithOfTypeFirstOrDefaultIssueTests.cs |  114 +
 .../CodeIssues/ReplaceWithOfTypeIssueTests.cs |  221 +
 .../ReplaceWithOfTypeLastIssueTests.cs        |  114 +
 ...eplaceWithOfTypeLastOrDefaultIssueTests.cs |  114 +
 .../ReplaceWithOfTypeLongCountIssueTests.cs   |  114 +
 .../ReplaceWithOfTypeSingleIssueTests.cs      |  114 +
 ...laceWithOfTypeSingleOrDefaultIssueTests.cs |  114 +
 .../ReplaceWithOfTypeWhereIssueTests.cs       |   94 +
 .../ReplaceWithSimpleAssignmentIssueTests.cs  |   98 +
 .../ReplaceWithSingleCallToCountIssueTests.cs |   77 +
 .../ReplaceWithSingleCallToFirstIssueTests.cs |   77 +
 ...ithSingleCallToFirstOrDefaultIssueTests.cs |   77 +
 .../ReplaceWithSingleCallToLastIssueTests.cs  |   77 +
 ...WithSingleCallToLastOrDefaultIssueTests.cs |   77 +
 ...laceWithSingleCallToLongCountIssueTests.cs |   77 +
 ...ReplaceWithSingleCallToSingleIssueTests.cs |   77 +
 ...thSingleCallToSingleOrDefaultIssueTests.cs |   77 +
 ...eplaceWithStringIsNullOrEmptyIssueTests.cs |  586 ++
 .../RewriteIfReturnToReturnIssueTests.cs      |  134 +
 ...onditionExpressionInIfElseBranchesTests.cs |  223 +
 .../SealedMemberInSealedClassIssueTests.cs    |   89 +
 ...lifyAnonymousMethodToDelegateIssueTests.cs |  333 -
 ...yConditionalTernaryExpressionIssueTests.cs |  213 +
 .../SimplifyLinqExpressionIssueTests.cs       |  193 +
 .../StaticConstructorAccessModifierTest.cs    |   86 -
 .../StaticConstructorParameterIssueTests.cs   |   72 +
 .../StaticFieldInGenericTypeTests.cs          |   17 +
 ...tringCompareIsCultureSpecificIssueTests.cs |  242 +
 ...ingCompareToIsCultureSpecificIssueTests.cs |   88 +
 ...tringEndsWithIsCultureSpecificIssueTest.cs |   74 +
 ...StringIndexOfIsCultureSpecificIssueTest.cs |  110 +
 .../StringIsNullOrEmptyInspectorTests.cs      |  515 -
 ...ngLastIndexOfIsCultureSpecificIssueTest.cs |   75 +
 ...ingStartsWithIsCultureSpecificIssueTest.cs |   74 +
 .../SuggestUseVarKeywordEvidentTests.cs       |   72 +
 .../ThreadStaticAtInstanceFieldTests.cs       |  180 +
 .../ThreadStaticOnInstanceFieldTests.cs       |  102 -
 .../TypeParameterNotUsedIssueTests.cs         |   68 -
 .../UnassignedReadonlyFieldIssueTests.cs      |  125 +
 ...dSizeSpeicificationInArrayCreationTests.cs |  131 +
 .../CodeIssues/UnreachableCodeIssueTests.cs   |   94 +
 ...nusedAnonymousMethodSignatureIssueTests.cs |  140 +
 .../CodeIssues/UnusedLabelIssueTests.cs       |  103 +
 .../CodeIssues/UnusedParameterIssueTests.cs   |  234 +
 .../UnusedTypeParameterIssueTests.cs          |   68 +
 .../UseArrayCreationExpressionIssueTests.cs   |   95 +
 .../UseBlockInsteadColonIssueTests.cs         |   81 -
 .../CodeIssues/UseIsOperatorIssueTests.cs     |   98 +
 .../CodeIssues/UseMethodAnyIssueTests.cs      |  153 +
 .../UseMethodIsInstanceOfTypeIssueTests.cs    |   79 +
 .../UseOfMemberOfNullReferenceTests.cs        |  283 +
 .../CodeIssues/UseVarKeywordInspectorTests.cs |   54 -
 .../ValueParameterNotUsedIssueTests.cs        |  228 +
 .../CodeIssues/ValueParameterUnusedTests.cs   |  184 -
 .../CodeIssues/XmlDocIssueIssueTests.cs       |  157 +
 .../CSharp/InsertParenthesesVisitorTests.cs   |   16 +-
 .../CSharp/Parser/Bugs/ParserBugTests.cs      |  213 +-
 .../Expression/ArrayCreateExpressionTests.cs  |    7 +
 .../Expression/UndocumentedExpressionTests.cs |    4 +-
 .../GeneralScope/AttributeSectionTests.cs     |   19 +-
 .../Parser/GeneralScope/CommentTests.cs       |   21 +-
 .../PreprocessorDirectiveTests.cs             |  101 +-
 .../GeneralScope/TypeDeclarationTests.cs      |    2 +-
 .../GeneralScope/UsingDeclarationTests.cs     |    3 +-
 .../CSharp/Parser/ParseSelfTests.cs           |   13 +-
 .../CSharp/Parser/ParseUtil.cs                |   30 +-
 .../Parser/Statements/EmptyStatementTests.cs  |    2 +-
 .../Parser/Statements/GotoStatementTests.cs   |    6 +-
 .../Parser/Statements/LockStatementTests.cs   |    2 +-
 .../TypeMembers/DestructorDeclarationTests.cs |    2 +-
 .../CSharp/QueryExpressionExpanderTests.cs    |   17 +
 .../CSharp/Refactoring/LambdaHelperTests.cs   |   65 +
 .../Refactoring/RefactoringStructureTests.cs  |    2 +-
 .../CSharp/Resolver/BinaryOperatorTests.cs    |  182 +-
 .../CSharp/Resolver/CastTests.cs              |   95 +
 .../CSharp/Resolver/ConversionsTest.cs        |   80 +
 .../CSharp/Resolver/FindReferencesTest.cs     |   77 +-
 .../CSharp/Resolver/InvocationTests.cs        |  154 +
 .../CSharp/Resolver/LambdaTests.cs            |   58 +
 .../CSharp/Resolver/MemberLookupTests.cs      |   71 +-
 .../CSharp/Resolver/MethodTests.cs            |    4 +-
 .../CSharp/Resolver/NameLookupTests.cs        |   27 +-
 .../CSharp/Resolver/ObjectCreationTests.cs    |    9 +-
 .../Resolver/OverloadResolutionTests.cs       |   29 +-
 .../CSharp/Resolver/ResolveAtLocationTests.cs |   42 +
 .../CSharp/Resolver/ResolverTestBase.cs       |   11 +-
 .../CSharp/Resolver/TypeInferenceTests.cs     |   46 +
 .../CSharp/Resolver/UnaryOperatorTests.cs     |    2 +
 .../Documentation/CSharpDocumentationTests.cs |   13 +
 .../TestBlankLineFormatting.cs                |  260 +-
 .../FormattingTests/TestBraceStlye.cs         |   78 +-
 .../TestExpressionFormatting.cs               |  219 +-
 .../FormattingTests/TestFormattingBugs.cs     |   51 +
 .../TestGlobalLevelFormatting.cs              |  169 +
 .../FormattingTests/TestLinq.cs               |  253 +
 .../FormattingTests/TestSpacingVisitor.cs     |  461 +-
 .../TestStatementIndentation.cs               |  880 +-
 .../TestTypeLevelIndentation.cs               |  285 +-
 .../FormattingTests/TestWrapping.cs           |    8 +-
 .../FormattingTests/TextEditorTestAdapter.cs  |   44 +-
 .../ICSharpCode.NRefactory.Tests.csproj       | 1132 ++-
 .../IndentationTests/AlignmentTests.cs        |  674 ++
 .../IndentationTests/AllInOneTests.cs         |  122 +
 .../IndentationTests/BlockTest.cs             |  899 ++
 .../IndentationTests/CommentTests.cs          |  137 +
 .../IndentationTests/GeneralTests.cs          |   60 +
 .../IndentationTests/Helper.cs                |  147 +
 .../IndentationTests/IndentationTests.cs      |  205 -
 .../IndentationTests/PreProcessorTests.cs     |  355 +
 .../IndentationTests/StringTests.cs           |  173 +
 .../TestFiles/CSharpParser.cs                 | 4073 ++++++++
 .../IndentationTests/TestFiles/Comments.cs    |   50 +
 .../TestFiles/IndentEngine.cs                 |  332 +
 .../IndentationTests/TestFiles/IndentState.cs | 1687 ++++
 .../TestFiles/InheritStatements.cs            |   59 +
 .../TestFiles/PreProcessorDirectives.cs       |   61 +
 .../IndentationTests/TestFiles/Simple.cs      |   12 +
 .../IndentationTests/TestFiles/Strings.cs     |   28 +
 .../IndentationTests/TestFiles/SwitchCase.cs  |   34 +
 .../IndentationTests/TestFiles/TextArea.cs    | 3283 +++++++
 .../TextPasteIndentEngineTests.cs             |  297 +
 .../TypeSystem/BinaryLoaderTests.cs           |  306 +
 .../TypeSystem/CecilLoaderTests.cs            |  279 +-
 .../TypeSystem/GetMembersTests.cs             |    2 +-
 .../TypeSystem/IkvmLoaderTests.cs             |   61 +
 .../TypeSystem/InheritanceHelperTests.cs      |   78 +
 .../TypeSystem/SerializedIkvmLoaderTests.cs   |   44 +
 .../TypeSystem/TypeSystemTests.TestCase.cs    |  225 +-
 .../TypeSystem/TypeSystemTests.cs             |  119 +-
 .../AssemblyInfo.cs                           |   35 -
 .../General/UnitTest.cs                       |  102 -
 .../ICSharpCode.NRefactory.VB.Tests.csproj    |  103 -
 .../Lexer/CustomLexerTests.cs                 |  118 -
 .../Lexer/ImplicitLineContinuationTests.cs    |  230 -
 .../Lexer/LATextReaderTests.cs                |   35 -
 .../Lexer/LexerContextTests.cs                |  574 --
 .../Lexer/LexerPositionTests.cs               |   87 -
 .../Lexer/LexerTests.cs                       | 1538 ---
 .../Lexer/LiteralsTests.cs                    |  194 -
 .../Lexer/TokenTests.cs                       |   23 -
 .../Lexer/XmlModeLexerTests.cs                |  993 --
 .../CodeDOMParenthesizedExpressionTest.cs     |   22 -
 .../CodeDOM/CodeDOMPrimitiveExpressionTest.cs |   23 -
 .../CodeDOM/CodeDOMTypeReferenceTest.cs       |   30 -
 .../CodeDOM/InvocationExpressionTest.cs       |   59 -
 .../Output/SpecialOutputVisitorTest.cs        |   79 -
 .../Output/VBNet/VBNetOutputTest.cs           |  670 --
 .../Expressions/AddressOfExpressionTests.cs   |   45 -
 .../Expressions/ArrayCreateExpressionTests.cs |   36 -
 .../Expressions/AssignmentExpressionTests.cs  |   73 -
 .../BaseReferenceExpressionTests.cs           |   24 -
 .../BinaryOperatorExpressionTests.cs          |  268 -
 .../Parser/Expressions/CastExpressionTests.cs |  181 -
 .../ClassReferenceExpressionTests.cs          |   24 -
 .../Expressions/ConditionalExpressionTests.cs |   29 -
 .../GlobalReferenceExpressionTests.cs         |   32 -
 .../Expressions/IdentifierExpressionTests.cs  |   40 -
 .../Expressions/InvocationExpressionTests.cs  |  116 -
 .../Expressions/LambdaExpressionTests.cs      |  137 -
 .../MemberReferenceExpressionTests.cs         |   82 -
 .../ObjectCreateExpressionTests.cs            |  114 -
 .../ParenthesizedExpressionTest.cs            |   26 -
 .../Expressions/PrimitiveExpressionTests.cs   |   23 -
 .../Expressions/QueryExpressionTests.cs       |  635 --
 .../ThisReferenceExpressionTests.cs           |   23 -
 .../Expressions/TypeOfExpressionTests.cs      |   87 -
 .../Expressions/TypeOfIsExpressionTests.cs    |   34 -
 .../TypeReferenceExpressionTests.cs           |   47 -
 .../UnaryOperatorExpressionTests.cs           |   61 -
 .../Parser/Expressions/XmlExpressionTests.cs  |  255 -
 .../XmlMemberAccessExpressionTests.cs         |  101 -
 .../GlobalScope/AttributeSectionTests.cs      |   74 -
 .../GlobalScope/ImportsStatementTests.cs      |  168 -
 .../GlobalScope/NamespaceDeclarationTests.cs  |   43 -
 .../GlobalScope/OptionStatementTests.cs       |  113 -
 .../GlobalScope/TypeDeclarationTests.cs       |  203 -
 .../Parser/ParseUtil.cs                       |  108 -
 .../Parser/SnippetParserTests.cs              |   22 -
 .../Statements/AddHandlerStatementTests.cs    |   22 -
 .../Parser/Statements/BlockStatementTests.cs  |   17 -
 .../Statements/ContinueStatementTests.cs      |   17 -
 .../Parser/Statements/DoLoopStatementTests.cs |   17 -
 .../Parser/Statements/EndStatementTests.cs    |   29 -
 .../Parser/Statements/EraseStatementTests.cs  |   23 -
 .../Parser/Statements/ErrorStatementTests.cs  |   23 -
 .../Statements/ExpressionStatementTests.cs    |   17 -
 .../Statements/ForNextStatementTests.cs       |   29 -
 .../Statements/ForeachStatementTests.cs       |   25 -
 .../Parser/Statements/GotoStatementTests.cs   |   24 -
 .../Parser/Statements/IfElseStatementTests.cs |  142 -
 .../Parser/Statements/LabelStatementTests.cs  |   26 -
 .../LocalVariableDeclarationTests.cs          |  204 -
 .../Parser/Statements/LockStatementTests.cs   |   17 -
 .../Parser/Statements/OnErrorStatementTest.cs |   23 -
 .../Statements/RaiseEventStatementTest.cs     |   23 -
 .../Parser/Statements/ReDimStatementTests.cs  |   77 -
 .../Statements/RemoveHandlerStatement.cs      |   23 -
 .../Parser/Statements/ResumeStatement.cs      |   23 -
 .../Parser/Statements/ReturnStatementTests.cs |   32 -
 .../Parser/Statements/StopStatementTests.cs   |   23 -
 .../Parser/Statements/SwitchStatementTests.cs |   34 -
 .../Parser/Statements/ThrowStatementTests.cs  |   17 -
 .../Statements/TryCatchStatementTests.cs      |   17 -
 .../Parser/Statements/UsingStatementTests.cs  |   47 -
 .../Parser/Statements/WithStatementTests.cs   |   23 -
 .../TypeLevel/ConstructorDeclarationTests.cs  |   34 -
 .../Parser/TypeLevel/CustomEventTests.cs      |   44 -
 .../TypeLevel/DeclareDeclarationTests.cs      |   28 -
 .../Parser/TypeLevel/EventDeclarationTests.cs |   25 -
 .../Parser/TypeLevel/FieldDeclarationTests.cs |   74 -
 .../TypeLevel/MethodDeclarationTests.cs       |  199 -
 .../TypeLevel/OperatorDeclarationTests.cs     |   30 -
 .../TypeLevel/PropertyDeclarationTests.cs     |  107 -
 .../ICSharpCode.NRefactory.VB/Ast/AstNode.cs  |  559 --
 .../Ast/AstNodeCollection.cs                  |  198 -
 .../ICSharpCode.NRefactory.VB/Ast/Comment.cs  |   67 -
 .../ICSharpCode.NRefactory.VB/Ast/Enums.cs    |  154 -
 .../AnonymousObjectCreationExpression.cs      |   41 -
 .../Ast/Expressions/ArrayCreateExpression.cs  |   64 -
 .../Expressions/ArrayInitializerExpression.cs |   53 -
 .../Ast/Expressions/AssignmentExpression.cs   |   44 -
 .../Expressions/BinaryOperatorExpression.cs   |  110 -
 .../Ast/Expressions/CastExpression.cs         |   95 -
 .../CollectionRangeVariableDeclaration.cs     |   42 -
 .../Ast/Expressions/ConditionalExpression.cs  |   44 -
 .../Ast/Expressions/EmptyExpression.cs        |   59 -
 .../Ast/Expressions/Expression.cs             |  107 -
 .../Expressions/FieldInitializerExpression.cs |   49 -
 .../Ast/Expressions/GetTypeExpression.cs      |   31 -
 .../Expressions/GetXmlNamespaceExpression.cs  |   32 -
 .../Ast/Expressions/IdentifierExpression.cs   |   39 -
 .../Ast/Expressions/InstanceExpression.cs     |   61 -
 .../Ast/Expressions/InvocationExpression.cs   |   52 -
 .../Ast/Expressions/LambdaExpression.cs       |  124 -
 .../Ast/Expressions/MemberAccessExpression.cs |   42 -
 .../Expressions/NamedArgumentExpression.cs    |   39 -
 .../Expressions/ObjectCreationExpression.cs   |   59 -
 .../Expressions/ParenthesizedExpression.cs    |   34 -
 .../Ast/Expressions/PrimitiveExpression.cs    |   75 -
 .../Ast/Expressions/QueryExpression.cs        |  348 -
 .../Ast/Expressions/SimpleNameExpression.cs   |   32 -
 .../Ast/Expressions/TypeOfIsExpression.cs     |   37 -
 .../Expressions/TypeReferenceExpression.cs    |   39 -
 .../Expressions/UnaryOperatorExpression.cs    |   80 -
 .../Ast/Expressions/VariableInitializer.cs    |   46 -
 .../Ast/Expressions/XmlIdentifier.cs          |   72 -
 .../Ast/Expressions/XmlLiteralString.cs       |   69 -
 .../Ast/General/Attribute.cs                  |   96 -
 .../Ast/General/AttributeBlock.cs             |   36 -
 .../Ast/General/AttributedNode.cs             |   67 -
 .../Ast/General/CompilationUnit.cs            |   81 -
 .../Ast/General/EventMemberSpecifier.cs       |   39 -
 .../Ast/General/InterfaceMemberSpecifier.cs   |   47 -
 .../Ast/General/ParameterDeclaration.cs       |   40 -
 .../Ast/General/TypeParameterDeclaration.cs   |   46 -
 .../Ast/Generated.cs                          | 4866 ----------
 .../Ast/GlobalScope/DelegateDeclaration.cs    |   52 -
 .../Ast/GlobalScope/EnumDeclaration.cs        |   44 -
 .../Ast/GlobalScope/EnumMemberDeclaration.cs  |   39 -
 .../Ast/GlobalScope/ImportsClause.cs          |  113 -
 .../Ast/GlobalScope/ImportsStatement.cs       |   36 -
 .../Ast/GlobalScope/NamespaceDeclaration.cs   |   78 -
 .../Ast/GlobalScope/OptionStatement.cs        |   60 -
 .../Ast/GlobalScope/TypeDeclaration.cs        |   67 -
 .../Ast/INullable.cs                          |   12 -
 .../Ast/Identifier.cs                         |   96 -
 .../Ast/Statements/BlockStatement.cs          |  123 -
 .../Ast/Statements/ContinueStatement.cs       |   50 -
 .../Ast/Statements/DoLoopStatement.cs         |   33 -
 .../Ast/Statements/ExitStatement.cs           |   55 -
 .../Ast/Statements/ExpressionStatement.cs     |   40 -
 .../Ast/Statements/ForEachStatement.cs        |   38 -
 .../Ast/Statements/ForStatement.cs            |   45 -
 .../Ast/Statements/GoToStatement.cs           |   27 -
 .../Ast/Statements/IfElseStatement.cs         |   39 -
 .../Statements/LabelDeclarationStatement.cs   |   35 -
 .../Statements/LocalDeclarationStatement.cs   |   37 -
 .../Ast/Statements/ReturnStatement.cs         |   43 -
 .../Ast/Statements/SelectStatement.cs         |  147 -
 .../Ast/Statements/Statement.cs               |  132 -
 .../Ast/Statements/SyncLockStatement.cs       |   36 -
 .../Ast/Statements/ThrowStatement.cs          |   43 -
 .../Ast/Statements/TryStatement.cs            |   67 -
 .../Ast/Statements/UsingStatement.cs          |   33 -
 .../Ast/Statements/WhileStatement.cs          |   31 -
 .../Ast/Statements/WithStatement.cs           |   36 -
 .../Ast/Statements/YieldStatement.cs          |   44 -
 .../Ast/TypeMembers/Accessor.cs               |   49 -
 .../Ast/TypeMembers/ConstructorDeclaration.cs |   45 -
 .../Ast/TypeMembers/EventDeclaration.cs       |   59 -
 .../TypeMembers/ExternalMethodDeclaration.cs  |   71 -
 .../Ast/TypeMembers/FieldDeclaration.cs       |   81 -
 .../Ast/TypeMembers/MethodDeclaration.cs      |   72 -
 .../Ast/TypeMembers/OperatorDeclaration.cs    |   83 -
 .../Ast/TypeMembers/PropertyDeclaration.cs    |   57 -
 .../Ast/TypeMembers/VariableDeclarator.cs     |   63 -
 .../Ast/TypeName/AstType.cs                   |  163 -
 .../Ast/TypeName/ComposedType.cs              |  119 -
 .../Ast/TypeName/PrimitiveType.cs             |   57 -
 .../Ast/TypeName/QualifiedType.cs             |   66 -
 .../Ast/TypeName/SimpleType.cs                |   87 -
 .../Ast/VBModifierToken.cs                    |  151 -
 .../Ast/VBTokenNode.cs                        |   87 -
 .../ICSharpCode.NRefactory.VB/IAstVisitor.cs  |  135 -
 .../ICSharpCode.NRefactory.VB.csproj          |  222 -
 .../ICSharpCode.NRefactory.VB/Lexer/Block.cs  |   57 -
 .../Lexer/ExpressionFinder.atg                | 1375 ---
 .../Lexer/ExpressionFinder.cs                 |  154 -
 .../Lexer/ExpressionFinderState.cs            |   22 -
 .../Lexer/Extensions.cs                       |   22 -
 .../Lexer/KeywordList.txt                     |  284 -
 .../Lexer/Keywords.cs                         |  215 -
 .../Lexer/LATextReader.cs                     |   52 -
 .../Lexer/LookupTable.cs                      |  116 -
 .../ICSharpCode.NRefactory.VB/Lexer/Parser.cs | 8631 -----------------
 .../Lexer/PushParser.frame                    |  100 -
 .../Lexer/SavepointEventArgs.cs               |   20 -
 .../Lexer/Special/BlankLine.cs                |   19 -
 .../Lexer/Special/Comment.cs                  |   59 -
 .../Lexer/Special/CommentType.cs              |   14 -
 .../Lexer/Special/ISpecial.cs                 |   52 -
 .../Lexer/Special/PreProcessingDirective.cs   |  156 -
 .../Lexer/Special/SpecialTracker.cs           |   71 -
 .../Lexer/Special/TagComment.cs               |   29 -
 .../ICSharpCode.NRefactory.VB/Lexer/Token.cs  |   93 -
 .../ICSharpCode.NRefactory.VB/Lexer/Tokens.cs |  527 -
 .../Lexer/VBLexer.cs                          | 1487 ---
 .../Lexer/VBLexerMemento.cs                   |   22 -
 .../Lexer/XmlModeInfo.cs                      |   29 -
 .../OutputVisitor/IOutputFormatter.cs         |   44 -
 .../OutputVisitor/OutputVisitor.cs            | 2659 -----
 .../TextWriterOutputFormatter.cs              |  101 -
 .../OutputVisitor/VBFormattingOptions.cs      |   17 -
 .../Parser/Errors.cs                          |   50 -
 .../Parser/Parser.cs                          |  760 --
 .../Parser/Parser.frame                       |  119 -
 .../Parser/VBParser.cs                        |  436 -
 .../ICSharpCode.NRefactory.VB/Parser/vb.atg   |  460 -
 .../PrettyPrinter/AbstractOutputFormatter.cs  |  228 -
 .../AbstractPrettyPrintOptions.cs             |   42 -
 .../PrettyPrinter/IOutputAstVisitor.cs        |   50 -
 .../PrettyPrinter/SpecialNodesInserter.cs     |  142 -
 .../VBNet/VBNetOutputFormatter.cs             |   73 -
 .../PrettyPrinter/VBNet/VBNetOutputVisitor.cs | 3023 ------
 .../VBNet/VBNetPrettyPrintOptions.cs          |   18 -
 .../Properties/AssemblyInfo.cs                |   13 -
 .../ICSharpCode.NRefactory.VB/VBParser.cs     |   55 -
 .../Visitors/CSharpToVBConverterVisitor.cs    | 2247 -----
 .../DocumentationElement.cs                   |    4 +
 .../ICSharpCode.NRefactory.Xml.csproj         |  232 +-
 .../Analysis/SymbolCollector.cs               |   33 +-
 .../Completion/DisplayFlags.cs                |    4 +-
 .../Completion/FrameworkLookup.cs             |  490 +
 .../Editor/ITextPasteHandler.cs               |   51 +
 .../Editor/UnicodeNewline.cs                  |  358 +
 .../ICSharpCode.NRefactory/IAnnotatable.cs    |    4 +-
 .../ICSharpCode.NRefactory.csproj             |  611 +-
 .../PatternMatching/AnyNode.cs                |    1 +
 .../PatternMatching/AnyNodeOrNull.cs          |   58 +
 .../PatternMatching/Backreference.cs          |    5 +-
 .../PatternMatching/BacktrackingInfo.cs       |    1 +
 .../PatternMatching/Match.cs                  |    7 +
 .../Properties/AssemblyInfo.cs                |    4 +
 .../Properties/GlobalAssemblyInfo.cs          |    2 +-
 .../Refactoring/IssueMarker.cs                |    7 +-
 .../Semantics/ConversionResolveResult.cs      |    2 +-
 .../Semantics/MemberResolveResult.cs          |   17 +-
 .../TypeSystem/AssemblyLoader.cs              |   94 +
 .../TypeSystem/CecilLoader.cs                 | 2381 -----
 .../TypeSystem/IField.cs                      |   15 +-
 .../TypeSystem/IParameter.cs                  |    6 +
 .../TypeSystem/IkvmLoader.cs                  | 2113 ----
 .../AbstractUnresolvedEntity.cs               |    1 +
 .../TypeSystem/Implementation/BlobReader.cs   |  387 +
 .../Implementation/DefaultParameter.cs        |    8 +-
 .../Implementation/DefaultResolvedField.cs    |    6 +-
 .../DefaultResolvedTypeDefinition.cs          |   23 +-
 .../Implementation/DefaultUnresolvedField.cs  |   10 +-
 .../DefaultUnresolvedParameter.cs             |   23 +-
 .../Implementation/DefaultVariable.cs         |   77 +
 .../Implementation/ResolvedAttributeBlob.cs   |  164 +
 .../Implementation/SpecializedField.cs        |    6 +-
 .../Implementation/SpecializedMember.cs       |   75 +-
 .../SpecializingMemberReference.cs            |    2 +
 .../Implementation/UnresolvedAttributeBlob.cs |   78 +
 .../UnresolvedSecurityDeclarationBlob.cs      |  152 +
 .../TypeSystem/KnownTypeReference.cs          |    8 +
 .../TypeSystem/ParameterListComparer.cs       |   31 +-
 .../TypeSystem/TypeSystemExtensions.cs        |   71 +
 .../Utils/ComparableList.cs                   |  166 +
 .../Utils/ExtensionMethods.cs                 |    2 +-
 src/Libraries/NRefactory/NRefactory.sln       |  478 +-
 .../Packages/ICSharpCode.NRefactory.nuspec    |    4 +
 src/Libraries/NRefactory/README               |    4 +-
 src/Main/Base/Project/Editor/ITextMarker.cs   |    4 +
 .../Project/ICSharpCode.SharpDevelop.csproj   |    4 +
 .../ICSharpCode.SharpDevelop.Tests.csproj     |    4 +
 src/Main/SharpDevelop/SharpDevelop.csproj     |    8 +
 .../Workbench/WorkbenchStartup.cs             |    3 +
 src/Setup/Files.wxs                           |  536 +-
 src/Setup/Setup.wxs                           |    2 +
 1350 files changed, 133561 insertions(+), 91603 deletions(-)
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AbstractAndVirtualConversionAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddAnotherAccessorAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddArgumentNameAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddBracesAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddCatchTypeAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddExceptionDescriptionAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddOptionalParameterToInvocationAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddUsingAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AutoLinqSumAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CS1520MethodMustHaveAReturnTypeAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ChangeAccessModifierAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CheckIfParameterIsNullAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ComputeConstantValueAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertAnonymousDelegateToLambdaAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertAsToCastAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertAssignmentToIfAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertBitwiseFlagComparisonToHasFlagsAction.cs
 rename src/Libraries/NRefactory/{ICSharpCode.NRefactory.CSharp/Refactoring => ICSharpCode.NRefactory.CSharp.Refactoring}/CodeActions/ConvertCastToAsAction.cs (100%)
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertDecToHexAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertDoWhileToWhileLoopAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertEqualityOperatorToEqualsAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertEqualsToEqualityOperatorAction.cs
 rename src/Libraries/NRefactory/{ICSharpCode.NRefactory.CSharp/Refactoring => ICSharpCode.NRefactory.CSharp.Refactoring}/CodeActions/ConvertExplicitToImplicitImplementationAction.cs (100%)
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertForToWhileAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertForeachToForAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertHasFlagsToBitwiseFlagComparisonAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertHexToDecAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertIfStatementToConditionalTernaryExpressionAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertIfStatementToNullCoalescingExpressionAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertIfStatementToReturnStatementAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertIfStatementToSwitchStatementAction.cs
 rename src/Libraries/NRefactory/{ICSharpCode.NRefactory.CSharp/Refactoring => ICSharpCode.NRefactory.CSharp.Refactoring}/CodeActions/ConvertImplicitToExplicitImplementationAction.cs (100%)
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertLambdaBodyExpressionToStatementAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertLambdaBodyStatementToExpressionAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertLambdaToAnonymousDelegateAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertMethodGroupToAnonymousMethodAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertMethodGroupToLambdaAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertMultiplyToShiftAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertNullCoalescingToConditionalExpressionAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertReturnStatementToIfAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertShiftToMultiplyAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertSwitchToIfAction.cs
 rename src/Libraries/NRefactory/{ICSharpCode.NRefactory.CSharp/Refactoring => ICSharpCode.NRefactory.CSharp.Refactoring}/CodeActions/ConvertToInitializer/AccessPath.cs (100%)
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertToInitializer/ConvertInitializerToExplicitInitializationsAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertToInitializer/ConvertToInitializerAction.cs
 rename src/Libraries/NRefactory/{ICSharpCode.NRefactory.CSharp/Refactoring => ICSharpCode.NRefactory.CSharp.Refactoring}/CodeActions/ConvertToInitializer/StatementsToInitializerConverter.cs (100%)
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertWhileToDoWhileLoopAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CopyCommentsFromBase.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CopyCommentsFromInterface.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateBackingStoreAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateChangedEventAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateClassDeclarationAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateConstructorDeclarationAction.cs
 rename src/Libraries/NRefactory/{ICSharpCode.NRefactory.CSharp/Refactoring => ICSharpCode.NRefactory.CSharp.Refactoring}/CodeActions/CreateCustomEventImplementationAction.cs (100%)
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateDelegateAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateEnumValue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateEventInvocatorAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateFieldAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateIndexerAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateLocalVariableAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateMethodDeclarationAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateOverloadWithoutParameterAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreatePropertyAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/DeclareLocalVariableAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtensionMethodInvocationToStaticMethodInvocationAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractAnonymousMethodAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractFieldAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractMethod/ExtractMethodAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractMethod/StaticVisitor.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractMethod/VariableLookupVisitor.cs
 rename src/Libraries/NRefactory/{ICSharpCode.NRefactory.CSharp/Refactoring => ICSharpCode.NRefactory.CSharp.Refactoring}/CodeActions/ExtractMethod/VariableUsageAnalyzation.cs (100%)
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractWhileConditionToInternalIfStatementAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/FlipEqualsTargetAndArgumentAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/FlipOperatorArgumentsAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/GenerateGetterAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/GeneratePropertyAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/GenerateSwitchLabelsAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ImplementAbstractMembersAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ImplementInterfaceAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ImplementInterfaceExplicitAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ImplementNotImplementedProperty.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InlineLocalVariableAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InsertAnonymousMethodSignatureAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/IntroduceConstantAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/IntroduceFormatItemAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InvertConditionalOperatorAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InvertIfAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InvertIfAndSimplify.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InvertLogicalExpressionAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/IterateViaForeachAction.cs
 rename src/Libraries/NRefactory/{ICSharpCode.NRefactory.CSharp/Refactoring => ICSharpCode.NRefactory.CSharp.Refactoring}/CodeActions/JoinDeclarationAndAssignmentAction.cs (100%)
 rename src/Libraries/NRefactory/{ICSharpCode.NRefactory.CSharp/Refactoring => ICSharpCode.NRefactory.CSharp.Refactoring}/CodeActions/JoinStringAction.cs (100%)
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/LinqFluentToQueryAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/LinqQueryToFluentAction.cs
 rename src/Libraries/NRefactory/{ICSharpCode.NRefactory.CSharp/Refactoring => ICSharpCode.NRefactory.CSharp.Refactoring}/CodeActions/MergeNestedIfAction.cs (100%)
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/MoveToOuterScopeAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/NegateIsExpressionAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/NegateRelationalExpressionAction.cs
 rename src/Libraries/NRefactory/{ICSharpCode.NRefactory.CSharp/Refactoring => ICSharpCode.NRefactory.CSharp.Refactoring}/CodeActions/PutInsideUsingAction.cs (100%)
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/RemoveBackingStoreAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/RemoveBracesAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/RemoveRedundantCatchTypeAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/RemoveRegionAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplaceAssignmentWithPostfixExpressionAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplaceEmptyStringAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplaceOperatorAssignmentWithAssignmentAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplacePostfixExpressionWithAssignmentAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplaceWithOperatorAssignmentAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReverseDirectionForForLoopAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SimplifyIfFlowAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SimplifyIfInLoopsFlowAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SortUsingsAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SpecializedCodeAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SplitDeclarationAndAssignmentAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SplitDeclarationListAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SplitIfAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SplitStringAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/UseAsAndNullCheckAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/UseExplicitTypeAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/UseStringFormatAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/UseVarKeywordAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/AdditionalOfTypeIssues.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/BaseMethodParameterNameMismatchIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0029InvalidConversionIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0126ReturnMustBeFollowedByAnyExpression.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0127ReturnMustNotBeFollowedByAnyExpression.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0152DuplicateCaseLabelValueIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0759RedundantPartialMethodIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/MissingInterfaceMemberImplementationIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/StaticConstructorParameterIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/ConvertIfToAndExpressionIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/LockThisIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/MixedUseOfFieldsAndGettersIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/NegativeRelationalExpressionIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/NotImplementedExceptionIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/RedundantInternalIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/RedundantPrivateIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/XmlDocIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/GatherVisitorBase.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/IssueCategories.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/AccessToClosureIssues/AccessToClosureIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/AccessToClosureIssues/AccessToDisposedClosureIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/AccessToClosureIssues/AccessToModifiedClosureIssue.cs
 rename src/Libraries/NRefactory/{ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues => ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking}/AccessToClosureIssues/LocalVariableNamePicker.cs (100%)
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/DuplicateBodyMethodIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/DuplicateExpressionsInConditionsIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/DuplicateIfInIfChainIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/ParameterCanBeIEnumerableIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/VariableDeclaredInWideScopeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/RefactoringExtensions.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/BaseMethodCallWithDefaultParameterIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/BitwiseOperatorOnEnumWithoutFlagsIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/CanBeReplacedWithTryCastAndCheckForNullIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/CompareNonConstrainedGenericWithNullIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/CompareOfFloatsByEqualityOperatorIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ConditionalTernaryEqualBranchIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/DelegateSubtractionIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/DoNotCallOverridableMethodsInConstructorIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/EmptyGeneralCatchClauseIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/EqualExpressionComparisonIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/EventUnsubscriptionViaAnonymousDelegateIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ForControlVariableIsNeverModifiedIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/FormatStringProblemIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/FunctionNeverReturnsIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/LocalVariableHidesMemberIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/LongLiteralEndingLowerLIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/MemberHidesStaticFromOuterClassIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/MethodOverloadWithOptionalParameterIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/NonReadonlyReferencedInGetHashCodeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/NotResolvedInTextIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ObjectCreationAsStatementIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OperatorIsCanBeUsedIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OptionalParameterHierarchyMismatchIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OptionalParameterRefOutIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ParameterHidesMemberIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PartialMethodParameterNameMismatchIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PolymorphicFieldLikeEventInvocationIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PossibleAssignmentToReadonlyFieldIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PossibleMultipleEnumerationIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/StaticFieldInGenericTypeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ThreadStaticAtInstanceFieldIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ValueParameterNotUsedIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerErrors/ProhibitedModifiersIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerWarnings/CS0183ExpressionIsAlwaysOfProvidedTypeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerWarnings/CS1573ParameterHasNoMatchingParamTagIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerWarnings/CS1717AssignmentMadeToSameVariableIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerWarnings/UnassignedReadonlyFieldIssue.cs
 rename src/Libraries/NRefactory/{ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues => ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations}/InconsistentNamingIssue/AffectedEntity.cs (100%)
 rename src/Libraries/NRefactory/{ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues => ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations}/InconsistentNamingIssue/DefaultRules.cs (100%)
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/InconsistentNamingIssue.cs
 rename src/Libraries/NRefactory/{ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues => ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations}/InconsistentNamingIssue/NamingConventionService.cs (100%)
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/NamingRule.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/NamingStyle.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/NUnit/NonPublicMethodWithTestAttributeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertClosureToMethodGroupIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertConditionalTernaryToNullCoalescingIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertIfStatementToConditionalTernaryExpressionIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertIfStatementToNullCoalescingExpressionIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertIfStatementToSwitchStatementIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertNullableToShortFormIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertToAutoPropertyIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertToLambdaExpressionIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertToStaticTypeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ForCanBeConvertedToForeachIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/InvokeAsExtensionMethodIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/RewriteIfReturnToReturnIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/SuggestUseVarKeywordEvidentIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/AccessToStaticMemberViaDerivedTypeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/BaseMemberHasParamsIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ConvertIfDoToWhileIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ConvertIfToOrExpressionIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ConvertToConstantIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/EmptyEmbeddedStatementIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/FieldCanBeMadeReadOnlyIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/MemberCanBeMadeStaticIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ParameterCanBeDeclaredWithBaseTypeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/PossibleMistakenCallToGetTypeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/PublicConstructorInAbstractClass.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReferenceEqualsWithValueTypeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithFirstOrDefaultIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithLastOrDefaultIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeAny.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeCountIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeFirstIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeFirstOrDefaultIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeLastIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeLastOrDefaultIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeLongCountIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeSingleIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeSingleOrDefaultIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeWhereIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSimpleAssignmentIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToAnyIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToCountIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToFirstIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToFirstOrDefaultIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToLastIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToLastOrDefaultIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToLongCountIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToSingleIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToSingleOrDefaultIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithStringIsNullOrEmptyIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/SimplifyConditionalTernaryExpressionIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/SimplifyLinqExpressionIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringCompareIsCultureSpecificIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringCompareToIsCultureSpecificIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringEndsWithIsCultureSpecificIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringIndexOfIsCultureSpecificIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringLastIndexOfIsCultureSpecificIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringStartsWithIsCultureSpecificIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/UseArrayCreationExpressionIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/UseIsOperatorIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/UseMethodAnyIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/UseMethodIsInstanceOfTypeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/ArrayCreationCanBeReplacedWithArrayInitializerIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/ConditionIsAlwaysTrueOrFalseIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/ConstantNullCoalescingConditionIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/DoubleNegationOperatorIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/EmptyStatementIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/ForStatementConditionIsTrueIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantAnonymousTypePropertyNameIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantArgumentDefaultValueIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantArgumentNameIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantAttributeParenthesesIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantBaseQualifierIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantBoolCompareIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCaseLabelIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCastIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCatchClauseIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCheckBeforeAssignmentIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCommaInArrayInitializerIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantComparisonWithNullIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantDelegateCreationIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantEmptyDefaultSwitchBranchIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantEmptyFinallyBlockIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantEmptyObjectCreationArgumentListssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantEnumerableCastCallIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantExplicitArrayCreationIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantExplicitArraySizeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantExplicitNullableCreationIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantExtendsListEntryIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantIfElseBlockIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantLambdaParameterTypeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantLambdaSignatureParenthesesIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantLogicalConditionalExpressionOperandIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantNameQualifierIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantObjectOrCollectionInitializerIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantStringToCharArrayCallIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantTernaryExpressionIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantThisQualifierIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantToStringCallForValueTypesIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantToStringCallIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantUnsafeContextIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantUsingDirectiveIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RemoveRedundantOrStatementIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/UnusedAnonymousMethodSignatureIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/EmptyConstructorIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/EmptyDestructorIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/EmptyNamespaceIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/EnumUnderlyingTypeIsIntIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/LocalVariableNotUsedIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/PartialTypeWithSinglePartIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/RedundantBaseConstructorCallIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/RedundantDefaultFieldInitializerIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/RedundantOverridenMemberIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/RedundantParamsIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/SealedMemberInSealedClassIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/UnusedLabelIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/UnusedParameterIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/UnusedTypeParameterIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/TODO/ConvertTailRecursiveCallToLoopIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/TODO/LoopCanBeConvertedToQueryIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/TODO/PartOfBodyCanBeConvertedToQueryIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/TODO/RedundantTypeArgumentsOfMethodIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/AutoAsyncIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CallToObjectEqualsViaBaseIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CastExpressionOfIncompatibleTypeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CheckNamespaceIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CompilerErrors/CS0659OverrideEqualWithoutGetHashCode.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CompilerErrors/CS1729TypeHasNoConstructorWithNArgumentsIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ConstantConditionIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/DisposeMethodInNonIDisposableTypeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/DontUseLinqWhenItsVerboseAndInefficientIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/DuplicatedLinqToListOrArrayIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ExceptionRethrowIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ExplicitConversionInForEachIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ExpressionIsNeverOfProvidedTypeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/IncorrectCallToObjectGetHashCodeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/MethodOverloadHidesOptionalParameterIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/OptionalParameterCouldBeSkippedIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantAssignmentIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantBlockInDifferentBranchesIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantNotNullAttributeInNonNullableTypeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ResultOfAsyncCallShouldNotBeIgnoredIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/SameGuardConditionExpressionInIfelseBranchesIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UnmatchedSizeSpecificationInArrayCreationIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UnreachableCodeIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UseOfMemberOfNullReference.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/VariableOnlyAssignedIssues/ParameterOnlyAssignedIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/VariableOnlyAssignedIssues/VariableOnlyAssignedIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/ICSharpCode.NRefactory.CSharp.Refactoring.csproj
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/Properties/AssemblyInfo.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/AnnotationNames.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/DeclarationSpace/LocalDeclarationSpace.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceVisitor.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/NullValueAnalysis.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/NullValueStatus.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/CombineQueryExpressions.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/CSharpIndentEngine.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Query.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/CSharpIndentEngine.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/CacheIndentEngine.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/IDocumentIndentEngine.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/IStateMachineIndentEngine.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/IndentState.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/NullIStateMachineIndentEngine.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/TextPasteIndentEngine.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IntroduceQueryExpressions.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/PatternMatching/AnyType.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActionProvider.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/AddAnotherAccessorAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/AddCatchTypeAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/AddUsingAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CheckIfParameterIsNullAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertAnonymousDelegateToLambdaAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertAsToCastAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertConditionalToIfAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertDecToHexAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertForeachToForAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertHexToDecAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertIfToConditionalAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertIfToSwitchAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertLambdaBodyExpressionToStatementAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertLambdaBodyStatementToExpressionAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertLambdaToAnonymousDelegateAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertSwitchToIfAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertToInitializer/ConvertInitializerToExplicitInitializationsAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertToInitializer/ConvertToInitializerAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateBackingStoreAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateClassDeclarationAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateConstructorDeclarationAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateDelegateAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateEnumValue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateEventInvocatorAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateFieldAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateIndexerAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateLocalVariableAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateMethodDeclarationAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateOverloadWithoutParameterAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreatePropertyAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/DeclareLocalVariableAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtensionMethodInvocationToStaticMethodInvocationAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractAnonymousMethodAction.cs
 delete mode 100755 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractFieldAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/ExtractMethodAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/StaticVisitor.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/VariableLookupVisitor.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/FlipOperatorArgumentsAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/GenerateGetterAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/GeneratePropertyAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/GenerateSwitchLabelsAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ImplementAbstractMembersAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ImplementInterfaceAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ImplementInterfaceExplicitAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/InlineLocalVariableAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/InsertAnonymousMethodSignatureAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IntroduceConstantAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IntroduceFormatItemAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/InvertIfAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/InvertIfAndSimplify.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IterateViaForeachAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/MoveToOuterScopeAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/NegateRelationalExpressionAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveBackingStoreAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveBracesAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveRedundantCatchTypeAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveRegionAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ReplaceEmptyStringAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SimplifyIfFlowAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SimplifyIfInLoopsFlowAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SortUsingsAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SpecializedCodeAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SplitDeclarationAndAssignmentAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SplitDeclarationListAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SplitStringAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/StaticMethodInvocationToExtensionMethodInvocationAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseExplicitTypeAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseStringFormatAction.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseVarKeywordAction.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeGenerationService.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssueProvider.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AccessToClosureIssues/AccessToClosureIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AccessToClosureIssues/AccessToDisposedClosureIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AccessToClosureIssues/AccessToModifiedClosureIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AssignmentMadeToSameVariableIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/BitwiseOperationOnNonFlagsEnumIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CallToObjectEqualsViaBaseIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CallToVirtualFunctionFromConstructorIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CastExpressionOfIncompatibleTypeIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompareBooleanWithTrueOrFalseIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompareFloatWithEqualityOperatorIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompilerErrors/CS0029InvalidConversionIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompilerErrors/CS0127ReturnMustNotBeFollowedByAnyExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConditionalToNullCoalescingIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstantConditionIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstructorIssues/PublicConstructorInAbstractClass.cs
 delete mode 100755 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstructorIssues/RedudantConstructorIssue.cs
 delete mode 100755 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstructorIssues/StaticConstructorAccessModifierIssue.cs
 delete mode 100755 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstructorIssues/StaticConstructorParameterIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConvertToStaticMethodIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/DoubleNegationIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/DuplicateBodyMethodIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/DuplicateExpressionsInConditionsIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/DuplicateIfInIfChainIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExceptionRethrowIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExplicitConversionInForEachIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExpressionIsAlwaysOfProvidedTypeIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExpressionIsNeverOfProvidedTypeIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ForControlVariableNotModifiedIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/FormatStringIssues/FormatStringHelper.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/FormatStringIssues/FormatStringIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/GatherVisitorBase.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IdenticalConditionalBranchIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/InconsistentNamingIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/NamingRule.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/NamingStyle.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IncorrectCallToObjectGetHashCodeIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IncorrectExceptionParameterOrderingIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IssueCategories.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MethodNeverReturnsIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MethodOverloadHidesOptionalParameterIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MissingStringComparisonIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MultipleEnumerationIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NegativeRelationalExpressionIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NoDefaultConstructorIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NotImplementedExceptionIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/OptionalParameterCouldBeSkippedIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/HasMemberCriterion.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/ITypeCriterion.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/IsArrayTypeCriterion.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/IsTypeCriterion.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeDemotedIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeIEnumerableIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/SupportsIndexingCriterion.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/TypeCriteriaCollector.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantArrayInitializerCommaIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantAssignmentIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantAttributeParenthesesIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantBaseConstructorIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantCaseLabelIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantCatchIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantElseIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantFieldInitializerIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantInternalIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantNamespaceUsageIssue.cs
 delete mode 100755 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantNullCheckIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantObjectCreationArgumentListIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantObjectOrCollectionInitializerIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantPrivateIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantThisIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantToStringIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantTypeCastIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantUsingIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantWhereWithPredicateIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ReferenceEqualsCalledWithValueTypeIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ReferenceToStaticMemberViaDerivedTypeIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ResultOfAsyncCallShouldNotBeIgnoredIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/SimplifyAnonymousMethodToDelegateIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/StaticFieldInGenericTypeIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/StringIsNullOrEmptyIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ThreadStaticOnInstanceFieldIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/TypeParameterNotUsedIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/Uncategorized/.DS_Store
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UnreachableCodeIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseBlockInsteadColonIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseVarKeywordIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ValueParameterUnusedIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableDeclaredInWideScopeIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableHidesMemberIssue/LocalVariableHidesMemberIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableHidesMemberIssue/ParameterHidesMemberIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableHidesMemberIssue/VariableHidesMemberIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableNotUsedIssues/LocalVariableNotUsedIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableNotUsedIssues/ParameterNotUsedIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableOnlyAssignedIssues/ParameterOnlyAssignedIssue.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableOnlyAssignedIssues/VariableOnlyAssignedIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CommonSubIssues.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CreateChangedEvent.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/FormatStringHelper.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/ICodeActionProvider.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/ICodeIssueProvider.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/TypeGuessing.cs
 rename src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/{CodeIssues/InconsistentNamingIssue => }/WordParser.cs (100%)
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/CastResolveResult.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Cecil/CecilLoader.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Cecil/Properties/AssemblyInfo.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/ICSharpCode.NRefactory.IKVM.csproj
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/IkvmLoader.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/IntConstantValue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/NonFrozenInterningProvider.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/Properties/AssemblyInfo.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/ShortConstantValue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/StringConstantValue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/StructConstantValue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceVisitorTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Analysis/NullValueAnalysisTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AbstractAndVirtualConversionActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddArgumentNameTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddBracesActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddExceptionDescriptionActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddOptionalParameterToInvocationTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AutoLinqSumTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CS1520MethodMustHaveAReturnTypeTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ChangeAccessModifierTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ComputeConstantValueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertAssignmentToIfActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertBitwiseFlagComparisonToHasFlagsActionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertConditionalToIfTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertDoWhileToWhileLoopTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertEqualityOperatorToEqualsActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertEqualsToEqualityOperatorActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertForToWhileActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertHasFlagsToBitwiseFlagComparisonActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfStatementToConditionalTernaryExpressionActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfStatementToNullCoalescingExpressionActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfStatementToReturnStatementActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfStatementToSwitchStatementActionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfToConditionalTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfToSwtichTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertMethodGroupToAnonymousMethodActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertMethodGroupToLambdaActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertMultiplyToShiftActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertNullCoalescingToConditionalExpressionActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertReturnStatementToIfActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertShiftToMultiplyActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertWhileToDoWhileLoopTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CopyCommentsFromBaseTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CopyCommentsFromIntefaceTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ExtractWhileConditionToInternalIfStatementActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/FlipEqualsTargetAndArgumentActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ImplementNotImplementedPropertyTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/InvertConditionalOperatorActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/InvertLogicalExpressionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/LinqFluentToQueryTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/LinqQueryToFluentTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/MetaTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/NegateIsExpressionActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReplaceAssignmentWithPostfixExpressionActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReplaceOperatorAssignmentWithAssignmentActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReplacePostfixExpressionWithAssignmentActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReplaceWithOperatorAssignmentActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReverseDirectionForForLoopTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/SplitIfActionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/StaticMethodInvocationToExtensionMethodInvocationTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/UseAsAndNullCheckActionTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionOperatorTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeComplteionOperatorTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/FormatItemTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AccessToStaticMemberViaDerivedTypeIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AdditionalOfTypeIssuesTests.cs
 create mode 100755 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ArrayCreationCanBeReplacedWithArrayInitializerIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AssignmentMadeToSameVariableIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AutoAsyncTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BaseMemberHasParamsIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BaseMethodCallWithDefaultParameterIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BaseMethodParameterNameMismatchIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BitwiseOperationOnNonFlagsEnumIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BitwiseOperatorOnEnumWithoutFlagsIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0126ReturnMustBeFollowedByAnyExpressionTestes.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0152DuplicateCaseLabelValueIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0183ExpressionIsAlwaysOfProvidedTypeIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0659OverrideEqualsWithoutGetHashCodeTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0759RedundantPartialMethodIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS1573ParameterHasNoMatchingParamTagIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS1717AssignmentMadeToSameVariableIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS1729TypeHasNoConstructorWithNArgumentsIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CallToVirtualFunctionFromConstructorTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CanBeReplacedWithTryCastAndCheckForNullIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CheckNamespaceIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CompareBooleanWithTrueOrFalseIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CompareFloatWithEqualityOperatorIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CompareNonConstrainedGenericWithNullIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CompareOfFloatsByEqualityOperatorIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConditionIsAlwaysTrueOrFalseIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConditionalTernaryEqualBranchTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConditionalToNullCoalescingInspectorTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConstantNullCoalescingConditionIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertClosureToMethodGroupIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertConditionalTernaryToNullCoalescingIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfDoToWhileIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfStatementToConditionalTernaryExpressionIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfStatementToNullCoalescingExpressionIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfStatementToSwitchStatementIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfToAndExpressionIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfToOrExpressionIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertNullableToShortFormIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertTailRecursiveCallToLoopIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToAutoPropertyIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToConstantIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToLambdaExpressionIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToStaticMethodIssueTests.cs
 create mode 100755 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToStaticTypeTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DelegateSubtractionIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DisposeMethodInNonIDisposableTypeTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DoNotCallOverridableMethodsInConstructorIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DontUseLinqWhenItsVerboseAndInefficientTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DoubleNegationIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DoubleNegationOperatorIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DuplicatedLinqToListOrArrayTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyConstructorIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyDestructorTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyEmbeddedStatementIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyGeneralCatchClauseTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyNamespaceTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyStatementIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EnumUnderlyingTypeIsIntTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EqualExpressionComparisonIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EventUnsubscriptionViaAnonymousDelegateIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ExpressionIsAlwaysOfProvidedTypeIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/FieldCanBeMadeReadOnlyIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ForCanBeConvertedToForeachIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ForControlVariableIsNeverModifiedIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ForControlVariableNotModifiedIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ForStatementConditionIsTrueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/FormatStringIssues/FormatStringTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/FormatStringProblemIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/FunctionNeverReturnsIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/IdenticalConditionalBranchIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/IncorrectExceptionParameterOrderingTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/InvokeAsExtensionMethodIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/LockThisTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/LongLiteralEndingLowerLIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/LoopCanBeConvertedToQueryIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MemberCanBeMadeStaticIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MemberHidesStaticFromOuterClassIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MethodNeverReturnsIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MethodOverloadWithOptionalParameterIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MissingInterfaceMemberImplementationIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MissingStringComparisonIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MultipleEnumerationIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NoDefaultConstructorIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NonPublicMethodWithTestAttributeIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NonReadonlyReferencedInGetHashCodeTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NonReadonlyReferencedInGetHashCodeTetsts.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NotResolvedInTextIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ObjectCreationAsStatementIssueTests.cs
 create mode 100755 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/OperatorIsCanBeUsedIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/OptionalParameterHierarchyMismatchIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/OptionalParameterRefOutIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeDeclaredWithBaseTypeIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeDemotedTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ParameterNotUsedIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PartOfBodyCanBeConvertedToQueryIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PartialMethodParameterNameMismatchIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PartialTypeWithSinglePartIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PolymorphicFieldLikeEventInvocationIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PossibleAssignmentToReadonlyFieldIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PossibleMistakenCallToGetTypeIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PossibleMultipleEnumerationIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ProhibitedModifiersIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantAnonymousTypePropertyNameIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantArgumentDefaultValueIssueTests.cs
 create mode 100755 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantArgumentNameTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantArrayInitializerCommaIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantBaseQualifierTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantBlockInDifferentBranchesTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantBoolCompareIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCastIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCatchClauseIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCatchTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCheckBeforeAssignmentTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCommaInArrayInitializerIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantComparisonWithNullIssueTests.cs
 delete mode 100755 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantConstructorTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantDefaultFieldInitializerIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantDelegateCreationIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantElseIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantEmptyDefaultSwitchBranchIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantEmptyFinallyBlockIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantEnumerableCastCallIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantExplicitArrayCreationIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantExplicitArraySizeIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantExplicitNullableCreationIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantExtendsListEntryIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantFieldInitializerIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantIfElseBlockIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantLambdaParameterTypeTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantLambdaSignatureParenthesesIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantLogicalConditionalExpressionOperandIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantNameQualifierIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantNamespaceUsageInspectorTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantNotNullAttributeInNonNullableTypeTests.cs
 delete mode 100755 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantNullCheckTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantOverridenMemberTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantParamsIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantStringToCharArrayCallIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantTernaryExpressionIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantThisInspectorTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantThisQualifierIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantToStringCallForValueTypesIssue.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantToStringCallIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantToStringTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantTypeArgumentsOfMethodIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantTypeCastIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantUnsafeContextIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantUsingDirectiveIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantUsingInspectorTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReferenceEqualsCalledWithValueTypeIssueTest.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReferenceEqualsWithValueTypeIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReferenceToStaticMemberViaDerivedTypeTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RemoveRedundantOrStatementIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithFirstOrDefaultIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithLastOrDefaultIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeAnyIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeCountIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeFirstIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeFirstOrDefaultIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeLastIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeLastOrDefaultIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeLongCountIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeSingleIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeSingleOrDefaultIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeWhereIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSimpleAssignmentIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToCountIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToFirstIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToFirstOrDefaultIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToLastIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToLastOrDefaultIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToLongCountIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToSingleIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToSingleOrDefaultIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithStringIsNullOrEmptyIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RewriteIfReturnToReturnIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SameGuardConditionExpressionInIfElseBranchesTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SealedMemberInSealedClassIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SimplifyAnonymousMethodToDelegateIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SimplifyConditionalTernaryExpressionIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SimplifyLinqExpressionIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StaticConstructorAccessModifierTest.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StaticConstructorParameterIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringCompareIsCultureSpecificIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringCompareToIsCultureSpecificIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringEndsWithIsCultureSpecificIssueTest.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringIndexOfIsCultureSpecificIssueTest.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringIsNullOrEmptyInspectorTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringLastIndexOfIsCultureSpecificIssueTest.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringStartsWithIsCultureSpecificIssueTest.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SuggestUseVarKeywordEvidentTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ThreadStaticAtInstanceFieldTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ThreadStaticOnInstanceFieldTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/TypeParameterNotUsedIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnassignedReadonlyFieldIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnmatchedSizeSpeicificationInArrayCreationTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnusedAnonymousMethodSignatureIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnusedLabelIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnusedParameterIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnusedTypeParameterIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseArrayCreationExpressionIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseBlockInsteadColonIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseIsOperatorIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseMethodAnyIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseMethodIsInstanceOfTypeIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseOfMemberOfNullReferenceTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseVarKeywordInspectorTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ValueParameterNotUsedIssueTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ValueParameterUnusedTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/XmlDocIssueIssueTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Refactoring/LambdaHelperTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestGlobalLevelFormatting.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestLinq.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/AlignmentTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/AllInOneTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/BlockTest.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/CommentTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/GeneralTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/Helper.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/IndentationTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/PreProcessorTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/StringTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/CSharpParser.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/Comments.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/IndentEngine.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/IndentState.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/InheritStatements.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/PreProcessorDirectives.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/Simple.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/Strings.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/SwitchCase.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/TextArea.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TextPasteIndentEngineTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/BinaryLoaderTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/IkvmLoaderTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/InheritanceHelperTests.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/SerializedIkvmLoaderTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/AssemblyInfo.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/General/UnitTest.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/ICSharpCode.NRefactory.VB.Tests.csproj
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/CustomLexerTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/ImplicitLineContinuationTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LATextReaderTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LexerContextTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LexerPositionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LexerTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LiteralsTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/TokenTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/XmlModeLexerTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/CodeDOM/CodeDOMParenthesizedExpressionTest.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/CodeDOM/CodeDOMPrimitiveExpressionTest.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/CodeDOM/CodeDOMTypeReferenceTest.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/CodeDOM/InvocationExpressionTest.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/SpecialOutputVisitorTest.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/VBNet/VBNetOutputTest.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/AddressOfExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ArrayCreateExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/AssignmentExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/BaseReferenceExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/BinaryOperatorExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/CastExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ClassReferenceExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ConditionalExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/GlobalReferenceExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/IdentifierExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/InvocationExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/LambdaExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/MemberReferenceExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ObjectCreateExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ParenthesizedExpressionTest.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/PrimitiveExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/QueryExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ThisReferenceExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/TypeOfExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/TypeOfIsExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/TypeReferenceExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/UnaryOperatorExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/XmlExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/XmlMemberAccessExpressionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/AttributeSectionTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/ImportsStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/NamespaceDeclarationTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/OptionStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/TypeDeclarationTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/ParseUtil.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/SnippetParserTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/AddHandlerStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/BlockStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ContinueStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/DoLoopStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/EndStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/EraseStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ErrorStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ExpressionStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ForNextStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ForeachStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/GotoStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/IfElseStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/LabelStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/LocalVariableDeclarationTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/LockStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/OnErrorStatementTest.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/RaiseEventStatementTest.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ReDimStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/RemoveHandlerStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ResumeStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ReturnStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/StopStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/SwitchStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ThrowStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/TryCatchStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/UsingStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/WithStatementTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/ConstructorDeclarationTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/CustomEventTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/DeclareDeclarationTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/EventDeclarationTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/FieldDeclarationTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/MethodDeclarationTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/OperatorDeclarationTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/PropertyDeclarationTests.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/AstNode.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/AstNodeCollection.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Comment.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Enums.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/AnonymousObjectCreationExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ArrayCreateExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ArrayInitializerExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/AssignmentExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/BinaryOperatorExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/CastExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/CollectionRangeVariableDeclaration.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ConditionalExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/EmptyExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/Expression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/FieldInitializerExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/GetTypeExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/GetXmlNamespaceExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/IdentifierExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/InstanceExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/InvocationExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/LambdaExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/MemberAccessExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/NamedArgumentExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ObjectCreationExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ParenthesizedExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/PrimitiveExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/QueryExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/SimpleNameExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/TypeOfIsExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/TypeReferenceExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/UnaryOperatorExpression.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/VariableInitializer.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/XmlIdentifier.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/XmlLiteralString.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/Attribute.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/AttributeBlock.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/AttributedNode.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/CompilationUnit.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/EventMemberSpecifier.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/InterfaceMemberSpecifier.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/ParameterDeclaration.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/TypeParameterDeclaration.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Generated.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/DelegateDeclaration.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/EnumDeclaration.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/EnumMemberDeclaration.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/ImportsClause.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/ImportsStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/NamespaceDeclaration.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/OptionStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/TypeDeclaration.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/INullable.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Identifier.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/BlockStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ContinueStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/DoLoopStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ExitStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ExpressionStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ForEachStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ForStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/GoToStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/IfElseStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/LabelDeclarationStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/LocalDeclarationStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ReturnStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/SelectStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/Statement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/SyncLockStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ThrowStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/TryStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/UsingStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/WhileStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/WithStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/YieldStatement.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/Accessor.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/ConstructorDeclaration.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/EventDeclaration.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/ExternalMethodDeclaration.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/FieldDeclaration.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/MethodDeclaration.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/OperatorDeclaration.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/PropertyDeclaration.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/VariableDeclarator.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/AstType.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/ComposedType.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/PrimitiveType.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/QualifiedType.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/SimpleType.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/VBModifierToken.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/VBTokenNode.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/IAstVisitor.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/ICSharpCode.NRefactory.VB.csproj
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Block.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/ExpressionFinder.atg
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/ExpressionFinder.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/ExpressionFinderState.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Extensions.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/KeywordList.txt
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Keywords.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/LATextReader.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/LookupTable.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Parser.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/PushParser.frame
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/SavepointEventArgs.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/BlankLine.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/Comment.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/CommentType.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/ISpecial.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/PreProcessingDirective.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/SpecialTracker.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/TagComment.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Token.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Tokens.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/VBLexer.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/VBLexerMemento.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/XmlModeInfo.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/OutputVisitor/IOutputFormatter.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/OutputVisitor/OutputVisitor.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/OutputVisitor/TextWriterOutputFormatter.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/OutputVisitor/VBFormattingOptions.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/Errors.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/Parser.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/Parser.frame
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/VBParser.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/vb.atg
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/AbstractOutputFormatter.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/AbstractPrettyPrintOptions.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/IOutputAstVisitor.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/SpecialNodesInserter.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/VBNet/VBNetOutputFormatter.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/VBNet/VBNetOutputVisitor.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/VBNet/VBNetPrettyPrintOptions.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Properties/AssemblyInfo.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/VBParser.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory/Completion/FrameworkLookup.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory/Editor/ITextPasteHandler.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory/Editor/UnicodeNewline.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/AnyNodeOrNull.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/AssemblyLoader.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs
 delete mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IkvmLoader.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/BlobReader.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultVariable.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/ResolvedAttributeBlob.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/UnresolvedAttributeBlob.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/UnresolvedSecurityDeclarationBlob.cs
 create mode 100644 src/Libraries/NRefactory/ICSharpCode.NRefactory/Utils/ComparableList.cs

diff --git a/SharpDevelop.Tests.sln b/SharpDevelop.Tests.sln
index 8792c34bdf..410acb93af 100644
--- a/SharpDevelop.Tests.sln
+++ b/SharpDevelop.Tests.sln
@@ -43,6 +43,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Xml"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Tests", "src\Libraries\NRefactory\ICSharpCode.NRefactory.Tests\ICSharpCode.NRefactory.Tests.csproj", "{63D3B27A-D966-4902-90B3-30290E1692F1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Cecil", "src\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj", "{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSharp.Refactoring", "src\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory.CSharp.Refactoring.csproj", "{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDock", "src\Libraries\AvalonDock\AvalonDock\AvalonDock.csproj", "{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
@@ -305,6 +309,10 @@ Global
 		{63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
 		{63D3B27A-D966-4902-90B3-30290E1692F1}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
 		{63D3B27A-D966-4902-90B3-30290E1692F1}.Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
+		{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}.Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
+		{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
+		{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
+		{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}.Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
 		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -633,6 +641,10 @@ Global
 		{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -655,6 +667,8 @@ Global
 		{53DCA265-3C3C-42F9-B647-F72BA678122B} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
 		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
 		{63D3B27A-D966-4902-90B3-30290E1692F1} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
+		{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
 		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
 		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
 		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
diff --git a/SharpDevelop.sln b/SharpDevelop.sln
index 21fc3a5300..c088ef92dc 100644
--- a/SharpDevelop.sln
+++ b/SharpDevelop.sln
@@ -35,6 +35,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSha
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Xml", "src\Libraries\NRefactory\ICSharpCode.NRefactory.Xml\ICSharpCode.NRefactory.Xml.csproj", "{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Cecil", "src\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj", "{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSharp.Refactoring", "src\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory.CSharp.Refactoring.csproj", "{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDock", "src\Libraries\AvalonDock\AvalonDock\AvalonDock.csproj", "{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
@@ -243,6 +247,10 @@ Global
 		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
 		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
 		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
 		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -499,6 +507,10 @@ Global
 		{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -517,6 +529,8 @@ Global
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
 		{53DCA265-3C3C-42F9-B647-F72BA678122B} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
 		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
 		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
 		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
 		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
diff --git a/samples/PortSD4AddInToSD5/PortSD4AddInToSD5.csproj b/samples/PortSD4AddInToSD5/PortSD4AddInToSD5.csproj
index 5b10f809db..af80f14189 100644
--- a/samples/PortSD4AddInToSD5/PortSD4AddInToSD5.csproj
+++ b/samples/PortSD4AddInToSD5/PortSD4AddInToSD5.csproj
@@ -65,6 +65,11 @@
     <Compile Include="WorkbenchSingletonIssueProvider.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory.CSharp.Refactoring.csproj">
+      <Project>{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}</Project>
+      <Name>ICSharpCode.NRefactory.CSharp.Refactoring</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
       <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
       <Name>ICSharpCode.NRefactory.CSharp</Name>
diff --git a/samples/PortSD4AddInToSD5/WorkbenchSingletonIssueProvider.cs b/samples/PortSD4AddInToSD5/WorkbenchSingletonIssueProvider.cs
index c6413536d4..f54b6b6740 100644
--- a/samples/PortSD4AddInToSD5/WorkbenchSingletonIssueProvider.cs
+++ b/samples/PortSD4AddInToSD5/WorkbenchSingletonIssueProvider.cs
@@ -22,11 +22,10 @@ namespace PortSD4AddInToSD5
 	[IssueDescription ("Usage of SD4 WorkbenchSingleton",
 	                   Description = "Usage of SD4 WorkbenchSingleton",
 	                   Category = "SD4->SD5",
-	                   Severity = Severity.Warning,
-	                   IssueMarker = IssueMarker.Underline)]
-	public class WorkbenchSingletonIssueProvider : ICodeIssueProvider
+	                   Severity = Severity.Warning)]
+	public class WorkbenchSingletonIssueProvider : CodeIssueProvider
 	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
+		public override IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context, string subIssue = null)
 		{
 			foreach (var mre in context.RootNode.Descendants.OfType<MemberReferenceExpression>()) {
 				var rr = context.Resolve(mre);
@@ -129,8 +128,8 @@ namespace PortSD4AddInToSD5
 						if (invocationExpression.Clone().Invoke("FireAndForget").IsMatch(invocationExpression.Parent.Parent)) {
 							var ident = invocationExpression.Parent.GetChildByRole(Roles.Identifier);
 							yield return new CodeIssue(
-								"Use InvokeAsyncAndForget() instead",
 								ident.StartLocation, ident.EndLocation,
+								"Use InvokeAsyncAndForget() instead",
 								new CodeAction("Use InvokeAsyncAndForget() instead",
 								               script => {
 								               	var newInvocation = (InvocationExpression)invocationExpression.Clone();
@@ -146,7 +145,7 @@ namespace PortSD4AddInToSD5
 		
 		CodeIssue Issue(AstNode node, Action<Script> fix = null)
 		{
-			return new CodeIssue("WorkbenchSingleton is obsolete", node.StartLocation, node.EndLocation,
+			return new CodeIssue(node.StartLocation, node.EndLocation, "WorkbenchSingleton is obsolete",
 			                     fix != null ? new CodeAction("Use SD5 API", fix, node) : null);
 		}
 	}
diff --git a/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj b/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj
index 32d9d66e4b..30689a7bd5 100644
--- a/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj
+++ b/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj
@@ -132,6 +132,11 @@
       <Name>Mono.Cecil</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
+      <Project>{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}</Project>
+      <Name>ICSharpCode.NRefactory.Cecil</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
       <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
       <Name>ICSharpCode.NRefactory.CSharp</Name>
diff --git a/src/AddIns/Analysis/UnitTesting/Test/UnitTesting.Tests.csproj b/src/AddIns/Analysis/UnitTesting/Test/UnitTesting.Tests.csproj
index c41cb14702..95fc8bef73 100644
--- a/src/AddIns/Analysis/UnitTesting/Test/UnitTesting.Tests.csproj
+++ b/src/AddIns/Analysis/UnitTesting/Test/UnitTesting.Tests.csproj
@@ -103,6 +103,10 @@
     <Compile Include="Utils\NRefactoryHelper.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
+      <Project>{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}</Project>
+      <Name>ICSharpCode.NRefactory.Cecil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
       <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
       <Name>ICSharpCode.NRefactory.CSharp</Name>
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
index 5bedde41cd..dc327294b0 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
@@ -16,7 +16,7 @@
 			<Doozer name="CSharpCodeActionProvider" class="CSharpBinding.Refactoring.CSharpCodeActionProviderDoozer"/>
 		</Import>
 		<Import assembly = ":ICSharpCode.SharpDevelop"/>
-		<Import assembly = ":ICSharpCode.NRefactory.CSharp"/>
+		<Import assembly = ":ICSharpCode.NRefactory.CSharp.Refactoring"/>
 	</Runtime>
 	
 	<Path name = "/SharpDevelop/Workbench/Ambiences">
@@ -165,103 +165,254 @@
 	<Path path = "/SharpDevelop/ViewContent/TextEditor/C#/IssueProviders">
 		<Class class = "CSharpBinding.Refactoring.CSharpSyntaxIssue" />
 		<Class class = "CSharpBinding.Refactoring.SDRedundantUsingIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.AssignmentMadeToSameVariableIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.BitwiseOperationOnNonFlagsEnumIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.BaseMethodCallWithDefaultParameterIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.AccessToDisposedClosureIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.AccessToModifiedClosureIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.AccessToStaticMemberViaDerivedTypeIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.AdditionalOfTypeIssues" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ArrayCreationCanBeReplacedWithArrayInitializerIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.AutoAsyncIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.BaseMemberHasParamsIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.BaseMethodParameterNameMismatchIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.BitwiseOperatorOnEnumWithoutFlagsIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CallToObjectEqualsViaBaseIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CallToVirtualFunctionFromConstructorIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CanBeReplacedWithTryCastAndCheckForNullIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CastExpressionOfIncompatibleTypeIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CompareBooleanWithTrueOrFalseIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CompareFloatWithEqualityOperatorIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConditionalToNullCoalescingIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CheckNamespaceIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CompareNonConstrainedGenericWithNullIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CompareOfFloatsByEqualityOperatorIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConditionalTernaryEqualBranchIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConditionIsAlwaysTrueOrFalseIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConstantConditionIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConstantNullCoalescingConditionIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertClosureToMethodGroupIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertConditionalTernaryToNullCoalescingIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertIfDoToWhileIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertIfStatementToConditionalTernaryExpressionIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertIfStatementToNullCoalescingExpressionIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertIfStatementToSwitchStatementIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertIfToAndExpressionIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertIfToOrExpressionIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertNullableToShortFormIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertToAutoPropertyIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertToConstantIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertToLambdaExpressionIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertToStaticTypeIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CS0029InvalidConversionIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CS0126ReturnMustBeFollowedByAnyExpression" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CS0127ReturnMustNotBeFollowedByAnyExpression" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.DoubleNegationIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.DuplicateExpressionsInConditionsIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.DuplicateIfInIfChainIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CS0152DuplicateCaseLabelValueIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CS0183ExpressionIsAlwaysOfProvidedTypeIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CS0659ClassOverrideEqualsWithoutGetHashCode" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CS0759RedundantPartialMethodIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CS1573ParameterHasNoMatchingParamTagIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CS1717AssignmentMadeToSameVariableIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.CS1729TypeHasNoConstructorWithNArgumentsIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.DelegateSubtractionIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.DisposeMethodInNonIDisposableTypeIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.DoNotCallOverridableMethodsInConstructorIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.DontUseLinqWhenItsVerboseAndInefficientIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.DoubleNegationOperatorIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.DuplicatedLinqToListOrArrayIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.EmptyConstructorIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.EmptyDestructorIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.EmptyEmbeddedStatementIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.EmptyGeneralCatchClauseIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.EmptyNamespaceIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.EmptyStatementIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.EnumUnderlyingTypeIsIntIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.EqualExpressionComparisonIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.EventUnsubscriptionViaAnonymousDelegateIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ExceptionRethrowIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ExplicitConversionInForEachIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ExpressionIsAlwaysOfProvidedTypeIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ExpressionIsNeverOfProvidedTypeIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ForControlVariableNotModifiedIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.FormatStringIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.IdenticalConditionalBranchIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.FieldCanBeMadeReadOnlyIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ForCanBeConvertedToForeachIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ForControlVariableIsNeverModifiedIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.FormatStringProblemIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ForStatementConditionIsTrueIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.FunctionNeverReturnsIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.InconsistentNamingIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.IncorrectCallToObjectGetHashCodeIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.IncorrectExceptionParameterOrderingIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.InvokeAsExtensionMethodIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.LocalVariableHidesMemberIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.LocalVariableNotUsedIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.MethodNeverReturnsIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.LockThisIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.LongLiteralEndingLowerLIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.MemberCanBeMadeStaticIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.MemberHidesStaticFromOuterClassIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.MethodOverloadHidesOptionalParameterIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.MissingStringComparisonIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.MethodOverloadWithOptionalParameterIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.MissingInterfaceMemberImplementationIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.NegativeRelationalExpressionIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.NoDefaultConstructorIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.NonPublicMethodWithTestAttributeIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.NonReadonlyReferencedInGetHashCodeIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.NotImplementedExceptionIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.NotResolvedInTextIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ObjectCreationAsStatementIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.OperatorIsCanBeUsedIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.OptionalParameterCouldBeSkippedIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ParameterCanBeDemotedIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.OptionalParameterHierarchyMismatchIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.OptionalParameterRefOutIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ParameterCanBeDeclaredWithBaseTypeIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ParameterHidesMemberIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ParameterNotUsedIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ParameterOnlyAssignedIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.PartialMethodParameterNameMismatchIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.PartialTypeWithSinglePartIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.PolymorphicFieldLikeEventInvocationIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.PossibleAssignmentToReadonlyFieldIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.PossibleMistakenCallToGetTypeIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ProhibitedModifiersIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.PublicConstructorInAbstractClassIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantArrayInitializerCommaIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantAnonymousTypePropertyNameIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantArgumentDefaultValueIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantArgumentNameIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantAttributeParenthesesIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantBaseConstructorIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantBaseConstructorCallIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantBaseQualifierIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantBlockInDifferentBranchesIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantBoolCompareIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantCaseLabelIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantCatchIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantConstructorIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantElseIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantFieldInitializerIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantCatchClauseIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantCheckBeforeAssignmentIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantCommaInArrayInitializerIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantComparisonWithNullIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantDefaultFieldInitializerIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantDelegateCreationIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantEmptyDefaultSwitchBranchIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantEmptyFinallyBlockIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantEnumerableCastCallIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantExplicitArrayCreationIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantExplicitArraySizeIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantExplicitNullableCreationIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantExtendsListEntryIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantIfElseBlockIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantInternalIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantNamespaceUsageIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantNullCheckIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantLambdaParameterTypeIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantLambdaSignatureParenthesesIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantLogicalConditionalExpressionOperandIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantNameQualifierIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantNotNullAttributeInNonNullableTypeIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantObjectCreationArgumentListIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantObjectOrCollectionInitializerIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantOverridenMemberIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantParamsIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantPrivateIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantThisIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantToStringIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantWhereWithPredicateIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReferenceEqualsCalledWithValueTypeIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReferenceToStaticMemberViaDerivedTypeIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantStringToCharArrayCallIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantTernaryExpressionIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantThisQualifierIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantToStringCallForValueTypesIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantToStringCallIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantUnsafeContextIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReferenceEqualsWithValueTypeIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RemoveRedundantOrStatementIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithFirstOrDefaultIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithLastOrDefaultIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithOfTypeAnyIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithOfTypeCountIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithOfTypeFirstIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithOfTypeFirstOrDefaultIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithOfTypeIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithOfTypeLastIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithOfTypeLastOrDefaultIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithOfTypeLongCountIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithOfTypeSingleIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithOfTypeSingleOrDefaultIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithOfTypeWhereIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithSimpleAssignmentIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithSingleCallToAnyIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithSingleCallToCountIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithSingleCallToFirstIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithSingleCallToFirstOrDefaultIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithSingleCallToLastIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithSingleCallToLastOrDefaultIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithSingleCallToLongCountIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithSingleCallToSingleIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithSingleCallToSingleOrDefaultIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithStringIsNullOrEmptyIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ResultOfAsyncCallShouldNotBeIgnoredIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.SimplifyAnonymousMethodToDelegateIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.StaticConstructorAccessModifierIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RewriteIfReturnToReturnIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.SameGuardConditionExpressionInIfelseBranchesIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.SealedMemberInSealedClassIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.SimplifyConditionalTernaryExpressionIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.SimplifyLinqExpressionIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.StaticConstructorParameterIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.StaticFieldInGenericTypeIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.StringIsNullOrEmptyIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ThreadStaticOnInstanceFieldIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.TypeParameterNotUsedIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.StringCompareIsCultureSpecificIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.StringCompareToIsCultureSpecificIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.StringEndsWithIsCultureSpecificIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.StringIndexOfIsCultureSpecificIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.StringLastIndexOfIsCultureSpecificIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.StringStartsWithIsCultureSpecificIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.SuggestUseVarKeywordEvidentIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ThreadStaticAtInstanceFieldIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.UnassignedReadonlyFieldIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.UnmatchedSizeSpecificationInArrayCreationIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.UnreachableCodeIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.UseBlockInsteadColonIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.UseVarKeywordIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ValueParameterUnusedIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.UnusedAnonymousMethodSignatureIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.UnusedLabelIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.UnusedParameterIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.UnusedTypeParameterIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.UseArrayCreationExpressionIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.UseIsOperatorIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.UseMethodAnyIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.UseMethodIsInstanceOfTypeIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.UseOfMemberOfNullReference" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ValueParameterNotUsedIssue" />
+		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.XmlDocIssue" />
 	</Path>
 	
 	<Path path = "/SharpDevelop/ViewContent/TextEditor/C#/ContextActions">
 		<!-- In this path, you can add SD context action providers using <Class>,
 		     or you can add NR5 code action providers using <CSharpCodeActionProvider> -->
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.AbstractAndVirtualConversionAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.AddAnotherAccessorAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.AddArgumentNameAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.AddBracesAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.AddCatchTypeAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.AddExceptionDescriptionAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.AddOptionalParameterToInvocationAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.AddUsingAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.AutoLinqSumAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ChangeAccessModifierAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.CheckIfParameterIsNullAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ComputeConstantValueAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertAnonymousDelegateToLambdaAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertAssignmentToIfAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertAsToCastAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertBitwiseFlagComparisonToHasFlagsAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertCastToAsAction" />
-		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertConditionalToIfAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertDecToHexAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertDoWhileToWhileLoopAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertEqualityOperatorToEqualsAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertEqualsToEqualityOperatorAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertExplicitToImplicitImplementationAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertForeachToForAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertForToWhileAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertHasFlagsToBitwiseFlagComparisonAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertHexToDecAction" />
-		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertIfToConditionalAction" />
-		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertIfToSwitchAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertIfStatementToConditionalTernaryExpressionAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertIfStatementToNullCoalescingExpressionAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertIfStatementToReturnStatementAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertIfStatementToSwitchStatementAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertImplicitToExplicitImplementationAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertInitializerToExplicitInitializationsAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertLambdaBodyExpressionToStatementAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertLambdaBodyStatementToExpressionAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertLambdaToAnonymousDelegateAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertMethodGroupToAnonymousMethodAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertMethodGroupToLambdaAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertMultiplyToShiftAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertNullCoalescingToConditionalExpressionAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertReturnStatementToIfAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertShiftToMultiplyAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertSwitchToIfAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertToInitializerAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ConvertWhileToDoWhileLoopAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.CopyCommentsFromBase" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.CopyCommentsFromInterface" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.CreateBackingStoreAction" />
-		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.CreateChangedEvent" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.CreateChangedEventAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.CreateClassDeclarationAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.CreateConstructorDeclarationAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.CreateCustomEventImplementationAction" />
@@ -274,11 +425,14 @@
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.CreateMethodDeclarationAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.CreateOverloadWithoutParameterAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.CreatePropertyAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.CS1520MethodMustHaveAReturnTypeAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.DeclareLocalVariableAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ExtensionMethodInvocationToStaticMethodInvocationAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ExtractAnonymousMethodAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ExtractFieldAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod.ExtractMethodAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ExtractWhileConditionToInternalIfStatementAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.FlipEqualsTargetAndArgumentAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.FlipOperatorArgumentsAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.GenerateGetterAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.GeneratePropertyAction" />
@@ -286,31 +440,43 @@
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ImplementAbstractMembersAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ImplementInterfaceAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ImplementInterfaceExplicitAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ImplementNotImplementedProperty" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.InlineLocalVariableAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.InsertAnonymousMethodSignatureAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.IntroduceConstantAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.IntroduceFormatItemAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.InvertConditionalOperatorAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.InvertIfAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.InvertIfAndSimplify" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.InvertLogicalExpressionAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.IterateViaForeachAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.JoinDeclarationAndAssignmentAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.JoinStringAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.LinqFluentToQueryAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.LinqQueryToFluentAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.MergeNestedIfAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.MoveToOuterScopeAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.NegateIsExpressionAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.NegateRelationalExpressionAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.PutInsideUsingAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.RemoveBackingStoreAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.RemoveBracesAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.RemoveRedundantCatchTypeAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.RemoveRegionAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceAssignmentWithPostfixExpressionAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceEmptyStringAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceOperatorAssignmentWithAssignmentAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplacePostfixExpressionWithAssignmentAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReplaceWithOperatorAssignmentAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReverseDirectionForForLoopAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.SimplifyIfFlowAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.SimplifyIfInLoopsFlowAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.SortUsingsAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.SplitDeclarationAndAssignmentAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.SplitDeclarationListAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.SplitIfAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.SplitStringAction" />
-		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.StaticMethodInvocationToExtensionMethodInvocationAction" />
+		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.UseAsAndNullCheckAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.UseExplicitTypeAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.UseStringFormatAction" />
 		<CSharpCodeActionProvider class = "ICSharpCode.NRefactory.CSharp.Refactoring.UseVarKeywordAction" />
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
index 0cfab3c3ae..e8c29d4d35 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
@@ -169,6 +169,11 @@
       <Name>ICSharpCode.AvalonEdit</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory.CSharp.Refactoring.csproj">
+      <Project>{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}</Project>
+      <Name>ICSharpCode.NRefactory.CSharp.Refactoring</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
       <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
       <Name>ICSharpCode.NRefactory.CSharp</Name>
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionDataFactory.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionDataFactory.cs
index 8d25706d93..c5497c86a4 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionDataFactory.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionDataFactory.cs
@@ -46,7 +46,7 @@ namespace CSharpBinding.Completion
 			};
 		}
 		
-		ICompletionData ICompletionDataFactory.CreateTypeCompletionData(IType type, bool showFullName, bool isInAttributeContext)
+		ICompletionData ICompletionDataFactory.CreateTypeCompletionData(IType type, bool showFullName, bool isInAttributeContext, bool addForTypeCreation)
 		{
 			var data = new TypeCompletionData(type);
 			if (showFullName) {
@@ -135,7 +135,7 @@ namespace CSharpBinding.Completion
 			return completionContext.ParseInformation.SyntaxTree.ConditionalSymbols.Select(def => new CompletionData(def));
 		}
 		
-		ICompletionData ICompletionDataFactory.CreateImportCompletionData(IType type, bool useFullName)
+		ICompletionData ICompletionDataFactory.CreateImportCompletionData(IType type, bool useFullName, bool addForTypeCreation)
 		{
 			ITypeDefinition typeDef = type.GetDefinition();
 			if (typeDef != null)
@@ -143,6 +143,16 @@ namespace CSharpBinding.Completion
 			else
 				throw new InvalidOperationException("Should never happen");
 		}
+		
+		ICompletionData ICompletionDataFactory.CreateFormatItemCompletionData(string format, string description, object example)
+		{
+			return new CompletionData("TODO: format item completion");
+		}
+
+		ICompletionData ICompletionDataFactory.CreateXmlDocCompletionData(string tag, string description, string tagInsertionText)
+		{
+			return new CompletionData("TODO: XmlDoc completion");
+		}
 		#endregion
 		
 		#region IParameterCompletionDataFactory implementation
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/Parser.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/Parser.cs
index 518d8b73c4..9500baebbc 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/Parser.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/Parser.cs
@@ -186,7 +186,7 @@ namespace CSharpBinding.Parser
 					typeof(Uri).Assembly,
 					typeof(Enumerable).Assembly
 				};
-				return assemblies.Select(asm => new CecilLoader().LoadAssemblyFile(asm.Location)).ToArray();
+				return assemblies.Select(asm => SD.AssemblyParserService.GetAssembly(FileName.Create(asm.Location))).ToArray();
 			});
 		
 		public ICompilation CreateCompilationForSingleFile(FileName fileName, IUnresolvedFile unresolvedFile)
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/CSharpCodeActionProviderDoozer.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/CSharpCodeActionProviderDoozer.cs
index 7444db1d73..8857925b06 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/CSharpCodeActionProviderDoozer.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/CSharpCodeActionProviderDoozer.cs
@@ -37,8 +37,8 @@ namespace CSharpBinding.Refactoring
 				LoggingService.Error("[ContextAction] attribute is missing on " + providerType.FullName);
 				return null;
 			}
-			if (!typeof(ICodeActionProvider).IsAssignableFrom(providerType)) {
-				LoggingService.Error(providerType.FullName + " does nto implement ICodeActionProvider");
+			if (!typeof(CodeActionProvider).IsAssignableFrom(providerType)) {
+				LoggingService.Error(providerType.FullName + " does not implement CodeActionProvider");
 				return null;
 			}
 			return new CSharpContextActionProviderWrapper((ContextActionAttribute)attributes[0], providerType);
@@ -55,13 +55,13 @@ namespace CSharpBinding.Refactoring
 				this.type = type;
 			}
 			
-			ICodeActionProvider codeActionProvider;
+			CodeActionProvider codeActionProvider;
 			
 			bool CreateCodeActionProvider()
 			{
 				lock (this) {
 					if (codeActionProvider == null) {
-						codeActionProvider = (ICodeActionProvider)Activator.CreateInstance(type);
+						codeActionProvider = (CodeActionProvider)Activator.CreateInstance(type);
 					}
 					return true;
 				}
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/CSharpSyntaxIssue.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/CSharpSyntaxIssue.cs
index 1acffca9f8..2f687e0c85 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/CSharpSyntaxIssue.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/CSharpSyntaxIssue.cs
@@ -16,11 +16,10 @@ namespace CSharpBinding.Refactoring
 	[IssueDescription("C# syntax error",
 	                  Description = "Displays syntax errors",
 	                  Category = IssueCategories.CompilerErrors,
-	                  Severity = Severity.Error,
-	                  IssueMarker = IssueMarker.Underline)]
-	public class CSharpSyntaxIssue : ICodeIssueProvider
+	                  Severity = Severity.Error)]
+	public class CSharpSyntaxIssue : CodeIssueProvider
 	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
+		public override IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context, string subIssue = null)
 		{
 			var refactoringContext = context as SDRefactoringContext;
 			if (refactoringContext == null)
@@ -50,7 +49,7 @@ namespace CSharpBinding.Refactoring
 			}
 			
 			TextLocation end = document.GetLocation(offset + length);
-			return new CodeIssue(error.Message, begin, end);
+			return new CodeIssue(begin, end, error.Message);
 		}
 	}
 }
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/EditorScript.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/EditorScript.cs
index 84cd2bcc44..d406b301ae 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/EditorScript.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/EditorScript.cs
@@ -81,6 +81,7 @@ namespace CSharpBinding.Refactoring
 			return completedTask;
 		}
 		
+		/*
 		public override Task InsertWithCursor(string operation, InsertPosition defaultPosition, IEnumerable<AstNode> nodes)
 		{
 			AstNode contextNode = context.GetNode();
@@ -107,6 +108,7 @@ namespace CSharpBinding.Refactoring
 			}
 			return completedTask;
 		}
+		*/
 		
 		public override void Dispose()
 		{
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueManager.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueManager.cs
index 5230459148..96beac8bee 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueManager.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueManager.cs
@@ -28,7 +28,7 @@ namespace CSharpBinding.Refactoring
 	public class IssueManager : IDisposable, IContextActionProvider
 	{
 		static readonly Lazy<IReadOnlyList<IssueProvider>> issueProviders = new Lazy<IReadOnlyList<IssueProvider>>(
-			() => AddInTree.BuildItems<ICodeIssueProvider>("/SharpDevelop/ViewContent/TextEditor/C#/IssueProviders", null, false)
+			() => AddInTree.BuildItems<CodeIssueProvider>("/SharpDevelop/ViewContent/TextEditor/C#/IssueProviders", null, false)
 			.Select(p => new IssueProvider(p)).ToList());
 		
 		internal static IReadOnlyList<IssueProvider> IssueProviders {
@@ -40,7 +40,7 @@ namespace CSharpBinding.Refactoring
 			public readonly Type ProviderType;
 			public readonly IssueDescriptionAttribute Attribute;
 			
-			public IssueProvider(ICodeIssueProvider provider)
+			public IssueProvider(CodeIssueProvider provider)
 			{
 				if (provider == null)
 					throw new ArgumentNullException("provider");
@@ -51,7 +51,7 @@ namespace CSharpBinding.Refactoring
 				if (attributes.Length == 1) {
 					this.Attribute = (IssueDescriptionAttribute)attributes[0];
 					defaultSeverity = this.Attribute.Severity;
-					IsRedundancy = this.Attribute.Category == IssueCategories.Redundancies;
+					IsRedundancy = this.Attribute.Category == IssueCategories.RedundanciesInCode || this.Attribute.Category == IssueCategories.RedundanciesInDeclarations;
 				} else {
 					SD.Log.Warn("Issue provider without attribute: " + ProviderType);
 				}
@@ -62,15 +62,11 @@ namespace CSharpBinding.Refactoring
 			public Severity CurrentSeverity { get; set; }
 			public bool IsRedundancy { get; set; }
 			
-			public IssueMarker MarkerType {
-				get { return Attribute != null ? Attribute.IssueMarker : IssueMarker.Underline; }
-			}
-			
 			public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
 			{
 				// use a separate instance for every call, this is necessary
 				// for thread-safety
-				var provider = (ICodeIssueProvider)Activator.CreateInstance(ProviderType);
+				var provider = (CodeIssueProvider)Activator.CreateInstance(ProviderType);
 				return provider.GetIssues(context);
 			}
 		}
@@ -119,8 +115,9 @@ namespace CSharpBinding.Refactoring
 			public readonly int EndOffset;
 			public readonly IReadOnlyList<IContextAction> Actions;
 			public readonly Severity Severity;
+			public readonly IssueMarker MarkerType;
 			
-			public InspectionTag(IssueManager manager, IssueProvider provider, ITextSourceVersion inspectedVersion, string description, int startOffset, int endOffset, IEnumerable<CodeAction> actions)
+			public InspectionTag(IssueManager manager, IssueProvider provider, ITextSourceVersion inspectedVersion, string description, int startOffset, int endOffset, IssueMarker markerType, IEnumerable<CodeAction> actions)
 			{
 				this.manager = manager;
 				this.Provider = provider;
@@ -129,6 +126,7 @@ namespace CSharpBinding.Refactoring
 				this.StartOffset = startOffset;
 				this.EndOffset = endOffset;
 				this.Severity = provider.CurrentSeverity;
+				this.MarkerType = markerType;
 				
 				this.Actions = actions.Select(Wrap).ToList();
 			}
@@ -175,10 +173,13 @@ namespace CSharpBinding.Refactoring
 				marker.MarkerColor = color;
 				if (!Provider.IsRedundancy)
 					marker.MarkerTypes = TextMarkerTypes.ScrollBarRightTriangle;
-				switch (Provider.MarkerType) {
-					case IssueMarker.Underline:
+				switch (MarkerType) {
+					case IssueMarker.WavedLine:
 						marker.MarkerTypes |= TextMarkerTypes.SquigglyUnderline;
 						break;
+					case IssueMarker.DottedLine:
+						marker.MarkerTypes |= TextMarkerTypes.DottedUnderline;
+						break;
 					case IssueMarker.GrayOut:
 						marker.ForegroundColor = SystemColors.GrayTextColor;
 						break;
@@ -272,6 +273,7 @@ namespace CSharpBinding.Refactoring
 									issue.Description,
 									context.GetOffset(issue.Start),
 									context.GetOffset(issue.End),
+									issue.IssueMarker,
 									issue.Actions));
 							}
 						}
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SDRedundantUsingIssue.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SDRedundantUsingIssue.cs
index 28a72e6d2c..761a641bdf 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SDRedundantUsingIssue.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SDRedundantUsingIssue.cs
@@ -6,7 +6,7 @@ using ICSharpCode.NRefactory.CSharp.Refactoring;
 
 namespace CSharpBinding.Refactoring
 {
-	public class SDRedundantUsingIssue : RedundantUsingIssue
+	public class SDRedundantUsingIssue : RedundantUsingDirectiveIssue
 	{
 		public SDRedundantUsingIssue()
 		{
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SDRefactoringContext.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SDRefactoringContext.cs
index 0cb3a459c4..6701ea5079 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SDRefactoringContext.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SDRefactoringContext.cs
@@ -146,6 +146,12 @@ namespace CSharpBinding.Refactoring
 			}
 		}
 		
+		public override string DefaultNamespace {
+			get {
+				return string.Empty; // TODO: get namespace from current project
+			}
+		}
+		
 		public override string GetText(int offset, int length)
 		{
 			return textSource.GetText(offset, length);
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpBinding.Tests.csproj b/src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpBinding.Tests.csproj
index c2d96c9bf4..1a16e6f6fc 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpBinding.Tests.csproj
+++ b/src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpBinding.Tests.csproj
@@ -81,6 +81,14 @@
       <Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
       <Name>ICSharpCode.AvalonEdit</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
+      <Project>{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}</Project>
+      <Name>ICSharpCode.NRefactory.Cecil</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory.CSharp.Refactoring.csproj">
+      <Project>{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}</Project>
+      <Name>ICSharpCode.NRefactory.CSharp.Refactoring</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
       <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
       <Name>ICSharpCode.NRefactory.CSharp</Name>
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Tests/RegistrationTests.cs b/src/AddIns/BackendBindings/CSharpBinding/Tests/RegistrationTests.cs
index a74f81cd1f..0942428ce9 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Tests/RegistrationTests.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Tests/RegistrationTests.cs
@@ -21,12 +21,13 @@ namespace CSharpBinding.Tests
 	public class RegistrationTests
 	{
 		Type[] exceptions = {
-			typeof(MultipleEnumerationIssue), // disabled due to https://github.com/icsharpcode/NRefactory/issues/123
+			typeof(PossibleMultipleEnumerationIssue), // disabled due to https://github.com/icsharpcode/NRefactory/issues/123
 			typeof(RedundantAssignmentIssue), // disabled due to https://github.com/icsharpcode/NRefactory/issues/123
-			typeof(RedundantTypeCastIssue), // disabled due to plenty of false positives (e.g. when cast is necessary for overload resolution)
+			typeof(RedundantCastIssue), // disabled due to plenty of false positives (e.g. when cast is necessary for overload resolution)
 		};
 		
-		Assembly NRCSharp = typeof(ICodeIssueProvider).Assembly;
+		Assembly NRCSharp = typeof(CodeIssueProvider).Assembly;
+		Assembly NRCSharpRefactoring = typeof(AddBracesAction).Assembly;
 		Assembly CSharpBinding = typeof(SDRefactoringContext).Assembly;
 		
 		AddIn addIn;
@@ -37,7 +38,7 @@ namespace CSharpBinding.Tests
 		
 		Type FindType(string @class)
 		{
-			return CSharpBinding.GetType(@class, false) ?? NRCSharp.GetType(@class, true);
+			return CSharpBinding.GetType(@class, false) ?? NRCSharpRefactoring.GetType(@class, false);
 		}
 		
 		[TestFixtureSetUpAttribute]
@@ -47,12 +48,22 @@ namespace CSharpBinding.Tests
 			addIn = AddIn.Load(addInTree, "CSharpBinding.addin");
 			
 			registeredIssueProviders = addIn.Paths["/SharpDevelop/ViewContent/TextEditor/C#/IssueProviders"].Codons
-				.Select(c => FindType(c.Properties["class"])).ToList();
-			NRissueProviders = NRCSharp.ExportedTypes.Where(t => t.GetCustomAttribute<IssueDescriptionAttribute>() != null).ToList();
+				.Select(c => FindType(c.Properties["class"])).Where(t => t != null).ToList();
+			NRissueProviders = NRCSharpRefactoring.ExportedTypes.Where(t => t.GetCustomAttribute<IssueDescriptionAttribute>() != null).ToList();
 			
 			registeredContextActions = addIn.Paths["/SharpDevelop/ViewContent/TextEditor/C#/ContextActions"].Codons
-				.Select(c => FindType(c.Properties["class"])).ToList();
-			NRcontextActions = NRCSharp.ExportedTypes.Where(t => t.GetCustomAttribute<ContextActionAttribute>() != null).ToList();
+				.Select(c => FindType(c.Properties["class"])).Where(t => t != null).ToList();
+			NRcontextActions = NRCSharpRefactoring.ExportedTypes.Where(t => t.GetCustomAttribute<ContextActionAttribute>() != null).ToList();
+		}
+		
+		
+		[Test]
+		public void NoMissingClasses()
+		{
+			var classNames = addIn.Paths["/SharpDevelop/ViewContent/TextEditor/C#/IssueProviders"].Codons
+				.Concat(addIn.Paths["/SharpDevelop/ViewContent/TextEditor/C#/ContextActions"].Codons)
+				.Select(c => c.Properties["class"]);
+			Assert.IsEmpty(classNames.Where(c => FindType(c) == null));
 		}
 		
 		[Test]
diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/XamlBinding.Tests.csproj b/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/XamlBinding.Tests.csproj
index fc5ab230f8..08f6639296 100644
--- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/XamlBinding.Tests.csproj
+++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/XamlBinding.Tests.csproj
@@ -93,6 +93,10 @@
       <Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
       <Name>ICSharpCode.AvalonEdit</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
+      <Project>{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}</Project>
+      <Name>ICSharpCode.NRefactory.Cecil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
       <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
       <Name>ICSharpCode.NRefactory.CSharp</Name>
diff --git a/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj b/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj
index 9803299e21..339f3f07b8 100644
--- a/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj
+++ b/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj
@@ -131,6 +131,11 @@
       <Name>Mono.Cecil</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
+      <Project>{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}</Project>
+      <Name>ICSharpCode.NRefactory.Cecil</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/TextMarkerService.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/TextMarkerService.cs
index 514d9ec60e..1081affab8 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/TextMarkerService.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/TextMarkerService.cs
@@ -168,13 +168,14 @@ namespace ICSharpCode.AvalonEdit.AddIn
 						drawingContext.DrawGeometry(brush, null, geometry);
 					}
 				}
-				if ((marker.MarkerTypes & (TextMarkerTypes.SquigglyUnderline | TextMarkerTypes.NormalUnderline)) != 0) {
+				var underlineMarkerTypes = TextMarkerTypes.SquigglyUnderline | TextMarkerTypes.NormalUnderline | TextMarkerTypes.DottedUnderline;
+				if ((marker.MarkerTypes & underlineMarkerTypes) != 0) {
 					foreach (Rect r in BackgroundGeometryBuilder.GetRectsForSegment(textView, marker)) {
 						Point startPoint = r.BottomLeft;
 						Point endPoint = r.BottomRight;
 						
-						Pen usedPen = new Pen(new SolidColorBrush(marker.MarkerColor), 1);
-						usedPen.Freeze();
+						Brush usedBrush = new SolidColorBrush(marker.MarkerColor);
+						usedBrush.Freeze();
 						if ((marker.MarkerTypes & TextMarkerTypes.SquigglyUnderline) != 0) {
 							double offset = 2.5;
 							
@@ -189,9 +190,19 @@ namespace ICSharpCode.AvalonEdit.AddIn
 							
 							geometry.Freeze();
 							
+							Pen usedPen = new Pen(usedBrush, 1);
+							usedPen.Freeze();
 							drawingContext.DrawGeometry(Brushes.Transparent, usedPen, geometry);
 						}
 						if ((marker.MarkerTypes & TextMarkerTypes.NormalUnderline) != 0) {
+							Pen usedPen = new Pen(usedBrush, 1);
+							usedPen.Freeze();
+							drawingContext.DrawLine(usedPen, startPoint, endPoint);
+						}
+						if ((marker.MarkerTypes & TextMarkerTypes.DottedUnderline) != 0) {
+							Pen usedPen = new Pen(usedBrush, 1);
+							usedPen.DashStyle = DashStyles.Dot;
+							usedPen.Freeze();
 							drawingContext.DrawLine(usedPen, startPoint, endPoint);
 						}
 					}
diff --git a/src/Libraries/ICSharpCode.Decompiler/Ast/Transforms/IntroduceUsingDeclarations.cs b/src/Libraries/ICSharpCode.Decompiler/Ast/Transforms/IntroduceUsingDeclarations.cs
index 3d4a8e7c19..5c3784fa4c 100644
--- a/src/Libraries/ICSharpCode.Decompiler/Ast/Transforms/IntroduceUsingDeclarations.cs
+++ b/src/Libraries/ICSharpCode.Decompiler/Ast/Transforms/IntroduceUsingDeclarations.cs
@@ -115,8 +115,8 @@ namespace ICSharpCode.Decompiler.Ast.Transforms
 			public override object VisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration, object data)
 			{
 				string oldNamespace = currentNamespace;
-				foreach (Identifier ident in namespaceDeclaration.Identifiers) {
-					currentNamespace = NamespaceDeclaration.BuildQualifiedName(currentNamespace, ident.Name);
+				foreach (string ident in namespaceDeclaration.Identifiers) {
+					currentNamespace = NamespaceDeclaration.BuildQualifiedName(currentNamespace, ident);
 					transform.declaredNamespaces.Add(currentNamespace);
 				}
 				base.VisitNamespaceDeclaration(namespaceDeclaration, data);
@@ -154,8 +154,8 @@ namespace ICSharpCode.Decompiler.Ast.Transforms
 			public override object VisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration, object data)
 			{
 				string oldNamespace = currentNamespace;
-				foreach (Identifier ident in namespaceDeclaration.Identifiers) {
-					currentNamespace = NamespaceDeclaration.BuildQualifiedName(currentNamespace, ident.Name);
+				foreach (string ident in namespaceDeclaration.Identifiers) {
+					currentNamespace = NamespaceDeclaration.BuildQualifiedName(currentNamespace, ident);
 				}
 				base.VisitNamespaceDeclaration(namespaceDeclaration, data);
 				currentNamespace = oldNamespace;
diff --git a/src/Libraries/NRefactory/.gitattributes b/src/Libraries/NRefactory/.gitattributes
index 1a15330249..fbfb41be87 100644
--- a/src/Libraries/NRefactory/.gitattributes
+++ b/src/Libraries/NRefactory/.gitattributes
@@ -1,2 +1,3 @@
-*.sln -crlf
-*.csproj -crlf
\ No newline at end of file
+*.cs text diff=csharp
+*.sln text eol=crlf
+*.csproj text eol=crlf
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.AstVerifier/ICSharpCode.NRefactory.CSharp.AstVerifier.csproj b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.AstVerifier/ICSharpCode.NRefactory.CSharp.AstVerifier.csproj
index 9d548dea56..c31f1197eb 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.AstVerifier/ICSharpCode.NRefactory.CSharp.AstVerifier.csproj
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.AstVerifier/ICSharpCode.NRefactory.CSharp.AstVerifier.csproj
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{961DADFA-7CE6-429F-BC22-47630D6DB826}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>ICSharpCode.NRefactory.CSharp.AstVerifier</RootNamespace>
-    <AssemblyName>AstVerifier</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Externalconsole>true</Externalconsole>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Externalconsole>true</Externalconsole>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\net_4_5_Debug\</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Externalconsole>true</Externalconsole>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\net_4_5_Release\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Externalconsole>true</Externalconsole>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Main.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
-      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
-      <Name>ICSharpCode.NRefactory.CSharp</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-    </ProjectReference>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{961DADFA-7CE6-429F-BC22-47630D6DB826}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ICSharpCode.NRefactory.CSharp.AstVerifier</RootNamespace>
+    <AssemblyName>AstVerifier</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Externalconsole>true</Externalconsole>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Externalconsole>true</Externalconsole>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\net_4_5_Debug\</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Externalconsole>true</Externalconsole>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\net_4_5_Release\</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Externalconsole>true</Externalconsole>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Main.cs" />
+    <Compile Include="AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
+      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
+      <Name>ICSharpCode.NRefactory.CSharp</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
+      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
+      <Name>ICSharpCode.NRefactory</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AbstractAndVirtualConversionAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AbstractAndVirtualConversionAction.cs
new file mode 100644
index 0000000000..e15d6591a0
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AbstractAndVirtualConversionAction.cs
@@ -0,0 +1,198 @@
+//
+// AbstractAndVirtualConversionAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Make abstract member virtual", Description = "Implements an abstract member as a virtual one")]
+	public class AbstractAndVirtualConversionAction : CodeActionProvider
+	{
+		static BlockStatement CreateNotImplementedBody(RefactoringContext context, out ThrowStatement throwStatement)
+		{
+			throwStatement = new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")));
+			return new BlockStatement { throwStatement };
+		}
+
+		static ThrowStatement ImplementStub (RefactoringContext context, EntityDeclaration newNode)
+		{
+			ThrowStatement throwStatement = null;
+			if (newNode is PropertyDeclaration || newNode is IndexerDeclaration) {
+				var setter = newNode.GetChildByRole(PropertyDeclaration.SetterRole);
+				if (!setter.IsNull)
+					setter.AddChild(CreateNotImplementedBody(context, out throwStatement), Roles.Body); 
+
+				var getter = newNode.GetChildByRole(PropertyDeclaration.GetterRole);
+				if (!getter.IsNull)
+					getter.AddChild(CreateNotImplementedBody(context, out throwStatement), Roles.Body); 
+			} else {
+				newNode.AddChild(CreateNotImplementedBody(context, out throwStatement), Roles.Body); 
+			}
+			return throwStatement;
+		}
+
+		static bool CheckBody(EntityDeclaration node)
+		{
+			var custom = node as CustomEventDeclaration;
+			if (custom != null && !(IsValidBody (custom.AddAccessor.Body) || IsValidBody (custom.RemoveAccessor.Body)))
+			    return false;
+			if (node is PropertyDeclaration || node is IndexerDeclaration) {
+				var setter = node.GetChildByRole(PropertyDeclaration.SetterRole);
+				var getter = node.GetChildByRole(PropertyDeclaration.GetterRole);
+				return IsValidBody(setter.Body) && IsValidBody(getter.Body);
+			} 
+			return IsValidBody(node.GetChildByRole(Roles.Body));
+		}
+
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var node = context.GetNode<EntityDeclaration>();
+			if (node == null || node.HasModifier(Modifiers.Override))
+				yield break;
+
+			var parent = node.Parent as TypeDeclaration;
+			if (parent == null)
+				yield break;
+
+			var custom = node as CustomEventDeclaration;
+			if (custom != null) {
+				if (!custom.PrivateImplementationType.IsNull)
+					yield break;
+			}
+
+			var selectedNode = node.GetNodeAt(context.Location);
+			if (selectedNode == null)
+				yield break;
+			if (selectedNode != node.NameToken) {
+				if ((node is EventDeclaration && node is CustomEventDeclaration || selectedNode.Role != Roles.Identifier) && 
+				    selectedNode.Role != IndexerDeclaration.ThisKeywordRole) {
+					var modToken = selectedNode as CSharpModifierToken;
+					if (modToken == null || (modToken.Modifier & (Modifiers.Abstract | Modifiers.Virtual)) == 0)
+						yield break;
+				} else {
+					if (!(node is EventDeclaration || node is CustomEventDeclaration) && selectedNode.Parent != node)
+						yield break;
+				}
+			}
+			if (!node.GetChildByRole(EntityDeclaration.PrivateImplementationTypeRole).IsNull)
+				yield break;
+
+			if (parent.HasModifier(Modifiers.Abstract)) {
+				if ((node.Modifiers & Modifiers.Abstract) != 0) {
+					yield return new CodeAction(context.TranslateString("To non-abstract"), script => {
+						var newNode = (EntityDeclaration)node.Clone();
+						newNode.Modifiers &= ~Modifiers.Abstract;
+						var throwStmt = ImplementStub (context, newNode);
+						script.Replace(node, newNode);
+						if (throwStmt != null)
+							script.Select(throwStmt); 
+					}, selectedNode);
+				} else {
+					if (CheckBody(node)) {
+						yield return new CodeAction(context.TranslateString("To abstract"), script => {
+							var newNode = CloneNodeWithoutBodies(node);
+							newNode.Modifiers &= ~Modifiers.Virtual;
+							newNode.Modifiers &= ~Modifiers.Static;
+							newNode.Modifiers |= Modifiers.Abstract;
+							script.Replace(node, newNode);
+						}, selectedNode);
+					}
+				}
+			}
+
+			if ((node.Modifiers & Modifiers.Virtual) != 0) {
+				yield return new CodeAction(context.TranslateString("To non-virtual"), script => {
+					script.ChangeModifier(node, node.Modifiers & ~Modifiers.Virtual);
+				}, selectedNode);
+			} else {
+				if ((node.Modifiers & Modifiers.Abstract) != 0) {
+					yield return new CodeAction(context.TranslateString("To virtual"), script => {
+						var newNode = CloneNodeWithoutBodies(node);
+						newNode.Modifiers &= ~Modifiers.Abstract;
+						newNode.Modifiers &= ~Modifiers.Static;
+						newNode.Modifiers |= Modifiers.Virtual;
+						var throwStmt = ImplementStub (context, newNode);
+						script.Replace(node, newNode);
+						if (throwStmt != null)
+							script.Select(throwStmt);
+					}, selectedNode);
+				} else {
+					yield return new CodeAction(context.TranslateString("To virtual"), script => {
+						script.ChangeModifier(node, (node.Modifiers & ~Modifiers.Static)  | Modifiers.Virtual);
+					}, selectedNode);
+				}
+			}
+
+		}
+
+		static EntityDeclaration CloneNodeWithoutBodies(EntityDeclaration node)
+		{
+			EntityDeclaration newNode;
+			var custom = node as CustomEventDeclaration;
+
+			if (custom == null) {
+				newNode = (EntityDeclaration)node.Clone();
+
+				if (newNode is PropertyDeclaration || node is IndexerDeclaration) {
+					var getter = newNode.GetChildByRole(PropertyDeclaration.GetterRole);
+					if (!getter.IsNull)
+						getter.Body.Remove();
+					var setter = newNode.GetChildByRole(PropertyDeclaration.SetterRole);
+					if (!setter.IsNull)
+						setter.Body.Remove();
+				} else {
+					newNode.GetChildByRole(Roles.Body).Remove();
+				}
+			} else {
+				newNode = new EventDeclaration {
+					Modifiers = custom.Modifiers,
+					ReturnType = custom.ReturnType.Clone(),
+					Variables =  {
+						new VariableInitializer {
+							Name = custom.Name
+						}
+					}
+				};
+			}
+			return newNode;
+		}
+
+		static bool IsValidBody(BlockStatement body)
+		{
+			if (body.IsNull)
+				return true;
+			var first = body.Statements.FirstOrDefault();
+			if (first == null)
+				return true;
+			if (first.GetNextSibling(s => s.Role == BlockStatement.StatementRole) != null)
+				return false;
+			return first is EmptyStatement || first is ThrowStatement;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddAnotherAccessorAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddAnotherAccessorAction.cs
new file mode 100644
index 0000000000..78b8a8f2fb
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddAnotherAccessorAction.cs
@@ -0,0 +1,89 @@
+// 
+// AddAnotherAccessor.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Add another accessor to a property declaration that has only one.
+	/// </summary>
+	[ContextAction("Add another accessor", Description = "Adds second accessor to a property.")]
+	public class AddAnotherAccessorAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var pdecl = context.GetNode<PropertyDeclaration> ();
+			if (pdecl == null || !pdecl.Getter.IsNull && !pdecl.Setter.IsNull || !pdecl.NameToken.Contains(context.Location)) { 
+				yield break;
+			}
+
+			var type = pdecl.Parent as TypeDeclaration;
+			if (type != null && type.ClassType == ClassType.Interface) {
+				yield break;
+			}
+			yield return new CodeAction (pdecl.Setter.IsNull ? context.TranslateString("Add setter") : context.TranslateString("Add getter"), script => {
+				Statement accessorStatement = null;
+			
+				var accessor = new Accessor ();
+				if (!pdecl.Getter.IsNull && !pdecl.Getter.Body.IsNull || !pdecl.Setter.IsNull && !pdecl.Setter.Body.IsNull) {
+					accessorStatement = BuildAccessorStatement(context, pdecl);
+					accessor.Body = new BlockStatement { accessorStatement };
+				}
+
+				accessor.Role = pdecl.Setter.IsNull ? PropertyDeclaration.SetterRole : PropertyDeclaration.GetterRole;
+
+				if (pdecl.Setter.IsNull && !pdecl.Getter.IsNull) {
+					script.InsertAfter(pdecl.Getter, accessor);
+				} else if (pdecl.Getter.IsNull && !pdecl.Setter.IsNull) {
+					script.InsertBefore(pdecl.Setter, accessor);
+				} else {
+					script.InsertBefore(pdecl.Getter, accessor);
+				}
+				script.FormatText(pdecl);
+				if (accessorStatement != null)
+					script.Select(accessorStatement);
+			}, pdecl.NameToken);
+		}
+		
+		static Statement BuildAccessorStatement (RefactoringContext context, PropertyDeclaration pdecl)
+		{
+			if (pdecl.Setter.IsNull && !pdecl.Getter.IsNull) {
+				var field = RemoveBackingStoreAction.ScanGetter (context, pdecl);
+				if (field != null && !field.IsReadOnly && !field.IsConst) 
+					return new AssignmentExpression (new IdentifierExpression (field.Name), AssignmentOperatorType.Assign, new IdentifierExpression ("value"));
+			}
+			
+			if (!pdecl.Setter.IsNull && pdecl.Getter.IsNull) {
+				var field = RemoveBackingStoreAction.ScanSetter (context, pdecl);
+				if (field != null) 
+					return new ReturnStatement (new IdentifierExpression (field.Name));
+			}
+			
+			return new ThrowStatement (new ObjectCreateExpression (context.CreateShortType ("System", "NotImplementedException")));
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddArgumentNameAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddArgumentNameAction.cs
new file mode 100644
index 0000000000..78ce7663e8
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddArgumentNameAction.cs
@@ -0,0 +1,205 @@
+// 
+// AddArgumentNameAction.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Linq;
+using System.Text;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	///  Add name for argument
+	/// </summary>
+	using System;
+	using System.Collections.Generic;
+	
+	[ContextAction("Add name for argument", Description = "Add name for argument including method, indexer invocation and Attibute Usage")]
+	public class AddArgumentNameAction : SpecializedCodeAction<Expression>
+	{
+		List<Expression> CollectNodes(AstNode parant, AstNode node)
+		{
+			List<Expression> returned = new List<Expression>();
+
+			var children = parant.GetChildrenByRole(Roles.Argument);
+			for (int i = 0; i< children.Count(); i++) {
+				if (children.ElementAt(i).Equals(node)) {
+					for (int j = i; j< children.Count(); j++) {
+						if (children.ElementAt(j) is Expression && children.ElementAt(j).Role == Roles.Argument && !(children.ElementAt(j) is NamedArgumentExpression)) {
+							returned.Add(children.ElementAt(j));
+						} else {
+							break;
+						}
+					}
+				}
+			}
+			return returned;
+		}
+
+		protected override CodeAction GetAction(RefactoringContext context, Expression expression)
+		{	
+			if (expression == null)
+				return null;
+			if (expression.Role != Roles.Argument || expression is NamedArgumentExpression)
+				return null;
+			if (context.Location != expression.StartLocation)
+				return null;
+			var parent = expression.Parent;
+			if (!(parent is CSharp.Attribute) && !(parent is IndexerExpression) && !(parent is InvocationExpression))
+				return null;
+
+			if (parent is CSharp.Attribute) {
+				var resolvedResult = context.Resolve(parent as CSharp.Attribute);
+				if (resolvedResult.IsError)
+					return null;
+				var arguments = (parent as CSharp.Attribute).Arguments;
+				IMember member = (resolvedResult as CSharpInvocationResolveResult).Member;
+
+				int index = 0;
+				int temp = 0; 
+				List<Expression> nodes = new List<Expression>();
+				foreach (var argument in arguments) {
+					if (argument.Equals(expression)) {
+						nodes = CollectNodes(parent, expression);
+						break;
+					}
+					temp++;
+				}
+				index = temp;
+				if (!nodes.Any())
+					return null;
+				var method = member as IMethod;
+				if (method == null || method.Parameters.Count == 0 || method.Parameters.Last().IsParams)
+					return null;
+
+				var parameterMap = (resolvedResult as CSharpInvocationResolveResult).GetArgumentToParameterMap();
+				var parameters = method.Parameters;
+				if (index >= parameterMap.Count)
+					return null;
+				var name = parameters.ElementAt(parameterMap [index]).Name;
+				return new CodeAction(string.Format(context.TranslateString("Add argument name '{0}'"), name), script => {
+					for (int i = 0; i < nodes.Count; i++) {
+						int p = index + i;
+						if (p >= parameterMap.Count)
+							break;
+						name = parameters.ElementAt(parameterMap [p]).Name;
+						var namedArgument = new NamedArgumentExpression(name, arguments.ElementAt(p).Clone());
+						script.Replace(arguments.ElementAt(p), namedArgument);
+					}}, 
+				expression
+				);
+			} 
+
+			if (parent is IndexerExpression) {
+				var resolvedResult = context.Resolve(parent as IndexerExpression);
+				if (resolvedResult.IsError)
+					return null;
+				var arguments = (parent as IndexerExpression).Arguments;
+				IMember member = (resolvedResult as CSharpInvocationResolveResult).Member;
+				
+				int index = 0;
+				int temp = 0; 
+				List<Expression> nodes = new List<Expression>();
+				foreach (var argument in arguments) {
+					if (argument.Equals(expression)) {
+						nodes = CollectNodes(parent, expression);
+						break;
+					}
+					temp++;
+				}
+				index = temp;
+				if (!nodes.Any())
+					return null;
+				var property = member as IProperty;
+				if (property == null || property.Parameters.Count == 0 || property.Parameters.Last().IsParams) {
+					return null;
+				}
+				var parameterMap = (resolvedResult as CSharpInvocationResolveResult).GetArgumentToParameterMap();
+				var parameters = property.Parameters;
+				if (index >= parameterMap.Count)
+					return null;
+				var name = parameters.ElementAt(parameterMap [index]).Name;
+				return new CodeAction(string.Format(context.TranslateString("Add argument name '{0}'"), name), script => {
+					for (int i = 0; i< nodes.Count; i++) {
+						int p = index + i;
+						if (p >= parameterMap.Count)
+							break;
+						name = parameters.ElementAt(parameterMap [p]).Name;
+						var namedArgument = new NamedArgumentExpression(name, arguments.ElementAt(p).Clone());
+						script.Replace(arguments.ElementAt(p), namedArgument);
+					}}, 
+				expression
+				);
+			} 
+
+			if (parent is InvocationExpression) {
+				var resolvedResult = context.Resolve(parent as InvocationExpression);
+				if (resolvedResult.IsError)
+					return null;
+				var arguments = (parent as InvocationExpression).Arguments;
+				IMember member = (resolvedResult as CSharpInvocationResolveResult).Member;
+				
+				int index = 0;
+				int temp = 0; 
+				List<Expression> nodes = new List<Expression>();
+				foreach (var argument in arguments) {
+					if (argument.Equals(expression)) {
+						nodes = CollectNodes(parent, expression);
+						break;
+					}
+					temp++;
+				}
+				index = temp;
+				if (!nodes.Any())
+					return null;
+			
+				var method = member as IMethod;
+				if (method == null || method.Parameters.Count == 0 || method.Parameters.Last().IsParams)
+					return null;
+
+				var parameterMap = (resolvedResult as CSharpInvocationResolveResult).GetArgumentToParameterMap();
+				var parameters = method.Parameters;
+				if (index >= parameterMap.Count)
+					return null;
+				var name = parameters.ElementAt(parameterMap [index]).Name;
+				return new CodeAction(string.Format(context.TranslateString("Add argument name '{0}'"), name), script => {
+					for (int i = 0; i< nodes.Count; i++) {
+						int p = index + i;
+						if (p >= parameterMap.Count)
+							break;
+						name = parameters.ElementAt(parameterMap [p]).Name;
+						var namedArgument = new NamedArgumentExpression(name, arguments.ElementAt(p).Clone());
+						script.Replace(arguments.ElementAt(p), namedArgument);
+					}}, 
+				expression
+				);
+			}
+			return null;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddBracesAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddBracesAction.cs
new file mode 100644
index 0000000000..e6cb02b5ce
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddBracesAction.cs
@@ -0,0 +1,57 @@
+//
+// AddBracesAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Add braces", Description = "Removes redundant braces around a statement.")]
+	public class AddBracesAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			string keyword;
+			Statement embeddedStatement;
+//			BlockStatement block;
+
+			var curNode = context.GetNode();
+			if (!RemoveBracesAction.IsSpecialNode(curNode, out keyword, out embeddedStatement))
+				yield break;
+			if (embeddedStatement is BlockStatement)
+				yield break;
+			yield return new CodeAction (
+				string.Format(context.TranslateString("Add braces to '{0}'"), keyword),
+				script => {
+					script.Replace(embeddedStatement, new BlockStatement { embeddedStatement.Clone() });
+				}, 
+				curNode
+			);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddCatchTypeAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddCatchTypeAction.cs
new file mode 100644
index 0000000000..58558556ae
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddCatchTypeAction.cs
@@ -0,0 +1,60 @@
+//
+// AddCatchTypeAction.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Add type to general catch clause",
+	               Description = "Adds an exception type specifier to general catch clauses.")]
+	public class AddCatchTypeAction : CodeActionProvider
+	{
+		#region ICodeActionProvider implementation
+
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var catchClause = context.GetNode<CatchClause>();
+			if (catchClause == null)
+				yield break;
+			if (!catchClause.Type.IsNull)
+				yield break;
+			yield return new CodeAction(context.TranslateString("Add type specifier"), script => {
+				var newType = context.CreateShortType("System", "Exception");
+				var namingHelper = new NamingHelper(context);
+				var newIdentifier = Identifier.Create(namingHelper.GenerateVariableName(newType, "e"));
+
+				script.Replace(catchClause, new CatchClause {
+					Type = newType,
+					VariableNameToken = newIdentifier,
+					Body = catchClause.Body.Clone() as BlockStatement
+				});
+				script.Select(newType);
+			}, catchClause);
+		}
+
+		#endregion
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddExceptionDescriptionAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddExceptionDescriptionAction.cs
new file mode 100644
index 0000000000..f2f0fae58b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddExceptionDescriptionAction.cs
@@ -0,0 +1,84 @@
+//
+// AddExceptionDescriptionAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.Xml;
+using ICSharpCode.NRefactory.Documentation;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Add an exception description to the xml documentation",
+	               Description = "Add an exception description to the xml documentation")]
+	public class AddExceptionDescriptionAction : SpecializedCodeAction<ThrowStatement>
+	{
+		static AstNode SearchInsertionNode (AstNode entity)
+		{
+			AstNode result = entity;
+			while (result != null && (result.Role == Roles.Comment || result.Role == Roles.NewLine || result.Role == Roles.Whitespace))
+				result = result.NextSibling;
+			return result;
+		}
+
+		protected override CodeAction GetAction (RefactoringContext context, ThrowStatement node)
+		{
+			var entity = node.GetParent<EntityDeclaration> ();
+			if (entity == null)
+				return null;
+			var rr = context.Resolve (entity) as MemberResolveResult;
+			if (rr == null || rr.IsError)
+				return null;
+			var expr = context.Resolve (node.Expression);
+			if (expr == null || expr.IsError || expr.Type.GetDefinition () == null)
+				return null;
+
+			var docElement = XmlDocumentationElement.Get (rr.Member);
+			if (docElement == null || docElement.Children.Count == 0)
+				return null;
+			foreach (var de in docElement.Children) {
+				if (de.Name == "exception") {
+					if (de.ReferencedEntity == expr.Type)
+						return null;
+				}
+			}
+
+			return new CodeAction (
+				context.TranslateString ("Add exception to xml documentation"),
+				script => {
+					var startText = string.Format (" <exception cref=\"{0}\">", expr.Type.GetDefinition ().GetIdString ());
+					var comment = new Comment (startText +"</exception>", CommentType.Documentation);
+					script.InsertBefore (
+						SearchInsertionNode (entity.FirstChild) ?? entity, 
+						comment
+					);
+					script.Select (script.GetSegment (comment).Offset + ("///" + startText).Length, 0);
+				},
+				node
+			);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddOptionalParameterToInvocationAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddOptionalParameterToInvocationAction.cs
new file mode 100644
index 0000000000..e7a91c2a05
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddOptionalParameterToInvocationAction.cs
@@ -0,0 +1,134 @@
+//
+// AddOptionalParameterToInvocationAction.cs
+//
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+//
+// Copyright (c) 2013 Luís Reis
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.Xml;
+using ICSharpCode.NRefactory.Documentation;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Add one or more optional parameters to an invocation, using their default values",
+	               Description = "Add one or more optional parameters to an invocation.")]
+	public class AddOptionalParameterToInvocationAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var invocationExpression = context.GetNode<InvocationExpression>();
+			if (invocationExpression == null)
+				yield break;
+
+			var resolveResult = context.Resolve(invocationExpression) as InvocationResolveResult;
+			if (resolveResult == null) {
+				yield break;
+			}
+
+			var method = (IMethod)resolveResult.Member;
+
+			bool foundOptionalParameter = false;
+			foreach (var parameter in method.Parameters) {
+				if (parameter.IsParams) {
+					yield break;
+				}
+
+				if (parameter.IsOptional) {
+					foundOptionalParameter = true;
+					break;
+				}
+			}
+
+			if (!foundOptionalParameter) {
+				yield break;
+			}
+
+			//Basic sanity checks done, now see if there are any missing optional arguments
+			var missingParameters = new List<IParameter>(method.Parameters);
+			if (resolveResult.Arguments.Count != invocationExpression.Arguments.Count) {
+				//Extension method
+				missingParameters.RemoveAt (0);
+			}
+			foreach (var argument in invocationExpression.Arguments) {
+				var namedArgument = argument as NamedArgumentExpression;
+				if (namedArgument == null) {
+					missingParameters.RemoveAt(0);
+				} else {
+					missingParameters.RemoveAll(parameter => parameter.Name == namedArgument.Name);
+				}
+			}
+
+			foreach (var parameterToAdd in missingParameters) {
+				//Add specific parameter
+				yield return new CodeAction(string.Format(context.TranslateString("Add optional parameter \"{0}\""),
+				                                         parameterToAdd.Name),
+				                           script => {
+
+					var newInvocation = (InvocationExpression)invocationExpression.Clone();
+					AddArgument(newInvocation, parameterToAdd, parameterToAdd == missingParameters.First());
+					script.Replace(invocationExpression, newInvocation);
+
+				}, invocationExpression);
+			}
+
+			if (missingParameters.Count > 1) {
+				//Add all parameters at once
+				yield return new CodeAction(context.TranslateString("Add all optional parameters"),
+				                            script => {
+
+					var newInvocation = (InvocationExpression)invocationExpression.Clone();
+
+					foreach (var parameterToAdd in missingParameters) {
+						//We'll add the remaining parameters, in the order they were declared in the function
+						AddArgument(newInvocation, parameterToAdd, true);
+					}
+					script.Replace(invocationExpression, newInvocation);
+
+				}, invocationExpression);
+			}
+		}
+
+		static void AddArgument(InvocationExpression newNode, IParameter parameterToAdd, bool isNextInSequence)
+		{
+			Expression defaultValue;
+			if (parameterToAdd.ConstantValue == null) {
+				defaultValue = new NullReferenceExpression();
+			}
+			else {
+				defaultValue = new PrimitiveExpression(parameterToAdd.ConstantValue);
+			}
+			Expression newArgument;
+			if (newNode.Arguments.Any(argument => argument is NamedExpression) || !isNextInSequence) {
+				newArgument = new NamedArgumentExpression(parameterToAdd.Name, defaultValue);
+			}
+			else {
+				newArgument = defaultValue;
+			}
+			newNode.Arguments.Add(newArgument);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddUsingAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddUsingAction.cs
new file mode 100644
index 0000000000..c4c50195fb
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddUsingAction.cs
@@ -0,0 +1,156 @@
+// Copyright (c) 2013 Daniel Grunwald
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// 1) When a type cannot be resolved, offers to add a using declaration
+	/// or to replace it with the fully qualified type name.
+	/// 2) When an extension method cannot be resolved, offers to add a using declaration.
+	/// 3) When the caret is on a namespace name, offers to add a using declaration
+	/// and simplify the type references to use the new shorter option.
+	/// </summary>
+	[ContextAction ("Add using", Description = "Add missing using declaration.")]
+	public class AddUsingAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			AstNode node = context.GetNode();
+			if (node is Identifier)
+				node = node.Parent;
+			if (node is SimpleType || node is IdentifierExpression) {
+				return GetActionsForType(context, node)
+					.Concat(GetActionsForAddNamespaceUsing(context, node));
+			} else if (node is MemberReferenceExpression && node.Parent is InvocationExpression) {
+				return GetActionsForExtensionMethodInvocation(context, (InvocationExpression)node.Parent);
+			} else if (node is MemberReferenceExpression) {
+				return GetActionsForAddNamespaceUsing(context, node);
+			} else {
+				return EmptyList<CodeAction>.Instance;
+			}
+		}
+		
+		IEnumerable<CodeAction> GetActionsForType(RefactoringContext context, AstNode node)
+		{
+			var rr = context.Resolve(node) as UnknownIdentifierResolveResult;
+			if (rr == null)
+				return EmptyList<CodeAction>.Instance;
+			
+			string identifier = rr.Identifier;
+			int tc = rr.TypeArgumentCount;
+			string attributeIdentifier = null;
+			if (node.Parent is Attribute)
+				attributeIdentifier = identifier + "Attribute";
+			
+			var lookup = new MemberLookup(null, context.Compilation.MainAssembly);
+			List<CodeAction> actions = new List<CodeAction>();
+			foreach (var typeDefinition in context.Compilation.GetAllTypeDefinitions()) {
+				if ((typeDefinition.Name == identifier || typeDefinition.Name == attributeIdentifier)
+				    && typeDefinition.TypeParameterCount == tc
+				    && lookup.IsAccessible(typeDefinition, false))
+				{
+					if (typeDefinition.DeclaringTypeDefinition == null) {
+						actions.Add(NewUsingAction(context, node, typeDefinition.Namespace));
+					}
+					actions.Add(ReplaceWithFullTypeNameAction(context, node, typeDefinition));
+				}
+			}
+			return actions;
+		}
+		
+		CodeAction NewUsingAction(RefactoringContext context, AstNode node, string ns)
+		{
+			return new CodeAction("using " + ns + ";", s => UsingHelper.InsertUsingAndRemoveRedundantNamespaceUsage(context, s, ns), node);
+		}
+		
+		CodeAction ReplaceWithFullTypeNameAction(RefactoringContext context, AstNode node, ITypeDefinition typeDefinition)
+		{
+			AstType astType = context.CreateShortType(typeDefinition);
+			string textWithoutGenerics = astType.ToString();
+			foreach (var typeArg in node.GetChildrenByRole(Roles.TypeArgument)) {
+				astType.AddChild(typeArg.Clone(), Roles.TypeArgument);
+			}
+			return new CodeAction(textWithoutGenerics, s => s.Replace(node, astType), node);
+		}
+		
+		IEnumerable<CodeAction> GetActionsForExtensionMethodInvocation(RefactoringContext context, InvocationExpression invocation)
+		{
+			var rr = context.Resolve(invocation) as UnknownMethodResolveResult;
+			if (rr == null)
+				return EmptyList<CodeAction>.Instance;
+			
+			var lookup = new MemberLookup(null, context.Compilation.MainAssembly);
+			HashSet<string> namespaces = new HashSet<string>();
+			List<CodeAction> result = new List<CodeAction>();
+			foreach (var typeDefinition in context.Compilation.GetAllTypeDefinitions()) {
+				if (!(typeDefinition.HasExtensionMethods && lookup.IsAccessible(typeDefinition, false))) {
+					continue;
+				}
+				foreach (var method in typeDefinition.Methods.Where(m => m.IsExtensionMethod && m.Name == rr.MemberName)) {
+					IType[] inferredTypes;
+					if (CSharpResolver.IsEligibleExtensionMethod(rr.TargetType, method, true, out inferredTypes)) {
+						// avoid offering the same namespace twice
+						if (namespaces.Add(typeDefinition.Namespace)) {
+							result.Add(NewUsingAction(context, invocation, typeDefinition.Namespace));
+						}
+						break; // continue with the next type
+					}
+				}
+			}
+			return result;
+		}
+		
+		IEnumerable<CodeAction> GetActionsForAddNamespaceUsing(RefactoringContext context, AstNode node)
+		{
+			var nrr = context.Resolve(node) as NamespaceResolveResult;
+			if (nrr == null)
+				return EmptyList<CodeAction>.Instance;
+			
+			var trr = context.Resolve(node.Parent) as TypeResolveResult;
+			if (trr == null)
+				return EmptyList<CodeAction>.Instance;
+			ITypeDefinition typeDef = trr.Type.GetDefinition();
+			if (typeDef == null)
+				return EmptyList<CodeAction>.Instance;
+			
+			IList<IType> typeArguments;
+			ParameterizedType parameterizedType = trr.Type as ParameterizedType;
+			if (parameterizedType != null)
+				typeArguments = parameterizedType.TypeArguments;
+			else
+				typeArguments = EmptyList<IType>.Instance;
+			
+			var resolver = context.GetResolverStateBefore(node.Parent);
+			if (resolver.ResolveSimpleName(typeDef.Name, typeArguments) is UnknownIdentifierResolveResult) {
+				// It's possible to remove the explicit namespace usage and introduce a using instead
+				return new[] { NewUsingAction(context, node, typeDef.Namespace) };
+			}
+			return EmptyList<CodeAction>.Instance;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AutoLinqSumAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AutoLinqSumAction.cs
new file mode 100644
index 0000000000..5eacb98c38
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AutoLinqSumAction.cs
@@ -0,0 +1,435 @@
+// 
+// AutoLinqSum.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis <luiscubal@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Convers a loop to a Linq expression.
+	/// </summary>
+	[ContextAction("Convert loop to Linq expression", Description = "Converts a loop to a Linq expression")]
+	public class AutoLinqSumAction : CodeActionProvider
+	{
+		// Disabled for nullables, since int? x = 3; x += null; has result x = null,
+		// but LINQ Sum behaves differently : nulls are treated as zero
+		static readonly IEnumerable<string> LinqSummableTypes = new string[] {
+			"System.UInt16",
+			"System.Int16",
+			"System.UInt32",
+			"System.Int32",
+			"System.UInt64",
+			"System.Int64",
+			"System.Single",
+			"System.Double",
+			"System.Decimal"
+		};
+
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var loop = GetForeachStatement (context);
+			if (loop == null) {
+				yield break;
+			}
+
+			if (context.GetResolverStateBefore(loop)
+			    .LookupSimpleNameOrTypeName("Enumerable", new List<IType>(), NameLookupMode.Type)
+			    .Type.FullName != "System.Linq.Enumerable") {
+
+				yield break;
+			}
+
+			var outputStatement = GetTransformedAssignmentExpression (context, loop);
+			if (outputStatement == null) {
+				yield break;
+			}
+
+			yield return new CodeAction(context.TranslateString("Convert foreach loop to LINQ expression"), script => {
+
+				var prevSibling = loop.GetPrevSibling(node => node is Statement);
+
+				Expression leftSide = outputStatement.Left;
+				Expression rightSide = outputStatement.Right;
+
+				Expression expressionToReplace = GetExpressionToReplace(prevSibling, leftSide);
+
+				if (expressionToReplace != null) {
+					Expression replacementExpression = rightSide.Clone();
+					if (!IsZeroPrimitive(expressionToReplace)) {
+						replacementExpression = new BinaryOperatorExpression(ParenthesizeIfNeeded(expressionToReplace).Clone(),
+						                                                     BinaryOperatorType.Add,
+						                                                     replacementExpression);
+					}
+
+					script.Replace(expressionToReplace, replacementExpression);
+					script.Remove(loop);
+				}
+				else {
+					script.Replace(loop, new ExpressionStatement(outputStatement));
+				}
+
+			}, loop);
+		}
+
+		bool IsZeroPrimitive(Expression expr)
+		{
+			//We want a very simple check -- no looking at constants, no constant folding, etc.
+			//So 1+1 should return false, but (0) should return true
+
+			var parenthesizedExpression = expr as ParenthesizedExpression;
+			if (parenthesizedExpression != null) {
+				return IsZeroPrimitive(parenthesizedExpression.Expression);
+			}
+
+			var zeroLiteralInteger = new PrimitiveExpression(0);
+			var zeroLiteralFloat = new PrimitiveExpression(0.0f);
+			var zeroLiteralDouble = new PrimitiveExpression(0.0);
+			var zeroLiteralDecimal = new PrimitiveExpression(0.0m);
+
+			return SameNode(zeroLiteralInteger, expr) ||
+				SameNode(zeroLiteralFloat, expr) ||
+				SameNode(zeroLiteralDouble, expr) ||
+				SameNode(zeroLiteralDecimal, expr);
+		}
+
+		Expression GetExpressionToReplace(AstNode prevSibling, Expression requiredLeftSide)
+		{
+			if (prevSibling == null) {
+				return null;
+			}
+
+			var declarationStatement = prevSibling as VariableDeclarationStatement;
+			if (declarationStatement != null)
+			{
+				if (declarationStatement.Variables.Count != 1) {
+					return null;
+				}
+
+				var identifierExpr = requiredLeftSide as IdentifierExpression;
+				if (identifierExpr == null) {
+					return null;
+				}
+
+				var variableDecl = declarationStatement.Variables.First();
+
+				if (!SameNode(identifierExpr.IdentifierToken, variableDecl.NameToken)) {
+					return null;
+				}
+
+				return variableDecl.Initializer;
+			}
+
+			var exprStatement = prevSibling as ExpressionStatement;
+			if (exprStatement != null) {
+				var assignment = exprStatement.Expression as AssignmentExpression;
+				if (assignment != null) {
+					if (assignment.Operator != AssignmentOperatorType.Assign &&
+						assignment.Operator != AssignmentOperatorType.Add) {
+
+						return null;
+					}
+
+					if (!SameNode(requiredLeftSide, assignment.Left)) {
+						return null;
+					}
+
+					return assignment.Right;
+				}
+			}
+
+			return null;
+		}
+
+		bool IsUnaryModifierExpression(UnaryOperatorExpression expr)
+		{
+			return expr.Operator == UnaryOperatorType.Increment || expr.Operator == UnaryOperatorType.PostIncrement || expr.Operator == UnaryOperatorType.Decrement || expr.Operator == UnaryOperatorType.PostDecrement;
+		}
+
+		AssignmentExpression GetTransformedAssignmentExpression (RefactoringContext context, ForeachStatement foreachStatement)
+		{
+			var enumerableToIterate = foreachStatement.InExpression.Clone();
+
+			Statement statement = foreachStatement.EmbeddedStatement;
+
+			Expression leftExpression, rightExpression;
+			if (!ExtractExpression(statement, out leftExpression, out rightExpression)) {
+				return null;
+			}
+			if (leftExpression == null || rightExpression == null) {
+				return null;
+			}
+
+			var type = context.Resolve(leftExpression).Type;
+			if (!IsLinqSummableType(type)) {
+				return null;
+			}
+
+			if (rightExpression.DescendantsAndSelf.OfType<AssignmentExpression>().Any()) {
+				// Reject loops such as
+				// int k = 0;
+				// foreach (var x in y) { k += (z = 2); }
+
+				return null;
+			}
+
+			if (rightExpression.DescendantsAndSelf.OfType<UnaryOperatorExpression>().Any(IsUnaryModifierExpression)) {
+				// int k = 0;
+				// foreach (var x in y) { k += (z++); }
+
+				return null;
+			}
+
+			var zeroLiteral = new PrimitiveExpression(0);
+
+			Expression baseExpression = enumerableToIterate;
+			for (;;) {
+				ConditionalExpression condition = rightExpression as ConditionalExpression;
+				if (condition == null) {
+					break;
+				}
+
+				if (SameNode(zeroLiteral, condition.TrueExpression)) {
+					baseExpression = new InvocationExpression(new MemberReferenceExpression(baseExpression.Clone(), "Where"),
+					                                          BuildLambda(foreachStatement.VariableName, CSharpUtil.InvertCondition(condition.Condition)));
+					rightExpression = condition.FalseExpression.Clone();
+
+					continue;
+				}
+
+				if (SameNode(zeroLiteral, condition.FalseExpression)) {
+					baseExpression = new InvocationExpression(new MemberReferenceExpression(baseExpression.Clone(), "Where"),
+					                                          BuildLambda(foreachStatement.VariableName, condition.Condition.Clone()));
+					rightExpression = condition.TrueExpression.Clone();
+
+					continue;
+				}
+
+				break;
+			}
+
+			var primitiveOne = new PrimitiveExpression(1);
+			bool isPrimitiveOne = SameNode(primitiveOne, rightExpression);
+
+			var arguments = new List<Expression>();
+
+			string method = isPrimitiveOne ? "Count" : "Sum";
+
+			if (!isPrimitiveOne && !IsIdentifier(rightExpression, foreachStatement.VariableName)) {
+				var lambda = BuildLambda(foreachStatement.VariableName, rightExpression);
+
+				arguments.Add(lambda);
+			}
+
+			var rightSide = new InvocationExpression(new MemberReferenceExpression(baseExpression, method), arguments);
+
+			return new AssignmentExpression(leftExpression.Clone(), AssignmentOperatorType.Add, rightSide);
+		}
+
+		static LambdaExpression BuildLambda(string variableName, Expression expression)
+		{
+			var lambda = new LambdaExpression();
+			lambda.Parameters.Add(new ParameterDeclaration() {
+				Name = variableName
+			});
+			lambda.Body = expression.Clone();
+			return lambda;
+		}
+
+		bool IsIdentifier(Expression expr, string variableName)
+		{
+			var identifierExpr = expr as IdentifierExpression;
+			if (identifierExpr != null) {
+				return identifierExpr.Identifier == variableName;
+			}
+
+			var parenthesizedExpr = expr as ParenthesizedExpression;
+			if (parenthesizedExpr != null) {
+				return IsIdentifier(parenthesizedExpr.Expression, variableName);
+			}
+
+			return false;
+		}
+
+		bool IsLinqSummableType(IType type) {
+			return LinqSummableTypes.Contains(type.FullName);
+		}
+
+		bool ExtractExpression (Statement statement, out Expression leftSide, out Expression rightSide) {
+			ExpressionStatement expression = statement as ExpressionStatement;
+			if (expression != null) {
+				AssignmentExpression assignment = expression.Expression as AssignmentExpression;
+				if (assignment != null) {
+					if (assignment.Operator == AssignmentOperatorType.Add) {
+						leftSide = assignment.Left;
+						rightSide = assignment.Right;
+						return true;
+					}
+					if (assignment.Operator == AssignmentOperatorType.Subtract) {
+						leftSide = assignment.Left;
+						rightSide = new UnaryOperatorExpression(UnaryOperatorType.Minus, assignment.Right.Clone());
+						return true;
+					}
+
+					leftSide = null;
+					rightSide = null;
+					return false;
+				}
+
+				UnaryOperatorExpression unary = expression.Expression as UnaryOperatorExpression;
+				if (unary != null) {
+					leftSide = unary.Expression;
+					if (unary.Operator == UnaryOperatorType.Increment || unary.Operator == UnaryOperatorType.PostIncrement) {
+						rightSide = new PrimitiveExpression(1);
+						return true;
+					} else if (unary.Operator == UnaryOperatorType.Decrement || unary.Operator == UnaryOperatorType.PostDecrement) {
+						rightSide = new PrimitiveExpression(-1);
+						return true;
+					} else {
+						leftSide = null;
+						rightSide = null;
+						return false;
+					}
+				}
+			}
+
+			if (statement is EmptyStatement || statement.IsNull) {
+				leftSide = null;
+				rightSide = null;
+				return true;
+			}
+
+			BlockStatement block = statement as BlockStatement;
+			if (block != null) {
+				leftSide = null;
+				rightSide = null;
+
+				foreach (Statement child in block.Statements) {
+					Expression newLeft, newRight;
+					if (!ExtractExpression(child, out newLeft, out newRight)) {
+						leftSide = null;
+						rightSide = null;
+						return false;
+					}
+
+					if (newLeft == null) {
+						continue;
+					}
+
+					if (leftSide == null) {
+						leftSide = newLeft;
+						rightSide = newRight;
+					} else if (SameNode(leftSide, newLeft)) {
+						rightSide = new BinaryOperatorExpression(ParenthesizeIfNeeded(rightSide).Clone(),
+						                                         BinaryOperatorType.Add,
+						                                         ParenthesizeIfNeeded(newRight).Clone());
+					} else {
+						return false;
+					}
+				}
+
+				return true;
+			}
+
+			IfElseStatement condition = statement as IfElseStatement;
+			if (condition != null) {
+				Expression ifLeft, ifRight;
+				if (!ExtractExpression(condition.TrueStatement, out ifLeft, out ifRight)) {
+					leftSide = null;
+					rightSide = null;
+					return false;
+				}
+
+				Expression elseLeft, elseRight;
+				if (!ExtractExpression(condition.FalseStatement, out elseLeft, out elseRight)) {
+					leftSide = null;
+					rightSide = null;
+					return false;
+				}
+
+				if (ifLeft == null && elseLeft == null) {
+					leftSide = null;
+					rightSide = null;
+					return true;
+				}
+
+				if (ifLeft != null && elseLeft != null && !SameNode(ifLeft, elseLeft)) {
+					leftSide = null;
+					rightSide = null;
+					return false;
+				}
+
+				ifRight = ifRight ?? new PrimitiveExpression(0);
+				elseRight = elseRight ?? new PrimitiveExpression(0);
+
+				leftSide = ifLeft ?? elseLeft;
+				rightSide = new ConditionalExpression(condition.Condition.Clone(), ifRight.Clone(), elseRight.Clone());
+				return true;
+			}
+
+			leftSide = null;
+			rightSide = null;
+			return false;
+		}
+
+		Expression ParenthesizeIfNeeded(Expression expr)
+		{
+			if (expr is ConditionalExpression) {
+				return new ParenthesizedExpression(expr.Clone());
+			}
+
+			var binaryExpression = expr as BinaryOperatorExpression;
+			if (binaryExpression != null) {
+				if (binaryExpression.Operator != BinaryOperatorType.Multiply &&
+					binaryExpression.Operator != BinaryOperatorType.Divide &&
+					binaryExpression.Operator != BinaryOperatorType.Modulus) {
+
+					return new ParenthesizedExpression(expr.Clone());
+				}
+			}
+
+			return expr;
+		}
+
+		bool SameNode(INode expr1, INode expr2)
+		{
+			Match m = expr1.Match(expr2);
+			return m.Success;
+		}
+
+		static ForeachStatement GetForeachStatement (RefactoringContext context)
+		{
+			var foreachStatement = context.GetNode<ForeachStatement>();
+			if (foreachStatement == null || !foreachStatement.ForeachToken.Contains(context.Location))
+				return null;
+
+			return foreachStatement;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CS1520MethodMustHaveAReturnTypeAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CS1520MethodMustHaveAReturnTypeAction.cs
new file mode 100644
index 0000000000..404f31f57a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CS1520MethodMustHaveAReturnTypeAction.cs
@@ -0,0 +1,71 @@
+//
+// CS1520MethodMustHaveAReturnTypeAction.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Threading;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Class, struct or interface method must have a return type", Description = "Found method without return type.")]
+	public class CS1520MethodMustHaveAReturnTypeAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var entity = context.GetNode<ConstructorDeclaration>();
+			if (entity == null)
+				yield break;
+			var type = entity.Parent as TypeDeclaration;
+
+			if (type == null || entity.Name == type.Name)
+				yield break;
+
+			var typeDeclaration = entity.GetParent<TypeDeclaration>();
+
+			yield return new CodeAction(context.TranslateString("This is a constructor"), script => script.Replace(entity.NameToken, Identifier.Create(typeDeclaration.Name, TextLocation.Empty)), entity) {
+				Severity = ICSharpCode.NRefactory.Refactoring.Severity.Error
+			};
+
+			yield return new CodeAction(context.TranslateString("This is a void method"), script => {
+				var generatedMethod = new MethodDeclaration();
+				generatedMethod.Modifiers = entity.Modifiers;
+				generatedMethod.ReturnType = new PrimitiveType("void");
+				generatedMethod.Name = entity.Name;
+				generatedMethod.Parameters.AddRange(entity.Parameters.Select(parameter => (ParameterDeclaration)parameter.Clone()));
+				generatedMethod.Body = (BlockStatement)entity.Body.Clone();
+				generatedMethod.Attributes.AddRange(entity.Attributes.Select(attribute => (AttributeSection)attribute.Clone()));
+
+				script.Replace(entity, generatedMethod);
+			}, entity) {
+				Severity = ICSharpCode.NRefactory.Refactoring.Severity.Error
+			};
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ChangeAccessModifierAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ChangeAccessModifierAction.cs
new file mode 100644
index 0000000000..75c0744fd2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ChangeAccessModifierAction.cs
@@ -0,0 +1,175 @@
+//
+// ChangeAccessModifierAction.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp;
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Changes the access level of an entity declaration
+	/// </summary>
+	[ContextAction("Change the access level of an entity declaration", Description = "Changes the access level of an entity declaration")]
+	public class ChangeAccessModifierAction : CodeActionProvider
+	{
+		Dictionary<string, Modifiers> accessibilityLevels = new Dictionary<string, Modifiers> {
+			{ "private", Modifiers.Private },
+			{ "protected", Modifiers.Protected },
+			{ "protected internal", Modifiers.Protected | Modifiers.Internal },
+			{ "internal", Modifiers.Internal },
+			{ "public", Modifiers.Public }
+		};
+
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var node = context.GetNode<EntityDeclaration>();
+			if (node == null)
+				yield break;
+
+			var selectedNode = node.GetNodeAt(context.Location);
+			if (selectedNode == null)
+				yield break;
+
+			if (selectedNode.Role != PropertyDeclaration.SetKeywordRole && 
+			    selectedNode.Role != PropertyDeclaration.GetKeywordRole && 
+			    selectedNode != node.NameToken) {
+				if (selectedNode.Role == EntityDeclaration.ModifierRole) {
+					var mod = (CSharpModifierToken)selectedNode;
+					if ((mod.Modifier & Modifiers.VisibilityMask) == 0)
+						yield break;
+				} else {
+					yield break;
+				}
+			}
+
+			if (node is EnumMemberDeclaration) {
+				yield break;
+			}
+
+			if (node.HasModifier(Modifiers.Override))
+				yield break;
+
+			var parentTypeDeclaration = node.GetParent<TypeDeclaration>();
+			if (parentTypeDeclaration != null && parentTypeDeclaration.ClassType == ClassType.Interface) {
+				//Interface members have no access modifiers
+				yield break;
+			}
+
+			var resolveResult = context.Resolve(node) as MemberResolveResult;
+			if (resolveResult != null) {
+				if (resolveResult.Member.ImplementedInterfaceMembers.Any())
+					yield break;
+			}
+
+			foreach (var accessName in accessibilityLevels.Keys) {
+				var access = accessibilityLevels [accessName];
+
+				if (parentTypeDeclaration == null && ((access & (Modifiers.Private | Modifiers.Protected)) != 0)) {
+					//Top-level declarations can only be public or internal
+					continue;
+				}
+
+				var accessor = node as Accessor;
+				if (accessor != null) {
+					//Allow only converting to modifiers stricter than the parent entity
+
+					var actualParentAccess = GetActualAccess(parentTypeDeclaration, accessor.GetParent<EntityDeclaration>());
+					if (access != actualParentAccess && !IsStricterThan (access, actualParentAccess)) {
+						continue;
+					}
+				}
+
+				if (GetActualAccess(parentTypeDeclaration, node) != access) {
+					yield return GetActionForLevel(context, accessName, access, node, selectedNode);
+				}
+			}
+		}
+
+		static bool IsStricterThan(Modifiers access1, Modifiers access2)
+		{
+			//First cover the basic cases
+			if (access1 == access2) {
+				return false;
+			}
+
+			if (access1 == Modifiers.Private) {
+				return true;
+			}
+			if (access2 == Modifiers.Private) {
+				return false;
+			}
+
+			if (access1 == Modifiers.Public) {
+				return false;
+			}
+			if (access2 == Modifiers.Public) {
+				return true;
+			}
+
+			return access2 == (Modifiers.Protected | Modifiers.Internal);
+		}
+
+		static Modifiers GetActualAccess(AstNode parentTypeDeclaration, EntityDeclaration node)
+		{
+			Modifiers nodeAccess = node.Modifiers & Modifiers.VisibilityMask;
+			if (nodeAccess == Modifiers.None && node is Accessor) {
+				EntityDeclaration parent = node.GetParent<EntityDeclaration>();
+
+				nodeAccess = parent.Modifiers & Modifiers.VisibilityMask;
+			}
+
+			if (nodeAccess == Modifiers.None) {
+				if (parentTypeDeclaration == null) {
+					return Modifiers.Internal;
+				}
+				return Modifiers.Private;
+			}
+
+			return nodeAccess & Modifiers.VisibilityMask;
+		}
+
+		CodeAction GetActionForLevel(RefactoringContext context, string accessName, Modifiers access, EntityDeclaration node, AstNode selectedNode)
+		{
+			return new CodeAction(context.TranslateString("To " + accessName), script => {
+
+				Modifiers newModifiers = node.Modifiers;
+				newModifiers &= ~Modifiers.VisibilityMask;
+				
+				if (!(node is Accessor) || access != (node.GetParent<EntityDeclaration>().Modifiers & Modifiers.VisibilityMask)) {
+					//Do not add access modifier for accessors if the new access level is the same as the parent
+					//That is, in public int X { $private get; } if access == public, then the result should not have the modifier
+					newModifiers |= access;
+				}
+
+				script.ChangeModifier(node, newModifiers);
+
+			}, selectedNode);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CheckIfParameterIsNullAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CheckIfParameterIsNullAction.cs
new file mode 100644
index 0000000000..fc4ad1d482
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CheckIfParameterIsNullAction.cs
@@ -0,0 +1,94 @@
+// 
+// CheckIfParameterIsNull.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Creates a 'if (param == null) throw new System.ArgumentNullException ();' contruct for a parameter.
+	/// </summary>
+	[ContextAction("Check if parameter is null", Description = "Checks function parameter is not null.")]
+	public class CheckIfParameterIsNullAction : SpecializedCodeAction<ParameterDeclaration>
+	{
+		protected override CodeAction GetAction(RefactoringContext context, ParameterDeclaration parameter)
+		{
+			if (!parameter.NameToken.Contains(context.Location))
+				return null;
+			BlockStatement bodyStatement;
+			if (parameter.Parent is LambdaExpression) {
+				bodyStatement = parameter.Parent.GetChildByRole (LambdaExpression.BodyRole) as BlockStatement;
+			} else {
+				bodyStatement = parameter.Parent.GetChildByRole (Roles.Body);
+			}
+			if (bodyStatement == null || bodyStatement.IsNull)
+				return null;
+			var type = context.ResolveType(parameter.Type);
+			if (type.IsReferenceType == false || HasNullCheck(parameter)) 
+				return null;
+			
+			return new CodeAction(context.TranslateString("Add null check for parameter"), script => {
+				var statement = new IfElseStatement() {
+					Condition = new BinaryOperatorExpression (new IdentifierExpression (parameter.Name), BinaryOperatorType.Equality, new NullReferenceExpression ()),
+					TrueStatement = new ThrowStatement (new ObjectCreateExpression (context.CreateShortType("System", "ArgumentNullException"), new PrimitiveExpression (parameter.Name)))
+				};
+				script.AddTo(bodyStatement, statement);
+			}, parameter.NameToken);
+		}
+
+		static bool HasNullCheck (ParameterDeclaration parameter)
+		{
+			var visitor = new CheckNullVisitor (parameter);
+			parameter.Parent.AcceptVisitor (visitor, null);
+			return visitor.ContainsNullCheck;
+		}
+		
+		class CheckNullVisitor : DepthFirstAstVisitor<object, object>
+		{
+			readonly Expression pattern;
+			
+			internal bool ContainsNullCheck;
+			
+			public CheckNullVisitor (ParameterDeclaration parameter)
+			{
+				pattern = PatternHelper.CommutativeOperator(new IdentifierExpression(parameter.Name), BinaryOperatorType.Any, new NullReferenceExpression());
+			}
+			
+			public override object VisitIfElseStatement (IfElseStatement ifElseStatement, object data)
+			{
+				if (ifElseStatement.Condition is BinaryOperatorExpression) {
+					var binOp = ifElseStatement.Condition as BinaryOperatorExpression;
+					if ((binOp.Operator == BinaryOperatorType.Equality || binOp.Operator == BinaryOperatorType.InEquality) && pattern.IsMatch(binOp)) {
+						ContainsNullCheck = true;
+					}
+				}
+				
+				return base.VisitIfElseStatement (ifElseStatement, data);
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ComputeConstantValueAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ComputeConstantValueAction.cs
new file mode 100644
index 0000000000..37ab12e92b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ComputeConstantValueAction.cs
@@ -0,0 +1,53 @@
+// 
+// ComputeConstantValueAction.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Compute constant value", Description = "Computes the value of the current expression and replaces it.")]
+	public class ComputeConstantValueAction : CodeActionProvider
+	{
+		public override System.Collections.Generic.IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var expression = context.GetNode(i => i is BinaryOperatorExpression || i is UnaryOperatorExpression);
+			if (expression == null)
+				yield break;
+			var node = context.GetNode();
+			if (node == null || !(node is PrimitiveExpression) && node.StartLocation != context.Location)
+				yield break;
+
+			var rr = context.Resolve(expression);
+			if (rr.ConstantValue == null)
+				yield break;
+			yield return new CodeAction(
+				context.TranslateString("Compute constant value"),
+				script => script.Replace(expression, new PrimitiveExpression(rr.ConstantValue)), 
+				node
+			);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertAnonymousDelegateToLambdaAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertAnonymousDelegateToLambdaAction.cs
new file mode 100644
index 0000000000..4886e7f924
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertAnonymousDelegateToLambdaAction.cs
@@ -0,0 +1,95 @@
+//
+// ConvertAnonymousDelegateToExpression.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Convert anonymous delegate to lambda",
+		Description = "Converts an anonymous delegate into a lambda")]
+	public class ConvertAnonymousDelegateToLambdaAction : SpecializedCodeAction<AnonymousMethodExpression>
+	{
+		#region implemented abstract members of SpecializedCodeAction
+
+		protected override CodeAction GetAction(RefactoringContext context, AnonymousMethodExpression node)
+		{
+			if (context.Location < node.DelegateToken.StartLocation || context.Location >= node.Body.StartLocation)
+				return null;
+
+			Expression convertExpression = null;
+
+			var stmt = node.Body.Statements.FirstOrDefault();
+			if (stmt.GetNextSibling(s => s.Role == BlockStatement.StatementRole) == null) {
+				var exprStmt = stmt as ExpressionStatement;
+				if (exprStmt != null) {
+					convertExpression = exprStmt.Expression;
+				}
+			}
+
+			IType guessedType = null;
+			if (!node.HasParameterList) {
+				guessedType = TypeGuessing.GuessType(context, node);
+				if (guessedType.Kind != TypeKind.Delegate)
+					return null;
+			}
+
+			return new CodeAction(context.TranslateString("Convert to lambda"), 
+				script => {
+					var parent = node.Parent;
+					while (!(parent is Statement))
+						parent = parent.Parent;
+					bool explicitLambda = parent is VariableDeclarationStatement && ((VariableDeclarationStatement)parent).Type.IsVar();
+					var lambda = new LambdaExpression ();
+
+					if (convertExpression != null) {
+						lambda.Body = convertExpression.Clone();
+					} else {
+						lambda.Body = node.Body.Clone();
+					}
+					if (node.HasParameterList) {
+						foreach (var parameter in node.Parameters) {
+							if (explicitLambda) {
+								lambda.Parameters.Add(new ParameterDeclaration { Type = parameter.Type.Clone(), Name = parameter.Name });
+							} else {
+								lambda.Parameters.Add(new ParameterDeclaration { Name = parameter.Name });
+							}
+						}
+					} else {
+						var method = guessedType.GetDelegateInvokeMethod ();
+						foreach (var parameter in method.Parameters) {
+							lambda.Parameters.Add(new ParameterDeclaration { Name = parameter.Name });
+						}
+					}
+					script.Replace(node, lambda);
+				}, 
+				node);
+		}
+
+		#endregion
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertAsToCastAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertAsToCastAction.cs
new file mode 100644
index 0000000000..20b2860fc3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertAsToCastAction.cs
@@ -0,0 +1,58 @@
+// 
+// ConvertAsToCastAction.cs
+//  
+// Author:
+//       Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Converts an 'as' expression to a cast expression
+	/// </summary>
+	[ContextAction("Convert 'as' to cast.", Description = "Convert 'as' to cast.")]
+	public class ConvertAsToCastAction : SpecializedCodeAction <AsExpression>
+	{
+		static InsertParenthesesVisitor insertParentheses = new InsertParenthesesVisitor ();
+		protected override CodeAction GetAction (RefactoringContext context, AsExpression node)
+		{
+			if (!node.AsToken.Contains (context.Location))
+				return null;
+			return new CodeAction (context.TranslateString ("Convert 'as' to cast"),  script => {
+				var castExpr = new CastExpression (node.Type.Clone (), node.Expression.Clone ());
+				var parenthesizedExpr = node.Parent as ParenthesizedExpression;
+				if (parenthesizedExpr != null && parenthesizedExpr.Parent is Expression) {
+					// clone parent expression and replace the ParenthesizedExpression with castExpr to remove
+					// parentheses, then insert parentheses if necessary
+					var parentExpr = (Expression)parenthesizedExpr.Parent.Clone ();
+					parentExpr.GetNodeContaining (parenthesizedExpr.StartLocation, parenthesizedExpr.EndLocation)
+						.ReplaceWith (castExpr);
+					parentExpr.AcceptVisitor (insertParentheses);
+					script.Replace (parenthesizedExpr.Parent, parentExpr);
+				} else {
+					castExpr.AcceptVisitor (insertParentheses);
+					script.Replace (node, castExpr);
+				}
+			}, node.AsToken);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertAssignmentToIfAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertAssignmentToIfAction.cs
new file mode 100644
index 0000000000..29f1fc3c84
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertAssignmentToIfAction.cs
@@ -0,0 +1,81 @@
+//
+// ConvertAssignmentToIfAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Convert assignment to 'if'",
+	               Description = "Convert assignment to 'if'")]
+	public class ConvertAssignmentToIfAction : SpecializedCodeAction<AssignmentExpression>
+	{
+		protected override CodeAction GetAction(RefactoringContext context, AssignmentExpression node)
+		{
+			if (!node.OperatorToken.Contains(context.Location) || !(node.Parent is ExpressionStatement))
+				return null;
+
+			if (node.Right is ConditionalExpression)
+				return CreateForConditionalExpression(context, node, (ConditionalExpression)node.Right);
+
+			var bOp = node.Right as BinaryOperatorExpression;
+			if (bOp != null && bOp.Operator == BinaryOperatorType.NullCoalescing)
+				return CreateForNullCoalesingExpression(context, node, bOp);
+			return null;
+		}
+
+		static CodeAction CreateForConditionalExpression(RefactoringContext ctx, AssignmentExpression node, ConditionalExpression conditionalExpression)
+		{
+			return new CodeAction (
+				ctx.TranslateString("Replace with 'if' statement"),
+				script => {
+					var ifStatement = new IfElseStatement(
+						conditionalExpression.Condition.Clone(),
+						new AssignmentExpression(node.Left.Clone(), node.Operator, conditionalExpression.TrueExpression.Clone()),
+						new AssignmentExpression(node.Left.Clone(), node.Operator, conditionalExpression.FalseExpression.Clone())
+					);
+					script.Replace(node.Parent, ifStatement); 
+				},
+				node.OperatorToken
+			);
+		}
+
+		static CodeAction CreateForNullCoalesingExpression(RefactoringContext ctx, AssignmentExpression node, BinaryOperatorExpression bOp)
+		{
+			return new CodeAction (
+				ctx.TranslateString("Replace with 'if' statement"),
+				script => {
+					var ifStatement = new IfElseStatement(
+						new BinaryOperatorExpression(bOp.Left.Clone(), BinaryOperatorType.InEquality, new NullReferenceExpression()), 
+						new AssignmentExpression(node.Left.Clone(), node.Operator, bOp.Left.Clone()),
+						new AssignmentExpression(node.Left.Clone(), node.Operator, bOp.Right.Clone())
+					);
+					script.Replace(node.Parent, ifStatement); 
+				},
+				node.OperatorToken
+			);
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertBitwiseFlagComparisonToHasFlagsAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertBitwiseFlagComparisonToHasFlagsAction.cs
new file mode 100644
index 0000000000..191b36dd58
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertBitwiseFlagComparisonToHasFlagsAction.cs
@@ -0,0 +1,110 @@
+//
+// ConvertBitwiseFlagComparisonToHasFlagsAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction ("Replace bitwise flag comparison with call to 'Enum.HasFlag'", Description = "Replace bitwise flag comparison with call to 'Enum.HasFlag'")]
+	public class ConvertBitwiseFlagComparisonToHasFlagsAction : SpecializedCodeAction<BinaryOperatorExpression>
+	{
+		static readonly AstNode truePattern = new Choice {
+			new BinaryOperatorExpression (new ParenthesizedExpression(new BinaryOperatorExpression (PatternHelper.OptionalParentheses(new AnyNode("target")), BinaryOperatorType.BitwiseAnd, PatternHelper.OptionalParentheses(new AnyNode("expr")))), BinaryOperatorType.InEquality, PatternHelper.OptionalParentheses(new PrimitiveExpression(0))),
+			new BinaryOperatorExpression (new ParenthesizedExpression(new BinaryOperatorExpression (PatternHelper.OptionalParentheses(new AnyNode("target")), BinaryOperatorType.BitwiseAnd, PatternHelper.OptionalParentheses(new AnyNode("expr")))), BinaryOperatorType.Equality, PatternHelper.OptionalParentheses(new Backreference("expr")))
+		};
+
+		static readonly AstNode falsePattern = new Choice {
+			new BinaryOperatorExpression (new ParenthesizedExpression(new BinaryOperatorExpression (PatternHelper.OptionalParentheses(new AnyNode("target")), BinaryOperatorType.BitwiseAnd, PatternHelper.OptionalParentheses(new AnyNode("expr")))), BinaryOperatorType.Equality, PatternHelper.OptionalParentheses(new PrimitiveExpression(0))),
+			new BinaryOperatorExpression (new ParenthesizedExpression(new BinaryOperatorExpression (PatternHelper.OptionalParentheses(new AnyNode("target")), BinaryOperatorType.BitwiseAnd, PatternHelper.OptionalParentheses(new AnyNode("expr")))), BinaryOperatorType.InEquality, PatternHelper.OptionalParentheses(new Backreference("expr")))
+		};
+
+		internal static Expression MakeFlatExpression (Expression expr, BinaryOperatorType opType)
+		{
+			var bOp = expr as BinaryOperatorExpression;
+			if (bOp == null)
+				return expr.Clone();
+			return new BinaryOperatorExpression(
+				MakeFlatExpression(bOp.Left, opType),
+				opType,
+				MakeFlatExpression(bOp.Right, opType)
+			);
+		}
+
+		static Expression BuildHasFlagExpression (Expression target, Expression expr)
+		{
+			var bOp = expr as BinaryOperatorExpression;
+			if (bOp == null)
+				return new InvocationExpression(new MemberReferenceExpression(target.Clone(), "HasFlag"), expr.Clone());
+
+			if (bOp.Operator == BinaryOperatorType.BitwiseOr) {
+				return new BinaryOperatorExpression(
+					BuildHasFlagExpression(target, bOp.Left),
+					BinaryOperatorType.BitwiseOr,
+					BuildHasFlagExpression(target, bOp.Right)
+				);
+			}
+
+			return new InvocationExpression(new MemberReferenceExpression(target.Clone(), "HasFlag"), MakeFlatExpression (bOp, BinaryOperatorType.BitwiseOr));
+		}
+
+		static CodeAction CreateAction(BaseRefactoringContext context, Match match, bool negateMatch, BinaryOperatorExpression node)
+		{
+			var target = match.Get<Expression>("target").Single();
+			var expr = match.Get<Expression>("expr").Single();
+
+			if (!expr.DescendantsAndSelf.All(x => !(x is BinaryOperatorExpression) || ((BinaryOperatorExpression)x).Operator == BinaryOperatorType.BitwiseOr) &&
+				!expr.DescendantsAndSelf.All(x => !(x is BinaryOperatorExpression) || ((BinaryOperatorExpression)x).Operator == BinaryOperatorType.BitwiseAnd))
+				return null;
+			var rr = context.Resolve(target);
+			if (rr.Type.Kind != ICSharpCode.NRefactory.TypeSystem.TypeKind.Enum)
+				return null;
+
+			return new CodeAction(
+				context.TranslateString("Replace with 'Enum.HasFlag'"), 
+				script => {
+					Expression newExpr = BuildHasFlagExpression (target, expr);
+					if (negateMatch)
+						newExpr = new UnaryOperatorExpression(UnaryOperatorType.Not, newExpr);
+					script.Replace(node, newExpr);
+				}, 
+				node.OperatorToken);
+		}
+
+		protected override CodeAction GetAction(RefactoringContext context, BinaryOperatorExpression node)
+		{
+			if (!node.OperatorToken.Contains(context.Location))
+				return null;
+			var match = truePattern.Match(node);
+			if (match.Success)
+				return CreateAction(context, match, false, node);
+			match = falsePattern.Match(node);
+			if (match.Success)
+				return CreateAction(context, match, true, node);
+			return null;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertCastToAsAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertCastToAsAction.cs
similarity index 100%
rename from src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertCastToAsAction.cs
rename to src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertCastToAsAction.cs
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertDecToHexAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertDecToHexAction.cs
new file mode 100644
index 0000000000..18e78daf00
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertDecToHexAction.cs
@@ -0,0 +1,52 @@
+// 
+// ConvertDecToHex.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Convert a dec numer to hex. For example: 16 -> 0x10
+	/// </summary>
+	[ContextAction("Convert dec to hex.", Description = "Convert dec to hex.")]
+	public class ConvertDecToHexAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var pexpr = context.GetNode<PrimitiveExpression>();
+			if (pexpr == null || pexpr.LiteralValue.StartsWith("0X", System.StringComparison.OrdinalIgnoreCase))
+				yield break;
+
+			var value = pexpr.Value;
+			if (value is string || value is bool || value is float || value is double || value is char)
+				yield break;
+
+			yield return new CodeAction(context.TranslateString("Convert to hex"), script => {
+				script.Replace(pexpr, new PrimitiveExpression (value, string.Format("0x{0:x}", value)));
+			}, pexpr);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertDoWhileToWhileLoopAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertDoWhileToWhileLoopAction.cs
new file mode 100644
index 0000000000..30a87564c2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertDoWhileToWhileLoopAction.cs
@@ -0,0 +1,70 @@
+//
+// ConvertDoWhileToWhileLoopAction.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+//
+// Copyright (c) 2013 Luís Reis
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp;
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Convert do...while to while. For instance, { do x++; while (Foo(x)); } becomes { while(Foo(x)) x++; }.
+	/// Note that this action will often change the semantics of the code.
+	/// </summary>
+	[ContextAction("Convert do...while to while.", Description = "Converts a do...while to a while loop (changing semantics).")]
+	public class ConvertDoWhileToWhileLoopAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var node = context.GetNode<DoWhileStatement>();
+			if (node == null)
+				yield break;
+
+			var target = node.DoToken;
+			if (!target.Contains(context.Location)) {
+				target = node.WhileToken;
+				if (!target.Contains(context.Location)) {
+					yield break;
+				}
+			}
+
+			yield return new CodeAction(context.TranslateString("Convert to while loop"),
+			                            script => ConvertToWhileLoop(script, node),
+			                            target);
+
+		}
+
+		static void ConvertToWhileLoop(Script script, DoWhileStatement originalStatement)
+		{
+			script.Replace(originalStatement, new WhileStatement {
+				Condition = originalStatement.Condition.Clone(),
+				EmbeddedStatement = originalStatement.EmbeddedStatement.Clone()
+			});
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertEqualityOperatorToEqualsAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertEqualityOperatorToEqualsAction.cs
new file mode 100644
index 0000000000..7c30685fb5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertEqualityOperatorToEqualsAction.cs
@@ -0,0 +1,88 @@
+//
+// ConvertEqualityOperatorToEqualsAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp;
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Convert do...while to while. For instance, { do x++; while (Foo(x)); } becomes { while(Foo(x)) x++; }.
+	/// Note that this action will often change the semantics of the code.
+	/// </summary>
+	[ContextAction("Convert '==' to 'Equals'", Description = "Converts '==' to call to 'object.Equals'")]
+	public class ConvertEqualityOperatorToEqualsAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var node = context.GetNode<BinaryOperatorExpression>();
+			if (node == null || 
+			    (node.Operator != BinaryOperatorType.Equality && node.Operator != BinaryOperatorType.InEquality) ||
+			    !node.OperatorToken.Contains(context.Location))
+				yield break;
+
+			yield return new CodeAction(
+				context.TranslateString("Use 'Equals'"),
+				script => {
+					Expression expr = new InvocationExpression(GenerateTarget(context, node), node.Left.Clone(), node.Right.Clone());
+					if (node.Operator == BinaryOperatorType.InEquality)
+						expr = new UnaryOperatorExpression(UnaryOperatorType.Not, expr);
+					script.Replace(node, expr);
+				}, 
+				node.OperatorToken
+			);
+		}
+
+		readonly IList<IType> emptyTypes = new IType[0];
+
+		bool HasDifferentEqualsMethod(IEnumerable<IMethod> methods)
+		{
+			foreach (var method in methods) {
+				if (method.Parameters.Count == 2 && method.FullName != "System.Object.Equals") {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		Expression GenerateTarget(RefactoringContext context, BinaryOperatorExpression bOp)
+		{
+			var rr = context.Resolver.GetResolverStateBefore(bOp).LookupSimpleNameOrTypeName("Equals", emptyTypes, NameLookupMode.Expression) as MethodGroupResolveResult;
+			if (rr == null || rr.IsError || HasDifferentEqualsMethod (rr.Methods)) {
+				return new MemberReferenceExpression(
+					new PrimitiveType ("object"),
+					"Equals"
+				);
+			}
+			return new IdentifierExpression("Equals");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertEqualsToEqualityOperatorAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertEqualsToEqualityOperatorAction.cs
new file mode 100644
index 0000000000..9d2b1474a5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertEqualsToEqualityOperatorAction.cs
@@ -0,0 +1,83 @@
+//
+// ConvertEqualsToEqualityOperatorAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp;
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Convert do...while to while. For instance, { do x++; while (Foo(x)); } becomes { while(Foo(x)) x++; }.
+	/// Note that this action will often change the semantics of the code.
+	/// </summary>
+	[ContextAction("Convert 'Equals' to '=='", Description = "Converts 'Equals' call to '=='")]
+	public class ConvertEqualsToEqualityOperatorAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var node = context.GetNode<InvocationExpression>();
+			if (node == null)
+				yield break;
+			if ((node.Target is IdentifierExpression) && !node.Target.IsInside(context.Location))
+				yield break;
+			var memberRefExpr = node.Target as MemberReferenceExpression;
+			if ((memberRefExpr != null) && !memberRefExpr.MemberNameToken.IsInside(context.Location))
+				yield break;
+			var rr = context.Resolve(node) as CSharpInvocationResolveResult;
+			if (rr == null || rr.IsError || rr.Member.Name != "Equals" || !rr.Member.DeclaringType.IsKnownType(KnownTypeCode.Object))
+				yield break;
+			Expression expr = node;
+			bool useEquality = true;
+			var uOp = node.Parent as UnaryOperatorExpression;
+			if (uOp != null && uOp.Operator == UnaryOperatorType.Not) {
+				expr = uOp;
+				useEquality = false;
+			}
+			if (node.Arguments.Count != 2 && (memberRefExpr == null || node.Arguments.Count != 1))
+				yield break;
+			yield return new CodeAction(
+				useEquality ? context.TranslateString("Use '=='") : context.TranslateString("Use '!='"),
+				script => {
+					script.Replace(
+						expr,
+						new BinaryOperatorExpression(
+							node.Arguments.Count == 1 ? memberRefExpr.Target.Clone() : node.Arguments.First().Clone(),
+							useEquality ? BinaryOperatorType.Equality :  BinaryOperatorType.InEquality,
+							node.Arguments.Last().Clone()
+						)
+					);
+				}, 
+				node.Target
+			);
+
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertExplicitToImplicitImplementationAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertExplicitToImplicitImplementationAction.cs
similarity index 100%
rename from src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertExplicitToImplicitImplementationAction.cs
rename to src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertExplicitToImplicitImplementationAction.cs
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertForToWhileAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertForToWhileAction.cs
new file mode 100644
index 0000000000..01ed03b52a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertForToWhileAction.cs
@@ -0,0 +1,56 @@
+//
+// ConvertForToWhileAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Convert 'for' loop to 'while'", Description = "Works on 'for' loops.")]
+	public class ConvertForToWhileAction : SpecializedCodeAction<ForStatement>
+	{
+		protected override CodeAction GetAction(RefactoringContext context, ForStatement node)
+		{
+			if (!node.ForToken.Contains(context.Location))
+				return null;
+			return new CodeAction(
+				context.TranslateString("Convert to 'while'"),
+				script => {
+					var body = node.EmbeddedStatement.Clone();
+					var blockStatement = body as BlockStatement ?? new BlockStatement { Statements = { body } };
+					blockStatement.Statements.AddRange(node.Iterators.Select(i => i.Clone ()));
+					var whileStatement = new WhileStatement(node.Condition.IsNull ? new PrimitiveExpression(true) : node.Condition.Clone(), blockStatement);
+					foreach (var init in node.Initializers) {
+						var stmt = init.Clone();
+						stmt.Role = BlockStatement.StatementRole;
+						script.InsertBefore(node, stmt);
+					}
+					script.Replace(node, whileStatement);
+				},
+				node
+			);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertForeachToForAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertForeachToForAction.cs
new file mode 100644
index 0000000000..83c2665b9c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertForeachToForAction.cs
@@ -0,0 +1,218 @@
+// 
+// ConvertForeachToFor.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Converts a foreach loop to for.
+	/// </summary>
+	[ContextAction("Convert 'foreach' loop to 'for'", Description = "Works on 'foreach' loops that allow direct access to its elements.")]
+	public class ConvertForeachToForAction : CodeActionProvider
+	{
+		static readonly string[] VariableNames = { "i", "j", "k", "l", "n", "m", "x", "y", "z"};
+		static readonly string[] CollectionNames = { "list" };
+
+		static string GetName(ICSharpCode.NRefactory.CSharp.Resolver.CSharpResolver state, string[] variableNames)
+		{
+			for (int i = 0; i < 1000; i++) {
+				foreach (var vn in variableNames) {
+					string id = i > 0 ? vn + i : vn;
+					var rr = state.LookupSimpleNameOrTypeName(id, new IType[0], NameLookupMode.Expression);
+					if (rr.IsError) 
+						return id;
+				}
+			}
+			return null;
+		}
+
+		string GetBoundName(Expression inExpression)
+		{
+			var ie = inExpression as IdentifierExpression;
+			if (ie != null)
+				return ie.Identifier;
+			var mre = inExpression as MemberReferenceExpression;
+			if (mre != null)
+				return GetBoundName(mre.Target) + mre.MemberName;
+			return "max";
+		}
+
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			bool hasIndexAccess;
+			var foreachStatement = GetForeachStatement(context, out hasIndexAccess);
+			if (foreachStatement == null || foreachStatement.EmbeddedStatement == null)
+				yield break;
+			var state = context.GetResolverStateBefore (foreachStatement.EmbeddedStatement);
+			string name = GetName(state, VariableNames);
+			if (name == null) // very unlikely, but just in case ...
+				yield break;
+
+			yield return new CodeAction(context.TranslateString("Convert 'foreach' loop to 'for'"), script => {
+				var result = context.Resolve(foreachStatement.InExpression);
+				var countProperty = GetCountProperty(result.Type);
+				var inExpression = foreachStatement.InExpression;
+
+				var initializer = hasIndexAccess ? new VariableDeclarationStatement(new PrimitiveType("int"), name, new PrimitiveExpression(0)) :
+				                  new VariableDeclarationStatement(new SimpleType("var"), name, new InvocationExpression(new MemberReferenceExpression (inExpression.Clone (), "GetEnumerator")));
+				var id1 = new IdentifierExpression(name);
+				var id2 = id1.Clone();
+				var id3 = id1.Clone();
+				Statement declarationStatement = null;
+				if (inExpression is ObjectCreateExpression || inExpression is ArrayCreateExpression) {
+					string listName = GetName(state, CollectionNames) ?? "col";
+					declarationStatement = new VariableDeclarationStatement (
+						new PrimitiveType ("var"),
+						listName,
+						inExpression.Clone ()
+					);
+					inExpression = new IdentifierExpression (listName);
+				}
+
+				var variableDeclarationStatement = new VariableDeclarationStatement(
+					foreachStatement.VariableType.Clone(),
+					foreachStatement.VariableName,
+					hasIndexAccess ? (Expression)new IndexerExpression(inExpression.Clone(), id3) : new MemberReferenceExpression(id1, "Current")
+				);
+
+				var forStatement = new ForStatement {
+					Initializers = { initializer },
+					Condition = hasIndexAccess ? (Expression)new BinaryOperatorExpression (id1, BinaryOperatorType.LessThan, new MemberReferenceExpression (inExpression.Clone (), countProperty)) :
+					            new InvocationExpression(new MemberReferenceExpression (id2, "MoveNext")),
+					EmbeddedStatement = new BlockStatement {
+						variableDeclarationStatement
+					}
+				};
+
+				if (hasIndexAccess)
+					forStatement.Iterators.Add(new UnaryOperatorExpression (UnaryOperatorType.PostIncrement, id2));
+
+				if (foreachStatement.EmbeddedStatement is BlockStatement) {
+					variableDeclarationStatement.Remove();
+					var oldBlock = (BlockStatement)foreachStatement.EmbeddedStatement.Clone();
+					if (oldBlock.Statements.Any()) {
+						oldBlock.Statements.InsertBefore(oldBlock.Statements.First(), variableDeclarationStatement);
+					} else {
+						oldBlock.Statements.Add(variableDeclarationStatement);
+					}
+					forStatement.EmbeddedStatement = oldBlock;
+				} else {
+					forStatement.EmbeddedStatement.AddChild (foreachStatement.EmbeddedStatement.Clone (), BlockStatement.StatementRole);
+				}
+				if (declarationStatement != null)
+					script.InsertBefore (foreachStatement, declarationStatement);
+				script.Replace (foreachStatement, forStatement);
+				if (hasIndexAccess) {
+					script.Link (initializer.Variables.First ().NameToken, id1, id2, id3);
+				} else {
+					script.Link (initializer.Variables.First ().NameToken, id1, id2);
+				}
+			}, foreachStatement);
+
+			if (!hasIndexAccess)
+				yield break;
+			yield return new CodeAction(context.TranslateString("Convert 'foreach' loop to optimized 'for'"), script => {
+				var result = context.Resolve(foreachStatement.InExpression);
+				var countProperty = GetCountProperty(result.Type);
+
+				var initializer = new VariableDeclarationStatement(new PrimitiveType("int"), name, new PrimitiveExpression(0));
+				var id1 = new IdentifierExpression(name);
+				var id2 = id1.Clone();
+				var id3 = id1.Clone();
+				var inExpression = foreachStatement.InExpression;
+				Statement declarationStatement = null;
+				if (inExpression is ObjectCreateExpression || inExpression is ArrayCreateExpression) {
+					string listName = GetName(state, CollectionNames) ?? "col";
+					declarationStatement = new VariableDeclarationStatement (
+						new PrimitiveType ("var"),
+						listName,
+						inExpression.Clone ()
+						);
+					inExpression = new IdentifierExpression (listName);
+				}
+
+				var variableDeclarationStatement = new VariableDeclarationStatement(
+					foreachStatement.VariableType.Clone(),
+					foreachStatement.VariableName,
+					new IndexerExpression(inExpression.Clone(), id3)
+					);
+
+				string optimizedUpperBound = GetBoundName(inExpression) + countProperty;
+				initializer.Variables.Add(new VariableInitializer(optimizedUpperBound, new MemberReferenceExpression (inExpression.Clone (), countProperty)));
+				var forStatement = new ForStatement {
+					Initializers = { initializer },
+					Condition = new BinaryOperatorExpression (id1, BinaryOperatorType.LessThan, new IdentifierExpression(optimizedUpperBound)),
+					Iterators = { new UnaryOperatorExpression (UnaryOperatorType.PostIncrement, id2) },
+					EmbeddedStatement = new BlockStatement {
+						variableDeclarationStatement
+					}
+				};
+
+				if (foreachStatement.EmbeddedStatement is BlockStatement) {
+					variableDeclarationStatement.Remove();
+					var oldBlock = (BlockStatement)foreachStatement.EmbeddedStatement.Clone();
+					if (oldBlock.Statements.Any()) {
+						oldBlock.Statements.InsertBefore(oldBlock.Statements.First(), variableDeclarationStatement);
+					} else {
+						oldBlock.Statements.Add(variableDeclarationStatement);
+					}
+					forStatement.EmbeddedStatement = oldBlock;
+				} else {
+					forStatement.EmbeddedStatement.AddChild (foreachStatement.EmbeddedStatement.Clone (), BlockStatement.StatementRole);
+				}
+				if (declarationStatement != null)
+					script.InsertBefore (foreachStatement, declarationStatement);
+				script.Replace (foreachStatement, forStatement);
+				script.Link (initializer.Variables.First ().NameToken, id1, id2, id3);
+			}, foreachStatement);
+		}
+		
+		static string GetCountProperty(IType type)
+		{
+			return type.Kind == TypeKind.Array ? "Length" : "Count";
+		}
+
+		static ForeachStatement GetForeachStatement (RefactoringContext context, out bool hasIndexAccess)
+		{
+			var astNode = context.GetNode ();
+			if (astNode == null) {
+				hasIndexAccess = false;
+				return null;
+			}
+			var result = (astNode as ForeachStatement) ?? astNode.Parent as ForeachStatement;
+			if (result == null) {
+				hasIndexAccess = false;
+				return null;
+			}
+			var collection = context.Resolve (result.InExpression);
+			hasIndexAccess = collection.Type.Kind == TypeKind.Array || collection.Type.GetProperties(p => p.IsIndexer).Any();
+			return result;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertHasFlagsToBitwiseFlagComparisonAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertHasFlagsToBitwiseFlagComparisonAction.cs
new file mode 100644
index 0000000000..f1691d45ca
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertHasFlagsToBitwiseFlagComparisonAction.cs
@@ -0,0 +1,78 @@
+//
+// ConvertHasFlagsToBitwiseFlagComparisonAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction ("Replace 'Enum.HasFlag' call with bitwise flag comparison", Description = "Replace 'Enum.HasFlag' call with bitwise flag comparison")]
+	public class ConvertHasFlagsToBitwiseFlagComparisonAction : SpecializedCodeAction<InvocationExpression>
+	{
+		protected override CodeAction GetAction(RefactoringContext context, InvocationExpression node)
+		{
+			var mRef = node.Target as MemberReferenceExpression;
+			if (mRef == null)
+				return null;
+			var rr = context.Resolve(node) as CSharpInvocationResolveResult;
+			if (rr == null || rr.IsError)
+				return null;
+			if (rr.Member.Name != "HasFlag" || rr.Member.DeclaringType.GetDefinition().KnownTypeCode != ICSharpCode.NRefactory.TypeSystem.KnownTypeCode.Enum)
+				return null;
+			var arg = node.Arguments.First ().Clone ();
+			if (!arg.DescendantsAndSelf.All(x => !(x is BinaryOperatorExpression) || ((BinaryOperatorExpression)x).Operator == BinaryOperatorType.BitwiseOr))
+				return null;
+			arg = ConvertBitwiseFlagComparisonToHasFlagsAction.MakeFlatExpression(arg, BinaryOperatorType.BitwiseAnd);
+			if (arg is BinaryOperatorExpression)
+				arg = new ParenthesizedExpression(arg);
+			return new CodeAction(
+				context.TranslateString("Replace with bitwise flag comparison"), 
+				script => {
+					var uOp = node.Parent as UnaryOperatorExpression;
+					if (uOp != null && uOp.Operator == UnaryOperatorType.Not) {
+						script.Replace(uOp, 
+							new BinaryOperatorExpression(
+								new ParenthesizedExpression(new BinaryOperatorExpression(mRef.Target.Clone(), BinaryOperatorType.BitwiseAnd, arg)), 
+								BinaryOperatorType.Equality, 
+								new PrimitiveExpression(0)
+							)
+						);
+					} else {
+						script.Replace(node, 
+							new BinaryOperatorExpression(
+								new ParenthesizedExpression(new BinaryOperatorExpression(mRef.Target.Clone(), BinaryOperatorType.BitwiseAnd, arg)), 
+								BinaryOperatorType.InEquality, 
+								new PrimitiveExpression(0)
+							)
+						);
+					}
+				}, 
+				node
+			);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertHexToDecAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertHexToDecAction.cs
new file mode 100644
index 0000000000..ca2b717bac
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertHexToDecAction.cs
@@ -0,0 +1,53 @@
+// 
+// ConvertHexToDec.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Convert a hex numer to dec. For example: 0x10 -> 16
+	/// </summary>
+	[ContextAction("Convert hex to dec.", Description = "Convert hex to dec.")]
+	public class ConvertHexToDecAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var pexpr = context.GetNode<PrimitiveExpression>();
+			if (pexpr == null || !pexpr.LiteralValue.StartsWith("0X", System.StringComparison.OrdinalIgnoreCase)) {
+				yield break;
+			}
+			if (!((pexpr.Value is int) || (pexpr.Value is long) || (pexpr.Value is short) || (pexpr.Value is sbyte) ||
+				(pexpr.Value is uint) || (pexpr.Value is ulong) || (pexpr.Value is ushort) || (pexpr.Value is byte))) {
+				yield break;
+			}
+			
+			yield return new CodeAction(context.TranslateString("Convert to dec"), script => {
+				script.Replace(pexpr, new PrimitiveExpression (pexpr.Value));
+			}, pexpr);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertIfStatementToConditionalTernaryExpressionAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertIfStatementToConditionalTernaryExpressionAction.cs
new file mode 100644
index 0000000000..06853a41b9
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertIfStatementToConditionalTernaryExpressionAction.cs
@@ -0,0 +1,89 @@
+//
+// ConvertIfStatementToConditionalTernaryExpressionAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Convert 'if' to '?:'",
+	               Description = "Convert 'if' to '?:'")]
+	public class ConvertIfStatementToConditionalTernaryExpressionAction : SpecializedCodeAction <IfElseStatement>
+	{
+		static readonly AstNode Pattern = 
+			new IfElseStatement(
+				new AnyNode("condition"),
+				PatternHelper.EmbeddedStatement (new ExpressionStatement(new NamedNode ("assign1", new AssignmentExpression(new AnyNode("target"), AssignmentOperatorType.Any, new AnyNode("expr1"))))),
+				PatternHelper.EmbeddedStatement (new ExpressionStatement(new NamedNode ("assign2", new AssignmentExpression(new Backreference("target"), AssignmentOperatorType.Any, new AnyNode("expr2")))))
+			);
+
+		public static bool GetMatch(IfElseStatement ifElseStatement, out Match match)
+		{
+			match = ConvertIfStatementToConditionalTernaryExpressionAction.Pattern.Match(ifElseStatement);
+			if (!match.Success || ifElseStatement.Parent is IfElseStatement)
+				return false;
+			var firstAssign = match.Get<AssignmentExpression>("assign1").Single();
+			var secondAssign = match.Get<AssignmentExpression>("assign2").Single();
+			return firstAssign.Operator == secondAssign.Operator;
+		}
+
+		static CodeAction CreateAction (BaseRefactoringContext ctx, IfElseStatement ifElseStatement, Match match)
+		{
+			var target = match.Get<Expression>("target").Single();
+			var condition = match.Get<Expression>("condition").Single();
+			var trueExpr = match.Get<Expression>("expr1").Single();
+			var falseExpr = match.Get<Expression>("expr2").Single();
+			var firstAssign = match.Get<AssignmentExpression>("assign1").Single();
+
+			return new CodeAction(
+				ctx.TranslateString("Replace with '?:' expression"),
+				script => {
+					script.Replace(
+						ifElseStatement, 
+						new ExpressionStatement(
+							new AssignmentExpression(
+								target.Clone(),
+								firstAssign.Operator,
+								new ConditionalExpression(condition.Clone(), trueExpr.Clone(), falseExpr.Clone())
+							)
+						)
+					); 
+				},
+				ifElseStatement
+			);
+		}
+
+		protected override CodeAction GetAction(RefactoringContext context, IfElseStatement node)
+		{
+			if (!node.IfToken.Contains(context.Location))
+				return null;
+			Match match;
+			if (!GetMatch(node, out match))
+				return null;
+			return CreateAction(context, node, match);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertIfStatementToNullCoalescingExpressionAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertIfStatementToNullCoalescingExpressionAction.cs
new file mode 100644
index 0000000000..b53e7c28c8
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertIfStatementToNullCoalescingExpressionAction.cs
@@ -0,0 +1,165 @@
+// 
+// ConvertIfToNullCoalescingAction.cs
+//  
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction ("Convert 'if' to '??' expression",
+	                Category = IssueCategories.Opportunities,
+	                Description = "Convert 'if' statement to '??' expression.")]
+	public class ConvertIfStatementToNullCoalescingExpressionAction : SpecializedCodeAction <IfElseStatement>
+	{
+		const string expressionGroupName = "expression";
+		const string comparedNodeGroupName = "comparedNode";
+		const string valueOnNullGroupName = "valueOnNull";
+
+		static readonly Expression ActionPattern = 
+			PatternHelper.OptionalParentheses(
+				new NamedNode(
+					expressionGroupName, 
+					new Choice {
+						PatternHelper.CommutativeOperatorWithOptionalParentheses(new AnyNode(comparedNodeGroupName), BinaryOperatorType.Equality, new NullReferenceExpression()),
+						PatternHelper.CommutativeOperatorWithOptionalParentheses(new AnyNode(comparedNodeGroupName), BinaryOperatorType.InEquality, new NullReferenceExpression())
+					}
+				)
+			);
+
+		internal static Expression CheckNode(IfElseStatement node, out Expression rightSide)
+		{
+			rightSide = null;
+			var match = ActionPattern.Match(node.Condition);
+			if (!match.Success)
+				return null;
+			var conditionExpression = match.Get<BinaryOperatorExpression>(expressionGroupName).Single();
+			bool isEqualityComparison = conditionExpression.Operator == BinaryOperatorType.Equality;
+			Expression comparedNode = match.Get<Expression>(comparedNodeGroupName).Single();
+			Statement contentStatement;
+			if (isEqualityComparison) {
+				contentStatement = node.TrueStatement;
+				if (!IsEmpty(node.FalseStatement))
+					return null;
+			}
+			else {
+				contentStatement = node.FalseStatement;
+				if (!IsEmpty(node.TrueStatement))
+					return null;
+			}
+			contentStatement = GetSimpleStatement(contentStatement);
+			if (contentStatement == null)
+				return null;
+			var leftExpressionPattern = PatternHelper.OptionalParentheses(comparedNode);
+			var expressionPattern = new AssignmentExpression(leftExpressionPattern, AssignmentOperatorType.Assign, new AnyNode(valueOnNullGroupName));
+			var statementPattern = new ExpressionStatement(PatternHelper.OptionalParentheses(expressionPattern));
+			var statementMatch = statementPattern.Match(contentStatement);
+			if (!statementMatch.Success)
+				return null;
+			rightSide = statementMatch.Get<Expression>(valueOnNullGroupName).Single();
+			return comparedNode;
+		}
+
+		protected override CodeAction GetAction (RefactoringContext context, IfElseStatement node)
+		{
+			if (!node.IfToken.Contains(context.Location))
+				return null;
+			Expression rightSide;
+			var comparedNode = CheckNode(node, out rightSide);
+			if (comparedNode == null)
+				return null;
+
+			return new CodeAction(context.TranslateString("Replace with '??'"),
+			                      script => {
+
+				var previousNode = node.GetPrevSibling(sibling => sibling is Statement);
+
+				var previousDeclaration = previousNode as VariableDeclarationStatement;
+				if (previousDeclaration != null && previousDeclaration.Variables.Count() == 1) {
+					var variable = previousDeclaration.Variables.First();
+
+					var comparedNodeIdentifierExpression = comparedNode as IdentifierExpression;
+					if (comparedNodeIdentifierExpression != null &&
+					    comparedNodeIdentifierExpression.Identifier == variable.Name) {
+
+						script.Replace(variable.Initializer, new BinaryOperatorExpression(variable.Initializer.Clone(),
+						                                                                  BinaryOperatorType.NullCoalescing,
+						                                                                  rightSide.Clone()));
+						script.Remove(node);
+
+						return;
+					}
+				}
+
+				var previousExpressionStatement = previousNode as ExpressionStatement;
+				if (previousExpressionStatement != null)
+				{
+					var previousAssignment = previousExpressionStatement.Expression as AssignmentExpression;
+					if (previousAssignment != null &&
+					    comparedNode.IsMatch(previousAssignment.Left)) {
+
+						var newExpression = new BinaryOperatorExpression(previousAssignment.Right.Clone(),
+						                                                 BinaryOperatorType.NullCoalescing,
+						                                                 rightSide.Clone());
+
+						script.Replace(previousAssignment.Right, newExpression);
+						script.Remove(node);
+						return;
+					}
+				}
+
+				var coalescedExpression = new BinaryOperatorExpression(comparedNode.Clone(),
+				                                                       BinaryOperatorType.NullCoalescing,
+				                                                       rightSide.Clone());
+
+				var newAssignment = new ExpressionStatement(new AssignmentExpression(comparedNode.Clone(), coalescedExpression));
+				script.Replace(node, newAssignment);
+			}, node);
+		}
+
+		static Statement GetSimpleStatement (Statement statement)
+		{
+			BlockStatement blockStatement;
+			while ((blockStatement = statement as BlockStatement) != null) {
+				var statements = blockStatement.Descendants.OfType<Statement>()
+					.Where(descendant => !IsEmpty(descendant)).ToList();
+
+				if (statements.Count() != 1) {
+					return null;
+				}
+
+				statement = statements.First();
+			}
+			return statement;
+		}
+
+		static bool IsEmpty (Statement statement)
+		{
+			return statement.IsNull || 
+				!statement.DescendantsAndSelf.OfType<Statement>().Any(descendant => !(descendant is EmptyStatement || descendant is BlockStatement));
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertIfStatementToReturnStatementAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertIfStatementToReturnStatementAction.cs
new file mode 100644
index 0000000000..f20be9a192
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertIfStatementToReturnStatementAction.cs
@@ -0,0 +1,115 @@
+//
+// ConvertIfStatementToReturnStatementAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Convert 'if' to 'return'",
+	               Description = "Convert 'if' to 'return'")]
+	public class ConvertIfStatementToReturnStatementAction : SpecializedCodeAction <IfElseStatement>
+	{
+		static readonly AstNode ifElsePattern = 
+			new IfElseStatement(
+				new AnyNode("condition"),
+				PatternHelper.EmbeddedStatement (new ReturnStatement(new AnyNode("expr1"))),
+				PatternHelper.EmbeddedStatement (new ReturnStatement(new AnyNode("expr2")))
+			);
+
+		static readonly AstNode ifPattern = 
+			new IfElseStatement(
+				new AnyNode("condition"),
+				PatternHelper.EmbeddedStatement (new ReturnStatement(new AnyNode("expr1")))
+			);
+
+		static readonly AstNode returnPattern = 
+			new ReturnStatement(new AnyNode("expr2"));
+
+		public static bool GetMatch(IfElseStatement ifElseStatement, out Expression condition, out Expression expr1, out Expression expr2, out AstNode returnStatement)
+		{
+			var match = ifElsePattern.Match(ifElseStatement);
+			returnStatement = null;
+			if (match.Success) {
+				condition = match.Get<Expression>("condition").Single();
+				expr1 = match.Get<Expression>("expr1").Single();
+				expr2 = match.Get<Expression>("expr2").Single();
+				return true;
+			}
+
+			match = ifPattern.Match(ifElseStatement);
+			if (match.Success) {
+				returnStatement = ifElseStatement.GetNextSibling(s => s.Role == BlockStatement.StatementRole);
+				var match2 = returnPattern.Match(returnStatement);
+
+				if (match2.Success) {
+					condition = match.Get<Expression>("condition").Single();
+					expr1 = match.Get<Expression>("expr1").Single();
+					expr2 = match2.Get<Expression>("expr2").Single();
+					return true;
+				}
+			}
+
+			condition = expr1 = expr2 = null;
+			return false;
+		}
+
+		static readonly AstNode truePattern = PatternHelper.OptionalParentheses(new PrimitiveExpression (true));
+		static readonly AstNode falsePattern = PatternHelper.OptionalParentheses(new PrimitiveExpression (false));
+
+		static Expression CreateCondition(Expression c, Expression e1, Expression e2)
+		{
+			if (truePattern.IsMatch(e1) && falsePattern.IsMatch(e2))
+				return c.Clone();
+			return new ConditionalExpression(c.Clone(), e1.Clone(), e2.Clone());
+		}
+
+		protected override CodeAction GetAction(RefactoringContext context, IfElseStatement ifElseStatement)
+		{
+			if (!ifElseStatement.IfToken.Contains(context.Location))
+				return null;
+
+			Expression c, e1, e2;
+			AstNode rs;
+			if (!ConvertIfStatementToReturnStatementAction.GetMatch(ifElseStatement, out c, out e1, out e2, out rs))
+				return null;
+			return new CodeAction (
+				context.TranslateString("Replace with 'return'"),
+				script => {
+					script.Replace(ifElseStatement, new ReturnStatement(
+					CreateCondition(c, e1, e2)
+				)); 
+					if (rs != null)
+						script.Remove(rs); 
+				},
+				ifElseStatement
+			);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertIfStatementToSwitchStatementAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertIfStatementToSwitchStatementAction.cs
new file mode 100644
index 0000000000..10c4d8d64a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertIfStatementToSwitchStatementAction.cs
@@ -0,0 +1,196 @@
+// 
+// ConvertIfToSwitchAction.cs
+//  
+// Author:
+//       Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction (
+		"Convert 'if' to 'switch'", 
+		Description = "Convert 'if' statement to 'switch' statement")]
+	public class ConvertIfStatementToSwitchStatementAction : SpecializedCodeAction<IfElseStatement>
+	{
+		protected override CodeAction GetAction (RefactoringContext context, IfElseStatement node)
+		{
+			if (!node.IfToken.Contains (context.Location))
+				return null;
+
+			var switchExpr = GetSwitchExpression (context, node.Condition);
+			if (switchExpr == null)
+				return null;
+
+			var switchSections = new List<SwitchSection> ();
+			if (!CollectSwitchSections (switchSections, context, node, switchExpr))
+				return null;
+
+			return new CodeAction (context.TranslateString ("Convert to 'switch'"),
+				script =>
+				{
+					var switchStatement = new SwitchStatement { Expression = switchExpr.Clone () };
+					switchStatement.SwitchSections.AddRange (switchSections);
+					script.Replace (node, switchStatement);
+				},
+				node
+			);
+		}
+
+		internal static Expression GetSwitchExpression (BaseRefactoringContext context, Expression expr)
+		{
+			var binaryOp = expr as BinaryOperatorExpression;
+			if (binaryOp == null)
+				return null;
+
+			if (binaryOp.Operator == BinaryOperatorType.ConditionalOr)
+				return GetSwitchExpression (context, binaryOp.Left);
+
+			if (binaryOp.Operator == BinaryOperatorType.Equality) {
+				Expression switchExpr = null;
+				if (IsConstantExpression (context, binaryOp.Right))
+					switchExpr = binaryOp.Left;
+				if (IsConstantExpression (context, binaryOp.Left))
+					switchExpr = binaryOp.Right;
+				if (switchExpr != null && IsValidSwitchType (context.Resolve (switchExpr).Type))
+					return switchExpr;
+			}
+
+			return null;
+		}
+
+		static bool IsConstantExpression (BaseRefactoringContext context, Expression expr)
+		{
+			if (expr is PrimitiveExpression || expr is NullReferenceExpression)
+				return true;
+			return context.Resolve (expr).IsCompileTimeConstant;
+		}
+
+		static readonly KnownTypeCode [] validTypes = 
+		{
+			KnownTypeCode.String, KnownTypeCode.Boolean, KnownTypeCode.Char,
+			KnownTypeCode.Byte, KnownTypeCode.SByte,
+			KnownTypeCode.Int16, KnownTypeCode.Int32, KnownTypeCode.Int64,
+			KnownTypeCode.UInt16, KnownTypeCode.UInt32, KnownTypeCode.UInt64
+		};
+
+		static bool IsValidSwitchType (IType type)
+		{
+			if (type.Kind == TypeKind.Enum)
+				return true;
+			var typeDefinition = type.GetDefinition ();
+			if (typeDefinition == null)
+				return false;
+
+			if (typeDefinition.KnownTypeCode == KnownTypeCode.NullableOfT) {
+				var nullableType = (ParameterizedType)type;
+				typeDefinition = nullableType.TypeArguments [0].GetDefinition ();
+				if (typeDefinition == null)
+					return false;
+			}
+			return Array.IndexOf (validTypes, typeDefinition.KnownTypeCode) != -1;
+		}
+
+		internal static bool CollectSwitchSections (ICollection<SwitchSection> result, BaseRefactoringContext context, 
+										   IfElseStatement ifStatement, Expression switchExpr)
+		{
+			// if
+			var section = new SwitchSection ();
+			if (!CollectCaseLabels (section.CaseLabels, context, ifStatement.Condition, switchExpr))
+				return false;
+			CollectSwitchSectionStatements (section.Statements, context, ifStatement.TrueStatement);
+			result.Add (section);
+
+			if (ifStatement.TrueStatement.Descendants.Any(n => n is BreakStatement))
+				return false;
+
+			if (ifStatement.FalseStatement.IsNull)
+				return true;
+
+			// else if
+			var falseStatement = ifStatement.FalseStatement as IfElseStatement;
+			if (falseStatement != null)
+				return CollectSwitchSections (result, context, falseStatement, switchExpr);
+
+			if (ifStatement.FalseStatement.Descendants.Any(n => n is BreakStatement))
+				return false;
+			// else (default label)
+			var defaultSection = new SwitchSection ();
+			defaultSection.CaseLabels.Add (new CaseLabel ());
+			CollectSwitchSectionStatements (defaultSection.Statements, context, ifStatement.FalseStatement);
+			result.Add (defaultSection);
+
+			return true;
+		}
+
+		static bool CollectCaseLabels (AstNodeCollection<CaseLabel> result, BaseRefactoringContext context, 
+									   Expression condition, Expression switchExpr)
+		{
+			if (condition is ParenthesizedExpression)
+				return CollectCaseLabels (result, context, ((ParenthesizedExpression)condition).Expression, switchExpr);
+
+			var binaryOp = condition as BinaryOperatorExpression;
+			if (binaryOp == null)
+				return false;
+
+			if (binaryOp.Operator == BinaryOperatorType.ConditionalOr)
+				return CollectCaseLabels (result, context, binaryOp.Left, switchExpr) &&
+					   CollectCaseLabels (result, context, binaryOp.Right, switchExpr);
+
+			if (binaryOp.Operator == BinaryOperatorType.Equality) {
+				if (switchExpr.Match (binaryOp.Left).Success) {
+					if (IsConstantExpression (context, binaryOp.Right)) {
+						result.Add (new CaseLabel (binaryOp.Right.Clone ()));
+						return true;
+					}
+				} else if (switchExpr.Match (binaryOp.Right).Success) {
+					if (IsConstantExpression (context, binaryOp.Left)) {
+						result.Add (new CaseLabel (binaryOp.Left.Clone ()));
+						return true;
+					}
+				}
+			}
+
+			return false;
+		}
+		
+		static void CollectSwitchSectionStatements (AstNodeCollection<Statement> result, BaseRefactoringContext context, 
+												    Statement statement)
+		{
+			BlockStatement blockStatement = statement as BlockStatement;
+			if (blockStatement != null)
+				result.AddRange(blockStatement.Statements.Select(s => s.Clone()));
+			else
+				result.Add(statement.Clone());
+
+			// add 'break;' at end if necessary
+			var reachabilityAnalysis = context.CreateReachabilityAnalysis (statement);
+			if (reachabilityAnalysis.IsEndpointReachable(statement))
+				result.Add(new BreakStatement());
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertImplicitToExplicitImplementationAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertImplicitToExplicitImplementationAction.cs
similarity index 100%
rename from src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertImplicitToExplicitImplementationAction.cs
rename to src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertImplicitToExplicitImplementationAction.cs
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertLambdaBodyExpressionToStatementAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertLambdaBodyExpressionToStatementAction.cs
new file mode 100644
index 0000000000..ad197225e8
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertLambdaBodyExpressionToStatementAction.cs
@@ -0,0 +1,63 @@
+// 
+// ConvertLambdaBodyExpressionToStatementAction.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction ("Converts expression of lambda body to statement",
+					Description = "Converts expression of lambda body to statement")]
+	public class ConvertLambdaBodyExpressionToStatementAction : SpecializedCodeAction<LambdaExpression>
+	{
+
+		protected override CodeAction GetAction (RefactoringContext context, LambdaExpression node)
+		{
+			if (!node.ArrowToken.Contains (context.Location))
+				return null;
+
+			var bodyExpr = node.Body as Expression;
+			if (bodyExpr == null)
+				return null;
+			return new CodeAction (context.TranslateString ("Convert to lambda statement"),
+				script =>
+				{
+					var body = new BlockStatement ();
+					if (RequireReturnStatement (context, node)) {
+						body.Add (new ReturnStatement (bodyExpr.Clone ()));
+					} else {
+						body.Add (bodyExpr.Clone ());
+					}
+					script.Replace (bodyExpr, body);
+				},
+				node
+			);
+		}
+
+		static bool RequireReturnStatement (RefactoringContext context, LambdaExpression lambda)
+		{
+			var type = LambdaHelper.GetLambdaReturnType (context, lambda);
+			return type != null && type.ReflectionName != "System.Void";
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertLambdaBodyStatementToExpressionAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertLambdaBodyStatementToExpressionAction.cs
new file mode 100644
index 0000000000..485c9a0d86
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertLambdaBodyStatementToExpressionAction.cs
@@ -0,0 +1,74 @@
+// 
+// ConvertLambdaBodyStatementToExpressionAction.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction ("Converts statement of lambda body to expression",
+					Description = "Converts statement of lambda body to expression")]
+	public class ConvertLambdaBodyStatementToExpressionAction : SpecializedCodeAction<LambdaExpression>
+	{
+		internal static bool TryGetConvertableExpression(AstNode body, out BlockStatement blockStatement, out Expression expr)
+		{
+			expr = null;
+			blockStatement = body as BlockStatement;
+			if (blockStatement == null || blockStatement.Statements.Count > 1)
+				return false;
+			var returnStatement = blockStatement.Statements.FirstOrNullObject() as ReturnStatement;
+			if (returnStatement != null) {
+				expr = returnStatement.Expression;
+			} else {
+				var exprStatement = blockStatement.Statements.FirstOrNullObject() as ExpressionStatement;
+				if (exprStatement == null)
+					return false;
+				expr = exprStatement.Expression;
+			}
+			return true;
+		}
+
+		internal static CodeAction CreateAction (BaseRefactoringContext context, AstNode node, BlockStatement blockStatement, Expression expr)
+		{
+			return new CodeAction (
+				context.TranslateString ("Convert to lambda expression"),
+				script => script.Replace (blockStatement, expr.Clone ()), 
+				node
+			);
+		}
+
+		protected override CodeAction GetAction (RefactoringContext context, LambdaExpression node)
+		{
+			if (!node.ArrowToken.Contains (context.Location))
+				return null;
+
+			BlockStatement blockStatement;
+			Expression expr;
+			if (!TryGetConvertableExpression(node.Body, out blockStatement, out expr))
+				return null;
+
+			
+			return CreateAction (context, node.ArrowToken, blockStatement, expr);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertLambdaToAnonymousDelegateAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertLambdaToAnonymousDelegateAction.cs
new file mode 100644
index 0000000000..fe64acbe9d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertLambdaToAnonymousDelegateAction.cs
@@ -0,0 +1,99 @@
+//
+// ConvertLambdaToDelegateAction.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Convert lambda to anonymous delegate",
+	               Description = "Converts a lambda to an anonymous delegate.")]
+	public class ConvertLambdaToAnonymousDelegateAction : SpecializedCodeAction<LambdaExpression>
+	{
+		#region implemented abstract members of SpecializedCodeAction
+		protected override CodeAction GetAction(RefactoringContext context, LambdaExpression node)
+		{
+			if (context.Location < node.StartLocation || context.Location >= node.Body.StartLocation)
+				return null;
+
+			var lambdaResolveResult = context.Resolve(node) as LambdaResolveResult;
+			if (lambdaResolveResult == null)
+				return null;
+
+			return new CodeAction(context.TranslateString("Convert to anonymous delegate"), script => {
+				BlockStatement newBody;
+				if (node.Body is BlockStatement) {
+					newBody = (BlockStatement)node.Body.Clone();
+				} else {
+					var expression = (Expression)node.Body.Clone();
+
+					Statement statement;
+					if (RequireReturnStatement(context, node)) {
+						statement = new ReturnStatement(expression);
+					}
+					else {
+						statement = expression;
+					}
+
+					newBody = new BlockStatement {
+						Statements = {
+							statement
+						}
+					};
+				}
+				var method = new AnonymousMethodExpression (newBody, GetParameters(lambdaResolveResult.Parameters, context));
+				script.Replace(node, method);
+			}, node);
+		}
+		#endregion
+
+		IEnumerable<ParameterDeclaration> GetParameters(IList<IParameter> parameters, RefactoringContext context)
+		{
+			if (parameters == null || parameters.Count == 0)
+				return null;
+			var result = new List<ParameterDeclaration> ();
+			foreach (var parameter in parameters) {
+				var type = context.CreateShortType(parameter.Type);
+				var name = parameter.Name;
+				ParameterModifier modifier = ParameterModifier.None;
+				if (parameter.IsRef) 
+					modifier |= ParameterModifier.Ref;
+				if (parameter.IsOut)
+					modifier |= ParameterModifier.Out;
+				result.Add (new ParameterDeclaration(type, name, modifier));
+			}
+			return result;
+		}
+
+		static bool RequireReturnStatement (RefactoringContext context, LambdaExpression lambda)
+		{
+			var type = LambdaHelper.GetLambdaReturnType (context, lambda);
+			return type != null && type.ReflectionName != "System.Void";
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertMethodGroupToAnonymousMethodAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertMethodGroupToAnonymousMethodAction.cs
new file mode 100644
index 0000000000..78c2cec7aa
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertMethodGroupToAnonymousMethodAction.cs
@@ -0,0 +1,78 @@
+//
+// ConvertMethodGroupToAnonymousMethodAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Convert method group to anoymous method",
+	               Description = "Convert method group to anoymous method")]
+	public class ConvertMethodGroupToAnonymousMethodAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			Expression node = context.GetNode<IdentifierExpression>();
+			if (node == null) {
+				var mr = context.GetNode<MemberReferenceExpression>();
+				if (mr == null || !mr.MemberNameToken.IsInside(context.Location))
+					yield break;
+				node = mr;
+			}
+			if (node == null)
+				yield break;
+			var rr = context.Resolve(node) as MethodGroupResolveResult;
+			if (rr == null || rr.IsError)
+				yield break;
+			var type = TypeGuessing.GetValidTypes(context.Resolver, node).FirstOrDefault(t => t.Kind == TypeKind.Delegate);
+			if (type == null)
+				yield break;
+			var invocationMethod = type.GetDelegateInvokeMethod();
+			if (invocationMethod == null)
+				yield break;
+
+			yield return new CodeAction(
+				context.TranslateString("Convert to anonymous method"), 
+				script => {
+					var expr = new InvocationExpression(node.Clone(), invocationMethod.Parameters.Select(p => new IdentifierExpression(context.GetNameProposal(p.Name))));
+					var stmt = invocationMethod.ReturnType.IsKnownType(KnownTypeCode.Void) ? (Statement)expr : new ReturnStatement(expr);
+					var anonymousMethod = new AnonymousMethodExpression {
+						Body = new BlockStatement { stmt }
+					};
+					foreach (var p in invocationMethod.Parameters) {
+						var decl = new ParameterDeclaration(context.CreateShortType(p.Type), context.GetNameProposal(p.Name));
+						anonymousMethod.Parameters.Add(decl); 
+					}
+
+					script.Replace(node, anonymousMethod);
+				},
+				node
+			);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertMethodGroupToLambdaAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertMethodGroupToLambdaAction.cs
new file mode 100644
index 0000000000..b7053437b3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertMethodGroupToLambdaAction.cs
@@ -0,0 +1,77 @@
+//
+// ConvertMethodGroupToLambdaAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Convert method group to lambda expression",
+	               Description = "Convert method group to lambda expression")]
+	public class ConvertMethodGroupToLambdaAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			Expression node = context.GetNode<IdentifierExpression>();
+			if (node == null) {
+				var mr = context.GetNode<MemberReferenceExpression>();
+				if (mr == null || !mr.MemberNameToken.IsInside(context.Location))
+					yield break;
+				node = mr;
+			}
+			if (node == null)
+				yield break;
+			var rr = context.Resolve(node) as MethodGroupResolveResult;
+			if (rr == null || rr.IsError)
+				yield break;
+			var type = TypeGuessing.GetValidTypes(context.Resolver, node).FirstOrDefault(t => t.Kind == TypeKind.Delegate);
+			if (type == null)
+				yield break;
+			var invocationMethod = type.GetDelegateInvokeMethod();
+			if (invocationMethod == null)
+				yield break;
+
+			yield return new CodeAction(
+				context.TranslateString("Convert to lambda expression"), 
+				script => {
+					var invocation = new InvocationExpression(node.Clone(), invocationMethod.Parameters.Select(p => new IdentifierExpression(context.GetNameProposal(p.Name))));
+					var lambda = new LambdaExpression {
+						Body = invocation
+					};
+					lambda.Parameters.AddRange(
+						invocation.Arguments
+							.Cast<IdentifierExpression>()
+							.Select(p => new ParameterDeclaration { Name = p.Identifier })
+					);
+					script.Replace(node, lambda);
+				},
+				node
+			);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertMultiplyToShiftAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertMultiplyToShiftAction.cs
new file mode 100644
index 0000000000..f995c47b1a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertMultiplyToShiftAction.cs
@@ -0,0 +1,67 @@
+//
+// ConvertMultiplyToShiftAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Convert '*'/'/' to '<<'/'>>'",
+	               Description = "Convert '*'/'/' to '<<'/'>>'")]
+	public class ConvertMultiplyToShiftAction : SpecializedCodeAction<BinaryOperatorExpression>
+	{
+		protected override CodeAction GetAction(RefactoringContext context, BinaryOperatorExpression node)
+		{
+			if (!node.OperatorToken.Contains(context.Location))
+				return null;
+			if (node.Operator != BinaryOperatorType.Multiply && node.Operator != BinaryOperatorType.Divide || !(node.Right is PrimitiveExpression))
+				return null;
+
+			var valueObj = context.Resolve(node.Right).ConstantValue;
+			if (!(valueObj is int))
+				return null;
+			var value = (int)valueObj;
+
+			var log2 = (int)Math.Log(value, 2);
+			if (value != 1 << log2)
+				return null;
+
+			return new CodeAction (
+				node.Operator == BinaryOperatorType.Multiply ? context.TranslateString("Replace with '<<'") : context.TranslateString("Replace with '>>'"),
+				script => script.Replace(
+					node, 
+					new BinaryOperatorExpression(
+						node.Left.Clone(), 
+						node.Operator == BinaryOperatorType.Multiply ? BinaryOperatorType.ShiftLeft : BinaryOperatorType.ShiftRight,
+						new PrimitiveExpression(log2)
+					)
+				),
+				node.OperatorToken
+			);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertNullCoalescingToConditionalExpressionAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertNullCoalescingToConditionalExpressionAction.cs
new file mode 100644
index 0000000000..04afa590b4
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertNullCoalescingToConditionalExpressionAction.cs
@@ -0,0 +1,54 @@
+//
+// ConvertNullCoalescingToConditionalExpressionAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Convert '??' to '?:'",
+	               Description = "Convert '??' to '?:'")]
+	public class ConvertNullCoalescingToConditionalExpressionAction : SpecializedCodeAction<BinaryOperatorExpression>
+	{
+		protected override CodeAction GetAction(RefactoringContext ctx, BinaryOperatorExpression node)
+		{
+			if (node.Operator != BinaryOperatorType.NullCoalescing || !node.OperatorToken.Contains(ctx.Location))
+				return null;
+			return new CodeAction(
+				ctx.TranslateString("Replace with '?:' expression"),
+				script => {
+					Expression expr = new ConditionalExpression (
+						new BinaryOperatorExpression(node.Left.Clone(), BinaryOperatorType.InEquality, new NullReferenceExpression ()),
+						node.Left.Clone(),
+						node.Right.Clone()
+					);
+					script.Replace(node, expr);
+				},
+				node
+			);
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertReturnStatementToIfAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertReturnStatementToIfAction.cs
new file mode 100644
index 0000000000..3b3913f096
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertReturnStatementToIfAction.cs
@@ -0,0 +1,78 @@
+//
+// ConvertReturnStatementToIfAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Convert 'return' to 'if'",
+	               Description = "Convert 'return' to 'if'")]
+	public class ConvertReturnStatementToIfAction : SpecializedCodeAction <ReturnStatement>
+	{
+		protected override CodeAction GetAction(RefactoringContext context, ReturnStatement node)
+		{
+			if (!node.ReturnToken.Contains(context.Location))
+				return null;
+
+			if (node.Expression is ConditionalExpression)
+				return CreateForConditionalExpression(context, node, (ConditionalExpression)node.Expression);
+			var bOp = node.Expression as BinaryOperatorExpression;
+			if (bOp != null && bOp.Operator == BinaryOperatorType.NullCoalescing)
+				return CreateForNullCoalesingExpression(context, node, bOp);
+			return null;
+		}
+
+		CodeAction CreateForConditionalExpression(RefactoringContext ctx, ReturnStatement node, ConditionalExpression conditionalExpression)
+		{
+			return new CodeAction (
+				ctx.TranslateString("Replace with 'if' statement"),
+				script => {
+					var ifStatement = new IfElseStatement(conditionalExpression.Condition.Clone(), new ReturnStatement(conditionalExpression.TrueExpression.Clone()));
+					script.Replace(node, ifStatement); 
+					script.InsertAfter(ifStatement, new ReturnStatement(conditionalExpression.FalseExpression.Clone()));
+				},
+				node
+			);
+		}
+
+		CodeAction CreateForNullCoalesingExpression(RefactoringContext ctx, ReturnStatement node, BinaryOperatorExpression bOp)
+		{
+			return new CodeAction (
+				ctx.TranslateString("Replace with 'if' statement"),
+				script => {
+					var ifStatement = new IfElseStatement(new BinaryOperatorExpression(bOp.Left.Clone(), BinaryOperatorType.InEquality, new NullReferenceExpression()), new ReturnStatement(bOp.Left.Clone()));
+					script.Replace(node, ifStatement); 
+					script.InsertAfter(ifStatement, new ReturnStatement(bOp.Right.Clone()));
+				},
+				node
+			);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertShiftToMultiplyAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertShiftToMultiplyAction.cs
new file mode 100644
index 0000000000..64076b18e7
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertShiftToMultiplyAction.cs
@@ -0,0 +1,61 @@
+//
+// ConvertShiftToMultiplyAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Convert '<<'/'>>' to '*'/'/'",
+	               Description = "Convert '<<'/'>>' to '*'/'/'")]
+	public class ConvertShiftToMultiplyAction : SpecializedCodeAction <BinaryOperatorExpression>
+	{
+		protected override CodeAction GetAction(RefactoringContext context, BinaryOperatorExpression node)
+		{
+			if (!node.OperatorToken.Contains(context.Location))
+				return null;
+			if (node.Operator != BinaryOperatorType.ShiftLeft && node.Operator != BinaryOperatorType.ShiftRight || !(node.Right is PrimitiveExpression))
+				return null;
+
+			var value = context.Resolve(node.Right).ConstantValue;
+			if (!(value is int))
+				return null;
+
+			return new CodeAction (
+				node.Operator == BinaryOperatorType.ShiftLeft ? context.TranslateString("Replace with '*'") : context.TranslateString("Replace with '/'"),
+				script => script.Replace(
+					node, 
+					new BinaryOperatorExpression(
+						node.Left.Clone(), 
+						node.Operator == BinaryOperatorType.ShiftLeft ? BinaryOperatorType.Multiply : BinaryOperatorType.Divide,
+						new PrimitiveExpression(1 << (int)value)
+					)
+				),
+				node.OperatorToken
+			);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertSwitchToIfAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertSwitchToIfAction.cs
new file mode 100644
index 0000000000..f91af2d5aa
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertSwitchToIfAction.cs
@@ -0,0 +1,147 @@
+// 
+// ConvertSwitchToIfAction.cs
+//  
+// Author:
+//       Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction ("Convert 'switch' to 'if'", Description = "Convert 'switch' statement to 'if' statement")]
+	public class ConvertSwitchToIfAction : SpecializedCodeAction<SwitchStatement>
+	{
+		static readonly InsertParenthesesVisitor insertParenthesesVisitor = new InsertParenthesesVisitor ();
+
+		protected override CodeAction GetAction (RefactoringContext context, SwitchStatement node)
+		{
+			if (!node.SwitchToken.Contains (context.Location))
+				return null;
+
+			// empty switch
+			if (node.SwitchSections.Count == 0)
+				return null;
+
+			// switch with default only
+			if (node.SwitchSections.First ().CaseLabels.Any (label => label.Expression.IsNull))
+				return null;
+
+			// check non-trailing breaks
+			foreach (var switchSection in node.SwitchSections) {
+				var lastStatement = switchSection.Statements.LastOrDefault ();
+				var finder = new NonTrailingBreakFinder (lastStatement as BreakStatement);
+				if (switchSection.AcceptVisitor (finder))
+					return null;
+			}
+			
+			return new CodeAction (context.TranslateString ("Convert to 'if'"),
+				script =>
+				{
+					IfElseStatement ifStatement = null;
+					IfElseStatement currentStatement = null;
+					foreach (var switchSection in node.SwitchSections) {
+						var condition = CollectCondition (node.Expression, switchSection.CaseLabels);
+						var bodyStatement = new BlockStatement ();
+						var lastStatement = switchSection.Statements.LastOrDefault ();
+						foreach (var statement in switchSection.Statements) {
+							// skip trailing break
+							if (statement == lastStatement && statement is BreakStatement)
+								continue;
+							bodyStatement.Add (statement.Clone ());
+						}
+
+						// default -> else
+						if (condition == null) {
+							currentStatement.FalseStatement = bodyStatement;
+							break;
+						}
+						var elseIfStatement = new IfElseStatement (condition, bodyStatement);
+						if (ifStatement == null)
+							ifStatement = elseIfStatement;
+						else
+							currentStatement.FalseStatement = elseIfStatement;
+						currentStatement = elseIfStatement;
+					}
+					script.Replace (node, ifStatement);
+					script.FormatText (ifStatement);
+				}, node);
+		}
+
+		static Expression CollectCondition(Expression switchExpr, AstNodeCollection<CaseLabel> caseLabels)
+		{
+			// default
+			if (caseLabels.Count == 0 || caseLabels.Any (label => label.Expression.IsNull))
+				return null;
+
+			var conditionList = caseLabels.Select (
+				label => new BinaryOperatorExpression (switchExpr.Clone (), BinaryOperatorType.Equality, label.Expression.Clone ()))
+				.ToArray ();
+
+			// insert necessary parentheses
+			foreach (var expr in conditionList)
+				expr.AcceptVisitor (insertParenthesesVisitor);
+
+			if (conditionList.Length == 1)
+				return conditionList [0];
+
+			// combine case labels into an conditional or expression
+			BinaryOperatorExpression condition = null;
+			BinaryOperatorExpression currentCondition = null;
+			for (int i = 0; i < conditionList.Length - 1; i++) {
+				var newCondition = new BinaryOperatorExpression
+				{
+					Operator = BinaryOperatorType.ConditionalOr,
+					Left = conditionList[i]
+				};
+				if (currentCondition == null)
+					condition = newCondition;
+				else
+					currentCondition.Right = newCondition;
+				currentCondition = newCondition;
+			}
+			currentCondition.Right = conditionList [conditionList.Length - 1];
+
+			return condition;
+		}
+		
+		class NonTrailingBreakFinder : DepthFirstAstVisitor<bool>
+		{
+			BreakStatement trailingBreakStatement;
+
+			public NonTrailingBreakFinder (BreakStatement trailingBreak)
+			{
+				trailingBreakStatement = trailingBreak;
+			}
+
+			protected override bool VisitChildren (AstNode node)
+			{
+				return node.Children.Any (child => child.AcceptVisitor (this));
+			}
+
+			public override bool VisitBreakStatement (BreakStatement breakStatement)
+			{
+				return breakStatement != trailingBreakStatement;
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertToInitializer/AccessPath.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertToInitializer/AccessPath.cs
similarity index 100%
rename from src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertToInitializer/AccessPath.cs
rename to src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertToInitializer/AccessPath.cs
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertToInitializer/ConvertInitializerToExplicitInitializationsAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertToInitializer/ConvertInitializerToExplicitInitializationsAction.cs
new file mode 100644
index 0000000000..bd7766b564
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertToInitializer/ConvertInitializerToExplicitInitializationsAction.cs
@@ -0,0 +1,207 @@
+//
+// ConvertInitializerToExplicitInitializationsAction.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Convert to explicit initializers",
+	               Description = "Converts an object or collection initializer to explicit initializations.")]
+	public class ConvertInitializerToExplicitInitializationsAction : CodeActionProvider
+	{
+		#region ICodeActionProvider implementation
+
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var codeAction = GetActionForVariableInitializer(context);
+			if (codeAction != null) {
+				yield return codeAction;
+				yield break;
+			}
+			codeAction = GetActionForAssignmentExpression(context);
+			if (codeAction != null) {
+				yield return codeAction;
+				yield break;
+			}
+		}
+		
+		public CodeAction GetActionForVariableInitializer(RefactoringContext context)
+		{
+			var variableInitializer = context.GetNode<VariableInitializer>();
+			if (variableInitializer == null)
+				return null;
+			var declaration = variableInitializer.Parent as VariableDeclarationStatement;
+			if (declaration == null)
+				return null;
+			if (variableInitializer.Initializer.IsNull)
+				return null;
+			var objectCreateExpression = variableInitializer.Initializer as ObjectCreateExpression;
+			if (objectCreateExpression == null)
+				return null;
+			var converter = new InitializerConversionVisitor(context);
+			Expression finalExpression;
+			var statements = converter.ConvertInitializer(objectCreateExpression, out finalExpression);
+			if (statements.Count > 0) {
+				return new CodeAction(context.TranslateString("Convert to explicit initializers"), script => {
+					foreach (var statement in statements) {
+						script.InsertBefore(declaration, statement);
+					}
+					script.Replace(variableInitializer.Initializer, finalExpression);
+				}, variableInitializer);
+			}
+			return null;
+		}
+		
+		public CodeAction GetActionForAssignmentExpression(RefactoringContext context)
+		{
+			var assignmentExpression = context.GetNode<AssignmentExpression>();
+			if (assignmentExpression == null)
+				return null;
+			var expressionStatement = assignmentExpression.Parent as ExpressionStatement;
+			if (expressionStatement == null)
+				return null;
+			var objectCreateExpression = assignmentExpression.Right as ObjectCreateExpression;
+			if (objectCreateExpression == null)
+				return null;
+			var converter = new InitializerConversionVisitor(context);
+			Expression finalExpression;
+			var statements = converter.ConvertInitializer(objectCreateExpression, out finalExpression);
+			if (statements.Count > 0) {
+				return new CodeAction(context.TranslateString("Convert to explicit initializers"), script => {
+					foreach (var statement in statements) {
+						script.InsertBefore(expressionStatement, statement);
+					}
+					script.Replace(assignmentExpression.Right, finalExpression);
+				}, assignmentExpression);
+			}
+			return null;
+		}
+		#endregion
+
+		class InitializerConversionVisitor : DepthFirstAstVisitor<Expression, Expression>
+		{
+			RefactoringContext context;
+			IList<Statement> statements;
+			NamingHelper namingHelper;
+
+			public InitializerConversionVisitor(RefactoringContext context)
+			{
+				this.context = context;
+				namingHelper = new NamingHelper(context);
+			}
+
+			AstType GetDeclarationType(AstType type)
+			{
+				AstType declarationType;
+				if (context.UseExplicitTypes) {
+					declarationType = type.Clone();
+				} else {
+					declarationType = new SimpleType("var");
+				}
+				return declarationType;
+			}
+
+			public IList<Statement> ConvertInitializer(ObjectCreateExpression initializer, out Expression finalExpression)
+			{
+				statements = new List<Statement>();
+
+				finalExpression = initializer.AcceptVisitor(this, null);
+
+				return statements;
+			}
+
+			public override Expression VisitObjectCreateExpression(ObjectCreateExpression objectCreateExpression, Expression data)
+			{
+				var creationType = objectCreateExpression.Type.Clone();
+
+				var parameters = objectCreateExpression.Arguments.Select(arg => arg.Clone());
+				var newCreation = new ObjectCreateExpression(creationType, parameters);
+				if (objectCreateExpression.Initializer.IsNull) {
+					return newCreation;
+				} else {
+					AstType declarationType = GetDeclarationType(objectCreateExpression.Type);
+					var name = namingHelper.GenerateVariableName(objectCreateExpression.Type);
+					var variableInitializer = new VariableDeclarationStatement(declarationType, name, newCreation);
+					statements.Add(variableInitializer);
+
+					var identifier = new IdentifierExpression(name);
+					base.VisitObjectCreateExpression(objectCreateExpression, identifier);
+
+					return identifier;
+				}
+			}
+
+			public override Expression VisitArrayInitializerExpression(ArrayInitializerExpression arrayInitializerExpression, Expression data)
+			{
+				if (!(arrayInitializerExpression.Parent is ArrayInitializerExpression)) {
+					return base.VisitArrayInitializerExpression(arrayInitializerExpression, data);
+				}
+				// this a tuple in a collection initializer
+				var arguments = arrayInitializerExpression.Elements.Select(element => element.AcceptVisitor(this, null).Clone());
+				var method = new MemberReferenceExpression {
+					Target = data.Clone(),
+					MemberName = "Add"
+				};
+				statements.Add(new InvocationExpression(method, arguments));
+
+				return null;
+			}
+
+			public override Expression VisitNamedExpression(NamedExpression namedExpression, Expression data)
+			{
+				var member = new MemberReferenceExpression {
+					Target = data.Clone(),
+					MemberName = namedExpression.Name
+				};
+				var expression = namedExpression.Expression.AcceptVisitor(this, member);
+				if (expression != null) {
+					var statement = new ExpressionStatement {
+						Expression = new AssignmentExpression {
+							Left = member,
+							Right = expression.Clone()
+						}
+					};
+					statements.Add(statement);
+				}
+
+				return null;
+			}
+
+			protected override Expression VisitChildren(AstNode node, Expression data)
+			{
+				// Most expressions should just be used as-is, and
+				// a) need not be visited
+				// b) only return themselves
+				if (node is Expression && !(node is ObjectCreateExpression || node is ArrayInitializerExpression || node is NamedExpression)){
+					return (Expression)node;
+				}
+				return base.VisitChildren(node, data);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertToInitializer/ConvertToInitializerAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertToInitializer/ConvertToInitializerAction.cs
new file mode 100644
index 0000000000..e3e4d5e83a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertToInitializer/ConvertToInitializerAction.cs
@@ -0,0 +1,109 @@
+//
+// ConvertToInitializerAction.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Convert to initializer",
+	               Description = "Converts a set of assignments and .Add() calls to an initializer.")]
+	public class ConvertToInitializerAction : CodeActionProvider
+	{
+		#region ICodeActionProvider implementation
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var initializer = context.GetNode<VariableInitializer>();
+			if (initializer != null) {
+				var action = HandleInitializer(context, initializer);
+				if (action != null)
+					yield return action;
+			}
+			var expressionStatement = context.GetNode<ExpressionStatement>();
+			if (expressionStatement != null) {
+				var action = HandleExpressionStatement(context, expressionStatement);
+				if (action != null)
+					yield return action;
+			}
+		}
+
+		CodeAction HandleInitializer(RefactoringContext context, VariableInitializer initializer)
+		{
+			var objectCreateExpression = initializer.Initializer as ObjectCreateExpression;
+			if (objectCreateExpression == null)
+				return null;
+			var initializerRR = context.Resolve(initializer) as LocalResolveResult;
+			if (initializerRR == null)
+				return null;
+			IList<AstNode> statements = GetNodes(context.GetNode<Statement>());
+			var converter = new StatementsToInitializerConverter(context);
+			var newInitializer = converter.ConvertToInitializer(initializer, ref statements);
+			if (newInitializer == null || statements.Count == 0)
+				return null;
+			return MakeAction(context, initializer, newInitializer, statements);
+		}
+
+		CodeAction HandleExpressionStatement(RefactoringContext context, ExpressionStatement expressionStatement)
+		{
+			var expression = expressionStatement.Expression as AssignmentExpression;
+			if (expression == null || expression.Operator != AssignmentOperatorType.Assign)
+				return null;
+			if (!(expression.Right is ObjectCreateExpression))
+				return null;
+			var expressionResolveResult = context.Resolve(expression.Left);
+			if (!(expressionResolveResult is LocalResolveResult) && !(expressionResolveResult is MemberResolveResult))
+				return null;
+			IList<AstNode> statements = GetNodes(context.GetNode<Statement>());
+			var converter = new StatementsToInitializerConverter(context);
+			var newExpression = converter.ConvertToInitializer(expression, ref statements);
+			if (newExpression == null || statements.Count == 0)
+				return null;
+			return MakeAction(context, expression, newExpression, statements);
+		}
+		
+		List<AstNode> GetNodes(Statement startStatement)
+		{
+			var statements = new List<AstNode>();
+			AstNode currentNode = startStatement.NextSibling;
+			while (currentNode != null) {
+				if (currentNode is Statement || currentNode is Comment)
+					statements.Add(currentNode);
+				currentNode = currentNode.NextSibling;
+			}
+			return statements;
+		}
+		
+		CodeAction MakeAction(RefactoringContext context, AstNode oldNode, AstNode replacementNode, IEnumerable<AstNode> toRemove)
+		{
+			return new CodeAction(context.TranslateString("Convert to initializer"), script => {
+				foreach (var statement in toRemove)
+					script.Remove(statement);
+				script.Replace(oldNode, replacementNode);
+			}, oldNode);
+		}
+		#endregion
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertToInitializer/StatementsToInitializerConverter.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertToInitializer/StatementsToInitializerConverter.cs
similarity index 100%
rename from src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertToInitializer/StatementsToInitializerConverter.cs
rename to src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertToInitializer/StatementsToInitializerConverter.cs
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertWhileToDoWhileLoopAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertWhileToDoWhileLoopAction.cs
new file mode 100644
index 0000000000..320c29b3aa
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertWhileToDoWhileLoopAction.cs
@@ -0,0 +1,60 @@
+// 
+// ConvertWhileToDoWhileLoopAction.cs
+//  
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Converts a while loop to a do...while loop.
+	/// For instance: while (foo) {} becomes do { } while (foo);
+	/// </summary>
+	[ContextAction("Convert while loop to do...while", Description = "Convert while loop to do...while (changing semantics)")]
+	public class ConvertWhileToDoWhileLoopAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var whileLoop = context.GetNode<WhileStatement>();
+			if (whileLoop == null || !whileLoop.WhileToken.Contains(context.Location)) {
+				yield break;
+			}
+
+			yield return new CodeAction(context.TranslateString("Convert to do...while loop"),
+			                            script => ApplyAction(script, whileLoop),
+			                            whileLoop.WhileToken);
+		}
+
+		void ApplyAction(Script script, WhileStatement statement) {
+			var doWhile = new DoWhileStatement {
+				Condition = statement.Condition.Clone(),
+				EmbeddedStatement = statement.EmbeddedStatement.Clone()
+			};
+
+			script.Replace(statement, doWhile);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CopyCommentsFromBase.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CopyCommentsFromBase.cs
new file mode 100644
index 0000000000..e5cbbfe5b5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CopyCommentsFromBase.cs
@@ -0,0 +1,69 @@
+// 
+// CopyCommentsFromBase.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus0@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	///  Copies documented comments from base to overriding methods.
+	/// </summary>
+	using System;
+	using System.Collections.Generic;
+	
+	[ContextAction("Copy comments from base", Description = "Copies documented comments from base to overriding methods.")]
+	public class CopyCommentsFromBase: SpecializedCodeAction <MethodDeclaration>
+	{
+		protected override CodeAction GetAction(RefactoringContext context, MethodDeclaration node)
+		{
+			if (node == null || !node.HasModifier(Modifiers.Override))
+				return null;
+			if (!node.NameToken.Contains(context.Location))
+				return null;
+			
+			IMethod resolvedMember = (IMethod)(context.Resolve(node) as MemberResolveResult).Member;
+			
+			if (resolvedMember == null)
+				return null;
+			
+			IMethod originalMember = (IMethod)InheritanceHelper.GetBaseMember(resolvedMember);
+		
+			if (originalMember == null || originalMember.Documentation == null)
+				return null;
+			string comments = originalMember.Documentation.ToString();
+			
+			if (string.IsNullOrEmpty(comments))
+				return null;
+			
+			string[] lines = comments.Split(new string[] { Environment.NewLine }, StringSplitOptions.None);
+			return new CodeAction(context.TranslateString("Copy comments from base"), script => {
+				foreach (string co in lines) {
+					script.InsertBefore(node, new Comment(co, CommentType.Documentation));
+				}
+			}, node.NameToken);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CopyCommentsFromInterface.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CopyCommentsFromInterface.cs
new file mode 100644
index 0000000000..abe8968250
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CopyCommentsFromInterface.cs
@@ -0,0 +1,82 @@
+// 
+// CopyCommentsFromInterface.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	///  Copies documented comments from interface to overriding methods.
+	/// </summary>
+	using System;
+	using System.Collections.Generic;
+	using System.Linq;
+	
+	[ContextAction("Copy comments from interface", Description = "Copies documented comments from interface to implementing methods.")]
+	public class CopyCommentsFromInterface: SpecializedCodeAction <MethodDeclaration>
+	{
+		protected override CodeAction GetAction(RefactoringContext context, MethodDeclaration node)
+		{
+			if (!(node.PrivateImplementationType.IsNull))
+				return null;
+			
+			if (!node.NameToken.Contains(context.Location))
+				return null;
+			
+			var method = (IMethod)((MemberResolveResult)context.Resolve(node)).Member;
+			
+			if (method.Documentation != null)
+				return null;
+			
+			IList<IMember> interfaceMethods = method.ImplementedInterfaceMembers;
+			
+			if (interfaceMethods.Count != 1 || method.DeclaringType.Kind == TypeKind.Interface)
+				return null;
+			
+			var interfaceMethod = interfaceMethods.SingleOrDefault();
+
+			if (interfaceMethod == null)
+				return null;
+
+			if (interfaceMethod.Documentation == null)
+				return null;
+
+			string comments = interfaceMethod.Documentation.ToString();
+			
+			if (comments == "")
+				return null;
+			
+			string[] lines = comments.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+			return new CodeAction(context.TranslateString("Copy comments from interface"), script =>
+			{
+				foreach (string co in lines) {
+					script.InsertBefore(node, new Comment(co, CommentType.Documentation));
+				}
+			}, node);
+			
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateBackingStoreAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateBackingStoreAction.cs
new file mode 100644
index 0000000000..a2ff5a1a9b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateBackingStoreAction.cs
@@ -0,0 +1,80 @@
+// 
+// CreateBackingStore.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Create backing store for auto property", Description = "Creates a backing field for an auto property.")]
+	public class CreateBackingStoreAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var property = context.GetNode<PropertyDeclaration>();
+			if (property == null || !property.NameToken.Contains(context.Location))
+				yield break;
+
+			if (!(!property.Getter.IsNull && !property.Setter.IsNull && // automatic properties always need getter & setter
+			      property.Getter.Body.IsNull &&
+			      property.Setter.Body.IsNull)) {
+				yield break;
+			}
+
+			yield return new CodeAction(context.TranslateString("Create backing store"), script => {
+				string backingStoreName = context.GetNameProposal (property.Name);
+				
+				// create field
+				var backingStore = new FieldDeclaration ();
+				if (property.Modifiers.HasFlag (Modifiers.Static))
+					backingStore.Modifiers |= Modifiers.Static;
+				backingStore.ReturnType = property.ReturnType.Clone ();
+				
+				var initializer = new VariableInitializer (backingStoreName);
+				backingStore.Variables.Add (initializer);
+				
+				// create new property & implement the get/set bodies
+				var newProperty = (PropertyDeclaration)property.Clone ();
+				Expression id1;
+				if (backingStoreName == "value")
+					id1 = new ThisReferenceExpression().Member("value");
+				else
+					id1 = new IdentifierExpression (backingStoreName);
+				Expression id2 = id1.Clone();
+				newProperty.Getter.Body = new BlockStatement () {
+					new ReturnStatement (id1)
+				};
+				newProperty.Setter.Body = new BlockStatement () {
+					new AssignmentExpression (id2, AssignmentOperatorType.Assign, new IdentifierExpression ("value"))
+				};
+				
+				script.Replace (property, newProperty);
+				script.InsertBefore (property, backingStore);
+				script.Link (initializer, id1, id2);
+			}, property.NameToken);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateChangedEventAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateChangedEventAction.cs
new file mode 100644
index 0000000000..89390865ae
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateChangedEventAction.cs
@@ -0,0 +1,86 @@
+//
+// CreateChangedEvent.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Threading;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Create changed event for property", Description = "Creates a changed event for an property.")]
+	public class CreateChangedEventAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var property = context.GetNode<PropertyDeclaration>();
+			if (property == null || !property.NameToken.Contains(context.Location))
+				yield break;
+
+			var field = RemoveBackingStoreAction.GetBackingField(context, property);
+			if (field == null)
+				yield break;
+			var resolvedType = ReflectionHelper.ParseReflectionName ("System.EventHandler").Resolve (context.Compilation);
+			if (resolvedType == null)
+				yield break;
+			var type = (TypeDeclaration)property.Parent;
+
+			yield return new CodeAction(context.TranslateString("Create changed event"), script => {
+				var eventDeclaration = CreateChangedEventDeclaration (context, property);
+				var methodDeclaration = CreateEventInvocatorAction.CreateEventInvocator (context, type, eventDeclaration, eventDeclaration.Variables.First (), resolvedType.GetDelegateInvokeMethod (), false);
+				var stmt = new ExpressionStatement (new InvocationExpression (
+					new IdentifierExpression (methodDeclaration.Name),
+					new MemberReferenceExpression (context.CreateShortType("System", "EventArgs"), "Empty")
+				));
+				script.InsertWithCursor(
+					context.TranslateString("Create event invocator"),
+					Script.InsertPosition.After,
+					new AstNode[] { eventDeclaration, methodDeclaration }
+				).ContinueScript(delegate {
+					script.InsertBefore (property.Setter.Body.RBraceToken, stmt);
+					script.FormatText (stmt);
+				});
+			}, property.NameToken);
+		}
+
+		EventDeclaration CreateChangedEventDeclaration (RefactoringContext context, PropertyDeclaration propertyDeclaration)
+		{
+			return new EventDeclaration {
+				Modifiers = propertyDeclaration.HasModifier (Modifiers.Static) ? Modifiers.Public | Modifiers.Static : Modifiers.Public,
+				ReturnType = context.CreateShortType("System", "EventHandler"),
+				Variables = {
+					new VariableInitializer {
+						Name = propertyDeclaration.Name + "Changed"
+					}
+				}
+			};
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateClassDeclarationAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateClassDeclarationAction.cs
new file mode 100644
index 0000000000..d0d1dd315f
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateClassDeclarationAction.cs
@@ -0,0 +1,330 @@
+// 
+// CreateClassDeclarationAction.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Create class", Description = "Creates a class declaration out of an object creation.")]
+	public class CreateClassDeclarationAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var simpleType = context.GetNode<SimpleType>();
+			if (simpleType != null && !(simpleType.Parent is EventDeclaration || simpleType.Parent is CustomEventDeclaration)) 
+				return GetActions(context, simpleType);
+
+			var createExpression = context.GetNode<ObjectCreateExpression>();
+			if (createExpression != null) 
+				return GetActions(context, createExpression);
+
+			var identifier = context.GetNode<IdentifierExpression>();
+			if (identifier != null && (identifier.Parent is MemberReferenceExpression)) 
+				return GetActions(context, identifier);
+
+			return Enumerable.Empty<CodeAction>();
+		}
+
+		static IEnumerable<CodeAction> GetActions(RefactoringContext context, AstNode node)
+		{
+			var resolveResult = context.Resolve(node) as UnknownIdentifierResolveResult;
+			if (resolveResult == null)
+				yield break;
+
+			var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
+			if (service != null && !service.IsValidName(resolveResult.Identifier, AffectedEntity.Class)) { 
+				yield break;
+			}
+			ClassType classType = GuessClassTypeByName(service, node);
+			ModifyClassTypeBasedOnTypeGuessing(context, node, ref classType);
+
+			string message;
+			switch (classType) {
+				case ClassType.Struct:
+					message = context.TranslateString("Create struct");
+					break;
+				case ClassType.Interface:
+					message = context.TranslateString("Create interface");
+					break;
+				default:
+					message = context.TranslateString("Create class");
+					break;
+			}
+			yield return new CodeAction(message, script => {
+				script.CreateNewType(CreateType(context, service, node, classType));
+			}, node);
+
+			if (node.Parent is TypeDeclaration || classType != ClassType.Class)
+				yield break;
+			yield return new CodeAction(context.TranslateString("Create nested class"), script => {
+				script.InsertWithCursor(
+					context.TranslateString("Create nested class"),
+					Script.InsertPosition.Before,
+					CreateType(context, service, node, classType)
+				);
+			}, node);
+		}
+
+		static void ModifyClassTypeBasedOnTypeGuessing(RefactoringContext context, AstNode node, ref ClassType classType)
+		{
+			var guessedType = TypeGuessing.GuessType(context, node);
+			if (guessedType.Kind == TypeKind.TypeParameter) {
+				var tp = (ITypeParameter)guessedType;
+				if (tp.HasValueTypeConstraint)
+					classType = ClassType.Struct;
+				if (tp.HasReferenceTypeConstraint)
+					classType = ClassType.Class;
+			}
+		}
+		
+		static ClassType GuessClassTypeByName(NamingConventionService service,  string identifier)
+		{
+			if (service == null)
+				return ClassType.Class;
+			if (service.IsValidName (identifier, AffectedEntity.Interface, Modifiers.Public))
+				return ClassType.Interface;
+			if (!service.IsValidName (identifier, AffectedEntity.Class, Modifiers.Public) &&
+			     service.IsValidName (identifier, AffectedEntity.Struct, Modifiers.Public))
+				return ClassType.Struct;
+			return ClassType.Class;
+		}
+
+		static ClassType GuessClassTypeByName(NamingConventionService service, AstNode node)
+		{
+			if (node is SimpleType) 
+				return GuessClassTypeByName (service, ((SimpleType)node).Identifier);
+			if (node is IdentifierExpression) 
+				return GuessClassTypeByName (service, ((IdentifierExpression)node).Identifier);
+			return ClassType.Class;
+		}
+
+		static TypeDeclaration CreateType(RefactoringContext context, NamingConventionService service, AstNode node, ClassType classType)
+		{
+			TypeDeclaration result;
+			if (node is SimpleType) {
+				result = CreateClassFromType(context, classType, (SimpleType)node);
+			} else if (node is ObjectCreateExpression) {
+				result = CreateClassFromObjectCreation(context, (ObjectCreateExpression)node);
+			} else {
+				result = CreateClassFromIdentifier(context, classType, (IdentifierExpression)node);
+			}
+
+			return AddBaseTypesAccordingToNamingRules(context, service, result);
+		}
+
+		static TypeDeclaration CreateClassFromIdentifier(RefactoringContext context, ClassType classType, IdentifierExpression identifierExpression)
+		{
+			var result = new TypeDeclaration { Name = identifierExpression.Identifier, ClassType = classType };
+			var entity = identifierExpression.GetParent<EntityDeclaration>();
+			if (entity != null)
+				result.Modifiers |= entity.Modifiers & Modifiers.Public;
+			return result;
+		}
+
+		static TypeDeclaration CreateClassFromType(RefactoringContext context, ClassType classType, SimpleType simpleType)
+		{
+			TypeDeclaration result;
+			string className = simpleType.Identifier;
+
+			if (simpleType.Parent is Attribute && classType == ClassType.Class) {
+				if (!className.EndsWith("Attribute", System.StringComparison.Ordinal))
+					className += "Attribute";
+			}
+
+			result = new TypeDeclaration { Name = className, ClassType = classType };
+			var entity = simpleType.GetParent<EntityDeclaration>();
+			if (entity != null)
+				result.Modifiers |= entity.Modifiers & Modifiers.Public;
+
+			var guessedType = TypeGuessing.GuessType (context, simpleType);
+			if (guessedType.Kind == TypeKind.TypeParameter)
+				ImplementConstraints (context, result, (ITypeParameter)guessedType);
+			return result;
+		}
+
+		static void ImplementConstraints(RefactoringContext context, TypeDeclaration result, ITypeParameter tp)
+		{
+			if (tp.HasValueTypeConstraint)
+				result.ClassType = ClassType.Struct;
+			if (tp.HasReferenceTypeConstraint)
+				result.ClassType = ClassType.Class;
+			if (tp.HasDefaultConstructorConstraint)
+				result.AddChild (new ConstructorDeclaration { Modifiers = Modifiers.Public, Body = new BlockStatement () }, Roles.TypeMemberRole);
+			foreach (var baseType in tp.DirectBaseTypes) {
+				if (baseType.Namespace == "System") {
+					if (baseType.Name == "Object" || baseType.Name == "ValueType")
+						continue;
+				}
+				result.BaseTypes.Add (context.CreateShortType (baseType));
+			}
+		}
+
+		static TypeDeclaration CreateClassFromObjectCreation(RefactoringContext context, ObjectCreateExpression createExpression)
+		{
+			TypeDeclaration result;
+			string className = createExpression.Type.ToString();
+			if (!createExpression.Arguments.Any()) {
+				result = new TypeDeclaration { Name = className };
+			} else {
+				var decl = new ConstructorDeclaration {
+					Name = className,
+					Modifiers = Modifiers.Public,
+					Body = new BlockStatement {
+						new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
+					}
+				};
+				result = new TypeDeclaration {
+					Name = className,
+					Members = {
+						decl
+					}
+				};
+				decl.Parameters.AddRange(CreateMethodDeclarationAction.GenerateParameters(context, createExpression.Arguments));
+			}
+			var guessedType = TypeGuessing.GuessType(context, createExpression);
+			if (guessedType.Kind == TypeKind.Interface || guessedType.Kind == TypeKind.Class && guessedType.GetDefinition ().IsAbstract) {
+				result.BaseTypes.Add(context.CreateShortType(guessedType));
+				AddImplementation(context, result, guessedType);
+			}
+			
+			return result;
+		}
+
+		static Modifiers GetModifiers(IEntity property)
+		{
+			if (property.DeclaringType.Kind == TypeKind.Interface)
+				return Modifiers.Public;
+			switch (property.Accessibility) {
+				case Accessibility.Public:
+					return Modifiers.Public | Modifiers.Override;
+				case Accessibility.Protected:
+					return Modifiers.Protected | Modifiers.Override;
+				case Accessibility.Internal:
+					return Modifiers.Internal | Modifiers.Override;
+				case Accessibility.ProtectedOrInternal:
+					// TODO: oops
+					return Modifiers.Internal | Modifiers.Protected | Modifiers.Override;
+				case Accessibility.ProtectedAndInternal:
+					// TODO: oops
+					return Modifiers.Internal | Modifiers.Protected | Modifiers.Override;
+			}
+			return Modifiers.Override;
+		}
+
+		static void AddImplementation(RefactoringContext context, TypeDeclaration result, IType guessedType)
+		{
+			foreach (var property in guessedType.GetProperties ()) {
+				if (!property.IsAbstract)
+					continue;
+				if (property.IsIndexer) {
+					var indexerDecl = new IndexerDeclaration {
+						ReturnType = context.CreateShortType(property.ReturnType),
+						Modifiers = GetModifiers(property),
+						Name = property.Name
+					};
+					indexerDecl.Parameters.AddRange(ConvertParameters(context, property.Parameters));
+					if (property.CanGet)
+						indexerDecl.Getter = new Accessor();
+					if (property.CanSet)
+						indexerDecl.Setter = new Accessor();
+					result.AddChild(indexerDecl, Roles.TypeMemberRole);
+					continue;
+				}
+				var propDecl = new PropertyDeclaration {
+					ReturnType = context.CreateShortType(property.ReturnType),
+					Modifiers = GetModifiers (property),
+					Name = property.Name
+				};
+				if (property.CanGet)
+					propDecl.Getter = new Accessor();
+				if (property.CanSet)
+					propDecl.Setter = new Accessor();
+				result.AddChild(propDecl, Roles.TypeMemberRole);
+			}
+			
+			foreach (var method in guessedType.GetMethods ()) {
+				if (!method.IsAbstract)
+					continue;
+				var decl = new MethodDeclaration {
+					ReturnType = context.CreateShortType(method.ReturnType),
+					Modifiers = GetModifiers (method),
+					Name = method.Name,
+					Body = new BlockStatement {
+						new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
+					}
+				};
+				decl.Parameters.AddRange(ConvertParameters(context, method.Parameters));
+				result.AddChild(decl, Roles.TypeMemberRole);
+			}
+
+			foreach (var evt in guessedType.GetEvents ()) {
+				if (!evt.IsAbstract)
+					continue;
+				var decl = new EventDeclaration {
+					ReturnType = context.CreateShortType(evt.ReturnType),
+					Modifiers = GetModifiers (evt),
+					Variables = {
+						new VariableInitializer {
+							Name = evt.Name
+						}
+					}
+				};
+				decl.Variables.Add(new VariableInitializer(evt.Name));
+				result.AddChild(decl, Roles.TypeMemberRole);
+			}
+		}
+
+		static IEnumerable<ParameterDeclaration> ConvertParameters(RefactoringContext context, IList<IParameter> parameters)
+		{
+			foreach (var param in parameters) {
+				ParameterModifier mod = ParameterModifier.None;
+				if (param.IsOut) {
+					mod = ParameterModifier.Out;
+				} else if (param.IsRef) {
+					mod = ParameterModifier.Ref;
+				} else if (param.IsParams) {
+					mod = ParameterModifier.Params;
+				}
+				yield return new ParameterDeclaration(context.CreateShortType(param.Type), param.Name, mod);
+			}
+		}
+
+		static TypeDeclaration AddBaseTypesAccordingToNamingRules(RefactoringContext context, NamingConventionService service, TypeDeclaration result)
+		{
+			if (service.HasValidRule(result.Name, AffectedEntity.CustomAttributes, Modifiers.Public)) {
+				result.BaseTypes.Add(context.CreateShortType("System", "Attribute"));
+			} else if (service.HasValidRule(result.Name, AffectedEntity.CustomEventArgs, Modifiers.Public)) {
+				result.BaseTypes.Add(context.CreateShortType("System", "EventArgs"));
+			} else if (service.HasValidRule(result.Name, AffectedEntity.CustomExceptions, Modifiers.Public)) {
+				result.BaseTypes.Add(context.CreateShortType("System", "Exception"));
+			}
+			return result;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateConstructorDeclarationAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateConstructorDeclarationAction.cs
new file mode 100644
index 0000000000..e8cef71afb
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateConstructorDeclarationAction.cs
@@ -0,0 +1,64 @@
+// 
+// CreateClassDeclarationAction.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Create constructor", Description = "Creates a constructor declaration out of an object creation.")]
+	public class CreateConstructorDeclarationAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var createExpression = context.GetNode<Expression>() as ObjectCreateExpression;
+			if (createExpression == null) 
+				yield break;
+			
+			var resolveResult = context.Resolve(createExpression) as CSharpInvocationResolveResult;
+			if (resolveResult == null || !resolveResult.IsError || resolveResult.Member.DeclaringTypeDefinition == null || resolveResult.Member.DeclaringTypeDefinition.IsSealed || resolveResult.Member.DeclaringTypeDefinition.Region.IsEmpty)
+				yield break;
+
+			yield return new CodeAction(context.TranslateString("Create constructor"), script =>
+				script.InsertWithCursor(
+					context.TranslateString("Create constructor"),
+					resolveResult.Member.DeclaringTypeDefinition,
+					(s, c) => {
+						var decl = new ConstructorDeclaration {
+							Name = resolveResult.Member.DeclaringTypeDefinition.Name,
+							Modifiers = Modifiers.Public,
+							Body = new BlockStatement {
+								new ThrowStatement(new ObjectCreateExpression(c.CreateShortType("System", "NotImplementedException")))
+							}
+						};
+						decl.Parameters.AddRange(CreateMethodDeclarationAction.GenerateParameters(context, createExpression.Arguments));
+						return decl;
+					}
+				)
+			, createExpression) { Severity = ICSharpCode.NRefactory.Refactoring.Severity.Error };
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateCustomEventImplementationAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateCustomEventImplementationAction.cs
similarity index 100%
rename from src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateCustomEventImplementationAction.cs
rename to src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateCustomEventImplementationAction.cs
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateDelegateAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateDelegateAction.cs
new file mode 100644
index 0000000000..d540a74996
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateDelegateAction.cs
@@ -0,0 +1,71 @@
+// 
+// CreateDelegateAction.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Create delegate", Description = "Creates a delegate declaration out of an event declaration.")]
+	public class CreateDelegateAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var simpleType = context.GetNode<SimpleType>();
+			if (simpleType != null && (simpleType.Parent is EventDeclaration || simpleType.Parent is CustomEventDeclaration)) 
+				return GetActions(context, simpleType);
+
+			return Enumerable.Empty<CodeAction>();
+		}
+
+		static IEnumerable<CodeAction> GetActions(RefactoringContext context, SimpleType node)
+		{
+			var resolveResult = context.Resolve(node) as UnknownIdentifierResolveResult;
+			if (resolveResult == null)
+				yield break;
+
+			yield return new CodeAction(context.TranslateString("Create delegate"), script => {
+				script.CreateNewType(CreateType(context,  node));
+			}, node);
+
+		}
+
+		static DelegateDeclaration CreateType(RefactoringContext context, SimpleType simpleType)
+		{
+			var result = new DelegateDeclaration() {
+				Name = simpleType.Identifier,
+				Modifiers = ((EntityDeclaration)simpleType.Parent).Modifiers,
+				ReturnType = new PrimitiveType("void"),
+				Parameters = {
+					new ParameterDeclaration(new PrimitiveType("object"), "sender"),
+					new ParameterDeclaration(context.CreateShortType("System", "EventArgs"), "e")
+				}
+			};
+			return result;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateEnumValue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateEnumValue.cs
new file mode 100644
index 0000000000..efe806f494
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateEnumValue.cs
@@ -0,0 +1,85 @@
+//
+// CreateEnumValue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Threading;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Create enum value", Description = "Creates an enum value for a undefined enum value.")]
+	public class CreateEnumValue : CodeActionProvider
+	{
+		internal static bool IsInvocationTarget(AstNode node)
+		{
+			var invoke = node.Parent as InvocationExpression;
+			return invoke != null && invoke.Target == node;
+		}
+		
+		internal static Expression GetCreatePropertyOrFieldNode(RefactoringContext context)
+		{
+			return context.GetNode(n => n is IdentifierExpression || n is MemberReferenceExpression || n is NamedExpression) as Expression;
+		}
+		
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var expr = GetCreatePropertyOrFieldNode(context);
+			if (expr == null)
+				yield break;
+			if (!(expr is MemberReferenceExpression))
+				yield break;
+			var propertyName = CreatePropertyAction.GetPropertyName(expr);
+			if (propertyName == null)
+				yield break;
+			if (IsInvocationTarget(expr))
+				yield break;
+			var statement = expr.GetParent<Statement>();
+			if (statement == null)
+				yield break;
+			if (!(context.Resolve(expr).IsError))
+				yield break;
+			var guessedType = TypeGuessing.GuessType(context, expr);
+			if (guessedType == null || guessedType.Kind != TypeKind.Enum)
+				yield break;
+			var state = context.GetResolverStateBefore(expr);
+			if (state.CurrentMember == null || state.CurrentTypeDefinition == null)
+				yield break;
+
+			yield return new CodeAction(context.TranslateString("Create enum value"), script => {
+				var decl = new EnumMemberDeclaration {
+					Name = propertyName
+				};
+				script.InsertWithCursor(context.TranslateString("Create enum value"), guessedType.GetDefinition (), (s, c) => decl);
+			}, expr) { Severity = ICSharpCode.NRefactory.Refactoring.Severity.Error };
+		}
+		
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateEventInvocatorAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateEventInvocatorAction.cs
new file mode 100644
index 0000000000..dee384cb09
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateEventInvocatorAction.cs
@@ -0,0 +1,144 @@
+// 
+// CreateEventInvocator.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Create event invocator", Description = "Creates a standard OnXXX event method.")]
+	public class CreateEventInvocatorAction : CodeActionProvider
+	{
+		/// <summary>
+		/// If <c>true</c> an explicit type will be used for the handler variable; otherwise, 'var' will be used as type.
+		/// Default value is <c>false</c>
+		/// </summary>
+		public bool UseExplictType {
+			get;
+			set;
+		}
+
+		public static MethodDeclaration CreateEventInvocator (RefactoringContext context, TypeDeclaration declaringType, EventDeclaration eventDeclaration, VariableInitializer initializer, IMethod invokeMethod, bool useExplictType)
+		{
+			bool hasSenderParam = false;
+			IEnumerable<IParameter> pars = invokeMethod.Parameters;
+			if (invokeMethod.Parameters.Any()) {
+				var first = invokeMethod.Parameters [0];
+				if (first.Name == "sender" /*&& first.Type == "System.Object"*/) {
+					hasSenderParam = true;
+					pars = invokeMethod.Parameters.Skip(1);
+				}
+			}
+			const string handlerName = "handler";
+
+			var arguments = new List<Expression>();
+			if (hasSenderParam)
+				arguments.Add(eventDeclaration.HasModifier (Modifiers.Static) ? (Expression)new PrimitiveExpression (null) : new ThisReferenceExpression());
+			bool useThisMemberReference = false;
+			foreach (var par in pars) {
+				arguments.Add(new IdentifierExpression(par.Name));
+				useThisMemberReference |= par.Name == initializer.Name;
+			}
+			var proposedHandlerName = GetNameProposal(initializer);
+			var modifiers = eventDeclaration.HasModifier(Modifiers.Static) ? Modifiers.Static : Modifiers.Protected | Modifiers.Virtual;
+			if (declaringType.HasModifier (Modifiers.Sealed)) {
+				modifiers = Modifiers.None;
+			}
+			var methodDeclaration = new MethodDeclaration {
+				Name = proposedHandlerName,
+				ReturnType = new PrimitiveType ("void"),
+				Modifiers = modifiers,
+				Body = new BlockStatement {
+					new VariableDeclarationStatement (
+						useExplictType ? eventDeclaration.ReturnType.Clone () : new PrimitiveType ("var"), handlerName, 
+						useThisMemberReference ? 
+						(Expression)new MemberReferenceExpression (new ThisReferenceExpression (), initializer.Name) 
+						: new IdentifierExpression (initializer.Name)
+						),
+					new IfElseStatement {
+						Condition = new BinaryOperatorExpression (new IdentifierExpression (handlerName), BinaryOperatorType.InEquality, new PrimitiveExpression (null)),
+						TrueStatement = new InvocationExpression (new IdentifierExpression (handlerName), arguments)
+					}
+				}
+			};
+
+			foreach (var par in pars) {
+				var typeName = context.CreateShortType(par.Type);
+				var decl = new ParameterDeclaration(typeName, par.Name);
+				methodDeclaration.Parameters.Add(decl);
+			}
+			return methodDeclaration;
+		}
+
+		static string GetNameProposal(VariableInitializer initializer)
+		{
+			return "On" + char.ToUpper(initializer.Name[0]) + initializer.Name.Substring(1);
+		}
+
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			VariableInitializer initializer;
+			var eventDeclaration = GetEventDeclaration(context, out initializer);
+			if (eventDeclaration == null) {
+				yield break;
+			}
+			var type = (TypeDeclaration)eventDeclaration.Parent;
+			var proposedHandlerName = GetNameProposal(initializer);
+			if (type.Members.Any(m => m is MethodDeclaration && m.Name == proposedHandlerName)) {
+				yield break;
+			}
+			var resolvedType = context.Resolve(eventDeclaration.ReturnType).Type;
+			if (resolvedType.Kind == TypeKind.Unknown) {
+				yield break;
+			}
+			var invokeMethod = resolvedType.GetDelegateInvokeMethod();
+			if (invokeMethod == null) {
+				yield break;
+			}
+			yield return new CodeAction(context.TranslateString("Create event invocator"), script => {
+				var methodDeclaration = CreateEventInvocator (context, type, eventDeclaration, initializer, invokeMethod, UseExplictType);
+				script.InsertWithCursor(
+					context.TranslateString("Create event invocator"),
+					Script.InsertPosition.After,
+					methodDeclaration
+				);
+			}, initializer);
+		}
+
+		static EventDeclaration GetEventDeclaration (RefactoringContext context, out VariableInitializer initializer)
+		{
+			var result = context.GetNode<EventDeclaration> ();
+			if (result == null) {
+				initializer = null;
+				return null;
+			}
+			initializer = result.Variables.FirstOrDefault (v => v.NameToken.Contains (context.Location));
+			return initializer != null ? result : null;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateFieldAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateFieldAction.cs
new file mode 100644
index 0000000000..ac1f95663f
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateFieldAction.cs
@@ -0,0 +1,98 @@
+// 
+// CreateField.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Threading;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Create field", Description = "Creates a field for a undefined variable.")]
+	public class CreateFieldAction : CodeActionProvider
+	{
+		internal static bool IsInvocationTarget(AstNode node)
+		{
+			var invoke = node.Parent as InvocationExpression;
+			return invoke != null && invoke.Target == node;
+		}
+
+		internal static Expression GetCreatePropertyOrFieldNode(RefactoringContext context)
+		{
+			return context.GetNode(n => n is IdentifierExpression || n is MemberReferenceExpression || n is NamedExpression) as Expression;
+		}
+
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var expr = GetCreatePropertyOrFieldNode(context);
+			if (expr == null)
+				yield break;
+
+			if (expr is MemberReferenceExpression && !(((MemberReferenceExpression)expr).Target is ThisReferenceExpression))
+				yield break;
+
+			var propertyName = CreatePropertyAction.GetPropertyName(expr);
+			if (propertyName == null)
+				yield break;
+
+			if (IsInvocationTarget(expr))
+				yield break;
+			var statement = expr.GetParent<Statement>();
+			if (statement == null)
+				yield break;
+			if (!(context.Resolve(expr).IsError))
+				yield break;
+			var guessedType = TypeGuessing.GuessAstType(context, expr);
+			if (guessedType == null)
+				yield break;
+			var state = context.GetResolverStateBefore(expr);
+			if (state.CurrentMember == null || state.CurrentTypeDefinition == null)
+				yield break;
+			bool isStatic =  !(expr is NamedExpression) && (state.CurrentMember.IsStatic | state.CurrentTypeDefinition.IsStatic);
+
+//			var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
+//			if (service != null && !service.IsValidName(identifier.Identifier, AffectedEntity.Field, Modifiers.Private, isStatic)) { 
+//				yield break;
+//			}
+
+			yield return new CodeAction(context.TranslateString("Create field"), script => {
+				var decl = new FieldDeclaration {
+					ReturnType = guessedType,
+					Variables = { new VariableInitializer(propertyName) }
+				};
+				if (isStatic)
+					decl.Modifiers |= Modifiers.Static;
+				script.InsertWithCursor(context.TranslateString("Create field"), Script.InsertPosition.Before, decl);
+			}, expr.GetNodeAt(context.Location) ?? expr) { Severity = ICSharpCode.NRefactory.Refactoring.Severity.Error };
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateIndexerAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateIndexerAction.cs
new file mode 100644
index 0000000000..561f9ffa9b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateIndexerAction.cs
@@ -0,0 +1,102 @@
+// 
+// CreateIndexerAction.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Text;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Create indexer", Description = "Creates an indexer declaration out of an indexer expression.")]
+	public class CreateIndexerAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var indexer = context.GetNode<IndexerExpression>();
+			if (indexer == null)
+				yield break;
+			if (!(context.Resolve(indexer).IsError))
+				yield break;
+
+			var state = context.GetResolverStateBefore(indexer);
+			if (state.CurrentTypeDefinition == null)
+				yield break;
+			var guessedType = TypeGuessing.GuessAstType(context, indexer);
+
+			bool createInOtherType = false;
+			ResolveResult targetResolveResult = null;
+			targetResolveResult = context.Resolve(indexer.Target);
+			createInOtherType = !state.CurrentTypeDefinition.Equals(targetResolveResult.Type.GetDefinition());
+
+			bool isStatic;
+			if (createInOtherType) {
+				if (targetResolveResult.Type.GetDefinition() == null || targetResolveResult.Type.GetDefinition().Region.IsEmpty)
+					yield break;
+				isStatic = targetResolveResult is TypeResolveResult;
+				if (isStatic && targetResolveResult.Type.Kind == TypeKind.Interface || targetResolveResult.Type.Kind == TypeKind.Enum)
+					yield break;
+			} else {
+				isStatic = indexer.Target is IdentifierExpression && state.CurrentMember.IsStatic;
+			}
+
+			yield return new CodeAction(context.TranslateString("Create indexer"), script => {
+				var decl = new IndexerDeclaration() {
+					ReturnType = guessedType,
+					Getter = new Accessor() {
+						Body = new BlockStatement() {
+							new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
+						}
+					},
+					Setter = new Accessor() {
+						Body = new BlockStatement() {
+							new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
+						}
+					},
+				};
+				decl.Parameters.AddRange(CreateMethodDeclarationAction.GenerateParameters(context, indexer.Arguments));
+				if (isStatic)
+					decl.Modifiers |= Modifiers.Static;
+				
+				if (createInOtherType) {
+					if (targetResolveResult.Type.Kind == TypeKind.Interface) {
+						decl.Getter.Body = null;
+						decl.Setter.Body = null;
+						decl.Modifiers = Modifiers.None;
+					} else {
+						decl.Modifiers |= Modifiers.Public;
+					}
+
+					script.InsertWithCursor(context.TranslateString("Create indexer"), targetResolveResult.Type.GetDefinition(), (s, c) => decl);
+					return;
+				}
+
+				script.InsertWithCursor(context.TranslateString("Create indexer"), Script.InsertPosition.Before, decl);
+			}, indexer) { Severity = ICSharpCode.NRefactory.Refactoring.Severity.Error };
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateLocalVariableAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateLocalVariableAction.cs
new file mode 100644
index 0000000000..778f0af584
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateLocalVariableAction.cs
@@ -0,0 +1,73 @@
+// 
+// CreateLocalVariable.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Create local variable", Description = "Creates a local variable for a undefined variable.")]
+	public class CreateLocalVariableAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var identifier = context.GetNode<IdentifierExpression>();
+			if (identifier == null) {
+				yield break;
+			}
+			if (CreateFieldAction.IsInvocationTarget(identifier)) {
+				yield break;
+			}
+			var statement = context.GetNode<Statement>();
+			if (statement == null) {
+				yield break;
+			}
+
+			if (!(context.Resolve(identifier).IsError)) {
+				yield break;
+			}
+			var guessedType = TypeGuessing.GuessAstType(context, identifier);
+			if (guessedType == null) {
+				yield break;
+			}
+
+			yield return new CodeAction(context.TranslateString("Create local variable"), script => {
+				var initializer = new VariableInitializer(identifier.Identifier);
+				var decl = new VariableDeclarationStatement() {
+					Type = guessedType,
+					Variables = { initializer }
+				};
+				if (identifier.Parent is AssignmentExpression && ((AssignmentExpression)identifier.Parent).Left == identifier) {
+					initializer.Initializer = ((AssignmentExpression)identifier.Parent).Right.Clone();
+					if (!context.UseExplicitTypes)
+						decl.Type = new SimpleType("var");
+					script.Replace(statement, decl);
+				} else {
+					script.InsertBefore(statement, decl);
+				}
+			}, identifier) { Severity = ICSharpCode.NRefactory.Refactoring.Severity.Error };
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateMethodDeclarationAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateMethodDeclarationAction.cs
new file mode 100644
index 0000000000..d325fe7ff9
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateMethodDeclarationAction.cs
@@ -0,0 +1,379 @@
+// 
+// CreateMethodDeclarationAction.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Text;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Create method", Description = "Creates a method declaration out of an invocation.")]
+	public class CreateMethodDeclarationAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var identifier = context.GetNode<IdentifierExpression>();
+			if (identifier != null && !(identifier.Parent is InvocationExpression && ((InvocationExpression)identifier.Parent).Target == identifier))
+				return GetActionsFromIdentifier(context, identifier);
+			
+			var memberReference = context.GetNode<MemberReferenceExpression>();
+			if (memberReference != null && !(memberReference.Parent is InvocationExpression && ((InvocationExpression)memberReference.Parent).Target == memberReference))
+				return GetActionsFromMemberReferenceExpression(context, memberReference);
+
+			var invocation = context.GetNode<InvocationExpression>();
+			if (invocation != null)
+				return GetActionsFromInvocation(context, invocation);
+			return Enumerable.Empty<CodeAction>();
+		}
+
+		IEnumerable<CodeAction> GetActionsFromMemberReferenceExpression(RefactoringContext context, MemberReferenceExpression invocation)
+		{
+			if (!(context.Resolve(invocation).IsError)) 
+					yield break;
+
+			var methodName = invocation.MemberName;
+			var guessedType = TypeGuessing.GuessType(context, invocation);
+			if (guessedType.Kind != TypeKind.Delegate)
+					yield break;
+			var invocationMethod = guessedType.GetDelegateInvokeMethod();
+			var state = context.GetResolverStateBefore(invocation);
+			if (state.CurrentTypeDefinition == null)
+				yield break;
+			ResolveResult targetResolveResult = context.Resolve(invocation.Target);
+			bool createInOtherType = !state.CurrentTypeDefinition.Equals(targetResolveResult.Type.GetDefinition());
+
+			bool isStatic;
+			if (createInOtherType) {
+				if (targetResolveResult.Type.GetDefinition() == null || targetResolveResult.Type.GetDefinition().Region.IsEmpty)
+					yield break;
+				isStatic = targetResolveResult is TypeResolveResult;
+				if (isStatic && targetResolveResult.Type.Kind == TypeKind.Interface || targetResolveResult.Type.Kind == TypeKind.Enum)
+					yield break;
+			} else {
+				if (state.CurrentMember == null)
+					yield break;
+				isStatic = state.CurrentMember.IsStatic || state.CurrentTypeDefinition.IsStatic;
+			}
+
+//			var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
+//			if (service != null && !service.IsValidName(methodName, AffectedEntity.Method, Modifiers.Private, isStatic)) { 
+//				yield break;
+//			}
+
+			yield return CreateAction(
+				context, 
+				invocation,
+				methodName, 
+				context.CreateShortType(invocationMethod.ReturnType),
+				invocationMethod.Parameters.Select(parameter => new ParameterDeclaration(context.CreateShortType(parameter.Type), parameter.Name) { 
+					ParameterModifier = GetModifiers(parameter)
+				}),
+				createInOtherType,
+				isStatic,
+				targetResolveResult);
+		}
+		
+		IEnumerable<CodeAction> GetActionsFromIdentifier(RefactoringContext context, IdentifierExpression identifier)
+		{
+			if (!(context.Resolve(identifier).IsError))
+				yield break;
+			var methodName = identifier.Identifier;
+			var guessedType = TypeGuessing.GuessType(context, identifier);
+			if (guessedType.Kind != TypeKind.Delegate)
+				yield break;
+			var invocationMethod = guessedType.GetDelegateInvokeMethod();
+			if (invocationMethod == null)
+				yield break;
+			var state = context.GetResolverStateBefore(identifier);
+			if (state.CurrentMember == null || state.CurrentTypeDefinition == null)
+				yield break;
+			bool isStatic = state.CurrentMember.IsStatic || state.CurrentTypeDefinition.IsStatic;
+
+			var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
+			if (service != null && !service.IsValidName(methodName, AffectedEntity.Method, Modifiers.Private, isStatic))
+				yield break;
+
+			yield return CreateAction(
+				context, 
+				identifier,
+				methodName, 
+				context.CreateShortType(invocationMethod.ReturnType),
+				invocationMethod.Parameters.Select(parameter => new ParameterDeclaration(context.CreateShortType(parameter.Type), parameter.Name) { 
+					ParameterModifier = GetModifiers(parameter)
+				}),
+				false,
+				isStatic,
+				null);
+		}
+
+		IEnumerable<CodeAction> GetActionsFromInvocation(RefactoringContext context, InvocationExpression invocation)
+		{
+			if (!(context.Resolve(invocation.Target).IsError)) 
+				yield break;
+
+			var methodName = GetMethodName(invocation);
+			if (methodName == null)
+				yield break;
+			var state = context.GetResolverStateBefore(invocation);
+			if (state.CurrentMember == null || state.CurrentTypeDefinition == null)
+				yield break;
+			var guessedType = invocation.Parent is ExpressionStatement ? new PrimitiveType("void") : TypeGuessing.GuessAstType(context, invocation);
+
+			bool createInOtherType = false;
+			ResolveResult targetResolveResult = null;
+			if (invocation.Target is MemberReferenceExpression) {
+				targetResolveResult = context.Resolve(((MemberReferenceExpression)invocation.Target).Target);
+				createInOtherType = !state.CurrentTypeDefinition.Equals(targetResolveResult.Type.GetDefinition());
+			}
+
+			bool isStatic;
+			if (createInOtherType) {
+				if (targetResolveResult.Type.GetDefinition() == null || targetResolveResult.Type.GetDefinition().Region.IsEmpty)
+					yield break;
+				isStatic = targetResolveResult is TypeResolveResult;
+				if (isStatic && targetResolveResult.Type.Kind == TypeKind.Interface || targetResolveResult.Type.Kind == TypeKind.Enum)
+					yield break;
+			} else {
+				isStatic = state.CurrentMember.IsStatic || state.CurrentTypeDefinition.IsStatic;
+			}
+
+//			var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
+//			if (service != null && !service.IsValidName(methodName, AffectedEntity.Method, Modifiers.Private, isStatic)) { 
+//				yield break;
+//			}
+
+
+			yield return CreateAction(
+				context, 
+				invocation,
+				methodName, 
+				guessedType,
+				GenerateParameters(context, invocation.Arguments),
+				createInOtherType,
+				isStatic,
+				targetResolveResult);
+		}
+
+		static ParameterModifier GetModifiers(IParameter parameter)
+		{
+			if (parameter.IsOut)
+				return ParameterModifier.Out;
+			if (parameter.IsRef)
+				return ParameterModifier.Ref;
+			if (parameter.IsParams)
+				return ParameterModifier.Params;
+			return ParameterModifier.None;
+		}
+
+		static CodeAction CreateAction(RefactoringContext context, AstNode createFromNode, string methodName, AstType returnType, IEnumerable<ParameterDeclaration> parameters, bool createInOtherType, bool isStatic, ResolveResult targetResolveResult)
+		{
+			return new CodeAction(context.TranslateString("Create method"), script => {
+				var throwStatement = new ThrowStatement();
+				var decl = new MethodDeclaration {
+					ReturnType = returnType,
+					Name = methodName,
+					Body = new BlockStatement {
+						throwStatement
+					}
+				};
+				decl.Parameters.AddRange(parameters);
+				
+				if (isStatic)
+					decl.Modifiers |= Modifiers.Static;
+				
+				if (createInOtherType) {
+					if (targetResolveResult.Type.Kind == TypeKind.Interface) {
+						decl.Body = null;
+						decl.Modifiers = Modifiers.None;
+					} else {
+						decl.Modifiers |= Modifiers.Public;
+					}
+
+					script
+						.InsertWithCursor(context.TranslateString("Create method"), targetResolveResult.Type.GetDefinition(), (s, c) => {
+						throwStatement.Expression = new ObjectCreateExpression(c.CreateShortType("System", "NotImplementedException"));
+						return decl;
+					})
+						.ContinueScript(s => s.Select(throwStatement));
+					return;
+				} else {
+					throwStatement.Expression = new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException"));
+				}
+
+				script
+					.InsertWithCursor(context.TranslateString("Create method"), Script.InsertPosition.Before, decl)
+					.ContinueScript(() => script.Select(throwStatement));
+			}, createFromNode.GetNodeAt(context.Location) ?? createFromNode)  { Severity = ICSharpCode.NRefactory.Refactoring.Severity.Error };
+		}
+
+		public static IEnumerable<ParameterDeclaration> GenerateParameters(RefactoringContext context, IEnumerable<Expression> arguments)
+		{
+			var nameCounter = new Dictionary<string, int>();
+			foreach (var argument in arguments) {
+				var direction = ParameterModifier.None;
+				AstNode node;
+				if (argument is DirectionExpression) {
+					var de = (DirectionExpression)argument;
+					direction = de.FieldDirection == FieldDirection.Out ? ParameterModifier.Out : ParameterModifier.Ref;
+					node = de.Expression;
+				} else {
+					node = argument;
+				}
+
+				var resolveResult = context.Resolve(node);
+				string name = CreateBaseName(argument, resolveResult.Type);
+				if (!nameCounter.ContainsKey(name)) {
+					nameCounter [name] = 1;
+				} else {
+					nameCounter [name]++;
+					name += nameCounter [name].ToString();
+				}
+				var type = resolveResult.Type.Kind == TypeKind.Unknown || resolveResult.Type.Kind == TypeKind.Null ? new PrimitiveType("object") : context.CreateShortType(resolveResult.Type);
+
+				yield return new ParameterDeclaration(type, name) { ParameterModifier = direction};
+			}
+		}
+
+		static string CreateBaseNameFromString(string str)
+		{
+			if (string.IsNullOrEmpty(str)) {
+				return "empty";
+			}
+			var sb = new StringBuilder();
+			bool firstLetter = true, wordStart = false;
+			foreach (char ch in str) {
+				if (char.IsWhiteSpace(ch)) {
+					wordStart = true;
+					continue;
+				}
+				if (!char.IsLetter(ch))
+					continue;
+				if (firstLetter) {
+					sb.Append(char.ToLower(ch));
+					firstLetter = false;
+					continue;
+				}
+				if (wordStart) {
+					sb.Append(char.ToUpper(ch));
+					wordStart = false;
+					continue;
+				}
+				sb.Append(ch);
+			}
+			return sb.Length == 0 ? "str" : sb.ToString();
+		}
+
+		public static string CreateBaseName(AstNode node, IType type)
+		{
+			string name = null;
+			if (node is NullReferenceExpression)
+				return "o";
+			if (node is DirectionExpression)
+				node = ((DirectionExpression)node).Expression;
+			if (node is IdentifierExpression) {
+				name = ((IdentifierExpression)node).Identifier;
+			} else if (node is MemberReferenceExpression) {
+				name = ((MemberReferenceExpression)node).MemberName;
+			} else if (node is PrimitiveExpression) {
+				var pe = (PrimitiveExpression)node;
+				if (pe.Value is string) {
+					name = CreateBaseNameFromString(pe.Value.ToString());
+				} else {
+					return char.ToLower(type.Name [0]).ToString();
+				}
+			} else if (node is ArrayCreateExpression) {
+				name = "arr";
+			} else {
+				if (type.Kind == TypeKind.Unknown)
+					return "par";
+				name = GuessNameFromType(type);
+			}
+			var sb = new StringBuilder ();
+			sb.Append (char.ToLower(name [0]));
+			for (int i = 1; i < name.Length; i++) {
+				var ch = name[i];
+				if (char.IsLetterOrDigit (ch) || ch == '_')
+					sb.Append (ch);
+			}
+			return sb.ToString ();
+		}
+
+		internal static string GuessNameFromType(IType returnType)
+		{
+			switch (returnType.ReflectionName) {
+				case "System.Byte":
+				case "System.SByte":
+					return "b";
+				
+				case "System.Int16":
+				case "System.UInt16":
+				case "System.Int32":
+				case "System.UInt32":
+				case "System.Int64":
+				case "System.UInt64":
+					return "i";
+				
+				case "System.Boolean":
+					return "b";
+				
+				case "System.DateTime":
+					return "date";
+				
+				case "System.Char":
+					return "ch";
+				case "System.Double":
+				case "System.Decimal":
+					return "d";
+				case "System.Single":
+					return "f";
+				case "System.String":
+					return "str";
+				
+				case "System.Exception":
+					return "e";
+				case "System.Object":
+					return "obj";
+				case "System.Func":
+					return "func";
+				case "System.Action":
+					return "action";
+			}
+			return returnType.Name;
+		}
+		
+		string GetMethodName(InvocationExpression invocation)
+		{
+			if (invocation.Target is IdentifierExpression)
+				return ((IdentifierExpression)invocation.Target).Identifier;
+			if (invocation.Target is MemberReferenceExpression)
+				return ((MemberReferenceExpression)invocation.Target).MemberName;
+
+			return null;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateOverloadWithoutParameterAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateOverloadWithoutParameterAction.cs
new file mode 100644
index 0000000000..bbbcb26208
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateOverloadWithoutParameterAction.cs
@@ -0,0 +1,154 @@
+// 
+// CreateOverloadWithoutParameterAction.cs
+//  
+// Author:
+//       Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Threading.Tasks;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction ("Create overload without parameter", Description = "Create overload without the selected parameter.")]
+	public class CreateOverloadWithoutParameterAction : SpecializedCodeAction<ParameterDeclaration>
+	{
+		protected override CodeAction GetAction (RefactoringContext context, ParameterDeclaration node)
+		{
+			if (!node.DefaultExpression.IsNull)
+				return null;
+			if (node.ParameterModifier == ParameterModifier.This || node.ParameterModifier == ParameterModifier.Params)
+				return null;
+			if (!node.NameToken.Contains(context.Location))
+				return null;
+
+			var methodDecl = node.Parent as MethodDeclaration;
+			if (methodDecl == null)
+				return null;
+
+			// explicit implementation
+			if (!methodDecl.PrivateImplementationType.IsNull)
+				return null;
+
+			// find existing method
+			var method = (IMethod)((MemberResolveResult)context.Resolve (methodDecl)).Member;
+			var parameters = new List<IParameter> (method.Parameters.Where (param => param.Name != node.Name));
+			if (method.DeclaringType.GetMethods (
+				m => m.Name == method.Name && m.TypeParameters.Count == method.TypeParameters.Count)
+				.Any (m => ParameterListComparer.Instance.Equals (m.Parameters, parameters)))
+				return null;
+			
+			return new CodeAction (context.TranslateString ("Create overload without parameter"),
+				script =>
+				{
+					var defaultExpr = GetDefaultValueExpression (context, node.Type);
+
+					var body = new BlockStatement ();
+					Expression argExpr;
+					if (node.ParameterModifier == ParameterModifier.Ref) {
+						body.Add (new VariableDeclarationStatement (node.Type.Clone (), node.Name, defaultExpr));
+						argExpr = GetArgumentExpression (node);
+					} else if (node.ParameterModifier == ParameterModifier.Out) {
+						body.Add (new VariableDeclarationStatement (node.Type.Clone (), node.Name));
+						argExpr = GetArgumentExpression (node);
+					} else {
+						argExpr = defaultExpr;
+					}
+					body.Add (new InvocationExpression (new IdentifierExpression (methodDecl.Name),
+						methodDecl.Parameters.Select (param => param == node ? argExpr : GetArgumentExpression(param))));
+
+					var decl = (MethodDeclaration)methodDecl.Clone ();
+					decl.Parameters.Remove (decl.Parameters.First (param => param.Name == node.Name));
+					decl.Body = body;
+
+					script
+						.InsertWithCursor ("Create overload without parameter", Script.InsertPosition.Before, decl)
+						.ContinueScript (() => script.Select(argExpr));
+				}, node.NameToken); 
+		}
+
+		static Expression GetArgumentExpression(ParameterDeclaration parameter)
+		{
+			var identifierExpr = new IdentifierExpression(parameter.Name);
+			switch (parameter.ParameterModifier) {
+				case ParameterModifier.Out:
+					return new DirectionExpression (FieldDirection.Out, identifierExpr);
+				case ParameterModifier.Ref:
+					return new DirectionExpression (FieldDirection.Ref, identifierExpr);
+			}
+			return identifierExpr;
+		}
+
+		static Expression GetDefaultValueExpression (RefactoringContext context, AstType astType)
+		{
+			var type = context.ResolveType (astType);
+
+			// array
+			if (type.Kind == TypeKind.Array)
+				return new ObjectCreateExpression (astType.Clone ());
+
+			// enum
+			if (type.Kind == TypeKind.Enum) {
+				var members = type.GetMembers ().ToArray();
+				if (members.Length == 0)
+					return new DefaultValueExpression (astType.Clone ());
+				return astType.Member(members[0].Name).Clone ();
+			}
+
+			if ((type.IsReferenceType ?? false) || type.Kind == TypeKind.Dynamic)
+				return new NullReferenceExpression ();
+
+			var typeDefinition = type.GetDefinition ();
+			if (typeDefinition != null) {
+				switch (typeDefinition.KnownTypeCode) {
+					case KnownTypeCode.Boolean:
+						return new PrimitiveExpression (false);
+
+					case KnownTypeCode.Char:
+						return new PrimitiveExpression ('\0');
+
+					case KnownTypeCode.SByte:
+					case KnownTypeCode.Byte:
+					case KnownTypeCode.Int16:
+					case KnownTypeCode.UInt16:
+					case KnownTypeCode.Int32:
+					case KnownTypeCode.UInt32:
+					case KnownTypeCode.Int64:
+					case KnownTypeCode.UInt64:
+					case KnownTypeCode.Single:
+					case KnownTypeCode.Double:
+					case KnownTypeCode.Decimal:
+						return new PrimitiveExpression (0);
+
+					case KnownTypeCode.NullableOfT:
+						return new NullReferenceExpression ();
+				}
+				if (type.Kind == TypeKind.Struct)
+					return new ObjectCreateExpression (astType.Clone ());
+			}
+			return new DefaultValueExpression (astType.Clone ());
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreatePropertyAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreatePropertyAction.cs
new file mode 100644
index 0000000000..3894ea229b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreatePropertyAction.cs
@@ -0,0 +1,131 @@
+// 
+// CreateProperty.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Create property", Description = "Creates a property for a undefined variable.")]
+	public class CreatePropertyAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var identifier = CreateFieldAction.GetCreatePropertyOrFieldNode (context);
+			if (identifier == null)
+				yield break;
+			if (CreateFieldAction.IsInvocationTarget(identifier))
+				yield break;
+
+			var propertyName = GetPropertyName(identifier);
+			if (propertyName == null)
+				yield break;
+
+			var statement = context.GetNode<Statement>();
+			if (statement == null)
+				yield break;
+
+			if (!(context.Resolve(identifier).IsError))
+				yield break;
+
+			var guessedType = TypeGuessing.GuessAstType(context, identifier);
+			if (guessedType == null)
+				yield break;
+			var state = context.GetResolverStateBefore(identifier);
+			if (state.CurrentTypeDefinition == null)
+				yield break;
+			
+			bool createInOtherType = false;
+			ResolveResult targetResolveResult = null;
+			if (identifier is MemberReferenceExpression) {
+				targetResolveResult = context.Resolve(((MemberReferenceExpression)identifier).Target);
+				if (targetResolveResult.Type.GetDefinition() == null || targetResolveResult.Type.GetDefinition().Region.IsEmpty)
+					yield break;
+				createInOtherType = !state.CurrentTypeDefinition.Equals(targetResolveResult.Type.GetDefinition());
+			}
+
+			bool isStatic = targetResolveResult is TypeResolveResult;
+			if (createInOtherType) {
+				if (isStatic && targetResolveResult.Type.Kind == TypeKind.Interface || targetResolveResult.Type.Kind == TypeKind.Enum)
+					yield break;
+			} else {
+				if (state.CurrentMember == null)
+					yield break;
+				isStatic |= state.CurrentTypeDefinition.IsStatic;
+				if (targetResolveResult == null)
+					isStatic |= state.CurrentMember.IsStatic;
+			}
+			isStatic &= !(identifier is NamedExpression);
+
+	//			var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
+//			if (service != null && !service.IsValidName(propertyName, AffectedEntity.Property, Modifiers.Private, isStatic)) { 
+//				yield break;
+//			}
+
+			yield return new CodeAction(context.TranslateString("Create property"), script => {
+				var decl = new PropertyDeclaration() {
+					ReturnType = guessedType,
+					Name = propertyName,
+					Getter = new Accessor(),
+					Setter = new Accessor()
+				};
+				if (isStatic)
+					decl.Modifiers |= Modifiers.Static;
+				
+				if (createInOtherType) {
+					if (targetResolveResult.Type.Kind == TypeKind.Interface) {
+						decl.Modifiers = Modifiers.None;
+					} else {
+						decl.Modifiers |= Modifiers.Public;
+					}
+					script.InsertWithCursor(
+						context.TranslateString("Create property"),
+						targetResolveResult.Type.GetDefinition(),
+						(s, c) => decl);
+
+					return;
+				}
+
+				script.InsertWithCursor(context.TranslateString("Create property"), Script.InsertPosition.Before, decl);
+
+			}, identifier.GetNodeAt(context.Location) ?? identifier) { Severity = ICSharpCode.NRefactory.Refactoring.Severity.Error };
+		}
+
+		internal static string GetPropertyName(Expression expr)
+		{
+			if (expr is IdentifierExpression) 
+				return ((IdentifierExpression)expr).Identifier;
+			if (expr is MemberReferenceExpression) 
+				return ((MemberReferenceExpression)expr).MemberName;
+			if (expr is NamedExpression) 
+				return ((NamedExpression)expr).Name;
+
+			return null;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/DeclareLocalVariableAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/DeclareLocalVariableAction.cs
new file mode 100644
index 0000000000..da4564c7e6
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/DeclareLocalVariableAction.cs
@@ -0,0 +1,188 @@
+// 
+// DeclareLocalVariableAction.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Threading;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Declare local variable", Description = "Declare a local variable out of a selected expression.")]
+	public class DeclareLocalVariableAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			if (!context.IsSomethingSelected) {
+				yield break;
+			}
+			var selected = new List<AstNode>(context.GetSelectedNodes());
+
+			if (selected.Count != 1 || !(selected [0] is Expression)) {
+				yield break;
+			}
+
+			var expr = selected [0] as Expression;
+			if (expr is ArrayInitializerExpression) {
+				var arr = (ArrayInitializerExpression)expr;
+				if (arr.IsSingleElement) {
+					expr = arr.Elements.First();
+				} else {
+					yield break;
+				}
+			}
+
+			var visitor = new SearchNodeVisitior(expr);
+			
+			var node = context.GetNode <BlockStatement>();
+			if (node != null) {
+				node.AcceptVisitor(visitor);
+			}
+
+			yield return new CodeAction(context.TranslateString("Declare local variable"), script => {
+				var resolveResult = context.Resolve(expr);
+				var guessedType = resolveResult.Type;
+				if (resolveResult is MethodGroupResolveResult) {
+					guessedType = GetDelegateType(context, ((MethodGroupResolveResult)resolveResult).Methods.First(), expr);
+				}
+				var name = CreateMethodDeclarationAction.CreateBaseName(expr, guessedType);
+				var type = context.UseExplicitTypes ? context.CreateShortType(guessedType) : new SimpleType("var");
+				var varDecl = new VariableDeclarationStatement(type, name, expr.Clone());
+				var replaceNode = visitor.Matches.First () as Expression;
+				if (replaceNode.Parent is ExpressionStatement) {
+					script.Replace(replaceNode.Parent, varDecl);
+					script.Select(varDecl.Variables.First().NameToken);
+				} else {
+					var containing = replaceNode.Parent;
+					while (!(containing.Parent is BlockStatement)) {
+						containing = containing.Parent;
+					}
+
+					script.InsertBefore(containing, varDecl);
+					var identifierExpression = new IdentifierExpression(name);
+					script.Replace(replaceNode, identifierExpression);
+					script.Link(varDecl.Variables.First().NameToken, identifierExpression);
+				}
+			}, expr);
+
+			if (visitor.Matches.Count > 1) {
+				yield return new CodeAction(string.Format(context.TranslateString("Declare local variable (replace '{0}' occurrences)"), visitor.Matches.Count), script => {
+					var resolveResult = context.Resolve(expr);
+					var guessedType = resolveResult.Type;
+					if (resolveResult is MethodGroupResolveResult) {
+						guessedType = GetDelegateType(context, ((MethodGroupResolveResult)resolveResult).Methods.First(), expr);
+					}
+					var linkedNodes = new List<AstNode>();
+					var name = CreateMethodDeclarationAction.CreateBaseName(expr, guessedType);
+					var type = context.UseExplicitTypes ? context.CreateShortType(guessedType) : new SimpleType("var");
+					var varDecl = new VariableDeclarationStatement(type, name, expr.Clone());
+					linkedNodes.Add(varDecl.Variables.First().NameToken);
+					var first = visitor.Matches [0];
+					if (first.Parent is ExpressionStatement) {
+						script.Replace(first.Parent, varDecl);
+					} else {
+						var containing = first.Parent;
+						while (!(containing.Parent is BlockStatement)) {
+							containing = containing.Parent;
+						}
+
+						script.InsertBefore(containing, varDecl);
+						var identifierExpression = new IdentifierExpression(name);
+						linkedNodes.Add(identifierExpression);
+						script.Replace(first, identifierExpression);
+					}
+					for (int i = 1; i < visitor.Matches.Count; i++) {
+						var identifierExpression = new IdentifierExpression(name);
+						linkedNodes.Add(identifierExpression);
+						script.Replace(visitor.Matches [i], identifierExpression);
+					}
+					script.Link(linkedNodes.ToArray ());
+				}, expr);
+			}
+		}
+
+		// Gets Action/Func delegate types for a given method.
+		IType GetDelegateType(RefactoringContext context, IMethod method, Expression expr)
+		{
+			var parameters = new List<IType>();
+			var invoke = expr.Parent as InvocationExpression;
+			if (invoke == null) {
+				return null;
+			}
+			foreach (var arg in invoke.Arguments) {
+				parameters.Add(context.Resolve(arg).Type);
+			}
+
+			ITypeDefinition genericType;
+			if (method.ReturnType.FullName == "System.Void") {
+				genericType = context.Compilation.GetAllTypeDefinitions().FirstOrDefault(t => t.FullName == "System.Action" && t.TypeParameterCount == parameters.Count);
+			} else {
+				parameters.Add(method.ReturnType);
+				genericType = context.Compilation.GetAllTypeDefinitions().FirstOrDefault(t => t.FullName == "System.Func" && t.TypeParameterCount == parameters.Count);
+			}
+			if (genericType == null) {
+				return null;
+			}
+			return new ParameterizedType(genericType, parameters);
+		}
+
+				
+		internal class SearchNodeVisitior : DepthFirstAstVisitor
+		{
+			readonly AstNode searchForNode;
+			public readonly List<AstNode> Matches = new List<AstNode> ();
+			
+			public SearchNodeVisitior (AstNode searchForNode)
+			{
+				this.searchForNode = searchForNode;
+				AddNode (searchForNode);
+			}
+
+			void AddNode(AstNode node)
+			{
+				if (node.Parent is ParenthesizedExpression) {
+					Matches.Add(node.Parent);
+				} else {
+					Matches.Add(node);
+				}
+			}
+			
+			protected override void VisitChildren(AstNode node)
+			{
+				if (node.StartLocation > searchForNode.StartLocation && node.IsMatch(searchForNode)) {
+					AddNode(node);
+					return;
+				} 
+				base.VisitChildren (node);
+			}
+		}
+
+
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtensionMethodInvocationToStaticMethodInvocationAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtensionMethodInvocationToStaticMethodInvocationAction.cs
new file mode 100644
index 0000000000..446c9ab52e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtensionMethodInvocationToStaticMethodInvocationAction.cs
@@ -0,0 +1,69 @@
+//
+// ExtensionMethodInvocationToStaticMethodInvocationAction.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Invoke using static method syntax",
+	               Description = "Converts the call into static method call syntax.")]
+	public class ExtensionMethodInvocationToStaticMethodInvocationAction : CodeActionProvider
+	{
+		#region ICodeActionProvider implementation
+
+		public override IEnumerable<CodeAction> GetActions (RefactoringContext context)
+		{
+			var invocation = context.GetNode<InvocationExpression>();
+			if (invocation == null)
+				yield break;
+			var memberReference = invocation.Target as MemberReferenceExpression;
+			if (memberReference == null)
+				yield break;
+			var invocationRR = context.Resolve(invocation) as CSharpInvocationResolveResult;
+			if (invocationRR == null)
+				yield break;
+			if (invocationRR.IsExtensionMethodInvocation)
+				yield return new CodeAction(context.TranslateString("Convert to static method call"), script => {
+					script.Replace(invocation, ToStaticMethodInvocation(invocation, memberReference, invocationRR));
+				}, invocation);
+		}
+
+		#endregion
+
+		AstNode ToStaticMethodInvocation(InvocationExpression invocation, MemberReferenceExpression memberReference,
+		                                 CSharpInvocationResolveResult invocationRR)
+		{
+			var newArgumentList = invocation.Arguments.Select(arg => arg.Clone()).ToList();
+			newArgumentList.Insert(0, memberReference.Target.Clone());
+			var newTarget = memberReference.Clone() as MemberReferenceExpression;
+			newTarget.Target = new IdentifierExpression(invocationRR.Member.DeclaringType.Name);
+			return new InvocationExpression(newTarget, newArgumentList);
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractAnonymousMethodAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractAnonymousMethodAction.cs
new file mode 100644
index 0000000000..dabaca84ad
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractAnonymousMethodAction.cs
@@ -0,0 +1,120 @@
+// 
+// ExtractAnonymousMethodAction.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction ("Extract anonymous method",
+					Description = "Extract anonymous method to method of the containing type")]
+	public class ExtractAnonymousMethodAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions (RefactoringContext context)
+		{
+			// lambda
+			var lambda = context.GetNode<LambdaExpression> ();
+			if (lambda != null && lambda.ArrowToken.Contains(context.Location)) {
+				if (ContainsLocalReferences (context, lambda, lambda.Body))
+					yield break;
+
+				bool noReturn = false;
+				BlockStatement body;
+				if (lambda.Body is BlockStatement) {
+					body = (BlockStatement)lambda.Body.Clone ();
+				} else {
+					if (!(lambda.Body is Expression))
+						yield break;
+					body = new BlockStatement ();
+
+					var type = LambdaHelper.GetLambdaReturnType (context, lambda);
+					if (type == null || type.ReflectionName == "System.Void") {
+						noReturn = true;
+						body.Add ((Expression)lambda.Body.Clone ());
+					} else {
+						body.Add (new ReturnStatement ((Expression)lambda.Body.Clone ()));
+					}
+				}
+				var method = GetMethod (context, (LambdaResolveResult)context.Resolve (lambda), body, noReturn);
+				yield return GetAction (context, lambda, method);
+			}
+
+			// anonymous method
+			var anonymousMethod = context.GetNode<AnonymousMethodExpression> ();
+			if (anonymousMethod != null && anonymousMethod.DelegateToken.Contains(context.Location)) {
+				if (ContainsLocalReferences (context, anonymousMethod, anonymousMethod.Body))
+					yield break;
+
+				var method = GetMethod (context, (LambdaResolveResult)context.Resolve (anonymousMethod), 
+										(BlockStatement)anonymousMethod.Body.Clone ());
+				yield return GetAction (context, anonymousMethod, method);
+			}
+		}
+
+		CodeAction GetAction (RefactoringContext context, AstNode node, MethodDeclaration method)
+		{
+			return new CodeAction (context.TranslateString ("Extract anonymous method"),
+				script =>
+				{
+					var identifier = new IdentifierExpression ("Method");
+					script.Replace (node, identifier);
+					script.InsertBefore (node.GetParent<EntityDeclaration> (), method);
+					script.Link (method.NameToken, identifier);
+				}, method.NameToken);
+		}
+
+		static MethodDeclaration GetMethod (RefactoringContext context, LambdaResolveResult lambda, BlockStatement body,
+			bool noReturnValue = false)
+		{
+			var method = new MethodDeclaration { Name = "Method" };
+
+			if (noReturnValue) {
+				method.ReturnType = new PrimitiveType ("void"); 
+			} else {
+				var type = lambda.ReturnType;
+				method.ReturnType = type.Kind == TypeKind.Unknown ? new PrimitiveType ("void") : context.CreateShortType (type);
+			}
+
+			foreach (var param in lambda.Parameters)
+				method.Parameters.Add (new ParameterDeclaration (context.CreateShortType (param.Type), param.Name));
+
+			method.Body = body;
+			if (lambda.IsAsync)
+				method.Modifiers |= Modifiers.Async;
+
+			return method;
+		}
+
+		static bool ContainsLocalReferences (RefactoringContext context, AstNode expr, AstNode body)
+		{
+			var visitor = new ExtractMethod.VariableLookupVisitor (context);
+			body.AcceptVisitor (visitor);
+			return visitor.UsedVariables.Any (variable => !expr.Contains (variable.Region.Begin));
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractFieldAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractFieldAction.cs
new file mode 100644
index 0000000000..f89c865f57
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractFieldAction.cs
@@ -0,0 +1,125 @@
+// 
+// ExtractFieldAction.cs
+//  
+// Author:
+//       Nieve <>
+// 
+// Copyright (c) 2012 Nieve
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using Mono.CSharp;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Extract field", Description = "Extracts a field from a local variable declaration.")]
+	public class ExtractFieldAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			//TODO: implement variable assignment & ctor param
+			var varInit = context.GetNode<VariableInitializer>();
+			if (varInit != null) {
+				var selectedNode = varInit.GetNodeAt(context.Location);
+				if (selectedNode != varInit.NameToken)
+					yield break;
+
+				AstType type = varInit.GetPrevNode() as AstType;
+				if (type == null) yield break;
+				if (varInit.Parent is FieldDeclaration) yield break;
+				if (CannotExtractField(context, varInit)) yield break;
+				
+				yield return new CodeAction(context.TranslateString("Assign to new field"), s=>{
+					var name = varInit.Name;
+
+					AstType extractedType;
+					if (type.IsVar()) {
+						IType resolvedType = context.Resolve(varInit.Initializer).Type;
+						extractedType = context.CreateShortType(resolvedType);
+					}
+					else {
+						extractedType = (AstType) type.Clone();
+					}
+
+					AstNode entityDeclarationNode = varInit.Parent;
+					while (!(entityDeclarationNode is EntityDeclaration) || (entityDeclarationNode is Accessor)) {
+						entityDeclarationNode = entityDeclarationNode.Parent;
+					}
+					var entity = (EntityDeclaration) entityDeclarationNode;
+					bool isStatic = entity.HasModifier(Modifiers.Static);
+
+					FieldDeclaration field = new FieldDeclaration(){
+						Modifiers = isStatic ? Modifiers.Static : Modifiers.None,
+						ReturnType = extractedType,
+						Variables = { new VariableInitializer(name) }
+					};
+					AstNode nodeToRemove = RemoveDeclaration(varInit) ? varInit.Parent : type;
+					s.Remove(nodeToRemove, true);
+					s.InsertWithCursor(context.TranslateString("Insert new field"),Script.InsertPosition.Before,field);
+					s.FormatText(varInit.Parent);
+				}, selectedNode);
+			}
+			
+			var idntf = context.GetNode<Identifier>();
+			if (idntf == null) yield break;
+			var paramDec = idntf.Parent as ParameterDeclaration;
+			if (paramDec != null) {
+				var ctor = paramDec.Parent as ConstructorDeclaration;
+				if (ctor == null) yield break;
+				MemberReferenceExpression thisField = new MemberReferenceExpression(new ThisReferenceExpression(), idntf.Name, new AstType[]{});
+				var assign = new AssignmentExpression(thisField, AssignmentOperatorType.Assign, new IdentifierExpression(idntf.Name));
+				var statement = new ExpressionStatement(assign);
+				var type = (idntf.GetPrevNode() as AstType).Clone();
+				FieldDeclaration field = new FieldDeclaration(){
+					ReturnType = type.Clone(),
+					Variables = { new VariableInitializer(idntf.Name) }
+				};
+				yield return new CodeAction(context.TranslateString("Assign to new field"), s=>{
+					s.InsertWithCursor(context.TranslateString("Insert new field"),Script.InsertPosition.Before,field);
+					s.AddTo(ctor.Body, statement);
+				}, paramDec.NameToken);
+			}
+		}
+		
+		static bool RemoveDeclaration (VariableInitializer varInit){
+			var result = varInit.Parent as VariableDeclarationStatement;
+			return result.Variables.First ().Initializer.IsNull;
+		}
+		
+		static bool CannotExtractField (RefactoringContext context, VariableInitializer varInit)
+		{
+			var result = varInit.Parent as VariableDeclarationStatement;
+			return result == null || result.Variables.Count != 1 || ContainsAnonymousType(context.Resolve(varInit.Initializer).Type);
+		}
+
+		static bool ContainsAnonymousType (IType type)
+		{
+			if (type.Kind == TypeKind.Anonymous)
+				return true;
+
+			var arrayType = type as ArrayType;
+			return arrayType != null && ContainsAnonymousType (arrayType.ElementType);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractMethod/ExtractMethodAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractMethod/ExtractMethodAction.cs
new file mode 100644
index 0000000000..6492cfde9e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractMethod/ExtractMethodAction.cs
@@ -0,0 +1,243 @@
+// 
+// ExtractMethodAction.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+using System.Threading;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Threading.Tasks;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod
+{
+	[ContextAction("Extract method", Description = "Creates a new method out of selected text.")]
+	public class ExtractMethodAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			if (!context.IsSomethingSelected)
+				yield break;
+			var selected = new List<AstNode>(context.GetSelectedNodes());
+			if (selected.Count == 0)
+				yield break;
+			
+			if (selected.Count == 1 && selected [0] is Expression) {
+				var codeAction = CreateFromExpression(context, (Expression)selected [0]);
+				if (codeAction == null)
+					yield break;
+				yield return codeAction;
+			}
+
+			foreach (var node in selected) {
+				if (!(node is Statement) && !(node is Comment) && !(node is NewLineNode) && !(node is PreProcessorDirective))
+					yield break;
+			}
+			var action = CreateFromStatements (context, new List<AstNode> (selected));
+			if (action != null)
+				yield return action;
+		}
+		
+		CodeAction CreateFromExpression(RefactoringContext context, Expression expression)
+		{
+			var resolveResult = context.Resolve(expression);
+			if (resolveResult.IsError)
+				return null;
+			
+			return new CodeAction(context.TranslateString("Extract method"), script => {
+				string methodName = "NewMethod";
+				var method = new MethodDeclaration {
+					ReturnType = context.CreateShortType(resolveResult.Type),
+					Name = methodName,
+					Body = new BlockStatement {
+						new ReturnStatement(expression.Clone())
+					}
+				};
+				if (!StaticVisitor.UsesNotStaticMember(context, expression))
+					method.Modifiers |= Modifiers.Static;
+
+				var usedVariables = VariableLookupVisitor.Analyze(context, expression);
+				
+				var inExtractedRegion = new VariableUsageAnalyzation (context, usedVariables);
+
+				usedVariables.Sort ((l, r) => l.Region.Begin.CompareTo (r.Region.Begin));
+				var target = new IdentifierExpression(methodName);
+				var invocation = new InvocationExpression(target);
+				foreach (var variable in usedVariables) {
+					Expression argumentExpression = new IdentifierExpression(variable.Name); 
+					
+					var mod = ParameterModifier.None;
+					if (inExtractedRegion.GetStatus (variable) == VariableState.Changed) {
+						mod = ParameterModifier.Ref;
+						argumentExpression = new DirectionExpression(FieldDirection.Ref, argumentExpression);
+					}
+					
+					method.Parameters.Add(new ParameterDeclaration(context.CreateShortType(variable.Type), variable.Name, mod));
+					invocation.Arguments.Add(argumentExpression);
+				}
+
+				script
+					.InsertWithCursor(context.TranslateString("Extract method"), Script.InsertPosition.Before, method)
+					.ContinueScript (delegate {
+						script.Replace(expression, invocation);
+						script.Link(target, method.NameToken);
+					});
+			}, expression);
+		}
+		
+		CodeAction CreateFromStatements(RefactoringContext context, List<AstNode> statements)
+		{
+			if (!(statements [0].Parent is Statement))
+				return null;
+			
+			return new CodeAction(context.TranslateString("Extract method"), script => {
+				string methodName = "NewMethod";
+				var method = new MethodDeclaration() {
+					ReturnType = new PrimitiveType("void"),
+					Name = methodName,
+					Body = new BlockStatement()
+				};
+				bool usesNonStaticMember = false;
+				foreach (var node in statements) {
+					usesNonStaticMember |= StaticVisitor.UsesNotStaticMember(context, node);
+					if (node is Statement) {
+						method.Body.Add((Statement)node.Clone());
+					} else {
+						method.Body.AddChildUnsafe (node.Clone (), node.Role);
+					}
+				}
+				if (!usesNonStaticMember)
+					method.Modifiers |= Modifiers.Static;
+				
+				var target = new IdentifierExpression(methodName);
+				var invocation = new InvocationExpression(target);
+				
+				var usedVariables = VariableLookupVisitor.Analyze(context, statements);
+				
+				var inExtractedRegion = new VariableUsageAnalyzation (context, usedVariables);
+				var lastStatement = statements [statements.Count - 1];
+				
+				var stmt = statements [0].GetParent<BlockStatement>();
+				while (stmt.GetParent<BlockStatement> () != null) {
+					stmt = stmt.GetParent<BlockStatement>();
+				}
+				
+				inExtractedRegion.SetAnalyzedRange(statements [0], lastStatement);
+				stmt.AcceptVisitor (inExtractedRegion);
+				
+				var beforeExtractedRegion = new VariableUsageAnalyzation (context, usedVariables);
+				beforeExtractedRegion.SetAnalyzedRange(statements [0].Parent, statements [0], true, false);
+				stmt.AcceptVisitor (beforeExtractedRegion);
+				
+				var afterExtractedRegion = new VariableUsageAnalyzation (context, usedVariables);
+				afterExtractedRegion.SetAnalyzedRange(lastStatement, stmt.Statements.Last(), false, true);
+				stmt.AcceptVisitor (afterExtractedRegion);
+				usedVariables.Sort ((l, r) => l.Region.Begin.CompareTo (r.Region.Begin));
+
+				IVariable generatedReturnVariable = null;
+				foreach (var variable in usedVariables) {
+					if ((variable is IParameter) || beforeExtractedRegion.Has (variable) || !afterExtractedRegion.Has (variable))
+						continue;
+					generatedReturnVariable = variable;
+					method.ReturnType = context.CreateShortType (variable.Type);
+					method.Body.Add (new ReturnStatement (new IdentifierExpression (variable.Name)));
+					break;
+				}
+
+				int parameterOutCount = 0;
+				foreach (var variable in usedVariables) {
+					if (!(variable is IParameter) && !beforeExtractedRegion.Has (variable) && !afterExtractedRegion.Has (variable))
+						continue;
+					if (variable == generatedReturnVariable)
+						continue;
+					Expression argumentExpression = new IdentifierExpression(variable.Name); 
+					
+					ParameterModifier mod = ParameterModifier.None;
+					if (inExtractedRegion.GetStatus (variable) == VariableState.Changed) {
+						if (beforeExtractedRegion.GetStatus (variable) == VariableState.None) {
+							mod = ParameterModifier.Out;
+							argumentExpression = new DirectionExpression(FieldDirection.Out, argumentExpression);
+							parameterOutCount++;
+						} else {
+							mod = ParameterModifier.Ref;
+							argumentExpression = new DirectionExpression(FieldDirection.Ref, argumentExpression);
+						}
+					}
+					
+					method.Parameters.Add(new ParameterDeclaration(context.CreateShortType(variable.Type), variable.Name, mod));
+					invocation.Arguments.Add(argumentExpression);
+				}
+
+				ParameterDeclaration parameterToTransform = null;
+				bool transformParameterToReturn = method.ReturnType is PrimitiveType && 
+				                                  ((PrimitiveType)method.ReturnType).Keyword == "void" &&
+				                                  parameterOutCount == 1;
+				if(transformParameterToReturn) {
+					parameterToTransform = method.Parameters.First(p => p.ParameterModifier == ParameterModifier.Out);
+					parameterToTransform.Remove();
+					var argumentExpression = invocation.Arguments.OfType<DirectionExpression>().First(a => a.FieldDirection == FieldDirection.Out);
+					argumentExpression.Remove();
+					method.ReturnType = parameterToTransform.Type.Clone();
+					var argumentDecl = new VariableDeclarationStatement(parameterToTransform.Type.Clone(),parameterToTransform.Name);
+					method.Body.InsertChildBefore(method.Body.First(),argumentDecl,BlockStatement.StatementRole);
+					method.Body.Add(new ReturnStatement (new IdentifierExpression (parameterToTransform.Name)));
+				}
+
+				script
+					.InsertWithCursor(context.TranslateString("Extract method"), Script.InsertPosition.Before, method)
+					.ContinueScript(delegate {
+						foreach (var node in statements.Skip (1)) {
+							if (node is NewLineNode)
+								continue;
+							script.Remove(node);
+						}
+						foreach (var variable in usedVariables) {
+							if ((variable is IParameter) || beforeExtractedRegion.Has (variable) || !afterExtractedRegion.Has (variable))
+								continue;
+							if (variable == generatedReturnVariable)
+								continue;
+							script.InsertBefore (statements [0], new VariableDeclarationStatement (context.CreateShortType(variable.Type), variable.Name));
+						}
+						Statement invocationStatement;
+
+						if (generatedReturnVariable != null) {
+							invocationStatement = new VariableDeclarationStatement (new SimpleType ("var"), generatedReturnVariable.Name, invocation);
+						} else if(transformParameterToReturn) {
+							invocationStatement = new AssignmentExpression(new IdentifierExpression(parameterToTransform.Name), invocation);
+						} else {
+							invocationStatement = invocation;
+						}
+
+						script.Replace(statements [0], invocationStatement);
+
+
+						script.Link(target, method.NameToken);
+					});
+			}, statements.First ().StartLocation, statements.Last ().EndLocation);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractMethod/StaticVisitor.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractMethod/StaticVisitor.cs
new file mode 100644
index 0000000000..41fc000935
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractMethod/StaticVisitor.cs
@@ -0,0 +1,85 @@
+// 
+// StaticVisitor.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod
+{
+	class StaticVisitor : DepthFirstAstVisitor
+	{
+		readonly BaseRefactoringContext context;
+		public bool UsesNonStaticMember = false;
+
+		StaticVisitor(BaseRefactoringContext context)
+		{
+			this.context = context;
+		}
+		
+		
+		public static bool UsesNotStaticMember(BaseRefactoringContext context, AstNode node)
+		{
+			var visitor = new StaticVisitor(context);
+			node.AcceptVisitor(visitor);
+			return visitor.UsesNonStaticMember;
+		}
+
+		protected override void VisitChildren(AstNode node)
+		{
+			if (UsesNonStaticMember)
+				return;
+			base.VisitChildren(node);
+		}
+
+		public override void VisitThisReferenceExpression(ThisReferenceExpression thisReferenceExpression)
+		{
+			UsesNonStaticMember = true;
+			base.VisitThisReferenceExpression(thisReferenceExpression);
+		}
+
+		public override void VisitBaseReferenceExpression(BaseReferenceExpression baseReferenceExpression)
+		{
+			UsesNonStaticMember = true;
+			base.VisitBaseReferenceExpression(baseReferenceExpression);
+		}
+
+		public override void VisitIdentifierExpression(IdentifierExpression identifierExpression)
+		{
+			var resolveResult = context.Resolve(identifierExpression);
+			if (resolveResult is MemberResolveResult) {
+				var memberResult = (MemberResolveResult)resolveResult;
+				if (!memberResult.Member.IsStatic)
+					UsesNonStaticMember = true;
+			} else if (resolveResult is MethodGroupResolveResult) {
+				var methodGroupResolveResult = (MethodGroupResolveResult)resolveResult;
+				if (methodGroupResolveResult.Methods.Any(m => !m.IsStatic))
+					UsesNonStaticMember = true;
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractMethod/VariableLookupVisitor.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractMethod/VariableLookupVisitor.cs
new file mode 100644
index 0000000000..a4f46bffa6
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractMethod/VariableLookupVisitor.cs
@@ -0,0 +1,135 @@
+// 
+// VariableLookupVisitor.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod
+{
+	class VariableLookupVisitor : DepthFirstAstVisitor
+	{
+		readonly RefactoringContext context;
+		
+		public List<IVariable> UsedVariables = new List<IVariable> ();
+		
+		TextLocation startLocation = TextLocation.Empty;
+		TextLocation endLocation = TextLocation.Empty;
+		
+		public VariableLookupVisitor (RefactoringContext context)
+		{
+			this.context = context;
+		}
+		
+		public bool Has (IVariable item1)
+		{
+			return UsedVariables.Contains (item1);
+		}
+		
+		public void SetAnalyzedRange(AstNode start, AstNode end, bool startInclusive = true, bool endInclusive = true)
+		{
+			if (start == null)
+				throw new ArgumentNullException("start");
+			if (end == null)
+				throw new ArgumentNullException("end");
+			startLocation = startInclusive ? start.StartLocation : start.EndLocation;
+			endLocation = endInclusive ? end.EndLocation : end.StartLocation;
+		}
+		
+		public override void VisitIdentifierExpression(IdentifierExpression identifierExpression)
+		{
+			if (startLocation.IsEmpty || startLocation <= identifierExpression.StartLocation && identifierExpression.EndLocation <= endLocation) {
+				var result = context.Resolve(identifierExpression);
+				var local = result as LocalResolveResult;
+				if (local != null && !UsedVariables.Contains(local.Variable)&& !anonymousParameters.Contains(local.Variable)) {
+					UsedVariables.Add(local.Variable);
+				}
+			}
+		}
+
+		HashSet<IVariable> anonymousParameters = new HashSet<IVariable> ();
+		public override void VisitLambdaExpression(LambdaExpression lambdaExpression)
+		{
+			foreach (var param in lambdaExpression.Parameters) {
+				var result = context.Resolve(param);
+				var local = result as LocalResolveResult;
+				anonymousParameters.Add(local.Variable); 
+			}
+			base.VisitLambdaExpression(lambdaExpression);
+			foreach (var param in lambdaExpression.Parameters) {
+				var result = context.Resolve(param);
+				var local = result as LocalResolveResult;
+				anonymousParameters.Remove(local.Variable); 
+			}
+		}
+
+		public override void VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression)
+		{
+			foreach (var param in anonymousMethodExpression.Parameters) {
+				var result = context.Resolve(param);
+				var local = result as LocalResolveResult;
+				anonymousParameters.Add(local.Variable); 
+			}
+
+
+			base.VisitAnonymousMethodExpression(anonymousMethodExpression);
+			foreach (var param in anonymousMethodExpression.Parameters) {
+				var result = context.Resolve(param);
+				var local = result as LocalResolveResult;
+				anonymousParameters.Remove(local.Variable); 
+			}
+		}
+
+		public override void VisitVariableDeclarationStatement(VariableDeclarationStatement variableDeclarationStatement)
+		{
+			base.VisitVariableDeclarationStatement(variableDeclarationStatement);
+			foreach (var varDecl in variableDeclarationStatement.Variables) {
+				if (startLocation.IsEmpty || startLocation <= varDecl.StartLocation && varDecl.EndLocation <= endLocation) {
+					var result = context.Resolve(varDecl);
+					var local = result as LocalResolveResult;
+					if (local != null && !UsedVariables.Contains(local.Variable) && !anonymousParameters.Contains(local.Variable))
+						UsedVariables.Add(local.Variable);
+				}
+			}
+		}
+		
+		
+		public static List<IVariable> Analyze(RefactoringContext context, Expression expression)
+		{
+			var visitor = new VariableLookupVisitor(context);
+			expression.AcceptVisitor(visitor);
+			return visitor.UsedVariables;
+		}
+		
+		public static List<IVariable> Analyze(RefactoringContext context, List<AstNode> statements)
+		{
+			var visitor = new VariableLookupVisitor(context);
+			statements.ForEach(stmt => stmt.AcceptVisitor(visitor));
+			return visitor.UsedVariables;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/VariableUsageAnalyzation.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractMethod/VariableUsageAnalyzation.cs
similarity index 100%
rename from src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/VariableUsageAnalyzation.cs
rename to src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractMethod/VariableUsageAnalyzation.cs
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractWhileConditionToInternalIfStatementAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractWhileConditionToInternalIfStatementAction.cs
new file mode 100644
index 0000000000..7fc00032f3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ExtractWhileConditionToInternalIfStatementAction.cs
@@ -0,0 +1,68 @@
+//
+// ExtractWhileConditionToInternalIfStatementAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using Mono.CSharp;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Extract field", Description = "Extracts a field from a local variable declaration.")]
+	public class ExtractWhileConditionToInternalIfStatementAction : SpecializedCodeAction<WhileStatement>
+	{
+		protected override CodeAction GetAction(RefactoringContext context, WhileStatement node)
+		{
+			if (!node.WhileToken.Contains(context.Location))
+				return null;
+
+			return new CodeAction(
+				context.TranslateString("Extract condition to internal 'if' statement"),
+				script => {
+					script.Replace(node.Condition, new PrimitiveExpression(true));
+					var ifStmt = new IfElseStatement(
+						CSharpUtil.InvertCondition(node.Condition),
+						new BreakStatement()
+					);
+
+					var block = node.EmbeddedStatement as BlockStatement;
+					if (block != null) {
+						script.InsertAfter(block.LBraceToken, ifStmt);
+					} else {
+						var blockStatement = new BlockStatement {
+							ifStmt
+						};
+						if (!(node.EmbeddedStatement is EmptyStatement))
+							blockStatement.Statements.Add(node.EmbeddedStatement.Clone());
+						script.Replace(node.EmbeddedStatement, blockStatement);
+					}
+				},
+				node
+			);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/FlipEqualsTargetAndArgumentAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/FlipEqualsTargetAndArgumentAction.cs
new file mode 100644
index 0000000000..e8749605d1
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/FlipEqualsTargetAndArgumentAction.cs
@@ -0,0 +1,96 @@
+//
+// FlipEqualsQualifierAndArgumentAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Swap 'Equals' target and argument", Description = "Swap 'Equals' target and argument")]
+	public class FlipEqualsTargetAndArgumentAction : CodeActionProvider
+	{
+		Expression GetInnerMostExpression(Expression target)
+		{
+			while (target is ParenthesizedExpression)
+				target = ((ParenthesizedExpression)target).Expression;
+			return target;
+		}
+
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var invocation = context.GetNode<InvocationExpression>();
+			if (invocation == null)
+				yield break;
+			if (invocation.Arguments.Count != 1 || invocation.Arguments.First() is NullReferenceExpression)
+				yield break;
+			var target = invocation.Target as MemberReferenceExpression;
+
+			if (target == null || target.MemberNameToken.StartLocation > context.Location || invocation.LParToken.StartLocation < context.Location)
+				yield break;
+
+			var rr = context.Resolve(invocation) as InvocationResolveResult;
+			if (rr == null || rr.Member.Name != "Equals" || rr.Member.IsStatic || !rr.Member.ReturnType.IsKnownType(KnownTypeCode.Boolean))
+				yield break;
+
+			yield return new CodeAction(
+				context.TranslateString("Flip 'Equals' target and argument"),
+				script => {
+					script.Replace(
+						invocation,
+						new InvocationExpression(
+							new MemberReferenceExpression(
+								AddParensIfRequired(invocation.Arguments.First ().Clone()),
+								"Equals"
+							),
+							GetInnerMostExpression (target.Target).Clone()
+						)
+				    );
+				},
+				invocation
+			);
+		}
+
+		Expression AddParensIfRequired(Expression expression)
+		{
+			if ((expression is BinaryOperatorExpression) ||
+			    (expression is UnaryOperatorExpression) ||
+			    (expression is CastExpression) ||
+			    (expression is AssignmentExpression) ||
+				(expression is AsExpression) ||
+			    (expression is IsExpression) ||
+			    (expression is LambdaExpression) ||
+			    (expression is ConditionalExpression)) {
+				return new ParenthesizedExpression(expression);
+			}
+
+			return expression;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/FlipOperatorArgumentsAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/FlipOperatorArgumentsAction.cs
new file mode 100644
index 0000000000..2230d6bf92
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/FlipOperatorArgumentsAction.cs
@@ -0,0 +1,61 @@
+// 
+// FlipOperatorArguments.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Swaps left and right arguments.", Description = "Swaps left and right arguments.")]
+	public class FlipOperatorArgumentsAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var binop = GetBinaryOperatorExpression(context);
+			if (binop == null) {
+				yield break;
+			}
+
+
+			yield return new CodeAction(string.Format(context.TranslateString("Flip '{0}' operator arguments"), binop.OperatorToken.ToString()), script => {
+				script.Replace(binop.Left, binop.Right.Clone());
+				script.Replace(binop.Right, binop.Left.Clone());
+			}, binop.OperatorToken);
+		}
+		
+		public static BinaryOperatorExpression GetBinaryOperatorExpression (RefactoringContext context)
+		{
+			var node = context.GetNode<BinaryOperatorExpression> ();
+			
+			if (node == null || !node.OperatorToken.Contains (context.Location))
+				return null;
+			var result = node as BinaryOperatorExpression;
+			if (result == null || (result.Operator != BinaryOperatorType.Equality && result.Operator != BinaryOperatorType.InEquality))
+				return null;
+			return result;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/GenerateGetterAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/GenerateGetterAction.cs
new file mode 100644
index 0000000000..be3a76407b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/GenerateGetterAction.cs
@@ -0,0 +1,101 @@
+// 
+// GenerateGetter.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Linq;
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Generate getter", Description = "Generates a getter for a field.")]
+	public class GenerateGetterAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var initializer = GetVariableInitializer(context);
+			if (initializer == null || !initializer.NameToken.Contains(context.Location)) {
+				yield break;
+			}
+			var type = initializer.Parent.Parent as TypeDeclaration;
+			if (type == null) {
+				yield break;
+			}
+			foreach (var member in type.Members) {
+				if (member is PropertyDeclaration && ContainsGetter((PropertyDeclaration)member, initializer)) {
+					yield break;
+				}
+			}
+			var field = initializer.Parent as FieldDeclaration;
+			if (field == null) {
+				yield break;
+			}
+			
+			yield return new CodeAction(context.TranslateString("Create getter"), script => {
+				script.InsertWithCursor(
+					context.TranslateString("Create getter"),
+					Script.InsertPosition.After,
+					GeneratePropertyDeclaration(context, field, initializer));
+			}, initializer);
+		}
+		
+		static PropertyDeclaration GeneratePropertyDeclaration (RefactoringContext context, FieldDeclaration field, VariableInitializer initializer)
+		{
+			var mod = ICSharpCode.NRefactory.CSharp.Modifiers.Public;
+			if (field.HasModifier (ICSharpCode.NRefactory.CSharp.Modifiers.Static))
+				mod |= ICSharpCode.NRefactory.CSharp.Modifiers.Static;
+			
+			return new PropertyDeclaration () {
+				Modifiers = mod,
+				Name = context.GetNameProposal (initializer.Name, false),
+				ReturnType = field.ReturnType.Clone (),
+				Getter = new Accessor () {
+					Body = new BlockStatement () {
+						new ReturnStatement (new IdentifierExpression (initializer.Name))
+					}
+				}
+			};
+		}
+		
+		bool ContainsGetter (PropertyDeclaration property, VariableInitializer initializer)
+		{
+			if (property.Getter.IsNull || property.Getter.Body.Statements.Count () != 1)
+				return false;
+			var ret = property.Getter.Body.Statements.Single () as ReturnStatement;
+			if (ret == null)
+				return false;
+			return ret.Expression.IsMatch (new IdentifierExpression (initializer.Name)) || 
+				ret.Expression.IsMatch (new MemberReferenceExpression (new ThisReferenceExpression (), initializer.Name));
+		}
+		
+		VariableInitializer GetVariableInitializer (RefactoringContext context)
+		{
+			return context.GetNode<VariableInitializer> ();
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/GeneratePropertyAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/GeneratePropertyAction.cs
new file mode 100644
index 0000000000..991b829a00
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/GeneratePropertyAction.cs
@@ -0,0 +1,108 @@
+// 
+// GenerateProperty.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Linq;
+using System.Threading;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Generate property", Description = "Generates a getter and setter for a field.")]
+	public class GeneratePropertyAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var initializer = context.GetNode<VariableInitializer>();
+			if (initializer == null || !initializer.NameToken.Contains(context.Location.Line, context.Location.Column)) {
+				yield break;
+			}
+			var type = initializer.Parent.Parent as TypeDeclaration;
+			if (type == null) {
+				yield break;
+			}
+			foreach (var member in type.Members) {
+				if (member is PropertyDeclaration && ContainsGetter((PropertyDeclaration)member, initializer)) {
+					yield break;
+				}
+			}
+			var field = initializer.Parent as FieldDeclaration;
+			if (field == null || field.HasModifier(Modifiers.Readonly) || field.HasModifier(Modifiers.Const)) {
+				yield break;
+			}
+			var resolveResult = context.Resolve(initializer) as MemberResolveResult;
+			if (resolveResult == null)
+				yield break;
+			yield return new CodeAction(context.TranslateString("Create property"), script => {
+				var fieldName = context.GetNameProposal(initializer.Name, true);
+				if (initializer.Name == context.GetNameProposal(initializer.Name, false)) {
+					script.Rename(resolveResult.Member, fieldName);
+				}
+				script.InsertWithCursor(
+					context.TranslateString("Create property"),
+					Script.InsertPosition.After, GeneratePropertyDeclaration(context, field, fieldName));
+			}, initializer);
+		}
+		
+		static PropertyDeclaration GeneratePropertyDeclaration (RefactoringContext context, FieldDeclaration field, string fieldName)
+		{
+			var mod = ICSharpCode.NRefactory.CSharp.Modifiers.Public;
+			if (field.HasModifier (ICSharpCode.NRefactory.CSharp.Modifiers.Static))
+				mod |= ICSharpCode.NRefactory.CSharp.Modifiers.Static;
+			
+			return new PropertyDeclaration () {
+				Modifiers = mod,
+				Name = context.GetNameProposal (fieldName, false),
+				ReturnType = field.ReturnType.Clone (),
+				Getter = new Accessor {
+					Body = new BlockStatement {
+						new ReturnStatement (new IdentifierExpression (fieldName))
+					}
+				},
+				Setter = new Accessor {
+					Body = new BlockStatement {
+						new AssignmentExpression (new IdentifierExpression (fieldName), new IdentifierExpression ("value"))
+					}
+				}
+			};
+		}
+		
+		bool ContainsGetter (PropertyDeclaration property, VariableInitializer initializer)
+		{
+			if (property.Getter.IsNull || property.Getter.Body.Statements.Count () != 1)
+				return false;
+			var ret = property.Getter.Body.Statements.Single () as ReturnStatement;
+			if (ret == null)
+				return false;
+			return ret.Expression.IsMatch (new IdentifierExpression (initializer.Name)) || 
+				ret.Expression.IsMatch (new MemberReferenceExpression (new ThisReferenceExpression (), initializer.Name));
+		}
+		
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/GenerateSwitchLabelsAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/GenerateSwitchLabelsAction.cs
new file mode 100644
index 0000000000..4a365da45a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/GenerateSwitchLabelsAction.cs
@@ -0,0 +1,123 @@
+// 
+// GenerateSwitchLabels.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Threading;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Generate switch labels", Description = "Creates switch lables for enumerations.")]
+	public class GenerateSwitchLabelsAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var switchStatement = context.GetNode<SwitchStatement> ();
+
+			if (switchStatement == null || !switchStatement.SwitchToken.Contains(context.Location))
+				yield break;
+			var result = context.Resolve(switchStatement.Expression);
+			if (result.Type.Kind != TypeKind.Enum)
+				yield break;
+
+			if (switchStatement.SwitchSections.Count == 0) {
+				yield return new CodeAction(context.TranslateString("Create switch labels"), script => {
+					var type = result.Type;
+					var newSwitch = (SwitchStatement)switchStatement.Clone();
+					
+					var target = context.CreateShortType(result.Type);
+					foreach (var field in type.GetFields ()) {
+						if (field.IsSynthetic || !field.IsConst)
+							continue;
+						newSwitch.SwitchSections.Add(new SwitchSection() {
+							CaseLabels = {
+								new CaseLabel(new MemberReferenceExpression(target.Clone(), field.Name))
+							},
+							Statements = {
+								new BreakStatement()
+							}
+						});
+					}
+					
+					newSwitch.SwitchSections.Add(new SwitchSection() {
+						CaseLabels = {
+							new CaseLabel()
+						},
+						Statements = {
+							new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "ArgumentOutOfRangeException")))
+						}
+					});
+					
+					script.Replace(switchStatement, newSwitch);
+				}, switchStatement);
+			} else {
+				var missingFields = new List<IField>();
+				foreach (var field in result.Type.GetFields ()) {
+					if (field.IsSynthetic || !field.IsConst)
+						continue;
+					if (!IsHandled(context, switchStatement, field)) {
+						missingFields.Add(field); 
+					}
+				}
+				if (missingFields.Count == 0)
+					yield break;
+				yield return new CodeAction(context.TranslateString("Create missing switch labels"), script => {
+					var type = result.Type;
+					//var newSwitch = (SwitchStatement)switchStatement.Clone();
+					var insertNode = (AstNode)switchStatement.SwitchSections.LastOrDefault(s => !s.CaseLabels.Any(label => label.Expression.IsNull)) ?? switchStatement.LBraceToken;
+
+					var target = context.CreateShortType(result.Type);
+					foreach (var field in missingFields) {
+						script.InsertAfter(insertNode, new SwitchSection() {
+							CaseLabels =  {
+								new CaseLabel(new MemberReferenceExpression(target.Clone(), field.Name))
+							},
+							Statements =  {
+								new BreakStatement()
+							}
+						});
+					}
+				}, switchStatement);
+			}
+		}
+
+		static bool IsHandled(RefactoringContext context, SwitchStatement switchStatement, IField field)
+		{
+			foreach (var sect in switchStatement.SwitchSections) {
+				foreach (var caseLabel in sect.CaseLabels) {
+					var resolveCase = context.Resolve(caseLabel.Expression) as MemberResolveResult;
+					if (resolveCase == null)
+						continue;
+					if (field == resolveCase.Member)
+						return true;
+				}
+			}
+			return false;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ImplementAbstractMembersAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ImplementAbstractMembersAction.cs
new file mode 100644
index 0000000000..391b0957de
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ImplementAbstractMembersAction.cs
@@ -0,0 +1,93 @@
+// 
+// ImplementAbstractMembersAction.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Threading;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Implement abstract members", Description = "Implements abstract members from an abstract class.")]
+	public class ImplementAbstractMembersAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var service = (CodeGenerationService)context.GetService(typeof(CodeGenerationService)); 
+			if (service == null)
+				yield break;
+
+			var type = context.GetNode<AstType>();
+			if (type == null || type.Role != Roles.BaseType)
+				yield break;
+			var state = context.GetResolverStateBefore(type);
+			if (state.CurrentTypeDefinition == null)
+				yield break;
+
+			var resolveResult = context.Resolve(type);
+			if (resolveResult.Type.Kind != TypeKind.Class || resolveResult.Type.GetDefinition() == null || !resolveResult.Type.GetDefinition().IsAbstract)
+				yield break;
+
+			var toImplement = CollectMembersToImplement(state.CurrentTypeDefinition, resolveResult.Type);
+			if (toImplement.Count == 0)
+				yield break;
+
+			yield return new CodeAction(
+				context.TranslateString("Implement abstract members"), 
+				script => script.InsertWithCursor(
+					context.TranslateString("Implement abstract members"), 
+					state.CurrentTypeDefinition, (s, c) => ImplementInterfaceAction.GenerateImplementation(c, toImplement.Select(m => Tuple.Create(m, false)), true)
+				.Select(entity => {
+					var decl = entity as EntityDeclaration;
+					if (decl != null)
+						decl.Modifiers |= Modifiers.Override;
+					return entity;
+				}).ToList()), type);
+		}
+
+		public static List<IMember> CollectMembersToImplement(ITypeDefinition implementingType, IType abstractType)
+		{
+			var toImplement = new List<IMember>();
+			bool alreadyImplemented;
+			foreach (var member in abstractType.GetMembers (d => !d.IsSynthetic  && d.IsAbstract)) {
+				alreadyImplemented = false;
+				var allBaseTypes = member.DeclaringType.GetAllBaseTypes().ToList ();
+				foreach (var cmet in implementingType.GetMembers (d => d.SymbolKind == member.SymbolKind && d.Name == member.Name)) {
+					if (allBaseTypes.Contains(cmet.DeclaringType))
+						continue;
+					if (ImplementInterfaceAction.CompareMembers(member, cmet)) {
+						alreadyImplemented = true;
+						break;
+					}
+				}
+				if (!alreadyImplemented) 
+					toImplement.Add(member);
+			}
+			return toImplement;
+		}
+
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ImplementInterfaceAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ImplementInterfaceAction.cs
new file mode 100644
index 0000000000..9b9135273c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ImplementInterfaceAction.cs
@@ -0,0 +1,204 @@
+// 
+// ImplementInterfaceAction.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Threading;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Implement interface", Description = "Creates an interface implementation.")]
+	public class ImplementInterfaceAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var service = (CodeGenerationService)context.GetService(typeof(CodeGenerationService)); 
+			if (service == null)
+				yield break;
+
+			var type = context.GetNode<AstType>();
+			if (type == null || type.Role != Roles.BaseType)
+				yield break;
+			
+			var state = context.GetResolverStateBefore(type);
+			if (state.CurrentTypeDefinition == null)
+				yield break;
+
+			var resolveResult = context.Resolve(type);
+			if (resolveResult.Type.Kind != TypeKind.Interface)
+				yield break;
+			
+			bool interfaceMissing;
+			var toImplement = CollectMembersToImplement(state.CurrentTypeDefinition, resolveResult.Type, false, out interfaceMissing);
+			if (toImplement.Count == 0)
+				yield break;
+			
+			yield return new CodeAction(context.TranslateString("Implement interface"), script =>
+				script.InsertWithCursor(
+					context.TranslateString("Implement Interface"),
+					state.CurrentTypeDefinition,
+					(s, c) => GenerateImplementation(c, toImplement, interfaceMissing).ToList()
+				)
+			, type);
+		}
+		
+		public static IEnumerable<AstNode> GenerateImplementation(RefactoringContext context, IEnumerable<Tuple<IMember, bool>> toImplement, bool generateRegion)
+		{
+			var service = (CodeGenerationService)context.GetService(typeof(CodeGenerationService)); 
+			if (service == null)
+				yield break;
+			var nodes = new Dictionary<IType, List<AstNode>>();
+			
+			foreach (var member in toImplement) {
+				if (!nodes.ContainsKey(member.Item1.DeclaringType)) 
+					nodes [member.Item1.DeclaringType] = new List<AstNode>();
+				nodes [member.Item1.DeclaringType].Add(service.GenerateMemberImplementation(context, member.Item1, member.Item2));
+			}
+			
+			foreach (var kv in nodes) {
+				if (generateRegion) {
+					if (kv.Key.Kind == TypeKind.Interface) {
+						yield return new PreProcessorDirective(
+							PreProcessorDirectiveType.Region,
+							string.Format("{0} implementation", kv.Key.Name));
+					} else {
+						yield return new PreProcessorDirective(
+							PreProcessorDirectiveType.Region,
+							string.Format("implemented abstract members of {0}", kv.Key.Name));
+					}
+				}
+				foreach (var member in kv.Value)
+					yield return member;
+				if (generateRegion) {
+					yield return new PreProcessorDirective(
+						PreProcessorDirectiveType.Endregion
+					);
+				}
+			}
+		}
+
+		static bool IsImplementation(IMember m, IMember method)
+		{
+			return m.UnresolvedMember == method.UnresolvedMember;
+		}
+
+		public static List<Tuple<IMember, bool>> CollectMembersToImplement(ITypeDefinition implementingType, IType interfaceType, bool explicitly, out bool interfaceMissing)
+		{
+			//var def = interfaceType.GetDefinition();
+			List<Tuple<IMember, bool>> toImplement = new List<Tuple<IMember, bool>>();
+			bool alreadyImplemented;
+			interfaceMissing = true;
+			// Stub out non-implemented events defined by @iface
+			foreach (var evGroup in interfaceType.GetEvents (e => !e.IsSynthetic).GroupBy (m => m.DeclaringType).Reverse ())
+				foreach (var ev in evGroup) {
+					if (ev.DeclaringType.Kind != TypeKind.Interface)
+						continue;
+
+					bool needsExplicitly = explicitly;
+					alreadyImplemented = implementingType.GetMembers().Any(m => m.ImplementedInterfaceMembers.Any(im => IsImplementation (im, ev)));
+				
+					if (!alreadyImplemented) {
+						toImplement.Add(new Tuple<IMember, bool>(ev, needsExplicitly));
+					} else {
+						interfaceMissing = false;
+					}
+				}
+			
+			// Stub out non-implemented methods defined by @iface
+			foreach (var methodGroup in interfaceType.GetMethods (d => !d.IsSynthetic).GroupBy (m => m.DeclaringType).Reverse ())
+				foreach (var method in methodGroup) {
+					if (method.DeclaringType.Kind != TypeKind.Interface)
+						continue;
+					bool needsExplicitly = explicitly;
+					alreadyImplemented = false;
+
+					foreach (var cmet in implementingType.GetMethods ()) {
+						alreadyImplemented |= cmet.ImplementedInterfaceMembers.Any(m => IsImplementation (m, method));
+
+						if (CompareMembers(method, cmet)) {
+							if (!needsExplicitly && !cmet.ReturnType.Equals(method.ReturnType))
+								needsExplicitly = true;
+							else
+								alreadyImplemented |= !needsExplicitly /*|| cmet.InterfaceImplementations.Any (impl => impl.InterfaceType.Equals (interfaceType))*/;
+						}
+					}
+					if (toImplement.Where(t => t.Item1 is IMethod).Any(t => CompareMembers(method, (IMethod)t.Item1)))
+						needsExplicitly = true;
+					if (!alreadyImplemented) {
+						toImplement.Add(new Tuple<IMember, bool>(method, needsExplicitly));
+					} else {
+						interfaceMissing = false;
+					}
+				}
+			
+			// Stub out non-implemented properties defined by @iface
+			foreach (var propGroup in interfaceType.GetProperties (p => !p.IsSynthetic).GroupBy (m => m.DeclaringType).Reverse ())
+				foreach (var prop in propGroup) {
+					if (prop.DeclaringType.Kind != TypeKind.Interface)
+						continue;
+
+					bool needsExplicitly = explicitly;
+					alreadyImplemented = implementingType.GetMembers().Any(m => m.ImplementedInterfaceMembers.Any(im => IsImplementation (im, prop)));
+
+					foreach (var t in implementingType.GetAllBaseTypeDefinitions ()) {
+						if (t.Kind == TypeKind.Interface) {
+							foreach (var cprop in t.Properties) {
+								if (cprop.Name == prop.Name && cprop.IsShadowing) {
+									if (!needsExplicitly && !cprop.ReturnType.Equals(prop.ReturnType))
+										needsExplicitly = true;
+								}
+							}
+							continue;
+						}
+						foreach (var cprop in t.Properties) {
+							if (cprop.Name == prop.Name) {
+								if (!needsExplicitly && !cprop.ReturnType.Equals(prop.ReturnType))
+									needsExplicitly = true;
+								else
+									alreadyImplemented |= !needsExplicitly/* || cprop.InterfaceImplementations.Any (impl => impl.InterfaceType.Resolve (ctx).Equals (interfaceType))*/;
+							}
+						}
+					}
+					if (!alreadyImplemented) {
+						toImplement.Add(new Tuple<IMember, bool>(prop, needsExplicitly));
+					} else {
+						interfaceMissing = false;
+					}
+				}
+			return toImplement;
+		}
+		
+		internal static bool CompareMembers(IMember interfaceMethod, IMember typeMethod)
+		{
+			if (typeMethod.IsExplicitInterfaceImplementation)
+				return typeMethod.ImplementedInterfaceMembers.Any(m => m.Equals(interfaceMethod));
+			return SignatureComparer.Ordinal.Equals(interfaceMethod, typeMethod);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ImplementInterfaceExplicitAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ImplementInterfaceExplicitAction.cs
new file mode 100644
index 0000000000..60db42e6c9
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ImplementInterfaceExplicitAction.cs
@@ -0,0 +1,74 @@
+// 
+// ImplementInterfaceExplicitAction.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Threading;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Implement interface explicit", Description = "Creates an interface implementation.")]
+	public class ImplementInterfaceExplicitAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var service = (CodeGenerationService)context.GetService(typeof(CodeGenerationService)); 
+			if (service == null)
+				yield break;
+
+			var type = context.GetNode<AstType>();
+			if (type == null || type.Role != Roles.BaseType)
+				yield break;
+			var state = context.GetResolverStateBefore(type);
+			if (state.CurrentTypeDefinition == null)
+				yield break;
+
+			var resolveResult = context.Resolve(type);
+			if (resolveResult.Type.Kind != TypeKind.Interface)
+				yield break;
+
+			bool interfaceMissing;
+			var toImplement = ImplementInterfaceAction.CollectMembersToImplement(
+				state.CurrentTypeDefinition,
+				resolveResult.Type,
+				false,
+				out interfaceMissing
+			);
+			if (toImplement.Count == 0)
+				yield break;
+
+			yield return new CodeAction(context.TranslateString("Implement interface explicit"), script =>
+				script.InsertWithCursor(
+					context.TranslateString("Implement Interface"),
+					state.CurrentTypeDefinition,
+					(s, c) => ImplementInterfaceAction.GenerateImplementation (c, toImplement.Select (t => Tuple.Create (t.Item1, true)), interfaceMissing).ToList()
+				)
+			, type);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ImplementNotImplementedProperty.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ImplementNotImplementedProperty.cs
new file mode 100644
index 0000000000..294549d4d5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ImplementNotImplementedProperty.cs
@@ -0,0 +1,103 @@
+//
+// ImplementNotImplementedProperty.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Create a backing field for a not implemented property", Description = "Creates a backing field for a not implemented property.")]
+	public class ImplementNotImplementedProperty : CodeActionProvider
+	{
+		bool IsNotImplemented(RefactoringContext context, BlockStatement body)
+		{
+			if (body.IsNull)
+				return true;
+			if (body.Statements.Count == 1) {
+				var throwStmt = body.Statements.First () as ThrowStatement;
+				if (throwStmt != null) {
+					return context.Resolve (throwStmt.Expression).Type.FullName == "System.NotImplementedException";
+				}
+			}
+			return false;
+		}
+
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var property = context.GetNode<PropertyDeclaration> ();
+			if (property == null || !property.NameToken.Contains(context.Location))
+				yield break;
+
+			if (!IsNotImplemented (context, property.Getter.Body) ||
+			    !IsNotImplemented (context, property.Setter.Body)) {
+				yield break;
+			}
+			
+			yield return new CodeAction(context.TranslateString("Implement property"), script => {
+				string backingStoreName = context.GetNameProposal (property.Name);
+				
+				// create field
+				var backingStore = new FieldDeclaration ();
+				if (property.Modifiers.HasFlag (Modifiers.Static))
+					backingStore.Modifiers |= Modifiers.Static;
+
+				if (property.Setter.IsNull)
+					backingStore.Modifiers |= Modifiers.Readonly;
+				
+				backingStore.ReturnType = property.ReturnType.Clone ();
+				
+				var initializer = new VariableInitializer (backingStoreName);
+				backingStore.Variables.Add (initializer);
+				
+				// create new property & implement the get/set bodies
+				var newProperty = (PropertyDeclaration)property.Clone ();
+				Expression id1;
+				if (backingStoreName == "value")
+					id1 = new ThisReferenceExpression().Member("value");
+				else
+					id1 = new IdentifierExpression (backingStoreName);
+				Expression id2 = id1.Clone();
+				newProperty.Getter.Body = new BlockStatement () {
+					new ReturnStatement (id1)
+				};
+				if (!property.Setter.IsNull) {
+					newProperty.Setter.Body = new BlockStatement () {
+						new AssignmentExpression (id2, AssignmentOperatorType.Assign, new IdentifierExpression ("value"))
+					};
+				}
+				
+				script.Replace (property, newProperty);
+				script.InsertBefore (property, backingStore);
+				if (!property.Setter.IsNull)
+					script.Link (initializer, id1, id2);
+				else
+					script.Link (initializer, id1);
+			}, property.NameToken);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InlineLocalVariableAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InlineLocalVariableAction.cs
new file mode 100644
index 0000000000..87059906ef
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InlineLocalVariableAction.cs
@@ -0,0 +1,104 @@
+// 
+// InlineLocalVariableAction.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Threading;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Inline local variable", Description = "Inlines a local variable.")]
+	public class InlineLocalVariableAction : CodeActionProvider
+	{
+		static FindReferences refFinder = new FindReferences();
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			if (context.IsSomethingSelected) {
+				yield break;
+			}
+			var node = context.GetNode<VariableDeclarationStatement>();
+			if (node == null || node.Variables.Count != 1) {
+				yield break;
+			}
+			var initializer = node.Variables.First();
+			if (!initializer.NameToken.Contains(context.Location) || initializer.Initializer.IsNull) {
+				yield break;
+			}
+			var resolveResult = context.Resolve(initializer) as LocalResolveResult;
+			if (resolveResult == null || resolveResult.IsError) {
+				yield break;
+			}
+			var unit = context.RootNode as SyntaxTree;
+			if (unit == null) {
+				yield break;
+			}
+			yield return new CodeAction(context.TranslateString("Inline local variable"), script => {
+				refFinder.FindLocalReferences(resolveResult.Variable, context.UnresolvedFile, unit, context.Compilation, (n, r) => script.Replace(n, AddParensIfRequired (n, initializer.Initializer.Clone())), default(CancellationToken));
+				script.Remove(node);
+			}, initializer);
+		}
+
+		public static bool RequiresParens(AstNode replaceNode, AstNode replaceWithNode)
+		{
+			if (!(replaceWithNode is BinaryOperatorExpression) &&
+			    !(replaceWithNode is AssignmentExpression) &&
+			    !(replaceWithNode is AsExpression) &&
+			    !(replaceWithNode is IsExpression) &&
+			    !(replaceWithNode is CastExpression) &&
+			    !(replaceWithNode is LambdaExpression) &&
+				!(replaceWithNode is ConditionalExpression)) {
+				return false;
+			}
+
+			var cond = replaceNode.Parent as ConditionalExpression;
+			if (cond != null && cond.Condition == replaceNode)
+				return true;
+
+			var indexer = replaceNode.Parent as IndexerExpression;
+			if (indexer != null && indexer.Target == replaceNode)
+				return true;
+
+			return replaceNode.Parent is BinaryOperatorExpression || 
+				replaceNode.Parent is UnaryOperatorExpression || 
+				replaceNode.Parent is AssignmentExpression || 
+				replaceNode.Parent is MemberReferenceExpression ||
+				replaceNode.Parent is AsExpression || 
+				replaceNode.Parent is IsExpression || 
+				replaceNode.Parent is CastExpression ||
+				replaceNode.Parent is LambdaExpression ||
+				replaceNode.Parent is PointerReferenceExpression;
+		}
+
+		static Expression AddParensIfRequired(AstNode replaceNode, Expression expression)
+		{
+			if (RequiresParens(replaceNode, expression))
+				return new ParenthesizedExpression(expression);
+			return expression;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InsertAnonymousMethodSignatureAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InsertAnonymousMethodSignatureAction.cs
new file mode 100644
index 0000000000..47e6feb88d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InsertAnonymousMethodSignatureAction.cs
@@ -0,0 +1,94 @@
+// 
+// InsertAnonymousMethodSignature.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Insert anonymous method signature", Description = "Inserts a signature to parameterless anonymous methods.")]
+	public class InsertAnonymousMethodSignatureAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			IType type;
+			var anonymousMethodExpression = GetAnonymousMethodExpression(context, out type);
+			if (anonymousMethodExpression == null) {
+				yield break;
+			}
+			yield return new CodeAction (context.TranslateString("Insert anonymous method signature"), script => {
+				var delegateMethod = type.GetDelegateInvokeMethod();
+				
+				var sb = new StringBuilder ("(");
+				for (int k = 0; k < delegateMethod.Parameters.Count; k++) {
+					if (k > 0) {
+						sb.Append(", ");
+					}
+					
+					var paramType = delegateMethod.Parameters [k].Type;
+					
+					sb.Append(context.CreateShortType(paramType));
+					sb.Append(" ");
+					sb.Append(delegateMethod.Parameters [k].Name);
+				}
+				sb.Append(")");
+				
+				script.InsertText(context.GetOffset(anonymousMethodExpression.DelegateToken.EndLocation), sb.ToString());
+			}, anonymousMethodExpression);
+		}
+		
+		static AnonymousMethodExpression GetAnonymousMethodExpression (RefactoringContext context, out IType delegateType)
+		{
+			delegateType = null;
+			
+			var anonymousMethodExpression = context.GetNode<AnonymousMethodExpression> ();
+			if (anonymousMethodExpression == null || !anonymousMethodExpression.DelegateToken.Contains (context.Location) || anonymousMethodExpression.HasParameterList)
+				return null;
+			
+			IType resolvedType = null;
+			var parent = anonymousMethodExpression.Parent;
+			
+			if (parent is AssignmentExpression) {
+				resolvedType = context.Resolve (((AssignmentExpression)parent).Left).Type;
+			} else if (parent is VariableInitializer) {
+				resolvedType = context.Resolve (((VariableDeclarationStatement)parent.Parent).Type).Type;
+			} else if (parent is InvocationExpression) {
+				// TODO: handle invocations
+			}
+			if (resolvedType == null)
+				return null;
+			delegateType = resolvedType;
+			if (delegateType.Kind != TypeKind.Delegate) 
+				return null;
+			
+			return anonymousMethodExpression;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/IntroduceConstantAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/IntroduceConstantAction.cs
new file mode 100644
index 0000000000..bf0cc06c23
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/IntroduceConstantAction.cs
@@ -0,0 +1,153 @@
+// 
+// IntroduceConstantAction.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Introduce constant", Description = "Creates a constant for a non constant primitive expression.")]
+	public class IntroduceConstantAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var pexpr = context.GetNode<PrimitiveExpression>();
+			if (pexpr == null)
+				yield break;
+
+			var visitor = new DeclareLocalVariableAction.SearchNodeVisitior(pexpr);
+
+			if (pexpr.Parent is VariableInitializer) {
+				var varDec = pexpr.Parent.Parent as VariableDeclarationStatement;
+				if (varDec != null && (varDec.Modifiers & Modifiers.Const) != 0)
+					yield break;
+				var fieldDecl = pexpr.Parent.Parent as FieldDeclaration;
+				if (fieldDecl != null && (fieldDecl.Modifiers & Modifiers.Const) != 0)
+					yield break;
+			}
+
+			var node = context.GetNode <BlockStatement>();
+			if (node != null)
+				node.AcceptVisitor(visitor);
+
+			var resolveResult = context.Resolve(pexpr);
+			var statement = context.GetNode<Statement>();
+			if (statement != null) {
+				yield return new CodeAction(context.TranslateString("Create local constant"), script => {
+					string name = CreateMethodDeclarationAction.CreateBaseName(pexpr, resolveResult.Type);
+					var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
+					if (service != null)
+						name = service.CheckName(context, name, AffectedEntity.LocalConstant);
+					
+					var initializer = new VariableInitializer(name, pexpr.Clone());
+					var decl = new VariableDeclarationStatement() {
+						Type = context.CreateShortType(resolveResult.Type),
+						Modifiers = Modifiers.Const,
+						Variables = { initializer }
+					};
+					
+					script.InsertBefore(statement, decl);
+					var variableUsage = new IdentifierExpression(name);
+					script.Replace(pexpr, variableUsage);
+					script.Link(initializer.NameToken, variableUsage);
+				}, pexpr);
+			}
+			
+			yield return new CodeAction(context.TranslateString("Create constant field"), script => {
+				string name = CreateMethodDeclarationAction.CreateBaseName(pexpr, resolveResult.Type);
+				var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
+				if (service != null)
+					name = service.CheckName(context, name, AffectedEntity.ConstantField);
+				
+				var initializer = new VariableInitializer(name, pexpr.Clone());
+				
+				var decl = new FieldDeclaration() {
+					ReturnType = context.CreateShortType(resolveResult.Type),
+					Modifiers = Modifiers.Const,
+					Variables = { initializer }
+				};
+				
+				var variableUsage = new IdentifierExpression(name);
+				script.Replace(pexpr, variableUsage);
+				//				script.Link(initializer.NameToken, variableUsage);
+				script.InsertWithCursor(context.TranslateString("Create constant"), Script.InsertPosition.Before, decl);
+			}, pexpr);
+
+			if (visitor.Matches.Count > 1) {
+				yield return new CodeAction(string.Format(context.TranslateString("Create local constant (replace '{0}' occurrences)"), visitor.Matches.Count), script => {
+					string name = CreateMethodDeclarationAction.CreateBaseName(pexpr, resolveResult.Type);
+					var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
+					if (service != null)
+						name = service.CheckName(context, name, AffectedEntity.LocalConstant);
+					
+					var initializer = new VariableInitializer(name, pexpr.Clone());
+					var decl = new VariableDeclarationStatement() {
+						Type = context.CreateShortType(resolveResult.Type),
+						Modifiers = Modifiers.Const,
+						Variables = { initializer }
+					};
+					
+					script.InsertBefore(statement, decl);
+
+					var linkedNodes = new List<AstNode>();
+					linkedNodes.Add(initializer.NameToken);
+					for (int i = 0; i < visitor.Matches.Count; i++) {
+						var identifierExpression = new IdentifierExpression(name);
+						linkedNodes.Add(identifierExpression);
+						script.Replace(visitor.Matches [i], identifierExpression);
+					}
+					script.Link(linkedNodes.ToArray ());
+				}, pexpr);
+				
+				yield return new CodeAction(string.Format(context.TranslateString("Create constant field (replace '{0}' occurrences)"), visitor.Matches.Count), script => {
+					string name = CreateMethodDeclarationAction.CreateBaseName(pexpr, resolveResult.Type);
+					var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
+					if (service != null)
+						name = service.CheckName(context, name, AffectedEntity.ConstantField);
+					
+					var initializer = new VariableInitializer(name, pexpr.Clone());
+					
+					var decl = new FieldDeclaration() {
+						ReturnType = context.CreateShortType(resolveResult.Type),
+						Modifiers = Modifiers.Const,
+						Variables = { initializer }
+					};
+					
+					var linkedNodes = new List<AstNode>();
+					linkedNodes.Add(initializer.NameToken);
+					for (int i = 0; i < visitor.Matches.Count; i++) {
+						var identifierExpression = new IdentifierExpression(name);
+						linkedNodes.Add(identifierExpression);
+						script.Replace(visitor.Matches [i], identifierExpression);
+					}
+					script.InsertWithCursor(context.TranslateString("Create constant"), Script.InsertPosition.Before, decl);
+				}, pexpr);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/IntroduceFormatItemAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/IntroduceFormatItemAction.cs
new file mode 100644
index 0000000000..c526965797
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/IntroduceFormatItemAction.cs
@@ -0,0 +1,105 @@
+// 
+// IntroduceFormatItem.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Introduce format item. Works on strings that contain selections.
+	/// "this is <some> string" => string.Format ("this is {0} string", <some>)
+	/// </summary>
+	[ContextAction("Introduce format item", Description = "Creates a string.format call with the selection as parameter.")]
+	public class IntroduceFormatItemAction : CodeActionProvider
+	{
+		readonly static MemberReferenceExpression PrototypeFormatReference = new MemberReferenceExpression (new PrimitiveType ("string"), "Format");
+		
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			if (!context.IsSomethingSelected) {
+				yield break;
+			}
+			var pexpr = context.GetNode<PrimitiveExpression>();
+			if (pexpr == null || !(pexpr.Value is string)) {
+				yield break;
+			}
+			if (pexpr.LiteralValue.StartsWith("@", StringComparison.Ordinal)) {
+				if (!(pexpr.StartLocation < new TextLocation(context.Location.Line, context.Location.Column - 1) && new TextLocation(context.Location.Line, context.Location.Column + 1) < pexpr.EndLocation)) {
+					yield break;
+				}
+			} else {
+				if (!(pexpr.StartLocation < context.Location && context.Location < pexpr.EndLocation)) {
+					yield break;
+				}
+			}
+
+			yield return new CodeAction (context.TranslateString("Introduce format item"), script => {
+				var invocation = context.GetNode<InvocationExpression>();
+				if (invocation != null && invocation.Target.IsMatch(PrototypeFormatReference)) {
+					AddFormatCallToInvocation(context, script, pexpr, invocation);
+					return;
+				}
+			
+				var arg = CreateFormatArgument(context);
+				var newInvocation = new InvocationExpression (PrototypeFormatReference.Clone()) {
+					Arguments = { CreateFormatString(context, pexpr, 0), arg }
+				};
+			
+				script.Replace(pexpr, newInvocation);
+				script.Select(arg);
+			}, pexpr);
+
+		}
+		
+		void AddFormatCallToInvocation (RefactoringContext context, Script script, PrimitiveExpression pExpr, InvocationExpression invocation)
+		{
+			var newInvocation = (InvocationExpression)invocation.Clone ();
+			
+			newInvocation.Arguments.First ().ReplaceWith (CreateFormatString (context, pExpr, newInvocation.Arguments.Count () - 1));
+			newInvocation.Arguments.Add (CreateFormatArgument (context));
+			
+			script.Replace (invocation, newInvocation);
+		}
+		
+		static PrimitiveExpression CreateFormatArgument (RefactoringContext context)
+		{
+			return new PrimitiveExpression (context.SelectedText);
+		}
+		
+		static PrimitiveExpression CreateFormatString(RefactoringContext context, PrimitiveExpression pExpr, int argumentNumber)
+		{
+			var start = context.GetOffset(pExpr.StartLocation);
+			var end = context.GetOffset(pExpr.EndLocation);
+			var sStart = context.GetOffset(context.SelectionStart);
+			var sEnd = context.GetOffset(context.SelectionEnd);
+			return new PrimitiveExpression("", context.GetText(start, sStart - start) + "{" + argumentNumber + "}" + context.GetText(sEnd, end - sEnd));
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InvertConditionalOperatorAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InvertConditionalOperatorAction.cs
new file mode 100644
index 0000000000..66299b1c43
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InvertConditionalOperatorAction.cs
@@ -0,0 +1,53 @@
+//
+// InvertConditionalOperatorAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Invert conditional operator", Description = "Inverts an '?:' expression.")]
+	public class InvertConditionalOperatorAction : SpecializedCodeAction<ConditionalExpression>
+	{
+		protected override CodeAction GetAction(RefactoringContext context, ConditionalExpression conditionalExpr)
+		{
+			if (context.Location != conditionalExpr.Condition.StartLocation && context.Location < conditionalExpr.Condition.EndLocation ||
+			    context.Location != conditionalExpr.TrueExpression.StartLocation && conditionalExpr.TrueExpression.Contains(context.Location) ||
+			    context.Location != conditionalExpr.FalseExpression.StartLocation && conditionalExpr.FalseExpression.Contains(context.Location))
+				return null;
+
+			var node = conditionalExpr.GetNodeAt(context.Location);
+			if (node == null)
+				return null;
+
+			return new CodeAction (context.TranslateString("Invert '?:'"), script => {
+				script.Replace(conditionalExpr.Condition, CSharpUtil.InvertCondition(conditionalExpr.Condition.Clone()));
+				script.Replace(conditionalExpr.TrueExpression, conditionalExpr.FalseExpression.Clone());
+				script.Replace(conditionalExpr.FalseExpression, conditionalExpr.TrueExpression.Clone());
+				script.FormatText(conditionalExpr);
+			}, node);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InvertIfAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InvertIfAction.cs
new file mode 100644
index 0000000000..142c2d4459
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InvertIfAction.cs
@@ -0,0 +1,62 @@
+// 
+// InvertIf.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Invert if", Description = "Inverts an 'if ... else' expression.")]
+	public class InvertIfAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			// TODO: Invert if without else
+			// ex. if (cond) DoSomething () == if (!cond) return; DoSomething ()
+			// beware of loop contexts return should be continue then.
+			
+			var ifStatement = GetIfElseStatement(context);
+			if (!(ifStatement != null && !ifStatement.TrueStatement.IsNull && !ifStatement.FalseStatement.IsNull)) {
+				yield break;
+
+			}
+			yield return new CodeAction (context.TranslateString("Invert if"), script => {
+				script.Replace(ifStatement.Condition, CSharpUtil.InvertCondition(ifStatement.Condition.Clone()));
+				script.Replace(ifStatement.TrueStatement, ifStatement.FalseStatement.Clone());
+				script.Replace(ifStatement.FalseStatement, ifStatement.TrueStatement.Clone());
+				script.FormatText(ifStatement);
+			}, ifStatement);
+		}
+		
+		static IfElseStatement GetIfElseStatement (RefactoringContext context)
+		{
+			var result = context.GetNode<IfElseStatement> ();
+			if (result != null && result.IfToken.Contains (context.Location))
+				return result;
+			return null;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InvertIfAndSimplify.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InvertIfAndSimplify.cs
new file mode 100644
index 0000000000..ac1b7aab0d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InvertIfAndSimplify.cs
@@ -0,0 +1,91 @@
+//
+// InvertIfAndSimplify.cs
+//
+// Author:
+//      Ciprian Khlud <ciprian.mustiata@yahoo.com>
+//
+// Copyright (c) 2013 Ciprian Khlud <ciprian.mustiata@yahoo.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Invert If and Simplify", Description = "Inverts if and simplify branching")]
+	public class InvertIfAndSimplify : CodeActionProvider
+	{
+		readonly InsertParenthesesVisitor _insertParenthesesVisitor = new InsertParenthesesVisitor();
+
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			// if (condition) {CodeBlock();}else { return|break|continue;} 
+			// will be reduced to:
+			//if (!condition) return|break|continue;
+			//CodeBlock();
+
+			var ifStatement = GetIfElseStatement(context);
+			if (ifStatement == null)
+				yield break;
+			yield return new CodeAction(context.TranslateString("Simplify if in loops"), script => GenerateNewScript(
+				script, ifStatement), ifStatement);
+		}
+
+		static Statement GenerateNewTrueStatement(Statement falseStatement)
+		{
+			var blockStatement = falseStatement as BlockStatement;
+			if (blockStatement != null) {
+				if (blockStatement.Children.Count(n => n.Role != Roles.NewLine && n.Role != Roles.LBrace && n.Role != Roles.RBrace) == 1)
+					return blockStatement.Statements.First().Clone ();
+			}
+			return falseStatement.Clone();
+		}
+
+		void GenerateNewScript(Script script, IfElseStatement ifStatement)
+		{
+			var mergedIfStatement = new IfElseStatement
+			{
+				Condition = CSharpUtil.InvertCondition(ifStatement.Condition)
+			};
+			var falseStatement = ifStatement.FalseStatement;
+			mergedIfStatement.TrueStatement = GenerateNewTrueStatement(falseStatement);
+			mergedIfStatement.Condition.AcceptVisitor(_insertParenthesesVisitor);
+
+			script.Replace(ifStatement, mergedIfStatement);
+
+			SimplifyIfFlowAction.InsertBody(script, ifStatement);
+		}
+
+		static IfElseStatement GetIfElseStatement(RefactoringContext context)
+		{
+			var result = context.GetNode<IfElseStatement>();
+			if (result == null || !result.IfToken.Contains(context.Location))
+				return null;
+			var falseStatement = result.FalseStatement;
+			var isQuitingStatement = falseStatement;
+			var blockStatement = falseStatement as BlockStatement;
+			if (blockStatement != null)
+				isQuitingStatement = blockStatement.Statements.FirstOrDefault();
+			if (isQuitingStatement is ReturnStatement || isQuitingStatement is ContinueStatement || isQuitingStatement is BreakStatement)
+				return result;
+			return null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InvertLogicalExpressionAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InvertLogicalExpressionAction.cs
new file mode 100644
index 0000000000..702f169e4d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/InvertLogicalExpressionAction.cs
@@ -0,0 +1,73 @@
+// 
+// InvertLogicalExpressionAction.cs
+// 
+// Author:
+//      Ji Kun<jikun.nus@gmail.com>
+// 
+// Copyright (c) 2012 Ji Kun<jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Invert logical expression", Description = "Inverts a logical expression")]
+	public class InvertLogicalExpressionAction : CodeActionProvider
+	{
+		public override System.Collections.Generic.IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			Expression expr = null;
+			AstNode token;
+			if (!NegateRelationalExpressionAction.GetLogicalExpression (context, out expr, out token))
+				yield break;
+
+			var uOp = expr as UnaryOperatorExpression;
+			if (uOp != null) {
+				yield return new CodeAction(
+					string.Format(context.TranslateString("Invert '{0}'"), expr),
+					script => {
+						script.Replace(uOp, CSharpUtil.InvertCondition(CSharpUtil.GetInnerMostExpression(uOp.Expression)));
+					}, token
+				);	
+				yield break;
+			}
+
+			var negativeExpression = CSharpUtil.InvertCondition(expr);
+			if (expr.Parent is ParenthesizedExpression && expr.Parent.Parent is UnaryOperatorExpression) {
+				var unaryOperatorExpression = expr.Parent.Parent as UnaryOperatorExpression;
+				if (unaryOperatorExpression.Operator == UnaryOperatorType.Not) {
+					yield return new CodeAction(
+						string.Format(context.TranslateString("Invert '{0}'"), unaryOperatorExpression),
+						script => {
+							script.Replace(unaryOperatorExpression, negativeExpression);
+						}, token
+					);	
+					yield break;
+				}
+			}
+			var newExpression = new UnaryOperatorExpression(UnaryOperatorType.Not, new ParenthesizedExpression(negativeExpression));
+			yield return new CodeAction(
+				string.Format(context.TranslateString("Invert '{0}'"), expr),
+				script => {
+					script.Replace(expr, newExpression);
+				}, token
+			);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/IterateViaForeachAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/IterateViaForeachAction.cs
new file mode 100644
index 0000000000..098cc9e96c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/IterateViaForeachAction.cs
@@ -0,0 +1,168 @@
+//
+// IterateViaForeachTests.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Iterate via foreach", Description = "Iterates an IEnumerable with a foreach loop.")]
+	public class IterateViaForeachAction : CodeActionProvider
+	{
+		#region ICodeActionProvider implementation
+
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			CodeAction action;
+			action = ActionFromUsingStatement(context);
+			if (action != null)
+				yield return action;
+			action = ActionFromVariableInitializer(context);
+			if (action != null)
+				yield return action;
+			action = ActionFromExpressionStatement(context);
+			if (action != null)
+				yield return action;
+		}
+
+		CodeAction ActionFromUsingStatement(RefactoringContext context)
+		{
+			var initializer = context.GetNode<VariableInitializer>();
+			if (initializer == null || !initializer.NameToken.Contains(context.Location))
+				return null;
+			var initializerRR = context.Resolve(initializer) as LocalResolveResult;
+			if (initializerRR == null)
+				return null;
+			var elementType = GetElementType(initializerRR, context);
+			if (elementType == null)
+				return null;
+			var usingStatement = initializer.Parent.Parent as UsingStatement;
+			if (usingStatement == null)
+				return null;
+			return new CodeAction(context.TranslateString("Iterate via foreach"), script => {
+				var iterator = MakeForeach(new IdentifierExpression(initializer.Name), elementType, context);
+				if (usingStatement.EmbeddedStatement is EmptyStatement) {
+					var blockStatement = new BlockStatement();
+					blockStatement.Statements.Add(iterator);
+					script.Replace(usingStatement.EmbeddedStatement, blockStatement);
+					script.FormatText((AstNode)blockStatement);
+				} else if (usingStatement.EmbeddedStatement is BlockStatement) {
+					var anchorNode = usingStatement.EmbeddedStatement.FirstChild;
+					script.InsertAfter(anchorNode, iterator);
+					script.FormatText(usingStatement.EmbeddedStatement);
+				}
+			}, initializer);
+		}
+
+		CodeAction ActionFromVariableInitializer(RefactoringContext context)
+		{
+			var initializer = context.GetNode<VariableInitializer>();
+			if (initializer == null || initializer.Parent.Parent is ForStatement || !initializer.NameToken.Contains(context.Location))
+				return null;
+			var initializerRR = context.Resolve(initializer) as LocalResolveResult;
+			if (initializerRR == null)
+				return null;
+			var elementType = GetElementType(initializerRR, context);
+			if (elementType == null)
+				return null;
+
+			return new CodeAction(context.TranslateString("Iterate via foreach"), script => {
+				var iterator = MakeForeach(new IdentifierExpression(initializer.Name), elementType, context);
+				script.InsertAfter(context.GetNode<Statement>(), iterator);
+			}, initializer);
+		}
+
+		CodeAction ActionFromExpressionStatement(RefactoringContext context)
+		{
+			var expressionStatement = context.GetNode<ExpressionStatement>();
+			if (expressionStatement == null)
+				return null;
+			var expression = expressionStatement.Expression;
+			var assignment = expression as AssignmentExpression;
+			if (assignment != null)
+				expression = assignment.Left;
+			if (!expression.Contains(context.Location))
+				return null;
+			var expressionRR = context.Resolve(expression);
+			if (expressionRR == null)
+				return null;
+			var elementType = GetElementType(expressionRR, context);
+			if (elementType == null)
+				return null;
+			return new CodeAction(context.TranslateString("Iterate via foreach"), script => {
+				var iterator = MakeForeach(expression, elementType, context);
+				if (expression == expressionStatement.Expression)
+					script.Replace(expressionStatement, iterator);
+				else
+					script.InsertAfter(expressionStatement, iterator);
+			}, expression);
+		}
+
+		static ForeachStatement MakeForeach(Expression node, IType type, RefactoringContext context)
+		{
+			var namingHelper = new NamingHelper(context);
+			return new ForeachStatement {
+				VariableType = new SimpleType("var"),
+				VariableName = namingHelper.GenerateVariableName(type),
+				InExpression = node.Clone(),
+				EmbeddedStatement = new BlockStatement()
+			};
+		}
+
+		static IType GetElementType(ResolveResult rr, BaseRefactoringContext context)
+		{
+			if (rr.IsError || rr.Type.Kind == TypeKind.Unknown)
+				return null;
+			var type = GetCollectionType(rr.Type);
+			if (type == null)
+				return null;
+
+			var parameterizedType = type as ParameterizedType;
+			if (parameterizedType != null)
+				return parameterizedType.TypeArguments.First();
+			return context.Compilation.FindType(KnownTypeCode.Object);
+		}
+
+		static IType GetCollectionType(IType type)
+		{
+			IType collectionType = null;
+			foreach (var baseType in type.GetAllBaseTypes()) {
+				if (baseType.IsKnownType(KnownTypeCode.IEnumerableOfT)) {
+					collectionType = baseType;
+					break;
+				} else if (baseType.IsKnownType(KnownTypeCode.IEnumerable)) {
+					collectionType = baseType;
+					// Don't break, continue in case type implements IEnumerable<T>
+				}
+			}
+			return collectionType;
+		}
+
+		#endregion
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/JoinDeclarationAndAssignmentAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/JoinDeclarationAndAssignmentAction.cs
similarity index 100%
rename from src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/JoinDeclarationAndAssignmentAction.cs
rename to src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/JoinDeclarationAndAssignmentAction.cs
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/JoinStringAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/JoinStringAction.cs
similarity index 100%
rename from src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/JoinStringAction.cs
rename to src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/JoinStringAction.cs
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/LinqFluentToQueryAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/LinqFluentToQueryAction.cs
new file mode 100644
index 0000000000..536bf4ce80
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/LinqFluentToQueryAction.cs
@@ -0,0 +1,132 @@
+// 
+// LinqFluentToQueryAction.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction ("Convert LINQ query to fluent syntax", Description = "Convert LINQ query to fluent syntax")]
+	public class LinqFluentToQueryAction : SpecializedCodeAction<InvocationExpression>
+	{
+		static readonly List<string> LinqQueryMethods = new List<string>() {
+			"Select", "SelectMany", "GroupBy",
+			"OrderBy", "OrderByDescending", "ThenBy", "ThenByDescending",
+			"Where", "Cast",
+			"Join", "GroupJoin"
+		};
+
+		protected override CodeAction GetAction(RefactoringContext context, InvocationExpression node)
+		{
+			if (!IsLinqMethodInvocation(node)) {
+				return null;
+			}
+
+			while (node.Parent is MemberReferenceExpression) {
+				var parentInvocation = ((MemberReferenceExpression)node.Parent).Parent;
+				if (!IsLinqMethodInvocation(parentInvocation)) {
+					break;
+				}
+				node = (InvocationExpression) parentInvocation;
+			}
+
+			IntroduceQueryExpressions queryExpressionIntroducer = new IntroduceQueryExpressions();
+			CombineQueryExpressions queryExpressionCombiner = new CombineQueryExpressions();
+			Expression newNode = queryExpressionIntroducer.ConvertFluentToQuery(node);
+
+			queryExpressionCombiner.CombineQuery(newNode);
+
+			if (!(newNode is QueryExpression)) {
+				return null;
+			}
+
+			return new CodeAction(context.TranslateString("Convert to query syntax"), script => {
+				List<string> newNames = new List<string>();
+				var identifiers = newNode.Descendants.OfType<Identifier>().ToList();
+				foreach (var identifier in identifiers.Where(id => id.Name.StartsWith("<>")))
+				{
+					int nameId = int.Parse(identifier.Name.Substring(2)) - 1;
+					while (newNames.Count <= nameId) {
+						//Find new name
+
+						//This might skip some legitimate names, but that's not a real problem.
+						var topMostBlock = node.AncestorsAndSelf.OfType<BlockStatement>().Last();
+						var variableDeclarations = topMostBlock.Descendants.OfType<VariableDeclarationStatement>();
+						var declaredNames = variableDeclarations.SelectMany(variableDeclaration => variableDeclaration.Variables).Select(variable => variable.Name).ToList();
+
+						int currentId = 1;
+						while (identifiers.Any(id => id.Name == "_" + currentId) || declaredNames.Contains("_" + currentId)) {
+							++currentId;
+						}
+
+						newNames.Add("_" + currentId);
+					}
+
+					identifier.Name = newNames[nameId];
+				}
+
+				if (NeedsParenthesis(node)) {
+					newNode = new ParenthesizedExpression(newNode);
+				}
+
+				script.Replace(node, newNode);
+			}, node);
+		}
+
+		bool NeedsParenthesis(AstNode node)
+		{
+			AstNode parent = node.Parent;
+			if (parent is BinaryOperatorExpression)
+				return true;
+
+			UnaryOperatorExpression unaryExpression = parent as UnaryOperatorExpression;
+			if (unaryExpression != null) {
+				return unaryExpression.Operator == UnaryOperatorType.PostIncrement ||
+					unaryExpression.Operator == UnaryOperatorType.PostDecrement;
+			}
+
+			return parent is MemberReferenceExpression ||
+				parent is InvocationExpression;
+		}
+
+		bool IsLinqMethodInvocation(AstNode node)
+		{
+			var invocation = node as InvocationExpression;
+			return invocation != null && IsLinqMethodInvocation(invocation);
+		}
+
+		bool IsLinqMethodInvocation(InvocationExpression node)
+		{
+			var target = node.Target as MemberReferenceExpression;
+			return target != null && IsLinqMethod(target);
+		}
+
+		bool IsLinqMethod(MemberReferenceExpression node)
+		{
+			return LinqQueryMethods.Contains(node.MemberName);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/LinqQueryToFluentAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/LinqQueryToFluentAction.cs
new file mode 100644
index 0000000000..52a5ce1b17
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/LinqQueryToFluentAction.cs
@@ -0,0 +1,119 @@
+// 
+// LinqQueryToFluentAction.cs
+//  
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Convert LINQ query to fluent syntax",
+	               Description = "Converts a LINQ query to the equivalent fluent syntax.")]
+	public class LinqQueryToFluentAction : SpecializedCodeAction<QueryExpression>
+	{
+		protected override CodeAction GetAction(RefactoringContext context, QueryExpression node)
+		{
+			AstNode currentNode = node;
+			for (;;) {
+				QueryContinuationClause continuationParent = currentNode.Parent as QueryContinuationClause;
+				if (continuationParent != null) {
+					currentNode = continuationParent;
+					continue;
+				}
+				QueryExpression exprParent = currentNode.Parent as QueryExpression;
+				if (exprParent != null) {
+					currentNode = exprParent;
+					continue;
+				}
+
+				break;
+			}
+
+			node = (QueryExpression)currentNode;
+
+			return new CodeAction(context.TranslateString("Convert LINQ query to fluent syntax"),
+			                      script => ConvertQueryToFluent(context, script, node),
+			                      node);
+		}
+
+		static void ConvertQueryToFluent(RefactoringContext context, Script script, QueryExpression query) {
+			IEnumerable<string> underscoreIdentifiers = GetNameProposals (context, query, "_");
+			Expression newExpression = GetFluentFromQuery(query, underscoreIdentifiers);
+			script.Replace (query, newExpression);
+		}
+
+		static IEnumerable<string> GetNameProposals(RefactoringContext context, QueryExpression query, string baseName)
+		{
+			var resolver = context.GetResolverStateBefore(query);
+			int current = -1;
+			string nameProposal;
+			for (;;) {
+				do {
+					++current;
+					nameProposal = baseName + (current == 0 ? string.Empty : current.ToString());
+				} while (IsNameUsed (resolver, query, nameProposal));
+
+				yield return nameProposal;
+			}
+		}
+
+		static bool IsNameUsed(CSharpResolver resolver, QueryExpression query, string name)
+		{
+			if (resolver.ResolveSimpleName(name, new List<IType>()) is LocalResolveResult) {
+				return true;
+			}
+
+			if (query.Ancestors.OfType <VariableInitializer>().Any(variable => variable.Name == name)) {
+				return true;
+			}
+
+			if (query.Ancestors.OfType <BlockStatement>()
+			    .Any(blockStatement => DeclaresLocalVariable(blockStatement, name))) {
+
+				return true;
+			}
+
+			return query.Descendants.OfType<Identifier> ().Any (identifier => identifier.Name == name);
+		}
+
+		static bool DeclaresLocalVariable(BlockStatement blockStatement, string name) {
+			return blockStatement.Descendants.OfType <VariableInitializer>()
+				.Any(variable => variable.Name == name &&
+				     variable.Ancestors.OfType<BlockStatement>().First() == blockStatement);
+		}
+
+		static Expression GetFluentFromQuery (QueryExpression query, IEnumerable<string> underscoreIdentifiers)
+		{
+			var queryExpander = new QueryExpressionExpander();
+			var expandResult = queryExpander.ExpandQueryExpressions(query, underscoreIdentifiers);
+
+			return (Expression) expandResult.AstNode;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/MergeNestedIfAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/MergeNestedIfAction.cs
similarity index 100%
rename from src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/MergeNestedIfAction.cs
rename to src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/MergeNestedIfAction.cs
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/MoveToOuterScopeAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/MoveToOuterScopeAction.cs
new file mode 100644
index 0000000000..ed624cf372
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/MoveToOuterScopeAction.cs
@@ -0,0 +1,153 @@
+//
+// MoveToOuterScopeAction.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using System.Threading;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	
+	[ContextAction("Move to outer scope", Description = "Moves a declaration to the parent scope.")]
+	public class MoveToOuterScopeAction : CodeActionProvider
+	{
+		#region ICodeActionProvider implementation
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var variableDeclaration = context.GetNode<VariableDeclarationStatement>();
+			if (variableDeclaration == null)
+				yield break;
+			var entryNode = FindCurrentScopeEntryNode(variableDeclaration);
+			if (entryNode == null)
+				yield break;
+			var selectedInitializer = context.GetNode<VariableInitializer>();
+			if (selectedInitializer != null) {
+				if (!selectedInitializer.NameToken.Contains(context.Location))
+					yield break;
+				if (HasDependency(context, entryNode, selectedInitializer)) {
+					yield return MoveDeclarationAction(context, entryNode, variableDeclaration, selectedInitializer);
+				} else {
+					yield return MoveInitializerAction(context, entryNode, variableDeclaration, selectedInitializer);
+				}
+			} else {
+				if (!variableDeclaration.Type.Contains(context.Location) || variableDeclaration.Variables.Count <= 1)
+					yield break;
+				yield return new CodeAction(context.TranslateString("Move declaration to outer scope"), script => {
+					script.Remove(variableDeclaration);
+					script.InsertBefore(entryNode, variableDeclaration.Clone());
+				}, variableDeclaration);
+			}
+		}
+
+		static CodeAction MoveInitializerAction(RefactoringContext context, AstNode insertAnchor,
+		                                        VariableDeclarationStatement declaration, VariableInitializer initializer)
+		{
+			var type = declaration.Type.Clone();
+			var name = initializer.Name;
+			return new CodeAction(context.TranslateString("Move initializer to outer scope"), script =>  {
+				if (declaration.Variables.Count != 1) {
+					var innerDeclaration = RemoveInitializer(declaration, initializer);
+					script.InsertBefore(declaration, innerDeclaration);
+				}
+				script.Remove(declaration);
+				var outerDeclaration = new VariableDeclarationStatement(type, name, initializer.Initializer.Clone());
+				script.InsertBefore(insertAnchor, outerDeclaration);
+			}, initializer.NameToken);
+		}
+
+		static CodeAction MoveDeclarationAction(RefactoringContext context, AstNode insertAnchor,
+		                                        VariableDeclarationStatement declarationStatement, VariableInitializer initializer)
+		{
+			var type = declarationStatement.Type.Clone();
+			var name = initializer.Name;
+			
+			return new CodeAction(context.TranslateString("Move declaration to outer scope"), script =>  {
+				script.InsertBefore(declarationStatement, new ExpressionStatement {
+					Expression = new AssignmentExpression(new IdentifierExpression(name), initializer.Initializer.Clone())
+				});
+				script.Remove(declarationStatement);
+				script.InsertBefore(insertAnchor, new VariableDeclarationStatement(type, name, Expression.Null));
+			}, initializer.NameToken);
+		}
+
+		bool HasDependency(RefactoringContext context, AstNode firstSearchNode, AstNode targetNode)
+		{
+			var referenceFinder = new FindReferences();
+			var identifiers = targetNode.Descendants
+				.Where(n => n is IdentifierExpression)
+					.Select<AstNode, IdentifierExpression>(node => (IdentifierExpression)node);
+			foreach (var identifier in identifiers) {
+				var resolveResult = context.Resolve(identifier);
+				var localResolveResult = resolveResult as LocalResolveResult;
+				if (localResolveResult == null)
+					continue;
+				bool referenceFound = false;
+//				var variable = localResolveResult.Variable;
+				var syntaxTree = context.RootNode as SyntaxTree;
+				referenceFinder.FindLocalReferences(localResolveResult.Variable, context.UnresolvedFile, syntaxTree,
+				                                    context.Compilation, (node, nodeResolveResult) => {
+					if (node.StartLocation > firstSearchNode.StartLocation && node.EndLocation < targetNode.StartLocation)
+						referenceFound = true;
+				}, CancellationToken.None);
+				if (referenceFound)
+					return true;
+			}
+			return false;
+		}
+
+		static VariableDeclarationStatement RemoveInitializer(VariableDeclarationStatement variableDeclarationStatement, VariableInitializer selectedVariableInitializer)
+		{
+			var newVariableDeclarationStatement = new VariableDeclarationStatement() {
+				Type = variableDeclarationStatement.Type.Clone()
+			};
+			foreach (var variableInitializer in variableDeclarationStatement.Variables) {
+				if (variableInitializer != selectedVariableInitializer) {
+					newVariableDeclarationStatement.AddChild((VariableInitializer)variableInitializer.Clone(), Roles.Variable);
+				}
+			}
+			return newVariableDeclarationStatement;
+		}
+
+		AstNode FindCurrentScopeEntryNode(Statement startNode)
+		{
+			// Start one node up in the tree, otherwise we may stop at the BlockStatement
+			// of the current scope instead of moving up to the enclosing scope
+			var currentNode = startNode.Parent;
+			AstNode lastNode;
+			do {
+				lastNode = currentNode;
+				currentNode = currentNode.Parent;
+				if (currentNode == null)
+					return null;
+			} while (!(currentNode is BlockStatement));
+			return lastNode;
+		}
+		#endregion
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/NegateIsExpressionAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/NegateIsExpressionAction.cs
new file mode 100644
index 0000000000..bdf15509f4
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/NegateIsExpressionAction.cs
@@ -0,0 +1,58 @@
+//
+// NegateIsExpressionAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction ("Negate 'is' expression", Description = "Negate an is expression.")]
+	public class NegateIsExpressionAction : SpecializedCodeAction<IsExpression>
+	{
+		protected override CodeAction GetAction (RefactoringContext context, IsExpression node)
+		{
+			if (!node.IsToken.Contains(context.Location))
+				return null;
+			var pExpr = node.Parent as ParenthesizedExpression;
+			if (pExpr != null) {
+				var uOp = pExpr.Parent as UnaryOperatorExpression;
+				if (uOp != null && uOp.Operator == UnaryOperatorType.Not) {
+					return new CodeAction(
+						string.Format(context.TranslateString("Negate '{0}'"), uOp),
+						script => {
+							script.Replace(uOp, node.Clone());
+						}, 
+						node.IsToken
+					);
+				}
+			}
+
+			return new CodeAction (
+				string.Format (context.TranslateString ("Negate '{0}'"), node),
+				script => {
+					script.Replace (node, new UnaryOperatorExpression(UnaryOperatorType.Not, new ParenthesizedExpression(node.Clone())));
+				}, 
+				node.IsToken
+			);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/NegateRelationalExpressionAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/NegateRelationalExpressionAction.cs
new file mode 100644
index 0000000000..71eabd10b0
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/NegateRelationalExpressionAction.cs
@@ -0,0 +1,70 @@
+//
+// NegateRelationalExpressionAction.cs
+//
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+//      Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction ("Negate a relational expression", Description = "Negate a relational expression.")]
+	public class NegateRelationalExpressionAction : CodeActionProvider
+	{
+		public static bool GetLogicalExpression (RefactoringContext context, out Expression expr, out AstNode token)
+		{
+			expr = null;
+			token = null;
+			var bOp = context.GetNode<BinaryOperatorExpression>();
+			if (bOp != null && bOp.OperatorToken.Contains(context.Location) && CSharpUtil.IsRelationalOperator (bOp.Operator)) {
+				expr = bOp;
+				token = bOp.OperatorToken;
+				return true;
+			}
+
+			var uOp = context.GetNode<UnaryOperatorExpression>();
+			if (uOp != null && uOp.OperatorToken.Contains(context.Location) && uOp.Operator == UnaryOperatorType.Not) {
+				expr = uOp;
+				token = uOp.OperatorToken;
+				return true;
+			}
+			return false;
+		}
+
+		public override System.Collections.Generic.IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			Expression expr = null;
+			AstNode token;
+			if (!GetLogicalExpression (context, out expr, out token))
+				yield break;
+			yield return new CodeAction (
+				string.Format (context.TranslateString ("Negate '{0}'"), expr),
+				script => {
+					script.Replace (expr, CSharpUtil.InvertCondition(expr));
+				}, 
+				token
+			);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/PutInsideUsingAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/PutInsideUsingAction.cs
similarity index 100%
rename from src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/PutInsideUsingAction.cs
rename to src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/PutInsideUsingAction.cs
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/RemoveBackingStoreAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/RemoveBackingStoreAction.cs
new file mode 100644
index 0000000000..a126a6119d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/RemoveBackingStoreAction.cs
@@ -0,0 +1,141 @@
+// 
+// RemoveBackingStore.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Remove backing store for property", Description = "Removes the backing store of a property and creates an auto property.")]
+	public class RemoveBackingStoreAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var property = context.GetNode<PropertyDeclaration>();
+			if (property == null || !property.NameToken.Contains(context.Location))
+				yield break;
+
+			var field = GetBackingField(context, property);
+			if (field == null) {
+				yield break;
+			}
+			// create new auto property
+			var newProperty = (PropertyDeclaration)property.Clone();
+			newProperty.Getter.Body = BlockStatement.Null;
+			newProperty.Setter.Body = BlockStatement.Null;
+			
+			yield return new CodeAction(context.TranslateString("Convert to auto property"), script => {
+				script.Rename((IEntity)field, newProperty.Name);
+				script.Remove (context.RootNode.GetNodeAt<FieldDeclaration> (field.Region.Begin));
+				script.Replace (property, newProperty);
+			}, property.NameToken);
+		}
+		
+//		void ReplaceBackingFieldReferences (MDRefactoringContext context, IField backingStore, PropertyDeclaration property)
+//		{
+//			using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
+//				foreach (var memberRef in MonoDevelop.Ide.FindInFiles.ReferenceFinder.FindReferences (backingStore, monitor)) {
+//					if (property.Contains (memberRef.Line, memberRef.Column))
+//						continue;
+//					if (backingStore.Location.Line == memberRef.Line && backingStore.Location.Column == memberRef.Column)
+//						continue;
+//					context.Do (new TextReplaceChange () {
+//						FileName = memberRef.FileName,
+//						Offset = memberRef.Position,
+//						RemovedChars = memberRef.Name.Length,
+//						InsertedText = property.Name
+//					});
+//				}
+//			}
+//		}
+//
+		static readonly Version csharp3 = new Version(3, 0);
+		
+		internal static IField GetBackingField (BaseRefactoringContext context, PropertyDeclaration propertyDeclaration)
+		{
+			// automatic properties always need getter & setter
+			if (propertyDeclaration == null || propertyDeclaration.Getter.IsNull || propertyDeclaration.Setter.IsNull || propertyDeclaration.Getter.Body.IsNull || propertyDeclaration.Setter.Body.IsNull)
+				return null;
+			if (!context.Supports(csharp3) || propertyDeclaration.HasModifier (ICSharpCode.NRefactory.CSharp.Modifiers.Abstract) || ((TypeDeclaration)propertyDeclaration.Parent).ClassType == ClassType.Interface)
+				return null;
+			var getterField = ScanGetter (context, propertyDeclaration);
+			if (getterField == null)
+				return null;
+			var setterField = ScanSetter (context, propertyDeclaration);
+			if (setterField == null)
+				return null;
+			if (!getterField.Equals(setterField))
+				return null;
+			return getterField;
+		}
+		
+		internal static IField ScanGetter (BaseRefactoringContext context, PropertyDeclaration propertyDeclaration)
+		{
+			if (propertyDeclaration.Getter.Body.Statements.Count != 1)
+				return null;
+			var returnStatement = propertyDeclaration.Getter.Body.Statements.First () as ReturnStatement;
+			if (returnStatement == null)
+				return null;
+			if (!IsPossibleExpression(returnStatement.Expression))
+				return null;
+			var result = context.Resolve (returnStatement.Expression);
+			if (result == null || !(result is MemberResolveResult))
+				return null;
+			return ((MemberResolveResult)result).Member as IField;
+		}
+		
+		internal static IField ScanSetter (BaseRefactoringContext context, PropertyDeclaration propertyDeclaration)
+		{
+			if (propertyDeclaration.Setter.Body.Statements.Count != 1)
+				return null;
+			var setAssignment = propertyDeclaration.Setter.Body.Statements.First () as ExpressionStatement;
+			var assignment = setAssignment != null ? setAssignment.Expression as AssignmentExpression : null;
+			if (assignment == null || assignment.Operator != AssignmentOperatorType.Assign)
+				return null;
+			if (!IsPossibleExpression(assignment.Left))
+				return null;
+			var result = context.Resolve (assignment.Left);
+			if (result == null || !(result is MemberResolveResult))
+				return null;
+			return ((MemberResolveResult)result).Member as IField;
+		}
+
+		static bool IsPossibleExpression(Expression left)
+		{
+			if (left is IdentifierExpression)
+				return true;
+			var mr = left as MemberReferenceExpression;
+			if (mr == null)
+				return false;
+			return mr.Target is ThisReferenceExpression;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/RemoveBracesAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/RemoveBracesAction.cs
new file mode 100644
index 0000000000..76ab473fcc
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/RemoveBracesAction.cs
@@ -0,0 +1,140 @@
+// 
+// RemoveBraces.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Remove braces", Description = "Removes redundant braces around a statement.")]
+	public class RemoveBracesAction : CodeActionProvider
+	{
+		internal static bool IsSpecialNode (AstNode node, out string keyword, out Statement embeddedStatement)
+		{
+			if (node != null) {
+				if (node.Role == IfElseStatement.IfKeywordRole) {
+					keyword = "if";
+					embeddedStatement = ((IfElseStatement)node.Parent).TrueStatement;
+					return true;
+				}
+
+				if (node.Role == IfElseStatement.ElseKeywordRole) {
+					keyword = "else";
+					embeddedStatement = ((IfElseStatement)node.Parent).FalseStatement;
+					return true;
+				}
+
+				if (node.Role == DoWhileStatement.DoKeywordRole || node.Role == DoWhileStatement.WhileKeywordRole) {
+					keyword = "do";
+					embeddedStatement = ((DoWhileStatement)node.Parent).EmbeddedStatement;
+					return true;
+				}
+
+				if (node.Role == ForeachStatement.ForeachKeywordRole) {
+					keyword = "foreach";
+					embeddedStatement = ((ForeachStatement)node.Parent).EmbeddedStatement;
+					return true;
+				}
+
+				if (node.Role == ForStatement.ForKeywordRole) {
+					keyword = "for";
+					embeddedStatement = ((ForStatement)node.Parent).EmbeddedStatement;
+					return true;
+				}
+
+				if (node.Role == LockStatement.LockKeywordRole) {
+					keyword = "lock";
+					embeddedStatement = ((LockStatement)node.Parent).EmbeddedStatement;
+					return true;
+				}
+
+				if (node.Role == UsingStatement.UsingKeywordRole) {
+					keyword = "using";
+					embeddedStatement = ((UsingStatement)node.Parent).EmbeddedStatement;
+					return true;
+				}
+
+				if (node.Role == WhileStatement.WhileKeywordRole) {
+					keyword = "while";
+					embeddedStatement = ((WhileStatement)node.Parent).EmbeddedStatement;
+					return true;
+				}
+			}
+			keyword = null;
+			embeddedStatement = null;
+			return false;
+		}
+
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			string keyword;
+			Statement embeddedStatement;
+			BlockStatement block;
+
+			var currentNode = context.GetNode();
+			if (IsSpecialNode(currentNode, out keyword, out embeddedStatement)) {
+				block = embeddedStatement as BlockStatement;
+				if (block == null || block.Statements.Count != 1 || block.Statements.First() is VariableDeclarationStatement)
+					yield break;
+			} else {
+				block = GetBlockStatement(context);
+			}
+
+			if (block == null)
+				yield break;
+
+			yield return new CodeAction (
+				keyword != null ? string.Format(context.TranslateString("Remove braces from '{0}'"), keyword) : context.TranslateString("Remove braces"), 
+				script => {
+					var start = script.GetCurrentOffset (block.LBraceToken.GetPrevNode ().EndLocation);
+					var end = script.GetCurrentOffset (block.LBraceToken.EndLocation);
+					if (end <= start)
+						return;
+					script.RemoveText (start, end - start);
+					script.Remove(block.LBraceToken);
+					script.Remove(block.RBraceToken);
+					script.FormatText(block.Parent);
+				}, 
+				currentNode
+			);
+		}
+		
+		static BlockStatement GetBlockStatement(RefactoringContext context)
+		{
+			var block = context.GetNode<BlockStatement>();
+			if (block == null || block.LBraceToken.IsNull || block.RBraceToken.IsNull)
+				return null;
+			if (!(block.LBraceToken.IsInside(context.Location) || block.RBraceToken.IsInside(context.Location)))
+				return null;
+			if (!(block.Parent is Statement) || block.Parent is TryCatchStatement) 
+				return null;
+			if (block.Statements.Count != 1 || block.Statements.First () is VariableDeclarationStatement) 
+				return null;
+			return block;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/RemoveRedundantCatchTypeAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/RemoveRedundantCatchTypeAction.cs
new file mode 100644
index 0000000000..3d02448625
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/RemoveRedundantCatchTypeAction.cs
@@ -0,0 +1,80 @@
+//
+// RemoveRedundantCatchTypeAction.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.TypeSystem;
+using System;
+using ICSharpCode.NRefactory.Semantics;
+using System.Threading;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{	
+	[ContextAction("Remove redundant type",
+	               Description = "Removes a redundant exception type specifier from catch clauses.")]
+	public class RemoveRedundantCatchTypeAction : CodeActionProvider
+	{
+		#region ICodeActionProvider implementation
+		public override System.Collections.Generic.IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var catchClause = context.GetNode<CatchClause>();
+			if (catchClause == null)
+				yield break;
+			if (catchClause.Type.IsNull)
+				yield break;
+			var exceptionType = context.ResolveType(catchClause.Type);
+			if (exceptionType != context.Compilation.FindType(typeof(Exception)))
+				yield break;
+			var syntaxTree = context.RootNode as SyntaxTree;
+			if (syntaxTree == null)
+				yield break;
+			var exceptionIdentifierRR = context.Resolve(catchClause.VariableNameToken) as LocalResolveResult;
+			if (exceptionIdentifierRR != null &&
+				IsReferenced(exceptionIdentifierRR.Variable, catchClause.Body, syntaxTree, context))
+				yield break;
+			yield return new CodeAction(context.TranslateString("Remove type specifier"), script => {
+				script.Replace(catchClause, new CatchClause() {
+					Body = catchClause.Body.Clone() as BlockStatement
+				});
+			}, catchClause.Type);
+		}
+
+		bool IsReferenced(IVariable variable, AstNode node, SyntaxTree syntaxTree, RefactoringContext context)
+		{
+			int referencesFound = 0;
+			var findRef = new FindReferences();
+			findRef.FindLocalReferences(variable, context.UnresolvedFile, syntaxTree, context.Compilation, (n, entity) => {
+				referencesFound++;
+			}, CancellationToken.None);
+
+			// One reference is the declaration, and that does not count
+			return referencesFound > 1;
+		}
+
+		#endregion
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/RemoveRegionAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/RemoveRegionAction.cs
new file mode 100644
index 0000000000..14bec1f6d6
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/RemoveRegionAction.cs
@@ -0,0 +1,104 @@
+// 
+// RemoveRegion.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Remove region", Description = "Removes a pre processor #region/#endregion directive.")]
+	public class RemoveRegionAction : CodeActionProvider
+	{
+		static PreProcessorDirective GetEndDirective(PreProcessorDirective directive)
+		{
+			var nextNode = directive.GetNextNode();
+			int d = 0;
+			while (nextNode != null) {
+				var pp = nextNode as PreProcessorDirective;
+				if (pp != null) {
+					if (pp.Type == PreProcessorDirectiveType.Region) {
+						d++;
+					} else if (pp.Type == PreProcessorDirectiveType.Endregion) {
+						if (d == 0) {
+							return pp;
+						}
+						d--;
+					}
+				}
+				nextNode = nextNode.GetNextNode();
+			}
+			return null;
+		}
+
+		static PreProcessorDirective GetStartDirective(PreProcessorDirective directive)
+		{
+			var nextNode = directive.GetPrevNode();
+			int d = 0;
+			while (nextNode != null) {
+				var pp = nextNode as PreProcessorDirective;
+				if (pp != null) {
+					if (pp.Type == PreProcessorDirectiveType.Endregion) {
+						d++;
+					} else if (pp.Type == PreProcessorDirectiveType.Region) {
+						if (d == 0) {
+							return pp;
+						}
+						d--;
+					}
+				}
+				nextNode = nextNode.GetPrevNode();
+			}
+			return null;
+		}
+
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var directive = GetDirective(context);
+			if (directive == null)
+				yield break;
+
+			PreProcessorDirective endDirective = directive.Type == PreProcessorDirectiveType.Region ? GetEndDirective(directive) : GetStartDirective(directive);
+
+			if (endDirective == null)
+				yield break;
+
+			yield return new CodeAction (context.TranslateString("Remove region"), script => {
+				script.Remove (directive);
+				script.Remove (endDirective);
+			}, directive);
+		}
+		
+		static PreProcessorDirective GetDirective (RefactoringContext context)
+		{
+			var directive = context.GetNode<PreProcessorDirective> ();
+			if (directive == null || directive.Type != PreProcessorDirectiveType.Region && directive.Type != PreProcessorDirectiveType.Endregion)
+				return null;
+			return directive;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplaceAssignmentWithPostfixExpressionAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplaceAssignmentWithPostfixExpressionAction.cs
new file mode 100644
index 0000000000..b584238463
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplaceAssignmentWithPostfixExpressionAction.cs
@@ -0,0 +1,58 @@
+//
+// ReplaceAssignmentWithPostfixExpressionAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Threading;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Replace assignment with postfix expression", Description = "Replace assignment with postfix expression")]
+	public class ReplaceAssignmentWithPostfixExpressionAction : SpecializedCodeAction<AssignmentExpression>
+	{
+		static readonly AstNode onePattern = PatternHelper.OptionalParentheses(new PrimitiveExpression (1));
+
+		protected override CodeAction GetAction(RefactoringContext context, AssignmentExpression node)
+		{
+			if (!node.OperatorToken.Contains(context.Location))
+				return null;
+			node = ReplaceWithOperatorAssignmentAction.CreateAssignment(node) ?? node;
+			if (node.Operator != AssignmentOperatorType.Add && node.Operator != AssignmentOperatorType.Subtract || !onePattern.IsMatch (node.Right))
+				return null;
+			string desc = node.Operator == AssignmentOperatorType.Add ? context.TranslateString("Replace with '{0}++'") : context.TranslateString("Replace with '{0}--'");
+			return new CodeAction(
+				string.Format(desc, node.Left),
+				s => s.Replace(node, new UnaryOperatorExpression(
+					node.Operator == AssignmentOperatorType.Add ? UnaryOperatorType.PostIncrement : UnaryOperatorType.PostDecrement,
+					node.Left.Clone()
+				)),
+				node.OperatorToken
+			);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplaceEmptyStringAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplaceEmptyStringAction.cs
new file mode 100644
index 0000000000..d3a73c990e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplaceEmptyStringAction.cs
@@ -0,0 +1,54 @@
+// 
+// ReplaceEmptyString.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Use string.Empty", Description = "Replaces \"\" with string.Empty")]
+	public class ReplaceEmptyStringAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var expr = GetEmptyString(context);
+			if (expr == null) {
+				yield break;
+			}
+			yield return new CodeAction(context.TranslateString("Use string.Empty"), script => {
+				script.Replace(expr, new MemberReferenceExpression (new PrimitiveType ("string"), "Empty"));
+			}, expr);
+		}
+		
+		static PrimitiveExpression GetEmptyString (RefactoringContext context)
+		{
+			var node = context.GetNode<PrimitiveExpression> ();
+			if (node == null || !(node.Value is string) || node.Value.ToString () != "")
+				return null;
+			return  node;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplaceOperatorAssignmentWithAssignmentAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplaceOperatorAssignmentWithAssignmentAction.cs
new file mode 100644
index 0000000000..3ab4cf48c3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplaceOperatorAssignmentWithAssignmentAction.cs
@@ -0,0 +1,87 @@
+//
+// ReplaceOperatorAssignmentWithAssignmentAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Threading;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Replace operator assignment with assignment", Description = "Replace operator assignment with assignment")]
+	public class ReplaceOperatorAssignmentWithAssignmentAction : SpecializedCodeAction<AssignmentExpression>
+	{
+		protected override CodeAction GetAction(RefactoringContext context, AssignmentExpression node)
+		{
+			if (!node.OperatorToken.Contains(context.Location))
+				return null;
+			var op = GetAssignmentOperator(node.Operator);
+			if (op == BinaryOperatorType.Any)
+				return null;
+
+			return new CodeAction(
+				context.TranslateString("Replace with '='"),
+				s => s.Replace(
+					node,
+					new AssignmentExpression(
+						node.Left.Clone(), 
+						new BinaryOperatorExpression(node.Left.Clone(), op, node.Right.Clone())
+					)
+				),
+				node.OperatorToken
+			);
+		}
+
+		static BinaryOperatorType GetAssignmentOperator(AssignmentOperatorType op)
+		{
+			switch (op) {
+				case AssignmentOperatorType.BitwiseAnd:
+					return BinaryOperatorType.BitwiseAnd;
+				case AssignmentOperatorType.BitwiseOr:
+					return BinaryOperatorType.BitwiseOr;
+				case AssignmentOperatorType.ExclusiveOr:
+					return BinaryOperatorType.ExclusiveOr;
+				case AssignmentOperatorType.Add:
+					return BinaryOperatorType.Add;
+				case AssignmentOperatorType.Subtract:
+					return BinaryOperatorType.Subtract;
+				case AssignmentOperatorType.Multiply:
+					return BinaryOperatorType.Multiply;
+				case AssignmentOperatorType.Divide:
+					return BinaryOperatorType.Divide;
+				case AssignmentOperatorType.Modulus:
+					return BinaryOperatorType.Modulus;
+				case AssignmentOperatorType.ShiftLeft:
+					return BinaryOperatorType.ShiftLeft;
+				case AssignmentOperatorType.ShiftRight:
+					return BinaryOperatorType.ShiftRight;
+				default:
+					return BinaryOperatorType.Any;
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplacePostfixExpressionWithAssignmentAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplacePostfixExpressionWithAssignmentAction.cs
new file mode 100644
index 0000000000..4623c9232b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplacePostfixExpressionWithAssignmentAction.cs
@@ -0,0 +1,54 @@
+//
+// ReplacePostfixExpressionWithAssignmentAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Threading;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Replace postfix expression with assignment", Description = "Replace postfix expression with assignment")]
+	public class ReplacePostfixExpressionWithAssignmentAction : SpecializedCodeAction<UnaryOperatorExpression>
+	{
+		protected override CodeAction GetAction(RefactoringContext context, UnaryOperatorExpression node)
+		{
+			if (node.Operator != UnaryOperatorType.PostIncrement && node.Operator != UnaryOperatorType.PostDecrement)
+				return null;
+			string desc = node.Operator == UnaryOperatorType.PostIncrement ? context.TranslateString("Replace with '{0} += 1'") : context.TranslateString("Replace with '{0} -= 1'");
+			return new CodeAction(
+				string.Format(desc, CSharpUtil.GetInnerMostExpression(node.Expression)),
+				s => s.Replace(node, new AssignmentExpression (
+					CSharpUtil.GetInnerMostExpression(node.Expression).Clone(),
+					node.Operator == UnaryOperatorType.PostIncrement ? AssignmentOperatorType.Add : AssignmentOperatorType.Subtract,
+					new PrimitiveExpression(1)
+				)),
+				node.OperatorToken
+			);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplaceWithOperatorAssignmentAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplaceWithOperatorAssignmentAction.cs
new file mode 100644
index 0000000000..be605f9f60
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReplaceWithOperatorAssignmentAction.cs
@@ -0,0 +1,103 @@
+//
+// ReplaceWithOperatorAssignmentAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Threading;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Replace assignment with operator assignment", Description = "Replace assignment with operator assignment")]
+	public class ReplaceWithOperatorAssignmentAction : SpecializedCodeAction<AssignmentExpression>
+	{
+		internal static AssignmentExpression CreateAssignment(AssignmentExpression node)
+		{
+			var bop = node.Right as BinaryOperatorExpression;
+			if (bop == null)
+				return null;
+			var outerLeft = GetOuterLeft(bop);
+			if (!outerLeft.IsMatch(node.Left))
+				return null;
+			var op = GetAssignmentOperator(bop.Operator);
+			if (op == AssignmentOperatorType.Any)
+				return null;
+			return new AssignmentExpression(node.Left.Clone(), op, SplitIfAction.GetRightSide((BinaryOperatorExpression)outerLeft.Parent));
+		}
+
+		protected override CodeAction GetAction(RefactoringContext context, AssignmentExpression node)
+		{
+			if (!node.OperatorToken.Contains(context.Location))
+				return null;
+
+			var ae = CreateAssignment(node);
+			if (ae == null)
+				return null;
+			return new CodeAction (
+				string.Format(context.TranslateString("Replace with '{0}='"), ((BinaryOperatorExpression)node.Right).OperatorToken),
+				s => s.Replace(node, ae),
+				node.OperatorToken
+			);
+		}
+
+		static AssignmentOperatorType GetAssignmentOperator(BinaryOperatorType op)
+		{
+			switch (op) {
+				case BinaryOperatorType.BitwiseAnd:
+					return AssignmentOperatorType.BitwiseAnd;
+				case BinaryOperatorType.BitwiseOr:
+					return AssignmentOperatorType.BitwiseOr;
+				case BinaryOperatorType.ExclusiveOr:
+					return AssignmentOperatorType.ExclusiveOr;
+				case BinaryOperatorType.Add:
+					return AssignmentOperatorType.Add;
+				case BinaryOperatorType.Subtract:
+					return AssignmentOperatorType.Subtract;
+				case BinaryOperatorType.Multiply:
+					return AssignmentOperatorType.Multiply;
+				case BinaryOperatorType.Divide:
+					return AssignmentOperatorType.Divide;
+				case BinaryOperatorType.Modulus:
+					return AssignmentOperatorType.Modulus;
+				case BinaryOperatorType.ShiftLeft:
+					return AssignmentOperatorType.ShiftLeft;
+				case BinaryOperatorType.ShiftRight:
+					return AssignmentOperatorType.ShiftRight;
+				default:
+					return AssignmentOperatorType.Any;
+			}
+		}
+
+		static Expression GetOuterLeft (BinaryOperatorExpression bop)
+		{
+			var leftBop = bop.Left as BinaryOperatorExpression;
+			if (leftBop != null && bop.Operator == leftBop.Operator)
+				return GetOuterLeft(leftBop);
+			return bop.Left;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReverseDirectionForForLoopAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReverseDirectionForForLoopAction.cs
new file mode 100644
index 0000000000..2b9eef30ea
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ReverseDirectionForForLoopAction.cs
@@ -0,0 +1,254 @@
+//
+// ReverseDirectionForForLoopAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Reverse the direction of a for loop", Description = "Reverse the direction of a for loop")]
+	public class ReverseDirectionForForLoopAction : SpecializedCodeAction<ForStatement>
+	{
+		static bool? IsForward(ExpressionStatement statement, string name, out Expression step)
+		{
+			step = null;
+			if (statement == null)
+				return null;
+
+			var forwardPattern = new Choice {
+				PatternHelper.OptionalParentheses(new UnaryOperatorExpression (UnaryOperatorType.Increment, new IdentifierExpression(name))),
+				PatternHelper.OptionalParentheses(new UnaryOperatorExpression (UnaryOperatorType.PostIncrement, new IdentifierExpression(name))),
+				PatternHelper.OptionalParentheses(new AssignmentExpression (new IdentifierExpression(name), AssignmentOperatorType.Add, PatternHelper.OptionalParentheses(new AnyNode("step"))))
+			};
+			var match = forwardPattern.Match(statement.Expression);
+			if (match.Success) {
+				step = match.Get<Expression>("step").FirstOrDefault();
+				return true;
+			}
+
+			var backwardPattern = new Choice {
+				PatternHelper.OptionalParentheses(new UnaryOperatorExpression (UnaryOperatorType.Decrement, new IdentifierExpression(name))),
+				PatternHelper.OptionalParentheses(new UnaryOperatorExpression (UnaryOperatorType.PostDecrement, new IdentifierExpression(name))),
+				PatternHelper.OptionalParentheses(new AssignmentExpression (new IdentifierExpression(name), AssignmentOperatorType.Subtract, PatternHelper.OptionalParentheses(new AnyNode("step"))))
+			};
+
+			match = backwardPattern.Match(statement.Expression);
+			if (match.Success) {
+				step = match.Get<Expression>("step").FirstOrDefault();
+				return false;
+			}
+			return null;
+		}
+
+		Expression GetNewCondition(Expression condition, VariableInitializer initializer, bool? direction, Expression step, out Expression newInitializer)
+		{
+			var name = initializer.Name;
+			newInitializer = null;
+			var bOp = condition as BinaryOperatorExpression;
+			if (bOp == null || direction == null)
+				return null;
+			if (direction == true) {
+				var upwardPattern = new Choice {
+					PatternHelper.OptionalParentheses(new BinaryOperatorExpression(PatternHelper.OptionalParentheses(new IdentifierExpression(name)), BinaryOperatorType.LessThan, PatternHelper.OptionalParentheses(new AnyNode("bound")))),
+					PatternHelper.OptionalParentheses(new BinaryOperatorExpression(PatternHelper.OptionalParentheses(new AnyNode("bound")), BinaryOperatorType.GreaterThan, PatternHelper.OptionalParentheses(new IdentifierExpression(name))))
+				};
+				var upMatch = upwardPattern.Match(condition);
+				if (upMatch.Success) {
+					var bound = upMatch.Get<Expression>("bound").FirstOrDefault();
+					newInitializer = direction == true ? Subtract(bound, step) : bound.Clone();
+					return GetNewBound(name, false, initializer.Initializer.Clone(), step);
+				}
+
+				var altUpwardPattern = new Choice {
+					PatternHelper.OptionalParentheses(new BinaryOperatorExpression(PatternHelper.OptionalParentheses(new IdentifierExpression(name)), BinaryOperatorType.LessThanOrEqual, PatternHelper.OptionalParentheses(new AnyNode("bound")))),
+					PatternHelper.OptionalParentheses(new BinaryOperatorExpression(PatternHelper.OptionalParentheses(new AnyNode("bound")), BinaryOperatorType.GreaterThanOrEqual, PatternHelper.OptionalParentheses(new IdentifierExpression(name))))
+				};
+				var altUpMatch = altUpwardPattern.Match(condition);
+				if (altUpMatch.Success) {
+					var bound = altUpMatch.Get<Expression>("bound").FirstOrDefault();
+					newInitializer = bound.Clone();
+					return GetNewBound(name, false, initializer.Initializer.Clone(), step);
+				}
+			}
+
+			var downPattern = new Choice {
+				PatternHelper.OptionalParentheses(new BinaryOperatorExpression(PatternHelper.OptionalParentheses(new IdentifierExpression(name)), BinaryOperatorType.GreaterThanOrEqual, PatternHelper.OptionalParentheses(new AnyNode("bound")))),
+				PatternHelper.OptionalParentheses(new BinaryOperatorExpression(PatternHelper.OptionalParentheses(new AnyNode("bound")), BinaryOperatorType.LessThanOrEqual, PatternHelper.OptionalParentheses(new IdentifierExpression(name))))
+			};
+			var downMatch = downPattern.Match(condition);
+			if (!downMatch.Success)
+				return null;
+			var bound2 = downMatch.Get<Expression>("bound").FirstOrDefault();
+			newInitializer = direction == true ? Subtract(bound2, step) : bound2.Clone();
+			return GetNewBound(name, true, initializer.Initializer.Clone(), step);
+		}
+
+		static readonly AstNode zeroExpr = new PrimitiveExpression(0);
+		static readonly AstNode oneExpr = new PrimitiveExpression(1);
+
+		Expression Subtract(Expression expr, Expression step)
+		{
+			if (step != null && CSharpUtil.GetInnerMostExpression(expr).IsMatch(CSharpUtil.GetInnerMostExpression(step)))
+				return new PrimitiveExpression(0);
+
+			var pe = expr as PrimitiveExpression;
+			if (pe != null) {
+				if (step == null)
+					return new PrimitiveExpression((int)pe.Value - 1);
+				var stepExpr = step as PrimitiveExpression;
+				if (stepExpr != null)
+					return new PrimitiveExpression((int)pe.Value - (int)stepExpr.Value);
+			} 
+
+			var bOp = expr as BinaryOperatorExpression;
+			if (bOp != null) {
+				if (bOp.Operator == BinaryOperatorType.Subtract) {
+					var right = Add(bOp.Right, step);
+					if (zeroExpr.IsMatch(right))
+						return bOp.Left.Clone();
+					return new BinaryOperatorExpression(bOp.Left.Clone(), BinaryOperatorType.Subtract, right);
+				}
+				if (bOp.Operator == BinaryOperatorType.Add) {
+					var right = Subtract(bOp.Right, step);
+					if (zeroExpr.IsMatch(right))
+						return bOp.Left.Clone();
+					return new BinaryOperatorExpression(bOp.Left.Clone(), BinaryOperatorType.Add, Subtract(bOp.Right, step));
+				}
+			} 
+			if (step == null)
+				return new BinaryOperatorExpression(expr.Clone(), BinaryOperatorType.Subtract, new PrimitiveExpression(1));
+
+			return new BinaryOperatorExpression(expr.Clone(), BinaryOperatorType.Subtract, CSharpUtil.AddParensForUnaryExpressionIfRequired(step.Clone()));
+		}
+
+		Expression Add(Expression expr, Expression step)
+		{
+			var pe = expr as PrimitiveExpression;
+			if (pe != null) {
+				if (step == null)
+					return new PrimitiveExpression((int)pe.Value + 1);
+				var stepExpr = step as PrimitiveExpression;
+				if (stepExpr != null)
+					return new PrimitiveExpression((int)pe.Value + (int)stepExpr.Value);
+			} 
+
+			var bOp = expr as BinaryOperatorExpression;
+			if (bOp != null) {
+				if (bOp.Operator == BinaryOperatorType.Add) {
+					var right = Add(bOp.Right, step);
+					if (zeroExpr.IsMatch(right))
+						return bOp.Left.Clone();
+					return new BinaryOperatorExpression(bOp.Left.Clone(), BinaryOperatorType.Add, right);
+				}
+				if (bOp.Operator == BinaryOperatorType.Subtract) {
+					var right = Subtract(bOp.Right, step);
+					if (zeroExpr.IsMatch(right))
+						return bOp.Left.Clone();
+					return new BinaryOperatorExpression(bOp.Left.Clone(), BinaryOperatorType.Subtract, right);
+				}
+			} 
+			if (step == null)
+				return new BinaryOperatorExpression(expr.Clone(), BinaryOperatorType.Add, new PrimitiveExpression(1));
+
+			return new BinaryOperatorExpression(expr.Clone(), BinaryOperatorType.Add, CSharpUtil.AddParensForUnaryExpressionIfRequired(step.Clone()));
+		}
+
+		Expression GetNewBound(string name, bool? direction, Expression initializer, Expression step)
+		{
+			if (initializer == null)
+				return null;
+
+			return new BinaryOperatorExpression (
+				new IdentifierExpression (name),
+				direction == true ? BinaryOperatorType.LessThan : BinaryOperatorType.GreaterThanOrEqual,
+				direction == true ? Add(initializer, step) : initializer
+			);
+		}
+
+		Expression CreateIterator(string name, bool? direction, Expression step)
+		{
+			if (direction == true) {
+				if (step == null || oneExpr.IsMatch(step)) {
+					return new UnaryOperatorExpression(UnaryOperatorType.PostIncrement, new IdentifierExpression(name));
+				}
+				return new AssignmentExpression(new IdentifierExpression(name), AssignmentOperatorType.Add, step.Clone());
+			}
+			if (step == null || oneExpr.IsMatch(step)) {
+				return new UnaryOperatorExpression(UnaryOperatorType.PostDecrement, new IdentifierExpression(name));
+			}
+			return new AssignmentExpression(new IdentifierExpression(name), AssignmentOperatorType.Subtract, step.Clone());
+		}
+
+		protected override CodeAction GetAction(RefactoringContext context, ForStatement node)
+		{
+			if (!node.ForToken.Contains(context.Location))
+				return null;
+			if (node.Initializers.Count() != 1)
+				return null;
+			var varDelc = node.Initializers.Single() as VariableDeclarationStatement;
+			if (varDelc == null)
+				return null;
+
+			if (varDelc.Variables.Count() != 1)
+				return null;
+			var initalizer = varDelc.Variables.First ();
+			if (initalizer == null)
+				return null;
+
+			if (!context.Resolve(initalizer.Initializer).Type.IsKnownType(KnownTypeCode.Int32))
+				return null;
+
+			if (node.Iterators.Count() != 1)
+				return null;
+			var iterator = node.Iterators.First();
+			Expression step;
+			var direction = IsForward(iterator as ExpressionStatement, initalizer.Name, out step);
+
+			Expression newInitializer;
+			var newCondition = GetNewCondition(node.Condition, initalizer, direction, step, out newInitializer);
+			if (newCondition == null)
+				return null;
+
+			return new CodeAction (
+				context.TranslateString("Reverse 'for' loop"),
+				s => {
+					var newFor = new ForStatement() {
+						Initializers = { new VariableDeclarationStatement(varDelc.Type.Clone(), initalizer.Name, newInitializer) },
+						Condition = newCondition,
+						Iterators = { CreateIterator(initalizer.Name, !direction, step) },
+						EmbeddedStatement = node.EmbeddedStatement.Clone()
+					};
+					s.Replace(node, newFor);
+				},
+				node.ForToken
+			);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SimplifyIfFlowAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SimplifyIfFlowAction.cs
new file mode 100644
index 0000000000..4d19ae9d79
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SimplifyIfFlowAction.cs
@@ -0,0 +1,100 @@
+//
+// SimplifyIfFlowAction.cs
+//
+// Author:
+//      Ciprian Khlud <ciprian.mustiata@yahoo.com>
+//
+// Copyright (c) 2013 Ciprian Khlud <ciprian.mustiata@yahoo.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Simplify if flow", Description = "Inverts if and reduces branching ")]
+	public class SimplifyIfFlowAction : CodeActionProvider
+	{
+		readonly InsertParenthesesVisitor _insertParenthesesVisitor = new InsertParenthesesVisitor();
+
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var ifStatement = GetIfElseStatement(context);
+			if (ifStatement == null)
+				yield break;
+			yield return new CodeAction(context.TranslateString("Invert if"), script =>
+			{
+				GenerateNewScript(script, ifStatement);
+			}, ifStatement);
+		}
+
+		internal static void InsertBody(Script script, IfElseStatement ifStatement)
+		{
+			var ifBody = ifStatement.TrueStatement.Clone();
+
+			if (ifBody is BlockStatement) {
+				AstNode last = ifStatement;
+				foreach (var stmt in ((BlockStatement)ifBody).Children) {
+					if (stmt.Role == Roles.LBrace || stmt.Role == Roles.RBrace || stmt.Role == Roles.NewLine)
+						continue;
+					script.InsertAfter(last, stmt);
+					last = stmt;
+				}
+			} else {
+				script.InsertAfter(ifStatement, ifBody);
+			}
+			script.FormatText(ifStatement.Parent);
+		}
+		
+		void GenerateNewScript(Script script, IfElseStatement ifStatement)
+		{
+			var mergedIfStatement = new IfElseStatement {
+				Condition = CSharpUtil.InvertCondition(ifStatement.Condition),
+				TrueStatement = new ReturnStatement()
+			};
+			mergedIfStatement.Condition.AcceptVisitor(_insertParenthesesVisitor);
+			
+			script.Replace(ifStatement, mergedIfStatement);
+
+			InsertBody(script, ifStatement);
+		}
+		
+		static IfElseStatement GetIfElseStatement(RefactoringContext context)
+		{
+			var result = context.GetNode<IfElseStatement>();
+			if (result == null)
+				return null;
+			if (!(result.IfToken.Contains(context.Location)
+				&& !result.TrueStatement.IsNull
+				&& result.FalseStatement.IsNull))
+				return null;
+			if (!(result.Parent is BlockStatement) || !(result.Parent.Parent is MethodDeclaration))
+				return null;
+			var parentMethod = (MethodDeclaration)result.Parent.Parent;
+			if (parentMethod.ReturnType.ToString() != "void")
+				return null;
+			var nextSibling = result.GetNextSibling(n => n is Statement);
+			if (nextSibling == null)
+				return result;
+			nextSibling = nextSibling.GetNextSibling (n => n is Statement);
+			if (nextSibling != null)
+				return null;
+			return result;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SimplifyIfInLoopsFlowAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SimplifyIfInLoopsFlowAction.cs
new file mode 100644
index 0000000000..37811b430e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SimplifyIfInLoopsFlowAction.cs
@@ -0,0 +1,84 @@
+//
+// SimplifyIfInLoopsFlowAction.cs
+//
+// Author:
+//      Ciprian Khlud <ciprian.mustiata@yahoo.com>
+//
+// Copyright (c) 2013 Ciprian Khlud <ciprian.mustiata@yahoo.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Simplify if flow in loops", Description = "Inverts if and reduces branching ")]
+	public class SimplifyIfInLoopsFlowAction : CodeActionProvider
+	{
+		readonly InsertParenthesesVisitor _insertParenthesesVisitor = new InsertParenthesesVisitor();
+
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var ifStatement = GetIfElseStatement(context);
+			if (ifStatement == null)
+				yield break;
+			yield return new CodeAction(context.TranslateString("Simplify if in loops"), script => {
+				GenerateNewScript(script, ifStatement);
+			}, ifStatement);
+		}
+		
+		void GenerateNewScript(Script script, IfElseStatement ifStatement)
+		{
+			var mergedIfStatement = new IfElseStatement {
+				Condition = CSharpUtil.InvertCondition(ifStatement.Condition),
+				TrueStatement = new ContinueStatement()
+			};
+			mergedIfStatement.Condition.AcceptVisitor(_insertParenthesesVisitor);
+			
+			script.Replace(ifStatement, mergedIfStatement);
+			
+			SimplifyIfFlowAction.InsertBody(script, ifStatement);
+		}
+		
+		static IfElseStatement GetIfElseStatement(RefactoringContext context)
+		{
+			var result = context.GetNode<IfElseStatement>();
+			if (result == null)
+				return null;
+			if (!(result.IfToken.Contains(context.Location)
+				&& !result.TrueStatement.IsNull
+				&& result.FalseStatement.IsNull))
+				return null;
+			if (!(result.Parent is BlockStatement))
+				return null;
+			var condition = (result.Parent.Parent is WhileStatement) 
+				|| (result.Parent.Parent is ForeachStatement) 
+				|| (result.Parent.Parent is ForStatement);
+			if (!condition)
+				return null;
+			
+			var nextSibling = result.GetNextSibling(n => n is Statement);
+			if (nextSibling == null)
+				return result;
+			nextSibling = nextSibling.GetNextSibling (n => n is Statement);
+			if (nextSibling != null)
+				return null;
+			return result;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SortUsingsAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SortUsingsAction.cs
new file mode 100644
index 0000000000..08d2e90dc7
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SortUsingsAction.cs
@@ -0,0 +1,98 @@
+//
+// SortUsingsAction.cs
+//
+// Author:
+//      Lopatkin Ilja
+//
+// Copyright (c) 2012 Lopatkin Ilja
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Sort usings", Description = "Sorts usings by their origin and then alphabetically.")]
+	public class SortUsingsAction: CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var usingNode = FindUsingNodeAtCursor(context);
+			if (usingNode == null)
+				yield break;
+
+			yield return new CodeAction(context.TranslateString("Sort usings"), script =>
+			{
+				var blocks = EnumerateUsingBlocks(context.RootNode);
+
+				foreach (var block in blocks)
+				{
+					var originalNodes = block.ToArray();
+					var sortedNodes = UsingHelper.SortUsingBlock(originalNodes, context).ToArray();
+
+					for (var i = 0; i < originalNodes.Length; ++i)
+						script.Replace(originalNodes[i], sortedNodes[i].Clone());
+				}
+			}, usingNode);
+		}
+
+		private static AstNode FindUsingNodeAtCursor(RefactoringContext context)
+		{
+			// If cursor is inside using declaration
+			var locationAsIs = context.Location;
+			// If cursor is at end of line with using declaration
+			var locationLeft = new TextLocation(locationAsIs.Line, locationAsIs.Column - 1);
+
+			var possibleNodes = new[] { locationAsIs, locationLeft }
+				.Select(_ => context.RootNode.GetNodeAt(_, IsUsingDeclaration));
+			var usingNode = possibleNodes.Where(_ => _ != null).Distinct().SingleOrDefault();
+
+			return usingNode;
+		}
+
+		private static bool IsUsingDeclaration(AstNode node)
+		{
+			return node is UsingDeclaration || node is UsingAliasDeclaration;
+		}
+
+		private static IEnumerable<IEnumerable<AstNode>> EnumerateUsingBlocks(AstNode root)
+		{
+			var alreadyAddedNodes = new HashSet<AstNode>();
+
+			foreach (var child in root.Descendants)
+				if (IsUsingDeclaration(child) && !alreadyAddedNodes.Contains(child)) {
+					var blockNodes = EnumerateUsingBlockNodes(child);
+
+					alreadyAddedNodes.UnionWith(blockNodes);
+					yield return blockNodes;
+				}
+		}
+
+		private static IEnumerable<AstNode> EnumerateUsingBlockNodes(AstNode firstNode)
+		{
+			for (var node = firstNode; IsUsingDeclaration(node); node = node.GetNextSibling (n => n.Role != Roles.NewLine))
+				yield return node;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SpecializedCodeAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SpecializedCodeAction.cs
new file mode 100644
index 0000000000..603a476116
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SpecializedCodeAction.cs
@@ -0,0 +1,38 @@
+using System;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// A specialized code action creates a code action assoziated with one special type of ast nodes.
+	/// </summary>
+	public abstract class SpecializedCodeAction<T> : CodeActionProvider where T : AstNode
+	{
+		/// <summary>
+		/// Gets the action for the specified ast node.
+		/// </summary>
+		/// <returns>
+		/// The code action. May return <c>null</c>, if no action can be provided.
+		/// </returns>
+		/// <param name='context'>
+		/// The refactoring conext.
+		/// </param>
+		/// <param name='node'>
+		/// The AstNode it's ensured that the node is always != null, if called.
+		/// </param>
+		protected abstract CodeAction GetAction(RefactoringContext context, T node);
+
+		#region ICodeActionProvider implementation
+		public override System.Collections.Generic.IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var node = context.GetNode<T>();
+			if (node == null)
+				yield break;
+			var action = GetAction(context, node);
+			if (action == null)
+				yield break;
+			yield return action;
+		}
+		#endregion
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SplitDeclarationAndAssignmentAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SplitDeclarationAndAssignmentAction.cs
new file mode 100644
index 0000000000..f3fd5ca009
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SplitDeclarationAndAssignmentAction.cs
@@ -0,0 +1,90 @@
+//
+// SplitDeclarationAndAssignmentAction.cs
+// 
+// SplitDeclarationAndAssignment.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Threading;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Split local variable declaration and assignment", Description = "Splits local variable declaration and assignment.")]
+	public class SplitDeclarationAndAssignmentAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			if (context.IsSomethingSelected) {
+				yield break;
+			}
+			AstType type;
+			var varInitializer = GetVariableDeclarationStatement(context, out type);
+			if (varInitializer == null)
+				yield break;
+			var statement = varInitializer.GetParent<Statement>();
+			var declaration = varInitializer.GetParent<VariableDeclarationStatement>();
+			if (declaration == null || (declaration.Modifiers & Modifiers.Const) != 0)
+				yield break;
+
+			var selectedNode = varInitializer.GetNodeAt(context.Location) ?? varInitializer;
+
+			yield return new CodeAction(context.TranslateString("Split local variable declaration and assignment"), script => {
+				var assign = new AssignmentExpression (new IdentifierExpression (varInitializer.Name), AssignmentOperatorType.Assign, varInitializer.Initializer.Clone());
+
+				if (declaration != null && declaration.Type.IsVar())
+					script.Replace(declaration.Type, type);
+				if (declaration.Parent is ForStatement) {
+					script.InsertBefore(statement, new VariableDeclarationStatement (type, varInitializer.Name));
+					script.Replace(declaration, assign);
+				} else {
+					script.Replace(varInitializer, new IdentifierExpression (varInitializer.Name));
+					script.InsertAfter(statement, new ExpressionStatement (assign));
+				}
+
+			}, selectedNode);
+		}
+		
+		static VariableInitializer GetVariableDeclarationStatement (RefactoringContext context, out AstType resolvedType, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var result = context.GetNode<VariableInitializer> ();
+			if (result != null && !result.Initializer.IsNull && context.Location <= result.Initializer.StartLocation) {
+				var type = context.Resolve(result).Type;
+				if (type.Equals(SpecialType.NullType) || type.Equals(SpecialType.UnknownType)) {
+					resolvedType = new PrimitiveType ("object");
+				} else {
+					resolvedType = context.CreateShortType (type);
+				}
+				return result;
+			}
+			resolvedType = null;
+			return null;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SplitDeclarationListAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SplitDeclarationListAction.cs
new file mode 100644
index 0000000000..a881d05f1f
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SplitDeclarationListAction.cs
@@ -0,0 +1,93 @@
+// 
+// SplitDeclarationListAction.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction ("Split declaration list", 
+		Description = "Split variable declaration with multiple variables into declarations with a single variable")] 
+	public class SplitDeclarationListAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions (RefactoringContext context)
+		{
+			// field, local var, event, fixed var, fixed field
+
+			// local variable
+			var variableDecl = context.GetNode<VariableDeclarationStatement> ();
+			if (variableDecl != null && variableDecl.Parent is BlockStatement) {
+				return GetAction (context, variableDecl, v => v.Variables);
+			}
+
+			// field
+			var fieldDecl = context.GetNode<FieldDeclaration> ();
+			if (fieldDecl != null)
+				return GetAction (context, fieldDecl, f => f.Variables);
+
+			// event
+			var eventDecl = context.GetNode<EventDeclaration> ();
+			if (eventDecl != null)
+				return GetAction (context, eventDecl, e => e.Variables);
+
+			// fixed field
+			var fixedFieldDecl = context.GetNode<FixedFieldDeclaration> ();
+			if (fixedFieldDecl != null)
+				return GetAction (context, fixedFieldDecl, f => f.Variables);
+
+			return Enumerable.Empty<CodeAction> ();
+		}
+
+		IEnumerable<CodeAction> GetAction<T, S> (RefactoringContext context, T decl, 
+												 Func<T, AstNodeCollection<S>> getInitializers)
+			where T : AstNode
+			where S : AstNode
+		{
+			var initializers = getInitializers(decl);
+			if (initializers.Count < 2)
+				yield break;
+
+			yield return new CodeAction (context.TranslateString ("Split declaration list"),
+				script =>
+				{
+					var emptyDecl = (T)decl.Clone ();
+					getInitializers (emptyDecl).Clear ();
+
+					var declList = initializers.Select (v =>
+					{
+						var singleDecl = (T)emptyDecl.Clone ();
+						getInitializers(singleDecl).Add ((S)v.Clone ());
+						return singleDecl;
+					});
+
+					foreach (var singleDecl in declList)
+						script.InsertBefore (decl, singleDecl);
+					script.Remove (decl);
+				}, decl);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SplitIfAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SplitIfAction.cs
new file mode 100644
index 0000000000..1a88478bd1
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SplitIfAction.cs
@@ -0,0 +1,114 @@
+//
+// SplitIfAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction ("Split 'if' statement", 
+	                Description = "Splits an if statement into two nested if statements")] 
+	public class SplitIfAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions (RefactoringContext context)
+		{
+			var ifStatement = context.GetNode<IfElseStatement>();
+			if (ifStatement == null)
+				yield break;
+			var bOp = ifStatement.GetNodeAt<BinaryOperatorExpression>(context.Location);
+			if (bOp == null || !bOp.OperatorToken.Contains(context.Location))
+				yield break;
+			if (bOp.Ancestors.OfType<BinaryOperatorExpression>().Any(b => b.Operator != bOp.Operator))
+				yield break;
+			if (bOp.Operator == BinaryOperatorType.ConditionalAnd) {
+				yield return CreateAndSplit(context, ifStatement, bOp);
+			} else if (bOp.Operator == BinaryOperatorType.ConditionalOr) {
+				yield return CreateOrSplit(context, ifStatement, bOp);
+			}
+		}
+
+		static CodeAction CreateAndSplit(RefactoringContext context, IfElseStatement ifStatement, BinaryOperatorExpression bOp)
+		{
+			return new CodeAction(
+				context.TranslateString("Split if"),
+				script => {
+					var nestedIf = (IfElseStatement)ifStatement.Clone();
+					nestedIf.Condition = GetRightSide(bOp); 
+					script.Replace(ifStatement.Condition, GetLeftSide(bOp));
+					script.Replace(ifStatement.TrueStatement, new BlockStatement { nestedIf });
+				},
+				bOp.OperatorToken
+			);
+		}
+
+		static CodeAction CreateOrSplit(RefactoringContext context, IfElseStatement ifStatement, BinaryOperatorExpression bOp)
+		{
+			return new CodeAction(
+				context.TranslateString("Split if"),
+				script => {
+					var newElse = (IfElseStatement)ifStatement.Clone();
+					newElse.Condition = GetRightSide(bOp); 
+					
+					var newIf = (IfElseStatement)ifStatement.Clone();
+					newIf.Condition = GetLeftSide(bOp); 
+					newIf.FalseStatement = newElse;
+
+					script.Replace(ifStatement, newIf);
+					script.FormatText(newIf);
+				},
+				bOp.OperatorToken
+			);
+		}
+
+		internal static Expression GetRightSide(BinaryOperatorExpression expression)
+		{
+			var parent = expression.Parent as BinaryOperatorExpression;
+			if (parent != null) {
+				if (parent.Left == expression) {
+					var parentClone = (BinaryOperatorExpression)parent.Clone();
+					parentClone.Left = expression.Right.Clone();
+					return parentClone;
+				}
+
+			}
+			return expression.Right.Clone();
+		}
+
+		internal static Expression GetLeftSide(BinaryOperatorExpression expression)
+		{
+			var parent = expression.Parent as BinaryOperatorExpression;
+			if (parent != null) {
+				if (parent.Right == expression) {
+					var parentClone = (BinaryOperatorExpression)parent.Clone();
+					parentClone.Right = expression.Left.Clone();
+					return parentClone;
+				}
+			}
+			return expression.Left.Clone();
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SplitStringAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SplitStringAction.cs
new file mode 100644
index 0000000000..b5376516f8
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/SplitStringAction.cs
@@ -0,0 +1,61 @@
+// 
+// SplitString.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Split string literal", Description = "Splits string literal into two.")]
+	public class SplitStringAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			if (context.IsSomethingSelected) {
+				yield break;
+			}
+			var pexpr = context.GetNode<PrimitiveExpression>();
+			if (pexpr == null || !(pexpr.Value is string)) {
+				yield break;
+			}
+			if (pexpr.LiteralValue.StartsWith("@", StringComparison.Ordinal)) {
+				if (!(pexpr.StartLocation < new TextLocation(context.Location.Line, context.Location.Column - 2) &&
+					new TextLocation(context.Location.Line, context.Location.Column + 2) < pexpr.EndLocation)) {
+					yield break;
+				}
+			} else {
+				if (!(pexpr.StartLocation < new TextLocation(context.Location.Line, context.Location.Column - 1) && new TextLocation(context.Location.Line, context.Location.Column + 1) < pexpr.EndLocation)) {
+					yield break;
+				}
+			}
+
+			yield return new CodeAction(context.TranslateString("Split string literal"), script => {
+				int offset = context.GetOffset (context.Location);
+				script.InsertText (offset, pexpr.LiteralValue.StartsWith("@", StringComparison.Ordinal) ? "\" + @\"" : "\" + \"");
+			}, pexpr);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/UseAsAndNullCheckAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/UseAsAndNullCheckAction.cs
new file mode 100644
index 0000000000..8046091b1c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/UseAsAndNullCheckAction.cs
@@ -0,0 +1,281 @@
+//
+// UseAsAndNullCheckAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction(
+		"Use 'as' and null check", 
+		Description = "Converts a 'is' into an 'as' and null check")]
+	public class UseAsAndNullCheckAction : SpecializedCodeAction<IfElseStatement>
+	{
+		static readonly AstNode pattern = 
+			new IfElseStatement(
+				new NamedNode ("isExpression", PatternHelper.OptionalParentheses(new IsExpression(PatternHelper.OptionalParentheses(new AnyNode()), PatternHelper.AnyType()))),
+				new AnyNode("embedded"),
+				new AnyNodeOrNull()
+			);
+
+		static readonly AstNode negatedPattern = 
+			new IfElseStatement(
+				new UnaryOperatorExpression (UnaryOperatorType.Not, new NamedNode ("isExpression", PatternHelper.OptionalParentheses(new IsExpression(PatternHelper.OptionalParentheses(new AnyNode()), PatternHelper.AnyType())))),
+				PatternHelper.EmbeddedStatement(new Choice { new ReturnStatement (new AnyNodeOrNull()), new BreakStatement (), new ContinueStatement () } ),
+				new AnyNodeOrNull()
+			);
+
+
+		internal static bool IsEmbeddedStatement(AstNode stmt)
+		{
+			return stmt.Role == Roles.EmbeddedStatement || 
+				stmt.Role == IfElseStatement.TrueRole || 
+				stmt.Role == IfElseStatement.FalseRole;
+		}
+
+		static CodeAction HandleNegatedCase(BaseRefactoringContext ctx, IfElseStatement ifElseStatement, Match match, out IsExpression isExpression, out int foundCastCount)
+		{
+			foundCastCount = 0;
+			var outerIs          = match.Get<Expression>("isExpression").Single();
+			isExpression         = CSharpUtil.GetInnerMostExpression(outerIs) as IsExpression;
+			var obj              = CSharpUtil.GetInnerMostExpression(isExpression.Expression);
+			var castToType       = isExpression.Type;
+
+			var cast = new Choice {
+				PatternHelper.OptionalParentheses(PatternHelper.OptionalParentheses(obj.Clone()).CastTo(castToType.Clone())),
+				PatternHelper.OptionalParentheses(PatternHelper.OptionalParentheses(obj.Clone()).CastAs(castToType.Clone()))
+			};
+
+			var rr = ctx.Resolve(castToType);
+			if (rr == null || rr.IsError || rr.Type.IsReferenceType == false)
+				return null;
+			var foundCasts = ifElseStatement.GetParent<BlockStatement>().DescendantNodes(n => n.StartLocation >= ifElseStatement.StartLocation && !cast.IsMatch(n)).Where(n => cast.IsMatch(n)).ToList();
+			foundCastCount = foundCasts.Count;
+
+			return new CodeAction(ctx.TranslateString("Use 'as' and check for null"), script =>  {
+				var varName = ctx.GetNameProposal(CreateMethodDeclarationAction.GuessNameFromType(rr.Type), ifElseStatement.StartLocation);
+				var varDec = new VariableDeclarationStatement(new PrimitiveType("var"), varName, new AsExpression(obj.Clone(), castToType.Clone()));
+				var binaryOperatorIdentifier = new IdentifierExpression(varName);
+				var binaryOperatorExpression = new BinaryOperatorExpression(binaryOperatorIdentifier, BinaryOperatorType.Equality, new NullReferenceExpression());
+				var linkedNodes = new List<AstNode>();
+				linkedNodes.Add(varDec.Variables.First().NameToken);
+				linkedNodes.Add(binaryOperatorIdentifier);
+				if (IsEmbeddedStatement(ifElseStatement)) {
+					var block = new BlockStatement();
+					block.Add(varDec);
+					var newIf = (IfElseStatement)ifElseStatement.Clone();
+					newIf.Condition = binaryOperatorExpression;
+					foreach (var node in newIf.DescendantNodesAndSelf(n => !cast.IsMatch(n)).Where(n => cast.IsMatch(n))) {
+						var id = new IdentifierExpression(varName);
+						linkedNodes.Add(id);
+						node.ReplaceWith(id);
+					}
+					block.Add(newIf);
+					script.Replace(ifElseStatement, block);
+				}
+				else {
+					script.InsertBefore(ifElseStatement, varDec);
+					script.Replace(ifElseStatement.Condition, binaryOperatorExpression);
+					foreach (var c in foundCasts) {
+						var id = new IdentifierExpression(varName);
+						linkedNodes.Add(id);
+						script.Replace(c, id);
+					}
+				}
+				script.Link(linkedNodes);
+			}, isExpression.IsToken);
+
+		}
+
+		internal static CodeAction ScanIfElse (BaseRefactoringContext ctx, IfElseStatement ifElseStatement, out IsExpression isExpression, out int foundCastCount)
+		{
+			foundCastCount = 0;
+			var match = pattern.Match(ifElseStatement);
+			if (!match.Success) {
+				match = negatedPattern.Match(ifElseStatement);
+				if (match.Success)
+					return HandleNegatedCase(ctx, ifElseStatement, match, out isExpression, out foundCastCount);
+				isExpression = null;
+				return null;
+			}
+
+			var outerIs          = match.Get<Expression>("isExpression").Single();
+			isExpression         = CSharpUtil.GetInnerMostExpression(outerIs) as IsExpression;
+			var obj              = CSharpUtil.GetInnerMostExpression(isExpression.Expression);
+			var castToType       = isExpression.Type;
+			var embeddedStatment = match.Get<Statement>("embedded").Single();
+
+			var cast = new Choice {
+				PatternHelper.OptionalParentheses(PatternHelper.OptionalParentheses(obj.Clone()).CastTo(castToType.Clone())),
+				PatternHelper.OptionalParentheses(PatternHelper.OptionalParentheses(obj.Clone()).CastAs(castToType.Clone()))
+			};
+
+			var rr = ctx.Resolve(castToType);
+			if (rr == null || rr.IsError || rr.Type.IsReferenceType == false)
+				return null;
+			var foundCasts = embeddedStatment.DescendantNodesAndSelf(n => !cast.IsMatch(n)).Where(n => cast.IsMatch(n)).ToList();
+			foundCastCount = foundCasts.Count;
+
+			return new CodeAction(ctx.TranslateString("Use 'as' and check for null"), script =>  {
+				var varName = ctx.GetNameProposal(CreateMethodDeclarationAction.GuessNameFromType(rr.Type), ifElseStatement.StartLocation);
+				var varDec = new VariableDeclarationStatement(new PrimitiveType("var"), varName, new AsExpression(obj.Clone(), castToType.Clone()));
+				var binaryOperatorIdentifier = new IdentifierExpression(varName);
+				var binaryOperatorExpression = new BinaryOperatorExpression(binaryOperatorIdentifier, BinaryOperatorType.InEquality, new NullReferenceExpression());
+				var linkedNodes = new List<AstNode>();
+				linkedNodes.Add(varDec.Variables.First().NameToken);
+				linkedNodes.Add(binaryOperatorIdentifier);
+				if (IsEmbeddedStatement(ifElseStatement)) {
+					var block = new BlockStatement();
+					block.Add(varDec);
+					var newIf = (IfElseStatement)ifElseStatement.Clone();
+					newIf.Condition = binaryOperatorExpression;
+					foreach (var node in newIf.DescendantNodesAndSelf(n => !cast.IsMatch(n)).Where(n => cast.IsMatch(n))) {
+						var id = new IdentifierExpression(varName);
+						linkedNodes.Add(id);
+						node.ReplaceWith(id);
+					}
+					block.Add(newIf);
+					script.Replace(ifElseStatement, block);
+				}
+				else {
+					script.InsertBefore(ifElseStatement, varDec);
+					script.Replace(outerIs, binaryOperatorExpression);
+					foreach (var c in foundCasts) {
+						var id = new IdentifierExpression(varName);
+						linkedNodes.Add(id);
+						script.Replace(c, id);
+					}
+				}
+				script.Link(linkedNodes);
+			}, isExpression.IsToken);
+
+		}
+
+		static List<AstNode> SearchCasts(RefactoringContext ctx, Statement embeddedStatement, Expression obj, AstType type, out ResolveResult rr)
+		{
+			var cast = new Choice {
+				PatternHelper.OptionalParentheses(PatternHelper.OptionalParentheses(obj.Clone()).CastTo(type.Clone())),
+				PatternHelper.OptionalParentheses(PatternHelper.OptionalParentheses(obj.Clone()).CastAs(type.Clone()))
+			};
+
+			rr = ctx.Resolve(type);
+			if (rr == null || rr.IsError)
+				return null;
+			return embeddedStatement.DescendantNodesAndSelf(n => !cast.IsMatch(n)).Where(n => cast.IsMatch(n)).ToList();
+		}
+
+		protected override CodeAction GetAction(RefactoringContext ctx, IfElseStatement ifElseStatement)
+		{
+			var isExpr = ctx.GetNode<IsExpression>();
+			if (isExpr == null || !isExpr.IsToken.Contains(ctx.Location))
+				return null;
+
+			int foundCasts;
+			var action = ScanIfElse(ctx, ifElseStatement, out isExpr, out foundCasts);
+			if (action != null)
+				return action;
+
+			isExpr = ctx.GetNode<IsExpression>();
+			var node = isExpr.Parent;
+			while (node is ParenthesizedExpression)
+				node = node.Parent;
+			var uOp = node as UnaryOperatorExpression;
+			if (uOp != null && uOp.Operator == UnaryOperatorType.Not) {
+				var rr = ctx.Resolve(isExpr.Type);
+				if (rr == null || rr.IsError || rr.Type.IsReferenceType == false)
+					return null;
+
+				return new CodeAction(ctx.TranslateString("Use 'as' and check for null"), script =>  {
+					var varName = ctx.GetNameProposal(CreateMethodDeclarationAction.GuessNameFromType(rr.Type), ifElseStatement.StartLocation);
+					var varDec = new VariableDeclarationStatement(new PrimitiveType("var"), varName, new AsExpression(isExpr.Expression.Clone(), isExpr.Type.Clone()));
+					var binaryOperatorIdentifier = new IdentifierExpression(varName);
+					var binaryOperatorExpression = new BinaryOperatorExpression(binaryOperatorIdentifier, BinaryOperatorType.Equality, new NullReferenceExpression());
+					if (IsEmbeddedStatement(ifElseStatement)) {
+						var block = new BlockStatement();
+						block.Add(varDec);
+						var newIf = (IfElseStatement)ifElseStatement.Clone();
+						newIf.Condition = binaryOperatorExpression;
+						block.Add(newIf);
+						script.Replace(ifElseStatement, block);
+					}
+					else {
+						script.InsertBefore(ifElseStatement, varDec);
+						script.Replace(uOp, binaryOperatorExpression);
+					}
+				}, isExpr.IsToken);
+			}
+
+			var obj = isExpr.Expression;
+			var castToType = isExpr.Type;
+
+			var cast = new Choice {
+				PatternHelper.OptionalParentheses(PatternHelper.OptionalParentheses(obj.Clone()).CastTo(castToType.Clone())),
+				PatternHelper.OptionalParentheses(PatternHelper.OptionalParentheses(obj.Clone()).CastAs(castToType.Clone()))
+			};
+
+			var rr2 = ctx.Resolve(castToType);
+			if (rr2 == null || rr2.IsError || rr2.Type.IsReferenceType == false)
+				return null;
+			var foundCasts2 = isExpr.GetParent<Statement>().DescendantNodesAndSelf(n => !cast.IsMatch(n)).Where(n => isExpr.StartLocation < n.StartLocation && cast.IsMatch(n)).ToList();
+
+			return new CodeAction(ctx.TranslateString("Use 'as' and check for null"), script =>  {
+				var varName = ctx.GetNameProposal(CreateMethodDeclarationAction.GuessNameFromType(rr2.Type), ifElseStatement.StartLocation);
+				var varDec = new VariableDeclarationStatement(new PrimitiveType("var"), varName, new AsExpression(obj.Clone(), castToType.Clone()));
+				var binaryOperatorIdentifier = new IdentifierExpression(varName);
+				var binaryOperatorExpression = new BinaryOperatorExpression(binaryOperatorIdentifier, BinaryOperatorType.InEquality, new NullReferenceExpression());
+				var linkedNodes = new List<AstNode>();
+				linkedNodes.Add(varDec.Variables.First().NameToken);
+				linkedNodes.Add(binaryOperatorIdentifier);
+				if (IsEmbeddedStatement(ifElseStatement)) {
+					var block = new BlockStatement();
+					block.Add(varDec);
+					var newIf = (IfElseStatement)ifElseStatement.Clone();
+					newIf.Condition = binaryOperatorExpression;
+					foreach (var node2 in newIf.DescendantNodesAndSelf(n => !cast.IsMatch(n)).Where(n => cast.IsMatch(n))) {
+						var id = new IdentifierExpression(varName);
+						linkedNodes.Add(id);
+						node2.ReplaceWith(id);
+					}
+					block.Add(newIf);
+					script.Replace(ifElseStatement, block);
+				}
+				else {
+					script.InsertBefore(ifElseStatement, varDec);
+					script.Replace(isExpr, binaryOperatorExpression);
+					foreach (var c in foundCasts2) {
+						var id = new IdentifierExpression(varName);
+						linkedNodes.Add(id);
+						script.Replace(c, id);
+					}
+				}
+				script.Link(linkedNodes);
+			}, isExpr.IsToken);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/UseExplicitTypeAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/UseExplicitTypeAction.cs
new file mode 100644
index 0000000000..1aeb517f2d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/UseExplicitTypeAction.cs
@@ -0,0 +1,97 @@
+// 
+// UseExplicitType.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Use explicit type", Description = "Converts local variable declaration to be explicit typed.")]
+	public class UseExplicitTypeAction: CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var varDecl = GetVariableDeclarationStatement(context);
+			AstNode node;
+			IType type;
+			if (varDecl != null) {
+				type = context.Resolve(varDecl.Variables.First().Initializer).Type;
+				node = varDecl;
+			} else {
+				var foreachStatement = GetForeachStatement(context);
+				if (foreachStatement == null) {
+					yield break;
+				}
+				type = context.Resolve(foreachStatement.VariableType).Type;
+				node = foreachStatement;
+			}
+
+			if (!(!type.Equals(SpecialType.NullType) && !type.Equals(SpecialType.UnknownType) && !ContainsAnonymousType(type))) {
+				yield break;
+			}
+			yield return new CodeAction (context.TranslateString("Use explicit type"), script => {
+				if (varDecl != null) {
+					script.Replace (varDecl.Type, context.CreateShortType (type));
+				} else {
+					var foreachStatement = GetForeachStatement (context);
+					script.Replace (foreachStatement.VariableType, context.CreateShortType (type));
+				}
+			}, node);
+		}
+
+		static bool ContainsAnonymousType (IType type)
+		{
+			if (type.Kind == TypeKind.Anonymous)
+				return true;
+
+			var arrayType = type as ArrayType;
+			return arrayType != null && ContainsAnonymousType (arrayType.ElementType);
+		}
+
+		static VariableDeclarationStatement GetVariableDeclarationStatement (RefactoringContext context)
+		{
+			var result = context.GetNode<VariableDeclarationStatement> ();
+			if (result != null && result.Variables.Count == 1 && !result.Variables.First ().Initializer.IsNull && result.Type.Contains (context.Location.Line, context.Location.Column) && result.Type.IsVar ()) {
+				if (context.Resolve (result.Variables.First ().Initializer) == null)
+					return null;
+				return result;
+			}
+			return null;
+		}
+		
+		static ForeachStatement GetForeachStatement (RefactoringContext context)
+		{
+			var result = context.GetNode<ForeachStatement> ();
+			if (result != null && result.VariableType.Contains (context.Location) && result.VariableType.IsVar ())
+				return result;
+			return null;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/UseStringFormatAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/UseStringFormatAction.cs
new file mode 100644
index 0000000000..51112a0124
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/UseStringFormatAction.cs
@@ -0,0 +1,220 @@
+//
+// UseStringFormatAction.cs
+//
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+//
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Text;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Use string.Format()",
+	                Description = "Convert concatenation of strings and objects to string.Format()")]
+	public class UseStringFormatAction : CodeActionProvider
+	{
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			// NOTE: @, multiple occurance
+			var node = context.GetNode();
+			while (node != null && !IsStringConcatenation(context, node as BinaryOperatorExpression))
+				node = node.Parent;
+
+			if (node == null)
+				yield break;
+
+			var expr = (BinaryOperatorExpression)node;
+			var parent = expr.Parent as BinaryOperatorExpression;
+			while (parent != null && parent.Operator == BinaryOperatorType.Add) {
+				expr = parent;
+				parent = expr.Parent as BinaryOperatorExpression;
+			}
+
+			yield return new CodeAction(context.TranslateString("Use 'string.Format()'"),
+			                             script => {
+				var stringType = new PrimitiveType("string");
+				var formatInvocation = new InvocationExpression(
+					new MemberReferenceExpression(stringType, "Format"));
+				var formatLiteral = new PrimitiveExpression("");
+				var counter = 0;
+				var arguments = new List<Expression>();
+
+				formatInvocation.Arguments.Add(formatLiteral);
+				var concatItems = GetConcatItems(context, expr);
+				bool hasVerbatimStrings = false;
+				bool hasNonVerbatimStrings = false;
+
+				foreach (var item in concatItems) {
+					if (IsStringLiteral(item)) {
+						var stringLiteral = (PrimitiveExpression)item;
+						if (stringLiteral.LiteralValue[0] == '@') {
+							hasVerbatimStrings = true;
+						} else {
+							hasNonVerbatimStrings = true;
+						}
+					}
+				}
+					
+				var format = new StringBuilder();
+				var verbatim = hasVerbatimStrings && hasNonVerbatimStrings;
+				format.Append('"');
+				foreach (var item in concatItems) {
+					if (IsStringLiteral(item)) {
+						var stringLiteral = (PrimitiveExpression)item;
+
+						string rawLiteral;
+						if (hasVerbatimStrings && hasNonVerbatimStrings) {
+							rawLiteral = stringLiteral.Value.ToString().Replace("\"", "\"\"");
+						} else {
+							if (stringLiteral.LiteralValue[0] == '@') {
+								verbatim = true;
+								rawLiteral = stringLiteral.LiteralValue.Substring(2, stringLiteral.LiteralValue.Length - 3);
+							} else {
+								rawLiteral = stringLiteral.LiteralValue.Substring(1, stringLiteral.LiteralValue.Length - 2);
+							}
+						}
+						format.Append(QuoteBraces(rawLiteral));
+					} else {
+						Expression myItem = RemoveUnnecessaryToString(item);
+						string itemFormatStr = DetermineItemFormatString(ref myItem);
+							
+						var index = IndexOf(arguments, myItem);
+						if (index == -1) {
+							// new item
+							formatInvocation.Arguments.Add(myItem.Clone());
+							arguments.Add(item);
+							format.Append("{" + counter++ + itemFormatStr + "}");
+						} else {
+							// existing item
+							format.Append("{" + index + itemFormatStr + "}");
+						}
+					}
+				}
+				format.Append('"');
+				if (verbatim)
+					format.Insert(0, '@');
+				formatLiteral.LiteralValue = format.ToString();
+				if (arguments.Count > 0)
+					script.Replace(expr, formatInvocation);
+				else
+					script.Replace(expr, formatLiteral);
+			}, node);
+		}
+
+		Expression RemoveUnnecessaryToString(Expression myItem)
+		{
+			if (myItem is InvocationExpression) {
+				InvocationExpression invocation = (InvocationExpression)myItem;
+				if (invocation.Target is MemberReferenceExpression &&
+					((MemberReferenceExpression)invocation.Target).MemberName.Equals("ToString") &&
+					invocation.Arguments.Count == 0) {
+					myItem = invocation.Target.FirstChild as Expression;
+				}
+                
+			}
+			return myItem;
+		}
+
+		string QuoteBraces(string rawLiteral)
+		{
+			if (!rawLiteral.Contains("{") && !rawLiteral.Contains("}"))
+				return rawLiteral;
+
+			StringBuilder quoted = new StringBuilder();
+			for (int i = 0; i < rawLiteral.Length; i++) {
+				char c = rawLiteral[i];
+				if (c == '{')
+					quoted.Append("{{");
+				else if (c == '}')
+					quoted.Append("}}");
+				else
+					quoted.Append(c);
+			}
+			return quoted.ToString();
+		}
+
+		static string DetermineItemFormatString(ref Expression myItem)
+		{
+			if (myItem is InvocationExpression) {
+				InvocationExpression invocation = myItem as InvocationExpression;
+				if (invocation.Target is MemberReferenceExpression &&
+					((MemberReferenceExpression)invocation.Target).MemberName.Equals("ToString") &&
+					invocation.Arguments.Count == 1) {
+					IEnumerator<Expression> i = invocation.Arguments.GetEnumerator();
+					i.MoveNext();
+					Expression arg = i.Current;
+					if (IsStringLiteral(arg) && invocation.Target.FirstChild is Expression) {
+						string formatStr = ((PrimitiveExpression)arg).Value as string;
+						myItem = invocation.Target.FirstChild as Expression; // invocation target identifier is first child
+						return ":" + formatStr;
+					}
+				}
+			}
+            
+			return "";
+		}
+
+		static int IndexOf(IList<Expression> arguments, Expression item)
+		{
+			for (int i = 0; i < arguments.Count; i++) {
+				if (item.Match(arguments[i]).Success)
+					return i;
+			}
+			return -1;
+		}
+
+		static IEnumerable<Expression> GetConcatItems(RefactoringContext context, BinaryOperatorExpression expr)
+		{
+			var leftExpr = expr.Left as BinaryOperatorExpression;
+			if (IsStringConcatenation(context, leftExpr)) {
+				foreach (var item in GetConcatItems (context, leftExpr))
+					yield return item;
+			} else {
+				yield return expr.Left;
+			}
+
+			var rightExpr = expr.Right as BinaryOperatorExpression;
+			if (IsStringConcatenation(context, rightExpr)) {
+				foreach (var item in GetConcatItems (context, rightExpr))
+					yield return item;
+			} else {
+				yield return expr.Right;
+			}
+		}
+
+		static bool IsStringConcatenation(RefactoringContext context, BinaryOperatorExpression expr)
+		{
+			if (expr == null || expr.Operator != BinaryOperatorType.Add)
+				return false;
+			var typeDef = context.Resolve(expr).Type.GetDefinition();
+			return typeDef != null && typeDef.KnownTypeCode == KnownTypeCode.String;
+		}
+
+		static bool IsStringLiteral(AstNode node)
+		{
+			var expr = node as PrimitiveExpression;
+			return expr != null && expr.Value is string;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/UseVarKeywordAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/UseVarKeywordAction.cs
new file mode 100644
index 0000000000..86aa6e5004
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/UseVarKeywordAction.cs
@@ -0,0 +1,75 @@
+// 
+// UseVarKeyword.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Use 'var' keyword",
+	               Description = "Converts local variable declaration to be implicit typed.")]
+	public class UseVarKeywordAction : CodeActionProvider
+	{
+		internal static readonly Version minimumVersion = new Version (3, 0, 0);
+
+		public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			if (!context.Supports(minimumVersion))
+				yield break;
+			var varDecl = GetVariableDeclarationStatement(context);
+			var foreachStmt = GetForeachStatement(context);
+			if (varDecl == null && foreachStmt == null) {
+				yield break;
+			}
+			yield return new CodeAction(context.TranslateString("Use 'var' keyword"), script => {
+				if (varDecl != null) {
+					script.Replace(varDecl.Type, new SimpleType ("var"));
+				} else {
+					script.Replace(foreachStmt.VariableType, new SimpleType ("var"));
+				}
+			}, (AstNode)varDecl ?? foreachStmt);
+		}
+		
+		static VariableDeclarationStatement GetVariableDeclarationStatement (RefactoringContext context)
+		{
+			var result = context.GetNode<VariableDeclarationStatement> ();
+			if (result != null && result.Variables.Count == 1 && !result.Variables.First ().Initializer.IsNull && result.Type.Contains (context.Location) && !result.Type.IsVar ())
+				return result;
+			return null;
+		}
+		
+		static ForeachStatement GetForeachStatement (RefactoringContext context)
+		{
+			var result = context.GetNode<ForeachStatement> ();
+			if (result != null && result.VariableType.Contains (context.Location) && !result.VariableType.IsVar ())
+				return result;
+			return null;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/AdditionalOfTypeIssues.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/AdditionalOfTypeIssues.cs
new file mode 100644
index 0000000000..9c24772530
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/AdditionalOfTypeIssues.cs
@@ -0,0 +1,104 @@
+//
+// AdditionalOfTypeIssues.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with OfType<T> (extended)",
+	                  Description = "Replace with call to OfType<T> (extended cases)",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Hint)]
+	public class AdditionalOfTypeIssues : GatherVisitorCodeIssueProvider
+	{
+		static readonly AstNode whereSimpleCase =
+			new InvocationExpression(
+				new MemberReferenceExpression(new AnyNode("target"), "Where"),
+				new NamedNode("lambda", 
+					new LambdaExpression {
+						Parameters = { PatternHelper.NamedParameter("param1", PatternHelper.AnyType("paramType", true), Pattern.AnyString) },
+						Body = PatternHelper.OptionalParentheses(
+								new IsExpression(PatternHelper.OptionalParentheses(new NamedNode("expr1", new IdentifierExpression(Pattern.AnyString))), new AnyNode("type"))
+						)
+					}
+				)
+			);
+
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<AdditionalOfTypeIssues>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitInvocationExpression (InvocationExpression anyInvoke)
+			{
+				var match = ReplaceWithOfTypeIssue.selectNotNullPattern.Match (anyInvoke);
+				if (match.Success)
+					return;
+
+				match = ReplaceWithOfTypeIssue.wherePatternCase1.Match (anyInvoke);
+				if (match.Success)
+					return;
+
+				match = ReplaceWithOfTypeIssue.wherePatternCase2.Match (anyInvoke); 
+				if (match.Success)
+					return;
+
+				// Warning: The simple case is not 100% equal in semantic, but it's one common code smell
+				match = whereSimpleCase.Match (anyInvoke); 
+				if (!match.Success)
+					return;
+				var lambda = match.Get<LambdaExpression>("lambda").Single();
+				var expr = match.Get<IdentifierExpression>("expr1").Single();
+				if (lambda.Parameters.Count != 1)
+					return;
+				if (expr.Identifier != lambda.Parameters.Single().Name)
+					return;
+				AddIssue (new CodeIssue(
+					anyInvoke,
+					ctx.TranslateString("Replace with OfType<T>"),
+					ctx.TranslateString("Replace with call to OfType<T>"),
+					script => {
+						var target = match.Get<Expression>("target").Single().Clone ();
+						var type = match.Get<AstType>("type").Single().Clone();
+						script.Replace(anyInvoke, new InvocationExpression(new MemberReferenceExpression(target, "OfType", type)));
+					}
+				));
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/BaseMethodParameterNameMismatchIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/BaseMethodParameterNameMismatchIssue.cs
new file mode 100644
index 0000000000..78580e90e0
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/BaseMethodParameterNameMismatchIssue.cs
@@ -0,0 +1,129 @@
+//
+// BaseMethodParameterNameMismatchIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription(
+		"Parameter name differs in base declaration",
+		Description = "Parameter name differs in base declaration",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning)]
+	public class BaseMethodParameterNameMismatchIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<BaseMethodParameterNameMismatchIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+				// skip
+			}
+
+			public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
+			{
+				// skip
+			}
+
+			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
+			{
+				// skip
+			}
+
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+				// skip
+			}
+
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+				// skip
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				// SKIP
+			}
+
+			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
+			{
+				Check (indexerDeclaration);
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				Check (methodDeclaration);
+			}
+
+			void Check (EntityDeclaration entity)
+			{
+				if (!entity.HasModifier(Modifiers.Override))
+					return;
+				var rr = ctx.Resolve(entity) as MemberResolveResult;
+				if (rr == null || rr.IsError)
+					return;
+				var method = rr.Member as IParameterizedMember;
+				if (method == null)
+					return;
+				var baseMethod = InheritanceHelper.GetBaseMember(method) as IParameterizedMember;
+				if (baseMethod == null)
+					return;
+
+				for (int i = 0; i < Math.Min (method.Parameters.Count, baseMethod.Parameters.Count); i++) {
+					var arg     = method.Parameters[i];
+					var baseArg = baseMethod.Parameters[i];
+
+					if (arg.Name != baseArg.Name) {
+						int _i = i;
+						var parameters = entity.GetChildrenByRole (Roles.Parameter);
+						AddIssue(new CodeIssue(
+							parameters.ElementAt(_i).NameToken,
+							ctx.TranslateString("Parameter name differs in base method declaration"),
+							string.Format(ctx.TranslateString("Rename to '{0}'"), baseArg.Name),
+							s => {
+								s.Rename(arg, baseArg.Name);
+							}
+						));
+					}
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0029InvalidConversionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0029InvalidConversionIssue.cs
new file mode 100644
index 0000000000..58c24aef3a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0029InvalidConversionIssue.cs
@@ -0,0 +1,192 @@
+// 
+// CS0029InvalidConversionIssue.cs
+// 
+// Author:
+//      Daniel Grunwald <daniel@danielgrunwald.de>
+// 
+// Copyright (c) 2013 Daniel Grunwald <daniel@danielgrunwald.de>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("CS0029: Cannot implicitly convert type 'A' to 'B'.",
+	                  Description = "This error occurs when trying to assign a value of an incompatible type.",
+	                  Category = IssueCategories.CompilerErrors,
+	                  Severity = Severity.Error)]
+	public class CS0029InvalidConversionIssue : GatherVisitorCodeIssueProvider
+	{
+		// This class handles both
+		// CS0029: Cannot implicitly convert type 'type' to 'type'
+		// and
+		// CS0266: Cannot implicitly convert type 'type1' to 'type2'. An explicit conversion exists (are you missing a cast?)
+		
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<CS0029InvalidConversionIssue>
+		{
+			readonly CSharpConversions conversion;
+
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+				conversion = new CSharpConversions(ctx.Compilation);
+			}
+
+			// Currently, we only checks assignments
+			public override void VisitAssignmentExpression(AssignmentExpression assignmentExpression)
+			{
+				base.VisitAssignmentExpression(assignmentExpression);
+				if (assignmentExpression.Operator != AssignmentOperatorType.Assign)
+					return;
+				var variableType = ctx.Resolve(assignmentExpression.Left).Type;
+				CheckConversion(variableType, assignmentExpression.Right);
+			}
+			
+			public override void VisitVariableInitializer(VariableInitializer variableInitializer)
+			{
+				base.VisitVariableInitializer(variableInitializer);
+				if (!variableInitializer.Initializer.IsNull) {
+					var variableType = ctx.Resolve(variableInitializer).Type;
+					CheckConversion(variableType, variableInitializer.Initializer);
+				}
+			}
+
+			public override void VisitReturnStatement(ReturnStatement returnStatement)
+			{
+				base.VisitReturnStatement(returnStatement);
+				if (!returnStatement.Expression.IsNull)
+					CheckConversion(ctx.GetExpectedType (returnStatement.Expression), returnStatement.Expression);			
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+				foreach (var expr in invocationExpression.Arguments) {
+					CheckConversion(ctx.GetExpectedType(expr), expr);		
+				}
+			}
+
+			public override void VisitFixedStatement(FixedStatement fixedStatement)
+			{
+				// TODO: Check the initializer - but it can't contain a type cast anyways.
+				fixedStatement.EmbeddedStatement.AcceptVisitor (this);
+			}
+
+			public override void VisitArrayInitializerExpression(ArrayInitializerExpression arrayInitializerExpression)
+			{
+				base.VisitArrayInitializerExpression(arrayInitializerExpression);
+				foreach (var expr in arrayInitializerExpression.Elements) {
+					CheckConversion(ctx.GetExpectedType(expr), expr);		
+				}
+			}
+			
+			void CheckConversion(IType variableType, Expression expression)
+			{
+				if (variableType.Kind == TypeKind.Unknown)
+					return; // ignore error if the variable type is unknown
+				if (ctx.GetConversion(expression).IsValid)
+					return; // don't complain if the code is valid
+				
+				var rr = ctx.Resolve(expression);
+				if (rr.Type.Kind == TypeKind.Unknown)
+					return; // ignore error if expression type is unknown
+				
+				var foundConversion = conversion.ExplicitConversion(rr, variableType);
+				
+				var builder = ctx.CreateTypeSystemAstBuilder(expression);
+				AstType variableTypeNode = builder.ConvertType(variableType);
+				AstType expressionTypeNode = builder.ConvertType(rr.Type);
+
+				string title;
+				List<CodeAction> fixes = new List<CodeAction>();
+				if (foundConversion.IsValid) {
+					// CS0266: An explicit conversion exists -> suggested fix is to insert the cast
+					title = string.Format(ctx.TranslateString("Cannot implicitly convert type `{0}' to `{1}'. An explicit conversion exists (are you missing a cast?)"),
+					                      expressionTypeNode, variableTypeNode);
+					string fixTitle = string.Format(ctx.TranslateString("Cast to '{0}'"), variableTypeNode);
+					Action<Script> fixAction = script => {
+						var right = expression.Clone();
+						var castRight = right.CastTo(variableTypeNode);
+						script.Replace(expression, castRight);
+					};
+					fixes.Add(new CodeAction(fixTitle, fixAction, expression));
+				} else {
+					// CS0029: No explicit conversion -> Issue without suggested fix
+					title = string.Format(ctx.TranslateString("Cannot implicitly convert type `{0}' to `{1}'"),
+					                             expressionTypeNode, variableTypeNode);
+
+				}
+
+				if (expression.Parent is VariableInitializer) {
+					var fd = expression.Parent.Parent as FieldDeclaration;
+					if (fd != null) {
+						fixes.Add(new CodeAction(
+							ctx.TranslateString("Change field return type"), 
+							script => {
+								script.Replace(fd.ReturnType, ctx.CreateTypeSystemAstBuilder(fd).ConvertType(rr.Type));
+							}, 
+							expression
+						));
+					}
+
+					var lc =  expression.Parent.Parent as VariableDeclarationStatement;
+					if (lc != null) {
+						fixes.Add(new CodeAction(
+							ctx.TranslateString("Fix local return type"), 
+							script => {
+								script.Replace(lc.Type, new SimpleType("var"));
+							}, 
+							expression
+						));
+					}
+				}
+
+				if (expression.Parent is ReturnStatement) {
+					AstNode entityNode;
+					var type = CS0126ReturnMustBeFollowedByAnyExpression.GetRequestedReturnType(ctx, expression.Parent, out entityNode);
+					if (type != null) {
+						var entity = entityNode as EntityDeclaration;
+						if (entity != null) {
+							fixes.Add(new CodeAction(
+								ctx.TranslateString("Change return type"), 
+								script => {
+									script.Replace(entity.ReturnType, ctx.CreateTypeSystemAstBuilder(entity).ConvertType(rr.Type));
+								}, 
+								expression
+							));
+						}
+					}
+				}
+				AddIssue(new CodeIssue(expression, title, fixes));
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0126ReturnMustBeFollowedByAnyExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0126ReturnMustBeFollowedByAnyExpression.cs
new file mode 100644
index 0000000000..159a6d69c1
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0126ReturnMustBeFollowedByAnyExpression.cs
@@ -0,0 +1,191 @@
+//
+// CS0126ReturnMustBeFollowedByAnyExpression.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("CS0126: A method with return type cannot return without value.",
+	                  Description = "Since 'function' doesn't return void, a return keyword must be followed by an object expression",
+	                  Category = IssueCategories.CompilerErrors,
+	                  Severity = Severity.Error)]
+	public class CS0126ReturnMustBeFollowedByAnyExpression : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		internal static IType GetRequestedReturnType (BaseRefactoringContext ctx, AstNode returnStatement, out AstNode entityNode)
+		{
+			entityNode = returnStatement.GetParent(p => p is LambdaExpression || p is AnonymousMethodExpression || !(p is Accessor) && p is EntityDeclaration);
+			if (entityNode == null)
+				return null;
+			if (entityNode is EntityDeclaration) {
+				var rr = ctx.Resolve(entityNode) as MemberResolveResult;
+				if (rr == null)
+					return null;
+				return rr.Member.ReturnType;
+			}
+			foreach (var type in TypeGuessing.GetValidTypes(ctx.Resolver, entityNode)) {
+				if (type.Kind != TypeKind.Delegate)
+					continue;
+				var invoke = type.GetDelegateInvokeMethod();
+				if (invoke != null && !invoke.ReturnType.IsKnownType(KnownTypeCode.Void))
+					return invoke.ReturnType;
+			}
+			return null;
+		}
+
+
+		class GatherVisitor : GatherVisitorBase<CS0126ReturnMustBeFollowedByAnyExpression>
+		{
+			string currentMethodName;
+
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			bool skip;
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				var primitiveType = methodDeclaration.ReturnType as PrimitiveType;
+				skip = (primitiveType != null && primitiveType.Keyword == "void");
+				currentMethodName = methodDeclaration.Name;
+				base.VisitMethodDeclaration(methodDeclaration);
+			}
+
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+				currentMethodName = constructorDeclaration.Name;
+				skip = true;
+				base.VisitConstructorDeclaration(constructorDeclaration);
+			}
+
+			public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
+			{
+				currentMethodName = "~" + destructorDeclaration.Name;
+				skip = true;
+				base.VisitDestructorDeclaration(destructorDeclaration);
+			}
+
+			public override void VisitAccessor(Accessor accessor)
+			{
+				bool old = skip; 
+				skip = accessor.Role != PropertyDeclaration.GetterRole && accessor.Role != IndexerDeclaration.GetterRole;
+				base.VisitAccessor(accessor);
+				skip = old;
+			}
+
+			static bool AnonymousMethodMayReturnVoid(BaseRefactoringContext ctx, Expression anonymousMethodExpression)
+			{
+				foreach (var type in TypeGuessing.GetValidTypes(ctx.Resolver, anonymousMethodExpression)) {
+					if (type.Kind != TypeKind.Delegate)
+						continue;
+					var invoke = type.GetDelegateInvokeMethod();
+					if (invoke != null && invoke.ReturnType.IsKnownType(KnownTypeCode.Void))
+						return true;
+				}
+				return false;
+			}
+
+
+			public override void VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression)
+			{
+				bool old = skip;
+				skip = AnonymousMethodMayReturnVoid(ctx, anonymousMethodExpression);
+				base.VisitAnonymousMethodExpression(anonymousMethodExpression);
+				skip = old;
+			}
+
+			public override void VisitLambdaExpression(LambdaExpression lambdaExpression)
+			{
+				bool old = skip;
+				skip = AnonymousMethodMayReturnVoid(ctx, lambdaExpression);
+				base.VisitLambdaExpression(lambdaExpression);
+				skip = old;
+			}
+
+			public override void VisitReturnStatement(ReturnStatement returnStatement)
+			{
+				base.VisitReturnStatement(returnStatement);
+				if (skip)
+					return;
+
+				if (returnStatement.Expression.IsNull) {
+					var entity = returnStatement.GetParent<EntityDeclaration>();
+					if (entity is Accessor)
+						entity = entity.GetParent<EntityDeclaration>();
+					if (entity == null)
+						return;
+					AstNode entityNode;
+					var rr = GetRequestedReturnType (ctx, returnStatement, out entityNode);
+					var actions = new List<CodeAction>();
+					if (rr != null) {
+						actions.Add(new CodeAction(ctx.TranslateString("Return default value"), script => {
+							Expression p;
+							if (rr.IsKnownType(KnownTypeCode.Boolean)) {
+								p = new PrimitiveExpression(false);
+							} else if (rr.IsKnownType(KnownTypeCode.String)) {
+								p = new PrimitiveExpression("");
+							} else if (rr.IsKnownType(KnownTypeCode.Char)) {
+								p = new PrimitiveExpression(' ');
+							} else if (rr.IsReferenceType == true) {
+								p = new NullReferenceExpression();
+							} else if (rr.GetDefinition() != null &&
+								rr.GetDefinition().KnownTypeCode < KnownTypeCode.DateTime) {
+								p = new PrimitiveExpression(0x0);
+							} else {
+								p = new DefaultValueExpression(ctx.CreateTypeSystemAstBuilder(returnStatement).ConvertType(rr));
+							}
+
+							script.Replace(returnStatement, new ReturnStatement(p));
+						}, returnStatement));
+					}
+					var method = returnStatement.GetParent<MethodDeclaration>();
+					if (method != null) {
+						actions.Add(new CodeAction(ctx.TranslateString("Change method return type to 'void'"), script => {
+							script.Replace(method.ReturnType, new PrimitiveType("void"));
+						}, returnStatement));
+					}
+
+					AddIssue(new CodeIssue(
+						returnStatement, 
+						string.Format(ctx.TranslateString("`{0}': A return keyword must be followed by any expression when method returns a value"), currentMethodName),
+						actions
+					));
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0127ReturnMustNotBeFollowedByAnyExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0127ReturnMustNotBeFollowedByAnyExpression.cs
new file mode 100644
index 0000000000..7f2d028833
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0127ReturnMustNotBeFollowedByAnyExpression.cs
@@ -0,0 +1,138 @@
+//
+// CS0127ReturnMustNotBeFollowedByAnyExpression.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("CS0127: A method with a void return type cannot return a value.",
+	                  Description = "Since 'function' returns void, a return keyword must not be followed by an object expression",
+	                  Category = IssueCategories.CompilerErrors,
+	                  Severity = Severity.Error)]
+	public class CS0127ReturnMustNotBeFollowedByAnyExpression : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<CS0127ReturnMustNotBeFollowedByAnyExpression>
+		{
+			bool skip;
+
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			static bool AnonymousMethodMayReturnNonVoid(BaseRefactoringContext ctx, Expression anonymousMethodExpression)
+			{
+				foreach (var type in TypeGuessing.GetValidTypes(ctx.Resolver, anonymousMethodExpression)) {
+					if (type.Kind != TypeKind.Delegate)
+						continue;
+					var invoke = type.GetDelegateInvokeMethod();
+					if (invoke != null && !invoke.ReturnType.IsKnownType(KnownTypeCode.Void))
+						return true;
+				}
+				return false;
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				var primitiveType = methodDeclaration.ReturnType as PrimitiveType;
+				if (primitiveType == null || primitiveType.Keyword != "void")
+					return;
+				base.VisitMethodDeclaration(methodDeclaration);
+			}
+
+			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
+			{
+			}
+
+			public override void VisitAccessor(Accessor accessor)
+			{
+				if (accessor.Role == PropertyDeclaration.SetterRole || 
+				    accessor.Role == IndexerDeclaration.SetterRole )
+				base.VisitAccessor(accessor);
+			}
+	
+				
+			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
+			{
+			}
+
+			public override void VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression)
+			{
+				bool old = skip;
+				skip = AnonymousMethodMayReturnNonVoid(ctx, anonymousMethodExpression);
+				base.VisitAnonymousMethodExpression(anonymousMethodExpression);
+				skip = old;
+			}
+
+			public override void VisitLambdaExpression(LambdaExpression lambdaExpression)
+			{
+				bool old = skip;
+				skip = AnonymousMethodMayReturnNonVoid(ctx, lambdaExpression);
+				base.VisitLambdaExpression(lambdaExpression);
+				skip = old;
+			}
+
+			public override void VisitReturnStatement(ReturnStatement returnStatement)
+			{
+				base.VisitReturnStatement(returnStatement);
+				if (skip)
+					return;
+
+				if (!returnStatement.Expression.IsNull) {
+					var actions = new List<CodeAction>();
+					actions.Add(new CodeAction(ctx.TranslateString("Remove returned expression"), script => {
+						script.Replace(returnStatement, new ReturnStatement());
+					}, returnStatement));
+
+					var method = returnStatement.GetParent<MethodDeclaration>();
+					if (method != null) {
+						var rr = ctx.Resolve(returnStatement.Expression);
+						if (rr != null && !rr.IsError) {
+							actions.Add(new CodeAction(ctx.TranslateString("Change return type of method."), script => {
+								script.Replace(method.ReturnType, ctx.CreateTypeSystemAstBuilder(method).ConvertType(rr.Type));
+							}, returnStatement));
+						}
+					}
+
+					AddIssue(new CodeIssue(
+						returnStatement, 
+						ctx.TranslateString("Return type is 'void'"),
+						actions
+					));
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0152DuplicateCaseLabelValueIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0152DuplicateCaseLabelValueIssue.cs
new file mode 100644
index 0000000000..6fec34977d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0152DuplicateCaseLabelValueIssue.cs
@@ -0,0 +1,81 @@
+//
+// DuplicateCaseLabelValueIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.PatternMatching;
+using Mono.CSharp;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Duplicate case label value issue",
+	                   Description = "A case label value is duplicate.",
+	                   Category = IssueCategories.CompilerErrors,
+	                   Severity = Severity.Error)]
+	public class CS0152DuplicateCaseLabelValueIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<CS0152DuplicateCaseLabelValueIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitSwitchSection(SwitchSection switchSection)
+			{
+				base.VisitSwitchSection(switchSection);
+
+				var parent = switchSection.Parent as SwitchStatement;
+				if (parent == null)
+					return;
+
+				foreach (var curLabel in switchSection.CaseLabels) {
+					if (curLabel.Expression.IsNull)
+						continue;
+					var curValue = ctx.Resolve(curLabel.Expression).ConstantValue;
+					if (curValue == null)
+						continue;
+					foreach (var sect in parent.SwitchSections) {
+						if (sect.CaseLabels.Any(label => label != curLabel && Equals(curValue, ctx.Resolve(label.Expression).ConstantValue))) {
+							AddIssue(new CodeIssue(curLabel, string.Format(ctx.TranslateString("Duplicate case label value '{0}'"), curValue)));
+							break;
+						}
+					}
+				}
+
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0759RedundantPartialMethodIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0759RedundantPartialMethodIssue.cs
new file mode 100644
index 0000000000..a8d09eb21c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0759RedundantPartialMethodIssue.cs
@@ -0,0 +1,91 @@
+// RedundantPartialMethodIssue.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.PatternMatching;
+using Mono.CSharp;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("CS0759: A partial method implementation is missing a partial method declaration",
+	                   Description = "A partial method must have a defining declaration that defines the signature (name, return type and parameters) of the method. The implementation or method body is optional.",
+	                   Category = IssueCategories.CompilerErrors,
+	                   Severity = Severity.Error)]
+	public class CS0759RedundantPartialMethodIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<CS0759RedundantPartialMethodIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				if (!methodDeclaration.HasModifier(Modifiers.Partial))
+					return;
+
+				var resolveResult = ctx.Resolve(methodDeclaration) as MemberResolveResult;
+				if (resolveResult == null)
+					return;
+
+				var method = (IMethod) resolveResult.Member;
+				if (method == null)
+					return;
+
+				if (!method.HasBody)
+					return;
+
+				if (method.Parts.Count == 1) {
+					AddIssue(new CodeIssue(methodDeclaration.NameToken,
+					         string.Format(ctx.TranslateString("CS0759: A partial method `{0}' implementation is missing a partial method declaration"), method.FullName),
+						GetFixAction(methodDeclaration)));
+				}
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				//We never need to visit the children of block statements
+			}
+
+			CodeAction GetFixAction(MethodDeclaration methodDeclaration)
+			{
+				return new CodeAction(ctx.TranslateString("Remove 'partial'"), script => {
+					script.ChangeModifier (methodDeclaration, methodDeclaration.Modifiers & ~Modifiers.Partial);
+				}, methodDeclaration);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/MissingInterfaceMemberImplementationIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/MissingInterfaceMemberImplementationIssue.cs
new file mode 100644
index 0000000000..3b35d0d637
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/MissingInterfaceMemberImplementationIssue.cs
@@ -0,0 +1,73 @@
+//
+// MissingInterfaceMemberImplementationIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Missing interface members",
+		Description = "Searches for missing interface implementations",
+		Category = IssueCategories.CompilerErrors,
+		Severity = Severity.Error)]
+	public class MissingInterfaceMemberImplementationIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<MissingInterfaceMemberImplementationIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				if (typeDeclaration.ClassType == ClassType.Interface || typeDeclaration.ClassType == ClassType.Enum)
+					return;
+				base.VisitTypeDeclaration(typeDeclaration);
+				var rr = ctx.Resolve(typeDeclaration);
+				if (rr.IsError)
+					return;
+				foreach (var baseType in typeDeclaration.BaseTypes) {
+					var bt = ctx.Resolve(baseType);
+					if (bt.IsError || bt.Type.Kind != TypeKind.Interface)
+						continue;
+					bool interfaceMissing;
+					var toImplement = ImplementInterfaceAction.CollectMembersToImplement(rr.Type.GetDefinition(), bt.Type, false, out interfaceMissing);
+					if (toImplement.Count == 0)
+						continue;
+
+					AddIssue(new CodeIssue(baseType, ctx.TranslateString("Missing interface member implementations")) { ActionProvider = { typeof(ImplementInterfaceAction), typeof(ImplementInterfaceExplicitAction)} });
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/StaticConstructorParameterIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/StaticConstructorParameterIssue.cs
new file mode 100644
index 0000000000..3ca1c72407
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/StaticConstructorParameterIssue.cs
@@ -0,0 +1,70 @@
+//
+// 
+// StaticConstructorParameterIssue.cs
+// 
+// Author:
+//      Ji Kun <jikun.nus@gmail.com>
+//      Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Ji Kun
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Static constructor should be parameterless",
+		Description = "Static constructor should be parameterless",
+		Category = IssueCategories.CompilerErrors,
+		Severity = Severity.Error)]
+	public class StaticConstructorParameterIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<StaticConstructorParameterIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base(ctx)
+			{
+			}
+
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+				if (!constructorDeclaration.HasModifier(Modifiers.Static) || !constructorDeclaration.Parameters.Any())
+					return;
+				AddIssue(new CodeIssue(
+					constructorDeclaration.Parameters.First().StartLocation,
+					constructorDeclaration.Parameters.Last().EndLocation,
+					ctx.TranslateString("Static constructor cannot take parameters"),
+					ctx.TranslateString("Remove parameters"),
+					s => {
+						int o1 = ctx.GetOffset(constructorDeclaration.LParToken.EndLocation);
+						int o2 = ctx.GetOffset(constructorDeclaration.RParToken.StartLocation);
+						s.RemoveText(o1, o2 - o1);
+					}
+				));
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/ConvertIfToAndExpressionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/ConvertIfToAndExpressionIssue.cs
new file mode 100644
index 0000000000..172bb66b35
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/ConvertIfToAndExpressionIssue.cs
@@ -0,0 +1,131 @@
+//
+// ConvertIfToAndExpressionIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("'if' statement can be re-written as '&&' expression",
+	                  Description = "Convert 'if' to '&&' expression",
+	                  Category = IssueCategories.Opportunities,
+	                  Severity = Severity.Hint)]
+	public class ConvertIfToAndExpressionIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ConvertIfToAndExpressionIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			static readonly AstNode ifPattern = 
+				new IfElseStatement(
+					new AnyNode ("condition"),
+					PatternHelper.EmbeddedStatement (
+						new AssignmentExpression(
+							new AnyNode("target"),
+							new PrimitiveExpression (false)
+						)
+					)
+				);
+
+			static readonly AstNode varDelarationPattern = 
+				new VariableDeclarationStatement(new AnyNode("type"), Pattern.AnyString, new AnyNode("initializer"));
+
+			void AddTo(IfElseStatement ifElseStatement, VariableDeclarationStatement varDeclaration, Expression expr)
+			{
+			}
+
+			public override void VisitIfElseStatement(IfElseStatement ifElseStatement)
+			{
+				base.VisitIfElseStatement(ifElseStatement);
+
+				var match = ifPattern.Match(ifElseStatement);
+				if (match.Success) {
+					var varDeclaration = ifElseStatement.GetPrevSibling(s => s.Role == BlockStatement.StatementRole) as VariableDeclarationStatement;
+					var target = match.Get<Expression>("target").Single();
+					var match2 = varDelarationPattern.Match(varDeclaration);
+					if (match2.Success) {
+						var initializer = varDeclaration.Variables.FirstOrDefault();
+						if (initializer != null && target is IdentifierExpression && ((IdentifierExpression)target).Identifier != initializer.Name)
+							return;
+						var expr = match.Get<Expression>("condition").Single();
+						AddIssue(new CodeIssue(
+							ifElseStatement.IfToken,
+							ctx.TranslateString("Convert to '&&' expresssion"),
+							ctx.TranslateString("Replace with '&&'"),
+							script => {
+								var variable = initializer;
+								var initalizerExpression = variable.Initializer.Clone();
+								var bOp = initalizerExpression as BinaryOperatorExpression;
+								if (bOp != null && bOp.Operator == BinaryOperatorType.ConditionalOr)
+									initalizerExpression = new ParenthesizedExpression (initalizerExpression);
+								script.Replace(
+									varDeclaration, 
+									new VariableDeclarationStatement(
+										varDeclaration.Type.Clone(),
+										variable.Name,
+										new BinaryOperatorExpression(initalizerExpression, BinaryOperatorType.ConditionalAnd, CSharpUtil.InvertCondition(expr)) 
+									)
+								);
+							script.Remove(ifElseStatement); 
+						}
+						) {
+							IssueMarker = IssueMarker.DottedLine
+						});
+						return;
+					} else {
+						var expr = match.Get<Expression>("condition").Single();
+						AddIssue(new CodeIssue(
+							ifElseStatement.IfToken,
+							ctx.TranslateString("Convert to '&=' expresssion"),
+							ctx.TranslateString("Replace with '&='"),
+							script =>
+								script.Replace(
+									ifElseStatement, 
+									new ExpressionStatement(
+										new AssignmentExpression(
+											target.Clone(),
+											AssignmentOperatorType.BitwiseAnd,
+											CSharpUtil.InvertCondition(expr)
+										) 
+									)
+								)
+						) { IssueMarker = IssueMarker.DottedLine });
+					}
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/LockThisIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/LockThisIssue.cs
new file mode 100644
index 0000000000..bdd7a5567c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/LockThisIssue.cs
@@ -0,0 +1,389 @@
+// LockThisIssue.cs 
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis <luiscubal@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Threading.Tasks;
+using System.Runtime.CompilerServices;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Use of lock (this) or MethodImplOptions.Synchronized is discouraged",
+	                  Description = "Warns about using lock (this) or MethodImplOptions.Synchronized.",
+	                  Category = IssueCategories.CodeQualityIssues,
+	                  Severity = Severity.Warning)]
+	public class LockThisIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<LockThisIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext context) : base (context)
+			{
+			}
+
+			public override void VisitAttribute(Attribute attribute)
+			{
+				base.VisitAttribute(attribute);
+
+				if (IsMethodSynchronizedAttribute(attribute)) {
+					var fixAction = new CodeAction(ctx.TranslateString("Create private locker field"), script => {
+						var containerEntity = GetParentMethodOrProperty(attribute);
+						var containerType = containerEntity.GetParent<TypeDeclaration>();
+
+						FixLockThisIssue(script, containerEntity, containerType);
+					}, attribute);
+
+					AddIssue(new CodeIssue(attribute, ctx.TranslateString("Found [MethodImpl(MethodImplOptions.Synchronized)]"), fixAction));
+				}
+			}
+
+			static EntityDeclaration GetParentMethodOrProperty(AstNode node)
+			{
+				var containerEntity = node.GetParent<EntityDeclaration>();
+				if (containerEntity is Accessor) {
+					containerEntity = containerEntity.GetParent<EntityDeclaration>();
+				}
+
+				return containerEntity;
+			}
+
+			public override void VisitLockStatement(LockStatement lockStatement)
+			{
+				base.VisitLockStatement(lockStatement);
+
+				var expression = lockStatement.Expression;
+
+				if (IsThisReference(expression)) {
+					var fixAction = new CodeAction(ctx.TranslateString("Create private locker field"), script => {
+						var containerEntity = GetParentMethodOrProperty(lockStatement);
+
+						var containerType = containerEntity.GetParent<TypeDeclaration>();
+
+						FixLockThisIssue(script, containerEntity, containerType);
+
+					}, lockStatement);
+
+					AddIssue(new CodeIssue(lockStatement.LockToken.StartLocation,
+						lockStatement.RParToken.EndLocation, ctx.TranslateString("Found lock (this)"), fixAction));
+				}
+			}
+
+			static bool IsEntityStatic(EntityDeclaration containerEntity)
+			{
+				return containerEntity.Modifiers.HasFlag(Modifiers.Static);
+			}
+
+			void FixLockThisIssue(Script script, EntityDeclaration containerEntity, TypeDeclaration containerType)
+			{
+				bool isStatic = IsEntityStatic(containerEntity);
+
+				List<BlockStatement> synchronizedStatements = FixMethodsWithMethodImplAttribute(script, containerType, isStatic).ToList();
+
+				List<AstNode> linkNodes = new List<AstNode>();
+
+				var locksToModify = LocksToModify(containerType, synchronizedStatements);
+				List<AstNode> nodeContexts = new List<AstNode>(locksToModify);
+
+				foreach (var synchronizedStatement in synchronizedStatements) {
+					if (synchronizedStatement.Statements.Count > 0) {
+						nodeContexts.Add(synchronizedStatement.Statements.First());
+
+						if (!isStatic) {
+							foreach (var childLock in synchronizedStatement.Descendants.OfType<LockStatement>()) {
+								if (IsThisReference(childLock.Expression)) {
+									nodeContexts.Add(childLock);
+								}
+							}
+						}
+					}
+				}
+
+				string proposedName = GetNameProposal(nodeContexts, "locker");
+
+				if (!isStatic) {
+					foreach (var lockToModify in locksToModify) {
+						var identifier = new IdentifierExpression (proposedName);
+						script.Replace(lockToModify.Expression, identifier);
+
+						linkNodes.Add(identifier);
+					}
+				}
+
+				foreach (var synchronizedStatement in synchronizedStatements) {
+					if (synchronizedStatement.Statements.Count > 0) {
+						var newBody = synchronizedStatement.Clone();
+
+						var outerLock = new LockStatement();
+						var outerLockIdentifier = new IdentifierExpression (proposedName);
+						outerLock.Expression = outerLockIdentifier;
+						outerLock.EmbeddedStatement = newBody;
+
+						linkNodes.Add(outerLockIdentifier);
+
+						if (!isStatic) {
+							foreach (var childLock in newBody.Descendants.OfType<LockStatement>()) {
+								if (IsThisReference(childLock.Expression)) {
+									var identifier = new IdentifierExpression (proposedName);
+									childLock.Expression.ReplaceWith(identifier);
+
+									linkNodes.Add(identifier);
+								}
+							}
+						}
+
+						script.InsertBefore(synchronizedStatement.Statements.First(), outerLock);
+
+						foreach (var stmt in synchronizedStatement.Statements) {
+							script.Remove(stmt);
+						}
+					}
+				}
+
+				if (linkNodes.Any()) {
+					var objectType = new PrimitiveType("object");
+
+					var lockerFieldDeclaration = new FieldDeclaration() {
+						Modifiers = isStatic ? Modifiers.Static : Modifiers.None,
+						ReturnType = objectType.Clone()
+					};
+
+					var lockerVariable = new VariableInitializer(proposedName, new ObjectCreateExpression(objectType.Clone()));
+					lockerFieldDeclaration.Variables.Add(lockerVariable);
+					script.InsertBefore(containerEntity, lockerFieldDeclaration);
+
+					linkNodes.Add(lockerVariable.NameToken);
+
+					script.Link(linkNodes.ToArray());
+				}
+			}
+
+			string GetNameProposal(List<AstNode> nodeContexts, string baseName)
+			{
+				var resolverStates = nodeContexts.Select(ctx.GetResolverStateBefore).ToList();
+				string nameProposal;
+				int n = 0;
+				do {
+					nameProposal = baseName + (n == 0 ? string.Empty : n.ToString());
+					n++;
+				} while (IdentifierNameExists(resolverStates, nameProposal));
+				return nameProposal;
+			}
+
+			static bool IdentifierNameExists(List<CSharpResolver> resolverStates, string nameProposal)
+			{
+				return resolverStates.Any(resolverState => {
+					ResolveResult result = resolverState.LookupSimpleNameOrTypeName(nameProposal, new List<IType>(), NameLookupMode.Expression);
+					return !result.IsError;
+				});
+			}
+
+			IEnumerable<LockStatement> LocksToModify(TypeDeclaration containerType, IEnumerable<BlockStatement> synchronizedStatements)
+			{
+				foreach (var lockToModify in LocksInType(containerType)) {
+					if (lockToModify.Ancestors.OfType<BlockStatement>()
+					    .Any(ancestor => synchronizedStatements.Contains(ancestor))) {
+
+						//These will be modified separately
+						continue;
+					}
+
+					if (!IsThisReference (lockToModify.Expression)) {
+						continue;
+					}
+
+					yield return lockToModify;
+				}
+			}
+
+			IEnumerable<BlockStatement> FixMethodsWithMethodImplAttribute(Script script, TypeDeclaration containerType, bool isStatic)
+			{
+				var bodies = new List<BlockStatement>();
+
+				foreach (var entityDeclarationToModify in EntitiesInType(containerType)) {
+					var methodDeclaration = entityDeclarationToModify as MethodDeclaration;
+					var accessor = entityDeclarationToModify as Accessor;
+					if (methodDeclaration == null && accessor == null) {
+						continue;
+					}
+
+					if ((methodDeclaration != null && IsEntityStatic(methodDeclaration) != isStatic) ||
+					    (accessor != null && IsEntityStatic(accessor.GetParent<EntityDeclaration>()) != isStatic)) {
+						//These will need a separate lock and therefore will not be changed.
+						continue;
+					}
+
+					var attributes = entityDeclarationToModify.Attributes.SelectMany(attributeSection => attributeSection.Attributes);
+					var methodSynchronizedAttribute = attributes.FirstOrDefault(IsMethodSynchronizedAttribute);
+					if (methodSynchronizedAttribute != null) {
+						short methodImplValue = GetMethodImplValue(methodSynchronizedAttribute);
+						short newValue = (short)(methodImplValue & ~((short)MethodImplOptions.Synchronized));
+						if (newValue != 0) {
+							InsertNewAttribute(script, methodSynchronizedAttribute, newValue);
+						} else {
+							var section = methodSynchronizedAttribute.GetParent<AttributeSection>();
+							if (section.Attributes.Count == 1) {
+								script.Remove(section);
+							} else {
+								script.Remove(methodSynchronizedAttribute);
+							}
+						}
+
+						bool isAbstract = entityDeclarationToModify.Modifiers.HasFlag(Modifiers.Abstract);
+						if (!isAbstract) {
+							var body = methodDeclaration == null ? accessor.Body : methodDeclaration.Body;
+							bodies.Add(body);
+						}
+					}
+				}
+
+				return bodies;
+			}
+
+			void InsertNewAttribute(Script script, Attribute attribute, short newValue) {
+				var availableValues = (MethodImplOptions[]) Enum.GetValues(typeof(MethodImplOptions));
+				var activeValues = availableValues.Where(value => (newValue & (short)value) != 0).ToList();
+
+				var astBuilder = ctx.CreateTypeSystemAstBuilder(attribute);
+				var methodImplOptionsType = astBuilder.ConvertType(new FullTypeName(typeof(MethodImplOptions).FullName));
+
+				Expression expression = CreateMethodImplReferenceNode(activeValues[0], methodImplOptionsType);
+				for (int optionIndex = 1; optionIndex < activeValues.Count; ++optionIndex) {
+					expression = new BinaryOperatorExpression(expression,
+					                                          BinaryOperatorType.BitwiseOr,
+					                                          CreateMethodImplReferenceNode(activeValues [optionIndex], methodImplOptionsType));
+				}
+
+				var newAttribute = new Attribute();
+				newAttribute.Type = attribute.Type.Clone();
+				newAttribute.Arguments.Add(expression);
+
+				script.Replace(attribute, newAttribute);
+			}
+
+			static MemberReferenceExpression CreateMethodImplReferenceNode(MethodImplOptions option, AstType methodImplOptionsType)
+			{
+				return new MemberReferenceExpression(methodImplOptionsType.Clone(), Enum.GetName(typeof(MethodImplOptions), option));
+			}
+
+			bool IsMethodSynchronizedAttribute(Attribute attribute)
+			{
+				var unresolvedType = attribute.Type;
+				var resolvedType = ctx.ResolveType(unresolvedType);
+
+				if (resolvedType.FullName != typeof(MethodImplAttribute).FullName) {
+					return false;
+				}
+
+				short methodImpl = GetMethodImplValue(attribute);
+
+				return (methodImpl & (short) MethodImplOptions.Synchronized) != 0;
+			}
+
+			short GetMethodImplValue(Attribute attribute)
+			{
+				short methodImpl = 0;
+				foreach (var argument in attribute.Arguments) {
+					var namedExpression = argument as NamedExpression;
+
+					if (namedExpression == null) {
+						short? implValue = GetMethodImplOptionsAsShort(argument);
+
+						if (implValue != null) {
+							methodImpl = (short)implValue;
+						}
+
+					} else if (namedExpression.Name == "Value") {
+						short? implValue = GetMethodImplOptionsAsShort(namedExpression.Expression);
+
+						if (implValue != null) {
+							methodImpl = (short)implValue;
+						}
+					}
+				}
+
+				return methodImpl;
+			}
+
+			short? GetMethodImplOptionsAsShort(AstNode argument)
+			{
+				//Returns null if the value could not be guessed
+
+				var result = ctx.Resolve(argument);
+				if (!result.IsCompileTimeConstant) {
+					return null;
+				}
+
+				if (result.Type.FullName == typeof(MethodImplOptions).FullName) {
+					return (short)(MethodImplOptions)result.ConstantValue;
+				}
+
+				return null;
+			}
+
+			static IEnumerable<EntityDeclaration> EntitiesInType(TypeDeclaration containerType)
+			{
+				return containerType.Descendants.OfType<EntityDeclaration>().Where(entityDeclaration => {
+					var childContainerType = entityDeclaration.GetParent<TypeDeclaration>();
+
+					return childContainerType == containerType;
+				});
+			}
+
+			static IEnumerable<LockStatement> LocksInType(TypeDeclaration containerType)
+			{
+				return containerType.Descendants.OfType<LockStatement>().Where(lockStatement => {
+					var childContainerType = lockStatement.GetParent<TypeDeclaration>();
+
+					return childContainerType == containerType;
+				});
+			}
+
+			static bool IsThisReference (Expression expression)
+			{
+				if (expression is ThisReferenceExpression) {
+					return true;
+				}
+
+				var parenthesizedExpression = expression as ParenthesizedExpression;
+				if (parenthesizedExpression != null) {
+					return IsThisReference(parenthesizedExpression.Expression);
+				}
+
+				return false;
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/MixedUseOfFieldsAndGettersIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/MixedUseOfFieldsAndGettersIssue.cs
new file mode 100644
index 0000000000..40d5b2358e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/MixedUseOfFieldsAndGettersIssue.cs
@@ -0,0 +1,75 @@
+//
+// MixedUseOfFieldsAndGettersIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Threading.Tasks;
+using System.Runtime.CompilerServices;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+//	[IssueDescription("Detects if fields & simple getters are used at the same time inside a class.",
+//	                  Description = "Detects if fields & simple getters are used at the same time inside a class.",
+//	                  Category = IssueCategories.CodeQualityIssues,
+//	                  Severity = Severity.Suggestion)]
+//	public class MixedUseOfFieldsAndGettersIssue : GatherVisitorCodeIssueProvider
+//	{
+//		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+//		{
+//			return new GatherVisitor(context);
+//		}
+//
+//		class GatherVisitor : GatherVisitorBase<LockThisIssue>
+//		{
+//			public GatherVisitor (BaseRefactoringContext context) : base (context)
+//			{
+//			}
+//
+//			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+//			{
+//				foreach (var entity in typeDeclaration.Members) {
+//					var propertyDeclaration = entity as PropertyDeclaration;
+//					if (propertyDeclaration == null)
+//						continue;
+//
+//				}
+//
+//				base.VisitTypeDeclaration(typeDeclaration);
+//
+//
+//
+//			}
+//
+//		}
+//	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/NegativeRelationalExpressionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/NegativeRelationalExpressionIssue.cs
new file mode 100644
index 0000000000..8b2d2bf960
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/NegativeRelationalExpressionIssue.cs
@@ -0,0 +1,107 @@
+// 
+// NegativeRelationalExpressionIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Simplify negative relational expression",
+					   Description = "Simplify negative relational expression",
+                       Category = IssueCategories.PracticesAndImprovements,
+					   Severity = Severity.Suggestion)]
+	public class NegativeRelationalExpressionIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<NegativeRelationalExpressionIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			bool IsFloatingPoint (AstNode node)
+			{
+				var typeDef = ctx.Resolve (node).Type.GetDefinition ();
+				return typeDef != null &&
+					(typeDef.KnownTypeCode == KnownTypeCode.Single || typeDef.KnownTypeCode == KnownTypeCode.Double);
+			}
+
+			public override void VisitUnaryOperatorExpression (UnaryOperatorExpression unaryOperatorExpression)
+			{
+				base.VisitUnaryOperatorExpression (unaryOperatorExpression);
+
+				if (unaryOperatorExpression.Operator != UnaryOperatorType.Not)
+					return;
+
+				var expr = unaryOperatorExpression.Expression;
+				while (expr != null && expr is ParenthesizedExpression)
+					expr = ((ParenthesizedExpression)expr).Expression;
+
+				var binaryOperatorExpr = expr as BinaryOperatorExpression;
+				if (binaryOperatorExpr == null)
+					return;
+				switch (binaryOperatorExpr.Operator) {
+					case BinaryOperatorType.BitwiseAnd:
+					case BinaryOperatorType.BitwiseOr:
+					case BinaryOperatorType.ConditionalAnd:
+					case BinaryOperatorType.ConditionalOr:
+					case BinaryOperatorType.ExclusiveOr:
+						return;
+				}
+
+				var negatedOp = CSharpUtil.NegateRelationalOperator(binaryOperatorExpr.Operator);
+				if (negatedOp == BinaryOperatorType.Any)
+					return;
+
+				if (IsFloatingPoint (binaryOperatorExpr.Left) || IsFloatingPoint (binaryOperatorExpr.Right)) {
+					if (negatedOp != BinaryOperatorType.Equality && negatedOp != BinaryOperatorType.InEquality)
+						return;
+				}
+
+				AddIssue (new CodeIssue(unaryOperatorExpression, ctx.TranslateString ("Simplify negative relational expression"), ctx.TranslateString ("Simplify negative relational expression"),
+					script => script.Replace (unaryOperatorExpression,
+						new BinaryOperatorExpression (binaryOperatorExpr.Left.Clone (), negatedOp,
+							binaryOperatorExpr.Right.Clone ()))));
+			}
+			
+			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
+			{
+				if (operatorDeclaration.OperatorType.IsComparisonOperator()) {
+					// Ignore operator declaration; within them it's common to define one operator
+					// by negating another.
+					return;
+				}
+				base.VisitOperatorDeclaration(operatorDeclaration);
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/NotImplementedExceptionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/NotImplementedExceptionIssue.cs
new file mode 100644
index 0000000000..375907ec7a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/NotImplementedExceptionIssue.cs
@@ -0,0 +1,64 @@
+// 
+// NotImplementedExceptionInspector.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// This inspector just shows that there is a not implemented exception. It doesn't offer a fix.
+	/// Should only be shown in overview bar, no underlining.
+	/// </summary>
+	[IssueDescription("Show NotImplementedExceptions", Description="Shows NotImplementedException throws in the quick task bar.", Category = IssueCategories.Notifications, Severity = Severity.Suggestion)]
+	public class NotImplementedExceptionIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context, this);
+		}
+
+		class GatherVisitor : GatherVisitorBase<NotImplementedExceptionIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx, NotImplementedExceptionIssue qualifierDirectiveEvidentIssueProvider) : base (ctx, qualifierDirectiveEvidentIssueProvider)
+			{
+			}
+
+			public override void VisitThrowStatement(ThrowStatement throwStatement)
+			{
+				var result = ctx.Resolve(throwStatement.Expression);
+				if (result.Type.Equals(ctx.Compilation.FindType(typeof(System.NotImplementedException)))) {
+					AddIssue(new CodeIssue(throwStatement, ctx.TranslateString("NotImplemented exception thrown")) { IssueMarker = IssueMarker.None });
+				}
+
+				base.VisitThrowStatement(throwStatement);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/RedundantInternalIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/RedundantInternalIssue.cs
new file mode 100644
index 0000000000..ddaf177664
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/RedundantInternalIssue.cs
@@ -0,0 +1,76 @@
+// 
+// RedundantInternalInspector.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Finds redundant internal modifiers.
+	/// </summary>
+	[IssueDescription("Remove redundant 'internal' modifier",
+	       Description="Removes 'internal' modifiers that are not required.", 
+	       Category = IssueCategories.RedundanciesInCode,
+	       Severity = Severity.Hint)]
+	public class RedundantInternalIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context, this);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantInternalIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx, RedundantInternalIssue qualifierDirectiveEvidentIssueProvider) : base (ctx, qualifierDirectiveEvidentIssueProvider)
+			{
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				foreach (var token_ in typeDeclaration.ModifierTokens) {
+					var token = token_;
+					if (token.Modifier == Modifiers.Internal) {
+						AddIssue(new CodeIssue(token, ctx.TranslateString("Keyword 'internal' is redundant.  This is the default modifier."), ctx.TranslateString("Remove 'internal' modifier"), script => {
+							int offset = script.GetCurrentOffset(token.StartLocation);
+							int endOffset = script.GetCurrentOffset(token.GetNextNode().StartLocation);
+							script.RemoveText(offset, endOffset - offset);
+						}) { IssueMarker = IssueMarker.GrayOut });
+					}
+				}
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				// SKIP
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/RedundantPrivateIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/RedundantPrivateIssue.cs
new file mode 100644
index 0000000000..65e7cc172c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/RedundantPrivateIssue.cs
@@ -0,0 +1,126 @@
+// 
+// RedundantPrivateInspector.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+    /// <summary>
+	/// Finds redundant internal modifiers.
+	/// </summary>
+	[IssueDescription("Remove redundant 'private' modifier",
+	       Description = "Removes 'private' modifiers that are not required.",
+	       Category = IssueCategories.RedundanciesInCode,
+	       Severity = Severity.Hint)]
+	public class RedundantPrivateIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context, this);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantPrivateIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx, RedundantPrivateIssue qualifierDirectiveEvidentIssueProvider) : base (ctx, qualifierDirectiveEvidentIssueProvider)
+			{
+			}
+
+			void CheckNode(EntityDeclaration node)
+			{
+				foreach (var token_ in node.ModifierTokens) {
+					var token = token_;
+					if (token.Modifier == Modifiers.Private) {
+						AddIssue(new CodeIssue(token, ctx.TranslateString("Keyword 'private' is redundant. This is the default modifier."), ctx.TranslateString("Remove redundant 'private' modifier"), script => {
+							script.ChangeModifier (node, node.Modifiers & ~Modifiers.Private);
+						}) { IssueMarker = IssueMarker.GrayOut });
+					}
+				}
+			}
+
+			public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
+			{
+				// SKIP
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				CheckNode(methodDeclaration);
+			}
+			
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+				CheckNode(fieldDeclaration);
+			}
+			
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+				CheckNode(propertyDeclaration);
+			}
+
+			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
+			{
+				CheckNode(indexerDeclaration);
+			}
+
+			public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
+			{
+				CheckNode(eventDeclaration);
+			}
+			
+			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
+			{
+				CheckNode(eventDeclaration);
+			}
+			
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+				CheckNode(constructorDeclaration);
+			}
+
+			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
+			{
+				CheckNode(operatorDeclaration);
+			}
+
+			public override void VisitFixedFieldDeclaration(FixedFieldDeclaration fixedFieldDeclaration)
+			{
+				CheckNode(fixedFieldDeclaration);
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				if (typeDeclaration.Parent is TypeDeclaration) {
+					CheckNode(typeDeclaration);
+				}
+				base.VisitTypeDeclaration(typeDeclaration);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/XmlDocIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/XmlDocIssue.cs
new file mode 100644
index 0000000000..1b44df31ba
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/XmlDocIssue.cs
@@ -0,0 +1,307 @@
+//
+// XmlDocIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using ICSharpCode.NRefactory.Documentation;
+using ICSharpCode.NRefactory.Editor;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Xml;
+using ICSharpCode.NRefactory.CSharp.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Validate Xml documentation",
+	                   Description = "Validate Xml docs",
+	                   Category = IssueCategories.CompilerWarnings,
+	                   Severity = Severity.Warning)]
+	public class XmlDocIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<XmlDocIssue>
+		{
+			readonly List<Comment> storedXmlComment = new List<Comment>();
+
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			void InvalideXmlComments()
+			{
+				if (storedXmlComment.Count == 0)
+					return;
+				var from = storedXmlComment.First().StartLocation;
+				var to = storedXmlComment.Last().EndLocation;
+				AddIssue(new CodeIssue(
+					from,
+					to,
+					ctx.TranslateString("Xml comment is not placed before a valid language element"),
+					ctx.TranslateString("Remove comment"),
+					script => {
+						var startOffset = script.GetCurrentOffset(from);
+						var endOffset = script.GetCurrentOffset(to);
+						endOffset += ctx.GetLineByOffset(endOffset).DelimiterLength;
+						script.RemoveText(startOffset, endOffset - startOffset);
+					}
+				));
+				storedXmlComment.Clear();
+			}
+
+			public override void VisitComment(Comment comment)
+			{
+				if (comment.CommentType == CommentType.Documentation)
+					storedXmlComment.Add(comment);
+			}
+
+			public override void VisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration)
+			{
+				InvalideXmlComments();
+				base.VisitNamespaceDeclaration(namespaceDeclaration);
+			}
+
+			public override void VisitUsingDeclaration(UsingDeclaration usingDeclaration)
+			{
+				InvalideXmlComments();
+				base.VisitUsingDeclaration(usingDeclaration);
+			}
+
+			public override void VisitUsingAliasDeclaration(UsingAliasDeclaration usingDeclaration)
+			{
+				InvalideXmlComments();
+				base.VisitUsingAliasDeclaration(usingDeclaration);
+			}
+
+			public override void VisitExternAliasDeclaration(ExternAliasDeclaration externAliasDeclaration)
+			{
+				InvalideXmlComments();
+				base.VisitExternAliasDeclaration(externAliasDeclaration);
+			}
+
+			TextLocation TranslateOffset(int offset)
+			{
+				int line = storedXmlComment.First().StartLocation.Line;
+				foreach (var cmt in storedXmlComment) {
+					var next = offset - cmt.Content.Length - "\n".Length;
+					if (next <= 0)
+						return new TextLocation(line, cmt.StartLocation.Column + "///".Length + offset);
+					offset = next;
+					line++;
+				}
+				return TextLocation.Empty;
+			}
+
+			void AddXmlIssue(int offset, int length, string str)
+			{
+				var textLocation = TranslateOffset(offset);
+				var textLocation2 = TranslateOffset(offset + length);
+				if (textLocation.IsEmpty && textLocation2.IsEmpty) {
+					AddIssue(new CodeIssue(storedXmlComment.Last(), str));
+				} else if (textLocation.IsEmpty) {
+					AddIssue(new CodeIssue(storedXmlComment.First().StartLocation, textLocation2, str));
+				} else if (textLocation2.IsEmpty) {
+					AddIssue(new CodeIssue(textLocation, storedXmlComment.Last().EndLocation, str));
+				} else {
+					AddIssue(new CodeIssue(textLocation, textLocation2, str));
+				}
+			}
+			readonly StringTextSource emptySource = new StringTextSource("");
+			void CheckXmlDoc(AstNode node)
+			{
+				ResolveResult resolveResult = ctx.Resolve(node);
+				IEntity member = null;
+				if (resolveResult is TypeResolveResult)
+					member = resolveResult.Type.GetDefinition();
+				if (resolveResult is MemberResolveResult)
+					member = ((MemberResolveResult)resolveResult).Member;
+				var xml = new StringBuilder();
+				var firstline = "<root>\n";
+				xml.Append(firstline);
+				foreach (var cmt in storedXmlComment)
+					xml.Append(cmt.Content + "\n");
+				xml.Append("</root>\n");
+
+				var doc = new AXmlParser().Parse(new StringTextSource(xml.ToString()));
+
+				var stack = new Stack<AXmlObject>();
+				stack.Push(doc);
+				foreach (var err in doc.SyntaxErrors)
+					AddXmlIssue(err.StartOffset - firstline.Length, err.EndOffset - err.StartOffset, err.Description);
+
+				while (stack.Count > 0) {
+					var cur = stack.Pop();
+					var el = cur as AXmlElement;
+					if (el != null) {
+						switch (el.Name) {
+							case "typeparam":
+							case "typeparamref":
+								var name = el.Attributes.FirstOrDefault(attr => attr.Name == "name");
+								if (name == null)
+									break;
+								if (member.SymbolKind == SymbolKind.TypeDefinition) {
+									var type = (ITypeDefinition)member;
+									if (!type.TypeArguments.Any(arg => arg.Name == name.Value)) {
+										AddXmlIssue(name.ValueSegment.Offset - firstline.Length + 1, name.ValueSegment.Length - 2, string.Format(ctx.TranslateString("Type parameter '{0}' not found"), name.Value));
+									}
+								}
+								break;
+							case "param":
+							case "paramref":
+								name = el.Attributes.FirstOrDefault(attr => attr.Name == "name");
+								if (name == null)
+									break;
+								var m = member as IParameterizedMember;
+								if (m != null && m.Parameters.Any(p => p.Name == name.Value))
+									break;
+								AddXmlIssue(name.ValueSegment.Offset - firstline.Length + 1, name.ValueSegment.Length - 2, string.Format(ctx.TranslateString("Parameter '{0}' not found"), name.Value));
+								break;
+							case "exception":
+							case "seealso":
+							case "see":
+								var cref = el.Attributes.FirstOrDefault(attr => attr.Name == "cref");
+								if (cref == null)
+									break;
+
+								try {
+									var trctx = ctx.Resolver.TypeResolveContext;
+									if (member is IMember)
+										trctx = trctx.WithCurrentTypeDefinition(member.DeclaringTypeDefinition).WithCurrentMember((IMember)member);
+									if (member is ITypeDefinition)
+										trctx = trctx.WithCurrentTypeDefinition((ITypeDefinition)member);
+
+									var state = ctx.Resolver.GetResolverStateBefore(node);
+									if (state.CurrentUsingScope != null)
+										trctx = trctx.WithUsingScope(state.CurrentUsingScope);
+
+									var cdc = new CSharpDocumentationComment (emptySource, trctx);
+									var entity = cdc.ResolveCref(cref.Value);
+
+									if (entity == null) {
+										AddXmlIssue(cref.ValueSegment.Offset - firstline.Length + 1, cref.ValueSegment.Length - 2, string.Format(ctx.TranslateString("Cannot find reference '{0}'"), cref.Value));
+									}
+								} catch (Exception e) {
+									AddXmlIssue(cref.ValueSegment.Offset - firstline.Length + 1, cref.ValueSegment.Length - 2, string.Format(ctx.TranslateString("Reference parsing error '{0}'."), e.Message));
+								}
+								break;
+
+						}
+					}
+					foreach (var child in cur.Children)
+						stack.Push(child);
+				}
+				storedXmlComment.Clear();
+			}
+
+			protected virtual void VisitXmlChildren(AstNode node)
+			{
+				AstNode next;
+				var child = node.FirstChild;
+				while (child != null && (child is Comment || child.Role == Roles.NewLine)) {
+					next = child.NextSibling;
+					child.AcceptVisitor(this);
+					child = next;
+				}
+
+				CheckXmlDoc(node);
+
+				for (; child != null; child = next) {
+					// Store next to allow the loop to continue
+					// if the visitor removes/replaces child.
+					next = child.NextSibling;
+					child.AcceptVisitor(this);
+				}
+				InvalideXmlComments();
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				VisitXmlChildren(typeDeclaration);
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				VisitXmlChildren(methodDeclaration);
+			}
+
+			public override void VisitDelegateDeclaration(DelegateDeclaration delegateDeclaration)
+			{
+				VisitXmlChildren(delegateDeclaration);
+			}
+
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+				VisitXmlChildren(constructorDeclaration);
+			}
+
+			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
+			{
+				VisitXmlChildren(eventDeclaration);
+			}
+
+			public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
+			{
+				VisitXmlChildren(destructorDeclaration);
+			}
+
+			public override void VisitEnumMemberDeclaration(EnumMemberDeclaration enumMemberDeclaration)
+			{
+				VisitXmlChildren(enumMemberDeclaration);
+			}
+
+			public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
+			{
+				VisitXmlChildren(eventDeclaration);
+			}
+
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+				VisitXmlChildren(fieldDeclaration);
+			}
+
+			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
+			{
+				VisitXmlChildren(indexerDeclaration);
+			}
+
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+				VisitXmlChildren(propertyDeclaration);
+			}
+
+			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
+			{
+				VisitXmlChildren(operatorDeclaration);
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/GatherVisitorBase.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/GatherVisitorBase.cs
new file mode 100644
index 0000000000..4cc348b29a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/GatherVisitorBase.cs
@@ -0,0 +1,269 @@
+// 
+// GatherVisitorBase.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.TypeSystem;
+using Mono.CSharp;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	class GatherVisitorConstants
+	{
+		public const string DisableAllString = "disable All";
+		public const string RestoreAllString = "restore All";
+
+	}
+
+	public interface IGatherVisitor
+	{
+		BaseRefactoringContext Ctx { get; }
+		string SubIssue { get; set; }
+		IEnumerable<CodeIssue> GetIssues();
+	}
+
+	/// <summary>
+	/// The code issue provider gets a list of all code issues in a syntax tree.
+	/// </summary>
+	public abstract class GatherVisitorCodeIssueProvider : CodeIssueProvider
+	{
+		protected abstract IGatherVisitor CreateVisitor (BaseRefactoringContext context);
+
+		public sealed override IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context, string subIssue = null)
+		{
+			var visitor = CreateVisitor(context);
+			if (visitor == null)
+				return Enumerable.Empty<CodeIssue> ();
+			visitor.SubIssue = subIssue;
+			return visitor.GetIssues();
+		}
+	}
+
+	/// <summary>
+	/// A base class for writing issue provider visitor implementations.
+	/// </summary>
+	class GatherVisitorBase<T> : DepthFirstAstVisitor, IGatherVisitor where T : CodeIssueProvider
+	{
+		/// <summary>
+		/// The issue provider. May be <c>null</c> if none was specified.
+		/// </summary>
+		protected readonly T issueProvider;
+		protected readonly BaseRefactoringContext ctx;
+
+		public BaseRefactoringContext Ctx {
+			get {
+				return ctx;
+			}
+		}
+
+		bool isAllDisabled;
+		bool isDisabled;
+		bool isDisabledOnce;
+		bool isGloballySuppressed;
+		bool isPragmaDisabled;
+		List<DomRegion> suppressedRegions = new List<DomRegion>();
+		[SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
+		static string disableString;
+		[SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
+		static string disableOnceString;
+		[SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
+		static string restoreString;
+		[SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
+		static string suppressMessageCategory;
+		[SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
+		static string suppressMessageCheckId;
+		[SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
+		static int pragmaWarning;
+
+		static void SetDisableKeyword(string disableKeyword)
+		{
+			disableString = "disable " + disableKeyword;
+			disableOnceString = "disable once " + disableKeyword;
+			restoreString = "restore " + disableKeyword;
+		}
+
+		public readonly List<CodeIssue> FoundIssues = new List<CodeIssue>();
+
+		public string SubIssue { get; set; }
+
+		static GatherVisitorBase()
+		{
+			var attr = (IssueDescriptionAttribute)typeof(T).GetCustomAttributes(false).FirstOrDefault(a => a is IssueDescriptionAttribute);
+			if (attr == null)
+				return;
+			if (attr.AnalysisDisableKeyword != null) 
+				SetDisableKeyword(attr.AnalysisDisableKeyword);
+			suppressMessageCheckId = attr.SuppressMessageCheckId;
+			suppressMessageCategory = attr.SuppressMessageCategory;
+			pragmaWarning = attr.PragmaWarning;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="GatherVisitorBase{T}"/> class.
+		/// </summary>
+		/// <param name='ctx'>
+		/// The refactoring context.
+		/// </param>
+		/// <param name='qualifierDirectiveEvidentIssueProvider'>
+		/// The issue provider.
+		/// </param>
+		public GatherVisitorBase(BaseRefactoringContext ctx, T qualifierDirectiveEvidentIssueProvider = default(T))
+		{
+			this.ctx = ctx;
+			this.issueProvider = qualifierDirectiveEvidentIssueProvider;
+			if (suppressMessageCheckId != null) {
+				foreach (var attr in this.ctx.Compilation.MainAssembly.AssemblyAttributes) {
+					if (attr.AttributeType.Name == "SuppressMessageAttribute" && attr.AttributeType.Namespace == "System.Diagnostics.CodeAnalysis") {
+						if (attr.PositionalArguments.Count < 2)
+							return;
+						var category = attr.PositionalArguments [0].ConstantValue;
+						if (category == null || category.ToString() != suppressMessageCategory)
+							continue;
+						var checkId = attr.PositionalArguments [1].ConstantValue;
+						if (checkId == null || checkId.ToString() != suppressMessageCheckId) 
+							continue;
+						isGloballySuppressed = true;
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets all the issues using the context root node as base.
+		/// </summary>
+		/// <returns>
+		/// The issues.
+		/// </returns>
+		public IEnumerable<CodeIssue> GetIssues()
+		{
+			ctx.RootNode.AcceptVisitor(this);
+			return FoundIssues;
+		}
+
+		public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+		{
+			if (ctx.CancellationToken.IsCancellationRequested)
+				return;
+			base.VisitTypeDeclaration(typeDeclaration);
+		}
+
+		public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+		{
+			if (ctx.CancellationToken.IsCancellationRequested)
+				return;
+			base.VisitMethodDeclaration(methodDeclaration);
+		}
+
+		public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+		{
+			if (ctx.CancellationToken.IsCancellationRequested)
+				return;
+			base.VisitPropertyDeclaration(propertyDeclaration);
+		}
+
+		public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+		{
+			if (ctx.CancellationToken.IsCancellationRequested)
+				return;
+			base.VisitFieldDeclaration(fieldDeclaration);
+		}
+
+		public override void VisitComment(Comment comment)
+		{
+			if (comment.CommentType == CommentType.SingleLine) {
+				var txt = comment.Content;
+				if (string.IsNullOrEmpty(txt))
+					return;
+				if (isAllDisabled) {
+					isAllDisabled &= txt.IndexOf(GatherVisitorConstants.RestoreAllString, StringComparison.InvariantCultureIgnoreCase) < 0;
+				} else {
+					isAllDisabled |= txt.IndexOf(GatherVisitorConstants.DisableAllString, StringComparison.InvariantCultureIgnoreCase) > 0;
+				}
+
+				if (restoreString != null) {
+					if (isDisabled) {
+						isDisabled &= txt.IndexOf(restoreString, StringComparison.InvariantCulture) < 0;
+					} else {
+						isDisabled |= txt.IndexOf(disableString, StringComparison.InvariantCulture) > 0;
+						isDisabledOnce |= txt.IndexOf(disableOnceString, StringComparison.InvariantCulture) > 0;
+					}
+				}
+			}
+		}
+
+		public override void VisitPreProcessorDirective(PreProcessorDirective preProcessorDirective)
+		{
+			if (pragmaWarning == 0)
+				return;
+
+			var warning = preProcessorDirective as PragmaWarningPreprocessorDirective;
+			if (warning == null)
+				return;
+			if (warning.IsDefined(pragmaWarning))
+				isPragmaDisabled = warning.Disable;
+		}
+
+		public override void VisitAttribute(Attribute attribute)
+		{
+			base.VisitAttribute(attribute);
+			if (suppressMessageCheckId == null)
+				return;
+			var resolveResult = ctx.Resolve(attribute);
+			if (resolveResult.Type.Name == "SuppressMessageAttribute" && resolveResult.Type.Namespace == "System.Diagnostics.CodeAnalysis") {
+				if (attribute.Arguments.Count < 2)
+					return;
+				var category = attribute.Arguments.First() as PrimitiveExpression;
+				if (category == null || category.Value.ToString() != suppressMessageCategory)
+					return;
+				var checkId = attribute.Arguments.Skip(1).First() as PrimitiveExpression;
+				if (checkId == null || checkId.Value.ToString() != suppressMessageCheckId) 
+					return;
+				suppressedRegions.Add(attribute.Parent.Parent.Region);
+			}
+		}
+
+		protected bool IsSuppressed(TextLocation location)
+		{
+			if (isAllDisabled)
+				return true;
+			if (isDisabledOnce) {
+				isDisabledOnce = false;
+				return true;
+			}
+			return isDisabled || isGloballySuppressed || isPragmaDisabled || suppressedRegions.Any(r => r.IsInside(location));
+		}
+
+		protected void AddIssue(CodeIssue issue)
+		{
+			if (IsSuppressed(issue.Start))
+				return;
+			FoundIssues.Add(issue);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/IssueCategories.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/IssueCategories.cs
new file mode 100644
index 0000000000..9eff8cd9b3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/IssueCategories.cs
@@ -0,0 +1,45 @@
+// 
+// IssueCategories.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	public class IssueCategories
+	{
+		public const string CodeQualityIssues = "Potential Code Quality Issues";
+		public const string ConstraintViolations = "Constraint Violations";
+		public const string PracticesAndImprovements = "Common Practices and Code Improvements";
+		public const string RedundanciesInCode = "Redundancies in Code";
+		public const string RedundanciesInDeclarations = "Redundancies in Symbol Declarations";
+		public const string Opportunities = "Language Usage Opportunities";
+		public const string Notifications = "Code Notifications";
+		public const string CompilerWarnings = "Compiler Warnings";
+		public const string CompilerErrors = "Compiler Errors";
+		public const string NUnit = "NUnit";
+	}
+}
+
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/AccessToClosureIssues/AccessToClosureIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/AccessToClosureIssues/AccessToClosureIssue.cs
new file mode 100644
index 0000000000..07a9c8523a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/AccessToClosureIssues/AccessToClosureIssue.cs
@@ -0,0 +1,324 @@
+// 
+// AccessToClosureIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using System;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	public abstract class AccessToClosureIssue : GatherVisitorCodeIssueProvider
+	{
+
+		public string Title
+		{ get; private set; }
+
+		protected AccessToClosureIssue (string title)
+		{
+			Title = title;
+		}
+
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			var unit = context.RootNode as SyntaxTree;
+			if (unit == null)
+				return null;
+			return new GatherVisitor(context, unit, this);
+		}
+
+		protected virtual bool IsTargetVariable (IVariable variable)
+		{
+			return true;
+		}
+
+		protected abstract NodeKind GetNodeKind (AstNode node);
+
+		protected virtual bool CanReachModification (ControlFlowNode node, Statement start,
+												     IDictionary<Statement, IList<Node>> modifications)
+		{
+			return node.NextStatement != null && node.NextStatement != start &&
+				   modifications.ContainsKey (node.NextStatement);
+		}
+
+		protected abstract IEnumerable<CodeAction> GetFixes (BaseRefactoringContext context, Node env, 
+															 string variableName);
+
+		#region GatherVisitor
+
+		class GatherVisitor : GatherVisitorBase<AccessToClosureIssue>
+		{
+			readonly ControlFlowGraphBuilder cfgBuilder = new ControlFlowGraphBuilder ();
+			string title;
+
+			public GatherVisitor (BaseRefactoringContext context, SyntaxTree unit,
+								  AccessToClosureIssue qualifierDirectiveEvidentIssueProvider)
+				: base (context, qualifierDirectiveEvidentIssueProvider)
+			{
+				this.title = context.TranslateString (qualifierDirectiveEvidentIssueProvider.Title);
+			}
+
+			public override void VisitVariableInitializer (VariableInitializer variableInitializer)
+			{
+				var variableDecl = variableInitializer.Parent as VariableDeclarationStatement;
+				if (variableDecl != null)
+					CheckVariable (((LocalResolveResult)ctx.Resolve (variableInitializer)).Variable, 
+								   variableDecl.GetParent<Statement> ());
+				base.VisitVariableInitializer (variableInitializer);
+			}
+
+			public override void VisitForeachStatement (ForeachStatement foreachStatement)
+			{
+				CheckVariable (((LocalResolveResult)ctx.Resolve (foreachStatement.VariableNameToken)).Variable,
+							   foreachStatement);
+				base.VisitForeachStatement (foreachStatement);
+			}
+
+			public override void VisitParameterDeclaration (ParameterDeclaration parameterDeclaration)
+			{
+				var parent = parameterDeclaration.Parent;
+				Statement body = null;
+				if (parent is MethodDeclaration) {
+					body = ((MethodDeclaration)parent).Body;
+				} else if (parent is AnonymousMethodExpression) {
+					body = ((AnonymousMethodExpression)parent).Body;
+				} else if (parent is LambdaExpression) {
+					body = ((LambdaExpression)parent).Body as Statement;
+				} else if (parent is ConstructorDeclaration) {
+					body = ((ConstructorDeclaration)parent).Body;
+				} else if (parent is OperatorDeclaration) {
+					body = ((OperatorDeclaration)parent).Body;
+				}
+				if (body != null) {
+					var lrr = ctx.Resolve (parameterDeclaration) as LocalResolveResult;
+					if (lrr != null)
+						CheckVariable (lrr.Variable, body);
+				}
+				base.VisitParameterDeclaration (parameterDeclaration);
+			}
+
+			void CheckVariable(IVariable variable, Statement env)
+			{
+				if (!issueProvider.IsTargetVariable(variable))
+					return;
+
+				var root = new Environment (env, env);
+				var envLookup = new Dictionary<AstNode, Environment> ();
+				envLookup [env] = root;
+
+				foreach (var result in ctx.FindReferences(env, variable)) {
+					AddNode(envLookup, new Node(result.Node, issueProvider.GetNodeKind(result.Node)));
+				}
+
+				root.SortChildren ();
+				CollectIssues (root, variable.Name);
+			}
+
+			void CollectIssues (Environment env, string variableName)
+			{
+				IList<ControlFlowNode> cfg = null;
+				IDictionary<Statement, IList<Node>> modifications = null;
+
+				if (env.Body != null) {
+					try { 
+						cfg = cfgBuilder.BuildControlFlowGraph (env.Body);
+					} catch (Exception) {
+						return;
+					}
+					modifications = new Dictionary<Statement, IList<Node>> ();
+					foreach (var node in env.Children) {
+						if (node.Kind == NodeKind.Modification || node.Kind == NodeKind.ReferenceAndModification) {
+							IList<Node> nodes;
+							if (!modifications.TryGetValue (node.ContainingStatement, out nodes))
+								modifications [node.ContainingStatement] = nodes = new List<Node> ();
+							nodes.Add (node);
+						}
+					}
+				}
+
+				foreach (var child in env.GetChildEnvironments ()) {
+					if (!child.IssueCollected && cfg != null && 
+						CanReachModification (cfg, child, modifications))
+						CollectAllIssues (child, variableName);
+
+					CollectIssues (child, variableName);
+				}
+			}
+
+			void CollectAllIssues (Environment env, string variableName)
+			{
+				var fixes = issueProvider.GetFixes (ctx, env, variableName).ToArray ();
+				env.IssueCollected = true;
+
+				foreach (var child in env.Children) {
+					if (child is Environment) {
+						CollectAllIssues ((Environment)child, variableName);
+					} else {
+						if (child.Kind != NodeKind.Modification)
+							AddIssue (new CodeIssue(child.AstNode, title, fixes));
+						// stop marking references after the variable is modified in current environment
+						if (child.Kind != NodeKind.Reference)
+							break;
+					}
+				}
+			}
+
+			void AddNode (IDictionary<AstNode, Environment> envLookup, Node node)
+			{
+				var astParent = node.AstNode.Parent;
+				var path = new List<AstNode> ();
+				while (astParent != null) {
+					Environment parent;
+					if (envLookup.TryGetValue (astParent, out parent)) {
+						parent.Children.Add (node);
+						return;
+					}
+
+					if (astParent is LambdaExpression) {
+						parent = new Environment (astParent, ((LambdaExpression)astParent).Body as Statement);
+					} else if (astParent is AnonymousMethodExpression) {
+						parent = new Environment (astParent, ((AnonymousMethodExpression)astParent).Body);
+					}
+
+					path.Add (astParent);
+					if (parent != null) {
+						foreach (var astNode in path)
+							envLookup [astNode] = parent;
+						path.Clear ();
+
+						parent.Children.Add (node);
+						node = parent;
+					}
+					astParent = astParent.Parent;
+				}
+			}
+
+			bool CanReachModification (IEnumerable<ControlFlowNode> cfg, Environment env,
+									   IDictionary<Statement, IList<Node>> modifications)
+			{
+				if (modifications.Count == 0)
+					return false;
+
+				var start = env.ContainingStatement;
+				if (modifications.ContainsKey (start) &&
+					modifications [start].Any (v => v.AstNode.StartLocation > env.AstNode.EndLocation))
+					return true;
+
+				var stack = new Stack<ControlFlowNode> (cfg.Where (node => node.NextStatement == start));
+				var visitedNodes = new HashSet<ControlFlowNode> (stack);
+				while (stack.Count > 0) {
+					var node = stack.Pop ();
+					if (issueProvider.CanReachModification (node, start, modifications))
+						return true;
+					foreach (var edge in node.Outgoing) {
+						if (visitedNodes.Add (edge.To))
+							stack.Push (edge.To);
+					}
+				}
+				return false;
+			}
+
+		}
+
+		#endregion
+
+		#region Node
+
+		protected enum NodeKind
+		{
+			Reference,
+			Modification,
+			ReferenceAndModification,
+			Environment,
+		}
+
+		protected class Node
+		{
+			public AstNode AstNode
+			{ get; private set; }
+
+			public NodeKind Kind
+			{ get; private set; }
+
+			public Statement ContainingStatement
+			{ get; private set; }
+
+			public Node (AstNode astNode, NodeKind kind)
+			{
+				AstNode = astNode;
+				Kind = kind;
+				ContainingStatement = astNode.GetParent<Statement> ();
+			}
+
+			public virtual IEnumerable<Node> GetAllReferences ()
+			{
+				yield return this;
+			}
+		}
+
+		protected class Environment : Node
+		{
+			public Statement Body
+			{ get; private set; }
+
+			public bool IssueCollected
+			{ get; set; }
+
+			public List<Node> Children
+			{ get; private set; }
+
+			public Environment (AstNode astNode, Statement body)
+				: base (astNode, NodeKind.Environment)
+			{
+				Body = body;
+				Children = new List<Node> ();
+			}
+
+			public override IEnumerable<Node> GetAllReferences ()
+			{
+				return Children.SelectMany (child => child.GetAllReferences ());
+			}
+
+			public IEnumerable<Environment> GetChildEnvironments ()
+			{
+				return from child in Children
+					   where child is Environment
+					   select (Environment)child;
+			}
+
+			public void SortChildren ()
+			{
+				Children.Sort ((x, y) => x.AstNode.StartLocation.CompareTo(y.AstNode.StartLocation));
+				foreach (var env in GetChildEnvironments ())
+					env.SortChildren ();
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/AccessToClosureIssues/AccessToDisposedClosureIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/AccessToClosureIssues/AccessToDisposedClosureIssue.cs
new file mode 100644
index 0000000000..bc48a268ad
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/AccessToClosureIssues/AccessToDisposedClosureIssue.cs
@@ -0,0 +1,93 @@
+// 
+// AccessToDisposedClosureIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+    [IssueDescription ("Access to disposed closure variable",
+                       Description = "Access to closure variable from anonymous method when the variable is" + 
+                                     " disposed externally",
+                       Category = IssueCategories.CodeQualityIssues,
+                       Severity = Severity.Warning,
+	                   AnalysisDisableKeyword = "AccessToDisposedClosure")]
+	public class AccessToDisposedClosureIssue : AccessToClosureIssue
+	{
+		public AccessToDisposedClosureIssue ()
+			: base ("Access to disposed closure")
+		{
+		}
+
+		protected override bool IsTargetVariable (IVariable variable)
+		{
+			return variable.Type.GetAllBaseTypeDefinitions ().Any (t => t.KnownTypeCode == KnownTypeCode.IDisposable);
+		}
+
+		protected override NodeKind GetNodeKind (AstNode node)
+		{
+			if (node.Parent is UsingStatement)
+				return NodeKind.ReferenceAndModification;
+
+			if (node.Parent is VariableDeclarationStatement && node.Parent.Parent is UsingStatement)
+				return NodeKind.Modification;
+
+			var memberRef = node.Parent as MemberReferenceExpression;
+			if (memberRef != null && memberRef.Parent is InvocationExpression && memberRef.MemberName == "Dispose")
+				return NodeKind.ReferenceAndModification;
+
+			return NodeKind.Reference;
+		}
+
+		protected override bool CanReachModification (ControlFlowNode node, Statement start,
+												   IDictionary<Statement, IList<Node>> modifications)
+		{
+			if (base.CanReachModification (node, start, modifications))
+				return true;
+
+			if (node.NextStatement != start) {
+				var usingStatement = node.PreviousStatement as UsingStatement;
+				if (usingStatement != null) {
+					if (modifications.ContainsKey(usingStatement))
+						return true;
+					if (usingStatement.ResourceAcquisition is Statement &&
+						modifications.ContainsKey ((Statement)usingStatement.ResourceAcquisition))
+						return true;
+				}
+			}
+			return false;
+		}
+
+		protected override IEnumerable<CodeAction> GetFixes (BaseRefactoringContext context, Node env,
+															 string variableName)
+		{
+			yield break;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/AccessToClosureIssues/AccessToModifiedClosureIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/AccessToClosureIssues/AccessToModifiedClosureIssue.cs
new file mode 100644
index 0000000000..1f6b0df694
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/AccessToClosureIssues/AccessToModifiedClosureIssue.cs
@@ -0,0 +1,116 @@
+// 
+// AccessToModifiedClosureIssue.cs
+//  
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+    [IssueDescription("Access to modified closure variable",
+                       Description = "Access to closure variable from anonymous method when the variable is modified " +
+                                     "externally",
+                       Category = IssueCategories.CodeQualityIssues,
+                       Severity = Severity.Warning,
+	                   AnalysisDisableKeyword = "AccessToModifiedClosure")]	
+	public class AccessToModifiedClosureIssue : AccessToClosureIssue
+	{
+		public AccessToModifiedClosureIssue ()
+			: base ("Access to modified closure")
+		{
+		}
+
+		protected override NodeKind GetNodeKind (AstNode node)
+		{
+			var assignment = node.GetParent<AssignmentExpression> ();
+			if (assignment != null && assignment.Left == node) {
+				if (assignment.Operator == AssignmentOperatorType.Assign) 
+					return NodeKind.Modification;
+				return NodeKind.ReferenceAndModification;
+			}
+			var unaryExpr = node.GetParent<UnaryOperatorExpression> ();
+			if (unaryExpr != null && unaryExpr.Expression == node &&
+				(unaryExpr.Operator == UnaryOperatorType.Increment ||
+				 unaryExpr.Operator == UnaryOperatorType.PostIncrement ||
+				 unaryExpr.Operator == UnaryOperatorType.Decrement ||
+				 unaryExpr.Operator == UnaryOperatorType.PostDecrement)) {
+				return NodeKind.ReferenceAndModification;
+			}
+			if (node.Parent is ForeachStatement)
+				return NodeKind.Modification;
+
+			return NodeKind.Reference;
+		}
+
+		protected override IEnumerable<CodeAction> GetFixes (BaseRefactoringContext context, Node env,
+															 string variableName)
+		{
+			var containingStatement = env.ContainingStatement;
+
+			// we don't give a fix for these cases since the general fix may not work
+			// lambda in while/do-while/for condition
+			if (containingStatement is WhileStatement || containingStatement is DoWhileStatement ||
+				containingStatement is ForStatement)
+				yield break;
+			// lambda in for initializer/iterator
+			if (containingStatement.Parent is ForStatement &&
+				((ForStatement)containingStatement.Parent).EmbeddedStatement != containingStatement)
+				yield break;
+
+			Action<Script> action = script =>
+			{
+				var newName = LocalVariableNamePicker.PickSafeName (
+					containingStatement.GetParent<EntityDeclaration> (),
+					Enumerable.Range (1, 100).Select (i => variableName + i));
+
+				var variableDecl = new VariableDeclarationStatement (new SimpleType("var"), newName, 
+																	 new IdentifierExpression (variableName));
+				
+				if (containingStatement.Parent is BlockStatement || containingStatement.Parent is SwitchSection) {
+					script.InsertBefore (containingStatement, variableDecl);
+				} else {
+					var offset = script.GetCurrentOffset (containingStatement.StartLocation);
+					script.InsertBefore (containingStatement, variableDecl);
+					script.InsertText (offset, "{");
+					script.InsertText (script.GetCurrentOffset (containingStatement.EndLocation), "}");
+					script.FormatText (containingStatement.Parent);
+				}
+
+				var textNodes = new List<AstNode> ();
+				textNodes.Add (variableDecl.Variables.First ().NameToken);
+
+				foreach (var reference in env.GetAllReferences ()) {
+					var identifier = new IdentifierExpression (newName);
+					script.Replace (reference.AstNode, identifier);
+					textNodes.Add (identifier);
+				}
+				script.Link (textNodes.ToArray ());
+			};
+			yield return new CodeAction (context.TranslateString ("Copy to local variable"), action, env.AstNode);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AccessToClosureIssues/LocalVariableNamePicker.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/AccessToClosureIssues/LocalVariableNamePicker.cs
similarity index 100%
rename from src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AccessToClosureIssues/LocalVariableNamePicker.cs
rename to src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/AccessToClosureIssues/LocalVariableNamePicker.cs
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/DuplicateBodyMethodIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/DuplicateBodyMethodIssue.cs
new file mode 100644
index 0000000000..aad1d48161
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/DuplicateBodyMethodIssue.cs
@@ -0,0 +1,176 @@
+//
+// DuplicateBodyMethodIssue.cs
+//
+// Author:
+//       Ciprian Khlud <ciprian.mustiata@yahoo.com>
+//
+// Copyright (c) 2013 Ciprian Khlud
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Text;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+//	[IssueDescription("Methods have duplicate body",
+//                      Description = "One method has the same body as other method",
+//                      Severity = Severity.Hint,
+//                      IssueMarker = IssueMarker.Underline)]
+	public class DuplicateBodyMethodIssue : CodeIssueProvider
+	{
+		#region ICodeIssueProvider implementation
+		public override IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context, string subIssue)
+		{
+			var visitor = new GatherVisitor(context);
+			visitor.GetMethods();
+			visitor.ComputeConflicts();
+			return visitor.GetIssues();
+		}
+		#endregion
+
+		private class GatherVisitor : GatherVisitorBase<DuplicateBodyMethodIssue>
+		{
+			public List<MethodDeclaration> DeclaredMethods;
+
+			public GatherVisitor(BaseRefactoringContext context)
+				: base(context)
+			{
+				DeclaredMethods = new List<MethodDeclaration>();
+			}
+
+			static string GetMethodDescriptor(MethodDeclaration methodDeclaration)
+			{
+				var sb = new StringBuilder();
+				sb.Append(methodDeclaration.ReturnType);
+				sb.Append(";");
+				foreach (var parameter in methodDeclaration.Parameters) {
+					sb.AppendFormat("{0}:{1};", parameter.Name, parameter.Type);
+				}
+				sb.Append(methodDeclaration.Modifiers);
+				return sb.ToString();
+			}
+
+			public void GetMethods()
+			{
+				ctx.RootNode.AcceptVisitor(this);
+			}
+
+			internal void ComputeConflicts()
+			{
+				var dict = new Dictionary<string, List<MethodDeclaration>>();
+				foreach (var declaredMethod in DeclaredMethods) {
+					var methodDescriptor = GetMethodDescriptor(declaredMethod);
+					List<MethodDeclaration> listMethods;
+					if (!dict.TryGetValue(methodDescriptor, out listMethods)) {
+						listMethods = new List<MethodDeclaration>();
+						dict [methodDescriptor] = listMethods;
+					}
+					listMethods.Add(declaredMethod);
+				}
+				DeclaredMethods.Clear();
+
+				foreach (var list in dict.Values.Where(list => list.Count >= 2)) {
+					for (var i = 0; i < list.Count - 1; i++) {
+						var firstMethod = list [i];
+						for (var j = i + 1; j < list.Count; j++) {
+							var secondMethod = list [j];
+							if (firstMethod.Body.IsMatch(secondMethod.Body)) {
+								AddIssue(new CodeIssue(secondMethod.NameToken,
+								         string.Format("Method '{0}' has the same with '{1}' ", secondMethod.Name,
+								              firstMethod.Name), string.Format("Method '{0}' has the same with '{1}' ", secondMethod.Name,
+								                                 firstMethod.Name),
+								                                 script => {
+									InvokeMethod(script, firstMethod, secondMethod); }
+								));
+							}
+						}
+					}
+				}
+			}
+
+			readonly InsertParenthesesVisitor _insertParenthesesVisitor = new InsertParenthesesVisitor();
+			private TypeDeclaration _parentType;
+
+			private void InvokeMethod(Script script, MethodDeclaration firstMethod, MethodDeclaration secondMethod)
+			{
+				var statement =
+                    new ExpressionStatement(new InvocationExpression(new IdentifierExpression(firstMethod.Name),
+                                                                     firstMethod.Parameters.Select(
+                                                                         declaration =>
+                                                                         GetArgumentExpression(declaration).Clone())));
+				statement.AcceptVisitor(_insertParenthesesVisitor);
+				if (firstMethod.ReturnType.ToString() != "System.Void") {
+					var returnStatement = new ReturnStatement(statement.Expression.Clone());
+
+					script.Replace(secondMethod.Body, new BlockStatement { returnStatement });
+				} else {
+					script.Replace(secondMethod.Body, new BlockStatement { statement });
+				}
+			}
+
+			static Expression GetArgumentExpression(ParameterDeclaration parameter)
+			{
+				var identifierExpr = new IdentifierExpression(parameter.Name);
+				switch (parameter.ParameterModifier) {
+					case ParameterModifier.Out:
+						return new DirectionExpression(FieldDirection.Out, identifierExpr);
+					case ParameterModifier.Ref:
+						return new DirectionExpression(FieldDirection.Ref, identifierExpr);
+				}
+				return identifierExpr;
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration declaration)
+			{
+				var context = ctx;
+				var methodDeclaration = declaration;
+
+				var resolved = context.Resolve(methodDeclaration) as MemberResolveResult;
+				if (resolved == null)
+					return;
+				var isImplementingInterface = resolved.Member.ImplementedInterfaceMembers.Any();
+
+				if (isImplementingInterface)
+					return;
+				if (declaration.Body.IsNull)
+					return;
+				var parentType = declaration.Parent as TypeDeclaration;
+				if (parentType == null)
+					return;
+				if (_parentType == null)
+					_parentType = parentType;
+				else {
+					//if we are here, it means that we switched from one class to another, so it means that we should compute 
+					//the duplicates up-to now, then reset the list of methods
+					if (parentType != _parentType) {
+						ComputeConflicts();
+						DeclaredMethods.Add(declaration); 
+						_parentType = parentType;
+						return;
+					}
+				}
+
+				DeclaredMethods.Add(declaration);
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/DuplicateExpressionsInConditionsIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/DuplicateExpressionsInConditionsIssue.cs
new file mode 100644
index 0000000000..4d25a2fb61
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/DuplicateExpressionsInConditionsIssue.cs
@@ -0,0 +1,125 @@
+//
+// DuplicateExpressionsInConditionsIssue.cs
+//
+// Author:
+//       Ciprian Khlud <ciprian.mustiata@yahoo.com>
+//
+// Copyright (c) 2013 Ciprian Khlud
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+//    [IssueDescription("Expression has some redundant items",
+//		                   Description = "Expression has some redundant items",
+//		                   Category = IssueCategories.CodeQualityIssues,
+//		                   Severity = Severity.Warning,
+//		                   AnalysisDisableKeyword = "ConditionalTernaryEqualBranch")]
+	public class DuplicateExpressionsInConditionsIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+        static readonly List<BinaryOperatorType> SupportedOperators = new List<BinaryOperatorType>();
+        static DuplicateExpressionsInConditionsIssue()
+        {
+            SupportedOperators.Add(BinaryOperatorType.BitwiseAnd);
+            SupportedOperators.Add(BinaryOperatorType.BitwiseOr);
+            SupportedOperators.Add(BinaryOperatorType.ConditionalAnd);
+            SupportedOperators.Add(BinaryOperatorType.ConditionalOr);
+        }
+		
+		class GatherVisitor : GatherVisitorBase<DuplicateExpressionsInConditionsIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+            public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
+            {
+                var expression = binaryOperatorExpression;
+                base.VisitBinaryOperatorExpression(expression);
+                if(!SupportedOperators.Contains(expression.Operator) )
+                    return;
+                var parentExpression = expression.Parent as BinaryOperatorExpression;
+                if(parentExpression!=null && parentExpression.Operator==expression.Operator)
+                {
+                    //handle only parent sequence
+                    return;
+                }
+                var expressions = GetExpressions(binaryOperatorExpression, expression);
+                for(var i=0;i<expressions.Count-1;i++)
+                {
+                    for (var j = i+1; j < expressions.Count; j++)
+                    {
+                        var expressionLeft = expressions[i];
+                        var expressionRight = expressions[j];
+                        if (!expressionLeft.IsMatch(expressionRight))
+                            continue;
+                        var action = new CodeAction(ctx.TranslateString("Remove redundant expression"),
+                                                    script => RemoveRedundantExpression(script, expressionRight),
+                                                    expressionRight);
+                    
+						AddIssue(
+							new CodeIssue(expressionRight, 
+								ctx.TranslateString(string.Format("The expression '{0}' is identical in the left branch", expressionRight)), 
+								action
+							) { IssueMarker = IssueMarker.GrayOut }
+						);
+
+
+                    }
+                }
+            }
+
+		    private static void RemoveRedundantExpression(Script script, AstNode expressionRight)
+		    {
+                var parent = expressionRight.Parent as BinaryOperatorExpression;
+                if(parent==null) //should never happen!
+                    return;
+                script.Replace(parent, parent.Left.Clone());
+		    }
+
+		    private static List<Expression> GetExpressions(BinaryOperatorExpression binaryOperatorExpression,
+		                                       BinaryOperatorExpression expression)
+		    {
+		        var baseExpression = expression;
+		        var leftExpression = baseExpression.FirstChild as BinaryOperatorExpression;
+		        var expressions = new List<Expression>();
+		        while (leftExpression != null && binaryOperatorExpression.Operator == leftExpression.Operator)
+		        {
+		            expressions.Add(baseExpression.Right);
+		            baseExpression = leftExpression;
+		            leftExpression = leftExpression.Left as BinaryOperatorExpression;
+		        }
+		        expressions.Add(baseExpression.Right);
+		        expressions.Add(baseExpression.Left);
+		        expressions.Reverse();
+		        return expressions;
+		    }
+		}
+	}	
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/DuplicateIfInIfChainIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/DuplicateIfInIfChainIssue.cs
new file mode 100644
index 0000000000..6f54aa62e1
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/DuplicateIfInIfChainIssue.cs
@@ -0,0 +1,111 @@
+//
+// DuplicateIfInIfChainIssue.cs
+//
+// Author:
+//       Ciprian Khlud <ciprian.mustiata@yahoo.com>
+//
+// Copyright (c) 2013 Ciprian Khlud
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+//	[IssueDescription("Else branch has some redundant if",
+//	                  Description = "One Else-if was checked before so is not be true",
+//	                  Category = IssueCategories.CodeQualityIssues,
+//	                  Severity = Severity.Warning,
+//	                  AnalysisDisableKeyword = "ConditionalTernaryEqualBranch")]
+	public class DuplicateIfInIfChainIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<DuplicateIfInIfChainIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+			
+			public override void VisitIfElseStatement(IfElseStatement ifStatement)
+			{
+				base.VisitIfElseStatement(ifStatement);
+				var parentExpression = ifStatement.Parent as IfElseStatement;
+				//handle only parent sequence
+				if (parentExpression != null)
+					return;
+				var expressions = GetExpressions(ifStatement);
+				for(var i=0;i<expressions.Count-1;i++) {
+					for (var j = i+1; j < expressions.Count; j++) {
+						var leftCondition = expressions[i].Condition;
+                        var rightIf = expressions[j];
+                        var rightCondition = rightIf.Condition;
+					    
+						if (!leftCondition.IsMatch(rightCondition))
+							continue;
+						var action = new CodeAction(ctx.TranslateString("Remove redundant expression"),
+                                                    script => RemoveRedundantIf(script, rightIf),
+						                            rightCondition);
+						
+						AddIssue(new CodeIssue(rightCondition,
+						         ctx.TranslateString(string.Format("The expression '{0}' is identical in the left branch",
+								rightCondition)), action) { IssueMarker = IssueMarker.GrayOut });
+						
+					}
+				}
+			}
+
+            private static void RemoveRedundantIf(Script script, IfElseStatement expressionRight)
+            {
+                var parent = expressionRight.Parent as IfElseStatement;
+                if(parent==null) { //should never happen!
+                    return;
+                }
+                if (expressionRight.FalseStatement.IsNull) {
+                    script.Remove(parent.ElseToken);
+                    script.Remove(parent.FalseStatement);
+                    script.FormatText(parent);
+				} else {
+					script.Replace(parent.FalseStatement, expressionRight.FalseStatement.Clone());
+				}
+            }
+
+		    private static List<IfElseStatement> GetExpressions(IfElseStatement expression)
+			{
+				var baseExpression = expression;
+				var falseExpression = baseExpression.FalseStatement as IfElseStatement;
+                var expressions = new List<IfElseStatement>();
+				while (falseExpression != null) {
+					expressions.Add(baseExpression);
+					baseExpression = falseExpression;
+					falseExpression = falseExpression.FalseStatement as IfElseStatement;
+				}
+				expressions.Add(baseExpression);
+				return expressions;
+			}
+		}
+	}
+	
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/ParameterCanBeIEnumerableIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/ParameterCanBeIEnumerableIssue.cs
new file mode 100644
index 0000000000..cc4b82e089
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/ParameterCanBeIEnumerableIssue.cs
@@ -0,0 +1,155 @@
+//
+// ParameterCanBeIEnumerableIssue.cs
+//
+// Author:
+//       Ciprian Khlud <ciprian.mustiata@yahoo.com>
+//
+// Copyright (c) 2013 Ciprian Khlud
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+// Does this even make sense ? We've a parameter can be demoted issue which does mostly the same.
+//	[IssueDescription("A parameter can IEnumerable/ICollection/IList<T>",
+//	                  Description = "Finds parameters that can be demoted to a generic list.",
+//	                  Category = IssueCategories.Opportunities,
+//	                  Severity = Severity.Suggestion
+//	                  )]
+	public class ParameterCanBeIEnumerableIssue : GatherVisitorCodeIssueProvider
+	{
+	    readonly bool tryResolve;
+		
+		public ParameterCanBeIEnumerableIssue() : this (true)
+		{
+		}
+		
+		public ParameterCanBeIEnumerableIssue(bool tryResolve)
+		{
+			this.tryResolve = tryResolve;
+		}
+		
+		#region ICodeIssueProvider implementation
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context, tryResolve);
+		}
+		#endregion
+		
+		class GatherVisitor : GatherVisitorBase<ParameterCanBeIEnumerableIssue>
+		{
+			bool tryResolve;
+			
+			public GatherVisitor(BaseRefactoringContext context, bool tryResolve) : base (context)
+			{
+				this.tryResolve = tryResolve;
+			}
+			
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				methodDeclaration.Attributes.AcceptVisitor(this);
+				if (HasEntryPointSignature(methodDeclaration))
+					return;
+				var eligibleParameters = methodDeclaration.Parameters
+					.Where(p => p.ParameterModifier != ParameterModifier.Out && p.ParameterModifier != ParameterModifier.Ref)
+						.ToList();
+				if (eligibleParameters.Count == 0)
+					return;
+				var declarationResolveResult = ctx.Resolve(methodDeclaration) as MemberResolveResult;
+				if (declarationResolveResult == null)
+					return;
+				var member = declarationResolveResult.Member;
+				if (member.IsOverride || member.IsOverridable || member.ImplementedInterfaceMembers.Any())
+					return;
+				
+				var collector = new TypeCriteriaCollector(ctx);
+				methodDeclaration.AcceptVisitor(collector);
+				
+				foreach (var parameter in eligibleParameters) {
+					ProcessParameter(parameter, methodDeclaration.Body, collector);
+				}
+			}
+			
+			bool HasEntryPointSignature(MethodDeclaration methodDeclaration)
+			{
+				if (!methodDeclaration.Modifiers.HasFlag(Modifiers.Static))
+					return false;
+				var returnType = ctx.Resolve(methodDeclaration.ReturnType).Type;
+				if (!returnType.IsKnownType(KnownTypeCode.Int32) && !returnType.IsKnownType(KnownTypeCode.Void))
+					return false;
+				var parameterCount = methodDeclaration.Parameters.Count;
+				if (parameterCount == 0)
+					return true;
+				if (parameterCount != 1)
+					return false;
+				var parameterType = ctx.Resolve(methodDeclaration.Parameters.First()).Type as ArrayType;
+				return parameterType != null && parameterType.ElementType.IsKnownType(KnownTypeCode.String);
+			}
+
+            void ProcessParameter(ParameterDeclaration parameter, AstNode rootResolutionNode, TypeCriteriaCollector collector)
+            {
+                var localResolveResult = ctx.Resolve(parameter) as LocalResolveResult;
+                if (localResolveResult == null)
+                    return;
+                var variable = localResolveResult.Variable;
+                var typeKind = variable.Type.Kind;
+                if (!(typeKind == TypeKind.Class ||
+                      typeKind == TypeKind.Struct ||
+                      typeKind == TypeKind.Interface ||
+                      typeKind == TypeKind.Array) ||
+                    !collector.UsedVariables.Contains(variable))
+                {
+                    return;
+                }
+
+                var candidateTypes = localResolveResult.Type.GetAllBaseTypes()
+                    .Where(t => t.IsParameterized)
+                    .ToList();
+
+                var validTypes =
+                    (from type in candidateTypes
+                     where !tryResolve || ParameterCanBeDeclaredWithBaseTypeIssue.TypeChangeResolvesCorrectly(ctx, parameter, rootResolutionNode, type)
+                     select type).ToList();
+                if (!validTypes.Any()) return;
+
+                var foundType = validTypes.FirstOrDefault();
+                if (foundType == null)
+                    return;
+
+				AddIssue(new CodeIssue(parameter.NameToken, string.Format(ctx.TranslateString("Parameter can be {0}"),
+				                                            foundType.Name),string.Format(ctx.TranslateString("Parameter can be {0}"),
+				                              foundType.Name),
+					script => script.Replace(parameter.Type, CreateShortType(ctx, foundType, parameter))));
+            }
+
+		    public static AstType CreateShortType(BaseRefactoringContext refactoringContext, IType expressionType, AstNode node)
+            {
+
+                var csResolver = refactoringContext.Resolver.GetResolverStateBefore(node);
+                var builder = new TypeSystemAstBuilder(csResolver);
+                return builder.ConvertType(expressionType);
+            }
+	}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/VariableDeclaredInWideScopeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/VariableDeclaredInWideScopeIssue.cs
new file mode 100644
index 0000000000..563a0d49bd
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/VariableDeclaredInWideScopeIssue.cs
@@ -0,0 +1,383 @@
+//
+// VariableDeclaredWideScopeIssue.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Linq;
+using System;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+//	[IssueDescription("The variable can be declared in a nested scope",
+//	                   Description = "Highlights variables that can be declared in a nested scope.",
+//	                   Category = IssueCategories.Opportunities,
+//	                   Severity = Severity.Suggestion)]
+	public class VariableDeclaredInWideScopeIssue : GatherVisitorCodeIssueProvider
+	{
+		#region ICodeIssueProvider implementation
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context, this);
+		}
+		#endregion
+
+		class GatherVisitor : GatherVisitorBase<VariableDeclaredInWideScopeIssue>
+		{
+			readonly BaseRefactoringContext context;
+			
+			public GatherVisitor(BaseRefactoringContext context, VariableDeclaredInWideScopeIssue qualifierDirectiveEvidentIssueProvider) : base (context, qualifierDirectiveEvidentIssueProvider)
+			{
+				this.context = context;
+			}
+
+			static readonly IList<Type> moveTargetBlacklist = new List<Type> {
+				typeof(WhileStatement),
+				typeof(ForeachStatement),
+				typeof(ForStatement),
+				typeof(DoWhileStatement),
+				typeof(TryCatchStatement),
+				typeof(AnonymousMethodExpression),
+				typeof(LambdaExpression),
+				typeof(LockStatement)
+			};
+
+			class CheckInitializer : DepthFirstAstVisitor
+			{
+				public bool IsValid {
+					get;
+					private set;
+				}
+
+				public CheckInitializer()
+				{
+					IsValid = true;
+				}
+
+				public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+				{
+					base.VisitInvocationExpression(invocationExpression);
+					IsValid = false;
+				}
+			}
+			
+			bool CheckForInvocations(Expression initializer)
+			{
+				var visitor = new CheckInitializer();
+				initializer.AcceptVisitor(visitor);
+				return visitor.IsValid;
+			}
+
+			public override void VisitVariableDeclarationStatement(VariableDeclarationStatement variableDeclarationStatement)
+			{
+				base.VisitVariableDeclarationStatement(variableDeclarationStatement);
+
+				var rootNode = variableDeclarationStatement.Parent as BlockStatement;
+				if (rootNode == null)
+					// We are somewhere weird, like a the ResourceAquisition of a using statement
+					return;
+
+				// TODO: Handle declarations with more than one variable?
+				if (variableDeclarationStatement.Variables.Count > 1)
+					return;
+
+				var variableInitializer = variableDeclarationStatement.Variables.First();
+				var identifiers = GetIdentifiers(rootNode.Descendants, variableInitializer.Name).ToList();
+
+				if (identifiers.Count == 0)
+					// variable is not used
+					return;
+
+				if (!CheckForInvocations(variableInitializer.Initializer))
+					return;
+
+				AstNode deepestCommonAncestor = GetDeepestCommonAncestor(rootNode, identifiers);
+				var path = GetPath(rootNode, deepestCommonAncestor);
+
+				// The node that will follow the moved declaration statement
+				AstNode anchorNode = GetInitialAnchorNode(rootNode, identifiers, path);
+
+				// Restrict path to only those where the initializer has not changed
+				var pathToCheck = path.Skip(1).ToList();
+				var firstInitializerChangeNode = GetFirstInitializerChange(variableDeclarationStatement, pathToCheck, variableInitializer.Initializer);
+				if (firstInitializerChangeNode != null) {
+					// The node changing the initializer expression may not be on the path
+					// to the actual usages of the variable, so we need to merge the paths
+					// so we get the part of the paths that are common between them
+					var pathToChange = GetPath(rootNode, firstInitializerChangeNode);
+					var deepestCommonIndex = GetLowestCommonAncestorIndex(path, pathToChange);
+					anchorNode = pathToChange [deepestCommonIndex + 1];
+					path = pathToChange.Take(deepestCommonIndex).ToList();
+				}
+
+				// Restrict to locations outside of blacklisted node types
+				var firstBlackListedNode = path.Where(node => moveTargetBlacklist.Contains(node.GetType())).FirstOrDefault();
+				if (firstBlackListedNode != null) {
+					path = GetPath(rootNode, firstBlackListedNode.Parent);
+					anchorNode = firstBlackListedNode;
+				}
+
+				anchorNode = GetInsertionPoint(anchorNode);
+
+				if (anchorNode != null && anchorNode != rootNode && anchorNode.Parent != rootNode) {
+					AddIssue(new CodeIssue(variableDeclarationStatement, context.TranslateString("Variable could be moved to a nested scope"),
+						GetActions(variableDeclarationStatement, (Statement)anchorNode)));
+				}
+			}
+
+			static bool IsBannedInsertionPoint(AstNode anchorNode)
+			{
+				var parent = anchorNode.Parent;
+
+				// Don't split 'else if ...' into else { if ... }
+				if (parent is IfElseStatement && anchorNode is IfElseStatement)
+					return true;
+				// Don't allow moving the declaration into the resource aquisition of a using statement
+				if (parent is UsingStatement)
+					return true;
+				// Don't allow moving things into arbitrary positions of for statements
+				if (parent is ForStatement && anchorNode.Role != Roles.EmbeddedStatement)
+					return true;
+				return false;
+			}
+
+			static AstNode GetInsertionPoint(AstNode node)
+			{
+				while (true) {
+					if (node == null)
+						break;
+					if (node is Statement && !IsBannedInsertionPoint(node))
+						break;
+					node = node.Parent;
+				}
+				return node;
+			}
+
+			AstNode GetInitialAnchorNode (BlockStatement rootNode, List<IdentifierExpression> identifiers, IList<AstNode> path)
+			{
+				if (identifiers.Count > 1) {
+					// Assume the first identifier is the first in the execution flow
+					// firstPath will always be longer than path since path is the
+					// combination of a least two (different) paths.
+					var firstPath = GetPath(rootNode, identifiers [0]);
+					if (firstPath [path.Count].Role == IfElseStatement.TrueRole) {
+						// IfElseStatement has a slightly weird structure; Don't
+						// consider the true role eligible for anchor node in this case
+						return firstPath [path.Count - 1];
+					}
+					return firstPath [path.Count];
+				}
+				// We only have one path, and a statement in itself cannot be an identifier
+				// so we're safe
+				return path [path.Count - 1];
+			}
+
+			static IEnumerable<IdentifierExpression> GetIdentifiers(IEnumerable<AstNode> candidates, string name = null)
+			{
+				return 
+					from node in candidates
+					let identifier = node as IdentifierExpression
+					where identifier != null && (name == null || identifier.Identifier == name)
+					select identifier;
+			}
+
+			AstNode GetFirstInitializerChange(AstNode variableDeclarationStatement, IList<AstNode> path, Expression initializer)
+			{
+				var identifiers = GetIdentifiers(initializer.DescendantsAndSelf).ToList();
+				var mayChangeInitializer = GetChecker (initializer, identifiers);
+				AstNode lastChange = null;
+				for (int i = path.Count - 1; i >= 0; i--) {
+					for (AstNode node = path[i].PrevSibling; node != null && node != variableDeclarationStatement; node = node.PrevSibling) {
+						// Special case for IfElseStatement: The AST nesting does not match the scope nesting, so
+						// don't handle branches here: The correct one has already been checked anyway.
+						// This also works to our advantage: No special checking is needed for the condition since
+						// it is a the same level in the tree as the false branch
+						if (node.Role == IfElseStatement.TrueRole || node.Role == IfElseStatement.FalseRole)
+							continue;
+						foreach (var expression in node.DescendantsAndSelf.Where(n => n is Expression).Cast<Expression>()) {
+							if (mayChangeInitializer(expression)) {
+								lastChange = expression;
+							}
+						}
+					}
+				}
+				return lastChange;
+			}
+
+			Func<Expression, bool> GetChecker(Expression expression, IList<IdentifierExpression> identifiers)
+			{
+				// TODO: This only works for simple cases.
+				IList<IMember> members;
+				IList<IVariable> locals;
+				var identifierResolveResults = identifiers.Select(identifier => context.Resolve(identifier)).ToList();
+				SplitResolveResults(identifierResolveResults, out members, out locals);
+				
+				if (expression is InvocationExpression || expression is ObjectCreateExpression) {
+					return node => {
+						if (node is InvocationExpression || node is ObjectCreateExpression)
+							// We don't know what these might do, so assume it will change the initializer
+							return true;
+						var binaryOperator = node as BinaryOperatorExpression;
+						if (binaryOperator != null) {
+							var resolveResult = context.Resolve(binaryOperator) as OperatorResolveResult;
+							if (resolveResult == null)
+								return false;
+							// Built-in operators are ok, user defined ones not so much
+							return resolveResult.UserDefinedOperatorMethod != null;
+						}
+						return IsConflictingAssignment(node, identifiers, members, locals);
+					};
+				} else if (expression is IdentifierExpression) {
+					var initializerDependsOnMembers = identifierResolveResults.Any(result => result is MemberResolveResult);
+					var initializerDependsOnReferenceType = identifierResolveResults.Any(result => result.Type.IsReferenceType == true);
+					return node => {
+						if ((node is InvocationExpression || node is ObjectCreateExpression) &&
+						    (initializerDependsOnMembers || initializerDependsOnReferenceType))
+							// Anything can happen...
+							return true;
+						var binaryOperator = node as BinaryOperatorExpression;
+						if (binaryOperator != null) {
+							var resolveResult = context.Resolve(binaryOperator) as OperatorResolveResult;
+							if (resolveResult == null)
+								return false;
+							return resolveResult.UserDefinedOperatorMethod != null;
+						}
+						return IsConflictingAssignment(node, identifiers, members, locals);
+					};
+				}
+
+				return node => false;
+			}
+
+			bool IsConflictingAssignment (Expression node, IList<IdentifierExpression> identifiers, IList<IMember> members, IList<IVariable> locals)
+			{
+				var assignmentExpression = node as AssignmentExpression;
+				if (assignmentExpression != null) {
+					IList<IMember> targetMembers;
+					IList<IVariable> targetLocals;
+					var identifierResolveResults = identifiers.Select(identifier => context.Resolve(identifier)).ToList();
+					SplitResolveResults(identifierResolveResults, out targetMembers, out targetLocals);
+
+					return members.Any(member => targetMembers.Contains(member)) ||
+						locals.Any(local => targetLocals.Contains(local));
+				}
+				return false;
+			}
+
+			static void SplitResolveResults(List<ResolveResult> identifierResolveResults, out IList<IMember> members, out IList<IVariable> locals)
+			{
+				members = new List<IMember>();
+				locals = new List<IVariable>();
+				foreach (var resolveResult in identifierResolveResults) {
+					var memberResolveResult = resolveResult as MemberResolveResult;
+					if (memberResolveResult != null) {
+						members.Add(memberResolveResult.Member);
+					}
+					var localResolveResult = resolveResult as LocalResolveResult;
+					if (localResolveResult != null) {
+						locals.Add(localResolveResult.Variable);
+					}
+				}
+			}
+
+			bool IsScopeContainer(AstNode node)
+			{
+				if (node == null)
+					return false;
+
+				var blockStatement = node as BlockStatement;
+				if (blockStatement != null)
+					return true;
+
+				var statement = node as Statement;
+				if (statement == null)
+					return false;
+
+				var role = node.Role;
+				if (role == Roles.EmbeddedStatement ||
+					role == IfElseStatement.TrueRole ||
+					role == IfElseStatement.FalseRole) {
+					return true;
+				}
+				return false;
+			}
+
+			IEnumerable<CodeAction> GetActions(Statement oldStatement, Statement followingStatement)
+			{
+				yield return new CodeAction(context.TranslateString("Move to nested scope"), script => {
+					var parent = followingStatement.Parent;
+					if (parent is SwitchSection || parent is BlockStatement) {
+						script.InsertBefore(followingStatement, oldStatement.Clone());
+					} else {
+						var newBlockStatement = new BlockStatement {
+							Statements = {
+								oldStatement.Clone(),
+								followingStatement.Clone()
+							}
+						};
+						script.Replace(followingStatement, newBlockStatement);
+						script.FormatText(parent);
+					}
+					script.Remove(oldStatement);
+				}, oldStatement);
+			}
+
+			AstNode GetDeepestCommonAncestor(AstNode assumedRoot, IEnumerable<AstNode> leaves)
+			{
+				var previousPath = GetPath(assumedRoot, leaves.First());
+				int lowestIndex = previousPath.Count - 1;
+				foreach (var leaf in leaves.Skip(1)) {
+					var currentPath = GetPath(assumedRoot, leaf);
+					lowestIndex = GetLowestCommonAncestorIndex(previousPath, currentPath, lowestIndex);
+					previousPath = currentPath;
+				}
+				return previousPath [lowestIndex];
+			}
+			
+			int GetLowestCommonAncestorIndex(IList<AstNode> path1, IList<AstNode> path2, int maxIndex = int.MaxValue)
+			{
+				var max = Math.Min(Math.Min(path1.Count, path2.Count), maxIndex);
+				for (int i = 0; i <= max; i++) {
+					if (path1 [i] != path2 [i])
+						return i - 1;
+				}
+				return max;
+			}
+
+			IList<AstNode> GetPath(AstNode from, AstNode to)
+			{
+				var reversePath = new List<AstNode>();
+				do {
+					reversePath.Add(to);
+					to = to.Parent;
+				} while (to != from.Parent);
+				reversePath.Reverse();
+				return reversePath;
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/RefactoringExtensions.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/RefactoringExtensions.cs
new file mode 100644
index 0000000000..f16099a98c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/RefactoringExtensions.cs
@@ -0,0 +1,62 @@
+//
+// RefactoringExtensions.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2013 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	static class RefactoringExtensions
+	{
+		/// <summary>
+		/// Gets the local variable declaration space, as defined by §3.3 Declarations.
+		/// </summary>
+		/// <returns>The local variable declaration space.</returns>
+		public static AstNode GetLocalVariableDeclarationSpace (this AstNode self)
+		{
+			var node = self.Parent;
+			while (node != null && !CreatesLocalVariableDeclarationSpace(node))
+				node = node.Parent;
+			return node;
+		}
+		
+		static ISet<Type> localVariableDeclarationSpaceCreators = new HashSet<Type> () {
+			typeof(BlockStatement),
+			typeof(SwitchStatement),
+			typeof(ForeachStatement),
+			typeof(ForStatement),
+			typeof(UsingStatement),
+			typeof(LambdaExpression),
+			typeof(AnonymousMethodExpression)
+		};
+
+		static bool CreatesLocalVariableDeclarationSpace(AstNode node)
+		{
+			return localVariableDeclarationSpaceCreators.Contains(node.GetType());
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/BaseMethodCallWithDefaultParameterIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/BaseMethodCallWithDefaultParameterIssue.cs
new file mode 100644
index 0000000000..d1e47fdd1b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/BaseMethodCallWithDefaultParameterIssue.cs
@@ -0,0 +1,142 @@
+//
+// BaseMethodCallWithDefaultParameterIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	[IssueDescription("Call to base member with implicit default parameters",
+	                  Description="Call to base member with implicit default parameters",
+	                  Category = IssueCategories.CodeQualityIssues,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "BaseMethodCallWithDefaultParameter")]
+	public class BaseMethodCallWithDefaultParameterIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<BaseMethodCallWithDefaultParameterIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+				// skip
+			}
+
+			public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
+			{
+				// skip
+			}
+
+			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
+			{
+				// skip
+			}
+
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+				// skip
+			}
+
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+				// skip
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+				var mr = invocationExpression.Target as MemberReferenceExpression;
+				if (mr == null || !(mr.Target is BaseReferenceExpression))
+					return;
+
+				var invocationRR = ctx.Resolve(invocationExpression) as InvocationResolveResult;
+				if (invocationRR == null)
+					return;
+
+				var parentEntity = invocationExpression.GetParent<EntityDeclaration>();
+				if (parentEntity == null)
+					return;
+				var rr = ctx.Resolve(parentEntity) as MemberResolveResult;
+				if (rr == null)
+					return;
+
+				if (invocationExpression.Arguments.Count >= invocationRR.Member.Parameters.Count ||
+					invocationRR.Member.Parameters.Count == 0 || 
+				    !invocationRR.Member.Parameters.Last().IsOptional)
+					return;
+
+				if (!InheritanceHelper.GetBaseMembers(rr.Member, false).Any(m => m == invocationRR.Member))
+					return;
+				AddIssue(new CodeIssue(
+					invocationExpression.RParToken,
+					ctx.TranslateString("Call to base member with implicit default parameters")
+				));
+			}
+		
+			public override void VisitIndexerExpression(IndexerExpression indexerExpression)
+			{
+				base.VisitIndexerExpression(indexerExpression);
+				if (!(indexerExpression.Target is BaseReferenceExpression))
+					return;
+				var invocationRR = ctx.Resolve(indexerExpression) as InvocationResolveResult;
+				if (invocationRR == null)
+					return;
+
+				var parentEntity = indexerExpression.GetParent<IndexerDeclaration>();
+				if (parentEntity == null)
+					return;
+				var rr = ctx.Resolve(parentEntity) as MemberResolveResult;
+				if (rr == null)
+					return;
+
+				if (indexerExpression.Arguments.Count >= invocationRR.Member.Parameters.Count ||
+				    invocationRR.Member.Parameters.Count == 0 || 
+				    !invocationRR.Member.Parameters.Last().IsOptional)
+					return;
+
+				if (!InheritanceHelper.GetBaseMembers(rr.Member, false).Any(m => m == invocationRR.Member))
+					return;
+				AddIssue(new CodeIssue(
+					indexerExpression.RBracketToken,
+					ctx.TranslateString("Call to base member with implicit default parameters")
+				));
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/BitwiseOperatorOnEnumWithoutFlagsIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/BitwiseOperatorOnEnumWithoutFlagsIssue.cs
new file mode 100644
index 0000000000..ad1d347d5d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/BitwiseOperatorOnEnumWithoutFlagsIssue.cs
@@ -0,0 +1,119 @@
+// 
+// BitwiseOperationOnNonFlagsEnumIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Bitwise operation on enum which has no [Flags] attribute",
+	                   Description = "Bitwise operation on enum which has no [Flags] attribute",
+					   Category = IssueCategories.CodeQualityIssues,
+					   Severity = Severity.Warning,
+                       AnalysisDisableKeyword = "BitwiseOperatorOnEnumWithoutFlags")]
+	public class BitwiseOperatorOnEnumWithoutFlagsIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<BitwiseOperatorOnEnumWithoutFlagsIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+			
+			static bool IsBitwiseOperator (UnaryOperatorType op)
+			{
+				return op == UnaryOperatorType.BitNot;
+			}
+
+			static bool IsBitwiseOperator (AssignmentOperatorType op)
+			{
+				return op == AssignmentOperatorType.BitwiseAnd || op == AssignmentOperatorType.BitwiseOr ||
+					op == AssignmentOperatorType.ExclusiveOr;
+			}
+
+			static bool IsBitwiseOperator (BinaryOperatorType op)
+			{
+				return op == BinaryOperatorType.BitwiseAnd || op == BinaryOperatorType.BitwiseOr || 
+					op == BinaryOperatorType.ExclusiveOr;
+			}
+
+			bool IsNonFlagsEnum (Expression expr)
+			{
+				var resolveResult = ctx.Resolve (expr);
+				if (resolveResult == null || resolveResult.Type.Kind != TypeKind.Enum)
+					return false;
+
+				// check [Flags]
+				var typeDef = resolveResult.Type.GetDefinition ();
+				return typeDef != null &&
+					typeDef.Attributes.All (attr => attr.AttributeType.FullName != "System.FlagsAttribute");
+			}
+
+			private void AddIssue (CSharpTokenNode operatorToken)
+			{
+				AddIssue (new CodeIssue (operatorToken, ctx.TranslateString ("Bitwise Operations on enum not marked with Flags attribute")));
+			}
+
+			public override void VisitUnaryOperatorExpression (UnaryOperatorExpression unaryOperatorExpression)
+			{
+				base.VisitUnaryOperatorExpression (unaryOperatorExpression);
+
+				if (!IsBitwiseOperator (unaryOperatorExpression.Operator))
+					return;
+				if (IsNonFlagsEnum (unaryOperatorExpression.Expression))
+					AddIssue (unaryOperatorExpression.OperatorToken);
+			}
+
+			public override void VisitAssignmentExpression (AssignmentExpression assignmentExpression)
+			{
+				base.VisitAssignmentExpression (assignmentExpression);
+
+				if (!IsBitwiseOperator (assignmentExpression.Operator))
+					return;
+				if (IsNonFlagsEnum (assignmentExpression.Right))
+					AddIssue (assignmentExpression.OperatorToken);
+			}
+
+			public override void VisitBinaryOperatorExpression (BinaryOperatorExpression binaryOperatorExpression)
+			{
+				base.VisitBinaryOperatorExpression (binaryOperatorExpression);
+
+				if (!IsBitwiseOperator (binaryOperatorExpression.Operator))
+					return;
+				if (IsNonFlagsEnum (binaryOperatorExpression.Left) || IsNonFlagsEnum (binaryOperatorExpression.Right))
+					AddIssue (binaryOperatorExpression.OperatorToken);
+			}
+
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/CanBeReplacedWithTryCastAndCheckForNullIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/CanBeReplacedWithTryCastAndCheckForNullIssue.cs
new file mode 100644
index 0000000000..04fa833edb
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/CanBeReplacedWithTryCastAndCheckForNullIssue.cs
@@ -0,0 +1,72 @@
+//
+// CanBeReplacedWithTryCastAndCheckForNullIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Type check and casts can be replaced with 'as' and null check",
+	                  Description="Type check and casts can be replaced with 'as' and null check",
+	                  Category = IssueCategories.CodeQualityIssues,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "CanBeReplacedWithTryCastAndCheckForNull")]
+	public class CanBeReplacedWithTryCastAndCheckForNullIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<CanBeReplacedWithTryCastAndCheckForNullIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+			public override void VisitIfElseStatement(IfElseStatement ifElseStatement)
+			{
+				base.VisitIfElseStatement(ifElseStatement);
+
+				IsExpression isExpression;
+				int foundCastCount;
+				if (UseAsAndNullCheckAction.ScanIfElse(ctx, ifElseStatement, out isExpression, out foundCastCount) == null)
+					return;
+				if (foundCastCount == 0)
+					return;
+
+				AddIssue(new CodeIssue(
+					isExpression.IsToken,
+					ctx.TranslateString("Type check and casts can be replaced with 'as' and null check")
+				) { ActionProvider = { typeof(UseAsAndNullCheckAction) } } );
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/CompareNonConstrainedGenericWithNullIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/CompareNonConstrainedGenericWithNullIssue.cs
new file mode 100644
index 0000000000..84935b17f2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/CompareNonConstrainedGenericWithNullIssue.cs
@@ -0,0 +1,100 @@
+//
+// CompareNonConstrainedGenericWithNullIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription (
+		"Possible compare of value type with 'null'",
+		Description = "Possible compare of value type with 'null'",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "CompareNonConstrainedGenericWithNull")]
+	public class CompareNonConstrainedGenericWithNullIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<CompareNonConstrainedGenericWithNullIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			static readonly AstNode pattern = new Choice {
+				PatternHelper.CommutativeOperatorWithOptionalParentheses(new AnyNode("node"), BinaryOperatorType.Equality, new NullReferenceExpression ()),
+				PatternHelper.CommutativeOperatorWithOptionalParentheses(new AnyNode("node"), BinaryOperatorType.InEquality, new NullReferenceExpression ())
+			};
+
+			void CheckCase(IType type, BinaryOperatorExpression binaryOperatorExpression, Expression expr)
+			{
+				if (type.Kind != TypeKind.TypeParameter || type.IsReferenceType == true)
+					return;
+				AddIssue(new CodeIssue(
+					binaryOperatorExpression,
+					ctx.TranslateString("Possible compare of value type with 'null'"),
+					ctx.TranslateString("Replace with 'default'"),
+					s => {
+						var builder = ctx.CreateTypeSystemAstBuilder(binaryOperatorExpression);
+						s.Replace(binaryOperatorExpression, 
+							new BinaryOperatorExpression(expr.Clone(), 
+								binaryOperatorExpression.Operator,
+								new DefaultValueExpression(builder.ConvertType(type))
+							)
+						); 
+					}
+				));
+			}
+
+			public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
+			{
+				base.VisitBinaryOperatorExpression(binaryOperatorExpression);
+				var match = pattern.Match(binaryOperatorExpression);
+				if (!match.Success)
+					return;
+				var expr = match.Get<Expression>("node").SingleOrDefault();
+				if (expr == null)
+					return;
+				var rr = ctx.Resolve(expr);
+
+				var lr = rr as LocalResolveResult;
+				if (lr != null)
+					CheckCase (lr.Variable.Type, binaryOperatorExpression, expr);
+				var mr = rr as MemberResolveResult;
+				if (mr != null)
+					CheckCase (mr.Member.ReturnType, binaryOperatorExpression, expr);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/CompareOfFloatsByEqualityOperatorIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/CompareOfFloatsByEqualityOperatorIssue.cs
new file mode 100644
index 0000000000..53c8fc01af
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/CompareOfFloatsByEqualityOperatorIssue.cs
@@ -0,0 +1,267 @@
+// 
+// CompareFloatWithEqualityOperatorIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Compare floating point numbers with equality operator",
+					   Description = "Comparison of floating point numbers with equality operator.",
+					   Category = IssueCategories.CodeQualityIssues,
+					   Severity = Severity.Warning,
+	                   AnalysisDisableKeyword = "CompareOfFloatsByEqualityOperator")]
+	public class CompareOfFloatsByEqualityOperatorIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<CompareOfFloatsByEqualityOperatorIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			static bool IsFloatingPointType (IType type)
+			{
+				var typeDef = type.GetDefinition ();
+				return typeDef != null &&
+					(typeDef.KnownTypeCode == KnownTypeCode.Single || typeDef.KnownTypeCode == KnownTypeCode.Double);
+			}
+
+			bool IsFloatingPoint(AstNode node)
+			{
+				return IsFloatingPointType (ctx.Resolve (node).Type);
+			}
+
+			bool IsConstantInfinity(AstNode node)
+			{
+				ResolveResult rr = ctx.Resolve(node);
+				if (!rr.IsCompileTimeConstant)
+					return false;
+				if (rr.ConstantValue is float)
+					return float.IsInfinity((float)rr.ConstantValue);
+				if (rr.ConstantValue is double)
+					return double.IsInfinity((double)rr.ConstantValue);
+				return false;
+			}
+
+			string GetFloatType(Expression left, Expression right)
+			{
+				var rr = ctx.Resolve (left);
+				if (rr.IsCompileTimeConstant)
+					return rr.ConstantValue is float ? "float" : "double";
+				
+				rr = ctx.Resolve (right);
+				if (rr.IsCompileTimeConstant)
+					return rr.ConstantValue is float ? "float" : "double";
+				return "double";
+			}
+
+			bool IsNaN (AstNode node)
+			{
+				var rr = ctx.Resolve (node);
+				if (!rr.IsCompileTimeConstant)
+					return false;
+
+				return rr.ConstantValue is double && double.IsNaN((double)rr.ConstantValue) || 
+					   rr.ConstantValue is float && float.IsNaN((float)rr.ConstantValue);
+			}
+
+			static bool IsZero (AstNode node)
+			{
+				var pe = node as PrimitiveExpression;
+				if (pe == null)
+					return false;
+				if (pe.Value is char || pe.Value is string || pe.Value is bool)
+					return false;
+
+				if (pe.Value is double && (double)pe.Value == 0d || 
+					pe.Value is float && (float)pe.Value == 0f || 
+					pe.Value is decimal && (decimal)pe.Value == 0m)
+					return true;
+
+				return !pe.LiteralValue.Any(c => char.IsDigit(c) && c != '0');
+			}
+
+			bool IsNegativeInfinity (AstNode node)
+			{
+				var rr = ctx.Resolve (node);
+				if (!rr.IsCompileTimeConstant)
+					return false;
+				return rr.ConstantValue is double && double.IsNegativeInfinity((double)rr.ConstantValue) ||
+					   rr.ConstantValue is float && float.IsNegativeInfinity((float)rr.ConstantValue);
+			}
+
+			bool IsPositiveInfinity (AstNode node)
+			{
+				var rr = ctx.Resolve (node);
+				if (!rr.IsCompileTimeConstant)
+					return false;
+
+				return rr.ConstantValue is double && double.IsPositiveInfinity ((double)rr.ConstantValue) ||
+					rr.ConstantValue is float && float.IsPositiveInfinity((float)rr.ConstantValue);
+			}
+
+			void AddIsNaNIssue(BinaryOperatorExpression binaryOperatorExpression, Expression argExpr, string floatType)
+			{
+				if (!ctx.Resolve(argExpr).Type.IsKnownType(KnownTypeCode.Single))
+					floatType = "double";
+				AddIssue(new CodeIssue(
+					binaryOperatorExpression, 
+					ctx.TranslateString ("NaN doesn't equal to any floating point number including to itself. Use 'IsNaN' instead."),
+					binaryOperatorExpression.Operator == BinaryOperatorType.InEquality ? 
+						string.Format(ctx.TranslateString ("Replace with '!{0}.IsNaN(...)' call"), floatType) :
+						string.Format(ctx.TranslateString ("Replace with '{0}.IsNaN(...)' call"), floatType),
+					script => {
+						Expression expr = new PrimitiveType(floatType).Invoke("IsNaN", argExpr.Clone());
+						if (binaryOperatorExpression.Operator == BinaryOperatorType.InEquality)
+							expr = new UnaryOperatorExpression (UnaryOperatorType.Not, expr);
+						script.Replace (binaryOperatorExpression, expr);
+					}
+				));
+			}
+
+			void AddIsNegativeInfinityIssue(BinaryOperatorExpression binaryOperatorExpression, Expression argExpr, string floatType)
+			{
+				if (!ctx.Resolve(argExpr).Type.IsKnownType(KnownTypeCode.Single))
+					floatType = "double";
+				AddIssue(new CodeIssue(
+					binaryOperatorExpression, 
+					ctx.TranslateString ("Comparison of floating point numbers with equality operator. Use 'IsNegativeInfinity' method."),
+					binaryOperatorExpression.Operator == BinaryOperatorType.InEquality ? 
+					string.Format(ctx.TranslateString ("Replace with '!{0}.IsNegativeInfinity(...)' call"), floatType) :
+					string.Format(ctx.TranslateString ("Replace with '{0}.IsNegativeInfinity(...)' call"), floatType),
+					script => {
+						Expression expr = new PrimitiveType(floatType).Invoke("IsNegativeInfinity", argExpr.Clone());
+						if (binaryOperatorExpression.Operator == BinaryOperatorType.InEquality)
+							expr = new UnaryOperatorExpression (UnaryOperatorType.Not, expr);
+						script.Replace (binaryOperatorExpression, expr);
+					}
+				));
+			}
+
+			void AddIsPositiveInfinityIssue(BinaryOperatorExpression binaryOperatorExpression, Expression argExpr, string floatType)
+			{
+				if (!ctx.Resolve(argExpr).Type.IsKnownType(KnownTypeCode.Single))
+					floatType = "double";
+				AddIssue(new CodeIssue(
+					binaryOperatorExpression, 
+					ctx.TranslateString ("Comparison of floating point numbers with equality operator. Use 'IsPositiveInfinity' method."),
+					binaryOperatorExpression.Operator == BinaryOperatorType.InEquality ? 
+					string.Format(ctx.TranslateString ("Replace with '!{0}.IsPositiveInfinity(...)' call"), floatType) :
+					string.Format(ctx.TranslateString ("Replace with '{0}.IsPositiveInfinity(...)' call"), floatType),
+					script => {
+						Expression expr = new PrimitiveType(floatType).Invoke("IsPositiveInfinity", argExpr.Clone());
+						if (binaryOperatorExpression.Operator == BinaryOperatorType.InEquality)
+							expr = new UnaryOperatorExpression (UnaryOperatorType.Not, expr);
+						script.Replace (binaryOperatorExpression, expr);
+					}
+				));
+			}
+
+			void AddIsZeroIssue(BinaryOperatorExpression binaryOperatorExpression, Expression argExpr)
+			{
+				AddIssue(new CodeIssue(
+					binaryOperatorExpression, 
+					ctx.TranslateString ("Comparison of floating point numbers can be unequal due to the differing precision of the two values."),
+					ctx.TranslateString ("Fix floating point number comparing. Compare a difference with epsilon."),
+					script => {
+						var builder = ctx.CreateTypeSystemAstBuilder(binaryOperatorExpression);
+					var diff = argExpr.Clone();
+						var abs = builder.ConvertType(new TopLevelTypeName("System", "Math")).Invoke("Abs", diff);
+						var op = binaryOperatorExpression.Operator == BinaryOperatorType.Equality ? BinaryOperatorType.LessThan : BinaryOperatorType.GreaterThan;
+						var epsilon = new IdentifierExpression ("EPSILON");
+						var compare = new BinaryOperatorExpression (abs, op, epsilon);
+						script.Replace (binaryOperatorExpression, compare);
+						script.Select (epsilon);
+					}
+				));
+			}
+
+			public override void VisitBinaryOperatorExpression (BinaryOperatorExpression binaryOperatorExpression)
+			{
+				base.VisitBinaryOperatorExpression (binaryOperatorExpression);
+
+				if (binaryOperatorExpression.Operator != BinaryOperatorType.Equality &&
+					binaryOperatorExpression.Operator != BinaryOperatorType.InEquality)
+					return;
+
+				string floatType = GetFloatType (binaryOperatorExpression.Left, binaryOperatorExpression.Right);
+
+
+				if (IsNaN(binaryOperatorExpression.Left)) {
+					AddIsNaNIssue (binaryOperatorExpression, binaryOperatorExpression.Right, floatType);
+				} else if (IsNaN (binaryOperatorExpression.Right)) {
+					AddIsNaNIssue (binaryOperatorExpression, binaryOperatorExpression.Left, floatType);
+				} else if (IsPositiveInfinity(binaryOperatorExpression.Left)) {
+					AddIsPositiveInfinityIssue (binaryOperatorExpression, binaryOperatorExpression.Right, floatType);
+				} else if (IsPositiveInfinity (binaryOperatorExpression.Right)) {
+					AddIsPositiveInfinityIssue (binaryOperatorExpression, binaryOperatorExpression.Left, floatType);
+				} else if (IsNegativeInfinity (binaryOperatorExpression.Left)) {
+					AddIsNegativeInfinityIssue (binaryOperatorExpression, binaryOperatorExpression.Right, floatType);
+				} else if (IsNegativeInfinity (binaryOperatorExpression.Right)) {
+					AddIsNegativeInfinityIssue (binaryOperatorExpression, binaryOperatorExpression.Left, floatType);
+				} else if (IsFloatingPoint(binaryOperatorExpression.Left) || IsFloatingPoint(binaryOperatorExpression.Right)) {
+					if (IsConstantInfinity(binaryOperatorExpression.Left) || IsConstantInfinity(binaryOperatorExpression.Right))
+						return;
+					if (IsZero(binaryOperatorExpression.Left)) {
+						AddIsZeroIssue(binaryOperatorExpression, binaryOperatorExpression.Right);
+						return;
+					}
+					if (IsZero(binaryOperatorExpression.Right)) {
+						AddIsZeroIssue(binaryOperatorExpression, binaryOperatorExpression.Left);
+						return;
+					}
+					AddIssue(new CodeIssue(
+						binaryOperatorExpression, 
+						ctx.TranslateString("Comparison of floating point numbers can be unequal due to the differing precision of the two values."),
+						ctx.TranslateString("Fix floating point number comparing. Compare a difference with epsilon."),
+						script => {
+							// Math.Abs(diff) op EPSILON
+							var builder = ctx.CreateTypeSystemAstBuilder(binaryOperatorExpression);
+							var diff = new BinaryOperatorExpression(binaryOperatorExpression.Left.Clone(),
+							                                         BinaryOperatorType.Subtract, binaryOperatorExpression.Right.Clone());
+							var abs = builder.ConvertType(new TopLevelTypeName("System", "Math")).Invoke("Abs", diff);
+							var op = binaryOperatorExpression.Operator == BinaryOperatorType.Equality ?
+								BinaryOperatorType.LessThan : BinaryOperatorType.GreaterThan;
+							var epsilon = new IdentifierExpression("EPSILON");
+							var compare = new BinaryOperatorExpression(abs, op, epsilon);
+							script.Replace(binaryOperatorExpression, compare);
+							script.Select(epsilon);
+						}
+					));
+				}
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ConditionalTernaryEqualBranchIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ConditionalTernaryEqualBranchIssue.cs
new file mode 100644
index 0000000000..d5dae7be58
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ConditionalTernaryEqualBranchIssue.cs
@@ -0,0 +1,66 @@
+// 
+// ConditionalTernaryEqualBranchIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+
+	[IssueDescription ("'?:' expression has identical true and false branches",
+					   Description = "'?:' expression has identical true and false branches.",
+					   Category = IssueCategories.CodeQualityIssues,
+					   Severity = Severity.Warning,
+                       AnalysisDisableKeyword = "ConditionalTernaryEqualBranch")]
+    public class ConditionalTernaryEqualBranchIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+        class GatherVisitor : GatherVisitorBase<ConditionalTernaryEqualBranchIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitConditionalExpression (ConditionalExpression conditionalExpression)
+			{
+				base.VisitConditionalExpression (conditionalExpression);
+
+				if (!conditionalExpression.TrueExpression.Match (conditionalExpression.FalseExpression).Success)
+					return;
+				var action = new CodeAction (ctx.TranslateString ("Replace '?:' with branch"),
+					script => script.Replace (conditionalExpression, conditionalExpression.TrueExpression.Clone ()), conditionalExpression.QuestionMarkToken);
+				AddIssue (new CodeIssue(conditionalExpression, 
+					ctx.TranslateString ("'?:' expression has identical true and false branches"), new [] { action }));
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/DelegateSubtractionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/DelegateSubtractionIssue.cs
new file mode 100644
index 0000000000..3ffe24469e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/DelegateSubtractionIssue.cs
@@ -0,0 +1,72 @@
+//
+// DelegateSubtractionIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Delegate subtractions",
+		Description = "Delegate subtraction has unpredictable result",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "DelegateSubtraction")]
+	public class DelegateSubtractionIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<DelegateSubtractionIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
+			{
+				base.VisitBinaryOperatorExpression(binaryOperatorExpression);
+				if (binaryOperatorExpression.Operator != BinaryOperatorType.Subtract)
+					return;
+				var rr = ctx.Resolve(binaryOperatorExpression);
+				if (rr.Type.Kind == ICSharpCode.NRefactory.TypeSystem.TypeKind.Delegate)
+					AddIssue(new CodeIssue(binaryOperatorExpression, ctx.TranslateString("Delegate subtraction has unpredictable result")));
+			}
+
+			public override void VisitAssignmentExpression(AssignmentExpression assignmentExpression)
+			{
+				base.VisitAssignmentExpression(assignmentExpression);
+				if (assignmentExpression.Operator != AssignmentOperatorType.Subtract)
+					return;
+				var rr = ctx.Resolve(assignmentExpression.Right);
+				if (rr.Type.Kind == ICSharpCode.NRefactory.TypeSystem.TypeKind.Delegate)
+					AddIssue(new CodeIssue(assignmentExpression, ctx.TranslateString("Delegate subtraction has unpredictable result")));
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/DoNotCallOverridableMethodsInConstructorIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/DoNotCallOverridableMethodsInConstructorIssue.cs
new file mode 100644
index 0000000000..599d4d8f14
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/DoNotCallOverridableMethodsInConstructorIssue.cs
@@ -0,0 +1,169 @@
+//
+// DoNotCallOverridableMethodsInConstructorIssue.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Virtual member call in constructor",
+	                  Description = "Warns about calls to virtual member functions occuring in the constructor.",
+	                  Category = IssueCategories.CodeQualityIssues,
+	                  Severity = Severity.Warning,
+                      AnalysisDisableKeyword = "DoNotCallOverridableMethodsInConstructor")]
+	public class DoNotCallOverridableMethodsInConstructorIssue : CodeIssueProvider
+	{
+		public override IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context, string subIssue)
+		{
+			var gv = new GatherVisitor(context);
+			context.RootNode.AcceptVisitor(gv);
+			return gv.CallFinder.FoundIssues;
+		}
+		
+		class GatherVisitor : GatherVisitorBase<DoNotCallOverridableMethodsInConstructorIssue>
+		{
+			internal readonly VirtualCallFinderVisitor CallFinder;
+
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+				CallFinder = new VirtualCallFinderVisitor(context);
+			}
+
+			bool isSealedType;
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				if (typeDeclaration.ClassType != ClassType.Class && typeDeclaration.ClassType != ClassType.Struct)
+					return;
+				bool oldIsSealedType = isSealedType;
+				isSealedType = typeDeclaration.Modifiers.HasFlag(Modifiers.Sealed);
+			    CallFinder.CurrentType = typeDeclaration;
+				base.VisitTypeDeclaration(typeDeclaration);
+				isSealedType = oldIsSealedType;
+			}
+
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+				if (isSealedType)
+					return;
+				var body = constructorDeclaration.Body;
+				if (body == null || body.IsNull)
+					return;
+				body.AcceptVisitor(CallFinder);
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				// nothing
+			}
+
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+				// nothing
+			}
+
+			public override void VisitIndexerExpression(IndexerExpression indexerExpression)
+			{
+				// nothing
+			}
+
+			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
+			{
+				// nothing
+			}
+
+			public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
+			{
+				// nothing
+			}
+
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+				// nothing
+			}
+
+			public override void VisitFixedFieldDeclaration(FixedFieldDeclaration fixedFieldDeclaration)
+			{
+				// nothing
+			}
+		}
+
+		class VirtualCallFinderVisitor: GatherVisitorBase<DoNotCallOverridableMethodsInConstructorIssue>
+		{
+			readonly BaseRefactoringContext context;
+            public TypeDeclaration CurrentType;
+			public VirtualCallFinderVisitor(BaseRefactoringContext context) : base(context)
+			{
+				this.context = context;
+			}
+
+		    
+
+		    public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+				if (!IsCallDependentOnCurrentInstance(invocationExpression))
+					// Call within current class scope without 'this' or 'base'
+					return;
+				var targetMethod = context.Resolve(invocationExpression) as InvocationResolveResult;
+				if (targetMethod == null)
+					return;
+				if (targetMethod.IsVirtualCall) {
+					if (targetMethod.Member.DeclaringType.Kind == ICSharpCode.NRefactory.TypeSystem.TypeKind.Delegate)
+						return;
+					AddIssue(new CodeIssue(invocationExpression,
+                             context.TranslateString("Virtual member call in constructor"),
+                             new CodeAction(string.Format(context.TranslateString("Make class '{0}' sealed"), CurrentType.Name),
+                             script => script.ChangeModifier(CurrentType, CurrentType.Modifiers | Modifiers.Sealed), 
+							invocationExpression)));
+				}
+			}
+
+			bool IsCallDependentOnCurrentInstance(InvocationExpression invocationExpression)
+			{
+				if (invocationExpression.Target is IdentifierExpression)
+					// Call within current class scope without 'this' or 'base'
+					return true;
+				var expression = invocationExpression.Target as MemberReferenceExpression;
+				if (expression == null || expression.Target is ThisReferenceExpression)
+					// Call within current class scope using 'this' or 'base'
+					return true;
+				return false;
+			}
+			
+			public override void VisitLambdaExpression(LambdaExpression lambdaExpression)
+			{
+				// ignore lambdas
+			}
+			
+			public override void VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression)
+			{
+				// ignore anonymous methods
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/EmptyGeneralCatchClauseIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/EmptyGeneralCatchClauseIssue.cs
new file mode 100644
index 0000000000..9e22da9a8c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/EmptyGeneralCatchClauseIssue.cs
@@ -0,0 +1,76 @@
+//
+// EmptyGeneralCatchClauseIssue.cs
+//
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+//
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// A catch clause that catches System.Exception and has an empty body
+	/// </summary>
+	[IssueDescription("Empty general catch clause",
+	                  Description= "A catch clause that catches System.Exception and has an empty body",
+	                  Category = IssueCategories.CodeQualityIssues,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "EmptyGeneralCatchClause")]
+	public class EmptyGeneralCatchClauseIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context, this);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<EmptyGeneralCatchClauseIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx, EmptyGeneralCatchClauseIssue issueProvider) : base (ctx, issueProvider)
+			{
+			}
+			
+			public override void VisitCatchClause(CatchClause catchClause)
+			{
+				base.VisitCatchClause(catchClause);
+
+				AstType type = catchClause.Type;
+				if (!type.IsNull) {
+					var resolvedType = ctx.Resolve(type);
+
+					if (resolvedType.IsError ||
+						!resolvedType.Type.Namespace.Equals("System") || !resolvedType.Type.Name.Equals("Exception"))
+						return;
+				}
+
+				var body = catchClause.Body;
+				if (body.Statements.Any())
+					return;
+
+				AddIssue(new CodeIssue(catchClause.CatchToken, ctx.TranslateString("Empty general catch clause suppresses any error")));
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/EqualExpressionComparisonIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/EqualExpressionComparisonIssue.cs
new file mode 100644
index 0000000000..0e48fc7024
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/EqualExpressionComparisonIssue.cs
@@ -0,0 +1,130 @@
+//
+// EqualExpressionComparisonIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Equal expression comparison",
+	                  Description="Comparing equal expression for equality is usually useless",
+	                  Category = IssueCategories.CodeQualityIssues,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "EqualExpressionComparison")]
+	public class EqualExpressionComparisonIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<EqualExpressionComparisonIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			void AddIssue(AstNode nodeToReplace, AstNode highlightNode, bool replaceWithTrue)
+			{
+				AddIssue(new CodeIssue(
+					highlightNode, 
+					ctx.TranslateString("Equal expression comparison"), 
+					replaceWithTrue ? ctx.TranslateString("Replace with 'true'") : ctx.TranslateString("Replace with 'false'"), 
+					script =>  {
+						script.Replace(nodeToReplace, new PrimitiveExpression(replaceWithTrue));
+					}
+				));
+			}
+
+
+			readonly BinaryOperatorExpression pattern = 
+				new BinaryOperatorExpression(
+					PatternHelper.OptionalParentheses(new AnyNode("expression")), 
+					BinaryOperatorType.Any, 
+					PatternHelper.OptionalParentheses(new Backreference("expression"))
+				);
+
+			public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
+			{
+				base.VisitBinaryOperatorExpression(binaryOperatorExpression);
+
+				if (binaryOperatorExpression.Operator != BinaryOperatorType.Equality &&
+				    binaryOperatorExpression.Operator != BinaryOperatorType.InEquality &&
+				    binaryOperatorExpression.Operator != BinaryOperatorType.GreaterThan &&
+				    binaryOperatorExpression.Operator != BinaryOperatorType.GreaterThanOrEqual &&
+				    binaryOperatorExpression.Operator != BinaryOperatorType.LessThan &&
+				    binaryOperatorExpression.Operator != BinaryOperatorType.LessThanOrEqual) {
+					return;
+				}
+
+				var match = pattern.Match(binaryOperatorExpression);
+				if (match.Success) {
+					AddIssue(binaryOperatorExpression, binaryOperatorExpression.OperatorToken, binaryOperatorExpression.Operator == BinaryOperatorType.Equality);
+					return;
+				}
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+				var rr = ctx.Resolve(invocationExpression) as InvocationResolveResult;
+				if (rr == null || rr.Member.Name != "Equals" || !rr.Member.ReturnType.IsKnownType(KnownTypeCode.Boolean))
+					return;
+
+				if (rr.Member.IsStatic) {
+					if (rr.Member.Parameters.Count != 2)
+						return;
+					if (CSharpUtil.AreConditionsEqual(invocationExpression.Arguments.FirstOrDefault(), invocationExpression.Arguments.Last())) {
+						if ((invocationExpression.Parent is UnaryOperatorExpression) && ((UnaryOperatorExpression)invocationExpression.Parent).Operator == UnaryOperatorType.Not) {
+							AddIssue(invocationExpression.Parent, invocationExpression.Parent, false);
+						} else {
+							AddIssue(invocationExpression, invocationExpression, true);
+						}
+					}
+				} else {
+					if (rr.Member.Parameters.Count != 1)
+						return;
+					var target = invocationExpression.Target as MemberReferenceExpression;
+					if (target == null)
+						return;
+					if (CSharpUtil.AreConditionsEqual(invocationExpression.Arguments.FirstOrDefault(), target.Target)) {
+						if ((invocationExpression.Parent is UnaryOperatorExpression) && ((UnaryOperatorExpression)invocationExpression.Parent).Operator == UnaryOperatorType.Not) {
+							AddIssue(invocationExpression.Parent, invocationExpression.Parent, false);
+						} else {
+							AddIssue(invocationExpression, invocationExpression, true);
+						}
+					}
+				}
+
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/EventUnsubscriptionViaAnonymousDelegateIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/EventUnsubscriptionViaAnonymousDelegateIssue.cs
new file mode 100644
index 0000000000..6b723e3748
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/EventUnsubscriptionViaAnonymousDelegateIssue.cs
@@ -0,0 +1,71 @@
+//
+// EventUnsubscriptionViaAnonymousDelegateIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Event unsubscription via anonymous delegate",
+	                  Description="Event unsubscription via anonymous delegate is useless",
+	                  Category = IssueCategories.CodeQualityIssues,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "EventUnsubscriptionViaAnonymousDelegate")]
+	public class EventUnsubscriptionViaAnonymousDelegateIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<EventUnsubscriptionViaAnonymousDelegateIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitAssignmentExpression(AssignmentExpression assignmentExpression)
+			{
+				base.VisitAssignmentExpression(assignmentExpression);
+				if (assignmentExpression.Operator != AssignmentOperatorType.Subtract)
+					return;
+				if (!(assignmentExpression.Right is AnonymousMethodExpression || assignmentExpression.Right is LambdaExpression))
+					return;
+				var rr = ctx.Resolve(assignmentExpression.Left) as MemberResolveResult;
+				if (rr == null || rr.Member.SymbolKind != ICSharpCode.NRefactory.TypeSystem.SymbolKind.Event)
+					return;
+				AddIssue(new CodeIssue(
+					assignmentExpression.OperatorToken,
+					ctx.TranslateString("Event unsubscription via anonymous delegate is useless")
+				));
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ForControlVariableIsNeverModifiedIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ForControlVariableIsNeverModifiedIssue.cs
new file mode 100644
index 0000000000..e3fdefa4aa
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ForControlVariableIsNeverModifiedIssue.cs
@@ -0,0 +1,133 @@
+// 
+// ForControlVariableIsNeverModifiedIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("'for' loop control variable is never modified",
+					   Description = "'for' loop control variable is never modified.",
+					   Category = IssueCategories.CodeQualityIssues,
+					   Severity = Severity.Warning,
+                       AnalysisDisableKeyword = "ForControlVariableIsNeverModified")]
+    public class ForControlVariableIsNeverModifiedIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ForControlVariableIsNeverModifiedIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			static VariableInitializer GetControlVariable(VariableDeclarationStatement variableDecl, 
+														  BinaryOperatorExpression condition)
+			{
+				var controlVariables = variableDecl.Variables.Where (
+					v =>
+					{
+						var identifier = new IdentifierExpression (v.Name);
+						return condition.Left.Match (identifier).Success ||
+							condition.Right.Match (identifier).Success;
+					}).ToList ();
+				return controlVariables.Count == 1 ? controlVariables [0] : null;
+			}
+
+			static VariableInitializer GetControlVariable(VariableDeclarationStatement variableDecl,
+														  UnaryOperatorExpression condition)
+			{
+				var controlVariables = variableDecl.Variables.Where (
+					v =>
+					{
+						var identifier = new IdentifierExpression (v.Name);
+						return condition.Expression.Match (identifier).Success;
+					}).ToList ();
+				return controlVariables.Count == 1 ? controlVariables [0] : null;
+			}
+
+			public override void VisitForStatement (ForStatement forStatement)
+			{
+				base.VisitForStatement (forStatement);
+
+				if (forStatement.Initializers.Count != 1)
+					return;
+				var variableDecl = forStatement.Initializers.First () as VariableDeclarationStatement;
+				if (variableDecl == null)
+					return;
+
+				VariableInitializer controlVariable = null;
+				if (forStatement.Condition is BinaryOperatorExpression) {
+					controlVariable = GetControlVariable (variableDecl, (BinaryOperatorExpression)forStatement.Condition);
+				} else if (forStatement.Condition is UnaryOperatorExpression) {
+					controlVariable = GetControlVariable (variableDecl, (UnaryOperatorExpression)forStatement.Condition);
+				} else if (forStatement.Condition is IdentifierExpression) {
+					controlVariable = variableDecl.Variables.FirstOrDefault (
+						v => v.Name == ((IdentifierExpression)forStatement.Condition).Identifier);
+				}
+
+				if (controlVariable == null)
+					return;
+
+				var localResolveResult = ctx.Resolve (controlVariable) as LocalResolveResult;
+				if (localResolveResult == null)
+					return;
+
+				var results = ctx.FindReferences (forStatement, localResolveResult.Variable);
+				var modified = false;
+				foreach (var result in results) {
+					if (modified)
+						break;
+					var node = result.Node;
+					var unary = node.Parent as UnaryOperatorExpression;
+					if (unary != null && unary.Expression == node) {
+						modified = unary.Operator == UnaryOperatorType.Decrement ||
+							unary.Operator == UnaryOperatorType.PostDecrement ||
+							unary.Operator == UnaryOperatorType.Increment ||
+							unary.Operator == UnaryOperatorType.PostIncrement;
+						continue;
+					}
+
+					var assignment = node.Parent as AssignmentExpression;
+					modified = assignment != null && assignment.Left == node;
+				}
+
+				if (!modified)
+					AddIssue (new CodeIssue(controlVariable.NameToken,
+						ctx.TranslateString ("'for' loop control variable is never modified")));
+
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/FormatStringProblemIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/FormatStringProblemIssue.cs
new file mode 100644
index 0000000000..9d5f175208
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/FormatStringProblemIssue.cs
@@ -0,0 +1,134 @@
+//
+// FormatStringIssue.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Linq;
+using ICSharpCode.NRefactory.Utils;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("String formatting problems",
+	                  Description = "Finds issues with format strings.",
+	                  Category = IssueCategories.CodeQualityIssues,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "FormatStringProblem")]
+	public class FormatStringProblemIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<FormatStringProblemIssue>
+		{
+			readonly BaseRefactoringContext context;
+
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+				this.context = context;
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+
+				// Speed up the inspector by discarding some invocations early
+				var hasEligibleArgument = invocationExpression.Arguments.Any(argument => {
+					var primitiveArg = argument as PrimitiveExpression;
+					return primitiveArg != null && primitiveArg.Value is string;
+				});
+				if (!hasEligibleArgument)
+					return;
+
+				var invocationResolveResult = context.Resolve(invocationExpression) as CSharpInvocationResolveResult;
+				if (invocationResolveResult == null)
+					return;
+				Expression formatArgument;
+				IList<Expression> formatArguments;
+				if (!FormatStringHelper.TryGetFormattingParameters(invocationResolveResult, invocationExpression,
+				                                                   out formatArgument, out formatArguments, null)) {
+					return;
+				}
+				var primitiveArgument = formatArgument as PrimitiveExpression;
+				if (primitiveArgument == null || !(primitiveArgument.Value is string))
+					return;
+				var format = (string)primitiveArgument.Value;
+				var parsingResult = context.ParseFormatString(format);
+				CheckSegments(parsingResult.Segments, formatArgument.StartLocation, formatArguments, invocationExpression);
+
+				var argUsed = new HashSet<int> ();
+
+				foreach (var item in parsingResult.Segments) {
+					var fi = item as FormatItem;
+					if (fi == null)
+						continue;
+					argUsed.Add(fi.Index);
+				}
+				for (int i = 0; i < formatArguments.Count; i++) {
+					if (!argUsed.Contains(i)) {
+						AddIssue(new CodeIssue(formatArguments[i], ctx.TranslateString("Argument is not used in format string")) { IssueMarker = IssueMarker.GrayOut });
+					}
+				}
+			}
+
+			void CheckSegments(IList<IFormatStringSegment> segments, TextLocation formatStart, IList<Expression> formatArguments, AstNode anchor)
+			{
+				int argumentCount = formatArguments.Count;
+				foreach (var segment in segments) {
+					var errors = segment.Errors.ToList();
+					var formatItem = segment as FormatItem;
+					if (formatItem != null) {
+						var segmentEnd = new TextLocation(formatStart.Line, formatStart.Column + segment.EndLocation + 1);
+						var segmentStart = new TextLocation(formatStart.Line, formatStart.Column + segment.StartLocation + 1);
+						if (formatItem.Index >= argumentCount) {
+							var outOfBounds = context.TranslateString("The index '{0}' is out of bounds of the passed arguments");
+							AddIssue(new CodeIssue(segmentStart, segmentEnd, string.Format(outOfBounds, formatItem.Index)));
+						}
+						if (formatItem.HasErrors) {
+							var errorMessage = string.Join(Environment.NewLine, errors.Select(error => error.Message).ToArray());
+							string messageFormat;
+							if (errors.Count > 1) {
+								messageFormat = context.TranslateString("Multiple:\n{0}");
+							} else {
+								messageFormat = context.TranslateString("{0}");
+							}
+							AddIssue(new CodeIssue(segmentStart, segmentEnd, string.Format(messageFormat, errorMessage)));
+						}
+					} else if (segment.HasErrors) {
+						foreach (var error in errors) {
+							var errorStart = new TextLocation(formatStart.Line, formatStart.Column + error.StartLocation + 1);
+							var errorEnd = new TextLocation(formatStart.Line, formatStart.Column + error.EndLocation + 1);
+							AddIssue(new CodeIssue(errorStart, errorEnd, error.Message));
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/FunctionNeverReturnsIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/FunctionNeverReturnsIssue.cs
new file mode 100644
index 0000000000..9328a76e72
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/FunctionNeverReturnsIssue.cs
@@ -0,0 +1,207 @@
+// 
+// MethodNeverReturnsIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Function never returns",
+		Description = "Function does not reach its end or a 'return' statement by any of possible execution paths.",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "FunctionNeverReturns")]
+	public class FunctionNeverReturnsIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<FunctionNeverReturnsIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitMethodDeclaration (MethodDeclaration methodDeclaration)
+			{
+				var body = methodDeclaration.Body;
+
+				// partial method
+				if (body.IsNull)
+					return;
+
+				var memberResolveResult = ctx.Resolve(methodDeclaration) as MemberResolveResult;
+				VisitBody("Method", methodDeclaration.NameToken, body,
+				          memberResolveResult == null ? null : memberResolveResult.Member, null);
+
+				base.VisitMethodDeclaration (methodDeclaration);
+			}
+
+			public override void VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression)
+			{
+				VisitBody("Delegate", anonymousMethodExpression.DelegateToken,
+				          anonymousMethodExpression.Body, null, null);
+
+				base.VisitAnonymousMethodExpression(anonymousMethodExpression);
+			}
+
+			public override void VisitAccessor(Accessor accessor)
+			{
+				if (accessor.Body.IsNull)
+					return;
+				var parentProperty = accessor.GetParent<PropertyDeclaration>();
+				var resolveResult = ctx.Resolve(parentProperty);
+				var memberResolveResult = resolveResult as MemberResolveResult;
+
+				VisitBody("Accessor", accessor.Keyword, accessor.Body,
+				          memberResolveResult == null ? null : memberResolveResult.Member,
+				          accessor.Keyword.Role);
+
+				base.VisitAccessor (accessor);
+			}
+
+			public override void VisitLambdaExpression(LambdaExpression lambdaExpression)
+			{
+				var body = lambdaExpression.Body as BlockStatement;
+				if (body != null) {
+					VisitBody("Lambda expression", lambdaExpression.ArrowToken, body, null, null);
+				}
+
+				//Even if it is an expression, we still need to check for children
+				//for cases like () => () => { while (true) {}}
+				base.VisitLambdaExpression(lambdaExpression);
+			}
+
+			void VisitBody(string entityType, AstNode node, BlockStatement body, IMember member, Role accessorRole)
+			{
+				var recursiveDetector = new RecursiveDetector(ctx, member, accessorRole);
+				var reachability = ctx.CreateReachabilityAnalysis(body, recursiveDetector);
+				bool hasReachableReturn = false;
+				foreach (var statement in reachability.ReachableStatements) {
+					if (statement is ReturnStatement || statement is ThrowStatement || statement is YieldBreakStatement) {
+						if (!statement.AcceptVisitor(recursiveDetector)) {
+							hasReachableReturn = true;
+							break;
+						}
+					}
+				}
+				if (!hasReachableReturn && !reachability.IsEndpointReachable(body)) {
+					AddIssue(new CodeIssue(node, ctx.TranslateString(string.Format("{0} never reaches its end or a 'return' statement.", entityType))));
+				}
+			}
+
+			class RecursiveDetector : ReachabilityAnalysis.RecursiveDetectorVisitor
+			{
+				BaseRefactoringContext ctx;
+				IMember member;
+				Role accessorRole;
+
+				internal RecursiveDetector(BaseRefactoringContext ctx, IMember member, Role accessorRole) {
+					this.ctx = ctx;
+					this.member = member;
+					this.accessorRole = accessorRole;
+				}
+
+				public override bool VisitIdentifierExpression(IdentifierExpression identifierExpression)
+				{
+					return CheckRecursion(identifierExpression);
+				}
+
+				public override bool VisitMemberReferenceExpression(MemberReferenceExpression memberReferenceExpression)
+				{
+					if (base.VisitMemberReferenceExpression(memberReferenceExpression))
+						return true;
+
+					return CheckRecursion(memberReferenceExpression);
+				}
+
+				public override bool VisitInvocationExpression(InvocationExpression invocationExpression)
+				{
+					if (base.VisitInvocationExpression(invocationExpression))
+						return true;
+
+					return CheckRecursion(invocationExpression);
+				}
+
+				bool CheckRecursion(AstNode node) {
+					if (member == null) {
+						return false;
+					}
+
+					var resolveResult = ctx.Resolve(node);
+
+					//We'll ignore Method groups here
+					//If the invocation expressions will be dealt with later anyway
+					//and properties are never in "method groups".
+					var memberResolveResult = resolveResult as MemberResolveResult;
+					if (memberResolveResult == null || memberResolveResult.Member != this.member) {
+						return false;
+					}
+
+					//Now check for virtuals
+					if (memberResolveResult.Member.IsVirtual && !memberResolveResult.Member.DeclaringTypeDefinition.IsSealed) {
+						return false;
+					}
+
+					var parentAssignment = node.Parent as AssignmentExpression;
+					if (parentAssignment != null) {
+						if (accessorRole == CustomEventDeclaration.AddKeywordRole) {
+							return parentAssignment.Operator == AssignmentOperatorType.Add;
+						}
+						if (accessorRole == CustomEventDeclaration.RemoveKeywordRole) {
+							return parentAssignment.Operator == AssignmentOperatorType.Subtract;
+						}
+						if (accessorRole == PropertyDeclaration.GetKeywordRole) {
+							return parentAssignment.Operator != AssignmentOperatorType.Assign;
+						}
+
+						return true;
+					}
+
+					var parentUnaryOperation = node.Parent as UnaryOperatorExpression;
+					if (parentUnaryOperation != null) {
+						var operatorType = parentUnaryOperation.Operator;
+						if (operatorType == UnaryOperatorType.Increment ||
+							operatorType == UnaryOperatorType.Decrement ||
+							operatorType == UnaryOperatorType.PostIncrement ||
+							operatorType == UnaryOperatorType.PostDecrement) {
+
+							return true;
+						}
+					}
+
+					return accessorRole == null || accessorRole == PropertyDeclaration.GetKeywordRole;
+				}
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/LocalVariableHidesMemberIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/LocalVariableHidesMemberIssue.cs
new file mode 100644
index 0000000000..c2ebc8fcde
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/LocalVariableHidesMemberIssue.cs
@@ -0,0 +1,219 @@
+// 
+// LocalVariableHideFieldIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Local variable hides member",
+	                   Description = "Local variable has the same name as a member and hides it.",
+	                   Category = IssueCategories.CodeQualityIssues,
+	                   Severity = Severity.Warning,
+	                   AnalysisDisableKeyword = "LocalVariableHidesMember")]
+	public class LocalVariableHidesMemberIssue : VariableHidesMemberIssue
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<LocalVariableHidesMemberIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitVariableInitializer (VariableInitializer variableInitializer)
+			{
+				base.VisitVariableInitializer(variableInitializer);
+
+				if (!(ctx.Resolve (variableInitializer) is LocalResolveResult))
+					return;
+				var mre = variableInitializer.Initializer as MemberReferenceExpression;
+				if (mre != null && mre.MemberName == variableInitializer.Name && mre.Target is ThisReferenceExpression) {
+					// Special case: the variable is initialized from the member it is hiding
+					// In this case, the hiding is obviously intentional and we shouldn't show a warning.
+					return;
+				}
+				CheckLocal(variableInitializer, variableInitializer.Name, variableInitializer.NameToken);
+			}
+
+			void CheckLocal(AstNode node, string name, AstNode token)
+			{
+				IMember member;
+				if (HidesMember(ctx, node, name, out member)) {
+					string msg;
+					switch (member.SymbolKind) {
+						case SymbolKind.Field:
+							msg = ctx.TranslateString("Local variable '{0}' hides field '{1}'");
+							break;
+							case SymbolKind.Method:
+							msg = ctx.TranslateString("Local variable '{0}' hides method '{1}'");
+							break;
+							case SymbolKind.Property:
+							msg = ctx.TranslateString("Local variable '{0}' hides property '{1}'");
+							break;
+							case SymbolKind.Event:
+							msg = ctx.TranslateString("Local variable '{0}' hides event '{1}'");
+							break;
+							default:
+							msg = ctx.TranslateString("Local variable '{0}' hides member '{1}'");
+							break;
+					}
+					AddIssue(new CodeIssue(token, string.Format(msg, name, member.FullName)));
+				}
+			}
+
+			public override void VisitForeachStatement (ForeachStatement foreachStatement)
+			{
+				base.VisitForeachStatement (foreachStatement);
+
+				CheckLocal(foreachStatement, foreachStatement.VariableName, foreachStatement.VariableNameToken);
+			}
+		}
+	}
+
+	public class MemberCollectionService
+	{
+		Dictionary<Tuple<IType, string>, IMember[]> memberCache = new Dictionary<Tuple<IType, string>, IMember[]> ();
+		Dictionary<IType, List<IMember>> allMembers = new Dictionary<IType, List<IMember>> ();
+
+		public IMember[] GetMembers(IType type, string variableName)
+		{
+			IMember[] members;
+			Tuple<IType, string> key = Tuple.Create(type, variableName);
+			if (!memberCache.TryGetValue (key, out members)) {
+				lock (memberCache) {
+					if (!memberCache.TryGetValue(key, out members)) {
+						List<IMember> am;
+						if (!allMembers.TryGetValue(type, out am)) {
+							lock (allMembers) {
+								if (!allMembers.TryGetValue(type, out am)) {
+									am = new List<IMember>(type.GetMembers());
+									allMembers [type] = am;
+								}
+							}
+						}
+						members = am.Where(m => m.Name == variableName).ToArray();
+						memberCache.Add(key, members);
+					}
+				}
+			}
+			return members;
+		}
+	}
+
+	public abstract class VariableHidesMemberIssue : GatherVisitorCodeIssueProvider
+	{
+		protected static bool HidesMember(BaseRefactoringContext ctx, AstNode node, string variableName)
+		{
+			IMember member;
+			return HidesMember(ctx, node, variableName, out member);
+		}
+
+		protected static bool HidesMember(BaseRefactoringContext ctx, AstNode node, string variableName, out IMember member)
+		{
+			MemberCollectionService mcs = (MemberCollectionService)ctx.GetService(typeof(MemberCollectionService));
+			if (mcs == null) {
+				lock (ctx) {
+					if ((mcs = (MemberCollectionService)ctx.GetService(typeof(MemberCollectionService))) == null) {
+						mcs = new MemberCollectionService();
+						ctx.Services.AddService(typeof(MemberCollectionService), mcs);
+					}
+				}
+			}
+
+			var typeDecl = node.GetParent<TypeDeclaration>();
+			member = null;
+			if (typeDecl == null)
+				return false;
+			var entityDecl = node.GetParent<EntityDeclaration>();
+			var memberResolveResult = ctx.Resolve(entityDecl) as MemberResolveResult;
+			if (memberResolveResult == null)
+				return false;
+			var typeResolveResult = ctx.Resolve(typeDecl) as TypeResolveResult;
+			if (typeResolveResult == null)
+				return false;
+
+			var sourceMember = memberResolveResult.Member;
+
+			member = mcs.GetMembers (typeResolveResult.Type, variableName).FirstOrDefault(m2 => IsAccessible(sourceMember, m2));
+			return member != null;
+		}
+
+		static bool IsAccessible(IMember sourceMember, IMember targetMember)
+		{
+			if (sourceMember.IsStatic != targetMember.IsStatic)
+				return false;
+
+			var sourceType = sourceMember.DeclaringType;
+			var targetType = targetMember.DeclaringType;
+			switch (targetMember.Accessibility)
+			{
+				case Accessibility.None:
+					return false;
+					case Accessibility.Private:
+					// check for members of outer classes (private members of outer classes can be accessed)
+					var targetTypeDefinition = targetType.GetDefinition();
+					for (var t = sourceType.GetDefinition(); t != null; t = t.DeclaringTypeDefinition)
+					{
+						if (t.Equals(targetTypeDefinition))
+							return true;
+					}
+					return false;
+					case Accessibility.Public:
+					return true;
+					case Accessibility.Protected:
+					return IsProtectedAccessible(sourceType, targetType);
+					case Accessibility.Internal:
+					return IsInternalAccessible(sourceMember.ParentAssembly, targetMember.ParentAssembly);
+					case Accessibility.ProtectedOrInternal:
+					return IsInternalAccessible(sourceMember.ParentAssembly, targetMember.ParentAssembly) || IsProtectedAccessible(sourceType, targetType);
+					case Accessibility.ProtectedAndInternal:
+					return IsInternalAccessible(sourceMember.ParentAssembly, targetMember.ParentAssembly) && IsProtectedAccessible(sourceType, targetType);
+					default:
+					throw new Exception("Invalid value for Accessibility");
+			}
+		}
+
+		static bool IsProtectedAccessible(IType sourceType, IType targetType)
+		{
+			return sourceType.GetAllBaseTypes().Any(type => targetType.Equals(type));
+		}
+
+		static bool IsInternalAccessible(IAssembly sourceAssembly, IAssembly targetAssembly)
+		{
+			return sourceAssembly.InternalsVisibleTo(targetAssembly);
+		}
+
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/LongLiteralEndingLowerLIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/LongLiteralEndingLowerLIssue.cs
new file mode 100644
index 0000000000..dd08a93616
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/LongLiteralEndingLowerLIssue.cs
@@ -0,0 +1,88 @@
+//
+// LowercaseLongLiteralIssue.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+//
+// Copyright (c) 2013 Luís Reis
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Long literal ends with 'l' instead of 'L'",
+	                   Description = "Lowercase 'l' is often confused with '1'",
+	                   Category = IssueCategories.CodeQualityIssues,
+	                   Severity = Severity.Warning,
+	                   AnalysisDisableKeyword = "LongLiteralEndingLowerL")]
+	public class LongLiteralEndingLowerLIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<LongLiteralEndingLowerLIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitPrimitiveExpression(PrimitiveExpression primitiveExpression)
+			{
+				if (!(primitiveExpression.Value is long || primitiveExpression.Value is ulong))
+				{
+					//Literals such as "l" or 'l' are perfectly acceptable.
+					//Also, no point in visiting integer or boolean literals
+					return;
+				}
+
+				string literalValue = primitiveExpression.LiteralValue;
+				if (literalValue.Length < 2) {
+					return;
+				}
+
+				char prevChar = literalValue [literalValue.Length - 2];
+				char lastChar = literalValue [literalValue.Length - 1];
+
+				if (prevChar == 'u' || prevChar == 'U') {
+					//No problem, '3ul' is not confusing
+					return;
+				}
+
+				if (lastChar == 'l' || prevChar == 'l') {
+					AddIssue(new CodeIssue(primitiveExpression,
+					         ctx.TranslateString("Long literal ends with 'l' instead of 'L'"),
+					         ctx.TranslateString("Make suffix upper case"),
+					         script => {
+								object newValue = primitiveExpression.Value;
+								string newLiteralValue = primitiveExpression.LiteralValue.ToUpperInvariant();
+								script.Replace(primitiveExpression, new PrimitiveExpression(newValue, newLiteralValue));
+							}
+					));
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/MemberHidesStaticFromOuterClassIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/MemberHidesStaticFromOuterClassIssue.cs
new file mode 100644
index 0000000000..ea201c7a51
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/MemberHidesStaticFromOuterClassIssue.cs
@@ -0,0 +1,135 @@
+//
+// MemberHidesStaticFromOuterClass.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription (
+		"Member hides static member from outer class",
+		Description = "Member hides static member from outer class",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "MemberHidesStaticFromOuterClass")]
+	public class MemberHidesStaticFromOuterClassIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<MemberHidesStaticFromOuterClassIssue>
+		{
+			readonly List<List<IMember>> staticMembers = new List<List<IMember>>();
+
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				// SKIP
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				var rr = ctx.Resolve(typeDeclaration);
+
+				staticMembers.Add(new List<IMember>(rr.Type.GetMembers(m => m.IsStatic)));
+				base.VisitTypeDeclaration(typeDeclaration);
+				staticMembers.RemoveAt(staticMembers.Count - 1); 
+			}
+
+			void Check(string name, AstNode nodeToMark, string memberType)
+			{
+				for (int i = 0; i < staticMembers.Count - 1; i++) {
+					var member = staticMembers[i].FirstOrDefault(m => m.Name == name);
+					if (member == null)
+						continue;
+					string outerMemberType;
+					switch (member.SymbolKind) {
+						case SymbolKind.Field:
+							outerMemberType = ctx.TranslateString("field");
+							break;
+						case SymbolKind.Property:
+							outerMemberType = ctx.TranslateString("property");
+							break;
+						case SymbolKind.Event:
+							outerMemberType = ctx.TranslateString("event");
+							break;
+						case SymbolKind.Method:
+							outerMemberType = ctx.TranslateString("method");
+							break;
+						default:
+							outerMemberType = ctx.TranslateString("member");
+							break;
+					}
+					AddIssue(new CodeIssue(nodeToMark,
+						string.Format(ctx.TranslateString("{0} '{1}' hides {2} from outer class"),
+							memberType, member.Name, outerMemberType)));
+					return;
+				}
+			}
+
+			public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
+			{
+				foreach (var init in eventDeclaration.Variables) {
+					Check(init.Name, init.NameToken, ctx.TranslateString("Event"));
+				}
+			}
+
+			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
+			{
+				Check(eventDeclaration.Name, eventDeclaration.NameToken, ctx.TranslateString("Event"));
+			}
+
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+				foreach (var init in fieldDeclaration.Variables) {
+					Check(init.Name, init.NameToken, ctx.TranslateString("Field"));
+				}
+			}
+
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+				Check(propertyDeclaration.Name, propertyDeclaration.NameToken, ctx.TranslateString("Property"));
+			}
+
+			public override void VisitFixedFieldDeclaration(FixedFieldDeclaration fixedFieldDeclaration)
+			{
+				Check(fixedFieldDeclaration.Name, fixedFieldDeclaration.NameToken, ctx.TranslateString("Fixed field"));
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				Check(methodDeclaration.Name, methodDeclaration.NameToken, ctx.TranslateString("Method"));
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/MethodOverloadWithOptionalParameterIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/MethodOverloadWithOptionalParameterIssue.cs
new file mode 100644
index 0000000000..1aafa2d884
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/MethodOverloadWithOptionalParameterIssue.cs
@@ -0,0 +1,122 @@
+//
+// MethodOverloadWithOptionalParameterIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription (
+		"Method with optional parameter is hidden by overload",
+		Description = "Method with optional parameter is hidden by overload",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "MethodOverloadWithOptionalParameter")]
+	public class MethodOverloadWithOptionalParameterIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<MethodOverloadWithOptionalParameterIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+
+			void CheckParameters(IParameterizedMember member,  List<IParameterizedMember> overloads, List<ParameterDeclaration> parameterDeclarations)
+			{
+				for (int i = 0; i < member.Parameters.Count; i++) {
+					if (!member.Parameters[i].IsOptional)
+						continue;
+
+					foreach (var overload in overloads) {
+						if (overload.Parameters.Count != i)
+							continue;
+						bool equal = true;
+						for (int j = 0; j < i; j++)  {
+							if (overload.Parameters[j].Type != member.Parameters[j].Type) {
+								equal = false;
+								break;
+							}
+						}
+						if (equal) {
+							AddIssue(new CodeIssue(
+								parameterDeclarations[i],
+								member.SymbolKind == SymbolKind.Method ?
+								ctx.TranslateString("Method with optional parameter is hidden by overload") :
+								ctx.TranslateString("Indexer with optional parameter is hidden by overload")));
+						}
+					}
+				}
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				var rr = ctx.Resolve(methodDeclaration) as MemberResolveResult;
+				if (rr == null || rr.IsError)
+					return;
+				var method = rr.Member as IMethod;
+				if (method == null)
+					return;
+				CheckParameters (method, 
+					method.DeclaringType.GetMethods(m =>
+						m.Name == method.Name).Cast<IParameterizedMember>().ToList(),
+					methodDeclaration.Parameters.ToList()
+				);
+
+			}
+
+			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
+			{
+				var rr = ctx.Resolve(indexerDeclaration) as MemberResolveResult;
+				if (rr == null || rr.IsError)
+					return;
+				var method = rr.Member as IProperty;
+				if (method == null)
+					return;
+				CheckParameters (method, 
+					method.DeclaringType.GetProperties(m =>
+						m.IsIndexer &&
+						m != method.UnresolvedMember).Cast<IParameterizedMember>().ToList(),
+					indexerDeclaration.Parameters.ToList()
+				);
+			}
+
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				// SKIP
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/NonReadonlyReferencedInGetHashCodeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/NonReadonlyReferencedInGetHashCodeIssue.cs
new file mode 100644
index 0000000000..6abe3b7068
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/NonReadonlyReferencedInGetHashCodeIssue.cs
@@ -0,0 +1,130 @@
+//
+// NonReadonlyReferencedInGetHashCodeIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Non-readonly field referenced in 'GetHashCode()'",
+		Description= "Non-readonly field referenced in 'GetHashCode()'",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "NonReadonlyReferencedInGetHashCode")]
+	public class NonReadonlyReferencedInGetHashCodeIssue : GatherVisitorCodeIssueProvider
+	{	
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<NonReadonlyReferencedInGetHashCodeIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base(ctx)
+			{
+			}
+
+			#region Skipped declarations
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+			}
+
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+			}
+
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+			}
+
+			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
+			{
+			}
+
+			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
+			{
+			}
+
+			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
+			{
+			}
+
+			public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
+			{
+			}
+
+			public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
+			{
+			}
+
+			public override void VisitFixedFieldDeclaration(FixedFieldDeclaration fixedFieldDeclaration)
+			{
+			}
+
+			public override void VisitDelegateDeclaration(DelegateDeclaration delegateDeclaration)
+			{
+			}
+			#endregion
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				if (methodDeclaration.Name != "GetHashCode" || !methodDeclaration.HasModifier(Modifiers.Override) || methodDeclaration.Parameters.Any())
+					return;
+				if (!ctx.Resolve(methodDeclaration.ReturnType).Type.IsKnownType(KnownTypeCode.Int32))
+					return;
+				base.VisitMethodDeclaration(methodDeclaration);
+			}
+
+			public override void VisitMemberReferenceExpression(MemberReferenceExpression memberReferenceExpression)
+			{
+				base.VisitMemberReferenceExpression(memberReferenceExpression);
+				CheckNode(memberReferenceExpression, memberReferenceExpression.MemberNameToken);
+			}
+
+			public override void VisitIdentifierExpression(IdentifierExpression identifierExpression)
+			{
+				base.VisitIdentifierExpression(identifierExpression);
+				CheckNode(identifierExpression, identifierExpression);
+			}
+
+			void CheckNode(AstNode expr, AstNode nodeToMark)
+			{
+				var resolvedResult = ctx.Resolve(expr);
+				var mrr = resolvedResult as MemberResolveResult;
+				if (mrr == null)
+					return;
+				var member = mrr.Member;
+				var field = member as IField;
+				if (field != null) {
+					if (!field.IsReadOnly && !field.IsConst)
+						AddIssue(new CodeIssue(nodeToMark, "Non-readonly field referenced in 'GetHashCode()'"));
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/NotResolvedInTextIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/NotResolvedInTextIssue.cs
new file mode 100644
index 0000000000..66814404eb
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/NotResolvedInTextIssue.cs
@@ -0,0 +1,256 @@
+//
+// ExceptionParameterCantBeResolvedIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using System;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Cannot resolve symbol in text argument",
+		Description = "Cannot resolve symbol in text argument",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "NotResolvedInText")]
+	public class NotResolvedInTextIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<NotResolvedInTextIssue>
+		{
+			readonly BaseRefactoringContext context;
+
+			static GatherVisitor()
+			{
+			}
+
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+				this.context = context;
+			}
+
+			static string GetArgumentParameterName(Expression expression)
+			{
+				var pExpr = expression as PrimitiveExpression;
+				if (pExpr != null)
+					return pExpr.Value as string;
+				return null;
+			}
+
+
+			bool CheckExceptionType(ObjectCreateExpression objectCreateExpression, out Expression paramNode, out Expression altParam, out bool canAddParameterName)
+			{
+				paramNode = null;
+				altParam = null;
+				canAddParameterName = false;
+				var rr = context.Resolve(objectCreateExpression.Type) as TypeResolveResult;
+				if (rr == null)
+					return false;
+
+				var type = rr.Type;
+				if (type.Name == typeof(ArgumentException).Name && type.Namespace == typeof(ArgumentException).Namespace) {
+					if (objectCreateExpression.Arguments.Count >= 2) {
+						altParam = objectCreateExpression.Arguments.ElementAt(0);
+						paramNode = objectCreateExpression.Arguments.ElementAt(1);
+
+					}
+					return paramNode != null;
+				}
+				if (type.Name == typeof(ArgumentNullException).Name && type.Namespace == typeof(ArgumentNullException).Namespace ||
+				    type.Name == typeof(ArgumentOutOfRangeException).Name && type.Namespace == typeof(ArgumentOutOfRangeException).Namespace ||
+				    type.Name == typeof(DuplicateWaitObjectException).Name && type.Namespace == typeof(DuplicateWaitObjectException).Namespace) {
+					canAddParameterName = objectCreateExpression.Arguments.Count == 1;
+					if (objectCreateExpression.Arguments.Count >= 1) {
+						paramNode = objectCreateExpression.Arguments.FirstOrDefault();
+						if (objectCreateExpression.Arguments.Count == 2) {
+							altParam = objectCreateExpression.Arguments.ElementAt(1);
+							if (!context.Resolve(altParam).Type.IsKnownType(KnownTypeCode.String))
+								paramNode = null;
+						}
+						if (objectCreateExpression.Arguments.Count == 3)
+							altParam = objectCreateExpression.Arguments.ElementAt(2);
+					}
+					return paramNode != null;
+				}
+				return false;
+			}
+
+			static List<string> GetValidParameterNames(ObjectCreateExpression objectCreateExpression)
+			{
+				var names = new List<string>();
+				var node = objectCreateExpression.Parent;
+				while (node != null && !(node is TypeDeclaration) && !(node is AnonymousTypeCreateExpression)) {
+					var lambda = node as LambdaExpression;
+					if (lambda != null)
+						names.AddRange(lambda.Parameters.Select(p => p.Name));
+					var anonymousMethod = node as AnonymousMethodExpression;
+					if (anonymousMethod != null)
+						names.AddRange(anonymousMethod.Parameters.Select(p => p.Name));
+
+					var indexer = node as IndexerDeclaration;
+					if (indexer != null) {
+						names.AddRange(indexer.Parameters.Select(p => p.Name));
+						break;
+					}
+
+					var methodDeclaration = node as MethodDeclaration;
+					if (methodDeclaration != null) {
+						names.AddRange(methodDeclaration.Parameters.Select(p => p.Name));
+						break;
+					}
+
+					var constructorDeclaration = node as ConstructorDeclaration;
+					if (constructorDeclaration != null) {
+						names.AddRange(constructorDeclaration.Parameters.Select(p => p.Name));
+						break;
+					}
+					var accessor = node as Accessor;
+					if (accessor != null) {
+						if (accessor.Role == PropertyDeclaration.SetterRole ||
+						    accessor.Role == CustomEventDeclaration.AddAccessorRole ||
+						    accessor.Role == CustomEventDeclaration.RemoveAccessorRole) {
+							names.Add("value");
+						}
+						break;
+					}
+
+					node = node.Parent;
+				}
+				return names;
+			}
+
+			string GetParameterName(Expression expr)
+			{
+				foreach (var node in expr.DescendantsAndSelf) {
+					if (!(node is Expression))
+						continue;
+					var rr = context.Resolve(node) as LocalResolveResult;
+					if (rr != null && rr.Variable.SymbolKind == SymbolKind.Parameter)
+						return rr.Variable.Name;
+				}
+				return null;
+			}
+
+			string GuessParameterName(ObjectCreateExpression objectCreateExpression, List<string> validNames)
+			{
+				if (validNames.Count == 1)
+					return validNames[0];
+				var parent = objectCreateExpression.GetParent<IfElseStatement>();
+				if (parent == null)
+					return null;
+				return GetParameterName(parent.Condition);
+			}
+
+			public override void VisitObjectCreateExpression(ObjectCreateExpression objectCreateExpression)
+			{
+				base.VisitObjectCreateExpression(objectCreateExpression);
+
+				Expression paramNode;
+				Expression altParamNode;
+				bool canAddParameterName;
+				if (!CheckExceptionType(objectCreateExpression, out paramNode, out altParamNode, out canAddParameterName))
+					return;
+
+				var paramName = GetArgumentParameterName(paramNode);
+				if (paramName == null)
+					return;
+				var validNames = GetValidParameterNames(objectCreateExpression);
+
+				if (!validNames.Contains(paramName)) {
+					// Case 1: Parameter name is swapped
+					var altParamName = GetArgumentParameterName(altParamNode);
+					if (altParamName != null && validNames.Contains(altParamName)) {
+						AddIssue(new CodeIssue(
+							paramNode,
+							string.Format(context.TranslateString("The parameter '{0}' can't be resolved"), paramName),
+							context.TranslateString("Swap parameter."),
+							script => {
+								var newAltNode = paramNode.Clone();
+								script.Replace(paramNode, altParamNode.Clone());
+								script.Replace(altParamNode, newAltNode);
+							}
+						));
+						AddIssue(new CodeIssue(
+							altParamNode,
+							context.TranslateString("The parameter name is on the wrong argument."),
+							context.TranslateString("Swap parameter."),
+							script => {
+								var newAltNode = paramNode.Clone();
+								script.Replace(paramNode, altParamNode.Clone());
+								script.Replace(altParamNode, newAltNode);
+							}
+						));
+						return;
+					}
+					var guessName = GuessParameterName(objectCreateExpression, validNames);
+					if (guessName != null) {
+
+						var actions = new List<CodeAction>();
+						if (canAddParameterName) {
+							actions.Add(new CodeAction(
+								string.Format(context.TranslateString("Add '\"{0}\"' parameter."), guessName),
+								script => {
+									var oce = (ObjectCreateExpression)objectCreateExpression.Clone();
+									oce.Arguments.Clear();
+									oce.Arguments.Add(new PrimitiveExpression(guessName));
+									oce.Arguments.Add(objectCreateExpression.Arguments.First().Clone());
+									script.Replace(objectCreateExpression, oce);
+								}, paramNode
+							)); 
+						}
+
+						actions.Add(new CodeAction (
+							string.Format(context.TranslateString("Replace with '\"{0}\"'."), guessName),
+							script => {
+								script.Replace(paramNode, new PrimitiveExpression(guessName));
+							}, paramNode
+						)); 
+
+						AddIssue(new CodeIssue(
+							paramNode,
+							string.Format(context.TranslateString("The parameter '{0}' can't be resolved"), paramName),
+							actions
+						));
+						return;
+					}
+
+					// General case: mark only
+					AddIssue(new CodeIssue(
+						paramNode,
+						string.Format(context.TranslateString("The parameter '{0}' can't be resolved"), paramName)
+					));
+				}
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ObjectCreationAsStatementIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ObjectCreationAsStatementIssue.cs
new file mode 100644
index 0000000000..9afb6f2280
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ObjectCreationAsStatementIssue.cs
@@ -0,0 +1,62 @@
+//
+// ObjectCreationAsStatementIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Possible unassigned object created by 'new'",
+		Description = "Possible unassigned object created by 'new'",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "ObjectCreationAsStatement")]
+	public class ObjectCreationAsStatementIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		sealed class GatherVisitor : GatherVisitorBase<ObjectCreationAsStatementIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base(ctx)
+			{
+			}
+
+			public override void VisitObjectCreateExpression(ObjectCreateExpression objectCreateExpression)
+			{
+				base.VisitObjectCreateExpression(objectCreateExpression);
+				if (!(objectCreateExpression.Parent is ExpressionStatement))
+					return;
+				AddIssue(new CodeIssue(objectCreateExpression.NewToken,
+					ctx.TranslateString("Possible unassigned object created by 'new' expression")));
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OperatorIsCanBeUsedIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OperatorIsCanBeUsedIssue.cs
new file mode 100644
index 0000000000..47e86ec08f
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OperatorIsCanBeUsedIssue.cs
@@ -0,0 +1,105 @@
+//
+// ReplaceWithIsOperatorIssue.cs
+//
+// Author:
+//	   Ji Kun <jikun.nus@gmail.com>
+//
+// Copyright (c) 2013 Ji Kun
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.using System;
+
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Operator 'is' can be used",
+		Description = "Operator Is can be used instead of comparing object GetType() and instances of System.Type object.",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "OperatorIsCanBeUsed")]
+	public class OperatorIsCanBeUsedIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		sealed class GatherVisitor : GatherVisitorBase<OperatorIsCanBeUsedIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base(ctx)
+			{
+			}
+
+			static readonly AstNode pattern = 
+				PatternHelper.CommutativeOperatorWithOptionalParentheses(
+					new InvocationExpression(new MemberReferenceExpression(new AnyNode("a"), "GetType"), null),
+					BinaryOperatorType.Equality,
+					new TypeOfExpression(new AnyNode("b"))
+				);
+
+			public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
+			{
+				base.VisitBinaryOperatorExpression(binaryOperatorExpression);
+
+				var m = pattern.Match(binaryOperatorExpression);
+				if (!m.Success)
+					return;
+
+				Expression identifier = null;
+				AstType type = null;
+
+				if (binaryOperatorExpression.Left is TypeOfExpression && binaryOperatorExpression.Right is InvocationExpression) {
+					type = (binaryOperatorExpression.Left as TypeOfExpression).Type;
+					var right = binaryOperatorExpression.Right as InvocationExpression;
+					identifier = (right.Target as MemberReferenceExpression).Target;
+				} else if (binaryOperatorExpression.Right is TypeOfExpression && binaryOperatorExpression.Left is InvocationExpression) {
+					type = (binaryOperatorExpression.Right as TypeOfExpression).Type;
+					var left = binaryOperatorExpression.Left as InvocationExpression;
+					identifier = (left.Target as MemberReferenceExpression).Target;
+				} else
+					return;
+
+				if (identifier == null || type == null)
+					return;
+
+				var typeResolved = ctx.Resolve(type) as TypeResolveResult; 
+
+				if (typeResolved.Type.Kind == TypeKind.Class) {
+					if (!typeResolved.Type.GetDefinition().IsSealed) {
+						return;
+					}
+				}
+
+				AddIssue(new CodeIssue(
+					binaryOperatorExpression, 
+					ctx.TranslateString("Operator 'is' can be used"), 
+					ctx.TranslateString("Replace with 'is' operator"), 
+					script => {
+						var isExpr = new IsExpression(identifier.Clone(), type.Clone());
+						script.Replace(binaryOperatorExpression, isExpr);
+					}
+				));
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OptionalParameterHierarchyMismatchIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OptionalParameterHierarchyMismatchIssue.cs
new file mode 100644
index 0000000000..70c7a6c806
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OptionalParameterHierarchyMismatchIssue.cs
@@ -0,0 +1,154 @@
+// 
+// OptionalParameterValueIssueMismatch.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Mismatch optional parameter value in overridden method",
+	                   Description = "The value of an optional parameter in a method does not match the base method.",
+	                   Category = IssueCategories.CodeQualityIssues,
+	                   Severity = Severity.Warning,
+	                   AnalysisDisableKeyword = "OptionalParameterHierarchyMismatch")]
+	public class OptionalParameterHierarchyMismatchIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<OptionalParameterHierarchyMismatchIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			//Delegate declarations are not visited even though they can have optional
+			//parameters because they can not be overriden.
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				VisitParameterizedEntityDeclaration("method", methodDeclaration, methodDeclaration.Parameters);
+			}
+
+			void VisitParameterizedEntityDeclaration(string memberType, EntityDeclaration entityDeclaration, AstNodeCollection<ParameterDeclaration> parameters)
+			{
+				//Override is not strictly necessary because methodDeclaration
+				//might still implement an interface member
+				var memberResolveResult = ctx.Resolve(entityDeclaration) as MemberResolveResult;
+				if (memberResolveResult == null) {
+					return;
+				}
+				var member = (IParameterizedMember)memberResolveResult.Member;
+				var baseMembers = InheritanceHelper.GetBaseMembers(member, true).ToList();
+				foreach (IParameterizedMember baseMember in baseMembers) {
+					if (baseMember.IsOverride || baseMember.DeclaringType.Kind == TypeKind.Interface)
+						continue;
+					CompareMethods(memberType, parameters, member, baseMember);
+					return;
+				}
+				// only check 1 interface method -> multiple interface implementations could lead to deault value conflicts
+				// possible other solutions: Skip the interface check entirely
+				var interfaceBaseMethods = baseMembers.Where(b => b.DeclaringType.Kind == TypeKind.Interface).ToList();
+				if (interfaceBaseMethods.Count == 1) {
+					foreach (IParameterizedMember baseMember in interfaceBaseMethods) {
+						if (baseMember.DeclaringType.Kind == TypeKind.Interface) {
+							CompareMethods(memberType, parameters, member, baseMember);
+						}
+					}
+				}
+			}
+
+			static Expression CreateDefaultValueExpression(BaseRefactoringContext ctx, AstNode node, IType type, object constantValue)
+			{
+				var astBuilder = ctx.CreateTypeSystemAstBuilder(node);
+				return astBuilder.ConvertConstantValue(type, constantValue); 
+			}
+
+			void CompareMethods(string memberType, AstNodeCollection<ParameterDeclaration> parameters, IParameterizedMember overridenMethod, IParameterizedMember baseMethod)
+			{
+				var parameterEnumerator = parameters.GetEnumerator();
+				for (int parameterIndex = 0; parameterIndex < overridenMethod.Parameters.Count; parameterIndex++) {
+					parameterEnumerator.MoveNext();
+
+					var baseParameter = baseMethod.Parameters [parameterIndex];
+
+					var overridenParameter = overridenMethod.Parameters [parameterIndex];
+
+					string parameterName = overridenParameter.Name;
+					var parameterDeclaration = parameterEnumerator.Current;
+
+					if (overridenParameter.IsOptional) {
+						if (!baseParameter.IsOptional) {
+							AddIssue(new CodeIssue(parameterDeclaration,
+							         string.Format(ctx.TranslateString("Optional parameter value {0} differs from base " + memberType + " '{1}'"), parameterName, baseMethod.DeclaringType.FullName),
+							         ctx.TranslateString("Remove parameter default value"),
+							         script => {
+								script.Remove(parameterDeclaration.AssignToken);
+								script.Remove(parameterDeclaration.DefaultExpression);
+								script.FormatText(parameterDeclaration);
+								}));
+						} else if (!object.Equals(overridenParameter.ConstantValue, baseParameter.ConstantValue)) {
+							AddIssue(new CodeIssue(parameterDeclaration,
+							         string.Format(ctx.TranslateString("Optional parameter value {0} differs from base " + memberType + " '{1}'"), parameterName, baseMethod.DeclaringType.FullName),
+							         string.Format(ctx.TranslateString("Change default value to {0}"), baseParameter.ConstantValue),
+								script => script.Replace(parameterDeclaration.DefaultExpression, CreateDefaultValueExpression(ctx, parameterDeclaration, baseParameter.Type, baseParameter.ConstantValue))));
+						}
+					} else {
+						if (!baseParameter.IsOptional)
+							continue;
+						AddIssue(new CodeIssue(parameterDeclaration,
+							string.Format(ctx.TranslateString("Parameter {0} has default value in base method '{1}'"), parameterName, baseMethod.FullName),
+							string.Format(ctx.TranslateString("Add default value from base '{0}'"), CreateDefaultValueExpression(ctx, parameterDeclaration, baseParameter.Type, baseParameter.ConstantValue)),
+							script => {
+								var newParameter = (ParameterDeclaration)parameterDeclaration.Clone();
+								newParameter.DefaultExpression = CreateDefaultValueExpression(ctx, parameterDeclaration, baseParameter.Type, baseParameter.ConstantValue);
+								script.Replace(parameterDeclaration, newParameter);
+							}
+						));
+					}
+				}
+			}
+
+			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
+			{
+				VisitParameterizedEntityDeclaration("indexer", indexerDeclaration, indexerDeclaration.Parameters);
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				//No need to visit statements
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OptionalParameterRefOutIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OptionalParameterRefOutIssue.cs
new file mode 100644
index 0000000000..ac099f3bc3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OptionalParameterRefOutIssue.cs
@@ -0,0 +1,72 @@
+//
+// OptionalParameterRefOutIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("[Optional] attribute with 'ref' or 'out' parameter",
+	                  Description="C# doesn't support optional 'ref' or 'out' parameters",
+	                  Category = IssueCategories.CodeQualityIssues,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "OptionalParameterRefOut")]
+	public class OptionalParameterRefOutIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<OptionalParameterRefOutIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitParameterDeclaration(ParameterDeclaration parameterDeclaration)
+			{
+				base.VisitParameterDeclaration(parameterDeclaration);
+				if (parameterDeclaration.ParameterModifier != ParameterModifier.Ref && parameterDeclaration.ParameterModifier != ParameterModifier.Out)
+					return;
+				foreach (var sect in parameterDeclaration.Attributes) {
+					foreach (var attr in sect.Attributes) {
+						var rr = ctx.Resolve(attr);
+						if (rr.Type.Name == "OptionalAttribute" && rr.Type.Namespace == "System.Runtime.InteropServices") {
+							AddIssue(new CodeIssue(attr, ctx.TranslateString("A 'ref' or 'out' parameter can't be optional")));
+							return;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ParameterHidesMemberIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ParameterHidesMemberIssue.cs
new file mode 100644
index 0000000000..f10fffdc93
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ParameterHidesMemberIssue.cs
@@ -0,0 +1,92 @@
+// 
+// ParameterHidesMemberIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Parameter hides a member",
+					   Description = "Parameter has the same name as a member and hides it.",
+					   Category = IssueCategories.CodeQualityIssues,
+					   Severity = Severity.Warning,
+                       AnalysisDisableKeyword = "ParameterHidesMember")]
+    public class ParameterHidesMemberIssue : VariableHidesMemberIssue
+	{
+	    protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ParameterHidesMemberIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitParameterDeclaration (ParameterDeclaration parameterDeclaration)
+			{
+				base.VisitParameterDeclaration (parameterDeclaration);
+
+				var rr = ctx.Resolve(parameterDeclaration.Parent) as MemberResolveResult;
+				if (rr == null || rr.IsError)
+					return;
+				var parent = rr.Member;
+				if (parent.SymbolKind == SymbolKind.Constructor || parent.ImplementedInterfaceMembers.Any ())
+					return;
+				if (parent.IsOverride || parent.IsAbstract || parent.IsPublic || parent.IsProtected)
+					return;
+					
+				IMember member;
+                if (HidesMember(ctx, parameterDeclaration, parameterDeclaration.Name, out member)) {
+                    string msg;
+                    switch (member.SymbolKind) {
+                        case SymbolKind.Field:
+                            msg = ctx.TranslateString("Parameter '{0}' hides field '{1}'");
+                            break;
+                        case SymbolKind.Method:
+                            msg = ctx.TranslateString("Parameter '{0}' hides method '{1}'");
+                            break;
+                        case SymbolKind.Property:
+                            msg = ctx.TranslateString("Parameter '{0}' hides property '{1}'");
+                            break;
+                        case SymbolKind.Event:
+                            msg = ctx.TranslateString("Parameter '{0}' hides event '{1}'");
+                            break;
+                        default:
+                            msg = ctx.TranslateString("Parameter '{0}' hides member '{1}'");
+                            break;
+                    }
+					AddIssue(new CodeIssue(parameterDeclaration.NameToken,
+						string.Format(msg, parameterDeclaration.Name, member.FullName)));
+			    }
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PartialMethodParameterNameMismatchIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PartialMethodParameterNameMismatchIssue.cs
new file mode 100644
index 0000000000..d03d3fd2aa
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PartialMethodParameterNameMismatchIssue.cs
@@ -0,0 +1,135 @@
+//
+// PartialMethodParameterNameMismatchIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription(
+		"Parameter name differs in partial method declaration",
+		Description = "Parameter name differs in partial method declaration",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "PartialMethodParameterNameMismatch")]
+	public class PartialMethodParameterNameMismatchIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<PartialMethodParameterNameMismatchIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+				// skip
+			}
+
+			public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
+			{
+				// skip
+			}
+
+			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
+			{
+				// skip
+			}
+
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+				// skip
+			}
+
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+				// skip
+			}
+		
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				// SKIP
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				if (!methodDeclaration.HasModifier(Modifiers.Partial))
+					return;
+				var rr = ctx.Resolve(methodDeclaration) as MemberResolveResult;
+				if (rr == null || rr.IsError)
+					return;
+				var method = rr.Member as IMethod;
+				if (method == null)
+					return;
+
+				int arg = 0;
+				foreach (var param in methodDeclaration.Parameters) {
+					var pr = ctx.Resolve(param) as LocalResolveResult;
+					if (pr == null)
+						continue;
+					foreach (var part in method.Parts) {
+						if (param.Name != part.Parameters[arg].Name) {
+							List<CodeAction> fixes = new List<CodeAction>();
+							foreach (var p2 in method.Parts) {
+								if (param.Name != p2.Parameters[arg].Name) {
+									int _arg = arg;
+									fixes.Add(new CodeAction (
+										string.Format(ctx.TranslateString("Rename to '{0}'"), p2.Parameters[_arg].Name),
+										s => {
+											s.Rename(pr.Variable, p2.Parameters[_arg].Name);
+										},
+										param
+									)); 
+								}
+							}
+							// TODO: Atm I think it makes only sense to offer a fix if the issue disappears
+							// which might not be the case here.
+							if (fixes.Count > 1) {
+								fixes.Clear();
+							}
+							AddIssue(new CodeIssue(
+								param.NameToken,
+								ctx.TranslateString("Parameter name differs in partial method declaration"),
+								fixes
+							));
+							break;
+						}
+					}
+					arg++;
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PolymorphicFieldLikeEventInvocationIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PolymorphicFieldLikeEventInvocationIssue.cs
new file mode 100644
index 0000000000..298784e93e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PolymorphicFieldLikeEventInvocationIssue.cs
@@ -0,0 +1,77 @@
+//
+// PolymorphicFieldLikeEventInvocationIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription (
+		"Invocation of polymorphic field event",
+		Description = "Invocation of polymorphic field event leads to unpredictable result since invocation lists are not virtual",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "PolymorphicFieldLikeEventInvocation")]
+	public class PolymorphicFieldLikeEventInvocationIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<PolymorphicFieldLikeEventInvocationIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+				var rr = ctx.Resolve(invocationExpression.Target) as MemberResolveResult;
+				if (rr == null || rr.IsError)
+					return;
+				var evt = rr.Member as IEvent;
+				if (evt == null || !evt.IsOverride)
+					return;
+				if (evt.AddAccessor.HasBody) {
+					AddIssue(new CodeIssue(
+						invocationExpression.Target,
+						string.Format(ctx.TranslateString("The event `{0}' can only appear on the left hand side of `+=' or `-=' operator"), evt.Name)
+					));
+					return;
+				}
+				AddIssue(new CodeIssue(
+					invocationExpression,
+					ctx.TranslateString("Invocation of polymorphic field like event")));
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PossibleAssignmentToReadonlyFieldIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PossibleAssignmentToReadonlyFieldIssue.cs
new file mode 100644
index 0000000000..7e5afce5db
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PossibleAssignmentToReadonlyFieldIssue.cs
@@ -0,0 +1,122 @@
+//
+// PossibleAssignmentToReadonlyFieldIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription (
+		"Check if a namespace corresponds to a file location",
+		Description = "Check if a namespace corresponds to a file location",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "PossibleAssignmentToReadonlyField")]
+	public class PossibleAssignmentToReadonlyFieldIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<PossibleAssignmentToReadonlyFieldIssue>
+		{
+			bool inConstructor;
+
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+				inConstructor = true;
+				base.VisitConstructorDeclaration(constructorDeclaration);
+				inConstructor = false;
+			}
+
+			void Check(Expression expr)
+			{
+				var mr = expr as MemberReferenceExpression;
+				if (mr != null) {
+					if (inConstructor && mr.Descendants.Any(d => d.Parent is MemberReferenceExpression && d is ThisReferenceExpression))
+						return;
+					Check(mr.Target);
+				}
+				if (inConstructor && expr is IdentifierExpression)
+					return;
+
+				var rr = ctx.Resolve(expr) as MemberResolveResult;
+
+				if (rr == null || rr.IsError)
+					return;
+				var field = rr.Member as IField;
+
+				if (field == null || !field.IsReadOnly)
+					return;
+
+				if (field.Type.Kind == TypeKind.TypeParameter) {
+					var param = (ITypeParameter)field.Type;
+					if (param.HasReferenceTypeConstraint)
+						return;
+					// TODO: Add resolve actions: Add class constraint + remove readonly modifier
+					AddIssue(new CodeIssue(expr,
+						ctx.TranslateString("Assignment to a property of a readonly field can be useless. Type parameter is not known to be a reference type.")));
+					return;
+				}
+				if (field.Type.Kind == TypeKind.Struct) {
+					// TODO: Add resolve actions: Remove readonly modifier
+					AddIssue(new CodeIssue(expr, ctx.TranslateString("Readonly field can not be used as assignment target.")));
+				}
+			}
+
+			public override void VisitAssignmentExpression(AssignmentExpression assignmentExpression)
+			{
+				base.VisitAssignmentExpression (assignmentExpression);
+				Check(assignmentExpression.Left);
+			}
+
+			public override void VisitDirectionExpression(DirectionExpression directionExpression)
+			{
+				base.VisitDirectionExpression (directionExpression);
+				Check(directionExpression.Expression);
+			}
+
+			public override void VisitUnaryOperatorExpression(UnaryOperatorExpression unaryOperatorExpression)
+			{
+				base.VisitUnaryOperatorExpression (unaryOperatorExpression);
+				if (unaryOperatorExpression.Operator == UnaryOperatorType.Increment || unaryOperatorExpression.Operator == UnaryOperatorType.Decrement ||
+					unaryOperatorExpression.Operator == UnaryOperatorType.PostIncrement || unaryOperatorExpression.Operator == UnaryOperatorType.PostDecrement) {
+					Check(unaryOperatorExpression.Expression);
+				}
+			}
+
+
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PossibleMultipleEnumerationIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PossibleMultipleEnumerationIssue.cs
new file mode 100644
index 0000000000..d32fb8e3e2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PossibleMultipleEnumerationIssue.cs
@@ -0,0 +1,417 @@
+// 
+// MultipleEnumerationIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Possible multiple enumeration of IEnumerable",
+		Description = "Possible multiple enumeration of IEnumerable",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "PossibleMultipleEnumeration")]
+	public class PossibleMultipleEnumerationIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class AnalysisStatementCollector : DepthFirstAstVisitor
+		{
+			List<Statement> statements;
+			AstNode variableDecl;
+
+			AnalysisStatementCollector (AstNode variableDecl)
+			{
+				this.variableDecl = variableDecl;
+			}
+
+			IList<Statement> GetStatements ()
+			{
+				if (statements != null)
+					return statements;
+
+				statements = new List<Statement> ();
+				var parent = variableDecl.Parent;
+				while (parent != null) {
+					if (parent is BlockStatement || parent is MethodDeclaration ||
+						parent is AnonymousMethodExpression || parent is LambdaExpression) {
+						parent.AcceptVisitor (this);
+						if (parent is BlockStatement)
+							statements.Add ((BlockStatement)parent);
+						break;
+					}
+					parent = parent.Parent;
+				}
+				return statements;
+			}
+
+			public override void VisitMethodDeclaration (MethodDeclaration methodDeclaration)
+			{
+				statements.Add (methodDeclaration.Body);
+
+				base.VisitMethodDeclaration (methodDeclaration);
+			}
+
+			public override void VisitAnonymousMethodExpression (AnonymousMethodExpression anonymousMethodExpression)
+			{
+				statements.Add (anonymousMethodExpression.Body);
+
+				base.VisitAnonymousMethodExpression (anonymousMethodExpression);
+			}
+
+			public override void VisitLambdaExpression (LambdaExpression lambdaExpression)
+			{
+				var body = lambdaExpression.Body as BlockStatement;
+				if (body != null)
+					statements.Add (body);
+
+				base.VisitLambdaExpression (lambdaExpression);
+			}
+
+			public static IList<Statement> Collect (AstNode variableDecl)
+			{
+				return new AnalysisStatementCollector (variableDecl).GetStatements ();
+			}
+		}
+
+		class GatherVisitor : GatherVisitorBase<PossibleMultipleEnumerationIssue>
+		{
+			HashSet<AstNode> collectedAstNodes;
+
+			public GatherVisitor (BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+				this.collectedAstNodes = new HashSet<AstNode> ();
+			}
+
+			void ResolveIssue(Script s, AstNode node, Func<TypeSystemAstBuilder, AstType> type, string methodCall)
+			{
+				var rr = ctx.Resolve(node) as LocalResolveResult;
+				if (rr == null || rr.IsError)
+					return;
+				var refs = ctx.FindReferences(ctx.RootNode, rr.Variable);
+				var nodes = refs.Select(r => r.Node).Where(IsEnumeration).OfType<Expression>().ToList(); 
+				if (nodes.Count == 0)
+					return;
+				var first = nodes.First().GetParent<Statement>();
+				var varName = ctx.GetNameProposal("enumerable", first.StartLocation);
+				var astBuilder = ctx.CreateTypeSystemAstBuilder(first);
+
+				var links = new List<AstNode>();
+				var varDec = new VariableDeclarationStatement(new PrimitiveType("var"), varName, new BinaryOperatorExpression(new AsExpression((Expression)node.Clone(), type (astBuilder)), BinaryOperatorType.NullCoalescing, new InvocationExpression(new MemberReferenceExpression((Expression)node.Clone(), methodCall))));
+
+				links.Add(varDec.Variables.First().NameToken);
+				s.InsertBefore(first, varDec);
+				foreach (var n in nodes) {
+					var id = new IdentifierExpression(varName);
+					links.Add(id);
+					s.Replace(n, id);
+				}
+				s.Link(links);
+			}
+
+			void AddIssue (AstNode node, IType elementType, IList<AstNode> nodes)
+			{
+				if (collectedAstNodes.Add(node)) {
+					var actions = new List<CodeAction>();
+					actions.Add(
+						new CodeAction(
+							ctx.TranslateString("Enumerate to array"),
+							s => ResolveIssue(s, node, ab => new ComposedType { BaseType = ab.ConvertType(elementType), ArraySpecifiers =  { new ArraySpecifier() } }, "ToArray"),
+							node
+						)
+					);
+
+					actions.Add(
+						new CodeAction(
+							ctx.TranslateString("Enumerate to list"),
+							s => {
+								var listType = ctx.Compilation.FindType(typeof(IList<>));
+								ResolveIssue(s, node, ab => ab.ConvertType(new ParameterizedType(listType.GetDefinition(), new IType[]{ elementType })), "ToList");
+							},
+							node
+						)
+					);
+
+					AddIssue(new CodeIssue(node, ctx.TranslateString("Possible multiple enumeration of IEnumerable"), actions));
+				}
+			}
+
+			void AddIssues (IList<AstNode> nodes)
+			{
+				if (nodes.Count == 0)
+					return;
+				var rr = ctx.Resolve(nodes[0]);
+				var elementType = TypeGuessing.GetElementType(ctx.Resolver, rr.Type);
+
+				foreach (var node in nodes)
+					AddIssue (node, elementType, nodes);
+			}
+
+			public override void VisitParameterDeclaration (ParameterDeclaration parameterDeclaration)
+			{
+				base.VisitParameterDeclaration (parameterDeclaration);
+
+				var resolveResult = ctx.Resolve (parameterDeclaration) as LocalResolveResult;
+				CollectIssues (parameterDeclaration, parameterDeclaration.Parent, resolveResult);
+			}
+
+			public override void VisitVariableInitializer (VariableInitializer variableInitializer)
+			{
+				base.VisitVariableInitializer (variableInitializer);
+
+				var resolveResult = ctx.Resolve (variableInitializer) as LocalResolveResult;
+				CollectIssues (variableInitializer, variableInitializer.Parent.Parent, resolveResult);
+			}
+
+			static bool IsAssignment (AstNode node)
+			{
+				var assignment = node.Parent as AssignmentExpression;
+				if (assignment != null)
+					return assignment.Left == node;
+
+				var direction = node.Parent as DirectionExpression;
+				if (direction != null)
+					return direction.FieldDirection == FieldDirection.Out && direction.Expression == node;
+
+				return false;
+			}
+
+			bool IsEnumeration (AstNode node)
+			{
+				var foreachStatement = node.Parent as ForeachStatement;
+				if (foreachStatement != null && foreachStatement.InExpression == node) {
+					return true;
+				}
+
+				var memberRef = node.Parent as MemberReferenceExpression;
+				if (memberRef != null && memberRef.Target == node) {
+					var invocation = memberRef.Parent as InvocationExpression;
+					if (invocation == null || invocation.Target != memberRef)
+						return false;
+
+					var methodGroup = ctx.Resolve (memberRef) as MethodGroupResolveResult;
+					if (methodGroup == null)
+						return false;
+
+					var method = methodGroup.Methods.FirstOrDefault ();
+					if (method != null) {
+						var declaringTypeDef = method.DeclaringTypeDefinition;
+						if (declaringTypeDef != null && declaringTypeDef.KnownTypeCode == KnownTypeCode.Object)
+							return false;
+					}
+					return true;
+				}
+
+				return false;
+			}
+
+			HashSet<AstNode> references;
+			HashSet<Statement> refStatements;
+			HashSet<LambdaExpression> lambdaExpressions;
+
+			HashSet<VariableReferenceNode> visitedNodes;
+			HashSet<VariableReferenceNode> collectedNodes;
+			Dictionary<VariableReferenceNode, int> nodeDegree; // number of enumerations a node can reach
+
+			void FindReferences (AstNode variableDecl, AstNode rootNode, IVariable variable)
+			{
+				references = new HashSet<AstNode> ();
+				refStatements = new HashSet<Statement> ();
+				lambdaExpressions = new HashSet<LambdaExpression> ();
+
+				foreach (var result in ctx.FindReferences (rootNode, variable)) {
+					var astNode = result.Node;
+					if (astNode == variableDecl)
+						continue;
+
+					var parent = astNode.Parent;
+					while (!(parent == null || parent is Statement || parent is LambdaExpression))
+						parent = parent.Parent;
+					if (parent == null)
+						continue;
+
+					// lambda expression with expression body, should be analyzed separately
+					var expr = parent as LambdaExpression;
+					if (expr != null) {
+						if (IsAssignment (astNode) || IsEnumeration (astNode)) {
+							references.Add (astNode);
+							lambdaExpressions.Add (expr);
+						}
+						continue;
+					}
+
+					if (IsAssignment (astNode) || IsEnumeration (astNode)) {
+						references.Add (astNode);
+						var statement = (Statement)parent;
+						refStatements.Add (statement);
+					}
+				}
+			}
+
+			void CollectIssues (AstNode variableDecl, AstNode rootNode, LocalResolveResult resolveResult)
+			{
+				if (resolveResult == null)
+					return;
+				var type = resolveResult.Type;
+				var typeDef = type.GetDefinition ();
+				if (typeDef == null ||
+				    (typeDef.KnownTypeCode != KnownTypeCode.IEnumerable &&
+				     typeDef.KnownTypeCode != KnownTypeCode.IEnumerableOfT))
+					return;
+
+				FindReferences (variableDecl, rootNode, resolveResult.Variable);
+
+				var statements = AnalysisStatementCollector.Collect (variableDecl);
+				var builder = new VariableReferenceGraphBuilder (ctx);
+				foreach (var statement in statements) {
+					var vrNode = builder.Build (statement, references, refStatements, ctx);
+					FindMultipleEnumeration (vrNode);
+				}
+				foreach (var lambda in lambdaExpressions) {
+					var vrNode = builder.Build (references, ctx.Resolver, (Expression)lambda.Body);
+					FindMultipleEnumeration (vrNode);
+				}
+			}
+
+			/// <summary>
+			/// split references in the specified node into sub nodes according to the value they uses
+			/// </summary>
+			/// <param name="node">node to split</param>
+			/// <returns>list of sub nodes</returns>
+			static IList<VariableReferenceNode> SplitNode (VariableReferenceNode node)
+			{
+				var subNodes = new List<VariableReferenceNode> ();
+				// find indices of all assignments in node and use them to split references
+				var assignmentIndices = new List<int> { -1 };
+				for (int i = 0; i < node.References.Count; i++) {
+					if (IsAssignment (node.References [i]))
+						assignmentIndices.Add (i);
+				}
+				assignmentIndices.Add (node.References.Count);
+				for (int i = 0; i < assignmentIndices.Count - 1; i++) {
+					var index1 = assignmentIndices [i];
+					var index2 = assignmentIndices [i + 1];
+					if (index1 + 1 >= index2)
+						continue;
+					var subNode = new VariableReferenceNode ();
+					for (int refIndex = index1 + 1; refIndex < index2; refIndex++)
+						subNode.References.Add (node.References [refIndex]);
+					subNodes.Add (subNode);
+				}
+				if (subNodes.Count == 0)
+					subNodes.Add (new VariableReferenceNode ());
+
+				var firstNode = subNodes [0];
+				foreach (var prevNode in node.PreviousNodes) {
+					prevNode.NextNodes.Remove (node);
+					// connect two nodes if the first ref is not an assignment
+					if (firstNode.References.FirstOrDefault () == node.References.FirstOrDefault ())
+						prevNode.NextNodes.Add (firstNode);
+				}
+
+				var lastNode = subNodes [subNodes.Count - 1];
+				foreach (var nextNode in node.NextNodes) {
+					nextNode.PreviousNodes.Remove (node);
+					lastNode.AddNextNode (nextNode);
+				}
+
+				return subNodes;
+			}
+
+			/// <summary>
+			/// convert a variable reference graph starting from the specified node to an assignment usage graph,
+			/// in which nodes are connect if and only if they contains references using the same assigned value
+			/// </summary>
+			/// <param name="startNode">starting node of the variable reference graph</param>
+			/// <returns>
+			/// list of VariableReferenceNode, each of which is a starting node of a sub-graph in which references all
+			/// use the same assigned value
+			/// </returns>
+			static IEnumerable<VariableReferenceNode> GetAssignmentUsageGraph (VariableReferenceNode startNode)
+			{
+				var graph = new List<VariableReferenceNode> ();
+				var visited = new HashSet<VariableReferenceNode> ();
+				var stack = new Stack<VariableReferenceNode> ();
+				stack.Push (startNode);
+				while (stack.Count > 0) {
+					var node = stack.Pop ();
+					if (!visited.Add (node))
+						continue;
+
+					var nodes = SplitNode (node);
+					graph.AddRange (nodes);
+					foreach (var addedNode in nodes)
+						visited.Add (addedNode);
+
+					foreach (var nextNode in nodes.Last ().NextNodes)
+						stack.Push (nextNode);
+				}
+				return graph;
+			}
+
+			void FindMultipleEnumeration (VariableReferenceNode startNode)
+			{
+				var vrg = GetAssignmentUsageGraph (startNode);
+				visitedNodes = new HashSet<VariableReferenceNode> ();
+				collectedNodes = new HashSet<VariableReferenceNode> ();
+
+				// degree of a node is the number of references that can be reached by the node
+				nodeDegree = new Dictionary<VariableReferenceNode, int> ();
+
+				foreach (var node in vrg) {
+					if (node.References.Count == 0 || !visitedNodes.Add (node))
+						continue;
+					ProcessNode (node);
+					if (nodeDegree [node] > 1)
+						collectedNodes.Add (node);
+				}
+				foreach (var node in collectedNodes)
+					AddIssues (node.References);
+			}
+
+			void ProcessNode (VariableReferenceNode node)
+			{
+				var degree = nodeDegree [node] = 0;
+				foreach (var nextNode in node.NextNodes) {
+					collectedNodes.Add (nextNode);
+					if (visitedNodes.Add (nextNode))
+						ProcessNode (nextNode);
+					degree = Math.Max (degree, nodeDegree [nextNode]);
+				}
+				nodeDegree [node] = degree + node.References.Count;
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/StaticFieldInGenericTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/StaticFieldInGenericTypeIssue.cs
new file mode 100644
index 0000000000..64951c640f
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/StaticFieldInGenericTypeIssue.cs
@@ -0,0 +1,107 @@
+//
+// StaticFieldInGenericTypeIssue.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Diagnostics.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Static field in generic type",
+	                  Description = "Warns about static fields in generic types.",
+	                  Category = IssueCategories.CodeQualityIssues,
+	                  Severity = Severity.Warning,
+	                  SuppressMessageCategory = "Microsoft.Design",
+	                  SuppressMessageCheckId  = "CA1000:DoNotDeclareStaticMembersOnGenericTypes",
+                      AnalysisDisableKeyword = "StaticFieldInGenericType"
+	                  )]
+	public class StaticFieldInGenericTypeIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<StaticFieldInGenericTypeIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+			}
+
+			IList<ITypeParameter> availableTypeParameters = new List<ITypeParameter>();
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				var typeResolveResult = ctx.Resolve(typeDeclaration);
+				var typeDefinition = typeResolveResult.Type.GetDefinition();
+				if (typeDefinition == null)
+					return;
+				var newTypeParameters = typeDefinition.TypeParameters;
+
+				var oldTypeParameters = availableTypeParameters; 
+				availableTypeParameters = Concat(availableTypeParameters, newTypeParameters);
+
+				base.VisitTypeDeclaration(typeDeclaration);
+
+				availableTypeParameters = oldTypeParameters;
+			}
+
+			static IList<ITypeParameter> Concat(params IList<ITypeParameter>[] lists)
+			{
+				return lists.SelectMany(l => l).ToList();
+			}
+
+			bool UsesAllTypeParameters(FieldDeclaration fieldDeclaration)
+			{
+				if (availableTypeParameters.Count == 0)
+					return true;
+
+				var fieldType = ctx.Resolve(fieldDeclaration.ReturnType).Type as ParameterizedType;
+				if (fieldType == null)
+					return false;
+
+				// Check that all current type parameters are used in the field type
+				var fieldTypeParameters = fieldType.TypeArguments;
+				foreach (var typeParameter in availableTypeParameters) {
+					if (!fieldTypeParameters.Contains(typeParameter))
+						return false;
+				}
+				return true;
+			}
+
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+				base.VisitFieldDeclaration(fieldDeclaration);
+				if (fieldDeclaration.Modifiers.HasFlag(Modifiers.Static) && !UsesAllTypeParameters(fieldDeclaration)) {
+					AddIssue(new CodeIssue(fieldDeclaration, ctx.TranslateString("Static field in generic type")));
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ThreadStaticAtInstanceFieldIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ThreadStaticAtInstanceFieldIssue.cs
new file mode 100644
index 0000000000..27fe952b88
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ThreadStaticAtInstanceFieldIssue.cs
@@ -0,0 +1,108 @@
+//
+// ThreadStaticAtInstanceFieldIssue.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+    [IssueDescription("[ThreadStatic] doesn't work with instance fields",
+                      Description = "[ThreadStatic] doesn't work with instance fields",
+	                  Category = IssueCategories.CodeQualityIssues,
+	                  Severity = Severity.Warning,
+                      AnalysisDisableKeyword = "ThreadStaticAtInstanceField")]
+	public class ThreadStaticAtInstanceFieldIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<ThreadStaticAtInstanceFieldIssue>
+		{
+			IType threadStaticAttribute;
+
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+				threadStaticAttribute = ctx.Compilation.FindType(typeof(ThreadStaticAttribute));
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+			}
+			
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+                if (fieldDeclaration.HasModifier(Modifiers.Static))
+                    return;
+
+                foreach (var attributeSection in fieldDeclaration.Attributes) {
+					int attributeCount = attributeSection.Attributes.Count;
+					foreach (var attribute in attributeSection.Attributes) {
+						var resolvedAttribute = ctx.Resolve(attribute.Type) as TypeResolveResult;
+						if (resolvedAttribute == null)
+							continue;
+						if (threadStaticAttribute.Equals(resolvedAttribute.Type)) {
+							string title = ctx.TranslateString("ThreadStatic does nothing on instance fields");
+							if (attributeCount == 1)
+								AddIssue(new CodeIssue(attributeSection, title, GetActions(attribute, attributeSection, fieldDeclaration)));
+							else
+								AddIssue(new CodeIssue(attribute, title, GetActions(attribute, attributeSection, fieldDeclaration)));
+						}
+					}
+				}
+			}
+
+			IEnumerable<CodeAction> GetActions(Attribute attribute, AttributeSection attributeSection, FieldDeclaration fieldDeclaration)
+			{
+				string removeAttributeMessage = ctx.TranslateString("Remove attribute");
+				yield return new CodeAction(removeAttributeMessage, script => {
+					if (attributeSection.Attributes.Count > 1) {
+						var newSection = new AttributeSection();
+						newSection.AttributeTarget = attributeSection.AttributeTarget;
+						foreach (var attr in attributeSection.Attributes) {
+							if (attr != attribute)
+								newSection.Attributes.Add((Attribute)attr.Clone());
+						}
+						script.Replace(attributeSection, newSection);
+					} else {
+						script.Remove(attributeSection);
+					}
+				}, attribute);
+
+				var makeStaticMessage = ctx.TranslateString("Make the field static");
+				yield return new CodeAction(makeStaticMessage, script => {
+					var newDeclaration = (FieldDeclaration)fieldDeclaration.Clone();
+					newDeclaration.Modifiers |= Modifiers.Static;
+					script.Replace(fieldDeclaration, newDeclaration);
+				}, fieldDeclaration.NameToken);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ValueParameterNotUsedIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ValueParameterNotUsedIssue.cs
new file mode 100644
index 0000000000..3efaf6d3e5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/ValueParameterNotUsedIssue.cs
@@ -0,0 +1,109 @@
+//
+// SetterDoesNotUseValueParameterTests.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Threading;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("'value' parameter not used",
+	       Description = "Warns about property or indexer setters and event adders or removers that do not use the value parameter.",
+	       Category = IssueCategories.CodeQualityIssues,
+	       Severity = Severity.Warning,
+           AnalysisDisableKeyword = "ValueParameterNotUsed")]
+	public class ValueParameterNotUsedIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context, this);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<ValueParameterNotUsedIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext context, ValueParameterNotUsedIssue inspector) : base (context)
+			{
+			}
+
+            public override void VisitAccessor(Accessor accessor)
+		    {
+		        if (accessor.Role == PropertyDeclaration.SetterRole) {
+                    FindIssuesInAccessor(accessor, ctx.TranslateString("The setter does not use the 'value' parameter"));
+                } else if (accessor.Role == CustomEventDeclaration.AddAccessorRole) {
+                    FindIssuesInAccessor(accessor, ctx.TranslateString("The add accessor does not use the 'value' parameter"));
+                } else if (accessor.Role == CustomEventDeclaration.RemoveAccessorRole) {
+                    FindIssuesInAccessor(accessor, ctx.TranslateString("The remove accessor does not use the 'value' parameter"));
+                }
+		    }
+
+		    public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
+		    {
+                if (eventDeclaration.AddAccessor.Body.Statements.Count == 0 && eventDeclaration.RemoveAccessor.Body.Statements.Count == 0)
+                    return;
+		        
+		        base.VisitCustomEventDeclaration(eventDeclaration);
+		    }
+
+		    void FindIssuesInAccessor(Accessor accessor, string accessorName)
+			{
+				var body = accessor.Body;
+				if (!IsEligible(body))
+					return;
+
+				var localResolveResult = ctx.GetResolverStateBefore(body)
+					.LookupSimpleNameOrTypeName("value", new List<IType>(), NameLookupMode.Expression) as LocalResolveResult; 
+				if (localResolveResult == null)
+					return;
+
+				bool referenceFound = false;
+				foreach (var result in ctx.FindReferences (body, localResolveResult.Variable)) {
+					var node = result.Node;
+					if (node.StartLocation >= body.StartLocation && node.EndLocation <= body.EndLocation) {
+						referenceFound = true;
+						break;
+					}
+				}
+
+				if(!referenceFound)
+					AddIssue(new CodeIssue(accessor.Keyword, accessorName));
+			}
+
+			static bool IsEligible(BlockStatement body)
+			{
+				if (body == null || body.IsNull)
+					return false;
+				if (body.Statements.FirstOrNullObject() is ThrowStatement)
+					return false;
+				return true;
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerErrors/ProhibitedModifiersIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerErrors/ProhibitedModifiersIssue.cs
new file mode 100644
index 0000000000..2b748c9f1e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerErrors/ProhibitedModifiersIssue.cs
@@ -0,0 +1,233 @@
+//
+// ProhibitedModifiersIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription(
+		"Checks for prohibited modifiers",
+		Description = "Checks for prohibited modifiers",
+		Category = IssueCategories.CompilerErrors,
+		Severity = Severity.Error)]
+	public class ProhibitedModifiersIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ProhibitedModifiersIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			readonly Stack<TypeDeclaration> curType = new Stack<TypeDeclaration> ();
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				curType.Push(typeDeclaration); 
+				base.VisitTypeDeclaration(typeDeclaration);
+				curType.Pop();
+			}
+
+			void AddStaticRequiredError (EntityDeclaration entity, AstNode node)
+			{
+				AddIssue(new CodeIssue(
+					node,
+					ctx.TranslateString("'static' modifier is required inside a static class"),
+					ctx.TranslateString("Add 'static' modifier"), 
+					s => {
+						s.ChangeModifier(entity, (entity.Modifiers & ~(Modifiers.Virtual | Modifiers.Override)) | Modifiers.Static);
+					}
+				));
+			}
+
+			void CheckStaticRequired(EntityDeclaration entity)
+			{
+				if (!curType.Peek().HasModifier(Modifiers.Static) || entity.HasModifier(Modifiers.Static) || entity.HasModifier(Modifiers.Const))
+					return;
+				var fd = entity as FieldDeclaration;
+				if (fd != null) {
+					foreach (var init in fd.Variables)
+						AddStaticRequiredError(entity, init.NameToken);
+					return;
+				}
+
+				var ed = entity as EventDeclaration;
+				if (ed != null) {
+					foreach (var init in ed.Variables)
+						AddStaticRequiredError(entity, init.NameToken);
+					return;
+				}
+
+				AddStaticRequiredError(entity, entity.NameToken);
+			}
+
+			void CheckVirtual(EntityDeclaration entity)
+			{
+				if (!curType.Peek().HasModifier(Modifiers.Static) && !curType.Peek().HasModifier(Modifiers.Sealed) && entity.HasModifier(Modifiers.Virtual)) {
+					if (!entity.HasModifier(Modifiers.Public) && !entity.HasModifier(Modifiers.Protected)  && !entity.HasModifier(Modifiers.Internal)) {
+						AddIssue(new CodeIssue(
+							entity.NameToken,
+							ctx.TranslateString("'virtual' members can't be private")
+						));
+						return;
+					}
+
+				}
+
+				if (entity.HasModifier(Modifiers.Sealed) && !entity.HasModifier(Modifiers.Override)) {
+					AddIssue(new CodeIssue(
+						entity.ModifierTokens.First(t => t.Modifier == Modifiers.Sealed),
+						ctx.TranslateString("'sealed' modifier is not usable without override"),
+						ctx.TranslateString("Remove 'sealed' modifier"), 
+						s => {
+							s.ChangeModifier(entity, entity.Modifiers & ~Modifiers.Sealed);
+						}
+					));
+
+				}
+
+				if (!curType.Peek().HasModifier(Modifiers.Sealed) || !entity.HasModifier(Modifiers.Virtual))
+					return;
+				AddIssue(new CodeIssue(
+					entity.ModifierTokens.First(t => t.Modifier == Modifiers.Virtual),
+					ctx.TranslateString("'virtual' modifier is not usable in a sealed class"),
+					ctx.TranslateString("Remove 'virtual' modifier"), 
+					s => s.ChangeModifier(entity, entity.Modifiers & ~Modifiers.Virtual)
+				));
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				CheckStaticRequired(methodDeclaration);
+				CheckVirtual(methodDeclaration);
+				if (methodDeclaration.IsExtensionMethod) {
+					var parent = methodDeclaration.Parent as TypeDeclaration;
+					if (parent != null && !parent.HasModifier(Modifiers.Static)) {
+						var actions = new List<CodeAction>();
+						var token = methodDeclaration.Parameters.First().FirstChild;
+						actions.Add(new CodeAction(
+							ctx.TranslateString("Make class 'static'"),
+							s => s.ChangeModifier(parent, (parent.Modifiers & ~Modifiers.Sealed) | Modifiers.Static),
+							token
+							));
+
+						actions.Add(new CodeAction(
+							ctx.TranslateString("Remove 'this'"),
+							s => s.ChangeModifier(methodDeclaration.Parameters.First(), ParameterModifier.None),
+							token
+						));
+
+						AddIssue(new CodeIssue(
+							token,
+							ctx.TranslateString("Extension methods are only allowed in static classes"),
+							actions
+						));
+					}
+				}
+
+				base.VisitMethodDeclaration(methodDeclaration);
+			}
+
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+				CheckStaticRequired(fieldDeclaration);
+				base.VisitFieldDeclaration(fieldDeclaration);
+			}
+
+			public override void VisitFixedFieldDeclaration(FixedFieldDeclaration fixedFieldDeclaration)
+			{
+				CheckStaticRequired(fixedFieldDeclaration);
+				base.VisitFixedFieldDeclaration(fixedFieldDeclaration);
+			}
+
+			public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
+			{
+				CheckStaticRequired(eventDeclaration);
+				base.VisitEventDeclaration(eventDeclaration);
+			}
+
+			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
+			{
+				CheckStaticRequired(eventDeclaration);
+				CheckVirtual(eventDeclaration);
+				base.VisitCustomEventDeclaration(eventDeclaration);
+			}
+
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+				CheckStaticRequired(constructorDeclaration);
+
+				if (constructorDeclaration.HasModifier(Modifiers.Static)) {
+					if ((constructorDeclaration.Modifiers & Modifiers.Static) != 0) {
+						foreach (var mod in constructorDeclaration.ModifierTokens) {
+							if (mod.Modifier == Modifiers.Static)
+								continue;
+							AddIssue(new CodeIssue(
+								mod,
+								ctx.TranslateString("Static constructors can't have any other modifier"),
+								ctx.TranslateString("Remove prohibited modifier"), 
+								s => {
+									s.ChangeModifier(constructorDeclaration, Modifiers.Static);
+								}
+							));
+						}
+					}
+				}
+				base.VisitConstructorDeclaration(constructorDeclaration);
+			}
+
+			public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
+			{
+				base.VisitDestructorDeclaration(destructorDeclaration);
+			}
+
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+				CheckStaticRequired(propertyDeclaration);
+				CheckVirtual(propertyDeclaration);
+				base.VisitPropertyDeclaration(propertyDeclaration);
+			}
+
+			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
+			{
+				CheckVirtual(indexerDeclaration);
+				base.VisitIndexerDeclaration(indexerDeclaration);
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				// SKIP
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerWarnings/CS0183ExpressionIsAlwaysOfProvidedTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerWarnings/CS0183ExpressionIsAlwaysOfProvidedTypeIssue.cs
new file mode 100644
index 0000000000..a4beadf815
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerWarnings/CS0183ExpressionIsAlwaysOfProvidedTypeIssue.cs
@@ -0,0 +1,88 @@
+// 
+// ExpressionIsAlwaysOfProvidedTypeIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("CS0183:Given expression is always of the provided type",
+		Description = "CS0183:Given expression is always of the provided type.",
+		Category = IssueCategories.CompilerWarnings,
+		Severity = Severity.Warning,
+		PragmaWarning = 183,
+		AnalysisDisableKeyword = "CSharpWarnings::CS0183"
+	)]
+	public class CS0183ExpressionIsAlwaysOfProvidedTypeIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<CS0183ExpressionIsAlwaysOfProvidedTypeIssue>
+		{
+			readonly CSharpConversions conversions;
+
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+				conversions = CSharpConversions.Get(ctx.Compilation);
+			}
+
+			public override void VisitIsExpression(IsExpression isExpression)
+			{
+				base.VisitIsExpression(isExpression);
+
+				var type = ctx.Resolve(isExpression.Expression).Type;
+				var providedType = ctx.ResolveType(isExpression.Type);
+
+				if (type.Kind == TypeKind.Unknown || providedType.Kind == TypeKind.Unknown)
+					return;
+//				var foundConversion = conversions.ImplicitConversion(type, providedType);
+				if (!IsValidReferenceOrBoxingConversion(type, providedType))
+					return;
+
+				var action = new CodeAction(
+					             ctx.TranslateString("Compare with 'null'"), 
+					             script => script.Replace(isExpression, new BinaryOperatorExpression(
+						             isExpression.Expression.Clone(), BinaryOperatorType.InEquality, new PrimitiveExpression(null))),
+					             isExpression
+				             );
+				AddIssue(new CodeIssue(isExpression, ctx.TranslateString("Given expression is always of the provided type. Consider comparing with 'null' instead"), new [] { action }));
+			}
+
+			bool IsValidReferenceOrBoxingConversion(IType fromType, IType toType)
+			{
+				Conversion c = conversions.ImplicitConversion(fromType, toType);
+				return c.IsValid && (c.IsIdentityConversion || c.IsReferenceConversion || c.IsBoxingConversion);
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerWarnings/CS1573ParameterHasNoMatchingParamTagIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerWarnings/CS1573ParameterHasNoMatchingParamTagIssue.cs
new file mode 100644
index 0000000000..47337d6e27
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerWarnings/CS1573ParameterHasNoMatchingParamTagIssue.cs
@@ -0,0 +1,282 @@
+//
+// CS1573ParameterHasNoMatchingParamTagIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using System.IO;
+using ICSharpCode.NRefactory.Documentation;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Parameter has no matching param tag in the XML comment",
+	                  Description = "Parameter has no matching param tag in the XML comment",
+	                  Category = IssueCategories.CompilerWarnings,
+	                  Severity = Severity.Warning,
+	                  PragmaWarning = 1573,
+	                  AnalysisDisableKeyword = "CSharpWarnings::CS1573")]
+	public class CS1573ParameterHasNoMatchingParamTagIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<CS1573ParameterHasNoMatchingParamTagIssue>
+		{
+			readonly List<Comment> storedXmlComment = new List<Comment>();
+
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			void InvalideXmlComments()
+			{
+				storedXmlComment.Clear();
+			}
+
+			public override void VisitComment(Comment comment)
+			{
+				base.VisitComment(comment);
+				if (comment.CommentType == CommentType.Documentation)
+					storedXmlComment.Add(comment);
+			}
+
+			public override void VisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration)
+			{
+				InvalideXmlComments();
+				base.VisitNamespaceDeclaration(namespaceDeclaration);
+			}
+
+			public override void VisitUsingDeclaration(UsingDeclaration usingDeclaration)
+			{
+				InvalideXmlComments();
+				base.VisitUsingDeclaration(usingDeclaration);
+			}
+
+			public override void VisitUsingAliasDeclaration(UsingAliasDeclaration usingDeclaration)
+			{
+				InvalideXmlComments();
+				base.VisitUsingAliasDeclaration(usingDeclaration);
+			}
+
+			public override void VisitExternAliasDeclaration(ExternAliasDeclaration externAliasDeclaration)
+			{
+				InvalideXmlComments();
+				base.VisitExternAliasDeclaration(externAliasDeclaration);
+			}
+
+			void AddXmlIssue(int line, int col, int length, string str)
+			{
+				var cmt = storedXmlComment [Math.Max(0, Math.Min(storedXmlComment.Count - 1, line))];
+
+				AddIssue(new CodeIssue(new TextLocation(cmt.StartLocation.Line, cmt.StartLocation.Column + 3 + col),
+				         new TextLocation(cmt.StartLocation.Line, cmt.StartLocation.Column + 3 + col + length),
+					str));
+			}
+
+			int SearchAttributeColumn(int x, int line)
+			{
+				var comment = storedXmlComment [Math.Max(0, Math.Min(storedXmlComment.Count - 1, line))];
+				var idx = comment.Content.IndexOfAny(new char[] { '"', '\'' }, x);
+				return idx < 0 ? x : idx + 1;
+			}
+
+			void CheckXmlDoc(AstNode node)
+			{
+				ResolveResult resolveResult = ctx.Resolve(node);
+				IEntity member = null;
+				if (resolveResult is TypeResolveResult)
+					member = resolveResult.Type.GetDefinition();
+				if (resolveResult is MemberResolveResult)
+					member = ((MemberResolveResult)resolveResult).Member;
+				var xml = new StringBuilder();
+				xml.AppendLine("<root>");
+				foreach (var cmt in storedXmlComment)
+					xml.AppendLine(cmt.Content);
+				xml.AppendLine("</root>");
+
+				List<Tuple<string, int>> parameters = new List<Tuple<string, int>>();
+
+				using (var reader = new XmlTextReader(new StringReader(xml.ToString()))) {
+					try {
+						while (reader.Read()) {
+							if (member == null)
+								continue;
+							if (reader.NodeType == XmlNodeType.Element) {
+								switch (reader.Name) {
+									case "param":
+										reader.MoveToFirstAttribute();
+										var line = reader.LineNumber;
+										var name = reader.GetAttribute("name");
+										if (name == null)
+											break;
+										parameters.Add(Tuple.Create(name, line));
+										break;
+
+								}
+							}
+						}
+					} catch (XmlException) {
+					}
+
+					if (storedXmlComment.Count > 0 && parameters.Count > 0) {
+						var pm = member as IParameterizedMember;
+						if (pm != null) {
+							for (int i = 0; i < pm.Parameters.Count; i++) {
+								var p = pm.Parameters [i];
+								if (!parameters.Any(tp => tp.Item1 == p.Name)) {
+									AstNode before = i < parameters.Count ? storedXmlComment [parameters [i].Item2 - 2] : null;
+									AstNode afterNode = before == null ? storedXmlComment [storedXmlComment.Count - 1] : null;
+									AddIssue(new CodeIssue(
+										GetParameterHighlightNode(node, i),
+										string.Format(ctx.TranslateString("Missing xml documentation for Parameter '{0}'"), p.Name),
+										string.Format(ctx.TranslateString("Create xml documentation for Parameter '{0}'"), p.Name),
+										script => {
+										if (before != null) {
+											script.InsertBefore(
+												before, 
+												new Comment(string.Format(" <param name = \"{0}\"></param>", p.Name), CommentType.Documentation)
+												);
+										} else {
+											script.InsertAfter(
+												afterNode, 
+												new Comment(string.Format(" <param name = \"{0}\"></param>", p.Name), CommentType.Documentation)
+												);
+										}
+										}));
+								}
+							}
+
+						}
+					}
+					storedXmlComment.Clear();
+				}
+			}
+
+			AstNode GetParameterHighlightNode(AstNode node, int i)
+			{
+				if (node is MethodDeclaration)
+					return ((MethodDeclaration)node).Parameters.ElementAt(i).NameToken;
+				if (node is ConstructorDeclaration)
+					return ((ConstructorDeclaration)node).Parameters.ElementAt(i).NameToken;
+				if (node is OperatorDeclaration)
+					return ((OperatorDeclaration)node).Parameters.ElementAt(i).NameToken;
+				if (node is IndexerDeclaration)
+					return ((IndexerDeclaration)node).Parameters.ElementAt(i).NameToken;
+				throw new InvalidOperationException("invalid parameterized node:" + node);
+			}
+
+			protected virtual void VisitXmlChildren(AstNode node)
+			{
+				AstNode next;
+				var child = node.FirstChild;
+				while (child != null && (child is Comment || child is PreProcessorDirective || child.Role == Roles.NewLine)) {
+					next = child.NextSibling;
+					child.AcceptVisitor(this);
+					child = next;
+				}
+
+				CheckXmlDoc(node);
+
+				for (; child != null; child = next) {
+					// Store next to allow the loop to continue
+					// if the visitor removes/replaces child.
+					next = child.NextSibling;
+					child.AcceptVisitor(this);
+				}
+				InvalideXmlComments();
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				VisitXmlChildren(typeDeclaration);
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				VisitXmlChildren(methodDeclaration);
+			}
+
+			public override void VisitDelegateDeclaration(DelegateDeclaration delegateDeclaration)
+			{
+				VisitXmlChildren(delegateDeclaration);
+			}
+
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+				VisitXmlChildren(constructorDeclaration);
+			}
+
+			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
+			{
+				VisitXmlChildren(eventDeclaration);
+			}
+
+			public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
+			{
+				VisitXmlChildren(destructorDeclaration);
+			}
+
+			public override void VisitEnumMemberDeclaration(EnumMemberDeclaration enumMemberDeclaration)
+			{
+				VisitXmlChildren(enumMemberDeclaration);
+			}
+
+			public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
+			{
+				VisitXmlChildren(eventDeclaration);
+			}
+
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+				VisitXmlChildren(fieldDeclaration);
+			}
+
+			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
+			{
+				VisitXmlChildren(indexerDeclaration);
+			}
+
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+				VisitXmlChildren(propertyDeclaration);
+			}
+
+			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
+			{
+				VisitXmlChildren(operatorDeclaration);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerWarnings/CS1717AssignmentMadeToSameVariableIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerWarnings/CS1717AssignmentMadeToSameVariableIssue.cs
new file mode 100644
index 0000000000..0b0c2e0c44
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerWarnings/CS1717AssignmentMadeToSameVariableIssue.cs
@@ -0,0 +1,103 @@
+// 
+// CS1717AssignmentMadeToSameVariableIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+    [IssueDescription("CS1717:Assignment made to same variable",
+					   Description = "CS1717:Assignment made to same variable.",
+					   Category = IssueCategories.CompilerWarnings,
+					   Severity = Severity.Warning,
+                       PragmaWarning = 1717,
+                       AnalysisDisableKeyword = "CSharpWarnings::CS1717")]
+    public class CS1717AssignmentMadeToSameVariableIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<CS1717AssignmentMadeToSameVariableIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitAssignmentExpression (AssignmentExpression assignmentExpression)
+			{
+				base.VisitAssignmentExpression (assignmentExpression);
+
+				if (assignmentExpression.Operator != AssignmentOperatorType.Assign)
+					return;
+				if (!(assignmentExpression.Left is IdentifierExpression) && 
+					!(assignmentExpression.Left is MemberReferenceExpression))
+					return;
+
+				var resolveResult = ctx.Resolve (assignmentExpression.Left);
+				var memberResolveResult = resolveResult as MemberResolveResult;
+				if (memberResolveResult != null) {
+					var memberResolveResult2 = ctx.Resolve (assignmentExpression.Right) as MemberResolveResult;
+					if (memberResolveResult2 == null || !AreEquivalent(memberResolveResult, memberResolveResult2))
+						return;
+				} else if (resolveResult is LocalResolveResult) {
+					if (!assignmentExpression.Left.Match (assignmentExpression.Right).Success)
+						return;
+				} else {
+					return;
+				}
+
+				AstNode node;
+				Action<Script> action;
+				if (assignmentExpression.Parent is ExpressionStatement) {
+					node = assignmentExpression.Parent;
+					action = script => script.Remove (assignmentExpression.Parent);
+				} else {
+					node = assignmentExpression;
+					action = script => script.Replace (assignmentExpression, assignmentExpression.Left.Clone ());
+				}
+				AddIssue (new CodeIssue(node, ctx.TranslateString ("CS1717:Assignment made to same variable"),
+					new [] { new CodeAction (ctx.TranslateString ("Remove assignment"), action, node) })
+					{ IssueMarker = IssueMarker.GrayOut }
+				);
+			}
+
+			static bool AreEquivalent(ResolveResult first, ResolveResult second)
+			{
+				var firstPath = AccessPath.FromResolveResult(first);
+				var secondPath = AccessPath.FromResolveResult(second);
+				return firstPath != null && firstPath.Equals(secondPath) && !firstPath.MemberPath.Any(m => !(m is IField));
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerWarnings/UnassignedReadonlyFieldIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerWarnings/UnassignedReadonlyFieldIssue.cs
new file mode 100644
index 0000000000..3c61cc2d4c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CompilerWarnings/UnassignedReadonlyFieldIssue.cs
@@ -0,0 +1,132 @@
+//
+// UnassignedReadonlyFieldIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+using System.Linq;
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Unassigned readonly field",
+	                  Description = "Unassigned readonly field",
+	                  Category = IssueCategories.CompilerWarnings,
+	                  Severity = Severity.Warning,
+	                  PragmaWarning = 649,
+	                  AnalysisDisableKeyword = "UnassignedReadonlyField.Compiler")]
+	public class UnassignedReadonlyFieldIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<UnassignedReadonlyFieldIssue>
+		{
+			readonly Stack<List<Tuple<VariableInitializer, IVariable>>> fieldStack = new Stack<List<Tuple<VariableInitializer, IVariable>>>();
+
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+			}
+
+			void Collect()
+			{
+				foreach (var varDecl in fieldStack.Peek()) {
+					var resolveResult = ctx.Resolve(varDecl.Item1) as MemberResolveResult;
+					if (resolveResult == null || resolveResult.IsError)
+						continue;
+					AddIssue(new CodeIssue(
+						varDecl.Item1.NameToken,
+						string.Format(ctx.TranslateString("Readonly field '{0}' is never assigned"), varDecl.Item1.Name),
+						ctx.TranslateString("Initialize field from constructor parameter"),
+						script => {
+						script.InsertWithCursor(
+							ctx.TranslateString("Create constructor"),
+							resolveResult.Member.DeclaringTypeDefinition,
+							(s, c) => {
+							return new ConstructorDeclaration {
+								Name = resolveResult.Member.DeclaringTypeDefinition.Name,
+								Modifiers = Modifiers.Public,
+								Body = new BlockStatement {
+										new AssignmentExpression(
+											new MemberReferenceExpression(new ThisReferenceExpression(), varDecl.Item1.Name),
+											new IdentifierExpression(varDecl.Item1.Name)
+										)
+								},
+								Parameters = {
+									new ParameterDeclaration(c.CreateShortType(resolveResult.Type), varDecl.Item1.Name)
+								}
+							};
+						}
+						);
+					}
+					));
+				}
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				var list = new List<Tuple<VariableInitializer, IVariable>>();
+				fieldStack.Push(list);
+				foreach (var fieldDeclaration in ConvertToConstantIssue.CollectFields(this, typeDeclaration)) {
+					if (!fieldDeclaration.HasModifier(Modifiers.Readonly))
+						continue;
+//					var rr = ctx.Resolve(fieldDeclaration.ReturnType);
+				
+					if (fieldDeclaration.Variables.Count() > 1)
+						continue;
+					if (!fieldDeclaration.Variables.First().Initializer.IsNull)
+						continue;
+					var variable = fieldDeclaration.Variables.First();
+					var mr = ctx.Resolve(variable) as MemberResolveResult;
+					if (mr == null)
+						continue;
+					list.Add(Tuple.Create(variable, mr.Member as IVariable)); 
+				}
+				base.VisitTypeDeclaration(typeDeclaration);
+				Collect();
+				fieldStack.Pop();
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				var assignmentAnalysis = new ConvertToConstantIssue.VariableUsageAnalyzation(ctx);
+				var newVars = new List<Tuple<VariableInitializer, IVariable>>();
+				blockStatement.AcceptVisitor(assignmentAnalysis); 
+				foreach (var variable in fieldStack.Pop()) {
+					if (assignmentAnalysis.GetStatus(variable.Item2) == VariableState.Changed)
+						continue;
+					newVars.Add(variable);
+				}
+				fieldStack.Push(newVars);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/AffectedEntity.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/AffectedEntity.cs
similarity index 100%
rename from src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/AffectedEntity.cs
rename to src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/AffectedEntity.cs
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/DefaultRules.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/DefaultRules.cs
similarity index 100%
rename from src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/DefaultRules.cs
rename to src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/DefaultRules.cs
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/InconsistentNamingIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/InconsistentNamingIssue.cs
new file mode 100644
index 0000000000..407e8fbff3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/InconsistentNamingIssue.cs
@@ -0,0 +1,374 @@
+// 
+// InconsistentNamingIssue.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Inconsistent Naming",
+	       Description = "Name doesn't match the defined style for this entity.",
+           Category = IssueCategories.ConstraintViolations,
+	       Severity = Severity.Warning,
+           AnalysisDisableKeyword = "InconsistentNaming")]
+	public class InconsistentNamingIssue : CodeIssueProvider
+	{
+		public override IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context, string subIssue)
+		{
+			var visitor = new GatherVisitor(context);
+			context.RootNode.AcceptVisitor(visitor);
+			return visitor.FoundIssues;
+		}
+
+		class GatherVisitor : GatherVisitorBase<InconsistentNamingIssue>
+		{
+			readonly NamingConventionService service;
+
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+				service = (NamingConventionService)ctx.GetService (typeof (NamingConventionService));
+			}
+
+			void CheckName(TypeDeclaration node, AffectedEntity entity, Identifier identifier, Modifiers accessibilty)
+			{
+				TypeResolveResult resolveResult = ctx.Resolve(node) as TypeResolveResult;
+				if (resolveResult == null)
+					return;
+				var type = resolveResult.Type;
+				if (type.DirectBaseTypes.Any(t => t.FullName == "System.Attribute")) {
+					if (CheckNamedResolveResult(resolveResult, node, AffectedEntity.CustomAttributes, identifier, accessibilty)) {
+						return;
+					}
+				} else if (type.DirectBaseTypes.Any(t => t.FullName == "System.EventArgs")) {
+					if (CheckNamedResolveResult(resolveResult, node, AffectedEntity.CustomEventArgs, identifier, accessibilty)) {
+						return;
+					}
+				} else if (type.DirectBaseTypes.Any(t => t.FullName == "System.Exception")) {
+					if (CheckNamedResolveResult(resolveResult, node, AffectedEntity.CustomExceptions, identifier, accessibilty)) {
+						return;
+					}
+				}
+
+				var typeDef = type.GetDefinition();
+				if (typeDef != null && typeDef.Attributes.Any(attr => attr.AttributeType.FullName == "NUnit.Framework.TestFixtureAttribute")) {
+					if (CheckNamedResolveResult(resolveResult, node, AffectedEntity.TestType, identifier, accessibilty)) {
+						return;
+					}
+				}
+
+				CheckNamedResolveResult(resolveResult, node, entity, identifier, accessibilty);
+			}
+
+			void CheckName(MethodDeclaration node, AffectedEntity entity, Identifier identifier, Modifiers accessibilty)
+			{
+				ResolveResult resolveResult = null;
+				if (node != null && node.Attributes.Any ())
+					resolveResult = ctx.Resolve(node);
+				
+				if (resolveResult is MemberResolveResult) {
+					var member = ((MemberResolveResult)resolveResult).Member;
+					if (member.SymbolKind == SymbolKind.Method && member.Attributes.Any(attr => attr.AttributeType.FullName == "NUnit.Framework.TestAttribute")) {
+						if (CheckNamedResolveResult(resolveResult, node, AffectedEntity.TestMethod, identifier, accessibilty)) {
+							return;
+						}
+					}
+				}
+
+				CheckNamedResolveResult(resolveResult, node, entity, identifier, accessibilty);
+			}
+
+			void CheckName(AstNode node, AffectedEntity entity, Identifier identifier, Modifiers accessibilty)
+			{
+				CheckNamedResolveResult(null, node, entity, identifier, accessibilty);
+			}
+
+			bool CheckNamedResolveResult(ResolveResult resolveResult, AstNode node, AffectedEntity entity, Identifier identifier, Modifiers accessibilty)
+			{
+				bool wasHandled = false;
+				foreach (var rule in service.Rules) {
+					if (!rule.AffectedEntity.HasFlag(entity)) {
+						continue;
+					}
+					if (!rule.VisibilityMask.HasFlag(accessibilty)) {
+						continue;
+					}
+					if (!rule.IncludeInstanceMembers || !rule.IncludeStaticEntities) {
+						EntityDeclaration typeSystemEntity;
+						if (node is VariableInitializer) {
+							typeSystemEntity = node.Parent as EntityDeclaration;
+						} else {
+							typeSystemEntity = node as EntityDeclaration;
+						}
+						if (!rule.IncludeInstanceMembers) {
+							if (typeSystemEntity == null || !typeSystemEntity.HasModifier (Modifiers.Static) || typeSystemEntity.HasModifier (Modifiers.Sealed)) {
+								continue;
+							}
+						}
+						if (!rule.IncludeStaticEntities) {
+							if (typeSystemEntity == null || typeSystemEntity.HasModifier (Modifiers.Static) || typeSystemEntity.HasModifier (Modifiers.Sealed)) {
+								continue;
+							}
+						}
+					}
+
+					wasHandled = true;
+					if (!rule.IsValid(identifier.Name)) {
+						IList<string> suggestedNames;
+						var msg = rule.GetErrorMessage(ctx, identifier.Name, out suggestedNames);
+						var actions = new List<CodeAction>(suggestedNames.Select(n => new CodeAction(string.Format(ctx.TranslateString("Rename to '{0}'"), n), (Script script) => {
+							if (resolveResult == null)
+								resolveResult = ctx.Resolve (node);
+							if (resolveResult is MemberResolveResult) {
+								script.Rename(((MemberResolveResult)resolveResult).Member, n);
+							} else if (resolveResult is TypeResolveResult) {
+								var def = resolveResult.Type.GetDefinition();
+								if (def != null) {
+									script.Rename(def, n);
+								} else if (resolveResult.Type.Kind == TypeKind.TypeParameter) {
+									script.Rename((ITypeParameter)resolveResult.Type, n);
+								}
+							} else if (resolveResult is LocalResolveResult) {
+								script.Rename(((LocalResolveResult)resolveResult).Variable, n);
+							} else if (resolveResult is NamespaceResolveResult) {
+								script.Rename(((NamespaceResolveResult)resolveResult).Namespace, n);
+							} else { 
+								script.Replace(identifier, Identifier.Create(n));
+							}
+						}, identifier)));
+
+						if (entity != AffectedEntity.Label) {
+							actions.Add(new CodeAction(string.Format(ctx.TranslateString("Rename '{0}'..."), identifier.Name), (Script script) => {
+								if (resolveResult == null)
+									resolveResult = ctx.Resolve (node);
+								if (resolveResult is MemberResolveResult) {
+									script.Rename(((MemberResolveResult)resolveResult).Member);
+								} else if (resolveResult is TypeResolveResult) {
+									var def = resolveResult.Type.GetDefinition();
+									if (def != null) {
+										script.Rename(def);
+									} else if (resolveResult.Type.Kind == TypeKind.TypeParameter) {
+										script.Rename((ITypeParameter)resolveResult.Type);
+									}
+								} else if (resolveResult is LocalResolveResult) {
+									script.Rename(((LocalResolveResult)resolveResult).Variable);
+								} else if (resolveResult is NamespaceResolveResult) {
+									script.Rename(((NamespaceResolveResult)resolveResult).Namespace);
+								}
+							}, identifier));
+						}
+
+						AddIssue(new CodeIssue(identifier, msg, actions));
+					}
+				}
+				return wasHandled;
+			}
+
+			public override void VisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration)
+			{
+				base.VisitNamespaceDeclaration(namespaceDeclaration);
+				var type = namespaceDeclaration.NamespaceName;
+				while (type is MemberType) {
+					var mt = (MemberType)type;
+					CheckNamedResolveResult(null, namespaceDeclaration, AffectedEntity.Namespace, mt.MemberNameToken, Modifiers.None);
+					type = mt.Target;
+				}
+				if (type is SimpleType)
+					CheckNamedResolveResult(null, namespaceDeclaration, AffectedEntity.Namespace, ((SimpleType)type).IdentifierToken, Modifiers.None);
+			}
+
+			Modifiers GetAccessibiltiy(EntityDeclaration decl, Modifiers defaultModifier)
+			{
+				var accessibility = (decl.Modifiers & Modifiers.VisibilityMask);
+				if (accessibility == Modifiers.None) {
+					return defaultModifier;
+				}
+				return accessibility;
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				base.VisitTypeDeclaration(typeDeclaration);
+				AffectedEntity entity;
+				switch (typeDeclaration.ClassType) {
+					case ClassType.Class:
+						entity = AffectedEntity.Class;
+						break;
+					case ClassType.Struct:
+						entity = AffectedEntity.Struct;
+						break;
+					case ClassType.Interface:
+						entity = AffectedEntity.Interface;
+						break;
+					case ClassType.Enum:
+						entity = AffectedEntity.Enum;
+						break;
+					default:
+						throw new System.ArgumentOutOfRangeException();
+				}
+				CheckName(typeDeclaration, entity, typeDeclaration.NameToken, GetAccessibiltiy(typeDeclaration, typeDeclaration.Parent is TypeDeclaration ? Modifiers.Private : Modifiers.Internal));
+			}
+
+			public override void VisitDelegateDeclaration(DelegateDeclaration delegateDeclaration)
+			{
+				base.VisitDelegateDeclaration(delegateDeclaration);
+				CheckName(delegateDeclaration, AffectedEntity.Delegate, delegateDeclaration.NameToken, GetAccessibiltiy(delegateDeclaration, delegateDeclaration.Parent is TypeDeclaration ? Modifiers.Private : Modifiers.Internal));
+			}
+
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+				if (propertyDeclaration.Modifiers.HasFlag (Modifiers.Override))
+					return;
+				base.VisitPropertyDeclaration(propertyDeclaration);
+				CheckName(propertyDeclaration, AffectedEntity.Property, propertyDeclaration.NameToken, GetAccessibiltiy(propertyDeclaration, Modifiers.Private));
+			}
+
+			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
+			{
+				if (indexerDeclaration.Modifiers.HasFlag(Modifiers.Override)) {
+					var rr = ctx.Resolve (indexerDeclaration) as MemberResolveResult;
+					if (rr == null)
+						return;
+					var baseType = rr.Member.DeclaringType.DirectBaseTypes.FirstOrDefault (t => t.Kind != TypeKind.Interface);
+					var method = baseType != null ? baseType.GetProperties (m => m.IsIndexer && m.IsOverridable && m.Parameters.Count == indexerDeclaration.Parameters.Count).FirstOrDefault () : null;
+					if (method == null)
+						return;
+					int i = 0;
+					foreach (var par in indexerDeclaration.Parameters) {
+						if (method.Parameters[i++].Name != par.Name) {
+							par.AcceptVisitor (this);
+						}
+					}
+					return;
+				}
+				base.VisitIndexerDeclaration(indexerDeclaration);
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				if (methodDeclaration.Modifiers.HasFlag(Modifiers.Override)) {
+					var rr = ctx.Resolve (methodDeclaration) as MemberResolveResult;
+					if (rr == null)
+						return;
+					var baseType = rr.Member.DeclaringType.DirectBaseTypes.FirstOrDefault (t => t.Kind != TypeKind.Interface);
+					var method = baseType != null ? baseType.GetMethods (m => m.Name == rr.Member.Name && m.IsOverridable && m.Parameters.Count == methodDeclaration.Parameters.Count).FirstOrDefault () : null;
+					if (method == null)
+						return;
+					int i = 0;
+					foreach (var par in methodDeclaration.Parameters) {
+						if (method.Parameters[i++].Name != par.Name) {
+							par.AcceptVisitor (this);
+						}
+					}
+
+					return;
+				}
+				base.VisitMethodDeclaration(methodDeclaration);
+
+				CheckName(methodDeclaration, methodDeclaration.Modifiers.HasFlag(Modifiers.Async) ? AffectedEntity.AsyncMethod : AffectedEntity.Method, methodDeclaration.NameToken, GetAccessibiltiy(methodDeclaration, Modifiers.Private));
+			}
+
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+				base.VisitFieldDeclaration(fieldDeclaration);
+				var entity = AffectedEntity.Field;
+				if (fieldDeclaration.Modifiers.HasFlag(Modifiers.Const)) {
+					entity = AffectedEntity.ConstantField;
+				} else if (fieldDeclaration.Modifiers.HasFlag(Modifiers.Readonly)) {
+					entity = AffectedEntity.ReadonlyField;
+				}
+				foreach (var init in fieldDeclaration.Variables) {
+					CheckName(init, entity, init.NameToken, GetAccessibiltiy(fieldDeclaration, Modifiers.Private));
+				}
+			}
+
+			public override void VisitFixedFieldDeclaration(FixedFieldDeclaration fixedFieldDeclaration)
+			{
+				base.VisitFixedFieldDeclaration(fixedFieldDeclaration);
+				var entity = AffectedEntity.Field;
+				if (fixedFieldDeclaration.Modifiers.HasFlag(Modifiers.Const)) {
+					entity = AffectedEntity.ConstantField;
+				} else if (fixedFieldDeclaration.Modifiers.HasFlag(Modifiers.Readonly)) {
+					entity = AffectedEntity.ReadonlyField;
+				}
+				CheckName(fixedFieldDeclaration, entity, fixedFieldDeclaration.NameToken, GetAccessibiltiy(fixedFieldDeclaration, Modifiers.Private));
+			}
+
+			public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
+			{
+				base.VisitEventDeclaration(eventDeclaration);
+				foreach (var init in eventDeclaration.Variables) {
+					CheckName(init, AffectedEntity.Event, init.NameToken, GetAccessibiltiy(eventDeclaration, Modifiers.Private));
+				}
+			}
+
+			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
+			{
+				if (eventDeclaration.Modifiers.HasFlag (Modifiers.Override))
+					return;
+				base.VisitCustomEventDeclaration(eventDeclaration);
+				CheckName(eventDeclaration, AffectedEntity.Event, eventDeclaration.NameToken, GetAccessibiltiy(eventDeclaration, Modifiers.Private));
+			}
+
+			public override void VisitEnumMemberDeclaration(EnumMemberDeclaration enumMemberDeclaration)
+			{
+				base.VisitEnumMemberDeclaration(enumMemberDeclaration);
+				CheckName(enumMemberDeclaration, AffectedEntity.EnumMember, enumMemberDeclaration.NameToken, GetAccessibiltiy(enumMemberDeclaration, Modifiers.Private));
+			}
+
+			public override void VisitParameterDeclaration(ParameterDeclaration parameterDeclaration)
+			{
+				base.VisitParameterDeclaration(parameterDeclaration);
+				CheckNamedResolveResult(null, parameterDeclaration, parameterDeclaration.Parent is LambdaExpression ? AffectedEntity.LambdaParameter : AffectedEntity.Parameter, parameterDeclaration.NameToken, Modifiers.None);
+			}
+
+			public override void VisitTypeParameterDeclaration(TypeParameterDeclaration typeParameterDeclaration)
+			{
+				base.VisitTypeParameterDeclaration(typeParameterDeclaration);
+				CheckNamedResolveResult(null, typeParameterDeclaration, AffectedEntity.TypeParameter, typeParameterDeclaration.NameToken, Modifiers.None);
+			}
+
+			public override void VisitVariableDeclarationStatement(VariableDeclarationStatement variableDeclarationStatement)
+			{
+				base.VisitVariableDeclarationStatement(variableDeclarationStatement);
+				var entity = variableDeclarationStatement.Modifiers.HasFlag(Modifiers.Const) ? AffectedEntity.LocalConstant : AffectedEntity.LocalVariable;
+				foreach (var init in variableDeclarationStatement.Variables) {
+					CheckNamedResolveResult(null, init, entity, init.NameToken, Modifiers.None);
+				}
+			}
+
+			public override void VisitLabelStatement(LabelStatement labelStatement)
+			{
+				base.VisitLabelStatement(labelStatement);
+				CheckNamedResolveResult(null, labelStatement, AffectedEntity.Label, labelStatement.LabelToken, Modifiers.None);
+			}
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/NamingConventionService.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/NamingConventionService.cs
similarity index 100%
rename from src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/NamingConventionService.cs
rename to src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/NamingConventionService.cs
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/NamingRule.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/NamingRule.cs
new file mode 100644
index 0000000000..5b087bf7b6
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/NamingRule.cs
@@ -0,0 +1,709 @@
+// 
+// NamingRule.cs
+//  
+// Author:
+//       Michael Hutchinson <mhutch@xamarin.com>
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Text;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	public class NamingRule : IEquatable<NamingRule>
+	{
+		public string Name { get; set; }
+
+		/// <summary>
+		/// If set, identifiers are required to be prefixed with one of these values.
+		/// </summary>
+		public string[] RequiredPrefixes { get; set; }
+
+		/// <summary>
+		/// If set, identifiers are allowed to be prefixed with one of these values.
+		/// </summary>
+		public string[] AllowedPrefixes { get; set; }
+
+		/// <summary>
+		/// If set, identifiers are required to be suffixed with one of these values.
+		/// </summary>
+		public string[] RequiredSuffixes { get; set; }
+
+		/// <summary>
+		/// If set, identifiers cannot be prefixed by any of these values.
+		/// </summary>
+		public string[] ForbiddenPrefixes { get; set; }
+
+		/// <summary>
+		/// If set, identifiers cannot be suffixed by with any of these values.
+		/// </summary
+		public string[] ForbiddenSuffixes { get; set; }
+
+		/// <summary>
+		/// Gets or sets the affected entity.
+		/// </summary>
+		public AffectedEntity AffectedEntity { get; set; }
+
+		/// <summary>
+		/// Gets or sets the modifiers mask
+		/// </summary>
+		public Modifiers VisibilityMask { get; set; }
+
+		/// <summary>
+		/// The way that the identifier is cased and that words are separated.
+		/// </summary>
+		public NamingStyle NamingStyle { get; set; }
+
+		public bool IncludeStaticEntities { get; set; }
+
+		public bool IncludeInstanceMembers { get; set; }
+
+		public bool IsValid(string name)
+		{
+			string id = name;
+			bool foundPrefix = false;
+			if (RequiredPrefixes != null && RequiredPrefixes.Length > 0) {
+				var prefix = RequiredPrefixes.FirstOrDefault(p => id.StartsWith(p, StringComparison.Ordinal));
+				if (prefix == null) {
+					return false;
+				}
+				id = id.Substring(prefix.Length);
+				foundPrefix = true;
+			}
+			
+			if (!foundPrefix && AllowedPrefixes != null && AllowedPrefixes.Length > 0) {
+				var prefix = AllowedPrefixes.FirstOrDefault(p => id.StartsWith(p, StringComparison.Ordinal));
+				if (prefix != null) {
+					id = id.Substring(prefix.Length);
+					foundPrefix = true;
+				}
+			}
+			
+			if (!foundPrefix && ForbiddenPrefixes != null && ForbiddenPrefixes.Length > 0) {
+				if (ForbiddenPrefixes.Any(p => id.StartsWith(p, StringComparison.Ordinal))) {
+					return false;
+				}
+			}
+			
+			if (RequiredSuffixes != null && RequiredSuffixes.Length > 0) {
+				var suffix = RequiredSuffixes.FirstOrDefault(s => id.EndsWith(s, StringComparison.Ordinal));
+				if (suffix == null) {
+					return false;
+				}
+				id = id.Substring(0, id.Length - suffix.Length);
+			} else if (ForbiddenSuffixes != null && ForbiddenSuffixes.Length > 0) {
+				if (ForbiddenSuffixes.Any(p => id.EndsWith(p, StringComparison.Ordinal))) {
+					return false;
+				}
+			}
+			
+			switch (NamingStyle) {
+				case NamingStyle.AllLower:
+					for (int i = 0; i < id.Length; i++) {
+						char ch = id [i];
+						if (ch == '_' && !HandleUnderscore(UnderscoreHandling.Allow, id, ref i))
+							return false;
+						if (char.IsLetter(ch) && char.IsUpper(ch))
+							return false;
+					}
+					return true;
+				case NamingStyle.AllUpper:
+					for (int i = 0; i < id.Length; i++) {
+						char ch = id [i];
+						if (ch == '_' && !HandleUnderscore(UnderscoreHandling.Allow, id, ref i))
+							return false;
+						if (char.IsLetter(ch) && char.IsLower(ch))
+							return false;
+					}
+					return true;
+				case NamingStyle.CamelCase:
+					if (id.Length > 0) {
+						if (char.IsUpper(id [0]) || id [0] == '_')
+							return false;
+						for (int i = 1; i < id.Length; i++) {
+							char ch = id [i];
+							if (ch == '_' && !HandleUnderscore(UnderscoreHandling.Forbid, id, ref i))
+								return false;
+						}
+					}
+					return true;
+				case NamingStyle.CamelCaseWithLowerLetterUnderscore:
+					if (id.Length > 0) {
+						if (char.IsUpper(id [0]) || id [0] == '_')
+							return false;
+						for (int i = 1; i < id.Length; i++) {
+							char ch = id [i];
+							if (ch == '_' && !HandleUnderscore(UnderscoreHandling.AllowWithLowerStartingLetter, id, ref i))
+								return false;
+						}
+					}
+					return true;
+
+				case NamingStyle.CamelCaseWithUpperLetterUnderscore:
+					if (id.Length > 0) {
+						if (char.IsUpper(id [0]) || id [0] == '_')
+							return false;
+						for (int i = 1; i < id.Length; i++) {
+							char ch = id [i];
+							if (ch == '_' && !HandleUnderscore(UnderscoreHandling.AllowWithUpperStartingLetter, id, ref i))
+								return false;
+						}
+					}
+					return true;
+
+				case NamingStyle.PascalCase:
+					if (id.Length > 0) {
+						if (char.IsLower(id [0]) || id [0] == '_')
+							return false;
+						for (int i = 1; i < id.Length; i++) {
+							char ch = id [i];
+							if (ch == '_' && !HandleUnderscore(UnderscoreHandling.Forbid, id, ref i))
+								return false;
+						}
+					}
+					return true;
+				case NamingStyle.PascalCaseWithLowerLetterUnderscore:
+					if (id.Length > 0) {
+						if (char.IsLower(id [0]) || id [0] == '_')
+							return false;
+						for (int i = 1; i < id.Length; i++) {
+							char ch = id [i];
+							if (ch == '_' && !HandleUnderscore(UnderscoreHandling.AllowWithLowerStartingLetter, id, ref i))
+								return false;
+						}
+					}
+					return true;
+				case NamingStyle.PascalCaseWithUpperLetterUnderscore:
+					if (id.Length > 0) {
+						if (char.IsLower(id [0]) || id [0] == '_')
+							return false;
+						for (int i = 1; i < id.Length; i++) {
+							char ch = id [i];
+							if (ch == '_' && !HandleUnderscore(UnderscoreHandling.AllowWithUpperStartingLetter, id, ref i))
+								return false;
+						}
+					}
+					return true;
+				case NamingStyle.FirstUpper:
+					if (id.Length > 0) {
+						if (char.IsLower(id [0]) || id [0] == '_')
+							return false;
+
+						for (int i = 1; i < id.Length; i++) {
+							char ch = id [i];
+							if (ch == '_' && !HandleUnderscore(UnderscoreHandling.Allow, id, ref i))
+								return false;
+							if (char.IsLetter(ch) && char.IsUpper(ch))
+								return false;
+						}
+					}
+					return true;
+			}
+			return true;
+		}
+
+		public NamingRule(AffectedEntity affectedEntity)
+		{
+			AffectedEntity = affectedEntity;
+			VisibilityMask = Modifiers.VisibilityMask;
+			IncludeStaticEntities = true;
+			IncludeInstanceMembers = true;
+		}
+
+		static bool CheckUnderscore(string id, UnderscoreHandling handling)
+		{
+			for (int i = 1; i < id.Length; i++) {
+				char ch = id [i];
+				if (ch == '_' && !HandleUnderscore(handling, id, ref i))
+					return false;
+			}
+			return true;
+		}
+
+		enum UnderscoreHandling {
+			Forbid,
+			Allow,
+			AllowWithLowerStartingLetter,
+			AllowWithUpperStartingLetter
+		}
+
+		static bool HandleUnderscore(UnderscoreHandling handling, string id, ref int i)
+		{
+			switch (handling) {
+				case UnderscoreHandling.Forbid:
+					if (i + 1 < id.Length) {
+						char ch = id [i + 1];
+						if (char.IsDigit(ch)) {
+							i++;
+							return true;
+						}
+					}
+					return false;
+				case UnderscoreHandling.Allow:
+					return true;
+				case UnderscoreHandling.AllowWithLowerStartingLetter:
+					if (i + 1 < id.Length) {
+						char ch = id [i + 1];
+						if (char.IsLetter(ch) && !char.IsLower(ch) || ch =='_')
+							return false;
+						i++;
+					}
+					return true;
+				case UnderscoreHandling.AllowWithUpperStartingLetter:
+					if (i + 1 < id.Length) {
+						char ch = id [i + 1];
+						if (char.IsLetter(ch) && !char.IsUpper(ch) || ch =='_')
+							return false;
+						i++;
+					}
+					return true;
+				default:
+					throw new ArgumentOutOfRangeException();
+			}
+		}
+
+		/// <summary>
+		/// Applies a suffix to a name and tries to reuse the suffix of the suffix.
+		/// MyArgs + EventArgs -> MyEventArgs instead of MyArgsEventArgs
+		/// </summary>
+		static string ApplySuffix(string name, string suffix)
+		{
+			var words = WordParser.BreakWords(suffix);
+
+			bool found = false;
+			for (int j = words.Count - 1; j >= 0; j--) {
+				if (name.EndsWith(words[j], StringComparison.Ordinal)) {
+					name = name.Substring(0, name.Length - words[j].Length);
+					found = true;
+				} else {
+					if (found)
+						return name + string.Join("", words.ToArray(), j, words.Count - j);
+					break;
+				}
+			}
+			return name + suffix;
+		}
+	
+		public string GetErrorMessage(BaseRefactoringContext ctx, string name, out IList<string> suggestedNames)
+		{
+			suggestedNames = new List<string>();
+			string id = name;
+			
+			string errorMessage = null;
+			
+			bool missingRequiredPrefix = false;
+			bool missingRequiredSuffix = false;
+			string requiredPrefix = null;
+			string allowedPrefix = null;
+			string suffix = null;
+			
+			if (AllowedPrefixes != null && AllowedPrefixes.Length > 0) {
+				allowedPrefix = AllowedPrefixes.FirstOrDefault(p => id.StartsWith(p, StringComparison.Ordinal));
+				if (allowedPrefix != null)
+					id = id.Substring(allowedPrefix.Length);
+
+			}
+
+			if (RequiredPrefixes != null && RequiredPrefixes.Length > 0) {
+				requiredPrefix = RequiredPrefixes.FirstOrDefault(p => id.StartsWith(p, StringComparison.Ordinal));
+				if (requiredPrefix == null) {
+					errorMessage = string.Format(ctx.TranslateString("Name should have prefix '{0}'. (Rule '{1}')."), RequiredPrefixes [0], Name);
+					missingRequiredPrefix = true;
+				} else {
+					id = id.Substring(requiredPrefix.Length);
+				}
+			} else if (ForbiddenPrefixes != null && ForbiddenPrefixes.Length > 0) {
+				requiredPrefix = ForbiddenPrefixes.FirstOrDefault(p => id.StartsWith(p, StringComparison.Ordinal));
+				if (requiredPrefix != null) {
+					errorMessage = string.Format(ctx.TranslateString("Name has forbidden prefix '{0}'. (Rule '{1}')"), requiredPrefix, Name);
+					id = id.Substring(requiredPrefix.Length);
+				}
+			}
+			
+			if (RequiredSuffixes != null && RequiredSuffixes.Length > 0) {
+				suffix = RequiredSuffixes.FirstOrDefault(s => id.EndsWith(s, StringComparison.Ordinal));
+				if (suffix == null) {
+					errorMessage = string.Format(ctx.TranslateString("Name should have suffix '{0}'. (Rule '{1}')"), RequiredSuffixes [0], Name);
+					missingRequiredSuffix = true;
+				} else {
+					id = id.Substring(0, id.Length - suffix.Length);
+				}
+			} else if (ForbiddenSuffixes != null && ForbiddenSuffixes.Length > 0) {
+				suffix = ForbiddenSuffixes.FirstOrDefault(p => id.EndsWith(p, StringComparison.Ordinal));
+				if (suffix != null) {
+					errorMessage = string.Format(ctx.TranslateString("Name has forbidden suffix '{0}'. (Rule '{1}')"), suffix, Name);
+					id = id.Substring(0, id.Length - suffix.Length);
+				}
+			}
+			
+			switch (NamingStyle) {
+				case NamingStyle.AllLower:
+					if (id.Any(ch => char.IsLetter(ch) && char.IsUpper(ch))) {
+						errorMessage = string.Format(ctx.TranslateString("'{0}' contains upper case letters. (Rule '{1}')"), name, Name);
+						suggestedNames.Add(LowerCaseIdentifier(WordParser.BreakWords(id)));
+					} else {
+						suggestedNames.Add(id);
+					}
+					break;
+				case NamingStyle.AllUpper:
+					if (id.Any(ch => char.IsLetter(ch) && char.IsLower(ch))) {
+						errorMessage = string.Format(ctx.TranslateString("'{0}' contains lower case letters. (Rule '{1}')"), name, Name);
+						suggestedNames.Add(UpperCaseIdentifier(WordParser.BreakWords(id)));
+					} else {
+						suggestedNames.Add(id);
+					}
+					break;
+
+				case NamingStyle.CamelCase:
+					if (id.Length > 0 && char.IsUpper(id [0])) {
+						errorMessage = string.Format(ctx.TranslateString("'{0}' should start with a lower case letter. (Rule '{1}')"), name, Name);
+					} else if (!CheckUnderscore(id, UnderscoreHandling.Forbid)) {
+						errorMessage = string.Format(ctx.TranslateString("'{0}' should not separate words with an underscore. (Rule '{1}')"), name, Name);
+					} else {
+						suggestedNames.Add(id);
+						break;
+					}
+					suggestedNames.Add(CamelCaseIdentifier(id));
+					break;
+				case NamingStyle.CamelCaseWithLowerLetterUnderscore:
+					if (id.Length > 0 && char.IsUpper(id [0])) {
+						errorMessage = string.Format(ctx.TranslateString("'{0}' should start with a lower case letter. (Rule '{1}')"), name, Name);
+					} else if (!CheckUnderscore(id, UnderscoreHandling.AllowWithLowerStartingLetter)) {
+						errorMessage = string.Format(ctx.TranslateString("after '_' a lower letter should follow. (Rule '{0}')"), Name);
+					} else {
+						suggestedNames.Add(id);
+						break;
+					}
+					suggestedNames.Add(CamelCaseWithLowerLetterUnderscore(id));
+					break;
+				case NamingStyle.CamelCaseWithUpperLetterUnderscore:
+					if (id.Length > 0 && char.IsUpper(id [0])) {
+						errorMessage = string.Format(ctx.TranslateString("'{0}' should start with a lower case letter. (Rule '{1}')"), name, Name);
+					} else if (!CheckUnderscore(id, UnderscoreHandling.AllowWithUpperStartingLetter)) {
+						errorMessage = string.Format(ctx.TranslateString("after '_' an upper letter should follow. (Rule '{0}')"), Name);
+					} else {
+						suggestedNames.Add(id);
+						break;
+					}
+					suggestedNames.Add(CamelCaseWithUpperLetterUnderscore(id));
+					break;
+
+				case NamingStyle.PascalCase:
+					if (id.Length > 0 && char.IsLower(id [0])) {
+						errorMessage = string.Format(ctx.TranslateString("'{0}' should start with an upper case letter. (Rule '{1}')"), name, Name);
+					} else if (!CheckUnderscore(id, UnderscoreHandling.Forbid)) {
+						errorMessage = string.Format(ctx.TranslateString("'{0}' should not separate words with an underscore. (Rule '{1}')"), name, Name);
+					} else {
+						suggestedNames.Add(id);
+						break;
+					}
+					suggestedNames.Add(PascalCaseIdentifier(id));
+					break;
+				case NamingStyle.PascalCaseWithLowerLetterUnderscore:
+					if (id.Length > 0 && char.IsLower(id [0])) {
+						errorMessage = string.Format(ctx.TranslateString("'{0}' should start with an upper case letter. (Rule '{1}')"), name, Name);
+					} else if (!CheckUnderscore(id, UnderscoreHandling.AllowWithLowerStartingLetter)) {
+						errorMessage = string.Format(ctx.TranslateString("after '_' a lower letter should follow. (Rule '{0}')"), Name);
+					} else {
+						suggestedNames.Add(id);
+						break;
+					}
+					suggestedNames.Add(PascalCaseWithLowerLetterUnderscore(id));
+					break;
+				case NamingStyle.PascalCaseWithUpperLetterUnderscore:
+					if (id.Length > 0 && char.IsLower(id [0])) {
+						errorMessage = string.Format(ctx.TranslateString("'{0}' should start with an upper case letter. (Rule '{1}')"), name, Name);
+					} else if (!CheckUnderscore(id, UnderscoreHandling.AllowWithUpperStartingLetter)) {
+						errorMessage = string.Format(ctx.TranslateString("after '_' an upper letter should follow. (Rule '{0}')"), Name);
+					} else {
+						suggestedNames.Add(id);
+						break;
+					}
+					suggestedNames.Add(PascalCaseWithUpperLetterUnderscore(id));
+					break;
+				case NamingStyle.FirstUpper:
+					if (id.Length > 0 && char.IsLower(id [0])) {
+						errorMessage = string.Format(ctx.TranslateString("'{0}' should start with an upper case letter. (Rule '{1}')"), name, Name);
+					} else if (id.Take(1).Any(ch => char.IsLetter(ch) && char.IsUpper(ch))) {
+						errorMessage = string.Format(ctx.TranslateString("'{0}' contains an upper case letter after the first. (Rule '{1}')"), name, Name);
+					} else {
+						suggestedNames.Add(id);
+						break;
+					}
+					suggestedNames.Add(FirstUpperIdentifier(WordParser.BreakWords(id)));
+					break;
+			}
+
+			if (requiredPrefix != null) {
+				for (int i = 0; i < suggestedNames.Count; i++) {
+					suggestedNames [i] = requiredPrefix + suggestedNames [i];
+				}
+			} else if (allowedPrefix != null) {
+				int count = suggestedNames.Count;
+				for (int i = 0; i < count; i++) {
+					suggestedNames.Add(suggestedNames [i]);
+					suggestedNames [i] = allowedPrefix + suggestedNames [i];
+				}
+			} else if (missingRequiredPrefix) {
+				for (int i = 0; i < suggestedNames.Count; i++) {
+					var n = suggestedNames [i];
+					bool first = true;
+					foreach (var p in RequiredPrefixes) {
+						if (first) {
+							first = false;
+							suggestedNames [i] = p + n;
+						} else {
+							suggestedNames.Add(p + n);
+						}
+					}
+				}
+			}
+			
+			if (suffix != null) {
+				for (int i = 0; i < suggestedNames.Count; i++) {
+					suggestedNames [i] = ApplySuffix (suggestedNames [i], suffix);
+				}
+			} else if (missingRequiredSuffix) {
+				for (int i = 0; i < suggestedNames.Count; i++) {
+					var n = suggestedNames [i];
+					bool first = true;
+					foreach (var s in RequiredSuffixes) {
+						if (first) {
+							first = false;
+							suggestedNames [i] = ApplySuffix (n, s);
+						} else {
+							suggestedNames.Add(ApplySuffix (n, s));
+						}
+					}
+				}
+			}
+			
+			return errorMessage
+			// should never happen.
+				?? "no known errors.";
+		}
+
+		static string CamelCaseIdentifier(string id)
+		{
+			return ConvertToValidName(id, ch => char.ToLower(ch), ch => char.ToUpper (ch));
+		}
+
+		static string CamelCaseWithLowerLetterUnderscore(string id)
+		{
+			return ConvertToValidNameWithSpecialUnderscoreHandling(id, ch => char.ToLower(ch), ch => char.ToLower(ch));
+		}
+
+		static string CamelCaseWithUpperLetterUnderscore(string id)
+		{
+			return ConvertToValidNameWithSpecialUnderscoreHandling(id, ch => char.ToLower(ch), ch => char.ToUpper(ch));
+		}
+
+		static string ConvertToValidName(string id, Func<char, char> firstCharFunc, Func<char, char> followingCharFunc)
+		{
+			var sb = new StringBuilder();
+			bool first = true;
+			for (int i = 0; i < id.Length; i++) {
+				char ch = id[i];
+				if (first && char.IsLetter(ch)) {
+					sb.Append(firstCharFunc(ch));
+					firstCharFunc = followingCharFunc;
+					first = false;
+					continue;
+				}
+				if (ch == '_') {
+					if (first)
+						continue;
+					if (i + 1 < id.Length && id[i + 1] == '_')
+						continue;
+
+					if (i + 1 < id.Length) {
+						if (char.IsDigit(id[i + 1])) {
+							sb.Append('_');
+						} else {
+							first = true;
+						}
+					}
+					continue;
+				}
+				sb.Append(ch);
+			}
+			return sb.ToString();
+		}
+
+		static string ConvertToValidNameWithSpecialUnderscoreHandling(string id, Func<char, char> firstCharFunc, Func<char, char> afterUnderscoreLetter)
+		{
+			var sb = new StringBuilder();
+			bool first = true;
+			for (int i = 0; i < id.Length; i++) {
+				char ch = id[i];
+				if (first && char.IsLetter(ch)) {
+					sb.Append(firstCharFunc(ch));
+					first = false;
+					continue;
+				}
+				if (ch == '_') {
+					if (first)
+						continue;
+					if (i + 1 < id.Length && id[i + 1] == '_')
+						continue;
+					sb.Append('_');
+					i++;
+					if (i < id.Length)
+						sb.Append(afterUnderscoreLetter (id[i]));
+					continue;
+				}
+				sb.Append(ch);
+			}
+			return sb.ToString();
+		}
+
+
+		static string PascalCaseIdentifier(string id)
+		{
+			return ConvertToValidName(id, ch => char.ToUpper(ch), ch => char.ToUpper (ch));
+		}
+
+		static string PascalCaseWithLowerLetterUnderscore(string id)
+		{
+			return ConvertToValidNameWithSpecialUnderscoreHandling(id, ch => char.ToUpper(ch), ch => char.ToLower (ch));
+		}
+
+		static string PascalCaseWithUpperLetterUnderscore(string id)
+		{
+			return ConvertToValidNameWithSpecialUnderscoreHandling(id, ch => char.ToUpper(ch), ch => char.ToUpper(ch));
+		}
+
+		static string LowerCaseIdentifier(List<string> words)
+		{
+			var sb = new StringBuilder();
+			sb.Append(words [0].ToLower());
+			for (int i = 1; i < words.Count; i++) {
+				sb.Append('_');
+				sb.Append(words [i].ToLower());
+			}
+			return sb.ToString();
+		}
+
+		static string UpperCaseIdentifier(List<string> words)
+		{
+			var sb = new StringBuilder();
+			sb.Append(words [0].ToUpper());
+			for (int i = 1; i < words.Count; i++) {
+				sb.Append('_');
+				sb.Append(words [i].ToUpper());
+			}
+			return sb.ToString();
+		}
+
+		static string FirstUpperIdentifier(List<string> words)
+		{
+			var sb = new StringBuilder();
+			AppendCapitalized(words [0], sb);
+			for (int i = 1; i < words.Count; i++) {
+				sb.Append('_');
+				sb.Append(words [i].ToLower());
+			}
+			return sb.ToString();
+		}
+
+		static void AppendCapitalized(string word, StringBuilder sb)
+		{
+			sb.Append(word.ToLower());
+			sb [sb.Length - word.Length] = char.ToUpper(sb [sb.Length - word.Length]);
+		}
+
+		#region IEquatable implementation
+
+		public bool Equals(NamingRule other)
+		{
+			return Name == other.Name &&
+				AffectedEntity == other.AffectedEntity && 
+				VisibilityMask == other.VisibilityMask && 
+				NamingStyle == other.NamingStyle;
+		}
+
+		#endregion
+
+		/// <summary>
+		/// Gets an identifier (or comma separated list of identifiers) which apply to this naming rule.
+		/// </summary>
+		public string GetPreview()
+		{
+			var result = new StringBuilder();
+			if (RequiredPrefixes != null && RequiredPrefixes.Length > 0)
+				result.Append(RequiredPrefixes [0]);
+			switch (NamingStyle) {
+				case NamingStyle.PascalCase:
+					result.Append("PascalCase");
+					break;
+				case NamingStyle.PascalCaseWithLowerLetterUnderscore:
+					result.Append("PascalCase_underscoreTolerant");
+					break;
+				case NamingStyle.PascalCaseWithUpperLetterUnderscore:
+					result.Append("PascalCase_UnderscoreTolerant");
+					break;
+
+				case NamingStyle.CamelCase:
+					result.Append("camelCase");
+					break;
+				case NamingStyle.CamelCaseWithLowerLetterUnderscore:
+					result.Append("camelCase_underscoreTolerant");
+					break;
+				case NamingStyle.CamelCaseWithUpperLetterUnderscore:
+					result.Append("camelCase_UnderscoreTolerant");
+					break;
+
+				case NamingStyle.AllUpper:
+					result.Append("ALL_UPPER");
+					break;
+				case NamingStyle.AllLower:
+					result.Append("all_Lower");
+					break;
+				case NamingStyle.FirstUpper:
+					result.Append("First_Upper");
+					break;
+			}
+			if (RequiredSuffixes != null && RequiredSuffixes.Length > 0)
+				result.Append(RequiredSuffixes [0]);
+			if (AllowedPrefixes != null) {
+				string baseString = result.ToString();
+				foreach (var str in AllowedPrefixes) {
+					result.Append(", " + str + baseString);
+				}
+			}
+			return result.ToString();
+		}
+
+		public NamingRule Clone()
+		{
+			return (NamingRule)MemberwiseClone();
+		}
+
+		public override string ToString()
+		{
+			return string.Format("[NamingRule: Name={0}, AffectedEntity={1}, VisibilityMask={2}, NamingStyle={3}, IncludeStaticEntities={4}, IncludeInstanceMembers={5}]", Name, AffectedEntity, VisibilityMask, NamingStyle, IncludeStaticEntities, IncludeInstanceMembers);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/NamingStyle.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/NamingStyle.cs
new file mode 100644
index 0000000000..a2c7e58738
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/NamingStyle.cs
@@ -0,0 +1,80 @@
+// 
+// NamingStyle.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	public enum NamingStyle {
+		None,
+		
+		/// <summary>
+		/// PascalCase
+		/// </summary>
+		PascalCase,
+		
+		/// <summary>
+		/// camelCase
+		/// </summary>
+		CamelCase,
+
+		/// <summary>
+		/// ALLUPPER
+		/// </summary>
+		AllUpper,
+
+		/// <summary>
+		/// alllower
+		/// </summary>
+		AllLower,
+
+		/// <summary>
+		/// Firstupper
+		/// </summary>
+		FirstUpper,
+
+		/// <summary>
+		/// PascalCaseWithLowerLetterUnderscore
+		/// </summary>
+		PascalCaseWithLowerLetterUnderscore,
+
+		/// <summary>
+		/// PascalCaseWithUpperLetterUnderscore
+		/// </summary>
+		PascalCaseWithUpperLetterUnderscore,
+
+		/// <summary>
+		/// CamelCaseWithLowerLetterUnderscore
+		/// </summary>
+		CamelCaseWithLowerLetterUnderscore,
+
+		/// <summary>
+		/// CamelCaseWithUpperLetterUnderscore
+		/// </summary>
+		CamelCaseWithUpperLetterUnderscore
+
+	}
+
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/NUnit/NonPublicMethodWithTestAttributeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/NUnit/NonPublicMethodWithTestAttributeIssue.cs
new file mode 100644
index 0000000000..dc0e65a234
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/NUnit/NonPublicMethodWithTestAttributeIssue.cs
@@ -0,0 +1,84 @@
+//
+// NonPublicMethodWithTestAttributeIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("NUnit Test methods should have public visibility",
+	                  Description = "Non public methods are not found by NUnit.",
+	                  Category = IssueCategories.NUnit,
+	                  Severity = Severity.Hint,
+	                  AnalysisDisableKeyword = "NUnit.NonPublicMethodWithTestAttribute")]
+	public class NonPublicMethodWithTestAttributeIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<NonPublicMethodWithTestAttributeIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				var result = ctx.Resolve(methodDeclaration) as MemberResolveResult; 
+				if (result == null || result.IsError)
+					return;
+
+				var member = result.Member;
+				if (member.IsOverride || member.IsStatic || member.IsPublic)
+					return;
+
+				if (!member.Attributes.Any(attr => attr.AttributeType.Name == "TestAttribute" && attr.AttributeType.Namespace == "NUnit.Framework"))
+					return;
+				AddIssue(new CodeIssue(
+					methodDeclaration.NameToken,
+					ctx.TranslateString("NUnit test methods should be public"),
+					ctx.TranslateString("Make method public"),
+					script => {
+						script.ChangeModifier(methodDeclaration, Modifiers.Public);
+					}
+				));
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				// Empty
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertClosureToMethodGroupIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertClosureToMethodGroupIssue.cs
new file mode 100644
index 0000000000..620cb5a253
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertClosureToMethodGroupIssue.cs
@@ -0,0 +1,179 @@
+//
+// SimplifyAnonymousMethodToDelegateIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{ 
+	[IssueDescription("Convert anonymous method to method group",
+	                  Description = "Anonymous method or lambda expression can be simplified to method group.",
+	                  Category = IssueCategories.Opportunities,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ConvertClosureToMethodGroup")]
+	public class ConvertClosureToMethodGroupIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ConvertClosureToMethodGroupIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+			
+			static readonly Pattern pattern = new Choice {
+				new BlockStatement {
+					new ReturnStatement (new AnyNode ("invoke")) 
+				},
+				new AnyNode ("invoke")
+			};
+
+			static InvocationExpression AnalyzeBody(AstNode body)
+			{
+				var m = pattern.Match(body);
+				if (m.Success)
+					return m.Get("invoke").Single () as InvocationExpression;
+				return null;
+			}
+
+			static bool IsSimpleTarget(Expression target)
+			{
+				if (target is IdentifierExpression)
+					return true;
+				var mref = target as MemberReferenceExpression;
+				if (mref != null)
+					return IsSimpleTarget (mref.Target);
+				var pref = target as PointerReferenceExpression;
+				if (pref != null)
+					return IsSimpleTarget (pref.Target);
+				return false;
+			}
+
+			void AnalyzeExpression(AstNode expression, AstNode body, AstNodeCollection<ParameterDeclaration> parameters)
+			{
+				var invocation = AnalyzeBody(body);
+				if (invocation == null)
+					return;
+				if (!IsSimpleTarget (invocation.Target))
+					return;
+				var rr = ctx.Resolve (invocation) as CSharpInvocationResolveResult;
+				if (rr == null)
+					return;
+				var lambdaParameters = parameters.ToList();
+				var arguments = rr.GetArgumentsForCall();
+				if (lambdaParameters.Count != arguments.Count)
+					return;
+				for (int i = 0; i < arguments.Count; i++) {
+					var arg = UnpackImplicitIdentityOrReferenceConversion(arguments[i]) as LocalResolveResult;
+					if (arg == null || arg.Variable.Name != lambdaParameters[i].Name)
+						return;
+				}
+				var returnConv = ctx.GetConversion(invocation);
+				if (returnConv.IsExplicit || !(returnConv.IsIdentityConversion || returnConv.IsReferenceConversion))
+					return;
+				var validTypes = TypeGuessing.GetValidTypes (ctx.Resolver, expression).ToList ();
+
+				// search for method group collisions
+				var targetResult = ctx.Resolve(invocation.Target) as MethodGroupResolveResult;
+				if (targetResult != null) {
+					foreach (var t in validTypes) {
+						if (t.Kind != TypeKind.Delegate)
+							continue;
+						var invokeMethod = t.GetDelegateInvokeMethod();
+
+						foreach (var otherMethod in targetResult.Methods) {
+							if (otherMethod == rr.Member)
+								continue;
+							if (ParameterListComparer.Instance.Equals(otherMethod.Parameters, invokeMethod.Parameters))
+								return;
+						}
+					}
+				}
+
+				bool isValidReturnType = false;
+				foreach (var t in validTypes) {
+					if (t.Kind != TypeKind.Delegate)
+						continue;
+					var invokeMethod = t.GetDelegateInvokeMethod();
+					isValidReturnType = rr.Member.ReturnType == invokeMethod.ReturnType || rr.Member.ReturnType.GetAllBaseTypes().Contains(invokeMethod.ReturnType);
+					if (isValidReturnType)
+						break;
+				}
+				if (!isValidReturnType)
+					return;
+
+				AddIssue(new CodeIssue(expression,
+				         expression is AnonymousMethodExpression ? ctx.TranslateString("Anonymous method can be simplified to method group") : ctx.TranslateString("Lambda expression can be simplified to method group"), 
+				         ctx.TranslateString("Replace with method group"), script =>  {
+					if (validTypes.Any (t => t.FullName == "System.Func" && t.TypeParameterCount == 1 + parameters.Count) && validTypes.Any (t => t.FullName == "System.Action")) {
+						if (rr != null && rr.Member.ReturnType.Kind != TypeKind.Void) {
+							var builder = ctx.CreateTypeSystemAstBuilder (expression);
+							var type = builder.ConvertType(new TopLevelTypeName("System", "Func", 1));
+							var args = type.GetChildrenByRole(Roles.TypeArgument);
+							args.Clear ();
+							foreach (var pde in parameters) {
+								args.Add (builder.ConvertType (ctx.Resolve (pde).Type));
+							}
+							args.Add (builder.ConvertType (rr.Member.ReturnType));
+							script.Replace(expression, new CastExpression (type, invocation.Target.Clone()));
+							return;
+						}
+					}
+					script.Replace(expression, invocation.Target.Clone());
+				}));
+			}
+			
+			static ResolveResult UnpackImplicitIdentityOrReferenceConversion(ResolveResult rr)
+			{
+				var crr = rr as ConversionResolveResult;
+				if (crr != null && crr.Conversion.IsImplicit && (crr.Conversion.IsIdentityConversion || crr.Conversion.IsReferenceConversion))
+					return crr.Input;
+				return rr;
+			}
+
+			public override void VisitLambdaExpression(LambdaExpression lambdaExpression)
+			{
+				base.VisitLambdaExpression(lambdaExpression);
+				AnalyzeExpression(lambdaExpression, lambdaExpression.Body, lambdaExpression.Parameters);
+			}
+
+			public override void VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression)
+			{
+				base.VisitAnonymousMethodExpression(anonymousMethodExpression);
+				AnalyzeExpression(anonymousMethodExpression, anonymousMethodExpression.Body, anonymousMethodExpression.Parameters);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertConditionalTernaryToNullCoalescingIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertConditionalTernaryToNullCoalescingIssue.cs
new file mode 100644
index 0000000000..2885f6626a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertConditionalTernaryToNullCoalescingIssue.cs
@@ -0,0 +1,114 @@
+// 
+// ConditionalToNullCoalescingInspector.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Checks for "a != null ? a : other"<expr>
+	/// Converts to: "a ?? other"<expr>
+	/// </summary>
+	[IssueDescription("'?:' expression can be converted to '??' expression",
+	                  Description="'?:' expression can be converted to '??' expression.",
+	                  Category = IssueCategories.Opportunities,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ConvertConditionalTernaryToNullCoalescing")]
+	public class ConvertConditionalTernaryToNullCoalescingIssue : GatherVisitorCodeIssueProvider
+	{
+		static readonly Pattern unequalPattern = new Choice {
+			// a != null ? a : other
+			new ConditionalExpression(
+				PatternHelper.CommutativeOperatorWithOptionalParentheses(new AnyNode("a"), BinaryOperatorType.InEquality, new NullReferenceExpression()),
+				new Backreference("a"),
+				new AnyNode("other")
+			),
+
+			// obj != null ? (Type)obj : other
+			new ConditionalExpression(
+				PatternHelper.CommutativeOperatorWithOptionalParentheses(new AnyNode("obj"), BinaryOperatorType.InEquality, new NullReferenceExpression()),
+				new NamedNode("a", new CastExpression(new AnyNode(), new Backreference("obj"))),
+				new AnyNode("other")
+			)
+
+		};
+
+		static readonly Pattern equalPattern = new Choice {
+			// a == null ? other : a
+			new ConditionalExpression(
+				PatternHelper.CommutativeOperatorWithOptionalParentheses(new AnyNode("a"), BinaryOperatorType.Equality, new NullReferenceExpression()),
+				new AnyNode("other"),
+				new Backreference("a")
+			)
+		};
+
+		
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<ConvertConditionalTernaryToNullCoalescingIssue>
+		{
+
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitConditionalExpression(ConditionalExpression conditionalExpression)
+			{
+				Match m = unequalPattern.Match(conditionalExpression);
+				bool isEqual = false;
+				if (!m.Success) {
+					isEqual = true;
+					m = equalPattern.Match(conditionalExpression);
+				}
+				if (m.Success) {
+					var a = m.Get<Expression>("a").Single();
+					var other = m.Get<Expression>("other").Single();
+
+					if (isEqual) {
+						var castExpression = other as CastExpression;
+						if (castExpression != null) {
+							a = new CastExpression(castExpression.Type.Clone(), a.Clone());
+							other = castExpression.Expression;
+						}
+					}
+
+					AddIssue(new CodeIssue(conditionalExpression, ctx.TranslateString("'?:' expression can be re-written as '??' expression"), new CodeAction (
+						ctx.TranslateString("Replace '?:'  operator with '??"), script => {
+							var expr = new BinaryOperatorExpression (a.Clone (), BinaryOperatorType.NullCoalescing, other.Clone ());
+							script.Replace (conditionalExpression, expr);
+						}, conditionalExpression)));
+				}
+				base.VisitConditionalExpression (conditionalExpression);
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertIfStatementToConditionalTernaryExpressionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertIfStatementToConditionalTernaryExpressionIssue.cs
new file mode 100644
index 0000000000..2622f73204
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertIfStatementToConditionalTernaryExpressionIssue.cs
@@ -0,0 +1,107 @@
+//
+// ConvertIfStatementToConditionalTernaryExpressionIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("'if' statement can be re-written as '?:' expression",
+	                  Description = "Convert 'if' to '?:'",
+	                  Category = IssueCategories.Opportunities,
+	                  Severity = Severity.Hint,
+	                  AnalysisDisableKeyword = "ConvertIfStatementToConditionalTernaryExpression")]
+	public class ConvertIfStatementToConditionalTernaryExpressionIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		public static bool IsComplexExpression(AstNode expr)
+		{
+			return expr.StartLocation.Line != expr.EndLocation.Line ||
+			expr is ConditionalExpression ||
+			expr is BinaryOperatorExpression;
+		}
+
+		public static bool IsComplexCondition(Expression expr)
+		{
+			if (expr.StartLocation.Line != expr.EndLocation.Line)
+				return true;
+
+			if (expr is PrimitiveExpression || expr is IdentifierExpression || expr is MemberReferenceExpression || expr is InvocationExpression)
+				return false;
+
+			var pexpr = expr as ParenthesizedExpression;
+			if (pexpr != null)
+				return IsComplexCondition(pexpr.Expression);
+
+			var uOp = expr as UnaryOperatorExpression;
+			if (uOp != null)
+				return IsComplexCondition(uOp.Expression);
+
+			var bop = expr as BinaryOperatorExpression;
+			if (bop == null)
+				return true;
+			return !(bop.Operator == BinaryOperatorType.GreaterThan ||
+			bop.Operator == BinaryOperatorType.GreaterThanOrEqual ||
+			bop.Operator == BinaryOperatorType.Equality ||
+			bop.Operator == BinaryOperatorType.InEquality ||
+			bop.Operator == BinaryOperatorType.LessThan ||
+			bop.Operator == BinaryOperatorType.LessThanOrEqual);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ConvertIfStatementToConditionalTernaryExpressionIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base(ctx)
+			{
+			}
+
+			public override void VisitIfElseStatement(IfElseStatement ifElseStatement)
+			{
+				base.VisitIfElseStatement(ifElseStatement);
+				Match match;
+				if (!ConvertIfStatementToConditionalTernaryExpressionAction.GetMatch(ifElseStatement, out match))
+					return;
+//				var target = match.Get<Expression>("target").Single();
+				var condition = match.Get<Expression>("condition").Single();
+				var trueExpr = match.Get<Expression>("expr1").Single();
+				var falseExpr = match.Get<Expression>("expr2").Single();
+
+				if (IsComplexCondition(condition) || IsComplexExpression(trueExpr) || IsComplexExpression(falseExpr))
+					return;
+				AddIssue(new CodeIssue(
+					ifElseStatement.IfToken,
+					ctx.TranslateString("Convert to '?:' expression")
+				){ IssueMarker = IssueMarker.DottedLine, ActionProvider = { typeof(ConvertIfStatementToConditionalTernaryExpressionAction) } });
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertIfStatementToNullCoalescingExpressionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertIfStatementToNullCoalescingExpressionIssue.cs
new file mode 100644
index 0000000000..17b990a1d7
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertIfStatementToNullCoalescingExpressionIssue.cs
@@ -0,0 +1,74 @@
+//
+// ConvertIfStatementToNullCoalescingExpressionIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("'if' statement can be re-written as '??' expression",
+	                  Description="Convert 'if' to '??'",
+	                  Category = IssueCategories.Opportunities,
+	                  Severity = Severity.Hint,
+	                  AnalysisDisableKeyword = "ConvertIfStatementToNullCoalescingExpression")]
+	public class ConvertIfStatementToNullCoalescingExpressionIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ConvertIfStatementToNullCoalescingExpressionIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitIfElseStatement(IfElseStatement ifElseStatement)
+			{
+				base.VisitIfElseStatement(ifElseStatement);
+				Expression rightSide;
+				var leftSide = ConvertIfStatementToNullCoalescingExpressionAction.CheckNode(ifElseStatement, out rightSide);
+				if (leftSide == null)
+					return;
+				if (ConvertIfStatementToConditionalTernaryExpressionIssue.IsComplexExpression(leftSide) || 
+				    ConvertIfStatementToConditionalTernaryExpressionIssue.IsComplexExpression(rightSide))
+					return;
+				var previousNode = ifElseStatement.GetPrevSibling(sibling => sibling is Statement) as VariableDeclarationStatement;
+				if (previousNode == null || ConvertIfStatementToConditionalTernaryExpressionIssue.IsComplexExpression(previousNode))
+					return;
+
+				AddIssue(new CodeIssue(
+					ifElseStatement.IfToken,
+					ctx.TranslateString("Convert to '??' expresssion")
+				){ IssueMarker = IssueMarker.DottedLine, ActionProvider = { typeof(ConvertIfStatementToNullCoalescingExpressionAction) } });
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertIfStatementToSwitchStatementIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertIfStatementToSwitchStatementIssue.cs
new file mode 100644
index 0000000000..391e6975ba
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertIfStatementToSwitchStatementIssue.cs
@@ -0,0 +1,71 @@
+//
+// ConvertIfStatementToSwitchStatementIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("'if' statement can be re-written as 'switch' statement",
+	                  Description="Convert 'if' to 'switch'",
+	                  Category = IssueCategories.Opportunities,
+	                  Severity = Severity.Hint)]
+	public class ConvertIfStatementToSwitchStatementIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ConvertIfStatementToSwitchStatementIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitIfElseStatement(IfElseStatement ifElseStatement)
+			{
+				base.VisitIfElseStatement(ifElseStatement);
+
+				if (ifElseStatement.Parent is IfElseStatement)
+					return;
+
+				var switchExpr = ConvertIfStatementToSwitchStatementAction.GetSwitchExpression (ctx, ifElseStatement.Condition);
+				if (switchExpr == null)
+					return;
+				var switchSections = new List<SwitchSection> ();
+				if (!ConvertIfStatementToSwitchStatementAction.CollectSwitchSections(switchSections, ctx, ifElseStatement, switchExpr))
+					return;
+				if (switchSections.Count(s => !s.CaseLabels.Any(l => l.Expression.IsNull)) <= 2)
+					return;
+				AddIssue(new CodeIssue(
+					ifElseStatement.IfToken,
+					ctx.TranslateString("Convert to 'switch' statement")) { IssueMarker = IssueMarker.DottedLine, ActionProvider = { typeof(ConvertIfStatementToSwitchStatementAction) } });
+
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertNullableToShortFormIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertNullableToShortFormIssue.cs
new file mode 100644
index 0000000000..00555117b7
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertNullableToShortFormIssue.cs
@@ -0,0 +1,83 @@
+//
+// ConvertNullableToShortFormIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Convert 'Nullable<T>' to 'T?'",
+	                  Description = "Convert 'Nullable<T>' to the short form 'T?'",
+	                  Category = IssueCategories.Opportunities,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ConvertNullableToShortForm")]
+	public class ConvertNullableToShortFormIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ConvertNullableToShortFormIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+			static readonly AstType nullType = new SimpleType("");
+
+			void CheckType(AstType simpleType, AstType arg)
+			{
+				if (arg == null || nullType.IsMatch(arg))
+					return;
+				var rr = ctx.Resolve(simpleType);
+				if (rr == null || rr.IsError || rr.Type.Namespace != "System" || rr.Type.Name != "Nullable")
+					return;
+
+				AddIssue(new CodeIssue(
+					simpleType,
+					string.Format(ctx.TranslateString("Type can be simplified to '{0}?'"), arg), 
+					string.Format(ctx.TranslateString("Rewrite to '{0}?'"), arg),
+					script =>  {
+						script.Replace(simpleType, arg.Clone().MakeNullableType());
+					}
+				));
+			}
+
+			public override void VisitSimpleType(SimpleType simpleType)
+			{
+				CheckType(simpleType, simpleType.TypeArguments.FirstOrDefault());
+			}
+
+			public override void VisitMemberType(MemberType memberType)
+			{
+				CheckType(memberType, memberType.TypeArguments.FirstOrDefault());
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertToAutoPropertyIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertToAutoPropertyIssue.cs
new file mode 100644
index 0000000000..5745da24a5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertToAutoPropertyIssue.cs
@@ -0,0 +1,74 @@
+//
+// ConvertToAutoPropertyIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Convert property to auto property",
+		Description = "Convert property to auto property",
+		Category = IssueCategories.Opportunities,
+		Severity = Severity.Suggestion,
+		AnalysisDisableKeyword = "ConvertToAutoProperty")]
+	public class ConvertToAutoPropertyIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ConvertToAutoPropertyIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				// SKIP
+			}
+
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+				var field = RemoveBackingStoreAction.GetBackingField(ctx, propertyDeclaration);
+				if (field == null)
+					return;
+				AddIssue(new CodeIssue(
+					propertyDeclaration.NameToken,
+					ctx.TranslateString("Convert to auto property")
+				) {
+					ActionProvider = { typeof (RemoveBackingStoreAction) }
+				}
+				);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertToLambdaExpressionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertToLambdaExpressionIssue.cs
new file mode 100644
index 0000000000..acede5d2fb
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertToLambdaExpressionIssue.cs
@@ -0,0 +1,114 @@
+//
+// ConvertToLambdaExpressionIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Convert to lambda expression",
+		Description = "Convert to lambda with expression",
+		Category = IssueCategories.Opportunities,
+		Severity = Severity.Suggestion,
+		AnalysisDisableKeyword = "ConvertToLambdaExpression")]
+	public class ConvertToLambdaExpressionIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ConvertToLambdaExpressionIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base(ctx)
+			{
+			}
+
+			public override void VisitLambdaExpression(LambdaExpression lambdaExpression)
+			{
+				base.VisitLambdaExpression(lambdaExpression);
+				BlockStatement block;
+				Expression expr;
+				if (!ConvertLambdaBodyStatementToExpressionAction.TryGetConvertableExpression(lambdaExpression.Body, out block, out expr))
+					return;
+				var node = block.Statements.FirstOrDefault() ?? block;
+				var returnTypes = new List<IType>();
+				foreach (var type in TypeGuessing.GetValidTypes(ctx.Resolver, lambdaExpression)) {
+					if (type.Kind != TypeKind.Delegate)
+						continue;
+					var invoke = type.GetDelegateInvokeMethod();
+					if (!returnTypes.Contains(invoke.ReturnType))
+						returnTypes.Add(invoke.ReturnType);
+				}
+				if (returnTypes.Count > 1)
+					return;
+
+				AddIssue(new CodeIssue(
+					node,
+					ctx.TranslateString("Can be converted to expression"),
+					ConvertLambdaBodyStatementToExpressionAction.CreateAction(ctx, node, block, expr)
+				));
+			}
+
+			public override void VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression)
+			{
+				base.VisitAnonymousMethodExpression(anonymousMethodExpression);
+				if (!anonymousMethodExpression.HasParameterList)
+					return;
+				BlockStatement block;
+				Expression expr;
+				if (!ConvertLambdaBodyStatementToExpressionAction.TryGetConvertableExpression(anonymousMethodExpression.Body, out block, out expr))
+					return;
+				var node = block.Statements.FirstOrDefault() ?? block;
+				var returnTypes = new List<IType>();
+				foreach (var type in TypeGuessing.GetValidTypes(ctx.Resolver, anonymousMethodExpression)) {
+					if (type.Kind != TypeKind.Delegate)
+						continue;
+					var invoke = type.GetDelegateInvokeMethod();
+					if (!returnTypes.Contains(invoke.ReturnType))
+						returnTypes.Add(invoke.ReturnType);
+				}
+				if (returnTypes.Count > 1)
+					return;
+
+				AddIssue(new CodeIssue(
+					node,
+					ctx.TranslateString("Can be converted to expression"),
+					ctx.TranslateString("Convert to lambda expression"),
+					script => {
+						var lambdaExpression = new LambdaExpression();
+						foreach (var parameter in anonymousMethodExpression.Parameters)
+							lambdaExpression.Parameters.Add(parameter.Clone());
+						lambdaExpression.Body = expr.Clone();
+						script.Replace(anonymousMethodExpression, lambdaExpression);
+					}
+				));
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertToStaticTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertToStaticTypeIssue.cs
new file mode 100644
index 0000000000..7be95a0f84
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ConvertToStaticTypeIssue.cs
@@ -0,0 +1,83 @@
+// 
+// ConvertToStaticTypeIssue.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013  Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Class can be converted to static",
+	                  Description = "If all fields, properties and methods members are static, the class can be made static.",
+	                  Category = IssueCategories.Opportunities,
+	                  Severity = Severity.Hint,
+	                  AnalysisDisableKeyword = "ConvertToStaticType")]
+	public class ConvertToStaticTypeIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ConvertToStaticTypeIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			static bool IsMainMethod(IMember f)
+			{
+				return 
+					f.SymbolKind == SymbolKind.Method &&
+					(f.ReturnType.IsKnownType(KnownTypeCode.Void) || f.ReturnType.IsKnownType(KnownTypeCode.Int32)) &&
+					f.IsStatic &&
+					f.Name == "Main";
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				base.VisitTypeDeclaration(typeDeclaration);
+
+				if (typeDeclaration == null || typeDeclaration.ClassType != ClassType.Class || typeDeclaration.HasModifier(Modifiers.Static))
+					return;
+				if (!typeDeclaration.Members.Any() || typeDeclaration.HasModifier(Modifiers.Abstract) || typeDeclaration.HasModifier(Modifiers.Partial))
+					return;
+				if (typeDeclaration.Members.Any(f => !f.HasModifier(Modifiers.Static) && !f.HasModifier(Modifiers.Const)))
+					return;
+				var rr = ctx.Resolve(typeDeclaration);
+				if (rr.IsError || rr.Type.GetMembers().Any(IsMainMethod))
+					return;
+				AddIssue(new CodeIssue(
+					typeDeclaration.NameToken, 
+					ctx.TranslateString("This class is recommended to be defined as static"),
+					ctx.TranslateString("Make class static"),
+					s => s.ChangeModifier(typeDeclaration, (typeDeclaration.Modifiers & ~Modifiers.Sealed) | Modifiers.Static)
+				));
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ForCanBeConvertedToForeachIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ForCanBeConvertedToForeachIssue.cs
new file mode 100644
index 0000000000..d2e2d36c2f
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/ForCanBeConvertedToForeachIssue.cs
@@ -0,0 +1,225 @@
+//
+// ForCanBeConvertedToForeachIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("'for' can be converted into 'foreach'",
+	                  Description = "Foreach loops are more efficient",
+	                  Category = IssueCategories.Opportunities,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ForCanBeConvertedToForeach")]
+	public class ForCanBeConvertedToForeachIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ForCanBeConvertedToForeachIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			static readonly AstNode forPattern =
+				new Choice {
+					new ForStatement {
+						Initializers = {
+							new VariableDeclarationStatement {
+								Type = new AnyNode("int"),
+								Variables = {
+									new NamedNode("iteratorInitialzer", new VariableInitializer(Pattern.AnyString, new PrimitiveExpression(0)))
+								}
+							}
+						},
+						Condition = PatternHelper.OptionalParentheses(
+							new BinaryOperatorExpression(
+								PatternHelper.OptionalParentheses(new AnyNode("iterator")), 
+								BinaryOperatorType.LessThan,
+								PatternHelper.OptionalParentheses(
+									new NamedNode("upperBound", new MemberReferenceExpression(new AnyNode (), Pattern.AnyString))
+								)
+							)
+						),
+						Iterators = {
+							new ExpressionStatement(
+								new Choice {
+									new UnaryOperatorExpression(UnaryOperatorType.Increment, new Backreference("iterator")), 
+									new UnaryOperatorExpression(UnaryOperatorType.PostIncrement, new Backreference("iterator")) 
+								}
+							)
+						},
+						EmbeddedStatement = new AnyNode("body")
+					},
+					new ForStatement {
+						Initializers = {
+							new VariableDeclarationStatement {
+								Type = new AnyNode("int"),
+								Variables = {
+									new NamedNode("iteratorInitialzer", new VariableInitializer(Pattern.AnyString, new PrimitiveExpression(0))),
+									new NamedNode("upperBoundInitializer", new VariableInitializer(Pattern.AnyString, new NamedNode("upperBound", new MemberReferenceExpression(new AnyNode (), Pattern.AnyString)))),
+								}
+							}
+						},
+						Condition = PatternHelper.OptionalParentheses(
+							new BinaryOperatorExpression(
+								PatternHelper.OptionalParentheses(new AnyNode("iterator")), 
+								BinaryOperatorType.LessThan,
+								PatternHelper.OptionalParentheses(
+									new AnyNode("upperBoundInitializerName")
+								)
+							)
+						),
+						Iterators = {
+							new ExpressionStatement(
+								new Choice {
+									new UnaryOperatorExpression(UnaryOperatorType.Increment, new Backreference("iterator")), 
+									new UnaryOperatorExpression(UnaryOperatorType.PostIncrement, new Backreference("iterator")) 
+								}
+							)
+						},
+						EmbeddedStatement = new AnyNode("body")
+					},
+				};
+			static readonly AstNode varDeclPattern =
+				new VariableDeclarationStatement {
+					Type = new AnyNode(),
+					Variables = {
+						new VariableInitializer(Pattern.AnyString, new NamedNode("indexer", new IndexerExpression(new AnyNode(), new IdentifierExpression(Pattern.AnyString))))
+					}
+				};
+			static readonly AstNode varTypePattern =
+				new SimpleType("var");
+
+			static bool IsEnumerable(IType type)
+			{
+				return type.Name == "IEnumerable" && (type.Namespace == "System.Collections.Generic" || type.Namespace == "System.Collections");
+			}
+
+			public override void VisitForStatement(ForStatement forStatement)
+			{
+				base.VisitForStatement(forStatement);
+				var forMatch = forPattern.Match(forStatement);
+				if (!forMatch.Success)
+					return;
+				var body = forStatement.EmbeddedStatement as BlockStatement;
+				if (body == null || !body.Statements.Any())
+					return;
+				var varDeclStmt = body.Statements.First() as VariableDeclarationStatement;
+				if (varDeclStmt == null)
+					return;
+				var varMatch = varDeclPattern.Match(varDeclStmt);
+				if (!varMatch.Success)
+					return;
+				var typeNode = forMatch.Get<AstNode>("int").FirstOrDefault();
+				var varDecl = forMatch.Get<VariableInitializer>("iteratorInitialzer").FirstOrDefault();
+				var iterator = forMatch.Get<IdentifierExpression>("iterator").FirstOrDefault();
+				var upperBound = forMatch.Get<MemberReferenceExpression>("upperBound").FirstOrDefault();
+				if (typeNode == null || varDecl == null || iterator == null || upperBound == null)
+					return;
+
+				// Check iterator type
+				if (!varTypePattern.IsMatch(typeNode)) {
+					var typeRR = ctx.Resolve(typeNode);
+					if (!typeRR.Type.IsKnownType(KnownTypeCode.Int32))
+						return;
+				}
+
+				if (varDecl.Name != iterator.Identifier)
+					return;
+
+				var upperBoundInitializer = forMatch.Get<VariableInitializer>("upperBoundInitializer").FirstOrDefault();
+				var upperBoundInitializerName = forMatch.Get<IdentifierExpression>("upperBoundInitializerName").FirstOrDefault();
+				if (upperBoundInitializer != null) {
+					if (upperBoundInitializerName == null || upperBoundInitializer.Name != upperBoundInitializerName.Identifier)
+						return;
+				}
+
+				var indexer = varMatch.Get<IndexerExpression>("indexer").Single();
+				if (((IdentifierExpression)indexer.Arguments.First()).Identifier != iterator.Identifier)
+					return;
+				if (!indexer.Target.IsMatch(upperBound.Target))
+					return;
+
+				var rr = ctx.Resolve(upperBound) as MemberResolveResult;
+				if (rr == null || rr.IsError)
+					return;
+
+				if (!(rr.Member.Name == "Length" && rr.Member.DeclaringType.Name == "Array" && rr.Member.DeclaringType.Namespace == "System") &&
+				!(rr.Member.Name == "Count" && (IsEnumerable(rr.TargetResult.Type) || rr.TargetResult.Type.GetAllBaseTypes().Any(IsEnumerable))))
+					return;
+
+				var variableInitializer = varDeclStmt.Variables.First();
+				var lr = ctx.Resolve(variableInitializer) as LocalResolveResult;
+				if (lr == null)
+					return;
+
+				var ir = ctx.Resolve(varDecl) as LocalResolveResult;
+				if (ir == null)
+					return;
+
+				var analyze = new ConvertToConstantIssue.VariableUsageAnalyzation(ctx);
+				analyze.SetAnalyzedRange(
+					varDeclStmt,
+					forStatement.EmbeddedStatement,
+					false
+				);
+				forStatement.EmbeddedStatement.AcceptVisitor(analyze);
+				if (analyze.GetStatus(lr.Variable) == ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod.VariableState.Changed ||
+				    analyze.GetStatus(ir.Variable) == ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod.VariableState.Changed ||
+				    analyze.GetStatus(ir.Variable) == ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod.VariableState.Used)
+					return;
+
+				AddIssue(new CodeIssue(
+					forStatement.ForToken,
+					ctx.TranslateString("'for' loop can be converted to 'foreach'"),
+					ctx.TranslateString("Convert to 'foreach'"),
+					script => {
+						var foreachBody = (BlockStatement)forStatement.EmbeddedStatement.Clone();
+						foreachBody.Statements.First().Remove();
+
+						var fe = new ForeachStatement {
+							VariableType = new PrimitiveType("var"),
+							VariableName = variableInitializer.Name,
+							InExpression = upperBound.Target.Clone(),
+							EmbeddedStatement = foreachBody
+						};
+						script.Replace(forStatement, fe); 
+					}
+				) { IssueMarker = IssueMarker.DottedLine });
+
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/InvokeAsExtensionMethodIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/InvokeAsExtensionMethodIssue.cs
new file mode 100644
index 0000000000..668cd9b6b8
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/InvokeAsExtensionMethodIssue.cs
@@ -0,0 +1,91 @@
+//
+// InvokeAsExtensionMethodIssue.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Convert static method call to extension method call",
+	                  Description = "If an extension method is called as static method convert it to method syntax",
+	                  Category = IssueCategories.Opportunities,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "InvokeAsExtensionMethod")]
+	public class InvokeAsExtensionMethodIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<InvokeAsExtensionMethodIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocation)
+			{
+				base.VisitInvocationExpression(invocation);
+				var memberReference = invocation.Target as MemberReferenceExpression;
+				if (memberReference == null)
+					return;
+				var firstArgument = invocation.Arguments.FirstOrDefault();
+				if (firstArgument is NullReferenceExpression)
+					return;
+				var invocationRR = ctx.Resolve(invocation) as CSharpInvocationResolveResult;
+				if (invocationRR == null)
+					return;
+				var method = invocationRR.Member as IMethod;
+				if (method == null || !method.IsExtensionMethod || invocationRR.IsExtensionMethodInvocation)
+					return;
+
+				AddIssue(new CodeIssue(
+					memberReference.MemberNameToken,
+					ctx.TranslateString("Convert static method call to extension method call"),
+					ctx.TranslateString("Convert to extension method call"),
+					script => {
+						script.Replace (
+							invocation, 
+							new InvocationExpression(
+								new MemberReferenceExpression(firstArgument.Clone(), memberReference.MemberName),
+								invocation.Arguments.Skip(1).Select(arg => arg.Clone())
+							)
+						);
+					}
+				));
+			}
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/RewriteIfReturnToReturnIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/RewriteIfReturnToReturnIssue.cs
new file mode 100644
index 0000000000..39f5de6c56
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/RewriteIfReturnToReturnIssue.cs
@@ -0,0 +1,73 @@
+//
+// RewriteIfReturnToReturnIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("'if...return' statement can be re-written as 'return' statement",
+	                  Description="Convert 'if...return' to 'return'",
+	                  Category = IssueCategories.Opportunities,
+	                  Severity = Severity.Hint)]
+	public class RewriteIfReturnToReturnIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<RewriteIfReturnToReturnIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitIfElseStatement(IfElseStatement ifElseStatement)
+			{
+				base.VisitIfElseStatement(ifElseStatement);
+
+				if (ifElseStatement.Parent is IfElseStatement)
+					return;
+				Expression c, e1, e2;
+				AstNode rs;
+				if (!ConvertIfStatementToReturnStatementAction.GetMatch(ifElseStatement, out c, out e1, out e2, out rs))
+					return;
+				if (ConvertIfStatementToConditionalTernaryExpressionIssue.IsComplexCondition(c) || 
+				    ConvertIfStatementToConditionalTernaryExpressionIssue.IsComplexExpression(e1) || 
+				    ConvertIfStatementToConditionalTernaryExpressionIssue.IsComplexExpression(e2))
+					return;
+				AddIssue(new CodeIssue(
+					ifElseStatement.IfToken,
+					ctx.TranslateString("Convert to 'return' statement")
+				) { IssueMarker = IssueMarker.DottedLine, ActionProvider = { typeof(ConvertIfStatementToReturnStatementAction) } });
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/SuggestUseVarKeywordEvidentIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/SuggestUseVarKeywordEvidentIssue.cs
new file mode 100644
index 0000000000..2345af6067
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/Opportunities/SuggestUseVarKeywordEvidentIssue.cs
@@ -0,0 +1,108 @@
+// 
+// UseVarKeywordInspector.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+using System;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Checks for places where the 'var' keyword can be used. Note that the action is actually done with a context
+	/// action.
+	/// </summary>
+	[IssueDescription("Use 'var'",
+		Description = "Use 'var' keyword when possible",
+		Category = IssueCategories.Opportunities,
+		Severity = Severity.Hint,
+		AnalysisDisableKeyword = "SuggestUseVarKeywordEvident")]
+	public class SuggestUseVarKeywordEvidentIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context, this);
+		}
+
+        class GatherVisitor : GatherVisitorBase<SuggestUseVarKeywordEvidentIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx, SuggestUseVarKeywordEvidentIssue qualifierDirectiveEvidentIssueProvider) : base (ctx, qualifierDirectiveEvidentIssueProvider)
+			{
+            }
+
+			public override void VisitSyntaxTree(SyntaxTree syntaxTree)
+			{
+				if (!ctx.Supports(UseVarKeywordAction.minimumVersion))
+					return;
+				base.VisitSyntaxTree(syntaxTree);
+			}
+
+			public override void VisitVariableDeclarationStatement(VariableDeclarationStatement variableDeclarationStatement)
+			{
+				base.VisitVariableDeclarationStatement(variableDeclarationStatement);
+				if (variableDeclarationStatement.Type is PrimitiveType) {
+					return;
+				}
+				if (variableDeclarationStatement.Type.IsVar()) {
+					return;
+				}
+				if (variableDeclarationStatement.Variables.Count != 1) {
+					return;
+				}
+				
+				//only checks for cases where the type would be obvious - assignment of new, cast, etc.
+				//also check the type actually matches else the user might want to assign different subclasses later
+				var v = variableDeclarationStatement.Variables.Single();
+				
+				var arrCreate = v.Initializer as ArrayCreateExpression;
+				if (arrCreate != null) {
+					var n = variableDeclarationStatement.Type as ComposedType;
+					//FIXME: check the specifier compatibility
+					if (n != null && n.ArraySpecifiers.Any() && n.BaseType.IsMatch(arrCreate.Type)) {
+						AddIssue(variableDeclarationStatement);
+					}
+				}
+				var objCreate = v.Initializer as ObjectCreateExpression;
+				if (objCreate != null && objCreate.Type.IsMatch(variableDeclarationStatement.Type)) {
+					AddIssue(variableDeclarationStatement);
+				}
+				var asCast = v.Initializer as AsExpression;
+				if (asCast != null && asCast.Type.IsMatch(variableDeclarationStatement.Type)) {
+					AddIssue(variableDeclarationStatement);
+				}
+				var cast = v.Initializer as CastExpression;
+				if (cast != null && cast.Type.IsMatch(variableDeclarationStatement.Type)) {
+					AddIssue(variableDeclarationStatement);
+				}
+			}
+			
+			void AddIssue(VariableDeclarationStatement variableDeclarationStatement)
+			{
+				AddIssue(new CodeIssue(variableDeclarationStatement.Type, ctx.TranslateString("Use 'var' keyword")) { IssueMarker = IssueMarker.DottedLine, ActionProvider = { typeof(UseVarKeywordAction) } });
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/AccessToStaticMemberViaDerivedTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/AccessToStaticMemberViaDerivedTypeIssue.cs
new file mode 100644
index 0000000000..606fbc8ab2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/AccessToStaticMemberViaDerivedTypeIssue.cs
@@ -0,0 +1,140 @@
+//
+// CallToStaticMemberViaDerivedTypeIssue.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Call to static member via a derived class",
+	                   Description = "Suggests using the class declaring a static function when calling it.",
+	                   Category = IssueCategories.PracticesAndImprovements,
+	                   Severity = Severity.Warning,
+                       AnalysisDisableKeyword = "AccessToStaticMemberViaDerivedType")]
+	public class AccessToStaticMemberViaDerivedTypeIssue : GatherVisitorCodeIssueProvider
+	{
+
+		#region ICodeIssueProvider implementation
+
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<AccessToStaticMemberViaDerivedTypeIssue>
+		{
+			readonly BaseRefactoringContext context;
+
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+				this.context = context;
+			}
+
+			public override void VisitMemberReferenceExpression(MemberReferenceExpression memberReferenceExpression)
+			{
+				base.VisitMemberReferenceExpression(memberReferenceExpression);
+				if (memberReferenceExpression == null || memberReferenceExpression.Target is ThisReferenceExpression)
+					// Call within current class scope using 'this' or 'base'
+					return;
+				var memberResolveResult = context.Resolve(memberReferenceExpression) as MemberResolveResult;
+				if (memberResolveResult == null)
+					return;
+				if (!memberResolveResult.Member.IsStatic)
+					return;
+				HandleMember(memberReferenceExpression, memberReferenceExpression.Target, memberResolveResult.Member, memberResolveResult.TargetResult);
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+				if (invocationExpression.Target is IdentifierExpression)
+					// Call within current class scope without 'this' or 'base'
+					return;
+				var memberReference = invocationExpression.Target as MemberReferenceExpression;
+				if (memberReference == null || memberReference.Target is ThisReferenceExpression)
+					// Call within current class scope using 'this' or 'base'
+					return;
+				var invocationResolveResult = context.Resolve(invocationExpression) as InvocationResolveResult;
+				if (invocationResolveResult == null)
+					return;
+				HandleMember(invocationExpression, memberReference.Target, invocationResolveResult.Member, invocationResolveResult.TargetResult);
+			}
+
+			void HandleMember(Expression issueAnchor, Expression targetExpression, IMember member, ResolveResult targetResolveResult)
+			{
+				var typeResolveResult = targetResolveResult as TypeResolveResult;
+				if (typeResolveResult == null)
+					return;
+				if (!member.IsStatic)
+					return;
+				if (typeResolveResult.Type.Equals(member.DeclaringType))
+					return;
+				// check whether member.DeclaringType contains the original type
+				// (curiously recurring template pattern)
+				var v = new ContainsTypeVisitor(typeResolveResult.Type.GetDefinition());
+				member.DeclaringType.AcceptVisitor(v);
+				if (v.IsContained)
+					return;
+				AddIssue(new CodeIssue(issueAnchor, context.TranslateString("Static method invoked via derived type"),
+					GetAction(context, targetExpression, member)));
+			}
+
+			CodeAction GetAction(BaseRefactoringContext context, Expression targetExpression,
+			                     IMember member)
+			{
+				var builder = context.CreateTypeSystemAstBuilder(targetExpression);
+				var newType = builder.ConvertType(member.DeclaringType);
+				string description = string.Format("{0} '{1}'", context.TranslateString("Use base qualifier"), newType.ToString());
+				return new CodeAction(description, script => {
+					script.Replace(targetExpression, newType);
+				}, targetExpression);
+			}
+
+			sealed class ContainsTypeVisitor : TypeVisitor
+			{
+				readonly ITypeDefinition searchedType;
+				internal bool IsContained;
+
+				public ContainsTypeVisitor(ITypeDefinition searchedType)
+				{
+					this.searchedType = searchedType;
+				}
+
+				public override IType VisitTypeDefinition(ITypeDefinition type)
+				{
+					if (type.Equals(searchedType))
+						IsContained = true;
+					return base.VisitTypeDefinition(type);
+				}
+			}
+		}
+
+		#endregion
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/BaseMemberHasParamsIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/BaseMemberHasParamsIssue.cs
new file mode 100644
index 0000000000..d727fb99c0
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/BaseMemberHasParamsIssue.cs
@@ -0,0 +1,83 @@
+//
+// BaseMemberHasParamsIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Base parameter has 'params' modifier, but missing in overrider",
+	                  Description = "Base parameter has 'params' modifier, but missing in overrider",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "BaseMemberHasParams")]
+	public class BaseMemberHasParamsIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<BaseMemberHasParamsIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				if (!methodDeclaration.HasModifier(Modifiers.Override))
+					return;
+				var lastParam = methodDeclaration.Parameters.LastOrDefault();
+				if (lastParam == null || lastParam.ParameterModifier == ParameterModifier.Params)
+					return;
+				var type = lastParam.Type as ComposedType;
+				if (type == null || !type.ArraySpecifiers.Any())
+					return;
+				var rr = ctx.Resolve(methodDeclaration) as MemberResolveResult;
+				if (rr == null)
+					return;
+				var baseMember = InheritanceHelper.GetBaseMember(rr.Member) as IMethod;
+				if (baseMember == null || baseMember.Parameters.Count == 0 || !baseMember.Parameters.Last().IsParams)
+					return;
+				AddIssue(new CodeIssue(
+					lastParam.NameToken,
+					string.Format(ctx.TranslateString("Base method '{0}' has a 'params' modifier"), baseMember.FullName),
+					ctx.TranslateString("Add 'params' modifier"),
+					script => {
+						script.ChangeModifier(lastParam, ParameterModifier.Params);
+					}
+				));
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				// SKIP
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ConvertIfDoToWhileIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ConvertIfDoToWhileIssue.cs
new file mode 100644
index 0000000000..b0ae363768
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ConvertIfDoToWhileIssue.cs
@@ -0,0 +1,88 @@
+//
+// ConvertIfDoToWhileIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("'if-do-while' statement can be re-written as 'while' statement",
+	                  Description = "Convert 'if-do-while' to 'while' statement",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ConvertIfDoToWhile")]
+	public class ConvertIfDoToWhileIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ConvertIfDoToWhileIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			static readonly AstNode ifPattern = 
+				new IfElseStatement(
+					new AnyNode ("condition"),
+					PatternHelper.EmbeddedStatement (
+						new DoWhileStatement (new AnyNode("condition2"), new AnyNode ("EmbeddedStatement"))
+					)
+				);
+
+			public override void VisitIfElseStatement(IfElseStatement ifElseStatement)
+			{
+				base.VisitIfElseStatement(ifElseStatement);
+				var match = ifPattern.Match(ifElseStatement);
+				if (match.Success) {
+					var cond1 = match.Get<Expression>("condition").Single();
+					var cond2 = match.Get<Expression>("condition2").Single();
+					if (!CSharpUtil.AreConditionsEqual(cond1, cond2))
+						return;
+					AddIssue(new CodeIssue(
+						ifElseStatement.IfToken,
+						ctx.TranslateString("Statement can be simplified to 'while' statement"),
+						ctx.TranslateString("Replace with 'while'"),
+						script => {
+							script.Replace(
+								ifElseStatement, 
+								new WhileStatement(
+									cond1.Clone(),
+									match.Get<Statement>("EmbeddedStatement").Single().Clone()
+								)
+							);
+						}
+					) { IssueMarker = IssueMarker.DottedLine });
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ConvertIfToOrExpressionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ConvertIfToOrExpressionIssue.cs
new file mode 100644
index 0000000000..315dd82d6c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ConvertIfToOrExpressionIssue.cs
@@ -0,0 +1,128 @@
+//
+// ConvertIfToOrExpressionIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("'if' statement can be re-written as '||' expression",
+	                  Description = "Convert 'if' to '||' expression",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ConvertIfToOrExpression")]
+	public class ConvertIfToOrExpressionIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ConvertIfToOrExpressionIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			static readonly AstNode ifPattern = 
+				new IfElseStatement(
+					new AnyNode ("condition"),
+					PatternHelper.EmbeddedStatement (
+						new AssignmentExpression(
+							new AnyNode("target"),
+							new PrimitiveExpression (true)
+						)
+					)
+				);
+
+			static readonly AstNode varDelarationPattern = 
+				new VariableDeclarationStatement(new AnyNode("type"), Pattern.AnyString, new AnyNode("initializer"));
+
+			void AddTo(IfElseStatement ifElseStatement, VariableDeclarationStatement varDeclaration, Expression expr)
+			{
+			}
+
+			public override void VisitIfElseStatement(IfElseStatement ifElseStatement)
+			{
+				base.VisitIfElseStatement(ifElseStatement);
+
+				var match = ifPattern.Match(ifElseStatement);
+				if (match.Success) {
+					var varDeclaration = ifElseStatement.GetPrevSibling(s => s.Role == BlockStatement.StatementRole) as VariableDeclarationStatement;
+					var target = match.Get<Expression>("target").Single();
+					var match2 = varDelarationPattern.Match(varDeclaration);
+					if (match2.Success) {
+						if (varDeclaration == null || target == null)
+							return;
+						var initializer = varDeclaration.Variables.FirstOrDefault();
+						if (initializer == null || !(target is IdentifierExpression) || ((IdentifierExpression)target).Identifier != initializer.Name)
+							return;
+						var expr = match.Get<Expression>("condition").Single();
+						AddIssue(new CodeIssue(
+							ifElseStatement.IfToken,
+							ctx.TranslateString("Convert to '||' expresssion"),
+							ctx.TranslateString("Replace with '||'"),
+							script => {
+								var variable = varDeclaration.Variables.First();
+								script.Replace(
+									varDeclaration, 
+									new VariableDeclarationStatement(
+									varDeclaration.Type.Clone(),
+									variable.Name,
+									new BinaryOperatorExpression(variable.Initializer.Clone(), BinaryOperatorType.ConditionalOr, expr.Clone()) 
+									)
+									);
+								script.Remove(ifElseStatement); 
+							}
+						) { IssueMarker = IssueMarker.DottedLine });
+						return;
+					} else {
+						var expr = match.Get<Expression>("condition").Single();
+						AddIssue(new CodeIssue(
+							ifElseStatement.IfToken,
+							ctx.TranslateString("Convert to '|=' expresssion"),
+							ctx.TranslateString("Replace with '|='"),
+							script => {
+								script.Replace(
+									ifElseStatement, 
+									new ExpressionStatement(
+										new AssignmentExpression(
+											target.Clone(),
+											AssignmentOperatorType.BitwiseOr,
+											expr.Clone()) 
+										)
+									);
+							}
+						));
+					}
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ConvertToConstantIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ConvertToConstantIssue.cs
new file mode 100644
index 0000000000..232953e947
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ConvertToConstantIssue.cs
@@ -0,0 +1,323 @@
+//
+// ConvertToConstantIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Threading;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using System;
+using System.Diagnostics;
+using ICSharpCode.NRefactory.Utils;
+using ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Convert local variable or field to constant",
+	                  Description = "Convert local variable or field to constant",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ConvertToConstant.Local")]
+	public class ConvertToConstantIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		internal static IEnumerable<FieldDeclaration> CollectFields<T>(GatherVisitorBase<T> provider, TypeDeclaration typeDeclaration) where T : CodeIssueProvider
+		{
+			var fieldVisitor = new ConvertToConstantIssue.FieldCollectVisitor<T>(provider.Ctx, typeDeclaration);
+			typeDeclaration.AcceptVisitor(fieldVisitor);
+			return fieldVisitor.CollectedFields;
+		}
+
+		class FieldCollectVisitor<T> : GatherVisitorBase<T>  where T : CodeIssueProvider
+		{
+			readonly TypeDeclaration typeDeclaration;
+			public readonly List<FieldDeclaration> CollectedFields = new List<FieldDeclaration>();
+
+			public FieldCollectVisitor(BaseRefactoringContext context, TypeDeclaration typeDeclaration) : base (context)
+			{
+				this.typeDeclaration = typeDeclaration;
+			}
+
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+				if (IsSuppressed(fieldDeclaration.StartLocation))
+					return;
+				CollectedFields.Add(fieldDeclaration); 
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				if (typeDeclaration != this.typeDeclaration)
+					return;
+				base.VisitTypeDeclaration(typeDeclaration);
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				// SKIP
+			}
+		}
+
+		class GatherVisitor : GatherVisitorBase<ConvertToConstantIssue>
+		{
+			readonly Stack<List<Tuple<VariableInitializer, IVariable>>> fieldStack = new Stack<List<Tuple<VariableInitializer, IVariable>>>();
+
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+			}
+
+			void Collect()
+			{
+				foreach (var varDecl in fieldStack.Peek()) {
+					AddIssue(new CodeIssue(
+						varDecl.Item1.NameToken,
+						ctx.TranslateString("Convert to constant"),
+						ctx.TranslateString("To const"),
+						script => {
+							var constVarDecl = (FieldDeclaration)varDecl.Item1.Parent;
+							script.ChangeModifier(constVarDecl, (constVarDecl.Modifiers & ~Modifiers.Static) | Modifiers.Const);
+						}
+					));
+				}
+			}
+
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				base.VisitBlockStatement(blockStatement);
+				if (blockStatement.Parent is EntityDeclaration || blockStatement.Parent is Accessor) {
+					var assignmentAnalysis = new VariableUsageAnalyzation (ctx);
+					var newVars = new List<Tuple<VariableInitializer, IVariable>>();
+					blockStatement.AcceptVisitor(assignmentAnalysis); 
+					foreach (var variable in fieldStack.Pop()) {
+						if (assignmentAnalysis.GetStatus(variable.Item2) == VariableState.Changed)
+							continue;
+						newVars.Add(variable);
+					}
+					fieldStack.Push(newVars);
+				}
+			}
+
+			static bool IsValidConstType(IType type)
+			{
+				var def = type.GetDefinition();
+				if (def == null)
+					return false;
+				return KnownTypeCode.Boolean <= def.KnownTypeCode && def.KnownTypeCode <= KnownTypeCode.Decimal ||
+					def.KnownTypeCode == KnownTypeCode.String;
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				var list = new List<Tuple<VariableInitializer, IVariable>>();
+				fieldStack.Push(list);
+				foreach (var fieldDeclaration in ConvertToConstantIssue.CollectFields(this, typeDeclaration)) {
+					if (IsSuppressed(fieldDeclaration.StartLocation))
+						continue;
+					if (fieldDeclaration.Modifiers.HasFlag (Modifiers.Const) || fieldDeclaration.Modifiers.HasFlag (Modifiers.Readonly))
+						continue;
+					if (fieldDeclaration.HasModifier(Modifiers.Public) || fieldDeclaration.HasModifier(Modifiers.Protected) || fieldDeclaration.HasModifier(Modifiers.Internal))
+						continue;
+					if (fieldDeclaration.Variables.Any (v => !(ctx.Resolve (v.Initializer) is ConstantResolveResult)))
+						continue;
+					var rr = ctx.Resolve(fieldDeclaration.ReturnType);
+					if (!IsValidConstType(rr.Type))
+						continue;
+					if (fieldDeclaration.Variables.Count() > 1)
+						continue;
+					var variable = fieldDeclaration.Variables.First();
+					var mr = ctx.Resolve(variable) as MemberResolveResult;
+					if (mr == null)
+						continue;
+					list.Add(Tuple.Create(variable, mr.Member as IVariable)); 
+				}
+				base.VisitTypeDeclaration(typeDeclaration);
+				Collect();
+				fieldStack.Pop();
+			}
+
+			public override void VisitVariableDeclarationStatement (VariableDeclarationStatement varDecl)
+			{
+				base.VisitVariableDeclarationStatement(varDecl);
+				if (varDecl.Modifiers.HasFlag (Modifiers.Const) || varDecl.Role == ForStatement.InitializerRole)
+					return;
+				if (varDecl.Variables.Count () > 1)
+					return;
+				if (varDecl.Variables.Any (v => !(ctx.Resolve (v.Initializer) is ConstantResolveResult)))
+					return;
+				var containingBlock = varDecl.GetParent<BlockStatement> ();
+				if (containingBlock == null)
+					return;
+
+				var returnTypeRR = ctx.Resolve(varDecl.Type);
+				if (returnTypeRR.Type.IsReferenceType.HasValue && returnTypeRR.Type.IsReferenceType.Value)
+					return;
+
+				var variable = varDecl.Variables.First();
+				var vr = ctx.Resolve(variable) as LocalResolveResult;
+				if (vr == null)
+					return;
+
+				if (ctx.Resolve(variable.Initializer).ConstantValue == null)
+					return;
+
+				var assignmentAnalysis = new VariableUsageAnalyzation (ctx);
+
+				containingBlock.AcceptVisitor(assignmentAnalysis);
+
+				if (assignmentAnalysis.GetStatus(vr.Variable) == VariableState.Changed)
+					return;
+				AddIssue (new CodeIssue(
+					variable.NameToken,
+					ctx.TranslateString ("Convert to constant"),
+					ctx.TranslateString ("To const"),
+					script => {
+						var constVarDecl = (VariableDeclarationStatement)varDecl.Clone ();
+						constVarDecl.Modifiers |= Modifiers.Const;
+						if (varDecl.Type.IsVar()) {
+							var builder = ctx.CreateTypeSystemAstBuilder(varDecl);
+							constVarDecl.Type = builder.ConvertType (ctx.Resolve(varDecl.Type).Type);
+						}
+						script.Replace (varDecl, constVarDecl);
+					}
+				));
+			}
+		}
+	
+
+		public class VariableUsageAnalyzation : DepthFirstAstVisitor
+		{
+			readonly BaseRefactoringContext context;
+
+			readonly Dictionary<IVariable, VariableState> states = new Dictionary<IVariable, VariableState> ();
+
+			TextLocation startLocation = TextLocation.Empty;
+			TextLocation endLocation = TextLocation.Empty;
+
+			public VariableUsageAnalyzation (BaseRefactoringContext context)
+			{
+				this.context = context;
+			}
+
+			public bool Has(IVariable variable)
+			{
+				return states.ContainsKey (variable);
+			}
+
+			public void SetAnalyzedRange(AstNode start, AstNode end, bool startInclusive = true, bool endInclusive = true)
+			{
+				if (start == null)
+					throw new ArgumentNullException("start");
+				if (end == null)
+					throw new ArgumentNullException("end");
+				startLocation = startInclusive ? start.StartLocation : start.EndLocation;
+				endLocation = endInclusive ? end.EndLocation : end.StartLocation;
+				states.Clear ();
+			}
+
+			public VariableState GetStatus (IVariable variable)
+			{
+				VariableState state;
+				if (!states.TryGetValue (variable, out state))
+					return VariableState.None;
+				return state;
+			}
+
+			void SetState (ResolveResult rr, VariableState state)
+			{
+				IVariable variable = null;
+				var lr = rr as LocalResolveResult;
+				if (lr != null)
+					variable = lr.Variable;
+				var mr = rr as MemberResolveResult;
+				if (mr != null)
+					variable = mr.Member as IVariable;
+				if (variable == null)
+					return;
+				var sv = variable as SpecializedField;
+				if (sv != null) {
+					variable = sv.MemberDefinition as IVariable;
+				}
+				VariableState oldState;
+				if (states.TryGetValue (variable, out oldState)) {
+					if (oldState < state)
+						states [variable] = state;
+				} else {
+					states [variable] = state;
+				}
+			}
+
+			public override void VisitIdentifierExpression(IdentifierExpression identifierExpression)
+			{
+				if (startLocation.IsEmpty || startLocation <= identifierExpression.StartLocation && identifierExpression.EndLocation <= endLocation) {
+					SetState (context.Resolve(identifierExpression), VariableState.Used);
+				}
+			}
+
+			public override void VisitAssignmentExpression(AssignmentExpression assignmentExpression)
+			{
+				if (startLocation.IsEmpty || startLocation <= assignmentExpression.StartLocation && assignmentExpression.EndLocation <= endLocation) {
+					SetState(context.Resolve(assignmentExpression.Left), VariableState.Changed);
+				}
+				base.VisitAssignmentExpression (assignmentExpression);
+			}
+
+			public override void VisitDirectionExpression(DirectionExpression directionExpression)
+			{
+				if (startLocation.IsEmpty || startLocation <= directionExpression.StartLocation && directionExpression.EndLocation <= endLocation) {
+					SetState(context.Resolve(directionExpression.Expression), VariableState.Changed);
+				}
+				base.VisitDirectionExpression (directionExpression);
+			}
+
+			public override void VisitUnaryOperatorExpression(UnaryOperatorExpression unaryOperatorExpression)
+			{
+				if (startLocation.IsEmpty || startLocation <= unaryOperatorExpression.StartLocation && unaryOperatorExpression.EndLocation <= endLocation) {
+					if (unaryOperatorExpression.Operator == UnaryOperatorType.Increment || unaryOperatorExpression.Operator == UnaryOperatorType.Decrement ||
+					    unaryOperatorExpression.Operator == UnaryOperatorType.PostIncrement || unaryOperatorExpression.Operator == UnaryOperatorType.PostDecrement) {
+						SetState(context.Resolve(unaryOperatorExpression.Expression), VariableState.Changed);
+					}
+				}
+				base.VisitUnaryOperatorExpression (unaryOperatorExpression);
+			}
+
+			public override void VisitNamedExpression(NamedExpression namedExpression)
+			{
+				SetState(context.Resolve(namedExpression), VariableState.Changed);
+				base.VisitNamedExpression(namedExpression);
+			}
+
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/EmptyEmbeddedStatementIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/EmptyEmbeddedStatementIssue.cs
new file mode 100644
index 0000000000..3ad11d89f5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/EmptyEmbeddedStatementIssue.cs
@@ -0,0 +1,99 @@
+//
+// Issue.cs
+//
+// Author:
+//       Ciprian Khlud <ciprian.mustiata@yahoo.com>
+//
+// Copyright (c) 2013 Ciprian Khlud
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Empty control statement body",
+	                   Description = "';' should be avoided. Use '{}' instead",
+	                   Category = IssueCategories.PracticesAndImprovements,
+	                   Severity = Severity.Warning,
+	                   AnalysisDisableKeyword = "EmptyEmbeddedStatement")]
+	public class EmptyEmbeddedStatementIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<EmptyEmbeddedStatementIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitWhileStatement(WhileStatement whileStatement)
+			{
+				base.VisitWhileStatement(whileStatement);
+				var statement = whileStatement.EmbeddedStatement as EmptyStatement;
+				if (statement == null)
+					return;
+
+				AddIssue(new CodeIssue(whileStatement.EmbeddedStatement,
+				                     ctx.TranslateString("';' should be avoided. Use '{}' instead"), ctx.TranslateString("Replace with '{}'"),
+					script => script.Replace(whileStatement.EmbeddedStatement, new BlockStatement())));
+			}
+
+			public override void VisitForeachStatement(ForeachStatement foreachStatement)
+			{
+				base.VisitForeachStatement(foreachStatement);
+				var statement = foreachStatement.EmbeddedStatement as EmptyStatement;
+				if (statement == null)
+					return;
+
+				AddIssue(new CodeIssue(foreachStatement.EmbeddedStatement,
+				                     ctx.TranslateString("';' should be avoided. Use '{}' instead"), ctx.TranslateString("Replace with '{}'"),
+					script => script.Replace(foreachStatement.EmbeddedStatement, new BlockStatement())));
+			}
+
+			public override void VisitIfElseStatement(IfElseStatement ifElseStatement)
+			{
+				base.VisitIfElseStatement(ifElseStatement);
+				var statement = ifElseStatement.TrueStatement as EmptyStatement;
+				if (statement == null)
+					return;
+				AddIssue(new CodeIssue(ifElseStatement.TrueStatement, 
+				                     ctx.TranslateString("';' should be avoided. Use '{}' instead"), ctx.TranslateString("Replace with '{}'"),
+					script => script.Replace(ifElseStatement.TrueStatement, new BlockStatement())));
+			}
+
+			public override void VisitForStatement(ForStatement forStatement)
+			{
+				base.VisitForStatement(forStatement);
+
+				var statement = forStatement.EmbeddedStatement as EmptyStatement;
+				if (statement == null)
+					return;
+
+				AddIssue(new CodeIssue(forStatement.EmbeddedStatement,
+				                     ctx.TranslateString("';' should be avoided. Use '{}' instead"), ctx.TranslateString("Replace with '{}'"),
+					script => script.Replace(forStatement.EmbeddedStatement, new BlockStatement())));
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/FieldCanBeMadeReadOnlyIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/FieldCanBeMadeReadOnlyIssue.cs
new file mode 100644
index 0000000000..c9f33feb5b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/FieldCanBeMadeReadOnlyIssue.cs
@@ -0,0 +1,128 @@
+//
+// FieldCanBeMadeReadOnlyIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Threading;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using System;
+using System.Diagnostics;
+using ICSharpCode.NRefactory.Utils;
+using ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Convert field to readonly",
+	                  Description = "Convert field to readonly",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "FieldCanBeMadeReadOnly.Local")]
+	public class FieldCanBeMadeReadOnlyIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<FieldCanBeMadeReadOnlyIssue>
+		{
+			readonly Stack<List<Tuple<VariableInitializer, IVariable>>> fieldStack = new Stack<List<Tuple<VariableInitializer, IVariable>>>();
+
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+			}
+
+			void Collect()
+			{
+				foreach (var varDecl in fieldStack.Peek()) {
+					AddIssue(new CodeIssue(
+						varDecl.Item1.NameToken,
+						ctx.TranslateString("Convert to readonly"),
+						ctx.TranslateString("To readonly"),
+						script => {
+						var field = (FieldDeclaration)varDecl.Item1.Parent;
+						script.ChangeModifier(field, field.Modifiers | Modifiers.Readonly);
+					}
+					));
+				}
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{	
+				var list = new List<Tuple<VariableInitializer, IVariable>>();
+				fieldStack.Push(list);
+
+				foreach (var fieldDeclaration in ConvertToConstantIssue.CollectFields (this, typeDeclaration)) {
+					if (fieldDeclaration.HasModifier(Modifiers.Const) || fieldDeclaration.HasModifier(Modifiers.Readonly))
+						continue;
+					if (fieldDeclaration.HasModifier(Modifiers.Public) || fieldDeclaration.HasModifier(Modifiers.Protected) || fieldDeclaration.HasModifier(Modifiers.Internal))
+						continue;
+					if (fieldDeclaration.Variables.Count() > 1)
+						continue;
+					var variable = fieldDeclaration.Variables.First();
+					var rr = ctx.Resolve(fieldDeclaration.ReturnType);
+					if ((rr.Type.IsReferenceType.HasValue && !rr.Type.IsReferenceType.Value) && (ctx.Resolve (variable.Initializer) is ConstantResolveResult))
+						continue;
+
+					var mr = ctx.Resolve(variable) as MemberResolveResult;
+					if (mr == null)
+						continue;
+					list.Add(Tuple.Create(variable, mr.Member as IVariable)); 
+				}
+				base.VisitTypeDeclaration(typeDeclaration);
+				Collect();
+				fieldStack.Pop();
+			}
+
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+				foreach (var node in constructorDeclaration.Descendants) {
+					if (node is AnonymousMethodExpression || node is LambdaExpression) {
+						node.AcceptVisitor(this);
+					}
+				}
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				var assignmentAnalysis = new ConvertToConstantIssue.VariableUsageAnalyzation (ctx);
+				var newVars = new List<Tuple<VariableInitializer, IVariable>>();
+				blockStatement.AcceptVisitor(assignmentAnalysis); 
+				foreach (var variable in fieldStack.Pop()) {
+					if (assignmentAnalysis.GetStatus(variable.Item2) == VariableState.Changed)
+						continue;
+					newVars.Add(variable);
+				}
+				fieldStack.Push(newVars);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/MemberCanBeMadeStaticIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/MemberCanBeMadeStaticIssue.cs
new file mode 100644
index 0000000000..5f1d35fcf5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/MemberCanBeMadeStaticIssue.cs
@@ -0,0 +1,209 @@
+//
+// MemberCanBeMadeStaticIssue.cs
+//
+// Author:
+//       Ciprian Khlud <ciprian.mustiata@yahoo.com>
+//       Mike krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Ciprian Khlud
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Member can be made static",
+	                  Description = "A member doesn't use 'this' object neither explicit nor implicit. It can be made static.",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Hint,
+	                  AnalysisDisableKeyword = "MemberCanBeMadeStatic.Local"
+	                  )]
+	[SubIssueAttribute(CommonSubIssues.PrivateMember)]
+	[SubIssueAttribute(CommonSubIssues.NonPrivateMember, false)]
+	public class MemberCanBeMadeStaticIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		private class GatherVisitor : GatherVisitorBase<MemberCanBeMadeStaticIssue>
+		{
+			bool CheckPrivateMember {
+				get {
+					return SubIssue == CommonSubIssues.PrivateMember;
+				}
+			}
+
+			public GatherVisitor(BaseRefactoringContext context)
+				: base(context)
+			{
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				var rr = ctx.Resolve(typeDeclaration);
+				if (rr.Type.GetNonInterfaceBaseTypes().Any(t => t.Name == "MarshalByRefObject" && t.Namespace == "System"))
+					return; // ignore MarshalByRefObject, as only instance method calls get marshaled
+				
+				base.VisitTypeDeclaration(typeDeclaration);
+			}
+
+			bool SkipMember(IMember resolved)
+			{
+				return resolved.Accessibility == Accessibility.Private && !CheckPrivateMember ||
+					resolved.Accessibility != Accessibility.Private && CheckPrivateMember;
+			}
+			
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				var context = ctx;
+				if (methodDeclaration.HasModifier(Modifiers.Static) ||
+				    methodDeclaration.HasModifier(Modifiers.Virtual) ||
+				    methodDeclaration.HasModifier(Modifiers.Override) ||
+				    methodDeclaration.HasModifier(Modifiers.New) ||
+				    methodDeclaration.Attributes.Any())
+					return;
+
+				var body = methodDeclaration.Body;
+				// skip empty methods
+				if (!body.Statements.Any())
+					return;
+
+				if (body.Statements.Count == 1) {
+					if (body.Statements.First () is ThrowStatement)
+						return;
+				}
+					
+				var resolved = context.Resolve(methodDeclaration) as MemberResolveResult;
+				if (resolved == null || SkipMember(resolved.Member))
+					return;
+				var isImplementingInterface = resolved.Member.ImplementedInterfaceMembers.Any();
+				if (isImplementingInterface)
+					return;
+
+				if (StaticVisitor.UsesNotStaticMember(context, body))
+					return;
+				
+				AddIssue(new CodeIssue(
+					methodDeclaration.NameToken.StartLocation, methodDeclaration.NameToken.EndLocation,
+					string.Format(context.TranslateString("Method '{0}' can be made static."), methodDeclaration.Name),
+					string.Format(context.TranslateString("Make '{0}' static"), methodDeclaration.Name),
+					script => script.ChangeModifier(methodDeclaration, methodDeclaration.Modifiers | Modifiers.Static)) { IssueMarker = IssueMarker.DottedLine });
+			}
+
+			static bool IsEmpty(Accessor setter)
+			{
+				return setter.IsNull || 
+					!setter.Body.Statements.Any() ||
+					setter.Body.Statements.Count == 1 && setter.Body.Statements.First () is ThrowStatement;
+			}
+
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+				if (propertyDeclaration.HasModifier(Modifiers.Static) ||
+				    propertyDeclaration.HasModifier(Modifiers.Virtual) ||
+				    propertyDeclaration.HasModifier(Modifiers.Override) ||
+				    propertyDeclaration.HasModifier(Modifiers.New) ||
+				    propertyDeclaration.Attributes.Any())
+					return;
+
+				if (IsEmpty(propertyDeclaration.Setter) && IsEmpty(propertyDeclaration.Getter))
+					return;
+
+
+				var resolved = ctx.Resolve(propertyDeclaration) as MemberResolveResult;
+				if (resolved == null || SkipMember(resolved.Member))
+					return;
+				var isImplementingInterface = resolved.Member.ImplementedInterfaceMembers.Any();
+				if (isImplementingInterface)
+					return;
+
+				if (!propertyDeclaration.Getter.IsNull && StaticVisitor.UsesNotStaticMember(ctx, propertyDeclaration.Getter.Body) ||
+				    !propertyDeclaration.Setter.IsNull && StaticVisitor.UsesNotStaticMember(ctx, propertyDeclaration.Setter.Body))
+					return;
+
+				AddIssue(new CodeIssue(propertyDeclaration.NameToken.StartLocation, propertyDeclaration.NameToken.EndLocation,
+				         string.Format(ctx.TranslateString("Property '{0}' can be made static."), propertyDeclaration.Name),
+				         string.Format(ctx.TranslateString("Make '{0}' static"), propertyDeclaration.Name),
+					script => script.ChangeModifier(propertyDeclaration, propertyDeclaration.Modifiers | Modifiers.Static)) { IssueMarker = IssueMarker.DottedLine });
+			}
+
+			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
+			{
+				if (eventDeclaration.HasModifier(Modifiers.Static) ||
+				    eventDeclaration.HasModifier(Modifiers.Virtual) ||
+				    eventDeclaration.HasModifier(Modifiers.Override) ||
+				    eventDeclaration.HasModifier(Modifiers.New) ||
+				    eventDeclaration.Attributes.Any())
+					return;
+
+				if (IsEmpty(eventDeclaration.RemoveAccessor) && IsEmpty(eventDeclaration.AddAccessor))
+					return;
+
+
+				var resolved = ctx.Resolve(eventDeclaration) as MemberResolveResult;
+				if (resolved == null || SkipMember(resolved.Member))
+					return;
+				var isImplementingInterface = resolved.Member.ImplementedInterfaceMembers.Any();
+				if (isImplementingInterface)
+					return;
+
+				if (!eventDeclaration.AddAccessor.IsNull && StaticVisitor.UsesNotStaticMember(ctx, eventDeclaration.AddAccessor.Body) ||
+				    !eventDeclaration.RemoveAccessor.IsNull && StaticVisitor.UsesNotStaticMember(ctx, eventDeclaration.RemoveAccessor.Body))
+					return;
+
+				AddIssue(new CodeIssue(eventDeclaration.NameToken.StartLocation, eventDeclaration.NameToken.EndLocation,
+				         string.Format(ctx.TranslateString("Event '{0}' can be made static."), eventDeclaration.Name),
+				         string.Format(ctx.TranslateString("Make '{0}' static"), eventDeclaration.Name),
+					script => script.ChangeModifier(eventDeclaration, eventDeclaration.Modifiers | Modifiers.Static)) { IssueMarker = IssueMarker.DottedLine });
+			}
+
+
+			static void DoStaticMethodGlobalOperation(AstNode fnode, RefactoringContext fctx, MemberResolveResult rr,
+			                                                           Script fscript)
+			{
+				if (fnode is MemberReferenceExpression) {
+					var memberReference = new MemberReferenceExpression(
+						fctx.CreateShortType(rr.Member.DeclaringType),
+						rr.Member.Name
+					);
+					fscript.Replace(fnode, memberReference);
+				} else {
+					var invoke = fnode as InvocationExpression;
+					if (invoke == null)
+						return;
+					if ((invoke.Target is MemberReferenceExpression))
+						return;
+					var memberReference = new MemberReferenceExpression(
+						fctx.CreateShortType(rr.Member.DeclaringType),
+						rr.Member.Name
+					);
+					fscript.Replace(invoke.Target, memberReference);
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ParameterCanBeDeclaredWithBaseTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ParameterCanBeDeclaredWithBaseTypeIssue.cs
new file mode 100644
index 0000000000..9f4da08fe0
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ParameterCanBeDeclaredWithBaseTypeIssue.cs
@@ -0,0 +1,565 @@
+//
+// ParameterCouldBeDeclaredWithBaseTypeIssue.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+using System;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using System.Diagnostics;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Parameter can be declared with base type",
+		Description = "Finds parameters that can be demoted to a base class.",
+		Category = IssueCategories.PracticesAndImprovements,
+		Severity = Severity.Hint,
+		SuppressMessageCategory="Microsoft.Design",
+		SuppressMessageCheckId="CA1011:ConsiderPassingBaseTypesAsParameters"
+	)]
+	public class ParameterCanBeDeclaredWithBaseTypeIssue : GatherVisitorCodeIssueProvider
+	{
+		bool tryResolve;
+
+		public ParameterCanBeDeclaredWithBaseTypeIssue() : this (true)
+		{
+		}
+
+		public ParameterCanBeDeclaredWithBaseTypeIssue(bool tryResolve)
+		{
+			this.tryResolve = tryResolve;
+		}
+
+		#region ICodeIssueProvider implementation
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context, tryResolve);
+		}
+		#endregion
+
+		class GatherVisitor : GatherVisitorBase<ParameterCanBeDeclaredWithBaseTypeIssue>
+		{
+			bool tryResolve;
+			
+			public GatherVisitor(BaseRefactoringContext context, bool tryResolve) : base (context)
+			{
+				this.tryResolve = tryResolve;
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				methodDeclaration.Attributes.AcceptVisitor(this);
+				if (HasEntryPointSignature(methodDeclaration) || methodDeclaration.HasModifier(Modifiers.Public) || methodDeclaration.HasModifier(Modifiers.Protected))
+					return;
+				var eligibleParameters = methodDeclaration.Parameters
+					.Where(p => p.ParameterModifier != ParameterModifier.Out && p.ParameterModifier != ParameterModifier.Ref)
+					.ToList();
+				if (eligibleParameters.Count == 0)
+					return;
+				var declarationResolveResult = ctx.Resolve(methodDeclaration) as MemberResolveResult;
+				if (declarationResolveResult == null)
+					return;
+				var member = declarationResolveResult.Member;
+				if (member.IsOverride || member.IsOverridable || member.ImplementedInterfaceMembers.Any())
+					return;
+
+				var collector = new TypeCriteriaCollector(ctx);
+				methodDeclaration.AcceptVisitor(collector);
+
+				foreach (var parameter in eligibleParameters) {
+					ProcessParameter(parameter, methodDeclaration.Body, collector);
+				}
+			}
+
+			bool HasEntryPointSignature(MethodDeclaration methodDeclaration)
+			{
+				if (!methodDeclaration.Modifiers.HasFlag(Modifiers.Static))
+					return false;
+				var returnType = ctx.Resolve(methodDeclaration.ReturnType).Type;
+				if (!returnType.IsKnownType(KnownTypeCode.Int32) && !returnType.IsKnownType(KnownTypeCode.Void))
+					return false;
+				var parameterCount = methodDeclaration.Parameters.Count;
+				if (parameterCount == 0)
+					return true;
+				if (parameterCount != 1)
+					return false;
+				var parameterType = ctx.Resolve(methodDeclaration.Parameters.First()).Type as ArrayType;
+				if (parameterType == null || !parameterType.ElementType.IsKnownType(KnownTypeCode.String))
+					return false;
+				return true;
+			}
+
+			bool FilterOut(IType current, IType newType)
+			{
+				// Filter out some strange framework types like _Exception
+				return newType.Namespace.StartsWith("System.", StringComparison.Ordinal) && 
+					   newType.Name.StartsWith("_", StringComparison.Ordinal) ? true : false;
+			}
+
+			void ProcessParameter(ParameterDeclaration parameter, AstNode rootResolutionNode, TypeCriteriaCollector collector)
+			{
+				var localResolveResult = ctx.Resolve(parameter) as LocalResolveResult;
+				if (localResolveResult == null)
+					return;
+				var variable = localResolveResult.Variable;
+				var typeKind = variable.Type.Kind;
+				if (!(typeKind == TypeKind.Class ||
+					  typeKind == TypeKind.Struct ||
+					  typeKind == TypeKind.Interface ||
+					  typeKind == TypeKind.Array) ||
+				    parameter.Type is PrimitiveType ||
+					!collector.UsedVariables.Contains(variable)) {
+					return;
+				}
+
+				var candidateTypes = localResolveResult.Type.GetAllBaseTypes().ToList();
+				TypesChecked += candidateTypes.Count;
+				var criterion = collector.GetCriterion(variable);
+
+				var possibleTypes = 
+					(from type in candidateTypes
+					 where !type.Equals(localResolveResult.Type) && criterion.SatisfiedBy(type)
+					 select type).ToList();
+
+				TypeResolveCount += possibleTypes.Count;
+				var validTypes = 
+					(from type in possibleTypes
+					 where (!tryResolve || TypeChangeResolvesCorrectly(ctx, parameter, rootResolutionNode, type)) && !FilterOut (variable.Type, type)
+					 select type).ToList();
+				if (validTypes.Any()) {
+					AddIssue(new CodeIssue(parameter.Type, ctx.TranslateString("Parameter can be declared with base type"), GetActions(parameter, validTypes)) {
+						IssueMarker = IssueMarker.DottedLine
+					});
+					MembersWithIssues++;
+				}
+			}
+
+			internal int TypeResolveCount = 0;
+			internal int TypesChecked = 0;
+			internal int MembersWithIssues = 0;
+			internal int MethodResolveCount = 0;
+
+			IEnumerable<CodeAction> GetActions(ParameterDeclaration parameter, IEnumerable<IType> possibleTypes)
+			{
+				var csResolver = ctx.Resolver.GetResolverStateBefore(parameter);
+				var astBuilder = new TypeSystemAstBuilder(csResolver);
+				foreach (var type in possibleTypes) {
+					var localType = type;
+					var message = String.Format(ctx.TranslateString("Demote parameter to '{0}'"), type.FullName);
+					yield return new CodeAction(message, script => {
+						script.Replace(parameter.Type, astBuilder.ConvertType(localType));
+					}, parameter.Type);
+				}
+			}
+		}
+
+	    public static bool TypeChangeResolvesCorrectly(BaseRefactoringContext ctx, ParameterDeclaration parameter, AstNode rootNode, IType type)
+	    {
+	        var resolver = ctx.GetResolverStateBefore(rootNode);
+	        resolver = resolver.AddVariable(new DefaultParameter(type, parameter.Name));
+	        var astResolver = new CSharpAstResolver(resolver, rootNode, ctx.UnresolvedFile);
+	        var validator = new TypeChangeValidationNavigator();
+	        astResolver.ApplyNavigator(validator, ctx.CancellationToken);
+	        return !validator.FoundErrors;
+	    }
+
+	    class TypeChangeValidationNavigator : IResolveVisitorNavigator
+		{
+			public bool FoundErrors { get; private set; }
+
+			#region IResolveVisitorNavigator implementation
+			public ResolveVisitorNavigationMode Scan(AstNode node)
+			{
+				if (FoundErrors)
+					return ResolveVisitorNavigationMode.Skip;
+				return ResolveVisitorNavigationMode.Resolve;
+			}
+
+			public void Resolved(AstNode node, ResolveResult result)
+			{
+//				bool errors = result.IsError;
+				FoundErrors |= result.IsError;
+			}
+
+			public void ProcessConversion(Expression expression, ResolveResult result, Conversion conversion, IType targetType)
+			{
+				// no-op
+			}
+			#endregion
+			
+		}
+	}
+
+	public interface ITypeCriterion
+	{
+		/// <summary>
+		/// Checks if the given type satisfies the critrion.
+		/// </summary>
+		/// <returns>
+		/// <c>true</c>, if the type satisfies the criterion, <c>false</c> otherwise.
+		/// </returns>
+		/// <param name='type'>
+		/// The type to check.
+		/// </param>
+		bool SatisfiedBy(IType type);
+	}
+
+	public class SupportsIndexingCriterion : ITypeCriterion
+	{
+		IType returnType;
+
+		IList<IType> argumentTypes;
+
+		CSharpConversions conversions;
+
+		bool isWriteAccess;
+
+		public SupportsIndexingCriterion(IType returnType, IEnumerable<IType> argumentTypes, CSharpConversions conversions, bool isWriteAccess = false)
+		{
+			if (returnType == null)
+				throw new ArgumentNullException("returnType");
+			if (argumentTypes == null)
+				throw new ArgumentNullException("argumentTypes");
+			if (conversions == null)
+				throw new ArgumentNullException("conversions");
+
+			this.returnType = returnType;
+			this.argumentTypes = argumentTypes.ToList();
+			this.conversions = conversions;
+			this.isWriteAccess = isWriteAccess;
+		}
+
+		#region ITypeCriterion implementation
+
+		public bool SatisfiedBy(IType type)
+		{
+			var accessors = type.GetAccessors().ToList();
+			return accessors.Any(member => {
+				var parameterizedMember = member as IParameterizedMember;
+				if (parameterizedMember == null)
+					return false;
+
+				if (isWriteAccess) {
+					var parameterCount = member.Parameters.Count;
+					if (member.Name != "set_Item" || parameterCount < 2)
+						return false;
+					var indexerElementType = parameterizedMember.Parameters.Last().Type;
+					var indexerParameterTypes = parameterizedMember.Parameters.Take(parameterCount - 1).Select(p => p.Type).ToList();
+					return IsSignatureMatch(indexerElementType, indexerParameterTypes);
+				} else {
+					if (member.Name != "get_Item" || member.Parameters.Count < 1)
+						return false;
+					var indexerElementType = parameterizedMember.ReturnType;
+					var indexerParameterTypes = parameterizedMember.Parameters.Select(p => p.Type).ToList();
+					return IsSignatureMatch(indexerElementType, indexerParameterTypes);
+				}
+			});
+		}
+
+		#endregion
+
+		bool IsSignatureMatch(IType indexerElementType, IList<IType> indexerParameterTypes)
+		{
+			indexerElementType.GetAllBaseTypes();
+			if (indexerParameterTypes.Count != argumentTypes.Count)
+				return false;
+			var returnConversion = conversions.ImplicitConversion(indexerElementType, returnType);
+			if (!returnConversion.IsValid)
+				return false;
+			for (int i = 0; i < argumentTypes.Count; i++) {
+				var conversion = conversions.ImplicitConversion(indexerParameterTypes[i], argumentTypes[i]);
+				if (!conversion.IsValid)
+					return false;
+			}
+			return true;
+		}
+	}
+
+	public class TypeCriteriaCollector : DepthFirstAstVisitor
+	{
+		BaseRefactoringContext context;
+
+		public TypeCriteriaCollector(BaseRefactoringContext context)
+		{
+			this.context = context;
+			TypeCriteria = new Dictionary<IVariable, IList<ITypeCriterion>>();
+			UsedVariables = new HashSet<IVariable>();
+		}
+
+		IDictionary<IVariable, IList<ITypeCriterion>> TypeCriteria { get; set; }
+
+		public HashSet<IVariable> UsedVariables { get; private set; }
+
+		public ITypeCriterion GetCriterion(IVariable variable)
+		{
+			if (!TypeCriteria.ContainsKey(variable))
+				return new ConjunctionCriteria(new List<ITypeCriterion>());
+			return new ConjunctionCriteria(TypeCriteria[variable]);
+		}
+
+		void AddCriterion(IVariable variable, ITypeCriterion criterion)
+		{
+			if (!TypeCriteria.ContainsKey(variable))
+				TypeCriteria[variable] = new List<ITypeCriterion>();
+			TypeCriteria[variable].Add(criterion);
+		}
+
+		public override void VisitMemberReferenceExpression(MemberReferenceExpression memberReferenceExpression)
+		{
+			base.VisitMemberReferenceExpression(memberReferenceExpression);
+
+			var targetResolveResult = context.Resolve(memberReferenceExpression.Target) as LocalResolveResult;
+			if (targetResolveResult == null)
+				return;
+			var variable = targetResolveResult.Variable;
+			var conversion = context.GetConversion(memberReferenceExpression);
+			if (conversion.IsMethodGroupConversion) {
+				AddCriterion(variable, new HasMemberCriterion(conversion.Method));
+			} else {
+				var resolveResult = context.Resolve(memberReferenceExpression);
+				var memberResolveResult = resolveResult as MemberResolveResult;
+				if (memberResolveResult != null)
+					AddCriterion(variable, new HasMemberCriterion(memberResolveResult.Member));
+			}
+		}
+
+		public override void VisitIndexerExpression(IndexerExpression indexerExpression)
+		{
+			base.VisitIndexerExpression(indexerExpression);
+
+			var localResolveResult = context.Resolve(indexerExpression.Target) as LocalResolveResult;
+			if (localResolveResult == null)
+				return;
+			var resolveResult = context.Resolve(indexerExpression);
+			if (localResolveResult == null)
+				return;
+			var parent = indexerExpression.Parent;
+			while (parent is ParenthesizedExpression)
+				parent = parent.Parent;
+			if (parent is DirectionExpression) {
+				// The only types which are indexable and where the indexing expression
+				// results in a variable is an actual array type
+				AddCriterion(localResolveResult.Variable, new IsArrayTypeCriterion());
+			} else if (resolveResult is ArrayAccessResolveResult) {
+				var arrayResolveResult = (ArrayAccessResolveResult)resolveResult;
+				var arrayType = arrayResolveResult.Array.Type as ArrayType;
+				if (arrayType != null) {
+					var parameterTypes = arrayResolveResult.Indexes.Select(index => index.Type);
+					var criterion = new SupportsIndexingCriterion(arrayType.ElementType, parameterTypes, CSharpConversions.Get(context.Compilation));
+					AddCriterion(localResolveResult.Variable, criterion);
+				}
+			} else if (resolveResult is CSharpInvocationResolveResult) {
+				var invocationResolveResult = (CSharpInvocationResolveResult)resolveResult;
+				var parameterTypes = invocationResolveResult.Arguments.Select(arg => arg.Type);
+				var criterion = new SupportsIndexingCriterion(invocationResolveResult.Member.ReturnType, parameterTypes, CSharpConversions.Get(context.Compilation));
+				AddCriterion(localResolveResult.Variable, criterion);
+			}
+		}
+
+		public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+		{
+			base.VisitInvocationExpression(invocationExpression);
+
+			var resolveResult = context.Resolve(invocationExpression);
+			var invocationResolveResult = resolveResult as InvocationResolveResult;
+			if (invocationResolveResult == null)
+				return;
+
+			// invocationExpression.Target resolves to a method group and VisitMemberReferenceExpression
+			// only handles members, so handle method groups here
+			var targetResolveResult = invocationResolveResult.TargetResult as LocalResolveResult;
+			if (targetResolveResult != null) {
+				var variable = targetResolveResult.Variable;
+				AddCriterion(variable, new HasMemberCriterion(invocationResolveResult.Member));
+			}
+		}
+
+		public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+		{
+			base.VisitMethodDeclaration(methodDeclaration);
+
+			var lastParameter = methodDeclaration.Parameters.LastOrNullObject();
+			if (lastParameter.IsNull || !lastParameter.ParameterModifier.HasFlag(ParameterModifier.Params))
+				return;
+			var localResolveResult = context.Resolve(lastParameter) as LocalResolveResult;
+			if (localResolveResult == null)
+				return;
+			AddCriterion(localResolveResult.Variable, new IsArrayTypeCriterion());
+		}
+
+		Role[] roles = new [] {
+			Roles.Expression,
+			Roles.Argument,
+			Roles.Condition,
+			BinaryOperatorExpression.RightRole,
+			BinaryOperatorExpression.LeftRole
+		};
+
+		public override void VisitIdentifierExpression(IdentifierExpression identifierExpression)
+		{
+			var resolveResult = context.Resolve(identifierExpression);
+			var localResolveResult = resolveResult as LocalResolveResult;
+			if (localResolveResult == null)
+				return;
+
+			var variable = localResolveResult.Variable;
+			if (!UsedVariables.Contains(variable))
+				UsedVariables.Add(variable);
+
+			// Assignment expressions are checked separately, see VisitAssignmentExpression
+			if (!roles.Contains(identifierExpression.Role) || identifierExpression.Parent is AssignmentExpression)
+				return;
+
+			CheckForCriterion(identifierExpression, variable);
+		}
+
+		public override void VisitAssignmentExpression(AssignmentExpression assignmentExpression)
+		{
+			base.VisitAssignmentExpression(assignmentExpression);
+
+			// Only check the right side; The left side always has the type of
+			// the variable, which is not what we want to check
+
+			var rightResolveResult = context.Resolve(assignmentExpression.Right) as LocalResolveResult;
+			if (rightResolveResult != null) {
+				CheckForCriterion(assignmentExpression.Right, rightResolveResult.Variable);
+			}
+		}
+
+		void CheckForCriterion(Expression expression, IVariable variable)
+		{
+			AddCriterion(variable, new IsTypeCriterion(context.GetExpectedType(expression)));
+		}
+
+		class ConjunctionCriteria : ITypeCriterion
+		{
+			IList<ITypeCriterion> criteria;
+
+			public ConjunctionCriteria(IList<ITypeCriterion> criteria)
+			{
+				this.criteria = criteria;
+			}
+
+			public bool SatisfiedBy(IType type)
+			{
+				foreach (var criterion in criteria) {
+					if (!criterion.SatisfiedBy(type)) {
+						return false;
+					}
+				}
+				return true;
+			}
+		}
+	}
+
+	public class IsTypeCriterion : ITypeCriterion
+	{
+		IType isType;
+
+		public IsTypeCriterion(IType isType)
+		{
+			this.isType = isType;
+		}
+
+		#region ITypeCriterion implementation
+		public bool SatisfiedBy (IType type)
+		{
+			return isType == type ||
+				type.GetAllBaseTypes().Any(t => t == isType);
+		}
+		#endregion
+	}
+
+	public class IsArrayTypeCriterion : ITypeCriterion
+	{
+		#region ITypeCriterion implementation
+
+		public bool SatisfiedBy(IType type)
+		{
+			return type is ArrayType;
+		}
+
+		#endregion
+	}
+
+	public class HasMemberCriterion : ITypeCriterion
+	{
+//		IMember neededMember;
+		IList<IMember> acceptableMembers;
+
+		public HasMemberCriterion(IMember neededMember)
+		{
+//			this.neededMember = neededMember;
+
+			if (neededMember.ImplementedInterfaceMembers.Any()) {
+				acceptableMembers = neededMember.ImplementedInterfaceMembers.ToList();
+			} else if (neededMember.IsOverride) {
+				acceptableMembers = new List<IMember>();
+				foreach (var member in InheritanceHelper.GetBaseMembers(neededMember, true)) {
+					acceptableMembers.Add(member);
+					if (member.IsShadowing)
+						break;
+				}
+				acceptableMembers.Add(neededMember);
+			} else {
+				acceptableMembers = new List<IMember> { neededMember };
+			}
+		}
+
+		#region ITypeCriterion implementation
+		public bool SatisfiedBy (IType type)
+		{
+			if (type == null)
+				throw new ArgumentNullException("type");
+
+			var typeMembers = type.GetMembers();
+			return typeMembers.Any(member => HasCommonMemberDeclaration(acceptableMembers, member));
+		}
+		#endregion
+
+		static bool HasCommonMemberDeclaration(IEnumerable<IMember> acceptableMembers, IMember member)
+		{
+			var implementedInterfaceMembers = member.MemberDefinition.ImplementedInterfaceMembers;
+			if (implementedInterfaceMembers.Any()) {
+				return ContainsAny(acceptableMembers, implementedInterfaceMembers);
+			} else {
+				return acceptableMembers.Contains(member/*				.MemberDefinition*/);
+			}
+		}
+
+		static bool ContainsAny<T>(IEnumerable<T> collection, IEnumerable<T> items)
+		{
+			foreach (var item in items) {
+				if (collection.Contains(item))
+					return true;
+			}
+			return false;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/PossibleMistakenCallToGetTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/PossibleMistakenCallToGetTypeIssue.cs
new file mode 100644
index 0000000000..1ea483b63f
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/PossibleMistakenCallToGetTypeIssue.cs
@@ -0,0 +1,71 @@
+//
+// PossibleMistakenCallToGetTypeIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Possible mistaken call to 'object.GetType()'",
+		Description = "Possible mistaken call to 'object.GetType()'",
+		Category = IssueCategories.PracticesAndImprovements,
+		Severity = Severity.Warning, 
+		AnalysisDisableKeyword = "PossibleMistakenCallToGetType" )]
+	public class PossibleMistakenCallToGetTypeIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<PossibleMistakenCallToGetTypeIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+
+				var mref = invocationExpression.Target as MemberReferenceExpression;
+				if (mref == null || mref.MemberName != "GetType")
+					return;
+				var rr = ctx.Resolve(invocationExpression) as CSharpInvocationResolveResult;
+				if (rr == null || !rr.Member.DeclaringType.IsKnownType(KnownTypeCode.Type) || rr.Member.IsStatic)
+					return;
+				AddIssue(new CodeIssue (
+					invocationExpression,
+					ctx.TranslateString("Possible mistaken call to 'object.GetType()'"),
+					ctx.TranslateString("Remove call to 'object.GetType()'"),
+					s => s.Replace(invocationExpression, mref.Target.Clone())
+				));
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/PublicConstructorInAbstractClass.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/PublicConstructorInAbstractClass.cs
new file mode 100644
index 0000000000..ad799a6fdd
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/PublicConstructorInAbstractClass.cs
@@ -0,0 +1,79 @@
+// EmptyConstructorIssue.cs
+// 
+// Author:
+//      Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SaHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Make constructor in abstract class protected",
+                      Description = "Constructor in abstract class should not be public",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "PublicConstructorInAbstractClass")]
+	public class PublicConstructorInAbstractClassIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			var unit = context.RootNode as SyntaxTree;
+			if (unit == null)
+				return null;
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<PublicConstructorInAbstractClassIssue>
+		{
+
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+			
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				if (!typeDeclaration.HasModifier(Modifiers.Abstract)) {
+					return;
+				}
+				foreach (var constructor in typeDeclaration.Children.OfType<ConstructorDeclaration>()){
+					VisitConstructorDeclaration(constructor);
+				}
+			}
+
+            public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+				if (constructorDeclaration.HasModifier (Modifiers.Public)) {
+
+                    var makeProtected = new CodeAction(ctx.TranslateString("Make constructor protected"), script => script.Replace(constructorDeclaration.ModifierTokens.First(t => t.Modifier == Modifiers.Public), new CSharpModifierToken(TextLocation.Empty, Modifiers.Protected)), constructorDeclaration.NameToken);
+                    var makePrivate = new CodeAction(ctx.TranslateString("Make constructor private"), script => script.Remove(constructorDeclaration.ModifierTokens.First(t => t.Modifier == Modifiers.Public)), constructorDeclaration.NameToken);
+
+					AddIssue(new CodeIssue(constructorDeclaration.NameToken, ctx.TranslateString("Constructor in Abstract Class should not be public"), new[] { makeProtected, makePrivate }));
+                }
+			}
+		}
+	}
+}
+
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReferenceEqualsWithValueTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReferenceEqualsWithValueTypeIssue.cs
new file mode 100644
index 0000000000..a472475417
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReferenceEqualsWithValueTypeIssue.cs
@@ -0,0 +1,85 @@
+// 
+// ReferenceEqualsCalledWithValueTypeIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Check for reference equality instead",
+		Description = "Check for reference equality instead",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Suggestion,
+		AnalysisDisableKeyword = "ReferenceEqualsWithValueType"
+	)]
+	public class ReferenceEqualsWithValueTypeIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ReferenceEqualsWithValueTypeIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+
+				// Quickly determine if this invocation is eligible to speed up the inspector
+				var nameToken = invocationExpression.Target.GetChildByRole(Roles.Identifier);
+				if (nameToken.Name != "ReferenceEquals")
+					return;
+
+				var resolveResult = ctx.Resolve(invocationExpression) as InvocationResolveResult;
+				if (resolveResult == null ||
+				    resolveResult.Member.DeclaringTypeDefinition == null ||
+				    resolveResult.Member.DeclaringTypeDefinition.KnownTypeCode != KnownTypeCode.Object ||
+				    resolveResult.Member.Name != "ReferenceEquals" ||
+				    invocationExpression.Arguments.All(arg => ctx.Resolve(arg).Type.IsReferenceType ?? true))
+					return;
+
+				var action1 = new CodeAction(ctx.TranslateString("Replace expression with 'false'"),
+					              script => script.Replace(invocationExpression, new PrimitiveExpression(false)), invocationExpression);
+
+				var action2 = new CodeAction(ctx.TranslateString("Use Equals()"),
+					              script => script.Replace(invocationExpression.Target, new MemberReferenceExpression(
+						              new PrimitiveType("object"), "Equals")), invocationExpression);
+
+				AddIssue(new CodeIssue(invocationExpression,
+					ctx.TranslateString("'Object.ReferenceEquals' is always false because it is called with value type"),
+					new [] { action1, action2 }));
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithFirstOrDefaultIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithFirstOrDefaultIssue.cs
new file mode 100644
index 0000000000..78b85c31f7
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithFirstOrDefaultIssue.cs
@@ -0,0 +1,97 @@
+//
+// ReplaceWithFirstOrDefaultIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with FirstOrDefault<T>()",
+	                  Description = "Replace with call to FirstOrDefault<T>()",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ReplaceWithFirstOrDefault")]
+	public class ReplaceWithFirstOrDefaultIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ReplaceWithFirstOrDefaultIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			readonly AstNode pattern =
+				new ConditionalExpression(
+					new InvocationExpression(
+						new MemberReferenceExpression(new AnyNode("expr"), "Any"),
+						new AnyNodeOrNull("param")
+					),
+					new InvocationExpression(
+						new MemberReferenceExpression(new Backreference("expr"), "First"),
+						new Backreference("param")
+					),
+					new Choice {
+						new NullReferenceExpression(),
+						new DefaultValueExpression(new AnyNode())
+					}
+				);
+
+			public override void VisitConditionalExpression(ConditionalExpression conditionalExpression)
+			{
+				base.VisitConditionalExpression(conditionalExpression);
+				var match = pattern.Match(conditionalExpression);
+				if (!match.Success)
+					return;
+				var expression = match.Get<Expression>("expr").First();
+				var param      = match.Get<Expression>("param").First();
+
+				AddIssue(new CodeIssue(
+					conditionalExpression,
+					ctx.TranslateString("Expression can be simlified to 'FirstOrDefault<T>()'"),
+					ctx.TranslateString("Replace with 'FirstOrDefault<T>()'"),
+					script => {
+						var invocation = new InvocationExpression(new MemberReferenceExpression(expression.Clone(), "FirstOrDefault"));
+						if (param != null && !param.IsNull)
+							invocation.Arguments.Add(param.Clone());
+						script.Replace(
+							conditionalExpression,
+							invocation
+						);
+					}
+				));
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithLastOrDefaultIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithLastOrDefaultIssue.cs
new file mode 100644
index 0000000000..494a06b0a1
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithLastOrDefaultIssue.cs
@@ -0,0 +1,97 @@
+//
+// ReplaceWithLastOrDefaultIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with LastOrDefault<T>()",
+	                  Description = "Replace with call to LastOrDefault<T>()",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ReplaceWithLastOrDefault")]
+	public class ReplaceWithLastOrDefaultIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ReplaceWithLastOrDefaultIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			readonly AstNode pattern =
+				new ConditionalExpression(
+					new InvocationExpression(
+						new MemberReferenceExpression(new AnyNode("expr"), "Any"),
+						new AnyNodeOrNull("param")
+					),
+					new InvocationExpression(
+						new MemberReferenceExpression(new Backreference("expr"), "Last"),
+						new Backreference("param")
+					),
+					new Choice {
+						new NullReferenceExpression(),
+						new DefaultValueExpression(new AnyNode())
+					}
+				);
+
+			public override void VisitConditionalExpression(ConditionalExpression conditionalExpression)
+			{
+				base.VisitConditionalExpression(conditionalExpression);
+				var match = pattern.Match(conditionalExpression);
+				if (!match.Success)
+					return;
+				var expression = match.Get<Expression>("expr").First();
+				var param      = match.Get<Expression>("param").First();
+
+				AddIssue(new CodeIssue(
+					conditionalExpression,
+					ctx.TranslateString("Expression can be simlified to 'LastOrDefault<T>()'"),
+					ctx.TranslateString("Replace with 'LastOrDefault<T>()'"),
+					script => {
+						var invocation = new InvocationExpression(new MemberReferenceExpression(expression.Clone(), "LastOrDefault"));
+						if (param != null && !param.IsNull)
+							invocation.Arguments.Add(param.Clone());
+						script.Replace(
+							conditionalExpression,
+							invocation
+							);
+					}
+				));
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeAny.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeAny.cs
new file mode 100644
index 0000000000..befbbe14cd
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeAny.cs
@@ -0,0 +1,203 @@
+//
+// ReplaceWithOfTypeAny.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with OfType<T>().Any()",
+	                  Description = "Replace with call to OfType<T>().Any()",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ReplaceWithOfType.Any")]
+	public class ReplaceWithOfTypeAnyIssue : GatherVisitorCodeIssueProvider
+	{
+		static readonly AstNode selectPattern =
+			new InvocationExpression(
+				new MemberReferenceExpression(
+					new InvocationExpression(
+						new MemberReferenceExpression(new AnyNode("targetExpr"), "Select"),
+						new LambdaExpression {
+							Parameters = { PatternHelper.NamedParameter ("param1", PatternHelper.AnyType ("paramType", true), Pattern.AnyString) },
+							Body = PatternHelper.OptionalParentheses (new AsExpression(new AnyNode("expr1"), PatternHelper.AnyType("type")))
+						}
+					), 
+					Pattern.AnyString
+				),
+				new LambdaExpression {
+					Parameters = { PatternHelper.NamedParameter ("param2", PatternHelper.AnyType ("paramType", true), Pattern.AnyString) },
+					Body = PatternHelper.CommutativeOperatorWithOptionalParentheses(new AnyNode("expr2"), BinaryOperatorType.InEquality, new NullReferenceExpression())
+				}
+			);
+
+		static readonly AstNode selectPatternWithFollowUp =
+			new InvocationExpression(
+				new MemberReferenceExpression(
+					new InvocationExpression(
+						new MemberReferenceExpression(new AnyNode("targetExpr"), "Select"),
+						new LambdaExpression {
+							Parameters = { PatternHelper.NamedParameter ("param1", PatternHelper.AnyType ("paramType", true), Pattern.AnyString) },
+							Body = PatternHelper.OptionalParentheses (new AsExpression(new AnyNode("expr1"), PatternHelper.AnyType("type")))
+						}
+					),	 
+					Pattern.AnyString
+				),
+				new NamedNode("lambda", 
+					new LambdaExpression {
+						Parameters = { PatternHelper.NamedParameter ("param2", PatternHelper.AnyType ("paramType", true), Pattern.AnyString) },
+						Body = new BinaryOperatorExpression(
+							PatternHelper.CommutativeOperatorWithOptionalParentheses(new AnyNode("expr2"), BinaryOperatorType.InEquality, new NullReferenceExpression()),
+							BinaryOperatorType.ConditionalAnd,
+							new AnyNode("followUpExpr")
+						)
+					}
+				)
+			);
+
+
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor<ReplaceWithOfTypeIssue>(context, "Any");
+		}
+
+		internal class GatherVisitor<T> : GatherVisitorBase<T> where T : GatherVisitorCodeIssueProvider
+		{
+			readonly string member;
+
+			public GatherVisitor (BaseRefactoringContext ctx, string member) : base (ctx)
+			{
+				this.member = member;
+			}
+
+			bool CheckParameterMatches(IEnumerable<INode> param, IEnumerable<INode> expr)
+			{
+				var p = param.Single() as ParameterDeclaration;
+				var e = expr.Single();
+
+				if (p == null)
+					return false;
+				if (e is IdentifierExpression)
+					return p.Name == ((IdentifierExpression)e).Identifier;
+				return false;
+			}
+
+			public override void VisitInvocationExpression (InvocationExpression anyInvoke)
+			{
+				base.VisitInvocationExpression (anyInvoke);
+
+				var anyResolve = ctx.Resolve (anyInvoke) as InvocationResolveResult;
+				if (anyResolve == null || !HasPredicateVersion(anyResolve.Member))
+					return;
+				Match match;
+
+				if (member != "Where") {
+					match = selectPattern.Match(anyInvoke);
+					if (match.Success) {
+						if (!ReplaceWithOfTypeIssue.CheckParameterMatches(match.Get("param1"), match.Get("expr1")) ||
+							!ReplaceWithOfTypeIssue.CheckParameterMatches(match.Get("param2"), match.Get("expr2")))
+							return;
+						AddIssue(new CodeIssue(
+							anyInvoke,
+							string.Format(ctx.TranslateString("Replace with OfType<T>().{0}()"), member),
+							string.Format(ctx.TranslateString("Replace with call to OfType<T>().{0}()"), member),
+							script => {
+							var target = match.Get<Expression>("targetExpr").Single().Clone();
+							var type = match.Get<AstType>("type").Single().Clone();
+							script.Replace(
+								anyInvoke,
+								new InvocationExpression(
+								new MemberReferenceExpression(
+								new InvocationExpression(new MemberReferenceExpression(target, "OfType", type)),
+								member
+							)
+							)
+							);
+						}
+						));
+						return;
+					}
+				}
+
+				match = selectPatternWithFollowUp.Match (anyInvoke);
+				if (match.Success) {
+					if (!ReplaceWithOfTypeIssue.CheckParameterMatches(match.Get("param1"), match.Get("expr1")) ||
+					    !ReplaceWithOfTypeIssue.CheckParameterMatches(match.Get("param2"), match.Get("expr2")))
+						return;
+					AddIssue(new CodeIssue(
+						anyInvoke,
+						string.Format(ctx.TranslateString("Replace with OfType<T>().{0}()"), member),
+						string.Format(ctx.TranslateString("Replace with call to OfType<T>().{0}()"), member),
+						script => {
+							var target = match.Get<Expression>("targetExpr").Single().Clone();
+							var type = match.Get<AstType>("type").Single().Clone();
+							var lambda = match.Get<LambdaExpression>("lambda").Single();
+							script.Replace(
+								anyInvoke,
+								new InvocationExpression(
+									new MemberReferenceExpression(
+										new InvocationExpression(new MemberReferenceExpression(target, "OfType", type)),
+										member
+									),
+									new LambdaExpression {
+										Parameters = { (ParameterDeclaration)lambda.Parameters.First().Clone() },
+										Body = match.Get<Expression>("followUpExpr").Single().Clone()
+									}
+								)
+							 );
+						}
+					));
+					return;
+				}
+			}
+
+			bool IsQueryExtensionClass(ITypeDefinition typeDef)
+			{
+				if (typeDef == null || typeDef.Namespace != "System.Linq")
+					return false;
+				switch (typeDef.Name) {
+					case "Enumerable":
+						case "ParallelEnumerable":
+						case "Queryable":
+						return true;
+						default:
+						return false;
+				}
+			}
+
+			bool HasPredicateVersion(IParameterizedMember member)
+			{
+				if (!IsQueryExtensionClass(member.DeclaringTypeDefinition))
+					return false;
+				return member.Name == this.member;
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeCountIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeCountIssue.cs
new file mode 100644
index 0000000000..4cc91a289a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeCountIssue.cs
@@ -0,0 +1,43 @@
+//
+// ReplaceWithOfTypeCountIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with OfType<T>().Count()",
+	                  Description = "Replace with call to OfType<T>().Count()",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ReplaceWithOfType.Count")]
+	public class ReplaceWithOfTypeCountIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new ReplaceWithOfTypeAnyIssue.GatherVisitor<ReplaceWithOfTypeCountIssue>(context, "Count");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeFirstIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeFirstIssue.cs
new file mode 100644
index 0000000000..0575e3e099
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeFirstIssue.cs
@@ -0,0 +1,42 @@
+//
+// ReplaceWithOfTypeFirstIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with OfType<T>().First()",
+	                  Description = "Replace with call to OfType<T>().First()",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ReplaceWithOfType.First")]
+	public class ReplaceWithOfTypeFirstIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new ReplaceWithOfTypeAnyIssue.GatherVisitor<ReplaceWithOfTypeFirstIssue>(context, "First");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeFirstOrDefaultIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeFirstOrDefaultIssue.cs
new file mode 100644
index 0000000000..6060a2aacc
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeFirstOrDefaultIssue.cs
@@ -0,0 +1,43 @@
+//
+// ReplaceWithOfTypeFirstOrDefaultIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with OfType<T>().FirstOrDefault()",
+	                  Description = "Replace with call to OfType<T>().FirstOrDefault()",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ReplaceWithOfType.FirstOrDefault")]
+	public class ReplaceWithOfTypeFirstOrDefaultIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new ReplaceWithOfTypeAnyIssue.GatherVisitor<ReplaceWithOfTypeFirstOrDefaultIssue>(context, "FirstOrDefault");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeIssue.cs
new file mode 100644
index 0000000000..e9a35d1966
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeIssue.cs
@@ -0,0 +1,146 @@
+//
+// ReplaceWithOfTypeIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with OfType<T>",
+	                  Description = "Replace with call to OfType<T>",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ReplaceWithOfType")]
+	public class ReplaceWithOfTypeIssue : GatherVisitorCodeIssueProvider
+	{
+		internal static readonly AstNode selectNotNullPattern =
+			new InvocationExpression(
+				new MemberReferenceExpression(new AnyNode("target"), "SelectNotNull"),
+				new LambdaExpression {
+					Parameters = { PatternHelper.NamedParameter ("param1", PatternHelper.AnyType ("paramType", true), Pattern.AnyString) },
+					Body = PatternHelper.OptionalParentheses (new AsExpression(new AnyNode("expr1"), new AnyNode("type")))
+				}
+			);
+
+		internal static readonly AstNode wherePatternCase1 =
+			new InvocationExpression(
+				new MemberReferenceExpression(
+					new InvocationExpression(
+						new MemberReferenceExpression(new AnyNode("target"), "Where"),
+						new LambdaExpression {
+							Parameters = { PatternHelper.NamedParameter ("param1", PatternHelper.AnyType ("paramType", true), Pattern.AnyString) },
+							Body = PatternHelper.OptionalParentheses (new IsExpression(new AnyNode("expr1"), new AnyNode("type")))
+						}
+					), "Select"),
+				new LambdaExpression {
+					Parameters = { PatternHelper.NamedParameter ("param2", PatternHelper.AnyType ("paramType", true), Pattern.AnyString) },
+					Body = PatternHelper.OptionalParentheses (new AsExpression(PatternHelper.OptionalParentheses (new AnyNode("expr2")), new Backreference("type")))
+				}
+		);
+
+		internal static readonly AstNode wherePatternCase2 =
+			new InvocationExpression(
+				new MemberReferenceExpression(
+					new InvocationExpression(
+						new MemberReferenceExpression(new AnyNode("target"), "Where"),
+						new LambdaExpression {
+							Parameters = { PatternHelper.NamedParameter ("param1", PatternHelper.AnyType ("paramType", true), Pattern.AnyString) },
+							Body = PatternHelper.OptionalParentheses (new IsExpression(PatternHelper.OptionalParentheses (new AnyNode("expr1")), new AnyNode("type")))
+						}
+					), "Select"),
+				new LambdaExpression {
+					Parameters = { PatternHelper.NamedParameter ("param2", PatternHelper.AnyType ("paramType", true), Pattern.AnyString) },
+					Body = PatternHelper.OptionalParentheses (new CastExpression(new Backreference("type"), PatternHelper.OptionalParentheses (new AnyNode("expr2"))))
+				}
+		);
+
+
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		internal static bool CheckParameterMatches(IEnumerable<INode> paramMatch, IEnumerable<INode> expressionMatch)
+		{
+			var p = paramMatch.Single() as ParameterDeclaration;
+			var e = expressionMatch.Single();
+
+			if (p == null)
+				return false;
+			if (e is IdentifierExpression)
+				return p.Name == ((IdentifierExpression)e).Identifier;
+			return false;
+		}
+
+
+		class GatherVisitor : GatherVisitorBase<ReplaceWithOfTypeIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitInvocationExpression (InvocationExpression anyInvoke)
+			{
+				var match = selectNotNullPattern.Match (anyInvoke);
+				if (!match.Success) {
+					match = wherePatternCase1.Match (anyInvoke);
+					if (!match.Success) {
+						match = wherePatternCase2.Match (anyInvoke); 
+						if (!match.Success) {
+							base.VisitInvocationExpression(anyInvoke);
+							return;
+						}
+					}
+					if (!CheckParameterMatches(match.Get("param1"), match.Get("expr1")) ||
+					    !CheckParameterMatches(match.Get("param2"), match.Get("expr2"))) {
+						base.VisitInvocationExpression (anyInvoke);
+						return;
+					}
+				} else {
+					if (!CheckParameterMatches(match.Get("param1"), match.Get("expr1"))) {
+						base.VisitInvocationExpression (anyInvoke);
+						return;
+					}
+				}
+				AddIssue(new CodeIssue(
+					anyInvoke,
+					ctx.TranslateString("Replace with OfType<T>"),
+					ctx.TranslateString("Replace with call to OfType<T>"),
+					script => {
+						var target = match.Get<Expression>("target").Single().Clone ();
+						var type = match.Get<AstType>("type").Single().Clone();
+						script.Replace(anyInvoke, new InvocationExpression(new MemberReferenceExpression(target, "OfType", type)));
+					}
+				));
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeLastIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeLastIssue.cs
new file mode 100644
index 0000000000..5fbf9c1f52
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeLastIssue.cs
@@ -0,0 +1,42 @@
+//
+// ReplaceWithOfTypeLastIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with OfType<T>().Last()",
+	                  Description = "Replace with call to OfType<T>().Last()",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ReplaceWithOfType.Last")]
+	public class ReplaceWithOfTypeLastIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new ReplaceWithOfTypeAnyIssue.GatherVisitor<ReplaceWithOfTypeLastIssue>(context, "Last");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeLastOrDefaultIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeLastOrDefaultIssue.cs
new file mode 100644
index 0000000000..fd4ca13725
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeLastOrDefaultIssue.cs
@@ -0,0 +1,42 @@
+//
+// ReplaceWithOfTypeLastOrDefaultIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with OfType<T>().LastOrDefault()",
+	                  Description = "Replace with call to OfType<T>().LastOrDefault()",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ReplaceWithOfType.LastOrDefault")]
+	public class ReplaceWithOfTypeLastOrDefaultIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new ReplaceWithOfTypeAnyIssue.GatherVisitor<ReplaceWithOfTypeLastOrDefaultIssue>(context, "LastOrDefault");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeLongCountIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeLongCountIssue.cs
new file mode 100644
index 0000000000..148f9b25ad
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeLongCountIssue.cs
@@ -0,0 +1,43 @@
+//
+// ReplaceWithOfTypeLongCountIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with OfType<T>().LongCount()",
+	                  Description = "Replace with call to OfType<T>().LongCount()",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ReplaceWithOfType.LongCount")]
+	public class ReplaceWithOfTypeLongCountIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new ReplaceWithOfTypeAnyIssue.GatherVisitor<ReplaceWithOfTypeLongCountIssue>(context, "LongCount");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeSingleIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeSingleIssue.cs
new file mode 100644
index 0000000000..4c5090ef4a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeSingleIssue.cs
@@ -0,0 +1,42 @@
+//
+// ReplaceWithOfTypeSingleIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with OfType<T>().Single()",
+	                  Description = "Replace with call to OfType<T>().Single()",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ReplaceWithOfType.Single")]
+	public class ReplaceWithOfTypeSingleIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new ReplaceWithOfTypeAnyIssue.GatherVisitor<ReplaceWithOfTypeSingleIssue>(context, "Single");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeSingleOrDefaultIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeSingleOrDefaultIssue.cs
new file mode 100644
index 0000000000..28730528ac
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeSingleOrDefaultIssue.cs
@@ -0,0 +1,42 @@
+//
+// ReplaceWithOfTypeSingleOrDefaultIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with OfType<T>().SingleOrDefault()",
+	                  Description = "Replace with call to OfType<T>().SingleOrDefault()",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ReplaceWithOfType.SingleOrDefault")]
+	public class ReplaceWithOfTypeSingleOrDefaultIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new ReplaceWithOfTypeAnyIssue.GatherVisitor<ReplaceWithOfTypeSingleOrDefaultIssue>(context, "SingleOrDefault");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeWhereIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeWhereIssue.cs
new file mode 100644
index 0000000000..0551979800
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithOfTypeWhereIssue.cs
@@ -0,0 +1,42 @@
+//
+// ReplaceWithOfTypeWhereIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with OfType<T>().Where()",
+	                  Description = "Replace with call to OfType<T>().Where()",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "ReplaceWithOfType.Where")]
+	public class ReplaceWithOfTypeWhereIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new ReplaceWithOfTypeAnyIssue.GatherVisitor<ReplaceWithOfTypeWhereIssue>(context, "Where");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSimpleAssignmentIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSimpleAssignmentIssue.cs
new file mode 100644
index 0000000000..07d85fc63c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSimpleAssignmentIssue.cs
@@ -0,0 +1,97 @@
+//
+// ReplaceWithSimpleAssignmentIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription(
+		"Replace with simple assignment",
+		Description = "Replace with simple assignment",
+		Category = IssueCategories.PracticesAndImprovements,
+		Severity = Severity.Suggestion,
+		AnalysisDisableKeyword = "ReplaceWithSimpleAssignment")]
+	public class ReplaceWithSimpleAssignmentIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ReplaceWithSimpleAssignmentIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			static readonly AstNode truePattern = 
+				new AssignmentExpression(
+					new AnyNode("expr"),
+					AssignmentOperatorType.BitwiseOr,
+					PatternHelper.OptionalParentheses(new PrimitiveExpression(true))
+				);
+
+			static readonly AstNode falsePattern = 
+				new AssignmentExpression(
+					new AnyNode("expr"),
+					AssignmentOperatorType.BitwiseAnd,
+					PatternHelper.OptionalParentheses(new PrimitiveExpression(false))
+				);
+
+			public override void VisitAssignmentExpression(AssignmentExpression assignmentExpression)
+			{
+				base.VisitAssignmentExpression(assignmentExpression);
+				var match = truePattern.Match(assignmentExpression);
+				AssignmentExpression simpleAssignment;
+
+				if (match.Success) {
+					var expr = match.Get<Expression>("expr").Single();
+					simpleAssignment = new AssignmentExpression(expr.Clone(), new PrimitiveExpression(true));
+				} else {
+					match = falsePattern.Match(assignmentExpression);
+					if (!match.Success)
+						return;
+					var expr = match.Get<Expression>("expr").Single();
+					simpleAssignment = new AssignmentExpression(expr.Clone(), new PrimitiveExpression(false));
+				}
+
+				AddIssue(new CodeIssue(
+					assignmentExpression,
+					ctx.TranslateString("Replace with simple assignment"),
+					string.Format(ctx.TranslateString("Replace with '{0}'"), simpleAssignment),
+					script => {
+						script.Replace(assignmentExpression, simpleAssignment);
+					}
+				));
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToAnyIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToAnyIssue.cs
new file mode 100644
index 0000000000..9a33adf65c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToAnyIssue.cs
@@ -0,0 +1,124 @@
+// 
+// ReplaceWithSingleCallToAnyIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+    [IssueDescription("Replace with single call to Any(...)",
+                      Description = "Replace with single call to Any(...)",
+                      Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+                      AnalysisDisableKeyword = "ReplaceWithSingleCallToAny")]
+    public class ReplaceWithSingleCallToAnyIssue : GatherVisitorCodeIssueProvider
+	{
+		static readonly AstNode pattern =
+			new InvocationExpression (
+				new MemberReferenceExpression (
+					new NamedNode ("whereInvoke",
+					               new InvocationExpression (
+					               	new MemberReferenceExpression (new AnyNode ("target"), "Where"),
+					               	new AnyNode ())),
+					Pattern.AnyString));
+		
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor<ReplaceWithSingleCallToAnyIssue>(context, "Any");
+		}
+		
+		internal class GatherVisitor<T> : GatherVisitorBase<T> where T : GatherVisitorCodeIssueProvider
+		{
+			readonly string member;
+
+			public GatherVisitor (BaseRefactoringContext ctx, string member) : base (ctx)
+			{
+				this.member = member;
+			}
+
+			public override void VisitInvocationExpression (InvocationExpression anyInvoke)
+			{
+				base.VisitInvocationExpression (anyInvoke);
+				
+				var match = pattern.Match (anyInvoke);
+				if (!match.Success)
+					return;
+				
+				var anyResolve = ctx.Resolve (anyInvoke) as InvocationResolveResult;
+				if (anyResolve == null || !HasPredicateVersion(anyResolve.Member))
+					return;
+				var whereInvoke = match.Get<InvocationExpression> ("whereInvoke").Single ();
+				var whereResolve = ctx.Resolve (whereInvoke) as InvocationResolveResult;
+				if (whereResolve == null || whereResolve.Member.Name != "Where" || !IsQueryExtensionClass(whereResolve.Member.DeclaringTypeDefinition))
+					return;
+				if (whereResolve.Member.Parameters.Count != 2)
+					return;
+				var predResolve = whereResolve.Member.Parameters [1];
+				if (predResolve.Type.TypeParameterCount != 2)
+					return;
+				
+				AddIssue(new CodeIssue(
+					anyInvoke, string.Format(ctx.TranslateString("Redundant Where() call with predicate followed by {0}()"), anyResolve.Member.Name),
+					new CodeAction (
+						string.Format(ctx.TranslateString("Replace with single call to '{0}'"), anyResolve.Member.Name),
+						script => {
+							var arg = whereInvoke.Arguments.Single ().Clone ();
+							var target = match.Get<Expression> ("target").Single ().Clone ();
+							script.Replace (anyInvoke, new InvocationExpression (new MemberReferenceExpression (target, anyResolve.Member.Name), arg));
+						},
+						anyInvoke
+					)
+				));
+			}
+			
+			bool IsQueryExtensionClass(ITypeDefinition typeDef)
+			{
+				if (typeDef == null || typeDef.Namespace != "System.Linq")
+					return false;
+				switch (typeDef.Name) {
+					case "Enumerable":
+					case "ParallelEnumerable":
+					case "Queryable":
+						return true;
+					default:
+						return false;
+				}
+			}
+			
+			bool HasPredicateVersion(IParameterizedMember member)
+			{
+				if (!IsQueryExtensionClass(member.DeclaringTypeDefinition))
+					return false;
+			    return member.Name == this.member;
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToCountIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToCountIssue.cs
new file mode 100644
index 0000000000..51daf27b65
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToCountIssue.cs
@@ -0,0 +1,43 @@
+// 
+// ReplaceWithSingleCallToCountIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with single call to Count(...)",
+        Description = "Replace with single call to Count(...)",
+        Category = IssueCategories.PracticesAndImprovements,
+        Severity = Severity.Suggestion,
+        AnalysisDisableKeyword = "ReplaceWithSingleCallToCount")]
+	public class ReplaceWithSingleCallToCountIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new ReplaceWithSingleCallToAnyIssue.GatherVisitor<ReplaceWithSingleCallToCountIssue>(context, "Count");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToFirstIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToFirstIssue.cs
new file mode 100644
index 0000000000..b11fb0640d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToFirstIssue.cs
@@ -0,0 +1,43 @@
+// 
+// ReplaceWithSingleCallToFirst.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with single call to First(...)",
+        Description = "Replace with single call to First(...)",
+        Category = IssueCategories.PracticesAndImprovements,
+        Severity = Severity.Suggestion,
+        AnalysisDisableKeyword = "ReplaceWithSingleCallToFirst")]
+	public class ReplaceWithSingleCallToFirstIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new ReplaceWithSingleCallToAnyIssue.GatherVisitor<ReplaceWithSingleCallToFirstIssue>(context, "First");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToFirstOrDefaultIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToFirstOrDefaultIssue.cs
new file mode 100644
index 0000000000..05dc3a0d6b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToFirstOrDefaultIssue.cs
@@ -0,0 +1,43 @@
+// 
+// ReplaceWithSingleCallToFirstOrDefault.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with single call to FirstOrDefault(...)",
+        Description = "Replace with single call to FirstOrDefault(...)",
+        Category = IssueCategories.PracticesAndImprovements,
+        Severity = Severity.Suggestion,
+        AnalysisDisableKeyword = "ReplaceWithSingleCallToFirstOrDefault")]
+	public class ReplaceWithSingleCallToFirstOrDefaultIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new ReplaceWithSingleCallToAnyIssue.GatherVisitor<ReplaceWithSingleCallToFirstOrDefaultIssue>(context, "FirstOrDefault");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToLastIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToLastIssue.cs
new file mode 100644
index 0000000000..16c1866129
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToLastIssue.cs
@@ -0,0 +1,43 @@
+// 
+// ReplaceWithSingleCallToLast.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with single call to Last(...)",
+        Description = "Replace with single call to Last(...)",
+        Category = IssueCategories.PracticesAndImprovements,
+        Severity = Severity.Suggestion,
+        AnalysisDisableKeyword = "ReplaceWithSingleCallToLast")]
+	public class ReplaceWithSingleCallToLastIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new ReplaceWithSingleCallToAnyIssue.GatherVisitor<ReplaceWithSingleCallToLastIssue>(context, "Last");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToLastOrDefaultIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToLastOrDefaultIssue.cs
new file mode 100644
index 0000000000..0c20902568
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToLastOrDefaultIssue.cs
@@ -0,0 +1,43 @@
+// 
+// ReplaceWithSingleCallToLastOrDefault.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with single call to LastOrDefault(...)",
+        Description = "Replace with single call to LastOrDefault(...)",
+        Category = IssueCategories.PracticesAndImprovements,
+        Severity = Severity.Suggestion,
+        AnalysisDisableKeyword = "ReplaceWithSingleCallToLastOrDefault")]
+	public class ReplaceWithSingleCallToLastOrDefaultIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new ReplaceWithSingleCallToAnyIssue.GatherVisitor<ReplaceWithSingleCallToLastOrDefaultIssue>(context, "LastOrDefault");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToLongCountIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToLongCountIssue.cs
new file mode 100644
index 0000000000..2ddc41213e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToLongCountIssue.cs
@@ -0,0 +1,43 @@
+// 
+// ReplaceWithSingleCallToLongCount.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with single call to LongCount(...)",
+        Description = "Replace with single call to LongCount(...)",
+        Category = IssueCategories.PracticesAndImprovements,
+        Severity = Severity.Suggestion,
+        AnalysisDisableKeyword = "ReplaceWithSingleCallToLongCount")]
+	public class ReplaceWithSingleCallToLongCountIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new ReplaceWithSingleCallToAnyIssue.GatherVisitor<ReplaceWithSingleCallToLongCountIssue>(context, "LongCount");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToSingleIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToSingleIssue.cs
new file mode 100644
index 0000000000..67f57f13b9
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToSingleIssue.cs
@@ -0,0 +1,43 @@
+// 
+// ReplaceWithSingleCallToSingle.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with single call to Single(...)",
+        Description = "Replace with single call to Single(...)",
+        Category = IssueCategories.PracticesAndImprovements,
+        Severity = Severity.Suggestion,
+        AnalysisDisableKeyword = "ReplaceWithSingleCallToSingle")]
+	public class ReplaceWithSingleCallToSingleIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new ReplaceWithSingleCallToAnyIssue.GatherVisitor<ReplaceWithSingleCallToSingleIssue>(context, "Single");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToSingleOrDefaultIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToSingleOrDefaultIssue.cs
new file mode 100644
index 0000000000..874ad256eb
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithSingleCallToSingleOrDefaultIssue.cs
@@ -0,0 +1,43 @@
+// 
+// ReplaceWithSingleCallToSingleOrDefault.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Replace with single call to SingleOrDefault(...)",
+        Description = "Replace with single call to SingleOrDefault(...)",
+        Category = IssueCategories.PracticesAndImprovements,
+        Severity = Severity.Suggestion,
+        AnalysisDisableKeyword = "ReplaceWithSingleCallToSingleOrDefault")]
+	public class ReplaceWithSingleCallToSingleOrDefaultIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new ReplaceWithSingleCallToAnyIssue.GatherVisitor<ReplaceWithSingleCallToSingleOrDefaultIssue>(context, "SingleOrDefault");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithStringIsNullOrEmptyIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithStringIsNullOrEmptyIssue.cs
new file mode 100644
index 0000000000..af869eaae2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/ReplaceWithStringIsNullOrEmptyIssue.cs
@@ -0,0 +1,152 @@
+// 
+// StringIsNullOrEmptyInspector.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Checks for str == null &amp;&amp; str == " "
+	/// Converts to: string.IsNullOrEmpty (str)
+	/// </summary>
+	[IssueDescription("Use 'String.IsNullOrEmpty'",
+	       Description = "Uses shorter string.IsNullOrEmpty call instead of a longer condition.",
+           Category = IssueCategories.PracticesAndImprovements,
+	       Severity = Severity.Suggestion,
+           AnalysisDisableKeyword = "ReplaceWithStringIsNullOrEmpty")]
+	public class ReplaceWithStringIsNullOrEmptyIssue : GatherVisitorCodeIssueProvider
+	{
+		static readonly Pattern pattern = new Choice {
+			// str == null || str == ""
+			// str == null || str.Length == 0
+			new BinaryOperatorExpression (
+				PatternHelper.CommutativeOperatorWithOptionalParentheses (new AnyNode ("str"), BinaryOperatorType.Equality, new NullReferenceExpression ()),
+				BinaryOperatorType.ConditionalOr,
+				new Choice {
+					PatternHelper.CommutativeOperatorWithOptionalParentheses (new Backreference ("str"), BinaryOperatorType.Equality, new PrimitiveExpression ("")),
+					PatternHelper.CommutativeOperatorWithOptionalParentheses (new Backreference ("str"), BinaryOperatorType.Equality,
+				                                       new MemberReferenceExpression(new PrimitiveType("string"), "Empty")),
+					PatternHelper.CommutativeOperatorWithOptionalParentheses (
+						new MemberReferenceExpression (new Backreference ("str"), "Length"),
+						BinaryOperatorType.Equality,
+						new PrimitiveExpression (0)
+					)
+				}
+			),
+			// str == "" || str == null
+			new BinaryOperatorExpression (
+				new Choice {
+					PatternHelper.CommutativeOperatorWithOptionalParentheses (new AnyNode ("str"), BinaryOperatorType.Equality, new PrimitiveExpression ("")),
+					PatternHelper.CommutativeOperatorWithOptionalParentheses (new AnyNode ("str"), BinaryOperatorType.Equality,
+				                                       new MemberReferenceExpression(new PrimitiveType("string"), "Empty"))
+				},
+				BinaryOperatorType.ConditionalOr,
+				PatternHelper.CommutativeOperator(new Backreference ("str"), BinaryOperatorType.Equality, new NullReferenceExpression ())
+			)
+		};
+		static readonly Pattern negPattern = new Choice {
+			// str != null && str != ""
+			// str != null && str.Length != 0
+			// str != null && str.Length > 0
+			new BinaryOperatorExpression (
+				PatternHelper.CommutativeOperatorWithOptionalParentheses(new AnyNode ("str"), BinaryOperatorType.InEquality, new NullReferenceExpression ()),
+				BinaryOperatorType.ConditionalAnd,
+				new Choice {
+					PatternHelper.CommutativeOperatorWithOptionalParentheses (new Backreference ("str"), BinaryOperatorType.InEquality, new PrimitiveExpression ("")),
+					PatternHelper.CommutativeOperatorWithOptionalParentheses (new Backreference ("str"), BinaryOperatorType.InEquality,
+				                                   	   new MemberReferenceExpression(new PrimitiveType("string"), "Empty")),
+					PatternHelper.CommutativeOperatorWithOptionalParentheses (
+						new MemberReferenceExpression (new Backreference ("str"), "Length"),
+						BinaryOperatorType.InEquality,
+						new PrimitiveExpression (0)
+					),
+					new BinaryOperatorExpression (
+						new MemberReferenceExpression (new Backreference ("str"), "Length"),
+						BinaryOperatorType.GreaterThan,
+						new PrimitiveExpression (0)
+					)
+				}
+			),
+			// str != "" && str != null
+			new BinaryOperatorExpression (
+				new Choice {
+					PatternHelper.CommutativeOperatorWithOptionalParentheses (new AnyNode ("str"), BinaryOperatorType.InEquality, new PrimitiveExpression ("")),
+					PatternHelper.CommutativeOperatorWithOptionalParentheses (new AnyNode ("str"), BinaryOperatorType.Equality,
+				                                   	   new MemberReferenceExpression(new PrimitiveType("string"), "Empty"))
+				},
+				BinaryOperatorType.ConditionalAnd,
+				PatternHelper.CommutativeOperatorWithOptionalParentheses(new Backreference ("str"), BinaryOperatorType.InEquality, new NullReferenceExpression ())
+			)
+		};
+
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ReplaceWithStringIsNullOrEmptyIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
+			{
+				base.VisitBinaryOperatorExpression(binaryOperatorExpression);
+				Match m = pattern.Match(binaryOperatorExpression);
+				bool isNegated = false;
+				if (!m.Success) {
+					m = negPattern.Match(binaryOperatorExpression);
+					isNegated = true;
+				}
+				if (m.Success) {
+					var str = m.Get<Expression>("str").Single();
+					var def = ctx.Resolve(str).Type.GetDefinition();
+					if (def == null || def.KnownTypeCode != ICSharpCode.NRefactory.TypeSystem.KnownTypeCode.String)
+						return;
+					AddIssue(new CodeIssue(
+						binaryOperatorExpression,
+						isNegated ? ctx.TranslateString("Expression can be replaced with !string.IsNullOrEmpty") : ctx.TranslateString("Expression can be replaced with string.IsNullOrEmpty"),
+						new CodeAction (
+							isNegated ? ctx.TranslateString("Use !string.IsNullOrEmpty") : ctx.TranslateString("Use string.IsNullOrEmpty"),
+							script => {
+								Expression expr = new PrimitiveType("string").Invoke("IsNullOrEmpty", str.Clone());
+								if (isNegated)
+									expr = new UnaryOperatorExpression(UnaryOperatorType.Not, expr);
+								script.Replace(binaryOperatorExpression, expr);
+							},
+							binaryOperatorExpression
+						)
+					));
+					return;
+				}
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/SimplifyConditionalTernaryExpressionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/SimplifyConditionalTernaryExpressionIssue.cs
new file mode 100644
index 0000000000..4aad3673eb
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/SimplifyConditionalTernaryExpressionIssue.cs
@@ -0,0 +1,137 @@
+//
+// SimplifyConditionalTernaryExpressionIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Simplify conditional expression",
+	                  Description = "Conditional expression can be simplified",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "SimplifyConditionalTernaryExpression")]
+	public class SimplifyConditionalTernaryExpressionIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<SimplifyConditionalTernaryExpressionIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			static bool? GetBool(Expression trueExpression)
+			{
+				var pExpr = trueExpression as PrimitiveExpression;
+				if (pExpr == null || !(pExpr.Value is bool))
+					return null;
+				return (bool)pExpr.Value;
+			}
+
+			public override void VisitConditionalExpression(ConditionalExpression conditionalExpression)
+			{
+				base.VisitConditionalExpression(conditionalExpression);
+
+				bool? trueBranch = GetBool(CSharpUtil.GetInnerMostExpression(conditionalExpression.TrueExpression));
+				bool? falseBranch = GetBool(CSharpUtil.GetInnerMostExpression(conditionalExpression.FalseExpression));
+
+				if (trueBranch == falseBranch || 
+				    trueBranch == true && falseBranch == false) // Handled by RedundantTernaryExpressionIssue
+					return;
+
+				AddIssue(new CodeIssue(
+					conditionalExpression.QuestionMarkToken.StartLocation,
+					conditionalExpression.FalseExpression.EndLocation,
+					ctx.TranslateString("Simplify conditional expression"),
+					ctx.TranslateString("Simplify conditional expression"),
+					script => {
+						if (trueBranch == false && falseBranch == true) {
+							script.Replace(conditionalExpression, CSharpUtil.InvertCondition(conditionalExpression.Condition));
+							return;
+						}
+						if (trueBranch == true) {
+							script.Replace(
+								conditionalExpression,
+								new BinaryOperatorExpression(
+									conditionalExpression.Condition.Clone(), 
+									BinaryOperatorType.ConditionalOr,
+									conditionalExpression.FalseExpression.Clone()
+								)
+							);
+							return;
+						}
+
+						if (trueBranch == false) {
+							script.Replace(
+								conditionalExpression,
+								new BinaryOperatorExpression(
+									CSharpUtil.InvertCondition(conditionalExpression.Condition), 
+									BinaryOperatorType.ConditionalAnd,
+									conditionalExpression.FalseExpression.Clone()
+								)
+							);
+							return;
+						}
+						
+						if (falseBranch == true) {
+							script.Replace(
+								conditionalExpression,
+								new BinaryOperatorExpression(
+									CSharpUtil.InvertCondition(conditionalExpression.Condition), 
+									BinaryOperatorType.ConditionalOr,
+									conditionalExpression.TrueExpression.Clone()
+								)
+							);
+							return;
+						}
+
+						if (falseBranch == false) {
+							script.Replace(
+								conditionalExpression,
+								new BinaryOperatorExpression(
+									conditionalExpression.Condition.Clone(), 
+									BinaryOperatorType.ConditionalAnd,
+									conditionalExpression.TrueExpression.Clone()
+								)
+							);
+							return;
+						}
+
+						// Should never happen
+					}
+				));
+			}
+
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/SimplifyLinqExpressionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/SimplifyLinqExpressionIssue.cs
new file mode 100644
index 0000000000..7f508da9fa
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/SimplifyLinqExpressionIssue.cs
@@ -0,0 +1,117 @@
+//
+// SimplifyLinqExpressionIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Simplify LINQ expression",
+		Description = "Simplify LINQ expression",
+		Category = IssueCategories.PracticesAndImprovements,
+		Severity = Severity.Suggestion,
+		AnalysisDisableKeyword = "SimplifyLinqExpression")]
+	public class SimplifyLinqExpressionIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<SimplifyLinqExpressionIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			static readonly Expression simpleExpression = new Choice {
+				new UnaryOperatorExpression (UnaryOperatorType.Not, new AnyNode()),
+				new BinaryOperatorExpression(new AnyNode(), BinaryOperatorType.Equality, new AnyNode()),
+				new BinaryOperatorExpression(new AnyNode(), BinaryOperatorType.InEquality, new AnyNode())
+			};
+
+			static readonly AstNode argumentPattern = new Choice {
+				new LambdaExpression  {
+					Parameters = { new ParameterDeclaration(PatternHelper.AnyType(true), Pattern.AnyString) },
+					Body = new Choice {
+						new NamedNode ("expr", simpleExpression),
+						new BlockStatement { new ReturnStatement(new NamedNode ("expr", simpleExpression))}
+					} 
+				},
+				new AnonymousMethodExpression {
+					Parameters = { new ParameterDeclaration(PatternHelper.AnyType(true), Pattern.AnyString) },
+					Body = new BlockStatement { new ReturnStatement(new NamedNode ("expr", simpleExpression))}
+				}
+			};
+
+			public override void VisitUnaryOperatorExpression(UnaryOperatorExpression unaryOperatorExpression)
+			{
+				base.VisitUnaryOperatorExpression(unaryOperatorExpression);
+				if (unaryOperatorExpression.Operator != UnaryOperatorType.Not)
+					return;
+				var invocation =  CSharpUtil.GetInnerMostExpression(unaryOperatorExpression.Expression) as InvocationExpression;
+				if (invocation == null)
+					return; 
+				var rr = ctx.Resolve(invocation) as CSharpInvocationResolveResult;
+				if (rr == null || rr.IsError)
+					return;
+
+				if (rr.Member.DeclaringType.Name != "Enumerable" || rr.Member.DeclaringType.Namespace != "System.Linq")
+					return;
+				if (!new[] { "All", "Any" }.Contains(rr.Member.Name))
+					return;
+				if (invocation.Arguments.Count != 1)
+					return;
+				var arg = invocation.Arguments.First();
+				var match = argumentPattern.Match(arg);
+				if (!match.Success)
+					return;
+				AddIssue(new CodeIssue (
+					unaryOperatorExpression,
+					ctx.TranslateString("Simplify LINQ expression"),
+					ctx.TranslateString("Simplify LINQ expression"),
+					s => {
+						var target = invocation.Target.Clone() as MemberReferenceExpression;
+						target.MemberName = target.MemberName == "All" ? "Any" : "All";
+
+						var expr = arg.Clone();
+						var nmatch = argumentPattern.Match(expr);
+						var cond = nmatch.Get<Expression>("expr").Single();
+						cond.ReplaceWith(CSharpUtil.InvertCondition(cond));
+						var simplifiedInvocation = new InvocationExpression(
+							target,
+							expr
+						);
+						s.Replace(unaryOperatorExpression, simplifiedInvocation);
+					}
+				));
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringCompareIsCultureSpecificIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringCompareIsCultureSpecificIssue.cs
new file mode 100644
index 0000000000..ffa277261b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringCompareIsCultureSpecificIssue.cs
@@ -0,0 +1,145 @@
+//
+// StringCompareIsCultureSpecificIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("'string.Compare' is culture-aware",
+	                  Description = "Warns when a culture-aware 'Compare' call is used by default.",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "StringCompareIsCultureSpecific")]
+	public class StringCompareIsCultureSpecificIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<StringCompareIsCultureSpecificIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+
+				var rr = ctx.Resolve(invocationExpression) as CSharpInvocationResolveResult;
+				if (rr == null || rr.IsError)
+					return;
+
+				if (!rr.Member.IsStatic ||
+					rr.Member.Name != "Compare" || 
+				    !rr.Member.DeclaringType.IsKnownType (KnownTypeCode.String) ||
+				    !rr.Member.Parameters[0].Type.IsKnownType(KnownTypeCode.String)) {
+					return;
+				}
+				if (rr.Member.Parameters.Count != 2 &&
+				    rr.Member.Parameters.Count != 3 &&
+				    rr.Member.Parameters.Count != 5 &&
+				    rr.Member.Parameters.Count != 6)
+					return;
+
+				bool? ignoreCase = null;
+				Expression caseArg = null;
+				IParameter lastParameter = rr.Member.Parameters.Last();
+				if (lastParameter.Type.Name == "StringComparison")
+					return; // already specifying a string comparison
+
+				if (rr.Member.Parameters.Count == 3) {
+					if (!rr.Member.Parameters[2].Type.IsKnownType(KnownTypeCode.Boolean))
+						return;
+					if (rr.Arguments[2].IsCompileTimeConstant) {
+						ignoreCase = (bool)rr.Arguments[2].ConstantValue;
+					} else {
+						caseArg = invocationExpression.Arguments.ElementAt(2);
+					}
+				}
+
+				if (rr.Member.Parameters.Count == 6) {
+					if (!rr.Member.Parameters[5].Type.IsKnownType(KnownTypeCode.Boolean))
+						return;
+					if (rr.Arguments[5].IsCompileTimeConstant) {
+						ignoreCase = (bool)rr.Arguments[5].ConstantValue;
+					} else {
+						caseArg = invocationExpression.Arguments.ElementAt(5);
+					}
+				}
+
+
+				AddIssue(new CodeIssue(
+					invocationExpression,
+					ctx.TranslateString("'string.Compare' is culture-aware"), 
+					new CodeAction(
+						ctx.TranslateString("Use ordinal comparison"), 
+						script => AddArgument(script, invocationExpression, CreateCompareArgument (invocationExpression, ignoreCase, caseArg, "Ordinal")), 
+						invocationExpression
+					),
+					new CodeAction(
+						ctx.TranslateString("Use culture-aware comparison"), 
+						script => AddArgument(script, invocationExpression, CreateCompareArgument (invocationExpression, ignoreCase, caseArg, "Ordinal")), 
+						invocationExpression
+					)
+				));
+			}
+
+			Expression CreateCompareArgument (InvocationExpression invocationExpression, bool? ignoreCase, Expression caseArg, string stringComparison)
+			{
+				var astBuilder = ctx.CreateTypeSystemAstBuilder(invocationExpression);
+				if (caseArg == null)
+					return astBuilder.ConvertType(new TopLevelTypeName("System", "StringComparison")).Member(ignoreCase == true ? stringComparison + "IgnoreCase" : stringComparison);
+
+				return new ConditionalExpression(
+					caseArg.Clone(),
+					astBuilder.ConvertType(new TopLevelTypeName("System", "StringComparison")).Member(stringComparison + "IgnoreCase"),
+					astBuilder.ConvertType(new TopLevelTypeName("System", "StringComparison")).Member(stringComparison)
+				);
+			}
+
+			void AddArgument(Script script, InvocationExpression invocationExpression, Expression compareArgument)
+			{
+				var copy = (InvocationExpression)invocationExpression.Clone();
+				copy.Arguments.Clear();
+				if (invocationExpression.Arguments.Count() <= 3) {
+					copy.Arguments.AddRange(invocationExpression.Arguments.Take(2).Select(a => a.Clone())); 
+				} else {
+					copy.Arguments.AddRange(invocationExpression.Arguments.Take(5).Select(a => a.Clone())); 
+				}
+				copy.Arguments.Add(compareArgument);
+				script.Replace(invocationExpression, copy);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringCompareToIsCultureSpecificIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringCompareToIsCultureSpecificIssue.cs
new file mode 100644
index 0000000000..6d72f2eec2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringCompareToIsCultureSpecificIssue.cs
@@ -0,0 +1,97 @@
+//
+// StringCompareToIsCultureSpecificIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("'string.CompareTo' is culture-aware",
+	                  Description = "Warns when a culture-aware 'string.CompareTo' call is used by default.",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "StringCompareToIsCultureSpecific")]
+	public class StringCompareToIsCultureSpecificIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<StringCompareToIsCultureSpecificIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+
+				var rr = ctx.Resolve(invocationExpression) as CSharpInvocationResolveResult;
+				if (rr == null || rr.IsError)
+					return;
+
+				if (rr.Member.Name != "CompareTo" || 
+				    !rr.Member.DeclaringType.IsKnownType (KnownTypeCode.String) ||
+				    rr.Member.Parameters.Count != 1 ||
+				    !rr.Member.Parameters[0].Type.IsKnownType(KnownTypeCode.String)) {
+					return;
+				}
+				AddIssue(new CodeIssue(
+					invocationExpression,
+					ctx.TranslateString("'string.CompareTo' is culture-aware"), 
+					new CodeAction(ctx.TranslateString("Use ordinal comparison"), script => AddArgument(script, invocationExpression, "Ordinal"), invocationExpression),
+					new CodeAction(ctx.TranslateString("Use culture-aware comparison"), script => AddArgument(script, invocationExpression, "CurrentCulture"), invocationExpression)
+				));
+
+			}
+
+			void AddArgument(Script script, InvocationExpression invocationExpression, string ordinal)
+			{
+				var mr = invocationExpression.Target as MemberReferenceExpression;
+				if (mr == null)
+					return;
+
+				var astBuilder = ctx.CreateTypeSystemAstBuilder(invocationExpression);
+				var newArgument = astBuilder.ConvertType(new TopLevelTypeName("System", "StringComparison")).Member(ordinal);
+
+				var newInvocation = new InvocationExpression(
+					new MemberReferenceExpression(new PrimitiveType("string"), "Compare"),
+					mr.Target.Clone(),
+					invocationExpression.Arguments.First().Clone(),
+					newArgument
+				);
+				script.Replace(invocationExpression, newInvocation);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringEndsWithIsCultureSpecificIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringEndsWithIsCultureSpecificIssue.cs
new file mode 100644
index 0000000000..9db9361573
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringEndsWithIsCultureSpecificIssue.cs
@@ -0,0 +1,42 @@
+//
+// StringEndsWithIsCultureSpecific.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("'string.EndsWith' is culture-aware",
+	                  Description = "Warns when a culture-aware 'EndsWith' call is used by default.",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "StringEndsWithIsCultureSpecific")]
+	public class StringEndsWithIsCultureSpecificIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new StringIndexOfIsCultureSpecificIssue.GatherVisitor<StringEndsWithIsCultureSpecificIssue>(context, "EndsWith");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringIndexOfIsCultureSpecificIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringIndexOfIsCultureSpecificIssue.cs
new file mode 100644
index 0000000000..339748b964
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringIndexOfIsCultureSpecificIssue.cs
@@ -0,0 +1,104 @@
+//
+// StringIndexOfIsCultureSpecificIssue.cs
+//
+// Author:
+//       Daniel Grunwald <daniel@danielgrunwald.de>
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2012 Daniel Grunwald
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("'string.IndexOf' is culture-aware",
+	                  Description = "Warns when a culture-aware 'IndexOf' call is used by default.",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "StringIndexOfIsCultureSpecific")]
+	public class StringIndexOfIsCultureSpecificIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor<StringIndexOfIsCultureSpecificIssue>(context, "IndexOf");
+		}
+
+		internal class GatherVisitor<T> : GatherVisitorBase<T> where T : GatherVisitorCodeIssueProvider
+		{
+			readonly string memberName;
+
+			public GatherVisitor(BaseRefactoringContext ctx, string memberName) : base(ctx)
+			{
+				this.memberName = memberName;
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+
+				MemberReferenceExpression mre = invocationExpression.Target as MemberReferenceExpression;
+				if (mre == null)
+					return;
+				if (mre.MemberName != memberName)
+					return;
+
+				var rr = ctx.Resolve(invocationExpression) as InvocationResolveResult;
+				if (rr == null || rr.IsError) {
+					// Not an invocation resolve result - e.g. could be a UnknownMemberResolveResult instead
+					return;
+				}
+				if (!(rr.Member.DeclaringTypeDefinition != null && rr.Member.DeclaringTypeDefinition.KnownTypeCode == KnownTypeCode.String)) {
+					// Not a string operation
+					return;
+				}
+				IParameter firstParameter = rr.Member.Parameters.FirstOrDefault();
+				if (firstParameter == null || !firstParameter.Type.IsKnownType(KnownTypeCode.String))
+					return; // First parameter not a string
+				IParameter lastParameter = rr.Member.Parameters.Last();
+				if (lastParameter.Type.Name == "StringComparison")
+					return; // already specifying a string comparison
+				AddIssue(new CodeIssue(
+					invocationExpression.LParToken.StartLocation, 
+					invocationExpression.RParToken.EndLocation,
+					string.Format(ctx.TranslateString("'{0}' is culture-aware and missing a StringComparison argument"), rr.Member.FullName),
+					new CodeAction(ctx.TranslateString("Add 'StringComparison.Ordinal'"), script => AddArgument(script, invocationExpression, "Ordinal"), invocationExpression),
+					new CodeAction(ctx.TranslateString("Add 'StringComparison.CurrentCulture'"), script => AddArgument(script, invocationExpression, "CurrentCulture"), invocationExpression)
+				));
+			}
+
+			void AddArgument(Script script, InvocationExpression invocationExpression, string stringComparison)
+			{
+				var astBuilder = ctx.CreateTypeSystemAstBuilder(invocationExpression);
+				var newArgument = astBuilder.ConvertType(new TopLevelTypeName("System", "StringComparison")).Member(stringComparison);
+				var copy = (InvocationExpression)invocationExpression.Clone();
+				copy.Arguments.Add(newArgument);
+				script.Replace(invocationExpression, copy);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringLastIndexOfIsCultureSpecificIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringLastIndexOfIsCultureSpecificIssue.cs
new file mode 100644
index 0000000000..8183f895ab
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringLastIndexOfIsCultureSpecificIssue.cs
@@ -0,0 +1,42 @@
+//
+// StringLastIndexOfIsCultureSpecificIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("'string.LastIndexOf' is culture-aware",
+	                  Description = "Warns when a culture-aware 'LastIndexOf' call is used by default.",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "StringLastIndexOfIsCultureSpecific")]
+	public class StringLastIndexOfIsCultureSpecificIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new StringIndexOfIsCultureSpecificIssue.GatherVisitor<StringLastIndexOfIsCultureSpecificIssue>(context, "LastIndexOf");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringStartsWithIsCultureSpecificIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringStartsWithIsCultureSpecificIssue.cs
new file mode 100644
index 0000000000..be47ec10f5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/StringStartsWithIsCultureSpecificIssue.cs
@@ -0,0 +1,42 @@
+//
+// StringStartsWithIsCultureSpecific.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("'string.StartsWith' is culture-aware",
+	                  Description = "Warns when a culture-aware 'StartsWith' call is used by default.",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "StringStartsWithIsCultureSpecific")]
+	public class StringStartsWithIsCultureSpecificIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new StringIndexOfIsCultureSpecificIssue.GatherVisitor<StringStartsWithIsCultureSpecificIssue>(context, "StartsWith");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/UseArrayCreationExpressionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/UseArrayCreationExpressionIssue.cs
new file mode 100644
index 0000000000..a7096f4131
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/UseArrayCreationExpressionIssue.cs
@@ -0,0 +1,91 @@
+//
+// UseArrayCreationExpressionIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Use array creation expression",
+	                  Description = "Use array creation expression",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "UseArrayCreationExpression")]
+	public class UseArrayCreationExpressionIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<UseArrayCreationExpressionIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+
+				var rr = ctx.Resolve(invocationExpression) as CSharpInvocationResolveResult;
+				if (rr == null || rr.IsError)
+					return;
+
+				if (rr.Member.Name != "CreateInstance" ||
+				    !rr.Member.DeclaringType.IsKnownType(KnownTypeCode.Array))
+					return;
+				var firstArg = invocationExpression.Arguments.FirstOrDefault() as TypeOfExpression;
+				if (firstArg == null)
+					return;
+				var argRR = ctx.Resolve(invocationExpression.Arguments.ElementAt(1));
+				if (!argRR.Type.IsKnownType(KnownTypeCode.Int32))
+					return;
+
+				AddIssue(new CodeIssue(
+					invocationExpression,
+					ctx.TranslateString("Use array create expression"), 
+					ctx.TranslateString("Replace with 'new'"), 
+					script => {
+						var ac = new ArrayCreateExpression {
+							Type = firstArg.Type.Clone()
+						};
+						foreach (var arg in invocationExpression.Arguments.Skip(1))
+							ac.Arguments.Add(arg.Clone()) ;
+						script.Replace(invocationExpression, ac);
+					}
+				));
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/UseIsOperatorIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/UseIsOperatorIssue.cs
new file mode 100644
index 0000000000..66d3cd9eac
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/UseIsOperatorIssue.cs
@@ -0,0 +1,125 @@
+//
+// UseIsOperatorIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+using System.Linq;
+using System;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Use 'is' operator",
+	                  Description = "'is' operator can be used",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "UseIsOperator")]
+	public class UseIsOperatorIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<UseIsOperatorIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+			}
+
+			static readonly Expression pattern1 = new InvocationExpression(
+				new MemberReferenceExpression(new TypeOfExpression(new AnyNode("Type")), "IsAssignableFrom"),
+				new InvocationExpression(
+				new MemberReferenceExpression(new AnyNode("object"), "GetType")
+			)
+			);
+			static readonly Expression pattern2 = new InvocationExpression(
+				new MemberReferenceExpression(new TypeOfExpression(new AnyNode("Type")), "IsInstanceOfType"),
+				new AnyNode("object")
+			);
+
+
+
+			void AddIssue(AstNode invocationExpression, Match match, bool negate = false)
+			{
+				AddIssue(new CodeIssue(
+					invocationExpression,
+					ctx.TranslateString("Use 'is' operator"),
+					ctx.TranslateString("Replace with 'is' operator"), 
+					s => {
+						Expression expression = new IsExpression(CSharpUtil.AddParensForUnaryExpressionIfRequired(match.Get<Expression>("object").Single().Clone()), match.Get<AstType>("Type").Single().Clone());
+						if (negate)
+							expression = new UnaryOperatorExpression (UnaryOperatorType.Not, new ParenthesizedExpression(expression));
+						s.Replace(invocationExpression, expression);
+					}
+				));
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+				var match = pattern1.Match(invocationExpression);
+				if (!match.Success)
+					match = pattern2.Match(invocationExpression);
+				if (match.Success) {
+					AddIssue(invocationExpression, match);
+				}
+			}
+
+			/* Unfortunately not quite the same :/
+			static readonly AstNode equalityComparePattern =
+				PatternHelper.CommutativeOperator(
+					PatternHelper.OptionalParentheses(new TypeOfExpression(new AnyNode("Type"))),
+					BinaryOperatorType.Equality,
+					PatternHelper.OptionalParentheses(new InvocationExpression(
+						new MemberReferenceExpression(new AnyNode("object"), "GetType")
+					))
+				);
+			static readonly AstNode inEqualityComparePattern =
+				PatternHelper.CommutativeOperator(
+					PatternHelper.OptionalParentheses(new TypeOfExpression(new AnyNode("Type"))),
+					BinaryOperatorType.InEquality,
+					PatternHelper.OptionalParentheses(new InvocationExpression(
+					new MemberReferenceExpression(new AnyNode("object"), "GetType")
+					))
+					);
+			public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
+			{
+				base.VisitBinaryOperatorExpression(binaryOperatorExpression);
+				var match = equalityComparePattern.Match(binaryOperatorExpression);
+				if (match.Success) {
+					AddIssue(new CodeIssue(binaryOperatorExpression, match);
+					return;
+				}
+
+				match = inEqualityComparePattern.Match(binaryOperatorExpression);
+				if (match.Success) {
+					AddIssue(new CodeIssue(binaryOperatorExpression, match, true);
+					return;
+				}
+			}*/
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/UseMethodAnyIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/UseMethodAnyIssue.cs
new file mode 100644
index 0000000000..6cd1c652a2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/UseMethodAnyIssue.cs
@@ -0,0 +1,163 @@
+//
+// UseMethodAnyIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Use method 'Any()'",
+	                  Description = "Replace usages of 'Count()' with call to 'Any()'",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "UseMethodAny")]
+	public class UseMethodAnyIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<UseMethodAnyIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			void AddIssue2(BinaryOperatorExpression binaryOperatorExpression, Expression expr)
+			{
+			}
+
+			readonly AstNode anyPattern =
+				new Choice {
+					PatternHelper.CommutativeOperatorWithOptionalParentheses(
+						new NamedNode ("invocation", new InvocationExpression(new MemberReferenceExpression(new AnyNode("expr"), "Count"))),
+						BinaryOperatorType.InEquality,
+						new PrimitiveExpression(0)
+					),
+					new BinaryOperatorExpression (
+						PatternHelper.OptionalParentheses(new NamedNode ("invocation", new InvocationExpression(new MemberReferenceExpression(new AnyNode("expr"), "Count")))),
+						BinaryOperatorType.GreaterThan,
+						PatternHelper.OptionalParentheses(new PrimitiveExpression(0))
+					),
+					new BinaryOperatorExpression (
+						PatternHelper.OptionalParentheses(new PrimitiveExpression(0)),
+						BinaryOperatorType.LessThan,
+						PatternHelper.OptionalParentheses(new NamedNode ("invocation", new InvocationExpression(new MemberReferenceExpression(new AnyNode("expr"), "Count"))))
+					),
+					new BinaryOperatorExpression (
+						PatternHelper.OptionalParentheses(new NamedNode ("invocation", new InvocationExpression(new MemberReferenceExpression(new AnyNode("expr"), "Count")))),
+						BinaryOperatorType.GreaterThanOrEqual,
+						PatternHelper.OptionalParentheses(new PrimitiveExpression(1))
+					),
+					new BinaryOperatorExpression (
+						PatternHelper.OptionalParentheses(new PrimitiveExpression(1)),
+						BinaryOperatorType.LessThanOrEqual,
+						PatternHelper.OptionalParentheses(new NamedNode ("invocation", new InvocationExpression(new MemberReferenceExpression(new AnyNode("expr"), "Count"))))
+					)
+			};
+
+			readonly AstNode notAnyPattern =
+				new Choice {
+					PatternHelper.CommutativeOperatorWithOptionalParentheses(
+						new NamedNode ("invocation", new InvocationExpression(new MemberReferenceExpression(new AnyNode("expr"), "Count"))),
+						BinaryOperatorType.Equality,
+						new PrimitiveExpression(0)
+					),
+					new BinaryOperatorExpression (
+						PatternHelper.OptionalParentheses(new NamedNode ("invocation", new InvocationExpression(new MemberReferenceExpression(new AnyNode("expr"), "Count")))),
+						BinaryOperatorType.LessThan,
+						PatternHelper.OptionalParentheses(new PrimitiveExpression(1))
+					),
+					new BinaryOperatorExpression (
+						PatternHelper.OptionalParentheses(new PrimitiveExpression(1)),
+						BinaryOperatorType.GreaterThan,
+						PatternHelper.OptionalParentheses(new NamedNode ("invocation", new InvocationExpression(new MemberReferenceExpression(new AnyNode("expr"), "Count"))))
+					),
+					new BinaryOperatorExpression (
+						PatternHelper.OptionalParentheses(new NamedNode ("invocation", new InvocationExpression(new MemberReferenceExpression(new AnyNode("expr"), "Count")))),
+						BinaryOperatorType.LessThanOrEqual,
+						PatternHelper.OptionalParentheses(new PrimitiveExpression(0))
+					),
+					new BinaryOperatorExpression (
+						PatternHelper.OptionalParentheses(new PrimitiveExpression(0)),
+						BinaryOperatorType.GreaterThanOrEqual,
+						PatternHelper.OptionalParentheses(new NamedNode ("invocation", new InvocationExpression(new MemberReferenceExpression(new AnyNode("expr"), "Count"))))
+					)
+				};
+
+			void AddMatch(BinaryOperatorExpression binaryOperatorExpression, Match match, bool negateAny)
+			{
+				AddIssue(new CodeIssue(
+					binaryOperatorExpression,
+					ctx.TranslateString("Use 'Any()' for increased performance."), 
+					negateAny ? ctx.TranslateString("Replace with call to '!Any()'") : ctx.TranslateString("Replace with call to 'Any()'"), 
+					script =>  {
+						Expression expr = new InvocationExpression(new MemberReferenceExpression(match.Get<Expression>("expr").First().Clone(), "Any"));
+						if (negateAny)
+							expr = new UnaryOperatorExpression(UnaryOperatorType.Not, expr);
+						script.Replace(binaryOperatorExpression, expr);
+					}
+				));
+			}
+
+			bool CheckMethod(Match match)
+			{
+				var invocation = match.Get<Expression>("invocation").First();
+				var rr = ctx.Resolve(invocation) as CSharpInvocationResolveResult;
+				if (rr == null || rr.IsError)
+					return false;
+				var method = rr.Member as IMethod;
+				return 
+					method != null &&
+					method.IsExtensionMethod &&
+					method.DeclaringTypeDefinition.Namespace == "System.Linq" && 
+					method.DeclaringTypeDefinition.Name == "Enumerable";
+			}
+
+			public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
+			{
+				base.VisitBinaryOperatorExpression(binaryOperatorExpression);
+				var match = anyPattern.Match(binaryOperatorExpression);
+				if (match.Success && CheckMethod (match)) {
+					AddMatch(binaryOperatorExpression, match, false);
+					return;
+				}
+				match = notAnyPattern.Match(binaryOperatorExpression);
+				if (match.Success && CheckMethod (match)) {
+					AddMatch(binaryOperatorExpression, match, true);
+					return;
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/UseMethodIsInstanceOfTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/UseMethodIsInstanceOfTypeIssue.cs
new file mode 100644
index 0000000000..eb65a0f1b8
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/UseMethodIsInstanceOfTypeIssue.cs
@@ -0,0 +1,88 @@
+//
+// UseMethodIsInstanceOfType.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Threading;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using System;
+using System.Diagnostics;
+using ICSharpCode.NRefactory.Utils;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Use method IsInstanceOfType",
+	                  Description = "Use method IsInstanceOfType",
+	                  Category = IssueCategories.PracticesAndImprovements,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "UseMethodIsInstanceOfType")]
+	public class UseMethodIsInstanceOfTypeIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<UseMethodIsInstanceOfTypeIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+			}
+
+			static readonly Expression pattern = new InvocationExpression(
+				new MemberReferenceExpression(new AnyNode("target"), "IsAssignableFrom"),
+				new InvocationExpression(
+					new MemberReferenceExpression(new AnyNode("object"), "GetType")
+				)
+			);
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+				var match = pattern.Match(invocationExpression);
+				if (match.Success) {
+					AddIssue(new CodeIssue(
+						invocationExpression,
+						ctx.TranslateString("Use method IsInstanceOfType (...)"),
+						ctx.TranslateString("Replace with call to IsInstanceOfType"),
+						s => {
+							s.Replace(invocationExpression, new InvocationExpression(
+								new MemberReferenceExpression(match.Get<Expression>("target").Single().Clone(), "IsInstanceOfType"),
+								match.Get<Expression>("object").Single().Clone()
+							));
+						}
+					));
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/ArrayCreationCanBeReplacedWithArrayInitializerIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/ArrayCreationCanBeReplacedWithArrayInitializerIssue.cs
new file mode 100644
index 0000000000..d127972f29
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/ArrayCreationCanBeReplacedWithArrayInitializerIssue.cs
@@ -0,0 +1,100 @@
+// RedundantArrayCreationExpressionIssue.cs
+//
+// Author:
+//      Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Array creation can be replaced with array initializer",
+		Description = "When initializing explicitly typed local variable or array type, array creation expression can be replaced with array initializer.",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning)]
+	public class ArrayCreationCanBeReplacedWithArrayInitializerIssue : GatherVisitorCodeIssueProvider
+	{
+
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context, this);
+		}
+
+
+		class GatherVisitor : GatherVisitorBase<ArrayCreationCanBeReplacedWithArrayInitializerIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx, ArrayCreationCanBeReplacedWithArrayInitializerIssue issueProvider) : base (ctx, issueProvider)
+			{
+			}
+
+			private void AddIssue(AstNode node, AstNode initializer)
+			{
+				AddIssue(new CodeIssue(
+					node.StartLocation, 
+					initializer.StartLocation, 
+					ctx.TranslateString("Redundant array creation expression"), 
+					ctx.TranslateString("Use array initializer"),
+					script => {
+						var startOffset = script.GetCurrentOffset(node.StartLocation);
+						var endOffset = script.GetCurrentOffset(initializer.StartLocation);
+						if (startOffset < endOffset)
+							script.RemoveText(startOffset, endOffset - startOffset);
+					}) { IssueMarker = IssueMarker.GrayOut }
+				);
+			}
+
+			public override void VisitArrayCreateExpression(ArrayCreateExpression arrayCreateExpression)
+			{
+				base.VisitArrayCreateExpression(arrayCreateExpression);
+
+				if (arrayCreateExpression.Initializer.IsNull)
+					return;
+			
+				var variableInilizer = arrayCreateExpression.GetParent<VariableInitializer>();
+				if (variableInilizer == null)
+					return;
+
+				if (variableInilizer.Parent is VariableDeclarationStatement) {
+					var variableDeclaration = variableInilizer.Parent;
+
+					if (variableDeclaration.GetChildByRole(Roles.Type) is ComposedType) {
+						var composedType = variableDeclaration.GetChildByRole(Roles.Type) as ComposedType;
+						if (composedType.ArraySpecifiers == null)
+							return;
+						AddIssue(arrayCreateExpression, arrayCreateExpression.Initializer);
+					}
+				} else if (variableInilizer.Parent is FieldDeclaration) {
+					var filedDeclaration = variableInilizer.Parent;
+
+					if (filedDeclaration.GetChildByRole(Roles.Type) is ComposedType) {
+						var composedType = filedDeclaration.GetChildByRole(Roles.Type) as ComposedType;
+						if (composedType.ArraySpecifiers == null)
+							return;
+						AddIssue(arrayCreateExpression, arrayCreateExpression.Initializer);
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/ConditionIsAlwaysTrueOrFalseIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/ConditionIsAlwaysTrueOrFalseIssue.cs
new file mode 100644
index 0000000000..ae09175b64
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/ConditionIsAlwaysTrueOrFalseIssue.cs
@@ -0,0 +1,139 @@
+//
+// ConditionIsAlwaysTrueOrFalseIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Runtime.InteropServices.ComTypes;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Expression is always 'true' or always 'false'",
+		Description = "Value of the expression can be determined at compile time",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "ConditionIsAlwaysTrueOrFalse")]
+	public class ConditionIsAlwaysTrueOrFalseIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ConditionIsAlwaysTrueOrFalseIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
+			{
+				if (CheckConstant(binaryOperatorExpression))
+					return;
+				if (CSharpUtil.GetInnerMostExpression(binaryOperatorExpression.Left) is NullReferenceExpression) {
+					if (CheckNullComparison(binaryOperatorExpression, binaryOperatorExpression.Right, binaryOperatorExpression.Left))
+						return;
+				}
+
+				if (CSharpUtil.GetInnerMostExpression(binaryOperatorExpression.Right) is NullReferenceExpression) {
+					if (CheckNullComparison(binaryOperatorExpression, binaryOperatorExpression.Left, binaryOperatorExpression.Right))
+						return;
+				}
+
+				base.VisitBinaryOperatorExpression(binaryOperatorExpression);
+			}
+
+			bool CheckNullComparison(BinaryOperatorExpression binaryOperatorExpression, Expression right, Expression nullNode)
+			{
+				if (binaryOperatorExpression.Operator != BinaryOperatorType.Equality && binaryOperatorExpression.Operator != BinaryOperatorType.InEquality)
+					return false;
+				// note null == null is checked by similiar expression comparison.
+				var expr = CSharpUtil.GetInnerMostExpression(right);
+
+				var rr = ctx.Resolve(expr);
+				if (rr.Type.IsReferenceType == false) {
+					// nullable check
+					if (NullableType.IsNullable(rr.Type))
+						return false;
+
+					var conversion = ctx.GetConversion(nullNode);
+					if (conversion.ConversionAfterUserDefinedOperator == Conversion.IdentityConversion)
+						return false;
+
+					// check for user operators
+					foreach (var op in rr.Type.GetMethods(m => m.SymbolKind == SymbolKind.Operator && m.Parameters.Count == 2)) {
+						if (op.Parameters[0].Type.IsReferenceType == false && op.Parameters[1].Type.IsReferenceType == false)
+							continue;
+						if (binaryOperatorExpression.Operator == BinaryOperatorType.Equality && op.Name == "op_Equality")
+							return false;
+						if (binaryOperatorExpression.Operator == BinaryOperatorType.InEquality && op.Name == "op_Inequality")
+							return false;
+					}
+
+					AddIssue(binaryOperatorExpression, binaryOperatorExpression.Operator != BinaryOperatorType.Equality);
+					return true;
+				}
+				return false;
+			}
+
+			void AddIssue(Expression expr, bool result)
+			{
+				AddIssue(new CodeIssue(
+					expr, 
+					string.Format(ctx.TranslateString("Expression is always '{0}'"), result ? "true" : "false"), 
+					string.Format(ctx.TranslateString("Replace with '{0}'"), result ? "true" : "false"), 
+					s => s.Replace(expr, new PrimitiveExpression(result))
+				));
+			}
+
+			bool CheckConstant(Expression expr)
+			{
+				var rr = ctx.Resolve(expr);
+				if (rr.ConstantValue is bool) {
+					var result = (bool)rr.ConstantValue;
+					AddIssue(expr, result);
+					return true;
+				}
+				return false;
+			}
+
+			public override void VisitUnaryOperatorExpression(UnaryOperatorExpression unaryOperatorExpression)
+			{
+				if (CheckConstant(unaryOperatorExpression))
+					return;
+				base.VisitUnaryOperatorExpression(unaryOperatorExpression);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/ConstantNullCoalescingConditionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/ConstantNullCoalescingConditionIssue.cs
new file mode 100644
index 0000000000..f1e7deaff5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/ConstantNullCoalescingConditionIssue.cs
@@ -0,0 +1,143 @@
+//
+// RedundantNullCoalescingExpressionIssue.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+//
+// Copyright (c) 2013 Luís Reis
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Runtime.InteropServices.ComTypes;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("'??' condition is known to be null or not null",
+	                  Description = "Finds redundant null coalescing expressions such as expr ?? expr",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "ConstantNullCoalescingCondition")]
+	public class ConstantNullCoalescingConditionIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ConstantNullCoalescingConditionIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			Dictionary<AstNode, NullValueAnalysis> cachedNullAnalysis = new Dictionary<AstNode, NullValueAnalysis>();
+
+			public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
+			{
+				base.VisitBinaryOperatorExpression(binaryOperatorExpression);
+
+				if (binaryOperatorExpression.Operator != BinaryOperatorType.NullCoalescing) {
+					//The issue is not applicable
+					return;
+				}
+
+				var parentFunction = GetParentFunctionNode(binaryOperatorExpression);
+				var analysis = GetAnalysis(parentFunction);
+
+				NullValueStatus leftStatus = analysis.GetExpressionResult(binaryOperatorExpression.Left);
+				if (leftStatus == NullValueStatus.DefinitelyNotNull) {
+					AddIssue(new CodeIssue(binaryOperatorExpression.OperatorToken.StartLocation,
+					         binaryOperatorExpression.Right.EndLocation,
+					         ctx.TranslateString("Redundant ??. Left side is never null."),
+					         ctx.TranslateString("Remove redundant right side"),
+					         script => {
+
+						script.Replace(binaryOperatorExpression, binaryOperatorExpression.Left.Clone());
+
+						}) { IssueMarker = IssueMarker.GrayOut });
+					return;
+				}
+				if (leftStatus == NullValueStatus.DefinitelyNull) {
+					AddIssue(new CodeIssue(binaryOperatorExpression.Left.StartLocation,
+					         binaryOperatorExpression.OperatorToken.EndLocation,
+					         ctx.TranslateString("Redundant ??. Left side is always null."),
+					         ctx.TranslateString("Remove redundant left side"),
+					         script => {
+
+						script.Replace(binaryOperatorExpression, binaryOperatorExpression.Right.Clone());
+
+						}));
+					return;
+				}
+				NullValueStatus rightStatus = analysis.GetExpressionResult(binaryOperatorExpression.Right);
+				if (rightStatus == NullValueStatus.DefinitelyNull) {
+					AddIssue(new CodeIssue(binaryOperatorExpression.OperatorToken.StartLocation,
+					         binaryOperatorExpression.Right.EndLocation,
+					         ctx.TranslateString("Redundant ??. Right side is always null."),
+					         ctx.TranslateString("Remove redundant right side"),
+					         script => {
+
+						script.Replace(binaryOperatorExpression, binaryOperatorExpression.Left.Clone());
+
+						}));
+					return;
+				}
+			}
+
+			NullValueAnalysis GetAnalysis(AstNode parentFunction)
+			{
+				NullValueAnalysis analysis;
+				if (cachedNullAnalysis.TryGetValue(parentFunction, out analysis)) {
+					return analysis;
+				}
+
+				analysis = new NullValueAnalysis(ctx, parentFunction.GetChildByRole(Roles.Body), parentFunction.GetChildrenByRole(Roles.Parameter), ctx.CancellationToken);
+				analysis.IsParametersAreUninitialized = true;
+				analysis.Analyze();
+				cachedNullAnalysis [parentFunction] = analysis;
+				return analysis;
+			}
+		}
+
+		public static AstNode GetParentFunctionNode(AstNode node)
+		{
+			do {
+				node = node.Parent;
+			} while (node != null && !IsFunctionNode(node));
+
+			return node;
+		}
+
+		static bool IsFunctionNode(AstNode node)
+		{
+			return node is EntityDeclaration ||
+				node is LambdaExpression ||
+					node is AnonymousMethodExpression;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/DoubleNegationOperatorIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/DoubleNegationOperatorIssue.cs
new file mode 100644
index 0000000000..7e96cd7aa7
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/DoubleNegationOperatorIssue.cs
@@ -0,0 +1,79 @@
+// 
+// DoubleNegationOperatorIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Double negation operator",
+						Description = "Double negation is meaningless.",
+						Category = IssueCategories.RedundanciesInCode,
+						Severity = Severity.Warning,
+                        AnalysisDisableKeyword = "DoubleNegationOperator")]
+    public class DoubleNegationOperatorIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<DoubleNegationOperatorIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			static Expression RemoveParentheses (Expression expr)
+			{
+				while (expr is ParenthesizedExpression)
+					expr = ((ParenthesizedExpression) expr).Expression;
+				return expr;
+			}
+
+			public override void VisitUnaryOperatorExpression (UnaryOperatorExpression unaryOperatorExpression)
+			{
+				base.VisitUnaryOperatorExpression (unaryOperatorExpression);
+
+				if (unaryOperatorExpression.Operator != UnaryOperatorType.Not)
+					return;
+
+				var innerUnaryOperatorExpr = 
+					RemoveParentheses (unaryOperatorExpression.Expression) as UnaryOperatorExpression;
+				if (innerUnaryOperatorExpr == null || innerUnaryOperatorExpr.Operator != UnaryOperatorType.Not)
+					return;
+
+				var expression = RemoveParentheses (innerUnaryOperatorExpr.Expression);
+				if (expression.IsNull)
+					return;
+				AddIssue(new CodeIssue(unaryOperatorExpression, ctx.TranslateString ("Double negation is redundant"), ctx.TranslateString ("Remove '!!'"),
+					script => script.Replace (unaryOperatorExpression, expression.Clone ())));
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/EmptyStatementIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/EmptyStatementIssue.cs
new file mode 100644
index 0000000000..b7f8aff102
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/EmptyStatementIssue.cs
@@ -0,0 +1,68 @@
+//
+// EmptyStatementIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription(
+		"Empty statement is redundant",
+		Description = "Empty statement is redundant",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "EmptyStatement")]
+	public class EmptyStatementIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<EmptyStatementIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitEmptyStatement(EmptyStatement emptyStatement)
+			{
+				if (UseAsAndNullCheckAction.IsEmbeddedStatement(emptyStatement))
+					return;
+				if (emptyStatement.GetPrevSibling(s => s.Role == BlockStatement.StatementRole) is LabelStatement)
+					return;
+				AddIssue(new CodeIssue(
+					emptyStatement,
+					ctx.TranslateString("Empty statement is redundant"),
+					ctx.TranslateString("Remove ';'"),
+					s => s.Remove(emptyStatement)
+				) { IssueMarker = IssueMarker.GrayOut });
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/ForStatementConditionIsTrueIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/ForStatementConditionIsTrueIssue.cs
new file mode 100644
index 0000000000..c3865b3dc8
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/ForStatementConditionIsTrueIssue.cs
@@ -0,0 +1,70 @@
+// 
+// ForStatementConditionIsTrueIssue.cs
+// 
+// Author:
+//      Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("'true' is redundant as for statement condition",
+	                   Description = "true is redundant as for statement condition, thus can be safely ommited",
+	                   Category = IssueCategories.RedundanciesInCode,
+	                   Severity = Severity.Warning,
+	                   AnalysisDisableKeyword = "ForStatementConditionIsTrue")]
+	public class ForStatementConditionIsTrueIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<ForStatementConditionIsTrueIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+			}
+
+			static readonly AstNode pattern =  new PrimitiveExpression(true);
+		
+			public override void VisitForStatement (ForStatement forstatement)
+			{
+				base.VisitForStatement(forstatement);
+
+				var m = pattern.Match(forstatement.Condition);
+				if (m.Success) {
+					AddIssue(new CodeIssue(
+						forstatement.Condition, 
+						ctx.TranslateString("'true' is redundant as for statement condition"), 
+						ctx.TranslateString("Remove 'true'"),
+						script => script.Remove(forstatement.Condition)
+					) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantAnonymousTypePropertyNameIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantAnonymousTypePropertyNameIssue.cs
new file mode 100644
index 0000000000..1702dde91c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantAnonymousTypePropertyNameIssue.cs
@@ -0,0 +1,84 @@
+//
+// RedundantAnonymousTypePropertyNameIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription(
+		"Redundant anonymous type property name",
+		Description = "The name can be inferred from the initializer expression",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "RedundantAnonymousTypePropertyName")]
+	public class RedundantAnonymousTypePropertyNameIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantAnonymousTypePropertyNameIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			static string GetAnonymousTypePropertyName(Expression expr)
+			{
+				if (expr is MemberReferenceExpression) {
+					return ((MemberReferenceExpression)expr).MemberName;
+				}
+				if (expr is IdentifierExpression) {
+					return ((IdentifierExpression)expr).Identifier;
+				}
+				return null;
+			}
+
+			public override void VisitAnonymousTypeCreateExpression(AnonymousTypeCreateExpression anonymousTypeCreateExpression)
+			{
+				base.VisitAnonymousTypeCreateExpression(anonymousTypeCreateExpression);
+				foreach (var expr in anonymousTypeCreateExpression.Initializers) {
+					var na = expr as NamedExpression;
+					if (na == null)
+						continue;
+					if (na.Name == GetAnonymousTypePropertyName(na.Expression)) {
+						AddIssue(new CodeIssue(na.StartLocation, na.AssignToken.EndLocation,
+							ctx.TranslateString("Redundant explicit property name"),
+							ctx.TranslateString("Remove redundant name"),
+							s => s.Replace(na, na.Expression.Clone())
+						) { IssueMarker = IssueMarker.GrayOut });
+					}
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantArgumentDefaultValueIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantArgumentDefaultValueIssue.cs
new file mode 100644
index 0000000000..2b0907cd66
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantArgumentDefaultValueIssue.cs
@@ -0,0 +1,130 @@
+//
+// RedundantArgumentDefaultValueIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription(
+		"Redundant argument with default value",
+		Description = "The parameter is optional with the same default value",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "RedundantArgumentDefaultValue")]
+	public class RedundantArgumentDefaultValueIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantArgumentDefaultValueIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			bool IsDefaultValue(Expression arg, ICSharpCode.NRefactory.TypeSystem.IParameter par)
+			{
+				var ne = arg as NamedArgumentExpression;
+				if (ne != null) {
+					if (ne.Name != par.Name)
+						return false;
+					arg = ne.Expression;
+				}
+				var cr = ctx.Resolve(arg);
+				if (cr == null || !cr.IsCompileTimeConstant || !par.IsOptional)
+					return false;
+				return 
+					cr.ConstantValue == null && par.ConstantValue == null || 
+					cr.ConstantValue.Equals(par.ConstantValue);
+			}
+
+			public override void VisitObjectCreateExpression(ObjectCreateExpression objectCreateExpression)
+			{
+				base.VisitObjectCreateExpression(objectCreateExpression);
+				Check(objectCreateExpression, objectCreateExpression.Arguments.ToList());
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+				Check(invocationExpression, invocationExpression.Arguments.ToList());
+			}
+
+			public override void VisitIndexerExpression(IndexerExpression indexerExpression)
+			{
+				base.VisitIndexerExpression(indexerExpression);
+				Check(indexerExpression, indexerExpression.Arguments.ToList());
+			}
+
+			void Check(AstNode invocationExpression, List<Expression> arguments)
+			{
+				var rr = ctx.Resolve(invocationExpression) as CSharpInvocationResolveResult;
+				if (rr == null || rr.IsError)
+					return;
+
+				for (int i = 0; i < arguments.Count && i < rr.Member.Parameters.Count; i++) {
+
+					if (!IsDefaultValue(arguments[i], rr.Member.Parameters[i]))
+						continue;
+					bool nextAreAllDefault = true;
+					for (int j = i + 1; j < arguments.Count && j < rr.Member.Parameters.Count; j++) {
+						if (!IsDefaultValue(arguments[j], rr.Member.Parameters[j])) {
+							nextAreAllDefault = false;
+							break;
+						}
+					}
+					if (!nextAreAllDefault)
+						continue;
+					for (int j = i; j < arguments.Count && j < rr.Member.Parameters.Count; j++) {
+						var _i = j;
+						AddIssue(new CodeIssue(
+							arguments[j],
+							i + 1 < arguments.Count ? ctx.TranslateString("Argument values are redundant") : ctx.TranslateString("Argument value is redundant"),
+							i + 1 < arguments.Count ? ctx.TranslateString("Remove redundant arguments") : ctx.TranslateString("Remove redundant argument"),
+							script => {
+								var invoke = invocationExpression.Clone();
+
+								var argCollection = invoke.GetChildrenByRole<Expression>(Roles.Argument);
+								argCollection.Clear();
+								for (int k = 0; k < _i; k++)
+									argCollection.Add(arguments[k].Clone());
+								script.Replace(invocationExpression, invoke);
+							}
+						) { IssueMarker = IssueMarker.GrayOut });
+					}
+					break;
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantArgumentNameIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantArgumentNameIssue.cs
new file mode 100644
index 0000000000..8d227eb99b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantArgumentNameIssue.cs
@@ -0,0 +1,105 @@
+// 
+// RedundantArgumentNameIssue.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{ 
+	[IssueDescription("Redundant explicit argument name specification",
+	                  Description= "Redundant explicit argument name specification",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Suggestion,
+	                  AnalysisDisableKeyword = "RedundantArgumentName")]
+	public class RedundantArgumentNameIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<RedundantArgumentNameIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			void CheckParameters(ResolveResult resolveResult, AstNodeCollection<Expression> arguments)
+			{
+				var ir = resolveResult as InvocationResolveResult;
+				if (ir == null || ir.IsError)
+					return;
+				int i = 0;
+				foreach (var arg in arguments) {
+					var na = arg as NamedArgumentExpression;
+					if (na != null) {
+						if (na.Name != ir.Member.Parameters[i].Name)
+							break;
+						var _i = i;
+						AddIssue(new CodeIssue(
+							na.NameToken.StartLocation,
+							na.ColonToken.EndLocation,
+							ctx.TranslateString("Redundant argument name specification"), 
+							ctx.TranslateString("Remove argument name specification"),
+							script => {
+								foreach (var node in arguments.Take(_i + 1).OfType<NamedArgumentExpression>()) {
+									script.Replace(node, node.Expression.Clone());
+								}
+							}
+						) { IssueMarker = IssueMarker.GrayOut });
+					}
+					i++;
+				}
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+				CheckParameters(ctx.Resolve(invocationExpression), invocationExpression.Arguments);
+			}
+
+			public override void VisitIndexerExpression(IndexerExpression indexerExpression)
+			{
+				base.VisitIndexerExpression(indexerExpression);
+				CheckParameters(ctx.Resolve(indexerExpression), indexerExpression.Arguments);
+			}
+
+			public override void VisitObjectCreateExpression(ObjectCreateExpression objectCreateExpression)
+			{
+				base.VisitObjectCreateExpression(objectCreateExpression);
+				CheckParameters(ctx.Resolve(objectCreateExpression), objectCreateExpression.Arguments);
+			}
+
+			public override void VisitAttribute(Attribute attribute)
+			{
+				base.VisitAttribute(attribute);
+				CheckParameters(ctx.Resolve(attribute), attribute.Arguments);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantAttributeParenthesesIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantAttributeParenthesesIssue.cs
new file mode 100644
index 0000000000..74884bf0a6
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantAttributeParenthesesIssue.cs
@@ -0,0 +1,63 @@
+// 
+// RedundantAttributeParenthesesIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Parentheses are redundant if attribute has no arguments",
+		Description = "Parentheses are redundant if attribute has no arguments.",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "RedundantAttributeParentheses")]
+	public class RedundantAttributeParenthesesIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantAttributeParenthesesIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitAttribute(Attribute attribute)
+			{
+				base.VisitAttribute(attribute);
+
+				if (attribute.Arguments.Count > 0 || !attribute.HasArgumentList)
+					return;
+
+				AddIssue(new CodeIssue(attribute.LParToken.StartLocation, attribute.RParToken.StartLocation, ctx.TranslateString("Parentheses are redundant if attribute has no arguments"), ctx.TranslateString("Remove '()'"), script =>
+					script.Replace(attribute, new Attribute { Type = attribute.Type.Clone() })) { IssueMarker = IssueMarker.GrayOut });
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantBaseQualifierIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantBaseQualifierIssue.cs
new file mode 100644
index 0000000000..37690486ab
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantBaseQualifierIssue.cs
@@ -0,0 +1,147 @@
+//
+// RedundantBaseQualifierIssue.cs
+//
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+//
+// Copyright (c) 2013  Ji Kun <jikun.nus@gmail.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Finds redundant base qualifier 
+	/// </summary>
+	[IssueDescription("Redundant 'base.' qualifier",
+	                  Description = "'base.' is redundant and can safely be removed.",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "RedundantBaseQualifier")]
+	public class RedundantBaseQualifierIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			var declarationSpaceVisitor = new LocalDeclarationSpaceVisitor();
+			context.RootNode.AcceptVisitor(declarationSpaceVisitor);
+
+			return new GatherVisitor(context, declarationSpaceVisitor);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantBaseQualifierIssue>
+		{
+			LocalDeclarationSpaceVisitor declarationsSpaceVisitor;
+
+			public GatherVisitor(BaseRefactoringContext ctx, LocalDeclarationSpaceVisitor visitor) : base (ctx)
+			{
+				declarationsSpaceVisitor = visitor;
+			}
+
+			public override void VisitSyntaxTree(SyntaxTree syntaxTree)
+			{
+				base.VisitSyntaxTree(syntaxTree);
+				AnalyzeAllThisReferences();
+			}
+
+			static IMember GetMember(ResolveResult result)
+			{
+				if (result is MemberResolveResult)
+					return ((MemberResolveResult)result).Member;
+				if (result is MethodGroupResolveResult)
+					return ((MethodGroupResolveResult)result).Methods.FirstOrDefault();
+				return null;
+			}
+
+			readonly IList<BaseReferenceExpression> thisReferences = new List<BaseReferenceExpression>();
+
+			public override void VisitBaseReferenceExpression(BaseReferenceExpression baseReferenceExpression)
+			{
+				base.VisitBaseReferenceExpression(baseReferenceExpression);
+				if (!IsSuppressed(baseReferenceExpression.Location))
+					thisReferences.Add(baseReferenceExpression);
+			}
+
+			void AnalyzeAllThisReferences()
+			{
+				foreach (var thisReference in thisReferences) {
+					AnalyzeThisReferenceExpression(thisReference);
+				}
+			}
+
+			void AnalyzeThisReferenceExpression(BaseReferenceExpression baseReferenceExpression)
+			{
+				var memberReference = baseReferenceExpression.Parent as MemberReferenceExpression;
+				if (memberReference == null) {
+					return;
+				}
+
+				var state = ctx.GetResolverStateAfter(baseReferenceExpression);
+				var wholeResult = ctx.Resolve(memberReference);
+
+				IMember member = GetMember(wholeResult);
+				if (member == null)
+					return;
+
+				if (declarationsSpaceVisitor.GetDeclarationSpace(baseReferenceExpression).IsNameUsed(member.Name))
+					return;
+
+				var result = state.LookupSimpleNameOrTypeName(memberReference.MemberName, EmptyList<IType>.Instance, NameLookupMode.Expression);
+				var parentResult = ctx.Resolve(memberReference.Parent) as CSharpInvocationResolveResult;
+
+				bool isRedundant;
+				if (result is MemberResolveResult) {
+					isRedundant = ((MemberResolveResult)result).Member.Region.Equals(member.Region);
+				} else if (parentResult != null && parentResult.IsExtensionMethodInvocation) {
+					// 'this.' is required for extension method invocation
+					isRedundant = false;
+				} else if (result is MethodGroupResolveResult) {
+					isRedundant = ((MethodGroupResolveResult)result).Methods.Any(m => m.Region.Equals(member.Region));
+				} else {
+					return;
+				}
+
+				var basicMembers = state.CurrentTypeDefinition.DirectBaseTypes.First().GetMembers();
+				var extendedMembers = state.CurrentTypeDefinition.GetMembers().Except(basicMembers);
+				if (extendedMembers.Any(f => f.Name.Equals(member.Name)))
+					return;
+
+				if (isRedundant) {
+					AddIssue(new CodeIssue(
+						baseReferenceExpression.StartLocation, 
+						memberReference.MemberNameToken.StartLocation, 
+						ctx.TranslateString("'base.' is redundant and can be removed safely."), 
+						ctx.TranslateString("Remove 'base.'"), 
+						script => {
+							script.Replace(memberReference, RefactoringAstHelper.RemoveTarget(memberReference));
+						}
+					) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantBoolCompareIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantBoolCompareIssue.cs
new file mode 100644
index 0000000000..216647909d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantBoolCompareIssue.cs
@@ -0,0 +1,97 @@
+// 
+// CompareBooleanWithTrueOrFalseIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Comparison of boolean with 'true' or 'false'",
+					   Description = "Comparison of a boolean value with 'true' or 'false' constant.",
+					   Category = IssueCategories.RedundanciesInCode,
+					   Severity = Severity.Warning,
+	                   AnalysisDisableKeyword = "RedundantBoolCompare")]
+	public class RedundantBoolCompareIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantBoolCompareIssue>
+		{
+			// note:this action should only check <bool> == true or <bool> != null - it needs excectly 
+			//      mimic the RedundantBoolCompare behavior otherwise it's no 1:1 mapping
+			static readonly Pattern pattern = new Choice {
+				PatternHelper.CommutativeOperatorWithOptionalParentheses(
+					new NamedNode ("const", new Choice { new PrimitiveExpression(true), new PrimitiveExpression(false) }),
+					BinaryOperatorType.Equality, new AnyNode("expr")),
+				PatternHelper.CommutativeOperatorWithOptionalParentheses(
+					new NamedNode ("const", new Choice { new PrimitiveExpression(true), new PrimitiveExpression(false) }),
+					BinaryOperatorType.InEquality, new AnyNode("expr")),
+			};
+
+			static readonly InsertParenthesesVisitor insertParenthesesVisitor = new InsertParenthesesVisitor ();
+
+			public GatherVisitor (BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitBinaryOperatorExpression (BinaryOperatorExpression binaryOperatorExpression)
+			{
+				base.VisitBinaryOperatorExpression (binaryOperatorExpression);
+
+				var match = pattern.Match (binaryOperatorExpression);
+				if (!match.Success)
+					return;
+				var expr = match.Get<Expression> ("expr").First ();
+				// check if expr is of boolean type
+				var exprType = ctx.Resolve (expr).Type.GetDefinition ();
+				if (exprType == null || exprType.KnownTypeCode != KnownTypeCode.Boolean)
+					return;
+
+				var boolConstant = (bool)match.Get<PrimitiveExpression> ("const").First ().Value;
+				AddIssue (new CodeIssue(
+					binaryOperatorExpression, 
+					boolConstant ? ctx.TranslateString ("Comparison with 'true' is redundant") : ctx.TranslateString ("Comparison with 'false' is redundant"),
+					ctx.TranslateString ("Remove redundant comparison"), 
+					script => {
+						if ((binaryOperatorExpression.Operator == BinaryOperatorType.InEquality && boolConstant) ||
+							(binaryOperatorExpression.Operator == BinaryOperatorType.Equality && !boolConstant)) {
+							expr = new UnaryOperatorExpression (UnaryOperatorType.Not, expr.Clone());
+							expr.AcceptVisitor (insertParenthesesVisitor);
+						}
+						script.Replace (binaryOperatorExpression, expr);
+					}
+				) { IssueMarker = IssueMarker.GrayOut });
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCaseLabelIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCaseLabelIssue.cs
new file mode 100644
index 0000000000..2d276507ad
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCaseLabelIssue.cs
@@ -0,0 +1,77 @@
+// 
+// RedundantCaseLabelIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Redundant 'case' label",
+						Description = "'case' label is redundant.",
+						Category = IssueCategories.RedundanciesInCode,
+						Severity = Severity.Warning,
+                        AnalysisDisableKeyword = "RedundantCaseLabel")]
+	public class RedundantCaseLabelIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantCaseLabelIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitSwitchSection (SwitchSection switchSection)
+			{
+				base.VisitSwitchSection (switchSection);
+
+				if (switchSection.CaseLabels.Count < 2)
+					return;
+
+				if (!switchSection.CaseLabels.Any(label => label.Expression.IsNull))
+					return;
+
+				foreach (var caseLabel in switchSection.CaseLabels) {
+					if (caseLabel.Expression.IsNull)
+						continue;
+					AddIssue(new CodeIssue(
+						caseLabel,
+						ctx.TranslateString("Redundant case label"),
+						string.Format(ctx.TranslateString("Remove 'case {0}'"), caseLabel.Expression),
+						scipt => {
+							scipt.Remove(caseLabel);
+						}
+					) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCastIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCastIssue.cs
new file mode 100644
index 0000000000..52a0655e17
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCastIssue.cs
@@ -0,0 +1,204 @@
+// 
+// RedundantCastIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Redundant cast",
+		Description = "Type cast can be safely removed.",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "RedundantCast")]
+	public class RedundantCastIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantCastIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitCastExpression(CastExpression castExpression)
+			{
+				base.VisitCastExpression(castExpression);
+
+				CheckTypeCast(castExpression, castExpression.Expression, castExpression.StartLocation, 
+					castExpression.Expression.StartLocation);
+			}
+
+			public override void VisitAsExpression(AsExpression asExpression)
+			{
+				base.VisitAsExpression(asExpression);
+
+				CheckTypeCast(asExpression, asExpression.Expression, asExpression.Expression.EndLocation,
+					asExpression.EndLocation);
+			}
+
+			IType GetExpectedType(Expression typeCastNode, out IMember accessingMember)
+			{
+				var memberRefExpr = typeCastNode.Parent as MemberReferenceExpression;
+				if (memberRefExpr != null) {
+					var invocationExpr = memberRefExpr.Parent as InvocationExpression;
+					if (invocationExpr != null && invocationExpr.Target == memberRefExpr) {
+						var invocationResolveResult = ctx.Resolve(invocationExpr) as InvocationResolveResult;
+						if (invocationResolveResult != null) {
+							accessingMember = invocationResolveResult.Member;
+							return invocationResolveResult.Member.DeclaringType;
+						}
+					} else {
+						var memberResolveResult = ctx.Resolve(memberRefExpr) as MemberResolveResult;
+						if (memberResolveResult != null) {
+							accessingMember = memberResolveResult.Member;
+							return memberResolveResult.Member.DeclaringType;
+						}
+					}
+				}
+				accessingMember = null;
+				return ctx.GetExpectedType(typeCastNode);
+			}
+
+			bool IsExplicitImplementation(IType exprType, IType interfaceType, Expression typeCastNode)
+			{
+				var memberRefExpr = typeCastNode.Parent as MemberReferenceExpression;
+				if (memberRefExpr != null) {
+					var rr = ctx.Resolve(memberRefExpr);
+					var memberResolveResult = rr as MemberResolveResult;
+					if (memberResolveResult != null) {
+						foreach (var member in exprType.GetMembers (m => m.SymbolKind == memberResolveResult.Member.SymbolKind)) {
+							if (member.IsExplicitInterfaceImplementation && member.ImplementedInterfaceMembers.Contains(memberResolveResult.Member)) {
+								return true;
+							}
+						}
+					}
+
+					var methodGroupResolveResult = rr as MethodGroupResolveResult;
+					if (methodGroupResolveResult != null) {
+						foreach (var member in exprType.GetMethods ()) {
+							if (member.IsExplicitInterfaceImplementation && member.ImplementedInterfaceMembers.Any(m => methodGroupResolveResult.Methods.Contains((IMethod)m))) {
+								return true;
+							}
+						}
+					}
+				}
+				return false;
+			}
+
+			void AddIssue(Expression outerTypeCastNode, Expression typeCastNode, Expression expr, TextLocation start, TextLocation end)
+			{
+				AstNode type;
+				if (typeCastNode is CastExpression)
+					type = ((CastExpression)typeCastNode).Type;
+				else
+					type = ((AsExpression)typeCastNode).Type;
+				AddIssue(new CodeIssue(start, end, ctx.TranslateString("Type cast is redundant"), string.Format(ctx.TranslateString("Remove cast to '{0}'"), type),
+					script => script.Replace(outerTypeCastNode, expr.Clone())) { IssueMarker = IssueMarker.GrayOut });
+			}
+
+			bool IsRedundantInBinaryExpression(BinaryOperatorExpression bop, Expression outerTypeCastNode, IType exprType)
+			{
+				if (bop.Operator == BinaryOperatorType.NullCoalescing) {
+					if (outerTypeCastNode == bop.Left) {
+						var rr = ctx.Resolve(bop.Right).Type;
+						if (rr != exprType)
+							return true;
+					}
+					return false;
+				}
+
+				return ctx.Resolve(bop.Left).Type != ctx.Resolve(bop.Right).Type;
+			}
+
+			bool IsBreaking(IType exprType, IType expectedType)
+			{
+				if (exprType.IsReferenceType == true &&
+					expectedType.IsReferenceType == false &&
+					exprType != expectedType)
+					return true;
+				if (exprType.IsReferenceType == false &&
+					expectedType.IsReferenceType == true &&
+					exprType != expectedType)
+					return true;
+				return false;
+			}
+
+			void CheckTypeCast(Expression typeCastNode, Expression expr, TextLocation castStart, TextLocation castEnd)
+			{
+				var outerTypeCastNode = typeCastNode;
+				while (outerTypeCastNode.Parent is ParenthesizedExpression)
+					outerTypeCastNode = (Expression)outerTypeCastNode.Parent;
+
+				IMember accessingMember;
+				var expectedType = GetExpectedType(outerTypeCastNode, out accessingMember);
+				var exprType = ctx.Resolve(expr).Type;
+				if (expectedType.Kind == TypeKind.Interface && IsExplicitImplementation(exprType, expectedType, outerTypeCastNode))
+					return;
+				var baseTypes = exprType.GetAllBaseTypes().ToList();
+				if (!baseTypes.Any(t => t.Equals(expectedType)))
+					return;
+
+				if (IsBreaking(exprType, expectedType))
+					return;
+
+				var cond = outerTypeCastNode.Parent as ConditionalExpression;
+				if (cond != null) {
+					if (outerTypeCastNode == cond.TrueExpression) {
+						var rr = ctx.Resolve(cond.FalseExpression).Type;
+						if (rr != exprType)
+							return;
+					}
+				}
+
+				var bop = outerTypeCastNode.Parent as BinaryOperatorExpression;
+				if (bop != null && IsRedundantInBinaryExpression(bop, outerTypeCastNode, exprType))
+					return;
+
+				// check if the called member doesn't change it's virtual slot when changing types
+				if (accessingMember != null) {
+					var baseMember = InheritanceHelper.GetBaseMember(accessingMember);
+					foreach (var bt in baseTypes) {
+						foreach (var member in bt.GetMembers(m => m.Name == accessingMember.Name)) {
+							if (InheritanceHelper.GetBaseMember(member) != baseMember)
+								return;
+						}
+					}
+				}
+				AddIssue(outerTypeCastNode, typeCastNode, expr, castStart, castEnd);
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCatchClauseIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCatchClauseIssue.cs
new file mode 100644
index 0000000000..351e0d4079
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCatchClauseIssue.cs
@@ -0,0 +1,159 @@
+//
+// RedundantCatchIssue.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Redundant catch clause",
+                      Description = "Catch clause with a single 'throw' statement is redundant.",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Hint,
+                      AnalysisDisableKeyword = "RedundantCatchClause")]
+	public class RedundantCatchClauseIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<RedundantCatchClauseIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+			}
+
+			public override void VisitTryCatchStatement(TryCatchStatement tryCatchStatement)
+			{
+				var redundantCatchClauses = new List<CatchClause>();
+				bool hasNonRedundantCatch = false;
+				foreach (var catchClause in tryCatchStatement.CatchClauses) {
+					if (IsRedundant(catchClause)) {
+						redundantCatchClauses.Add(catchClause);
+					} else {
+						hasNonRedundantCatch = true;
+					}
+				}
+
+				if (hasNonRedundantCatch || !tryCatchStatement.FinallyBlock.IsNull) {
+					AddIssuesForClauses(tryCatchStatement, redundantCatchClauses);
+				} else {
+					AddIssueForTryCatchStatement(tryCatchStatement);
+				}
+			}
+
+			void AddIssuesForClauses(AstNode node, List<CatchClause> redundantCatchClauses)
+			{
+				var allCatchClausesMessage = ctx.TranslateString("Remove all '{0}' redundant 'catch' clauses");
+				var removeAllRedundantClausesAction = new CodeAction(allCatchClausesMessage, script => {
+					foreach (var redundantCatchClause in redundantCatchClauses) {
+						script.Remove(redundantCatchClause);
+					}
+				}, node);
+				var singleCatchClauseMessage = ctx.TranslateString("Remove 'catch'");
+                var redundantCatchClauseMessage = ctx.TranslateString("Catch clause with a single 'throw' statement is redundant.");
+				foreach (var redundantCatchClause in redundantCatchClauses) {
+					var closureLocalCatchClause = redundantCatchClause;
+					var removeRedundantClauseAction = new CodeAction(singleCatchClauseMessage, script => {
+						script.Remove(closureLocalCatchClause);
+					}, node);
+					var actions = new List<CodeAction>();
+					actions.Add(removeRedundantClauseAction);
+					if (redundantCatchClauses.Count > 1) {
+						actions.Add(removeAllRedundantClausesAction);
+					}
+					AddIssue(new CodeIssue(closureLocalCatchClause, redundantCatchClauseMessage, actions) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+
+			void AddIssueForTryCatchStatement(TryCatchStatement tryCatchStatement)
+			{
+				var lastCatch = tryCatchStatement.CatchClauses.LastOrNullObject();
+				if (lastCatch.IsNull)
+					return;
+
+				var removeTryCatchMessage = ctx.TranslateString("Remove 'try' statement");
+
+				var removeTryStatementAction = new CodeAction(removeTryCatchMessage, script => {
+					var statements = tryCatchStatement.TryBlock.Statements;
+					if (statements.Count == 1 || tryCatchStatement.Parent is BlockStatement) {
+						foreach (var statement in statements) {
+							script.InsertAfter(tryCatchStatement.GetPrevSibling (s => !(s is NewLineNode)), statement.Clone());
+						}
+						script.Remove(tryCatchStatement);
+					} else {
+						var blockStatement = new BlockStatement();
+						foreach (var statement in statements) {
+							blockStatement.Statements.Add(statement.Clone());
+						}
+						script.Replace(tryCatchStatement, blockStatement);
+					}
+					// The replace and insert script functions does not format these things well on their own
+					script.FormatText(tryCatchStatement.Parent);
+				}, tryCatchStatement);
+
+				var fixes = new [] {
+					removeTryStatementAction
+				};
+				AddIssue(new CodeIssue(tryCatchStatement.TryBlock.EndLocation, lastCatch.EndLocation, removeTryCatchMessage, fixes) { IssueMarker = IssueMarker.GrayOut });
+			}
+
+			static bool IsThrowsClause (CatchClause catchClause)
+			{
+				var firstStatement = catchClause.Body.Statements.FirstOrNullObject();
+				if (firstStatement.IsNull)
+					return false;
+				var throwStatement = firstStatement as ThrowStatement;
+				if (throwStatement == null || !throwStatement.Expression.IsNull)
+					return false;
+				return true;
+			}
+
+			bool IsRedundant(CatchClause catchClause)
+			{
+				if (!IsThrowsClause (catchClause))
+					return false;
+
+				var type = ctx.Resolve (catchClause.Type).Type;
+				var n = catchClause.NextSibling;
+				while (n != null) {
+					var nextClause = n as CatchClause;
+					if (nextClause != null) {
+						if (nextClause.Type.IsNull && !IsThrowsClause(nextClause))
+							return false;
+						if (!IsThrowsClause(nextClause) && type.GetDefinition ().IsDerivedFrom (ctx.Resolve (nextClause.Type).Type.GetDefinition ()))
+							return false;
+					}
+					n = n.NextSibling;
+				}
+				return true;
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCheckBeforeAssignmentIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCheckBeforeAssignmentIssue.cs
new file mode 100644
index 0000000000..c0c395691e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCheckBeforeAssignmentIssue.cs
@@ -0,0 +1,80 @@
+// 
+// RedundantCheckBeforeAssignmentIssue.cs
+// 
+// Author:
+//      Ji Kun <jikun.nus@gmail.com>
+//      Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Redundant condition check before assignment",
+	                   Description = "Check for inequality before assignment is redundant if (x != value) x = value;",
+	                   Category = IssueCategories.RedundanciesInCode,
+	                   Severity = Severity.Warning,
+	                   AnalysisDisableKeyword = "RedundantCheckBeforeAssignment")]
+	public class RedundantCheckBeforeAssignmentIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantCheckBeforeAssignmentIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			static readonly AstNode pattern = 
+				new IfElseStatement(
+					PatternHelper.CommutativeOperatorWithOptionalParentheses(new AnyNode("a"), BinaryOperatorType.InEquality, new AnyNode("b")),
+					PatternHelper.EmbeddedStatement(new AssignmentExpression(new Backreference("a"), PatternHelper.OptionalParentheses(new Backreference("b"))))
+				);
+
+			public override void VisitIfElseStatement(IfElseStatement ifElseStatement)
+			{
+				base.VisitIfElseStatement(ifElseStatement);
+				var m = pattern.Match(ifElseStatement);
+				if (!m.Success)
+					return;
+				AddIssue(new CodeIssue(
+					ifElseStatement.Condition,
+					ctx.TranslateString("Redundant condition check before assignment"),
+					ctx.TranslateString("Remove redundant check"),
+					script => {
+						var stmt = ifElseStatement.TrueStatement;
+						var block = stmt as BlockStatement;
+						if (block != null)
+							stmt = block.Statements.First();
+						script.Replace(ifElseStatement, stmt.Clone());
+					}
+				));
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCommaInArrayInitializerIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCommaInArrayInitializerIssue.cs
new file mode 100644
index 0000000000..1f94bb0242
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCommaInArrayInitializerIssue.cs
@@ -0,0 +1,77 @@
+// 
+// RedundantCommaInArrayInitializerIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Redundant comma in array initializer",
+						Description = "Redundant comma in array initializer.",
+						Category = IssueCategories.RedundanciesInCode,
+						Severity = Severity.Warning,
+                        AnalysisDisableKeyword = "RedundantCommaInArrayInitializer")]
+	public class RedundantCommaInArrayInitializerIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantCommaInArrayInitializerIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitArrayInitializerExpression(ArrayInitializerExpression arrayInitializerExpression)
+			{
+				base.VisitArrayInitializerExpression(arrayInitializerExpression);
+
+				if (arrayInitializerExpression.IsSingleElement)
+					return;
+
+				var commaToken = arrayInitializerExpression.RBraceToken.PrevSibling as CSharpTokenNode;
+				if (commaToken == null || commaToken.ToString() != ",")
+					return;
+				string issueDescription;
+				if (arrayInitializerExpression.Parent is ObjectCreateExpression) {
+					if (arrayInitializerExpression.Elements.FirstOrNullObject() is NamedExpression) {
+						issueDescription = ctx.TranslateString("Redundant comma in object initializer");
+					} else {
+						issueDescription = ctx.TranslateString("Redundant comma in collection initializer");
+					}
+				} else {
+					issueDescription = ctx.TranslateString("Redundant comma in array initializer");
+				}
+				AddIssue(new CodeIssue(commaToken,
+				         issueDescription,
+				         ctx.TranslateString("Remove ','"),
+					script => script.Remove(commaToken)) { IssueMarker = IssueMarker.GrayOut });
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantComparisonWithNullIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantComparisonWithNullIssue.cs
new file mode 100644
index 0000000000..b84461526c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantComparisonWithNullIssue.cs
@@ -0,0 +1,100 @@
+//
+// RedundantComparisonWithNullIssue.cs
+//
+// Author:
+//	   Ji Kun <jikun.nus@gmail.com>
+//
+// Copyright (c) 2013 Ji Kun
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.using System;
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Redundant comparison with 'null'",
+	                  Description = "When 'is' keyword is used, which implicitly check null.",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Warning,
+                      AnalysisDisableKeyword = "RedundantComparisonWithNull")]
+	public class RedundantComparisonWithNullIssue : GatherVisitorCodeIssueProvider
+	{
+		private static readonly Pattern pattern1
+			= new Choice {
+			//  a is Record && a != null
+			new BinaryOperatorExpression(
+				PatternHelper.OptionalParentheses(
+					new IsExpression {
+						Expression = new AnyNode("a"),
+						Type = new AnyNode("t")
+					}),
+				BinaryOperatorType.ConditionalAnd,
+				PatternHelper.CommutativeOperatorWithOptionalParentheses(new Backreference("a"),
+					                                  BinaryOperatorType.InEquality,
+					                                  new NullReferenceExpression())
+			),
+			//  a != null && a is Record
+			new BinaryOperatorExpression (
+				PatternHelper.CommutativeOperatorWithOptionalParentheses(new AnyNode("a"),
+					                                  BinaryOperatorType.InEquality,
+					                                  new NullReferenceExpression()),
+				BinaryOperatorType.ConditionalAnd,
+				PatternHelper.OptionalParentheses(
+					new IsExpression {
+						Expression = new Backreference("a"),
+						Type = new AnyNode("t")
+					})
+			)
+		};
+
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantComparisonWithNullIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
+			{
+				base.VisitBinaryOperatorExpression(binaryOperatorExpression);
+				Match m1 = pattern1.Match(binaryOperatorExpression);
+				if (m1.Success) {
+					AddIssue(new CodeIssue(binaryOperatorExpression,
+					         ctx.TranslateString("Redundant comparison with 'null'"),
+					         ctx.TranslateString("Remove expression"), 
+					         script => {
+					         	var isExpr = m1.Get<AstType>("t").Single().Parent;
+					         	script.Replace(binaryOperatorExpression, isExpr);
+					         }
+					) { IssueMarker = IssueMarker.GrayOut });
+					return;
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantDelegateCreationIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantDelegateCreationIssue.cs
new file mode 100644
index 0000000000..b92e92fb1e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantDelegateCreationIssue.cs
@@ -0,0 +1,76 @@
+//
+// RedundantDelegateCreationIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription (
+		"Explicit delegate creation expression is redundant",
+		Description = "Explicit delegate creation expression is redundant",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "RedundantDelegateCreation")]
+	public class RedundantDelegateCreationIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantDelegateCreationIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitAssignmentExpression(AssignmentExpression assignmentExpression)
+			{
+				base.VisitAssignmentExpression(assignmentExpression);
+				if (assignmentExpression.Operator != AssignmentOperatorType.Add && assignmentExpression.Operator != AssignmentOperatorType.Subtract)
+					return;
+				var oce = assignmentExpression.Right as ObjectCreateExpression;
+				if (oce == null || oce.Arguments.Count != 1)
+					return;
+				var left = ctx.Resolve(assignmentExpression.Left) as MemberResolveResult;
+				if (left == null || left.Member.SymbolKind != SymbolKind.Event)
+					return;
+				var right = ctx.Resolve(assignmentExpression.Right);
+				if (right.IsError || !Equals(left.Type, right.Type))
+					return;
+				AddIssue(new CodeIssue(oce.StartLocation, oce.Type.EndLocation,
+					ctx.TranslateString("Redundant explicit delegate declaration"),
+					ctx.TranslateString("Remove redundant 'new'"),
+					s => s.Replace(assignmentExpression.Right, oce.Arguments.First())
+				) { IssueMarker = IssueMarker.GrayOut });
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantEmptyDefaultSwitchBranchIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantEmptyDefaultSwitchBranchIssue.cs
new file mode 100644
index 0000000000..6cd9d280e3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantEmptyDefaultSwitchBranchIssue.cs
@@ -0,0 +1,69 @@
+//
+// RedundantEmptyDefaultSwitchBranchIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Redundant empty 'default' switch branch",
+	                   Description = "Redundant empty 'default' switch branch",
+	                   Category = IssueCategories.RedundanciesInCode,
+	                   Severity = Severity.Warning,
+	                   AnalysisDisableKeyword = "RedundantEmptyDefaultSwitchBranch")]
+	public class RedundantEmptyDefaultSwitchBranchIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantEmptyDefaultSwitchBranchIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			static readonly AstNode pattern = new SwitchSection {
+				CaseLabels = { new CaseLabel () },
+				Statements = { new BreakStatement() }
+			};
+
+			public override void VisitSwitchSection(SwitchSection switchSection)
+			{
+				base.VisitSwitchSection(switchSection);
+				if (!pattern.IsMatch(switchSection))
+					return;
+				AddIssue(new CodeIssue(
+					switchSection,
+					ctx.TranslateString("Redundant empty 'default' switch branch"),
+					ctx.TranslateString("Remove redundant 'default' branch"),
+					script => script.Remove(switchSection)
+				) { IssueMarker = IssueMarker.GrayOut });
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantEmptyFinallyBlockIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantEmptyFinallyBlockIssue.cs
new file mode 100644
index 0000000000..b946b569c3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantEmptyFinallyBlockIssue.cs
@@ -0,0 +1,90 @@
+//
+// RedundantEmptyFinallyBlockIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription(
+		"Redundant empty finally block",
+		Description = "Redundant empty finally block",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "RedundantEmptyFinallyBlock")]
+	public class RedundantEmptyFinallyBlockIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantEmptyFinallyBlockIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			static bool IsEmpty (BlockStatement blockStatement)
+			{
+				return !blockStatement.Descendants.Any(s => s is Statement && !(s is EmptyStatement || s is BlockStatement));
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				base.VisitBlockStatement(blockStatement);
+				if (blockStatement.Role != TryCatchStatement.FinallyBlockRole || !IsEmpty (blockStatement))
+					return;
+				var tryCatch = blockStatement.Parent as TryCatchStatement;
+				if (tryCatch == null)
+					return;
+				AddIssue(new CodeIssue(
+					tryCatch.FinallyToken.StartLocation,
+					blockStatement.EndLocation,
+					ctx.TranslateString("Redundant empty finally block"),
+					ctx.TranslateString("Remove 'finally'"),
+					s => {
+						if (tryCatch.CatchClauses.Any()) {
+							s.Remove(tryCatch.FinallyToken);
+							s.Remove(blockStatement); 
+							s.FormatText(tryCatch);
+							return;
+						}
+						s.Remove(tryCatch.TryToken);
+						s.Remove(tryCatch.TryBlock.LBraceToken);
+						s.Remove(tryCatch.TryBlock.RBraceToken);
+						s.Remove(tryCatch.FinallyToken);
+						s.Remove(tryCatch.FinallyBlock); 
+						s.FormatText(tryCatch.Parent);
+					}
+				) { IssueMarker = IssueMarker.GrayOut });
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantEmptyObjectCreationArgumentListssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantEmptyObjectCreationArgumentListssue.cs
new file mode 100644
index 0000000000..a4224cbdf2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantEmptyObjectCreationArgumentListssue.cs
@@ -0,0 +1,72 @@
+// 
+// RedundantObjectCreationArgumentListIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Redundant empty argument list on object creation expression",
+	                   Description = "When object creation uses object or collection initializer, empty argument list is redundant.",
+	                   Category = IssueCategories.RedundanciesInCode,
+	                   Severity = Severity.Warning,
+	                   AnalysisDisableKeyword = "RedundantEmptyObjectCreationArgumentList")]
+	public class RedundantObjectCreationArgumentListIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantObjectCreationArgumentListIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitObjectCreateExpression(ObjectCreateExpression objectCreateExpression)
+			{
+				base.VisitObjectCreateExpression(objectCreateExpression);
+
+				if (objectCreateExpression.Initializer.IsNull ||
+					objectCreateExpression.Arguments.Count > 0 ||
+					objectCreateExpression.LParToken.IsNull)
+					return;
+
+				AddIssue(new CodeIssue(objectCreateExpression.LParToken.StartLocation, objectCreateExpression.RParToken.EndLocation,
+				         ctx.TranslateString("Empty argument list is redundant"),
+				         ctx.TranslateString("Remove '()'"), script => {
+					var l1 = objectCreateExpression.LParToken.GetPrevNode().EndLocation;
+					var l2 = objectCreateExpression.RParToken.GetNextNode().StartLocation;
+					var o1 = script.GetCurrentOffset(l1);
+					var o2 = script.GetCurrentOffset(l2);
+
+					script.Replace(o1, o2 - o1, " ");
+					}) { IssueMarker = IssueMarker.GrayOut });
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantEnumerableCastCallIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantEnumerableCastCallIssue.cs
new file mode 100644
index 0000000000..93e891f9d7
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantEnumerableCastCallIssue.cs
@@ -0,0 +1,113 @@
+//
+// RedundantEnumerableCastCallIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	// OfType -> Underline (+suggest to compare to null)
+	[IssueDescription (
+		"Redundant 'IEnumerable.Cast<T>' or 'IEnumerable.OfType<T>' call",
+		Description = "Redundant 'IEnumerable.Cast<T>' or 'IEnumerable.OfType<T>' call",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "RedundantEnumerableCastCall")]
+	public class RedundantEnumerableCastCallIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantEnumerableCastCallIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+				var mt = invocationExpression.Target as MemberReferenceExpression;
+				if (mt == null)
+					return;
+				var rr = ctx.Resolve(invocationExpression) as CSharpInvocationResolveResult;
+				if (rr == null || rr.IsError)
+					return;
+				if (rr.Member.DeclaringType.Name != "Enumerable" || rr.Member.DeclaringType.Namespace != "System.Linq")
+					return;
+				bool isCast = rr.Member.Name == "Cast";
+				if (!isCast && rr.Member.Name != "OfType")
+					return;
+				var tr = ctx.Resolve(mt.Target);
+				if (tr.Type.Equals(rr.Type) || tr.Type.GetAllBaseTypes().Any (bt=> bt.Equals(rr.Type))) {
+					if (isCast) {
+						AddIssue(new CodeIssue(
+							mt.DotToken.StartLocation,
+							mt.EndLocation,
+							ctx.TranslateString("Redundant 'IEnumerable.Cast<T>' call"),
+							ctx.TranslateString("Remove 'Cast<T>' call"),
+							s => s.Replace(invocationExpression, mt.Target.Clone())
+						) { IssueMarker = IssueMarker.GrayOut });
+					} else {
+						AddIssue(new CodeIssue(
+							mt.DotToken.StartLocation,
+							mt.EndLocation,
+							ctx.TranslateString("Redundant 'IEnumerable.OfType<T>' call."),
+							new [] {
+								new CodeAction(
+									ctx.TranslateString("Compare items with null"),
+									s => {
+										var name = ctx.GetNameProposal("i", mt.StartLocation);
+										s.Replace(invocationExpression, 
+											new InvocationExpression(
+												new MemberReferenceExpression(mt.Target.Clone(), "Where"), 
+												new LambdaExpression {
+													Parameters = { new ParameterDeclaration(name) },
+													Body = new BinaryOperatorExpression(new IdentifierExpression(name), BinaryOperatorType.InEquality, new NullReferenceExpression())
+												}
+											)
+										);
+									},
+									mt
+								),
+								new CodeAction(
+									ctx.TranslateString("Remove 'OfType<T>' call"),
+									s => s.Replace(invocationExpression, mt.Target.Clone()),
+									mt
+								),
+							}
+						));
+					}
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantExplicitArrayCreationIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantExplicitArrayCreationIssue.cs
new file mode 100644
index 0000000000..979d511f8a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantExplicitArrayCreationIssue.cs
@@ -0,0 +1,100 @@
+//
+// RedundantExplicitArrayCreationIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription(
+		"Redundant explicit size in array creation",
+		Description = "Redundant explicit size in array creation",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "RedundantExplicitArrayCreation")]
+	public class RedundantExplicitArrayCreationIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantExplicitArrayCreationIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitSyntaxTree(SyntaxTree syntaxTree)
+			{
+				if (!ctx.Supports(new Version(3, 0)))
+					return;
+				base.VisitSyntaxTree(syntaxTree);
+			}
+
+			public override void VisitArrayCreateExpression(ArrayCreateExpression arrayCreateExpression)
+			{
+				base.VisitArrayCreateExpression(arrayCreateExpression);
+				if (arrayCreateExpression.Arguments.Count != 0)
+					return;
+				var arrayType = arrayCreateExpression.Type;
+				if (arrayType.IsNull)
+					return;
+				var arrayTypeRR = ctx.Resolve(arrayType);
+				if (arrayTypeRR.IsError)
+					return;
+
+				IType elementType = null;
+				foreach (var element in arrayCreateExpression.Initializer.Elements) {
+					var elementTypeRR = ctx.Resolve(element);
+					if (elementTypeRR.IsError)
+						return;
+					if (elementType == null) {
+						elementType = elementTypeRR.Type;
+						continue;
+					}
+					if (elementType != elementTypeRR.Type)
+						return;
+				}
+				if (elementType != arrayTypeRR.Type)
+					return;
+
+				AddIssue(
+					new CodeIssue (
+						arrayType,
+						ctx.TranslateString("Redundant explicit array type specification"),
+						ctx.TranslateString("Remove redundant type specification"),
+						s => s.Remove(arrayType) 
+					) { IssueMarker = IssueMarker.GrayOut }
+				);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantExplicitArraySizeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantExplicitArraySizeIssue.cs
new file mode 100644
index 0000000000..9ff5cface2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantExplicitArraySizeIssue.cs
@@ -0,0 +1,76 @@
+//
+// RedundantExplicitArraySizeIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription(
+		"Redundant explicit size in array creation",
+		Description = "Redundant explicit size in array creation",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "RedundantExplicitArraySize")]
+	public class RedundantExplicitArraySizeIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantExplicitArraySizeIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitArrayCreateExpression(ArrayCreateExpression arrayCreateExpression)
+			{
+				base.VisitArrayCreateExpression(arrayCreateExpression);
+				if (arrayCreateExpression.Arguments.Count != 1)
+					return;
+				var arg = arrayCreateExpression.Arguments.Single() as PrimitiveExpression;
+				if (arg == null || !(arg.Value is int))
+					return;
+				var value = (int)arg.Value;
+				if (value == 0)
+					return;
+				if (arrayCreateExpression.Initializer.Elements.Count() == value) {
+					AddIssue(new CodeIssue(
+						arg,
+						ctx.TranslateString("Redundant explicit size in array creation"),
+						string.Format(ctx.TranslateString("Remove '{0}'"), arg),
+						s => { s.Remove(arg); }
+					) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantExplicitNullableCreationIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantExplicitNullableCreationIssue.cs
new file mode 100644
index 0000000000..470bc2bcbd
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantExplicitNullableCreationIssue.cs
@@ -0,0 +1,78 @@
+//
+// RedundantExplicitNullableCreationIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Redundant explicit nullable type creation",
+		Description= "Value types are implicitly convertible to nullables",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "RedundantExplicitNullableCreation")]
+	public class RedundantExplicitNullableCreationIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantExplicitNullableCreationIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base(ctx)
+			{
+			}
+
+			public override void VisitObjectCreateExpression(ObjectCreateExpression objectCreateExpression)
+			{
+				base.VisitObjectCreateExpression(objectCreateExpression);
+
+				// test for var foo = new ... 
+				var parentVarDecl = objectCreateExpression.Parent.Parent as VariableDeclarationStatement;
+				if (parentVarDecl != null && parentVarDecl.Type.IsVar())
+					return;
+
+				var rr = ctx.Resolve(objectCreateExpression);
+				if (!NullableType.IsNullable(rr.Type))
+					return;
+				var arg = objectCreateExpression.Arguments.FirstOrDefault();
+				if (arg == null)
+					return;
+				AddIssue(new CodeIssue(
+					objectCreateExpression.StartLocation,
+					objectCreateExpression.Type.EndLocation,
+					ctx.TranslateString("Redundant explicit nullable type creation"),
+					ctx.TranslateString("Remove redundant 'new'"),
+					s => s.Replace(objectCreateExpression, arg.Clone())
+				) { IssueMarker = IssueMarker.GrayOut });
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantExtendsListEntryIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantExtendsListEntryIssue.cs
new file mode 100644
index 0000000000..40ffabaf21
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantExtendsListEntryIssue.cs
@@ -0,0 +1,147 @@
+// 
+// RedundantBaseTypeIssue.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013  Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Type is either mentioned in the base type list of other part, or it is interface and appears as other's type base and contains no explicit implementation.
+	/// </summary>
+	[IssueDescription("Redundant class or interface specification in base types list",
+	                  Description= "Type is either mentioned in the base type list of another part or in another base type",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "RedundantExtendsListEntry")]
+	public class RedundantExtendsListEntryIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context, this);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<RedundantExtendsListEntryIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx, RedundantExtendsListEntryIssue issueProvider) : base (ctx, issueProvider)
+			{
+			}
+			
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				if (typeDeclaration == null)
+					return;
+				
+				base.VisitTypeDeclaration(typeDeclaration);
+				
+				if (typeDeclaration.BaseTypes.Count == 0)
+					return;
+				
+				List<AstNode> redundantBase = new List<AstNode>();
+				var type = ctx.Resolve(typeDeclaration).Type;
+
+				if (typeDeclaration.HasModifier(Modifiers.Partial)) {
+					var parts = type.GetDefinition().Parts;
+					foreach (var node in typeDeclaration.BaseTypes) {
+						int count = 0;
+						foreach (var unresolvedTypeDefinition in parts) {
+							var baseTypes = unresolvedTypeDefinition.BaseTypes;
+							
+							if (baseTypes.Any(f => f.ToString().Equals(node.ToString()))) {
+								count++;
+								if (count > 1) {
+									if (!redundantBase.Contains(node))
+										redundantBase.Add(node);
+									break;
+								}
+							}
+						}
+					}
+				}
+				
+				var directBaseType = type.DirectBaseTypes.Where(f => f.Kind == TypeKind.Class);
+				if (directBaseType.Count() != 1)
+					return;
+				var members = type.GetMembers();
+				var memberDeclaration = typeDeclaration.Members;
+				var interfaceBase = typeDeclaration.BaseTypes.Where(delegate(AstType f) {
+					var resolveResult = ctx.Resolve(f);
+					if (resolveResult.IsError || resolveResult.Type.GetDefinition() == null)
+						return false;
+					return resolveResult.Type.GetDefinition().Kind == TypeKind.Interface;
+				});
+				foreach (var node in interfaceBase) {
+					if (directBaseType.Single().GetDefinition().GetAllBaseTypeDefinitions().Any(f => f.Name.Equals(node.ToString()))) {
+						bool flag = false;
+						foreach (var member in members) {
+							if (!memberDeclaration.Any(f => f.Name.Equals(member.Name))) {
+								continue;
+							}
+							if (
+								member.ImplementedInterfaceMembers.Any(
+								g => g.DeclaringType.Name.Equals(node.ToString()))) {
+								flag = true;
+								break;
+							}
+						}
+						if (!flag) {
+							if (!redundantBase.Contains(node))
+								redundantBase.Add(node);
+						}
+					}			
+				}
+				foreach (var node in redundantBase) {
+					var nodeType = ctx.Resolve(node).Type;
+					var issueText = nodeType.Kind == TypeKind.Interface ?
+						ctx.TranslateString("Base interface '{0}' is redundant") :
+						ctx.TranslateString("Base type '{0}' is already specified in other parts");
+
+					AddIssue(new CodeIssue(
+						node,
+						string.Format(issueText, nodeType.Name), 
+						new CodeAction (
+							ctx.TranslateString("Remove redundant base type reference"),
+							script => {
+								if (typeDeclaration.GetCSharpNodeBefore(node).ToString().Equals(":")) {
+									if (node.GetNextNode().Role != Roles.BaseType) {
+										script.Remove(typeDeclaration.GetCSharpNodeBefore(node));
+									}
+								}
+								if (typeDeclaration.GetCSharpNodeBefore(node).ToString().Equals(",")) {
+									script.Remove(typeDeclaration.GetCSharpNodeBefore(node));
+								}
+								script.Remove(node);
+							},
+						node)
+					) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+			
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantIfElseBlockIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantIfElseBlockIssue.cs
new file mode 100644
index 0000000000..32f0663c3d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantIfElseBlockIssue.cs
@@ -0,0 +1,116 @@
+// 
+// RedundantIfElseBlockIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Redundant 'else' keyword",
+	                  Description = "Redundant 'else' keyword.",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "RedundantIfElseBlock")]
+	public class RedundantIfElseBlockIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantIfElseBlockIssue>
+		{
+			readonly LocalDeclarationSpaceVisitor declarationSpaceVisitor;
+
+			public GatherVisitor (BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+				this.declarationSpaceVisitor = new LocalDeclarationSpaceVisitor();
+			}
+
+			public override void VisitSyntaxTree(SyntaxTree syntaxTree)
+			{
+				syntaxTree.AcceptVisitor(declarationSpaceVisitor);
+				base.VisitSyntaxTree(syntaxTree);
+			}
+
+			bool ElseIsRedundantControlFlow(IfElseStatement ifElseStatement)
+			{
+				if (ifElseStatement.FalseStatement.IsNull || ifElseStatement.Parent is IfElseStatement)
+					return false;
+				var blockStatement = ifElseStatement.FalseStatement as BlockStatement;
+				if (blockStatement != null && blockStatement.Statements.Count == 0)
+					return true;
+				var reachability = ctx.CreateReachabilityAnalysis(ifElseStatement.TrueStatement);
+				return !reachability.IsEndpointReachable(ifElseStatement.TrueStatement);
+			}
+
+			bool HasConflictingNames(AstNode targetContext, AstNode currentContext)
+			{
+				var targetSpace = declarationSpaceVisitor.GetDeclarationSpace(targetContext);
+				var currentSpace = declarationSpaceVisitor.GetDeclarationSpace(currentContext);
+				foreach (var name in currentSpace.DeclaredNames) {
+					var isUsed = targetSpace.GetNameDeclarations(name).Any(node => node.Ancestors.Any(n => n == currentContext));
+					if (isUsed)
+						return true;
+				}
+				return false;
+			}
+			public override void VisitIfElseStatement (IfElseStatement ifElseStatement)
+			{
+				base.VisitIfElseStatement(ifElseStatement);
+
+				if (!ElseIsRedundantControlFlow(ifElseStatement) || HasConflictingNames(ifElseStatement.Parent, ifElseStatement.FalseStatement))
+					return;
+
+				AddIssue(new CodeIssue(ifElseStatement.ElseToken, ctx.TranslateString("Redundant 'else' keyword"), ctx.TranslateString("Remove redundant 'else'"), script =>  {
+					int start = script.GetCurrentOffset(ifElseStatement.ElseToken.GetPrevNode(n => !(n is NewLineNode)).EndLocation);
+					int end;
+					var blockStatement = ifElseStatement.FalseStatement as BlockStatement;
+					if (blockStatement != null) {
+						if (blockStatement.Statements.Count == 0) {
+							// remove empty block
+							end = script.GetCurrentOffset(blockStatement.LBraceToken.StartLocation);
+							script.Remove(blockStatement);
+						}
+						else {
+							// remove block braces
+							end = script.GetCurrentOffset(blockStatement.LBraceToken.EndLocation);
+							script.Remove(blockStatement.RBraceToken);
+						}
+					}
+					else {
+						end = script.GetCurrentOffset(ifElseStatement.ElseToken.EndLocation);
+					}
+					if (end > start)
+						script.RemoveText(start, end - start);
+					script.FormatText(ifElseStatement.Parent);
+				}) { IssueMarker = IssueMarker.GrayOut });
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantLambdaParameterTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantLambdaParameterTypeIssue.cs
new file mode 100644
index 0000000000..b5b69d0024
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantLambdaParameterTypeIssue.cs
@@ -0,0 +1,104 @@
+// 
+// RedundantLambdaParameterTypeIssue.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+//
+// Copyright (c) 2013  Ji Kun <jikun.nus@gmail.com>
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Redundant lambda explicit type specification",
+	                  Description= "Explicit type specification can be removed as it can be implicitly inferred",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "RedundantLambdaParameterType")]
+	public class RedundantLambdaParameterTypeIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<RedundantLambdaParameterTypeIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+			
+			public override void VisitLambdaExpression(LambdaExpression lambdaExpression)
+			{
+				base.VisitLambdaExpression(lambdaExpression);
+
+				var arguments = lambdaExpression.Parameters.ToList();
+				if (arguments.Any(f => f.Type.IsNull))
+					return;
+				if (!LambdaTypeCanBeInferred(ctx, lambdaExpression, arguments))
+					return;
+
+				foreach (var argument in arguments) {
+					AddIssue(new CodeIssue(
+						argument.Type,
+						ctx.TranslateString("Redundant lambda explicit type specification"), 
+						ctx.TranslateString("Remove parameter type specification"),
+						script => {
+							if (arguments.Count == 1) {
+								if (argument.NextSibling.ToString().Equals(")") && argument.PrevSibling.ToString().Equals("(")) {
+									script.Remove(argument.NextSibling);
+									script.Remove(argument.PrevSibling);
+								}
+							}
+							foreach (var arg in arguments)
+								script.Replace(arg, new ParameterDeclaration(arg.Name));
+						}) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+		}
+
+		public static bool LambdaTypeCanBeInferred(BaseRefactoringContext ctx, Expression expression, List<ParameterDeclaration> parameters)
+		{
+			var validTypes = TypeGuessing.GetValidTypes(ctx.Resolver, expression).ToList();
+			foreach (var type in validTypes) {
+				if (type.Kind != TypeKind.Delegate)
+					continue;
+				var invokeMethod = type.GetDelegateInvokeMethod();
+				if (invokeMethod == null || invokeMethod.Parameters.Count != parameters.Count)
+					continue;
+				for (int p = 0; p < invokeMethod.Parameters.Count; p++) {
+					var resolvedArgument = ctx.Resolve(parameters[p].Type);
+					if (!invokeMethod.Parameters [p].Type.Equals(resolvedArgument.Type))
+						return false;
+				}
+			}
+			return true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantLambdaSignatureParenthesesIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantLambdaSignatureParenthesesIssue.cs
new file mode 100644
index 0000000000..40aca23bb0
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantLambdaSignatureParenthesesIssue.cs
@@ -0,0 +1,79 @@
+//
+// RedundantLambdaSignatureParenthesesIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Redundant lambda signature parentheses",
+	                  Description= "Redundant lambda signature parentheses",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "RedundantLambdaSignatureParentheses")]
+	public class RedundantLambdaSignatureParenthesesIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantLambdaSignatureParenthesesIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitLambdaExpression(LambdaExpression lambdaExpression)
+			{
+				base.VisitLambdaExpression(lambdaExpression);
+				var p = lambdaExpression.Parameters.FirstOrDefault();
+				if (p == null || !p.Type.IsNull)
+					return;
+				var lParToken = lambdaExpression.LParToken;
+				if (lParToken.IsNull)
+					return;
+				if (p.GetNextSibling(n => n.Role == Roles.Parameter) != null)
+					return;
+				Action<Script> action = script =>  {
+					script.Remove(lParToken);
+					script.Remove(lambdaExpression.RParToken);
+					script.FormatText(lambdaExpression);
+				};
+
+				var issueText = ctx.TranslateString("Redundant lambda signature parentheses");
+				var fixText = ctx.TranslateString("Remove signature parentheses");
+				AddIssue(new CodeIssue(lambdaExpression.LParToken, issueText, fixText, action) { IssueMarker = IssueMarker.GrayOut });
+				AddIssue(new CodeIssue(lambdaExpression.RParToken, issueText, fixText, action) { IssueMarker = IssueMarker.GrayOut });
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantLogicalConditionalExpressionOperandIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantLogicalConditionalExpressionOperandIssue.cs
new file mode 100644
index 0000000000..3d2ae11d0b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantLogicalConditionalExpressionOperandIssue.cs
@@ -0,0 +1,78 @@
+//
+// RedundantLogicalConditionalExpressionOperandIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Redundant operand in logical conditional expression",
+	                  Description= "Redundant operand in logical conditional expression",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "RedundantLogicalConditionalExpressionOperand")]
+	public class RedundantLogicalConditionalExpressionOperandIssue: GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantLogicalConditionalExpressionOperandIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			static readonly AstNode pattern = new Choice {
+				PatternHelper.CommutativeOperator(new NamedNode ("redundant", PatternHelper.OptionalParentheses(new PrimitiveExpression(true))), BinaryOperatorType.ConditionalOr, new AnyNode("expr")),	
+				PatternHelper.CommutativeOperator(new NamedNode ("redundant", PatternHelper.OptionalParentheses(new PrimitiveExpression(false))), BinaryOperatorType.ConditionalAnd, new AnyNode("expr"))
+			};
+
+			public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
+			{
+				base.VisitBinaryOperatorExpression(binaryOperatorExpression);
+				var match = pattern.Match(binaryOperatorExpression);
+				if (!match.Success)
+					return;
+				var redundant = match.Get<Expression>("redundant").Single();
+				var expr = match.Get<Expression>("expr").Single();
+				AddIssue(new CodeIssue(
+					redundant,
+					ctx.TranslateString("Redundant operand in logical conditional expression"),
+					ctx.TranslateString("Remove expression"),
+					script => script.Replace(binaryOperatorExpression, expr.Clone())
+				) { IssueMarker = IssueMarker.GrayOut });
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantNameQualifierIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantNameQualifierIssue.cs
new file mode 100644
index 0000000000..fd00aa0a5f
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantNameQualifierIssue.cs
@@ -0,0 +1,104 @@
+// 
+// RedundantNamespaceUsageInspector.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Finds redundant namespace usages.
+	/// </summary>
+	[IssueDescription("Redundant name qualifier",
+	                  Description = "Removes namespace usages that are obsolete.",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Warning,
+                      AnalysisDisableKeyword = "RedundantNameQualifier")]
+	public class RedundantNameQualifierIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context, this);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantNameQualifierIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx, RedundantNameQualifierIssue qualifierDirectiveEvidentIssueProvider) : base (ctx, qualifierDirectiveEvidentIssueProvider)
+			{
+			}
+
+			public override void VisitMemberReferenceExpression(MemberReferenceExpression memberReferenceExpression)
+			{
+				base.VisitMemberReferenceExpression(memberReferenceExpression);
+				HandleMemberReference(
+					memberReferenceExpression, memberReferenceExpression.Target, memberReferenceExpression.MemberNameToken, memberReferenceExpression.TypeArguments, NameLookupMode.Expression,
+					script => {
+						script.Replace(memberReferenceExpression, RefactoringAstHelper.RemoveTarget(memberReferenceExpression));
+					});
+			}
+			
+			public override void VisitMemberType(MemberType memberType)
+			{
+				base.VisitMemberType(memberType);
+				HandleMemberReference(
+					memberType, memberType.Target, memberType.MemberNameToken, memberType.TypeArguments, memberType.GetNameLookupMode(),
+					script => {
+						script.Replace(memberType, RefactoringAstHelper.RemoveTarget(memberType));
+					});
+			}
+			
+			void HandleMemberReference(AstNode wholeNode, AstNode targetNode, Identifier memberName, IEnumerable<AstType> typeArguments, NameLookupMode mode, Action<Script> action)
+			{
+				var result = ctx.Resolve(targetNode);
+				if (!(result is NamespaceResolveResult)) {
+					return;
+				}
+				var wholeResult = ctx.Resolve(wholeNode);
+				if (!(wholeResult is TypeResolveResult)) {
+					return;
+				}
+
+				var state = ctx.GetResolverStateBefore(wholeNode);
+				var resolvedTypeArguments = typeArguments.Select(ctx.ResolveType).ToList();
+				var lookupName = state.LookupSimpleNameOrTypeName(memberName.Name, resolvedTypeArguments, mode);
+				
+				if (lookupName is TypeResolveResult && !lookupName.IsError && wholeResult.Type.Equals(lookupName.Type)) {
+					AddIssue(new CodeIssue(
+						wholeNode.StartLocation, 
+						memberName.StartLocation, 
+						ctx.TranslateString("Qualifier is redundant"), 
+						ctx.TranslateString("Remove redundant qualifier"), 
+						action) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantObjectOrCollectionInitializerIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantObjectOrCollectionInitializerIssue.cs
new file mode 100644
index 0000000000..82cc58bfda
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantObjectOrCollectionInitializerIssue.cs
@@ -0,0 +1,66 @@
+// 
+// RedundantObjectOrCollectionInitializerIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Redundant empty object or collection initializer",
+		Description = "Redundant empty object or collection initializer.",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "RedundantEmptyObjectOrCollectionInitializer")]
+	public class RedundantObjectOrCollectionInitializerIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantObjectOrCollectionInitializerIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitObjectCreateExpression(ObjectCreateExpression objectCreateExpression)
+			{
+				base.VisitObjectCreateExpression(objectCreateExpression);
+				if (objectCreateExpression.Initializer.IsNull || objectCreateExpression.Initializer.Elements.Count > 0)
+					return;
+
+				AddIssue(new CodeIssue(objectCreateExpression.Initializer, ctx.TranslateString("Empty object or collection initializer is redundant"), ctx.TranslateString("Remove initializer"),
+					script => {
+						var expr = (ObjectCreateExpression)objectCreateExpression.Clone();
+						expr.Initializer = ArrayInitializerExpression.Null;
+						script.Replace(objectCreateExpression, expr);
+					}) { IssueMarker = IssueMarker.GrayOut });
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantStringToCharArrayCallIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantStringToCharArrayCallIssue.cs
new file mode 100644
index 0000000000..1ef59e0316
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantStringToCharArrayCallIssue.cs
@@ -0,0 +1,92 @@
+//
+// RedundantStringToCharArrayCallIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Redundant 'string.ToCharArray()' call",
+		Description = "Redundant 'string.ToCharArray()' call",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "RedundantStringToCharArrayCall")]
+	public class RedundantStringToCharArrayCallIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantStringToCharArrayCallIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			void AddProblem(AstNode replaceExpression, InvocationExpression invocationExpression)
+			{
+				var t = invocationExpression.Target as MemberReferenceExpression;
+				AddIssue(new CodeIssue (
+					t.DotToken.StartLocation,
+					t.MemberNameToken.EndLocation,
+					ctx.TranslateString("Redundant 'string.ToCharArray()' call"),
+					ctx.TranslateString("Remove redundant 'string.ToCharArray()' call"),
+					s => s.Replace(replaceExpression, t.Target.Clone())
+				) { IssueMarker = IssueMarker.GrayOut });
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+
+				var t = invocationExpression.Target as MemberReferenceExpression;
+				if (t == null || t.MemberName != "ToCharArray")
+					return;
+				var rr = ctx.Resolve(t.Target);
+				if (!rr.Type.IsKnownType(KnownTypeCode.String))
+					return;
+				if (invocationExpression.Parent is ForeachStatement && invocationExpression.Role == Roles.Expression) {
+					AddProblem(invocationExpression, invocationExpression);
+					return;
+				}
+				var p = invocationExpression.Parent;
+				while (p is ParenthesizedExpression) {
+					p = p.Parent;
+				}
+				var idx = p as IndexerExpression;
+				if (idx != null) {
+					AddProblem(idx.Target, invocationExpression);
+					return;
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantTernaryExpressionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantTernaryExpressionIssue.cs
new file mode 100644
index 0000000000..c8131f4e45
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantTernaryExpressionIssue.cs
@@ -0,0 +1,76 @@
+//
+// RedundantTernaryExpressionIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Redundant conditional expression",
+	                  Description = "Redundant conditional expression",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "RedundantTernaryExpression")]
+	public class RedundantTernaryExpressionIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantTernaryExpressionIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			readonly AstNode pattern = new ConditionalExpression(
+				new AnyNode (), 
+				PatternHelper.OptionalParentheses(new PrimitiveExpression(true)),
+				PatternHelper.OptionalParentheses(new PrimitiveExpression(false))
+			);
+
+			public override void VisitConditionalExpression(ConditionalExpression conditionalExpression)
+			{
+				base.VisitConditionalExpression(conditionalExpression);
+				if (pattern.IsMatch(conditionalExpression)) {
+					AddIssue(new CodeIssue(
+						conditionalExpression.QuestionMarkToken.StartLocation,
+						conditionalExpression.FalseExpression.EndLocation,
+						ctx.TranslateString("Redundant conditional expression"),
+						ctx.TranslateString("Replace by condition"),
+						script => {
+							script.Replace(conditionalExpression, conditionalExpression.Condition.Clone());
+						}
+					) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantThisQualifierIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantThisQualifierIssue.cs
new file mode 100644
index 0000000000..791a756775
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantThisQualifierIssue.cs
@@ -0,0 +1,203 @@
+// 
+// RedundantThisInspector.cs
+// 
+// RedundantThisInspector.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Diagnostics;
+using ICSharpCode.NRefactory.Utils;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Finds redundant this usages.
+	/// </summary>
+	[IssueDescription("Redundant 'this.' qualifier",
+	                  Description= "'this.' is redundant and can be removed safely.",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "RedundantThisQualifier")]
+	[SubIssueAttribute(RedundantThisQualifierIssue.InsideConstructors)]
+	[SubIssueAttribute(RedundantThisQualifierIssue.EverywhereElse)]
+	public class RedundantThisQualifierIssue : GatherVisitorCodeIssueProvider
+	{
+		public const string InsideConstructors = "Inside constructors";
+		public const string EverywhereElse = "Everywhere else";
+
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			var declarationSpaceVisitor = new LocalDeclarationSpaceVisitor();
+			context.RootNode.AcceptVisitor(declarationSpaceVisitor);
+
+			return new GatherVisitor(declarationSpaceVisitor, context, this);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantThisQualifierIssue>
+		{
+			bool InsideConstructors {
+				get {
+					return SubIssue == RedundantThisQualifierIssue.InsideConstructors;
+				}
+			}
+
+			LocalDeclarationSpaceVisitor declarationsSpaceVisitor;
+
+			public GatherVisitor (LocalDeclarationSpaceVisitor visitor, BaseRefactoringContext ctx, RedundantThisQualifierIssue qualifierDirectiveEvidentIssueProvider) : base (ctx, qualifierDirectiveEvidentIssueProvider)
+			{
+				declarationsSpaceVisitor = visitor;
+			}
+
+			static IMember GetMember (ResolveResult result)
+			{
+				if (result is MemberResolveResult) {
+					return ((MemberResolveResult)result).Member;
+				}
+				if (result is MethodGroupResolveResult) {
+					return ((MethodGroupResolveResult)result).Methods.FirstOrDefault();
+				}
+				return null;
+			}
+
+			public override void VisitSyntaxTree(SyntaxTree syntaxTree)
+			{
+				base.VisitSyntaxTree(syntaxTree);
+				AnalyzeAllThisReferences();
+			}
+
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+				if (InsideConstructors)
+					base.VisitConstructorDeclaration(constructorDeclaration);
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				if (!InsideConstructors)
+					base.VisitMethodDeclaration(methodDeclaration);
+			}
+
+			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
+			{
+				if (!InsideConstructors)
+					base.VisitIndexerDeclaration(indexerDeclaration);
+			}
+
+			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
+			{
+				if (!InsideConstructors)
+					base.VisitCustomEventDeclaration(eventDeclaration);
+			}
+
+			public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
+			{
+				if (!InsideConstructors)
+					base.VisitDestructorDeclaration(destructorDeclaration);
+			}
+
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+				if (!InsideConstructors)
+					base.VisitFieldDeclaration(fieldDeclaration);
+			}
+
+			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
+			{
+				if (!InsideConstructors)
+					base.VisitOperatorDeclaration(operatorDeclaration);
+			}
+
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+				if (!InsideConstructors)
+					base.VisitPropertyDeclaration(propertyDeclaration);
+			}
+
+			IList<ThisReferenceExpression> thisReferences = new List<ThisReferenceExpression> ();
+
+			public override void VisitThisReferenceExpression(ThisReferenceExpression thisReferenceExpression)
+			{
+				base.VisitThisReferenceExpression(thisReferenceExpression);
+				if (!IsSuppressed(thisReferenceExpression.Location))
+					thisReferences.Add(thisReferenceExpression);
+			}
+
+			void AnalyzeAllThisReferences ()
+			{
+				foreach (var thisReference in thisReferences) {
+					AnalyzeThisReferenceExpression(thisReference);
+				}
+			}
+
+			void AnalyzeThisReferenceExpression (ThisReferenceExpression thisReferenceExpression)
+			{
+				var memberReference = thisReferenceExpression.Parent as MemberReferenceExpression;
+				if (memberReference == null) {
+					return;
+				}
+
+				var state = ctx.GetResolverStateAfter(thisReferenceExpression);
+				var wholeResult = ctx.Resolve(memberReference);
+			
+				IMember member = GetMember(wholeResult);
+				if (member == null) { 
+					return;
+				}
+
+				if (declarationsSpaceVisitor.GetDeclarationSpace(thisReferenceExpression).IsNameUsed(member.Name))
+					return;
+
+				var result = state.LookupSimpleNameOrTypeName(memberReference.MemberName, EmptyList<IType>.Instance, NameLookupMode.Expression);
+				var parentResult = ctx.Resolve(memberReference.Parent) as CSharpInvocationResolveResult;
+				
+				bool isRedundant;
+				if (result is MemberResolveResult) {
+					isRedundant = ((MemberResolveResult)result).Member.Region.Equals(member.Region);
+				} else if (parentResult != null && parentResult.IsExtensionMethodInvocation) {
+					// 'this.' is required for extension method invocation
+					isRedundant = false;
+				} else if (result is MethodGroupResolveResult) {
+					isRedundant = ((MethodGroupResolveResult)result).Methods.Any(m => m.Region.Equals(member.Region));
+				} else {
+					return;
+				}
+
+				if (isRedundant) {
+					var issueDescription = ctx.TranslateString("'this.' is redundant and can be removed safely.");
+					var actionDescription = ctx.TranslateString("Remove 'this.'");
+					AddIssue(new CodeIssue(thisReferenceExpression.StartLocation, memberReference.MemberNameToken.StartLocation, issueDescription, actionDescription, script => {
+						script.Replace(memberReference, RefactoringAstHelper.RemoveTarget(memberReference));
+					}) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantToStringCallForValueTypesIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantToStringCallForValueTypesIssue.cs
new file mode 100644
index 0000000000..227bc69244
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantToStringCallForValueTypesIssue.cs
@@ -0,0 +1,228 @@
+//
+// RedundantToStringCallForValueTypesIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Redundant 'object.ToString()' call for value types",
+	                  Description = "Finds calls to ToString() which would be generated automatically by the compiler.",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Hint)]
+	public class RedundantToStringCallForValueTypesIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantToStringCallForValueTypesIssue>
+		{
+			static Tuple<int, int> onlyFirst = Tuple.Create (0, 0);
+
+			static IDictionary<Tuple<string, int>, Tuple<int, int>> membersCallingToString = new Dictionary<Tuple<string, int>, Tuple<int, int>> {
+				{ Tuple.Create("System.IO.TextWriter.Write", 1), onlyFirst },
+				{ Tuple.Create("System.IO.TextWriter.WriteLine", 1), onlyFirst },
+				{ Tuple.Create("System.Console.Write", 1), onlyFirst },
+				{ Tuple.Create("System.Console.WriteLine", 1), onlyFirst }
+			};
+
+			public GatherVisitor (BaseRefactoringContext context) : base (context)
+			{
+				binOpVisitor = new BinaryExpressionVisitor (this);
+			}
+
+			HashSet<AstNode> processedNodes = new HashSet<AstNode>();
+
+			void CheckExpressionInAutoCallContext(Expression expression)
+			{
+				if (expression is InvocationExpression && !processedNodes.Contains(expression)) {
+					CheckInvocationInAutoCallContext((InvocationExpression)expression);
+				}
+			}
+
+			void CheckInvocationInAutoCallContext(InvocationExpression invocationExpression)
+			{
+				var memberExpression = invocationExpression.Target as MemberReferenceExpression;
+				if (memberExpression == null) {
+					return;
+				}
+				if (memberExpression.MemberName != "ToString" || invocationExpression.Arguments.Any ()) {
+					return;
+				}
+
+				var resolveResult = ctx.Resolve(invocationExpression) as CSharpInvocationResolveResult;
+				if (resolveResult == null)
+					return;
+				if (ctx.Resolve(memberExpression.Target).Type.Kind == TypeKind.Struct) 
+					AddRedundantToStringIssue(memberExpression, invocationExpression);
+			}
+
+			void AddRedundantToStringIssue(MemberReferenceExpression memberExpression, InvocationExpression invocationExpression)
+			{
+				// Simon Lindgren 2012-09-14: Previously there was a check here to see if the node had already been processed
+				// This has been moved out to the callers, to check it earlier for a 30-40% run time reduction
+				processedNodes.Add(invocationExpression);
+
+				AddIssue(new CodeIssue(memberExpression.DotToken.StartLocation, invocationExpression.RParToken.EndLocation,
+				         ctx.TranslateString("Redundant ToString() call"), 
+				         ctx.TranslateString("Remove redundant '.ToString()'"), script =>  {
+					script.Replace(invocationExpression, memberExpression.Target.Clone());
+					}) { IssueMarker = IssueMarker.GrayOut });
+			}
+
+			#region Binary operator
+			public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
+			{
+				base.VisitBinaryOperatorExpression(binaryOperatorExpression);
+
+				if (binaryOperatorExpression.Operator != BinaryOperatorType.Add)
+					return;
+				binOpVisitor.Reset();
+				binaryOperatorExpression.AcceptVisitor(binOpVisitor);
+			}
+
+			BinaryExpressionVisitor binOpVisitor;
+			class BinaryExpressionVisitor : DepthFirstAstVisitor
+			{
+				GatherVisitor issue;
+				int stringExpressionCount;
+				Expression firstStringExpression;
+
+				public BinaryExpressionVisitor(GatherVisitor issue)
+				{
+					this.issue = issue;
+				}
+
+				public void Reset()
+				{
+					stringExpressionCount = 0;
+					firstStringExpression = null;
+				}
+
+				void Check (Expression expression)
+				{
+					if (expression is BinaryOperatorExpression) {
+						expression.AcceptVisitor(this);
+						return;
+					}
+					if (stringExpressionCount <= 1) {
+						var resolveResult = issue.ctx.Resolve(expression);
+						if (resolveResult.Type.IsKnownType(KnownTypeCode.String)) {
+							stringExpressionCount++;
+							if (stringExpressionCount == 1) {
+								firstStringExpression = expression;
+							} else {
+								issue.CheckExpressionInAutoCallContext(firstStringExpression);
+								issue.CheckExpressionInAutoCallContext(expression);
+							}
+						}
+					} else {
+						issue.CheckExpressionInAutoCallContext(expression);
+					}
+				}
+
+				public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
+				{
+					Check(binaryOperatorExpression.Left);
+					Check(binaryOperatorExpression.Right);
+				}
+			}
+
+			#endregion
+
+			#region Invocation expression
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+
+				//var target = invocationExpression.Target as MemberReferenceExpression;
+
+				var invocationResolveResult = ctx.Resolve(invocationExpression) as CSharpInvocationResolveResult;
+				if (invocationResolveResult == null) {
+					return;
+				}
+				IMember member = invocationResolveResult.Member;
+
+				// Check list of members that call ToString() automatically
+				CheckAutomaticToStringCallers(invocationExpression, member);
+
+				// Check formatting calls
+				CheckFormattingCall(invocationExpression, invocationResolveResult);
+			}
+
+			void CheckAutomaticToStringCallers(InvocationExpression invocationExpression, IMember member)
+			{
+				if (member.IsOverride) {
+					member = InheritanceHelper.GetBaseMember(member);
+					if (member == null) {
+						return;
+					}
+				}
+				var key = new Tuple<string, int>(member.ReflectionName, invocationExpression.Arguments.Count);
+				Tuple<int, int> checkInfo;
+				if (membersCallingToString.TryGetValue(key, out checkInfo)) {
+					var arguments = invocationExpression.Arguments.ToList();
+					for (int i = checkInfo.Item1; i < Math.Min(invocationExpression.Arguments.Count, checkInfo.Item2 + 1); ++i) {
+						CheckExpressionInAutoCallContext(arguments[i]);
+					}
+				}
+			}
+
+			void CheckFormattingCall(InvocationExpression invocationExpression, CSharpInvocationResolveResult invocationResolveResult)
+			{
+				Expression formatArgument;
+				IList<Expression> formatArguments;
+				// Only check parameters that are of type object: String means it is neccessary, others
+				// means that there is another problem (ie no matching overload of the method).
+				Func<IParameter, Expression, bool> predicate = (parameter, argument) => {
+					var type = parameter.Type;
+					if (type is TypeWithElementType && parameter.IsParams) {
+						type = ((TypeWithElementType)type).ElementType;
+					}
+					var typeDefinition = type.GetDefinition();
+					if (typeDefinition == null)
+					return false;
+					return typeDefinition.IsKnownType(KnownTypeCode.Object);
+				};
+				if (FormatStringHelper.TryGetFormattingParameters(invocationResolveResult, invocationExpression,
+				                                                  out formatArgument, out formatArguments, predicate)) {
+					foreach (var argument in formatArguments) {
+						CheckExpressionInAutoCallContext(argument);
+					}
+				}
+			}
+			#endregion
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantToStringCallIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantToStringCallIssue.cs
new file mode 100644
index 0000000000..75ed144fc6
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantToStringCallIssue.cs
@@ -0,0 +1,243 @@
+//
+// RedundantToStringCallIssue.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Redundant 'object.ToString()' call",
+	                  Description = "Finds calls to ToString() which would be generated automatically by the compiler.",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "RedundantToStringCall")]
+	public class RedundantToStringCallIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<RedundantToStringCallIssue>
+		{
+			static Tuple<int, int> onlyFirst = Tuple.Create (0, 0);
+
+			static IDictionary<Tuple<string, int>, Tuple<int, int>> membersCallingToString = new Dictionary<Tuple<string, int>, Tuple<int, int>> {
+				{ Tuple.Create("System.IO.TextWriter.Write", 1), onlyFirst },
+				{ Tuple.Create("System.IO.TextWriter.WriteLine", 1), onlyFirst },
+				{ Tuple.Create("System.Console.Write", 1), onlyFirst },
+				{ Tuple.Create("System.Console.WriteLine", 1), onlyFirst }
+			};
+						
+			public GatherVisitor (BaseRefactoringContext context) : base (context)
+			{
+				binOpVisitor = new BinaryExpressionVisitor (this);
+			}
+			
+			HashSet<AstNode> processedNodes = new HashSet<AstNode>();
+
+			void CheckExpressionInAutoCallContext(Expression expression)
+			{
+				if (expression is InvocationExpression && !processedNodes.Contains(expression)) {
+					CheckInvocationInAutoCallContext((InvocationExpression)expression);
+				}
+			}
+
+			void CheckInvocationInAutoCallContext(InvocationExpression invocationExpression)
+			{
+				var memberExpression = invocationExpression.Target as MemberReferenceExpression;
+				if (memberExpression == null) {
+					return;
+				}
+				if (memberExpression.MemberName != "ToString" || invocationExpression.Arguments.Any ()) {
+					return;
+				}
+
+				var resolveResult = ctx.Resolve(invocationExpression) as CSharpInvocationResolveResult;
+				if (resolveResult == null) {
+					return;
+				}
+				if (ctx.Resolve(memberExpression.Target).Type.Kind != TypeKind.Struct) 
+					AddRedundantToStringIssue(memberExpression, invocationExpression);
+			}
+			
+			void AddRedundantToStringIssue(MemberReferenceExpression memberExpression, InvocationExpression invocationExpression)
+			{
+				// Simon Lindgren 2012-09-14: Previously there was a check here to see if the node had already been processed
+				// This has been moved out to the callers, to check it earlier for a 30-40% run time reduction
+				processedNodes.Add(invocationExpression);
+				
+				AddIssue(new CodeIssue(memberExpression.DotToken.StartLocation, invocationExpression.RParToken.EndLocation,
+				         ctx.TranslateString("Redundant ToString() call"), 
+				         ctx.TranslateString("Remove redundant '.ToString()'"), script =>  {
+					script.Replace(invocationExpression, memberExpression.Target.Clone());
+					}) { IssueMarker = IssueMarker.GrayOut });
+			}
+
+			#region Binary operator
+			public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
+			{
+				base.VisitBinaryOperatorExpression(binaryOperatorExpression);
+
+				if (binaryOperatorExpression.Operator != BinaryOperatorType.Add)
+					return;
+				binOpVisitor.Reset();
+				binaryOperatorExpression.AcceptVisitor(binOpVisitor);
+			}
+
+			BinaryExpressionVisitor binOpVisitor;
+			class BinaryExpressionVisitor : DepthFirstAstVisitor
+			{
+				GatherVisitor issue;
+				int stringExpressionCount;
+				Expression firstStringExpression;
+
+				public BinaryExpressionVisitor(GatherVisitor issue)
+				{
+					this.issue = issue;
+				}
+
+				public void Reset()
+				{
+					stringExpressionCount = 0;
+					firstStringExpression = null;
+				}
+
+				void Check (Expression expression)
+				{
+					if (expression is BinaryOperatorExpression) {
+						expression.AcceptVisitor(this);
+						return;
+					}
+					if (stringExpressionCount <= 1) {
+						var resolveResult = issue.ctx.Resolve(expression);
+						if (resolveResult.Type.IsKnownType(KnownTypeCode.String)) {
+							stringExpressionCount++;
+							if (stringExpressionCount == 1) {
+								firstStringExpression = expression;
+							} else {
+								issue.CheckExpressionInAutoCallContext(firstStringExpression);
+								issue.CheckExpressionInAutoCallContext(expression);
+							}
+						}
+					} else {
+						issue.CheckExpressionInAutoCallContext(expression);
+					}
+				}
+				
+				public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
+				{
+					Check(binaryOperatorExpression.Left);
+					Check(binaryOperatorExpression.Right);
+				}
+			}
+
+			#endregion
+
+			#region Invocation expression
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+
+				//var target = invocationExpression.Target as MemberReferenceExpression;
+
+				var invocationResolveResult = ctx.Resolve(invocationExpression) as CSharpInvocationResolveResult;
+				if (invocationResolveResult == null) {
+					return;
+				}
+				IMember member = invocationResolveResult.Member;
+
+				// "".ToString()
+                CheckTargetedObject(invocationExpression, invocationResolveResult.TargetResult.Type, member);
+
+				// Check list of members that call ToString() automatically
+				CheckAutomaticToStringCallers(invocationExpression, member);
+
+				// Check formatting calls
+				CheckFormattingCall(invocationExpression, invocationResolveResult);
+			}
+
+			void CheckTargetedObject(InvocationExpression invocationExpression, IType type, IMember member)
+			{
+				var memberExpression = invocationExpression.Target as MemberReferenceExpression;
+				if (memberExpression != null && !processedNodes.Contains(invocationExpression)) {
+					if (type.IsKnownType(KnownTypeCode.String) && member.Name == "ToString") {
+						AddRedundantToStringIssue(memberExpression, invocationExpression);
+					}
+				}
+			}
+			
+			void CheckAutomaticToStringCallers(InvocationExpression invocationExpression, IMember member)
+			{
+				if (member.IsOverride) {
+					member = InheritanceHelper.GetBaseMember(member);
+					if (member == null) {
+						return;
+					}
+				}
+				var key = new Tuple<string, int>(member.ReflectionName, invocationExpression.Arguments.Count);
+				Tuple<int, int> checkInfo;
+				if (membersCallingToString.TryGetValue(key, out checkInfo)) {
+					var arguments = invocationExpression.Arguments.ToList();
+					for (int i = checkInfo.Item1; i < Math.Min(invocationExpression.Arguments.Count, checkInfo.Item2 + 1); ++i) {
+						CheckExpressionInAutoCallContext(arguments[i]);
+					}
+				}
+			}
+
+			void CheckFormattingCall(InvocationExpression invocationExpression, CSharpInvocationResolveResult invocationResolveResult)
+			{
+				Expression formatArgument;
+				IList<Expression> formatArguments;
+				// Only check parameters that are of type object: String means it is neccessary, others
+				// means that there is another problem (ie no matching overload of the method).
+				Func<IParameter, Expression, bool> predicate = (parameter, argument) => {
+					var type = parameter.Type;
+					if (type is TypeWithElementType && parameter.IsParams) {
+						type = ((TypeWithElementType)type).ElementType;
+					}
+					var typeDefinition = type.GetDefinition();
+					if (typeDefinition == null)
+						return false;
+					return typeDefinition.IsKnownType(KnownTypeCode.Object);
+				};
+				if (FormatStringHelper.TryGetFormattingParameters(invocationResolveResult, invocationExpression,
+				                                                  out formatArgument, out formatArguments, predicate)) {
+					foreach (var argument in formatArguments) {
+						CheckExpressionInAutoCallContext(argument);
+					}
+				}
+			}
+			#endregion
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantUnsafeContextIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantUnsafeContextIssue.cs
new file mode 100644
index 0000000000..b3f738f1ba
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantUnsafeContextIssue.cs
@@ -0,0 +1,149 @@
+//
+// RedundantUnsafeContextIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription(
+		"Redundant 'unsafe' modifier",
+		Description = "Unsafe modifier in redundant in unsafe context or when no unsafe constructs are used.",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "RedundantUnsafeContext")]
+	public class RedundantUnsafeContextIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantUnsafeContextIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			class UnsafeState 
+			{
+				public bool InUnsafeContext;
+				public bool UseUnsafeConstructs;
+
+				public UnsafeState(bool inUnsafeContext)
+				{
+					this.InUnsafeContext = inUnsafeContext;
+					this.UseUnsafeConstructs = false;
+				}
+			}
+
+			readonly Stack<UnsafeState> unsafeStateStack = new Stack<UnsafeState> ();
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				bool unsafeIsRedundant = false;
+				if (unsafeStateStack.Count > 0) {
+					var curState = unsafeStateStack.Peek();
+
+					unsafeIsRedundant |= typeDeclaration.HasModifier(Modifiers.Unsafe);
+
+					unsafeStateStack.Push(new UnsafeState (curState.InUnsafeContext)); 
+				} else {
+					unsafeStateStack.Push(new UnsafeState (typeDeclaration.HasModifier(Modifiers.Unsafe))); 
+				}
+
+				base.VisitTypeDeclaration(typeDeclaration);
+
+				var state = unsafeStateStack.Pop();
+				unsafeIsRedundant |= typeDeclaration.HasModifier(Modifiers.Unsafe) && !state.UseUnsafeConstructs;
+
+				if (unsafeIsRedundant) {
+					AddIssue(new CodeIssue(
+						typeDeclaration.ModifierTokens.First (t => t.Modifier == Modifiers.Unsafe),
+						ctx.TranslateString("'unsafe' modifier is redundant."), 
+						ctx.TranslateString("Remove redundant 'unsafe' modifier"), 
+						script => {
+							script.ChangeModifier (typeDeclaration, typeDeclaration.Modifiers & ~Modifiers.Unsafe);
+						}
+					) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+
+			public override void VisitFixedFieldDeclaration(FixedFieldDeclaration fixedFieldDeclaration)
+			{
+				base.VisitFixedFieldDeclaration(fixedFieldDeclaration);
+				unsafeStateStack.Peek().UseUnsafeConstructs = true;
+			}
+
+			public override void VisitComposedType(ComposedType composedType)
+			{
+				base.VisitComposedType(composedType);
+				if (composedType.PointerRank > 0)
+					unsafeStateStack.Peek().UseUnsafeConstructs = true;
+			}
+
+			public override void VisitFixedStatement(FixedStatement fixedStatement)
+			{
+				base.VisitFixedStatement(fixedStatement);
+				unsafeStateStack.Peek().UseUnsafeConstructs = true;
+			}
+
+			public override void VisitUnaryOperatorExpression(UnaryOperatorExpression unaryOperatorExpression)
+			{
+				base.VisitUnaryOperatorExpression(unaryOperatorExpression);
+				if (unaryOperatorExpression.Operator == UnaryOperatorType.AddressOf ||
+				    unaryOperatorExpression.Operator == UnaryOperatorType.Dereference)
+					unsafeStateStack.Peek().UseUnsafeConstructs = true;
+			}
+		
+			public override void VisitUnsafeStatement(UnsafeStatement unsafeStatement)
+			{
+				unsafeStateStack.Peek().UseUnsafeConstructs = true;
+				bool isRedundant = unsafeStateStack.Peek().InUnsafeContext;
+				unsafeStateStack.Push(new UnsafeState (true)); 
+				base.VisitUnsafeStatement(unsafeStatement);
+				isRedundant |= !unsafeStateStack.Pop().UseUnsafeConstructs;
+
+				if (isRedundant) {
+					AddIssue(new CodeIssue(
+						unsafeStatement.UnsafeToken,
+						ctx.TranslateString("'unsafe' statement is redundant."), 
+						ctx.TranslateString("Replace 'unsafe' statement with it's body"), 
+						s => {
+							s.Remove(unsafeStatement.UnsafeToken);
+							s.Remove(unsafeStatement.Body.LBraceToken);
+							s.Remove(unsafeStatement.Body.RBraceToken);
+							s.FormatText(unsafeStatement.Parent);
+						}
+					));
+				}
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantUsingDirectiveIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantUsingDirectiveIssue.cs
new file mode 100644
index 0000000000..1200344f14
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantUsingDirectiveIssue.cs
@@ -0,0 +1,178 @@
+// 
+// RedundantUsingInspector.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// Finds redundant using declarations.
+	/// </summary>
+	[IssueDescription("Redundant using directive",
+	                  Description = "Using directive is not required and can safely be removed.",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Hint,
+	                  AnalysisDisableKeyword = "RedundantUsingDirective"
+	                  )]
+	public class RedundantUsingDirectiveIssue : CodeIssueProvider
+	{
+		List<string> namespacesToKeep = new List<string>();
+
+		/// <summary>
+		/// The list of namespaces that should be kept even if they are not being used.
+		/// Used in SharpDevelop to always keep the "System" namespace around.
+		/// </summary>
+		public IList<string> NamespacesToKeep {
+			get { return namespacesToKeep; }
+		}
+
+
+		public override IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context, string subIssue)
+		{
+			var visitor = new GatherVisitor(context, this);
+			context.RootNode.AcceptVisitor (visitor);
+			visitor.Collect (0);
+			return visitor.FoundIssues;
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantUsingDirectiveIssue>
+		{
+			class UsingDeclarationSpecifier {
+				public UsingDeclaration UsingDeclaration { get; set; }
+				public bool IsUsed { get; set; }
+
+				public UsingDeclarationSpecifier(UsingDeclaration usingDeclaration)
+				{
+					this.UsingDeclaration = usingDeclaration;
+				}
+			}
+
+			List<UsingDeclarationSpecifier> declarations = new List<UsingDeclarationSpecifier>();
+			HashSet<string> usedNamespaces = new HashSet<string>();
+
+			public GatherVisitor (BaseRefactoringContext ctx, RedundantUsingDirectiveIssue qualifierDirectiveEvidentIssueProvider) : base (ctx, qualifierDirectiveEvidentIssueProvider)
+			{
+			}
+
+			public void Collect(int startIndex)
+			{
+				var unused = new List<UsingDeclaration>();
+				foreach (var u in declarations.Skip (startIndex)) {
+					if (u.IsUsed || 
+					    issueProvider.namespacesToKeep.Contains(u.UsingDeclaration.Namespace))
+						continue;
+					unused.Add(u.UsingDeclaration);
+				}
+
+				foreach (var decl in unused) {
+					AddIssue(new CodeIssue(
+						decl,
+						ctx.TranslateString("Using directive is not used by code and can be removed safely."), ctx.TranslateString("Remove redundant using directives"),
+						script => {
+						foreach (var u2 in unused) {
+							script.Remove (u2);
+						}
+					}
+					) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+
+			public override void VisitUsingDeclaration(UsingDeclaration usingDeclaration)
+			{
+				if (IsSuppressed(usingDeclaration.StartLocation))
+					return;
+				declarations.Add(new UsingDeclarationSpecifier (usingDeclaration));
+			}
+
+			public override void VisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration)
+			{
+				int idx = declarations.Count;
+				usedNamespaces.Clear();
+				base.VisitNamespaceDeclaration(namespaceDeclaration);
+				Collect(idx);
+				declarations.RemoveRange(idx, declarations.Count - idx);
+			}
+			
+			void UseNamespace(string ns)
+			{
+				if (usedNamespaces.Contains(ns))
+					return;
+				usedNamespaces.Add(ns);
+				for (int i = declarations.Count - 1; i >= 0; i--) {
+					var decl = declarations [i];
+					if (decl.UsingDeclaration.Namespace == ns) {
+						decl.IsUsed = true;
+						break;
+					}
+				}
+			}
+
+			public override void VisitIdentifierExpression(IdentifierExpression identifierExpression)
+			{
+				base.VisitIdentifierExpression(identifierExpression);
+				var trr = ctx.Resolve(identifierExpression) as TypeResolveResult;
+				if (trr != null) {
+					UseNamespace(trr.Type.Namespace);
+				}
+			}
+
+			public override void VisitSimpleType(SimpleType simpleType)
+			{
+				base.VisitSimpleType(simpleType);
+				UseNamespace(ctx.Resolve(simpleType).Type.Namespace);
+			}
+
+			public override void VisitInvocationExpression (InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression (invocationExpression);
+				UseExtensionMethod(ctx.Resolve(invocationExpression));
+			}
+			
+			void UseExtensionMethod(ResolveResult rr)
+			{
+				var mg = rr as CSharpInvocationResolveResult;
+				if (mg != null && mg.IsExtensionMethodInvocation) {
+					UseNamespace (mg.Member.DeclaringType.Namespace);
+				}
+			}
+			
+			public override void VisitQueryExpression(QueryExpression queryExpression)
+			{
+				base.VisitQueryExpression(queryExpression);
+				foreach (var clause in queryExpression.Clauses) {
+					UseExtensionMethod(ctx.Resolve(clause));
+				}
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RemoveRedundantOrStatementIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RemoveRedundantOrStatementIssue.cs
new file mode 100644
index 0000000000..349c39031d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RemoveRedundantOrStatementIssue.cs
@@ -0,0 +1,76 @@
+//
+// RemoveRedundantOrStatementIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription(
+		"Remove redundant statement",
+		Description = "Remove redundant statement",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "RemoveRedundantOrStatement")]
+	public class RemoveRedundantOrStatementIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RemoveRedundantOrStatementIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			readonly AstNode pattern = new ExpressionStatement (
+				new Choice {
+					new AssignmentExpression(new AnyNode(), AssignmentOperatorType.BitwiseOr, new PrimitiveExpression(false)),
+					new AssignmentExpression(new AnyNode(), AssignmentOperatorType.BitwiseAnd, new PrimitiveExpression(true))
+				}
+			);
+
+			public override void VisitExpressionStatement(ExpressionStatement expressionStatement)
+			{
+				base.VisitExpressionStatement(expressionStatement);
+				if (pattern.IsMatch(expressionStatement)) {
+					AddIssue(new CodeIssue(
+						expressionStatement,
+						ctx.TranslateString("Statement is redundant"),
+						ctx.TranslateString("Remove redundant statement"),
+						s => s.Remove(expressionStatement)
+					) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/UnusedAnonymousMethodSignatureIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/UnusedAnonymousMethodSignatureIssue.cs
new file mode 100644
index 0000000000..5bb8dbc99e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/UnusedAnonymousMethodSignatureIssue.cs
@@ -0,0 +1,94 @@
+// 
+// UnusedAnonymousMethodSignatureIssue.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+//      Mike Krüger <mkrueger@xamarn.com>
+//
+// Copyright (c) 2013 Luís Reis
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Anonymous method signature is not required",
+		Description = "Detects when no delegate parameter is used in the anonymous method body.",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "UnusedAnonymousMethodSignature")]
+	public class UnusedAnonymousMethodSignatureIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<UnusedAnonymousMethodSignatureIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx) : base(ctx)
+			{
+			}
+
+			bool IsParameterListRedundant(Expression expression)
+			{
+				var validTypes = TypeGuessing.GetValidTypes(ctx.Resolver, expression);
+				return validTypes.Count(t => t.Kind == TypeKind.Delegate) == 1;
+			}
+
+			public override void VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression)
+			{
+				base.VisitAnonymousMethodExpression(anonymousMethodExpression);
+				if (!anonymousMethodExpression.HasParameterList || !IsParameterListRedundant(anonymousMethodExpression))
+					return;
+
+				var parameters = anonymousMethodExpression.Parameters.ToList();
+				if (parameters.Count > 0) {
+					var usageAnalysis = new ConvertToConstantIssue.VariableUsageAnalyzation(ctx);
+					anonymousMethodExpression.Body.AcceptVisitor(usageAnalysis); 
+					foreach (var parameter in parameters) {
+						var rr = ctx.Resolve(parameter) as LocalResolveResult;
+						if (rr == null)
+							continue;
+						if (usageAnalysis.GetStatus(rr.Variable) != ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod.VariableState.None)
+							return;
+					}
+				}
+
+				AddIssue(new CodeIssue(anonymousMethodExpression.LParToken.StartLocation,
+					anonymousMethodExpression.RParToken.EndLocation,
+					ctx.TranslateString("Specifying signature is redundant because no parameter is used"),
+					ctx.TranslateString("Remove redundant signature"),
+					script => {
+						int start = script.GetCurrentOffset(anonymousMethodExpression.DelegateToken.EndLocation);
+						int end = script.GetCurrentOffset(anonymousMethodExpression.Body.StartLocation);
+
+						script.Replace(start, end - start, " ");
+					}) { IssueMarker = IssueMarker.GrayOut });
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/EmptyConstructorIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/EmptyConstructorIssue.cs
new file mode 100644
index 0000000000..cdcb8c125d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/EmptyConstructorIssue.cs
@@ -0,0 +1,87 @@
+// 
+// EmptyConstructorIssue.cs
+// 
+// Author:
+//      Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SaHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Empty constructor",
+	                   Description = "An empty public constructor without paramaters is redundant.",
+	                   Category = IssueCategories.RedundanciesInDeclarations,
+	                   Severity = Severity.Warning,
+	                   AnalysisDisableKeyword = "EmptyConstructor")]
+	public class EmptyConstructorIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			var unit = context.RootNode as SyntaxTree;
+			if (unit == null)
+				return null;
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<EmptyConstructorIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+                : base(ctx)
+			{
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typedeclaration)
+			{
+				bool hasEmptyConstructor = false;
+				bool hasUnemptyConstructor = false;
+				ConstructorDeclaration emptyContructorNode = null;
+
+				foreach (var child in typedeclaration.Children.OfType<ConstructorDeclaration>()) {
+					if (child.HasModifier(Modifiers.Static)) 
+						continue;
+					if (child.Body.Any() || child.Parameters.Count > 0) {
+						hasUnemptyConstructor = true;
+					} else if (child.HasModifier(Modifiers.Public)) {
+						if (child.Initializer.Arguments.Any())
+							continue;
+						hasEmptyConstructor = true;
+						emptyContructorNode = child;
+					}
+				}
+
+				if (!hasUnemptyConstructor && hasEmptyConstructor) {
+					AddIssue(new CodeIssue(
+						emptyContructorNode.NameToken,
+						ctx.TranslateString("Empty constructor is redundant."), 
+						new CodeAction(
+							ctx.TranslateString("Remove redundant constructor"),
+							script => script.Remove(emptyContructorNode),
+							emptyContructorNode.NameToken
+						)
+					) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/EmptyDestructorIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/EmptyDestructorIssue.cs
new file mode 100644
index 0000000000..0a898a2eb5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/EmptyDestructorIssue.cs
@@ -0,0 +1,123 @@
+// EmptyDestructorIssue.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Empty destructor",
+	                   Description = "Empty destructor is redundant",
+	                   Category = IssueCategories.RedundanciesInDeclarations,
+	                   Severity = Severity.Warning,
+	                   AnalysisDisableKeyword = "EmptyDestructor"
+	                   )]
+	public class EmptyDestructorIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<EmptyDestructorIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
+			{
+				if (IsEmpty (destructorDeclaration.Body)) {
+					AddIssue(new CodeIssue(destructorDeclaration.NameToken,
+					         ctx.TranslateString("Empty destructor is redundant"),
+						GetFixAction(destructorDeclaration)) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+			}
+
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+			}
+
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+			}
+
+			public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
+			{
+			}
+
+			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
+			{
+			}
+
+			public override void VisitFixedFieldDeclaration(FixedFieldDeclaration fixedFieldDeclaration)
+			{
+			}
+
+			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
+			{
+			}
+
+			public override void VisitUsingDeclaration(UsingDeclaration usingDeclaration)
+			{
+			}
+
+			public override void VisitUsingAliasDeclaration(UsingAliasDeclaration usingDeclaration)
+			{
+			}
+
+			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
+			{
+			}
+
+			bool IsEmpty(AstNode node)
+			{
+				if (node is EmptyStatement) {
+					return true;
+				}
+
+				BlockStatement block = node as BlockStatement;
+				return block != null && block.Statements.All(IsEmpty);
+			}
+
+			CodeAction GetFixAction(DestructorDeclaration destructorDeclaration)
+			{
+				return new CodeAction(ctx.TranslateString("Remove redundant destructor"), script =>
+				{
+					script.Remove(destructorDeclaration);
+				}, destructorDeclaration.NameToken);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/EmptyNamespaceIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/EmptyNamespaceIssue.cs
new file mode 100644
index 0000000000..2c49551459
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/EmptyNamespaceIssue.cs
@@ -0,0 +1,80 @@
+// EmptyNamespaceIssue.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Empty namespace declaration",
+	                   Description = "Empty namespace declaration is redundant",
+	                   Category = IssueCategories.RedundanciesInDeclarations,
+	                   Severity = Severity.Warning,
+	                   AnalysisDisableKeyword = "EmptyNamespace")]
+	public class EmptyNamespaceIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<EmptyNamespaceIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration)
+			{
+				bool hasContents = false;
+				foreach (var member in namespaceDeclaration.Members) {
+					if (member is TypeDeclaration || member is DelegateDeclaration) {
+						hasContents = true;
+					}
+					else if (member is NamespaceDeclaration) {
+						hasContents = true;
+						member.AcceptVisitor(this);
+					}
+				}
+
+				if (!hasContents) {
+					AddIssue(new CodeIssue(namespaceDeclaration.NamespaceToken, ctx.TranslateString("Empty namespace declaration is redundant"),
+						GetFixAction(namespaceDeclaration)) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+
+			CodeAction GetFixAction(NamespaceDeclaration namespaceDeclaration)
+			{
+				return new CodeAction(ctx.TranslateString("Remove empty namespace"),
+				                      script => script.Remove(namespaceDeclaration),
+				                      namespaceDeclaration);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/EnumUnderlyingTypeIsIntIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/EnumUnderlyingTypeIsIntIssue.cs
new file mode 100644
index 0000000000..020b7ad6d4
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/EnumUnderlyingTypeIsIntIssue.cs
@@ -0,0 +1,99 @@
+//
+// EnumUnderlyingTypeIsIntIssue.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+//
+// Copyright (c) 2013 Luís Reis
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Underlying type of enum is int",
+	                  Description = "The default underlying type of enums is int, so defining it explicitly is redundant.",
+	                  Category = IssueCategories.RedundanciesInDeclarations,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "EnumUnderlyingTypeIsInt")]
+	public class EnumUnderlyingTypeIsIntIssue : CodeIssueProvider
+	{
+		public override IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context, string subIssue)
+		{
+			return new GatherVisitor(context).GetIssues();
+		}
+
+		class GatherVisitor : GatherVisitorBase<EnumUnderlyingTypeIsIntIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext context)
+				: base(context)
+			{
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				switch (typeDeclaration.ClassType) {
+					case ClassType.Class:
+					case ClassType.Struct:
+						//Visit nested types
+						base.VisitTypeDeclaration(typeDeclaration);
+						return;
+					case ClassType.Interface:
+						return;
+				}
+
+				var underlyingType = typeDeclaration.BaseTypes.FirstOrDefault();
+
+				if (underlyingType != null && ctx.ResolveType(underlyingType).FullName == "System.Int32") {
+					var colonToken = typeDeclaration.ColonToken;
+					var startLocation = colonToken.StartLocation;
+					var endLocation = underlyingType.EndLocation;
+
+					AddIssue(new CodeIssue(startLocation,
+					         endLocation,
+					         ctx.TranslateString("Default underlying type of enums is already int"),
+					         ctx.TranslateString("Remove redundant ': int'"),
+					         script =>
+					{
+						script.ChangeBaseTypes(typeDeclaration, Enumerable.Empty<AstType>());
+						}) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+
+			CodeAction GetFixAction(TypeDeclaration typeDeclaration, TextLocation start, TextLocation end)
+			{
+				return new CodeAction(ctx.TranslateString("Remove redundant underlying type"),
+				                      script => {
+
+					script.ChangeBaseTypes(typeDeclaration, Enumerable.Empty<AstType>());
+
+				}, start, end);
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				//No need to visit statements
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/LocalVariableNotUsedIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/LocalVariableNotUsedIssue.cs
new file mode 100644
index 0000000000..c684ed5c07
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/LocalVariableNotUsedIssue.cs
@@ -0,0 +1,111 @@
+// 
+// LocalVariableNotUsedIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Unused local variable",
+		Description = "Local variable is never used.",
+		Category = IssueCategories.RedundanciesInDeclarations,
+		Severity = Severity.Warning,
+		PragmaWarning = 163,
+		AnalysisDisableKeyword = "UnusedVariable.Compiler")]
+	public class LocalVariableNotUsedIssue : GatherVisitorCodeIssueProvider
+	{
+
+		#region ICodeIssueProvider implementation
+
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		#endregion
+
+		class GatherVisitor : GatherVisitorBase<LocalVariableNotUsedIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitVariableInitializer(VariableInitializer variableInitializer)
+			{
+				base.VisitVariableInitializer(variableInitializer);
+
+				// check if variable is assigned
+				if (!variableInitializer.Initializer.IsNull)
+					return;
+				var decl = variableInitializer.Parent as VariableDeclarationStatement;
+				if (decl == null)
+					return;
+
+				var resolveResult = ctx.Resolve(variableInitializer) as LocalResolveResult;
+				if (resolveResult == null)
+					return;
+
+				if (IsUsed(decl.Parent, resolveResult.Variable, variableInitializer))
+					return;
+
+				AddIssue(new CodeIssue(variableInitializer.NameToken, 
+					string.Format(ctx.TranslateString("Local variable '{0}' is never used"), resolveResult.Variable.Name), ctx.TranslateString("Remove unused local variable"),
+					script => {
+						if (decl.Variables.Count == 1) {
+							script.Remove(decl);
+						} else {
+							var newDeclaration = (VariableDeclarationStatement)decl.Clone();
+							newDeclaration.Variables.Remove(
+								newDeclaration.Variables.FirstOrNullObject(v => v.Name == variableInitializer.Name));
+							script.Replace(decl, newDeclaration);
+						}
+					}) { IssueMarker = IssueMarker.GrayOut });
+			}
+
+			public override void VisitForeachStatement(ForeachStatement foreachStatement)
+			{
+				base.VisitForeachStatement(foreachStatement);
+
+				var resolveResult = ctx.Resolve(foreachStatement.VariableNameToken) as LocalResolveResult;
+				if (resolveResult == null)
+					return;
+
+				if (IsUsed(foreachStatement, resolveResult.Variable, foreachStatement.VariableNameToken))
+					return;
+
+				AddIssue(new CodeIssue(foreachStatement.VariableNameToken, ctx.TranslateString("Local variable is never used")));
+			}
+
+			bool IsUsed(AstNode rootNode, IVariable variable, AstNode variableNode)
+			{
+				return ctx.FindReferences(rootNode, variable).Any(result => result.Node != variableNode);
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/PartialTypeWithSinglePartIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/PartialTypeWithSinglePartIssue.cs
new file mode 100644
index 0000000000..6a051c2a4a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/PartialTypeWithSinglePartIssue.cs
@@ -0,0 +1,99 @@
+// RedundantPartialTypeIssue.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.PatternMatching;
+using Mono.CSharp;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+
+	[IssueDescription ("Redundant 'partial' modifier in type declaration",
+	                   Description = "Class is declared partial but has only one part",
+	                   Category = IssueCategories.RedundanciesInDeclarations,
+	                   Severity = Severity.Warning,
+	                   AnalysisDisableKeyword = "PartialTypeWithSinglePart")]
+	public class PartialTypeWithSinglePartIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<PartialTypeWithSinglePartIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				if (!typeDeclaration.HasModifier(Modifiers.Partial)) {
+					//We still need to visit the children in search of partial nested types.
+					base.VisitTypeDeclaration(typeDeclaration);
+					return;
+				}
+
+				var resolveResult = ctx.Resolve(typeDeclaration) as TypeResolveResult;
+				if (resolveResult == null)
+					return;
+
+				var typeDefinition = resolveResult.Type.GetDefinition();
+				if (typeDefinition == null)
+					return;
+
+				if (typeDefinition.Parts.Count == 1) {
+					var partialModifierToken = typeDeclaration.ModifierTokens.Single(modifier => modifier.Modifier == Modifiers.Partial);
+					// there may be a disable comment before the partial token somewhere
+					foreach (var child in typeDeclaration.Children.TakeWhile (child => child != partialModifierToken)) {
+						child.AcceptVisitor(this);
+					}
+					AddIssue(new CodeIssue(partialModifierToken,
+					         ctx.TranslateString("Partial class with single part"),
+						GetFixAction(typeDeclaration, partialModifierToken)) { IssueMarker = IssueMarker.GrayOut });
+				}
+				base.VisitTypeDeclaration(typeDeclaration);
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				//We never need to visit the children of block statements
+			}
+
+			CodeAction GetFixAction(TypeDeclaration typeDeclaration, CSharpModifierToken partialModifierToken)
+			{
+				return new CodeAction(ctx.TranslateString("Remove 'partial'"), script => {
+					script.ChangeModifier (typeDeclaration, typeDeclaration.Modifiers & ~Modifiers.Partial);
+				}, partialModifierToken);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/RedundantBaseConstructorCallIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/RedundantBaseConstructorCallIssue.cs
new file mode 100644
index 0000000000..30ec0fc241
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/RedundantBaseConstructorCallIssue.cs
@@ -0,0 +1,86 @@
+// 
+// RedundantBaseConstructorCallIssue.cs
+// 
+// Author:
+//      Ciprian Khlud <ciprian.mustiata@yahoo.com>
+// 
+// Copyright (c) 2013 Ciprian Khlud <ciprian.mustiata@yahoo.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Redundant base constructor call",
+	                   Description = "This is generated by the compiler and can be safely removed.",
+	                   Category = IssueCategories.RedundanciesInDeclarations,
+	                   Severity = Severity.Suggestion,
+	                   AnalysisDisableKeyword = "RedundantBaseConstructorCall")]
+	public class RedundantBaseConstructorCallIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantBaseConstructorCallIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+				base.VisitConstructorDeclaration(constructorDeclaration);
+
+				if (constructorDeclaration.Initializer.ConstructorInitializerType != ConstructorInitializerType.Base)
+					return;
+				if (constructorDeclaration.Initializer.IsNull)
+					return;
+				if (constructorDeclaration.Initializer.Arguments.Count != 0)
+					return;
+				AddIssue(new CodeIssue(constructorDeclaration.Initializer.StartLocation, constructorDeclaration.Initializer.EndLocation,
+				         ctx.TranslateString("Redundant base constructor call"),
+				         ctx.TranslateString("Remove redundant 'base()'"),
+				         script => {
+					var clone = (ConstructorDeclaration)constructorDeclaration.Clone();
+					script.Replace(clone.ColonToken, CSharpTokenNode.Null.Clone());
+					script.Replace(constructorDeclaration.Initializer, ConstructorInitializer.Null.Clone());
+					}) { IssueMarker = IssueMarker.GrayOut });
+			}
+
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+				//ignore properties
+			}
+
+			public override void  VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+				//ignore fields
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				//ignore method declarations
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/RedundantDefaultFieldInitializerIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/RedundantDefaultFieldInitializerIssue.cs
new file mode 100644
index 0000000000..96d585667a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/RedundantDefaultFieldInitializerIssue.cs
@@ -0,0 +1,124 @@
+// 
+// RedundantDefaultFieldInitializerIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Redundant field initializer",
+	                   Description = "Initializing field with default value is redundant.",
+	                   Category = IssueCategories.RedundanciesInDeclarations,
+	                   Severity = Severity.Hint,
+	                   AnalysisDisableKeyword = "RedundantDefaultFieldInitializer")]
+	public class RedundantDefaultFieldInitializerIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantDefaultFieldInitializerIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+				base.VisitFieldDeclaration(fieldDeclaration);
+				if (fieldDeclaration.HasModifier(Modifiers.Const) || fieldDeclaration.HasModifier(Modifiers.Readonly))
+					return;
+				var defaultValueExpr = GetDefaultValueExpression(fieldDeclaration.ReturnType);
+				if (defaultValueExpr == null)
+					return;
+
+				foreach (var variable1 in fieldDeclaration.Variables) {
+					var variable = variable1;
+					if (!defaultValueExpr.Match(variable.Initializer).Success)
+						continue;
+
+					AddIssue(new CodeIssue(variable.Initializer, ctx.TranslateString("Initializing field by default value is redundant"),
+					         new CodeAction(ctx.TranslateString("Remove field initializer"),
+					                         script => script.Replace(variable, new VariableInitializer(variable.Name)),
+							variable.Initializer)) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+
+			Expression GetDefaultValueExpression(AstType astType)
+			{
+				var type = ctx.ResolveType(astType);
+
+				if ((type.IsReferenceType ?? false) || type.Kind == TypeKind.Dynamic)
+					return new NullReferenceExpression();
+
+				var typeDefinition = type.GetDefinition();
+				if (typeDefinition != null) {
+					switch (typeDefinition.KnownTypeCode) {
+						case KnownTypeCode.Boolean:
+							return new PrimitiveExpression(false);
+
+						case KnownTypeCode.Char:
+							return new PrimitiveExpression('\0');
+
+						case KnownTypeCode.SByte:
+						case KnownTypeCode.Byte:
+						case KnownTypeCode.Int16:
+						case KnownTypeCode.UInt16:
+						case KnownTypeCode.Int32:
+							return new PrimitiveExpression(0);
+
+						case KnownTypeCode.Int64:
+							return new Choice { new PrimitiveExpression(0), new PrimitiveExpression(0L) };
+						case KnownTypeCode.UInt32:
+							return new Choice { new PrimitiveExpression(0), new PrimitiveExpression(0U) };
+						case KnownTypeCode.UInt64:
+							return new Choice {
+								new PrimitiveExpression(0), new PrimitiveExpression(0U), new PrimitiveExpression(0UL)
+							};
+						case KnownTypeCode.Single:
+							return new Choice { new PrimitiveExpression(0), new PrimitiveExpression(0F) };
+						case KnownTypeCode.Double:
+							return new Choice {
+								new PrimitiveExpression(0), new PrimitiveExpression(0F), new PrimitiveExpression(0D)
+							};
+						case KnownTypeCode.Decimal:
+							return new Choice { new PrimitiveExpression(0), new PrimitiveExpression(0M) };
+
+						case KnownTypeCode.NullableOfT:
+							return new NullReferenceExpression();
+					}
+					if (type.Kind == TypeKind.Struct)
+						return new ObjectCreateExpression(astType.Clone());
+				}
+				return new DefaultValueExpression(astType.Clone());
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/RedundantOverridenMemberIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/RedundantOverridenMemberIssue.cs
new file mode 100644
index 0000000000..d6c221e7f5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/RedundantOverridenMemberIssue.cs
@@ -0,0 +1,277 @@
+// 
+// RedundantOverridenMemberIssue.cs
+// 
+// Author:
+//      Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Runtime.InteropServices;
+using Mono.CSharp;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Redundant member override",
+	                   Description = "The override of a virtual member is redundant because it consists of only a call to the base",
+	                   Category = IssueCategories.RedundanciesInDeclarations,
+	                   Severity = Severity.Warning,
+	                   AnalysisDisableKeyword = "RedundantOverridenMember")]
+	public class RedundantOverridenMemberIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<RedundantOverridenMemberIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			void AddIssue(MethodDeclaration methodDeclaration)
+			{
+				var title = ctx.TranslateString("Redundant method override");
+				AddIssue(new CodeIssue(methodDeclaration, title, ctx.TranslateString("Remove redundant method override"), script => script.Remove(methodDeclaration)) {
+					IssueMarker = IssueMarker.GrayOut
+				});
+			}
+			
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				base.VisitMethodDeclaration(methodDeclaration);
+				
+				if (!methodDeclaration.HasModifier(Modifiers.Override))
+					return;
+				
+				if (methodDeclaration.Body.Statements.Count != 1)
+					return;
+				
+				var expr = methodDeclaration.Body.Statements.FirstOrNullObject();
+				//Debuger.WriteInFile(expr.FirstChild.ToString());
+				if (expr == null)
+					return;
+
+				var returnStatement = expr as ReturnStatement;
+				if (returnStatement != null) {
+					var invocationExpression = returnStatement.Expression as InvocationExpression;
+					if (invocationExpression == null)
+						return;
+					var memberReferenceExpression = invocationExpression.Target as MemberReferenceExpression;
+					if (memberReferenceExpression == null ||
+					    memberReferenceExpression.MemberName != methodDeclaration.Name ||
+					    !(memberReferenceExpression.FirstChild is BaseReferenceExpression))
+						return;
+					if (methodDeclaration.Name == "GetHashCode" && !methodDeclaration.Parameters.Any()) {
+						var rr = ctx.Resolve(methodDeclaration) as MemberResolveResult;
+						if (rr != null && rr.Member.ReturnType.IsKnownType(KnownTypeCode.Int32)) {
+							if (rr.Member.DeclaringType.GetMethods(m => m.Name == "Equals" && m.IsOverride, GetMemberOptions.IgnoreInheritedMembers).Any())
+								return;
+						}
+					}
+
+					AddIssue(methodDeclaration);
+				}
+				var stmtExpr = expr as ExpressionStatement;
+				if (stmtExpr == null)
+					return;
+				var invocation = stmtExpr.Expression as InvocationExpression;
+				if (invocation != null) {
+					var memberReferenceExpression = invocation.Target as MemberReferenceExpression;
+					if (memberReferenceExpression == null ||
+					    memberReferenceExpression.MemberName != methodDeclaration.Name ||
+					    !(memberReferenceExpression.FirstChild is BaseReferenceExpression))
+						return;
+					AddIssue(methodDeclaration);
+				}
+			}
+
+			static readonly AstNode setterPattern = new ExpressionStatement(
+				new AssignmentExpression (new AnyNode ("left"), new IdentifierExpression("value"))
+			);
+			
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+				base.VisitPropertyDeclaration(propertyDeclaration);
+				
+				if (!propertyDeclaration.HasModifier(Modifiers.Override))
+					return;
+				
+				bool hasGetter = !propertyDeclaration.Getter.IsNull;
+				bool hasSetter = !propertyDeclaration.Setter.IsNull;
+				if (!hasGetter && !hasSetter)
+					return;
+				
+				if (hasGetter && propertyDeclaration.Getter.Body.Statements.Count != 1)
+					return;
+				
+				if (hasSetter && propertyDeclaration.Setter.Body.Statements.Count != 1)
+					return;
+				
+				var resultProperty = ctx.Resolve(propertyDeclaration) as MemberResolveResult;
+				if (resultProperty == null)
+					return;
+				var baseProperty = InheritanceHelper.GetBaseMember(resultProperty.Member) as IProperty;
+				if (baseProperty == null)
+					return;
+				
+				bool hasBaseGetter = baseProperty.Getter != null;
+				bool hasBaseSetter = baseProperty.Setter != null;
+				
+				if (hasBaseGetter) {
+					if (hasGetter) {
+						var expr = propertyDeclaration.Getter.Body.Statements.FirstOrNullObject();
+					
+						if (expr == null || !(expr is ReturnStatement))
+							return;
+					
+						var memberReferenceExpression = (expr as ReturnStatement).Expression as MemberReferenceExpression;
+					
+						if (memberReferenceExpression == null || 
+							memberReferenceExpression.MemberName != propertyDeclaration.Name ||
+							!(memberReferenceExpression.FirstChild is BaseReferenceExpression))
+							return;
+					}
+				}
+				
+				if (hasBaseSetter) {
+					if (hasSetter) {
+						var match = setterPattern.Match(propertyDeclaration.Setter.Body.Statements.FirstOrNullObject());
+						if (!match.Success)
+							return;
+						var memberReferenceExpression = match.Get("left").Single() as MemberReferenceExpression;
+						if (memberReferenceExpression == null || 
+							memberReferenceExpression.MemberName != propertyDeclaration.Name ||
+							!(memberReferenceExpression.FirstChild is BaseReferenceExpression))
+							return;
+					}
+				}
+				
+				var title = ctx.TranslateString("Redundant property override");
+				AddIssue(new CodeIssue(propertyDeclaration, title, ctx.TranslateString("Remove redundant property override"), script => script.Remove(propertyDeclaration)) { IssueMarker = IssueMarker.GrayOut });
+			}
+			
+			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
+			{
+				base.VisitIndexerDeclaration(indexerDeclaration);
+				
+				if (!indexerDeclaration.HasModifier(Modifiers.Override))
+					return;
+				
+				bool hasGetter = !indexerDeclaration.Getter.IsNull;
+				bool hasSetter = !indexerDeclaration.Setter.IsNull;
+				if (!hasGetter && !hasSetter)
+					return;
+				
+				if (hasGetter && indexerDeclaration.Getter.Body.Statements.Count != 1)
+					return;
+				
+				if (hasSetter && indexerDeclaration.Setter.Body.Statements.Count != 1)
+					return;
+				
+				var resultIndexer = ctx.Resolve(indexerDeclaration) as MemberResolveResult;
+				if (resultIndexer == null)
+					return;
+				var baseIndexer = InheritanceHelper.GetBaseMember(resultIndexer.Member) as IProperty;
+				if (baseIndexer == null)
+					return;
+
+				bool hasBaseGetter = (baseIndexer.Getter != null);
+				bool hasBaseSetter = (baseIndexer.Setter != null);
+				
+				if (hasBaseGetter) {
+					if (hasGetter) {
+					
+						var expr = indexerDeclaration.Getter.Body.Statements.FirstOrNullObject() as ReturnStatement;
+					
+						if (expr == null)
+							return;
+					
+						Expression indexerExpression = expr.Expression;
+					
+						if (indexerExpression == null || 
+							!(indexerExpression.FirstChild is BaseReferenceExpression))
+							return;
+					}
+				}
+				
+				if (hasBaseSetter) {
+					if (hasSetter) {
+						var match = setterPattern.Match(indexerDeclaration.Setter.Body.Statements.FirstOrNullObject());
+						if (!match.Success)
+							return;
+						var memberReferenceExpression = match.Get("left").Single() as IndexerExpression;
+						if (memberReferenceExpression == null || 
+							!(memberReferenceExpression.FirstChild is BaseReferenceExpression))
+							return;
+					}
+				}
+				
+				var title = ctx.TranslateString("Redundant indexer override");
+				AddIssue(new CodeIssue(indexerDeclaration, title, ctx.TranslateString("Remove redundant indexer override"), script => script.Remove(indexerDeclaration)) { IssueMarker = IssueMarker.GrayOut });
+			}
+
+			static readonly AstNode customEventPattern =
+				new CustomEventDeclaration {
+					Modifiers = Modifiers.Any,
+					Name = Pattern.AnyString,
+					ReturnType = new AnyNode(), 
+					AddAccessor = new Accessor {
+						Body = new BlockStatement {
+							new AssignmentExpression {
+								Left = new NamedNode ("baseRef", new MemberReferenceExpression(new BaseReferenceExpression(), Pattern.AnyString)),
+								Operator = AssignmentOperatorType.Add,
+								Right = new IdentifierExpression("value")
+							}
+						}
+					},
+					RemoveAccessor = new Accessor {
+						Body = new BlockStatement {
+							new AssignmentExpression {
+								Left = new Backreference("baseRef"),
+								Operator = AssignmentOperatorType.Subtract,
+								Right = new IdentifierExpression("value")
+							}
+						}
+					},
+				};
+			
+			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
+			{
+				var m = customEventPattern.Match(eventDeclaration);
+				if (!m.Success)
+					return;
+				var baseRef = m.Get<MemberReferenceExpression>("baseRef").First();
+				if (baseRef == null || baseRef.MemberName != eventDeclaration.Name)
+					return;
+
+				var title = ctx.TranslateString("Redundant event override");
+				AddIssue(new CodeIssue(eventDeclaration, title, ctx.TranslateString("Remove event override"), script => script.Remove(eventDeclaration)) { IssueMarker = IssueMarker.GrayOut });
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/RedundantParamsIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/RedundantParamsIssue.cs
new file mode 100644
index 0000000000..a30df35947
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/RedundantParamsIssue.cs
@@ -0,0 +1,86 @@
+//
+// RedundantParamsIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("'params' is ignored on overrides",
+	                  Description = "'params' is ignored on overrides",
+	                  Category = IssueCategories.RedundanciesInDeclarations,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "RedundantParams")]
+	public class RedundantParamsIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantParamsIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				if (!methodDeclaration.HasModifier(Modifiers.Override))
+					return;
+				var lastParam = methodDeclaration.Parameters.LastOrDefault();
+				if (lastParam == null || lastParam.ParameterModifier != ParameterModifier.Params)
+					return;
+				var type = lastParam.Type as ComposedType;
+				if (type == null || !type.ArraySpecifiers.Any())
+					return;
+				var rr = ctx.Resolve(methodDeclaration) as MemberResolveResult;
+				if (rr == null)
+					return;
+				var baseMember = InheritanceHelper.GetBaseMember(rr.Member) as IMethod;
+				if (baseMember == null || baseMember.Parameters.Count == 0 || baseMember.Parameters.Last().IsParams)
+					return;
+				AddIssue(new CodeIssue(
+					lastParam.GetChildByRole(ParameterDeclaration.ParamsModifierRole),
+					ctx.TranslateString("'params' is always ignored in overrides"),
+					ctx.TranslateString("Remove 'params' modifier"),
+					script => {
+						var p = (ParameterDeclaration)lastParam.Clone();
+						p.ParameterModifier = ParameterModifier.None;
+						script.Replace(lastParam, p);
+					}
+				) { IssueMarker = IssueMarker.GrayOut });
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				// SKIP
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/SealedMemberInSealedClassIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/SealedMemberInSealedClassIssue.cs
new file mode 100644
index 0000000000..2e94d42a55
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/SealedMemberInSealedClassIssue.cs
@@ -0,0 +1,141 @@
+//
+// SealedMemberInSealedClassIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Sealed member in sealed class",
+	                  Description = "'sealed' modifier is redundant in sealed classes",
+	                  Category = IssueCategories.RedundanciesInDeclarations,
+	                  Severity = Severity.Warning,
+	                  AnalysisDisableKeyword = "SealedMemberInSealedClass")]
+	public class SealedMemberInSealedClassIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<SealedMemberInSealedClassIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			void CheckNode(EntityDeclaration node)
+			{
+				if (!node.HasModifier(Modifiers.Override))
+					return;
+				var type = node.Parent as TypeDeclaration;
+				if (type == null || !type.HasModifier(Modifiers.Sealed))
+					return;
+				foreach (var token_ in node.ModifierTokens) {
+					var token = token_;
+					if (token.Modifier == Modifiers.Sealed) {
+						AddIssue(new CodeIssue(
+							token, 
+							ctx.TranslateString("Keyword 'sealed' is redundant in sealed classes."), 
+							ctx.TranslateString("Remove redundant 'sealed' modifier"), 
+							script => script.ChangeModifier(node, node.Modifiers & ~Modifiers.Sealed)
+						) { IssueMarker = IssueMarker.GrayOut });
+					}
+				}
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				base.VisitMethodDeclaration(methodDeclaration);
+				CheckNode(methodDeclaration);
+			}
+
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+				base.VisitFieldDeclaration(fieldDeclaration);
+				CheckNode(fieldDeclaration);
+			}
+
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+				base.VisitPropertyDeclaration(propertyDeclaration);
+				CheckNode(propertyDeclaration);
+			}
+
+			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
+			{
+				base.VisitIndexerDeclaration(indexerDeclaration);
+				CheckNode(indexerDeclaration);
+			}
+
+			public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
+			{
+				base.VisitEventDeclaration(eventDeclaration);
+				CheckNode(eventDeclaration);
+			}
+
+			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
+			{
+				base.VisitCustomEventDeclaration(eventDeclaration);
+				CheckNode(eventDeclaration);
+			}
+
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+				base.VisitConstructorDeclaration(constructorDeclaration);
+				CheckNode(constructorDeclaration);
+			}
+
+			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
+			{
+				base.VisitOperatorDeclaration(operatorDeclaration);
+				CheckNode(operatorDeclaration);
+			}
+
+			public override void VisitFixedFieldDeclaration(FixedFieldDeclaration fixedFieldDeclaration)
+			{
+				base.VisitFixedFieldDeclaration(fixedFieldDeclaration);
+				CheckNode(fixedFieldDeclaration);
+			}
+
+			public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
+			{
+				// SKIP
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				if (typeDeclaration.Parent is TypeDeclaration) {
+					CheckNode(typeDeclaration);
+				}
+				base.VisitTypeDeclaration(typeDeclaration);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/UnusedLabelIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/UnusedLabelIssue.cs
new file mode 100644
index 0000000000..504e0962f7
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/UnusedLabelIssue.cs
@@ -0,0 +1,156 @@
+//
+// UnusedLabelIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription(
+		"Unused label",
+		Description = "Label is never referenced",
+		Category = IssueCategories.RedundanciesInDeclarations,
+		Severity = Severity.Warning,
+		PragmaWarning = 164,
+		AnalysisDisableKeyword = "UnusedLabel")]
+	public class UnusedLabelIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<UnusedLabelIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			class LabelDescriptor 
+			{
+				public List<LabelStatement> LabelStatement = new List<ICSharpCode.NRefactory.CSharp.LabelStatement>();
+				public bool IsUsed;
+
+				public LabelDescriptor(LabelStatement labelStatement)
+				{
+					this.LabelStatement.Add(labelStatement);
+				}
+			}
+
+			readonly Dictionary<string, LabelDescriptor> labels = new Dictionary<string, LabelDescriptor> ();
+
+			void GatherLabels(BlockStatement body)
+			{
+				foreach (var node in body.Descendants) {
+					var labelStatement = node as LabelStatement;
+					if (labelStatement == null)
+						continue;
+					// note: duplicate labels are checked by the parser.
+					LabelDescriptor desc;
+					if (!labels.TryGetValue(labelStatement.Label, out desc)) {
+						labels[labelStatement.Label] = new LabelDescriptor(labelStatement);
+					} else {
+						desc.LabelStatement.Add(labelStatement);
+					}
+				}
+			}
+
+			void CheckLables()
+			{
+				foreach (var label in labels.Values) {
+					if (label.IsUsed)
+						continue;
+					foreach (var stmt in label.LabelStatement) {
+						AddIssue(new CodeIssue(
+							stmt.LabelToken.StartLocation,
+							stmt.ColonToken.EndLocation,
+							ctx.TranslateString("Label is unused"),
+							ctx.TranslateString("Remove unused label"),
+							s => { s.Remove(stmt); s.FormatText(stmt.Parent); }
+						) { IssueMarker = IssueMarker.GrayOut });
+					}
+				}
+
+				labels.Clear();
+			}
+
+			public override void VisitGotoStatement(GotoStatement gotoStatement)
+			{
+				LabelDescriptor desc;
+				if (labels.TryGetValue(gotoStatement.Label, out desc)) {
+					desc.IsUsed = true;
+				}
+			}
+
+			public override void VisitLabelStatement(LabelStatement labelStatement)
+			{
+				if (IsSuppressed(labelStatement.StartLocation)) {
+					LabelDescriptor desc;
+					if (labels.TryGetValue(labelStatement.Label, out desc)) 
+						desc.LabelStatement.Remove(labelStatement);
+				}
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				GatherLabels(methodDeclaration.Body);
+				base.VisitMethodDeclaration(methodDeclaration);
+				CheckLables();
+			}
+
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+				GatherLabels(constructorDeclaration.Body);
+				base.VisitConstructorDeclaration(constructorDeclaration);
+				CheckLables();
+			}
+
+			public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
+			{
+				GatherLabels(destructorDeclaration.Body);
+				base.VisitDestructorDeclaration(destructorDeclaration);
+				CheckLables();
+			}
+
+			public override void VisitAccessor(Accessor accessor)
+			{
+				GatherLabels(accessor.Body);
+				base.VisitAccessor(accessor);
+				CheckLables();
+			}
+
+			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
+			{
+				GatherLabels(operatorDeclaration.Body);
+				base.VisitOperatorDeclaration(operatorDeclaration);
+				CheckLables();
+			}
+
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/UnusedParameterIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/UnusedParameterIssue.cs
new file mode 100644
index 0000000000..affe5d7045
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/UnusedParameterIssue.cs
@@ -0,0 +1,168 @@
+// 
+// UnusedParameterIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Unused parameter",
+		Description = "Parameter is never used.",
+		Category = IssueCategories.RedundanciesInDeclarations,
+		Severity = Severity.Warning, 
+		AnalysisDisableKeyword = "UnusedParameter"
+	)]
+	public class UnusedParameterIssue : GatherVisitorCodeIssueProvider
+	{
+
+		#region ICodeIssueProvider implementation
+
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			var delegateVisitor = new GetDelgateUsagesVisitor(context);
+			context.RootNode.AcceptVisitor(delegateVisitor);
+
+			return new GatherVisitor(context, delegateVisitor);
+		}
+
+		#endregion
+
+		// Collect all methods that are used as delegate
+		class GetDelgateUsagesVisitor : DepthFirstAstVisitor
+		{
+			BaseRefactoringContext ctx;
+			public readonly List<IMethod> UsedMethods = new List<IMethod>();
+
+			public GetDelgateUsagesVisitor(BaseRefactoringContext ctx)
+			{
+				this.ctx = ctx;
+			}
+
+			public override void VisitIdentifierExpression(IdentifierExpression identifierExpression)
+			{
+				if (!IsTargetOfInvocation(identifierExpression)) {
+					var mgr = ctx.Resolve(identifierExpression) as MethodGroupResolveResult;
+					if (mgr != null)
+						UsedMethods.AddRange(mgr.Methods);
+				}
+				base.VisitIdentifierExpression(identifierExpression);
+			}
+
+			public override void VisitMemberReferenceExpression(MemberReferenceExpression memberReferenceExpression)
+			{
+				if (!IsTargetOfInvocation(memberReferenceExpression)) {
+					var mgr = ctx.Resolve(memberReferenceExpression) as MethodGroupResolveResult;
+					if (mgr != null)
+						UsedMethods.AddRange(mgr.Methods);
+				}
+				base.VisitMemberReferenceExpression(memberReferenceExpression);
+			}
+
+			static bool IsTargetOfInvocation(AstNode node)
+			{
+				return node.Role == Roles.TargetExpression && node.Parent is InvocationExpression;
+			}
+		}
+
+		class GatherVisitor : GatherVisitorBase<UnusedParameterIssue>
+		{
+			GetDelgateUsagesVisitor usedDelegates;
+			bool currentTypeIsPartial;
+
+			public GatherVisitor(BaseRefactoringContext ctx, GetDelgateUsagesVisitor usedDelegates)
+				: base(ctx)
+			{
+				this.usedDelegates = usedDelegates;
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				bool outerTypeIsPartial = currentTypeIsPartial;
+				currentTypeIsPartial = typeDeclaration.HasModifier(Modifiers.Partial);
+				base.VisitTypeDeclaration(typeDeclaration);
+				currentTypeIsPartial = outerTypeIsPartial;
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				// Only some methods are candidates for the warning
+
+				if (methodDeclaration.Body.IsNull)
+					return;
+				if (methodDeclaration.Modifiers.HasFlag(Modifiers.Virtual) ||
+				    methodDeclaration.Modifiers.HasFlag(Modifiers.New) ||
+				    methodDeclaration.Modifiers.HasFlag(Modifiers.Partial))
+					return;
+				var methodResolveResult = ctx.Resolve(methodDeclaration) as MemberResolveResult;
+				if (methodResolveResult == null)
+					return;
+				var member = methodResolveResult.Member;
+				if (member.IsOverride)
+					return;
+				if (member.ImplementedInterfaceMembers.Any())
+					return;
+				if (usedDelegates.UsedMethods.Any(m => m.MemberDefinition == member))
+					return;
+				if (currentTypeIsPartial && methodDeclaration.Parameters.Count == 2) {
+					if (methodDeclaration.Parameters.First().Name == "sender") {
+						// Looks like an event handler; the registration might be in the designer part
+						return;
+					}
+				}
+				foreach (var parameter in methodDeclaration.Parameters)
+					parameter.AcceptVisitor(this);
+			}
+
+			public override void VisitParameterDeclaration(ParameterDeclaration parameterDeclaration)
+			{
+				base.VisitParameterDeclaration(parameterDeclaration);
+
+				if (!(parameterDeclaration.Parent is MethodDeclaration || parameterDeclaration.Parent is ConstructorDeclaration))
+					return;
+
+				var resolveResult = ctx.Resolve(parameterDeclaration) as LocalResolveResult;
+				if (resolveResult == null)
+					return;
+				if (resolveResult.Type.Name == "StreamingContext" && resolveResult.Type.Namespace == "System.Runtime.Serialization") {
+					// commonly unused parameter in constructors associated with ISerializable
+					return;
+				}
+
+				if (ctx.FindReferences(parameterDeclaration.Parent, resolveResult.Variable).Any(r => r.Node != parameterDeclaration))
+					return;
+
+				AddIssue(new CodeIssue (
+					parameterDeclaration.NameToken, 
+					string.Format(ctx.TranslateString("Parameter '{0}' is never used"), parameterDeclaration.Name)) { IssueMarker = IssueMarker.GrayOut });
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/UnusedTypeParameterIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/UnusedTypeParameterIssue.cs
new file mode 100644
index 0000000000..3b3ccff2e9
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInDeclaration/UnusedTypeParameterIssue.cs
@@ -0,0 +1,98 @@
+// 
+// UnusedTypeParameterIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Unused type parameter",
+		Description = "Type parameter is never used.",
+		Category = IssueCategories.RedundanciesInDeclarations,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "UnusedTypeParameter")]
+	public class UnusedTypeParameterIssue : GatherVisitorCodeIssueProvider
+	{
+		static FindReferences refFinder = new FindReferences();
+
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			var unit = context.RootNode as SyntaxTree;
+			if (unit == null)
+				return null;
+			return new GatherVisitor(context, unit);
+		}
+
+		protected static bool FindUsage(BaseRefactoringContext context, SyntaxTree unit,
+		                                 ITypeParameter typeParameter, AstNode declaration)
+		{
+			var found = false;
+			var searchScopes = refFinder.GetSearchScopes(typeParameter);
+			refFinder.FindReferencesInFile(searchScopes, context.Resolver,
+				(node, resolveResult) => {
+					if (node != declaration)
+						found = true;
+				}, context.CancellationToken);
+			return found;
+		}
+
+		class GatherVisitor : GatherVisitorBase<UnusedTypeParameterIssue>
+		{
+			SyntaxTree unit;
+
+			public GatherVisitor(BaseRefactoringContext ctx, SyntaxTree unit)
+				: base(ctx)
+			{
+				this.unit = unit;
+			}
+
+			public override void VisitTypeParameterDeclaration(TypeParameterDeclaration decl)
+			{
+				base.VisitTypeParameterDeclaration(decl);
+
+				var resolveResult = ctx.Resolve(decl) as TypeResolveResult;
+				if (resolveResult == null)
+					return;
+				var typeParameter = resolveResult.Type as ITypeParameter;
+				if (typeParameter == null)
+					return;
+				var methodDecl = decl.Parent as MethodDeclaration;
+				if (methodDecl == null)
+					return;
+
+				if (FindUsage(ctx, unit, typeParameter, decl))
+					return;
+
+				AddIssue(new CodeIssue(decl.NameToken, ctx.TranslateString("Type parameter is never used")) { IssueMarker = IssueMarker.GrayOut });
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/TODO/ConvertTailRecursiveCallToLoopIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/TODO/ConvertTailRecursiveCallToLoopIssue.cs
new file mode 100644
index 0000000000..e58f970ff4
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/TODO/ConvertTailRecursiveCallToLoopIssue.cs
@@ -0,0 +1,58 @@
+//
+// ConvertTailRecursiveCallToLoopIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+//	[IssueDescription ("Tail recursive call may be replaced by loop",
+//		Description = "Tail recursive calls should be avoided.",
+//		Category = IssueCategories.CodeQualityIssues,
+//		Severity = Severity.Hint)]
+	public class ConvertTailRecursiveCallToLoopIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ConvertTailRecursiveCallToLoopIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				// TODO
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/TODO/LoopCanBeConvertedToQueryIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/TODO/LoopCanBeConvertedToQueryIssue.cs
new file mode 100644
index 0000000000..4bdc18e910
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/TODO/LoopCanBeConvertedToQueryIssue.cs
@@ -0,0 +1,51 @@
+//
+// LoopCanBeConvertedToQueryIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+//	[IssueDescription ("Loop can be converted into LINQ expression",
+//		Description = "Loop can be converted into LINQ expression",
+//		Category = IssueCategories.Opportunities,
+//		Severity = Severity.Suggestion,
+//		AnalysisDisableKeyword = "LoopCanBeConvertedToQuery")]
+	public class LoopCanBeConvertedToQueryIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<LoopCanBeConvertedToQueryIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/TODO/PartOfBodyCanBeConvertedToQueryIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/TODO/PartOfBodyCanBeConvertedToQueryIssue.cs
new file mode 100644
index 0000000000..50195115c0
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/TODO/PartOfBodyCanBeConvertedToQueryIssue.cs
@@ -0,0 +1,50 @@
+//
+// PartOfBodyCanBeConvertedToQueryIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+//	[IssueDescription ("Part of the loop body can be converted into LINQ expression",
+//		Description = "Part of the loop body can be converted into LINQ expression",
+//		Category = IssueCategories.Opportunities,
+//		Severity = Severity.Hint)]
+	public class PartOfBodyCanBeConvertedToQueryIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<PartOfBodyCanBeConvertedToQueryIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/TODO/RedundantTypeArgumentsOfMethodIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/TODO/RedundantTypeArgumentsOfMethodIssue.cs
new file mode 100644
index 0000000000..03aaadf046
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/TODO/RedundantTypeArgumentsOfMethodIssue.cs
@@ -0,0 +1,51 @@
+//
+// RedundantTypeArgumentsOfMethodIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+//	[IssueDescription ("Redundant type arguments in method call",
+//		Description = "Explicit specifiction is redundant because they are inferred from arguments",
+//		Category = IssueCategories.RedundanciesInCode,
+//		Severity = Severity.Hint, 
+//		AnalysisDisableKeyword = "RedundantTypeArgumentsOfMethod" )]
+	public class RedundantTypeArgumentsOfMethodIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantTypeArgumentsOfMethodIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/AutoAsyncIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/AutoAsyncIssue.cs
new file mode 100644
index 0000000000..20d360ed0c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/AutoAsyncIssue.cs
@@ -0,0 +1,636 @@
+//
+// AutoAsyncIssue.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+//
+// Copyright (c) 2013 Luís Reis
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+using ICSharpCode.NRefactory.PatternMatching;
+
+using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.Refactoring;
+
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Old-style asynchronous function can be converted to C# 5 async",
+	                  Description = "Detects usage of old-style TaskCompletionSource/ContinueWith and suggests using async/await instead",
+	                  Category = IssueCategories.Opportunities,
+	                  Severity = Severity.Hint)]
+	public class AutoAsyncIssue : GatherVisitorCodeIssueProvider
+	{
+		static readonly ReturnStatement ReturnTaskCompletionSourcePattern = new ReturnStatement {
+			Expression = new MemberReferenceExpression {
+				Target = new IdentifierExpression(Pattern.AnyString).WithName("target"),
+				MemberName = "Task"
+			}
+		};
+
+		sealed class OriginalNodeAnnotation
+		{
+			internal readonly AstNode sourceNode;
+
+			internal OriginalNodeAnnotation(AstNode sourceNode) {
+				this.sourceNode = sourceNode;
+			}
+		}
+
+		static void AddOriginalNodeAnnotations(AstNode currentFunction)
+		{
+			foreach (var nodeToAnnotate in currentFunction
+			         .DescendantNodesAndSelf(MayHaveChildrenToAnnotate)
+			         .Where(ShouldAnnotate)) {
+				nodeToAnnotate.AddAnnotation(new OriginalNodeAnnotation(nodeToAnnotate));
+			}
+		}
+
+		static void RemoveOriginalNodeAnnotations(AstNode currentFunction)
+		{
+			foreach (var nodeToAnnotate in currentFunction
+			         .DescendantNodesAndSelf(MayHaveChildrenToAnnotate)
+			         .Where(ShouldAnnotate)) {
+				nodeToAnnotate.RemoveAnnotations<OriginalNodeAnnotation>();
+			}
+		}
+
+		static bool MayHaveChildrenToAnnotate(AstNode node)
+		{
+			return node is Statement ||
+				node is Expression ||
+				node is MethodDeclaration;
+		}
+
+		static bool ShouldAnnotate(AstNode node)
+		{
+			return node is InvocationExpression;
+		}
+
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			if (!context.Supports(new Version(5, 0))) {
+				//Old C# version -- async/await are not available
+				return null;
+			}
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<AutoAsyncIssue>
+		{
+			internal GatherVisitor(BaseRefactoringContext ctx)
+			: base(ctx) {}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				AddIssueFor(methodDeclaration);
+				base.VisitMethodDeclaration(methodDeclaration);
+			}
+
+			public override void VisitLambdaExpression(LambdaExpression lambdaExpression)
+			{
+				AddIssueFor(lambdaExpression);
+				base.VisitLambdaExpression(lambdaExpression);
+			}
+
+			public override void VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression)
+			{
+				AddIssueFor(anonymousMethodExpression);
+				base.VisitAnonymousMethodExpression(anonymousMethodExpression);
+			}
+
+			void AddIssueFor(AstNode currentFunction)
+			{
+				if (IsAsync(currentFunction))
+					return;
+
+				//Only suggest modifying functions that return void, Task or Task<T>.
+				IType returnType = GetReturnType(ctx, currentFunction);
+				if (returnType == null) {
+					return;
+				}
+
+				bool isVoid = false;
+				IType resultType = null;
+				switch (returnType.FullName) {
+					case "System.Void":
+						isVoid = true;
+						break;
+					case "System.Threading.Tasks.Task":
+						resultType = returnType.IsParameterized ? returnType.TypeArguments.FirstOrDefault() : null;
+						break;
+					default:
+						return;
+				}
+
+				var functionBody = currentFunction.GetChildByRole(Roles.Body);
+				var statements = GetStatements(functionBody).ToList();
+				var returnStatements = statements.OfType<ReturnStatement>().ToList();
+
+				var invocations = new List<InvocationExpression>();
+				var nextInChain = new Dictionary<InvocationExpression, InvocationExpression>();
+				foreach (var invocation in currentFunction.Descendants.OfType<InvocationExpression>()) {
+					if (invocation.Arguments.Count != 1)
+						continue;
+
+					var lambdaOrDelegate = invocation.Arguments.Single();
+					Statement lambdaBody;
+					if (lambdaOrDelegate is LambdaExpression) {
+						lambdaBody = lambdaOrDelegate.GetChildByRole(LambdaExpression.BodyRole) as BlockStatement;
+						if (lambdaBody == null) {
+							continue;
+						}
+					} else if (lambdaOrDelegate is AnonymousMethodExpression) {
+						lambdaBody = lambdaOrDelegate.GetChildByRole(Roles.Body);
+					} else {
+						continue;
+					}
+
+					var resolveResult = ctx.Resolve(invocation) as MemberResolveResult;
+					if (resolveResult == null) {
+						continue;
+					}
+					if (resolveResult.Member.FullName != "System.Threading.Tasks.Task.ContinueWith")
+						continue;
+
+					var parentExpression = invocation.Parent as Expression;
+					if (parentExpression != null) {
+						var mreParent = parentExpression as MemberReferenceExpression;
+						if (mreParent == null || mreParent.MemberName != "ContinueWith") {
+							continue;
+						}
+
+						var parentInvocation = mreParent.Parent as InvocationExpression;
+						if (parentInvocation == null || parentInvocation.Arguments.Count != 1) {
+							continue;
+						}
+
+						nextInChain[invocation] = parentInvocation;
+					}
+
+					invocations.Add(invocation);
+				}
+
+				if (isVoid && invocations.Count == 0) {
+					//Prevent functions like void Foo() {} from being accepted
+					return;
+				}
+
+				string taskCompletionSourceIdentifier = null;
+				InvocationExpression returnedContinuation = null;
+
+				if (isVoid) {
+					if (returnStatements.Any())
+						return;
+				} else if (!isVoid) {
+					if (returnStatements.Count() != 1)
+						return;
+
+					var returnStatement = returnStatements.Single();
+					if (functionBody.Statements.Last() != returnStatement)
+						return;
+
+					var match = ReturnTaskCompletionSourcePattern.Match(returnStatement);
+					if (match.Success) {
+						var taskCompletionSource = match.Get<IdentifierExpression>("target").Single();
+						var taskCompletionSourceResolveResult = ctx.Resolve(taskCompletionSource);
+
+						//Make sure the TaskCompletionSource is a local variable
+						if (!(taskCompletionSourceResolveResult is LocalResolveResult) ||
+						    taskCompletionSourceResolveResult.Type.FullName != "System.Threading.Tasks.TaskCompletionSource") {
+
+							return;
+						}
+						taskCompletionSourceIdentifier = taskCompletionSource.Identifier;
+
+						var cfgBuilder = new ControlFlowGraphBuilder();
+						var cachedControlFlowGraphs = new Dictionary<BlockStatement, IList<ControlFlowNode>>();
+
+						//Make sure there are no unsupported uses of the task completion source
+						foreach (var identifier in functionBody.Descendants.OfType<Identifier>()) {
+							if (identifier.Name != taskCompletionSourceIdentifier)
+								continue;
+
+							var statement = identifier.GetParent<Statement>();
+							var variableStatement = statement as VariableDeclarationStatement;
+							if (variableStatement != null) {
+								if (functionBody.Statements.First() != variableStatement || variableStatement.Variables.Count != 1) {
+									//This may actually be valid, but it would add even more complexity to this action
+									return;
+								}
+								var initializer = variableStatement.Variables.First().Initializer as ObjectCreateExpression;
+								if (initializer == null || initializer.Arguments.Count != 0 || !initializer.Initializer.IsNull) {
+									return;
+								}
+
+								var constructedType = ctx.ResolveType(initializer.Type);
+								if (constructedType.FullName != "System.Threading.Tasks.TaskCompletionSource") {
+									return;
+								}
+
+								continue;
+							}
+
+							if (statement == returnStatement)
+								continue;
+
+							if (identifier.Parent is MemberReferenceExpression) {
+								//Right side of the member.
+								//We don't care about this case since it's not a reference to the variable.
+								continue;
+							}
+
+							//The method's taskCompletionSource can only be used on the left side of a member
+							//reference expression (specifically tcs.SetResult).
+							var identifierExpressionParent = identifier.Parent as IdentifierExpression;
+							if (identifierExpressionParent == null) {
+								return;
+							}
+							var memberReferenceExpression = identifierExpressionParent.Parent as MemberReferenceExpression;
+							if (memberReferenceExpression == null) {
+								return;
+							}
+
+							if (memberReferenceExpression.MemberName != "SetResult") {
+								//Aside from the final return statement, the only member of task completion source
+								//that can be used is SetResult.
+								//Perhaps future versions could also include SetException and SetCancelled.
+								return;
+							}
+
+							//We found a SetResult -- we will now find out if it is in a proper context
+							AstNode node = memberReferenceExpression;
+							for (;;) {
+								node = node.Parent;
+
+								if (node == null) {
+									//Abort since this is unexpected (it should never happen)
+									return;
+								}
+
+								if (node is MethodDeclaration) {
+									//Ok -- tcs.SetResult is in method declaration
+									break;
+								}
+
+								if (node is LambdaExpression || node is AnonymousMethodExpression) {
+									//It's time to verify if the lambda is supported
+									var lambdaParent = node.Parent as InvocationExpression;
+									if (lambdaParent == null || !invocations.Contains(lambdaParent)) {
+										return;
+									}
+									break;
+								}
+							}
+
+							var containingContinueWith = node.Parent as InvocationExpression;
+							if (containingContinueWith != null) {
+								if (nextInChain.ContainsKey(containingContinueWith)) {
+									//Unsupported: ContinueWith has a SetResult
+									//but it's not the last in the chain
+									return;
+								}
+							}
+
+							var containingFunctionBlock = node is LambdaExpression ? (BlockStatement)node.GetChildByRole(LambdaExpression.BodyRole) : node.GetChildByRole(Roles.Body);
+
+							//Finally, tcs.SetResult must be at the end of its method
+							IList<ControlFlowNode> nodes;
+							if (!cachedControlFlowGraphs.TryGetValue(containingFunctionBlock, out nodes)) {
+								nodes = cfgBuilder.BuildControlFlowGraph(containingFunctionBlock, ctx.CancellationToken);
+								cachedControlFlowGraphs[containingFunctionBlock] = nodes;
+							}
+
+							var setResultNode = nodes.FirstOrDefault(candidateNode => candidateNode.PreviousStatement == statement);
+							if (setResultNode != null && HasReachableNonReturnNodes(setResultNode)) {
+								//The only allowed outgoing nodes are return statements
+								return;
+							}
+						}
+					} else {
+						//Not TaskCompletionSource-based
+						//Perhaps it is return Task.ContinueWith(foo);
+
+						if (!invocations.Any()) {
+							return;
+						}
+
+						var outerMostInvocations = new List<InvocationExpression>();
+						InvocationExpression currentInvocation = invocations.First();
+						do {
+							outerMostInvocations.Add(currentInvocation);
+						} while (nextInChain.TryGetValue(currentInvocation, out currentInvocation));
+
+						var lastInvocation = outerMostInvocations.Last();
+						if (returnStatement.Expression != lastInvocation) {
+							return;
+						}
+
+						//Found return <1>.ContinueWith(<2>);
+						returnedContinuation = lastInvocation;
+					}
+				}
+
+				//We do not support "return expr" in continuations
+				//The only exception is when the outer method returns that continuation.
+				invocations.RemoveAll(invocation => invocation != returnedContinuation &&
+				                      invocation.Arguments.First().Children.OfType<Statement>().First().DescendantNodesAndSelf(node => node is Statement).OfType<ReturnStatement>().Any(returnStatement => !returnStatement.Expression.IsNull));
+
+				AddIssue(new CodeIssue(GetFunctionToken(currentFunction),
+				         ctx.TranslateString("Function can be converted to C# 5-style async function"),
+				         ctx.TranslateString("Convert to C# 5-style async function"),
+				                            script => {
+					AddOriginalNodeAnnotations(currentFunction);
+					var newFunction = currentFunction.Clone();
+					RemoveOriginalNodeAnnotations(currentFunction);
+
+					//Set async
+					var lambda = newFunction as LambdaExpression;
+					if (lambda != null)
+						lambda.IsAsync = true;
+					var anonymousMethod = newFunction as AnonymousMethodExpression;
+					if (anonymousMethod != null)
+						anonymousMethod.IsAsync = true;
+					var methodDeclaration = newFunction as MethodDeclaration;
+					if (methodDeclaration != null)
+						methodDeclaration.Modifiers |= Modifiers.Async;
+
+					TransformBody(invocations, isVoid, resultType != null, returnedContinuation, taskCompletionSourceIdentifier, newFunction.GetChildByRole(Roles.Body));
+
+					script.Replace(currentFunction, newFunction);
+					}));
+			}
+
+			void TransformBody(List<InvocationExpression> validInvocations, bool isVoid, bool isParameterizedTask, InvocationExpression returnedContinuation, string taskCompletionSourceIdentifier, BlockStatement blockStatement)
+			{
+				if (!isVoid) {
+					if (returnedContinuation == null) {
+						//Is TaskCompletionSource-based
+						blockStatement.Statements.First().Remove(); //Remove task completion source declaration
+						blockStatement.Statements.Last().Remove(); //Remove final return
+					}
+
+					//We use ToList() because we will be modifying the original collection
+					foreach (var expressionStatement in blockStatement.Descendants.OfType<ExpressionStatement>().ToList()) {
+						var invocationExpression = expressionStatement.Expression as InvocationExpression;
+						if (invocationExpression == null || invocationExpression.Arguments.Count != 1)
+							continue;
+
+						var target = invocationExpression.Target as MemberReferenceExpression;
+						if (target == null || target.MemberName != "SetResult") {
+							continue;
+						}
+						var targetExpression = target.Target as IdentifierExpression;
+						if (targetExpression == null || targetExpression.Identifier != taskCompletionSourceIdentifier) {
+							continue;
+						}
+
+						var returnedExpression = invocationExpression.Arguments.Single();
+						returnedExpression.Remove();
+
+						var originalInvocation = (InvocationExpression) invocationExpression.Annotation<OriginalNodeAnnotation>().sourceNode;
+						var originalReturnedExpression = originalInvocation.Arguments.Single();
+						var argumentType = ctx.Resolve(originalReturnedExpression).Type;
+
+						if (!isParameterizedTask) {
+							var parent = expressionStatement.Parent;
+							var resultIdentifier = CreateVariableName(blockStatement, "result");
+
+							var blockParent = parent as BlockStatement;
+							var resultDeclarationType = argumentType == SpecialType.NullType ? new PrimitiveType("object") : CreateShortType(originalInvocation, argumentType);
+							var declaration = new VariableDeclarationStatement(resultDeclarationType, resultIdentifier, returnedExpression);
+							if (blockParent == null) {
+								var newStatement = new BlockStatement();
+								newStatement.Add(declaration);
+								newStatement.Add(new ReturnStatement());
+								expressionStatement.ReplaceWith(newStatement);
+							} else {
+								blockParent.Statements.InsertAfter(expressionStatement, new ReturnStatement());
+								expressionStatement.ReplaceWith(declaration);
+							}
+						} else {
+							var newStatement = new ReturnStatement(returnedExpression);
+							expressionStatement.ReplaceWith(newStatement);
+						}
+					}
+				}
+
+				//Find all instances of ContinueWith to replace and associated 
+				var continuations = new List<Tuple<InvocationExpression, InvocationExpression, string>>();
+				foreach (var invocation in blockStatement.Descendants.OfType<InvocationExpression>()) {
+					if (invocation.Arguments.Count != 1)
+						continue;
+
+					var originalInvocation = (InvocationExpression) invocation.Annotation<OriginalNodeAnnotation>().sourceNode;
+					if (!validInvocations.Contains(originalInvocation))
+						continue;
+
+					var lambda = invocation.Arguments.Single();
+
+					string associatedTaskName = null;
+
+					var lambdaParameters = lambda.GetChildrenByRole(Roles.Parameter).Select(p => p.Name).ToList();
+					var lambdaTaskParameterName = lambdaParameters.FirstOrDefault();
+					if (lambdaTaskParameterName != null) {
+						associatedTaskName = lambdaTaskParameterName;
+					}
+
+					continuations.Add(Tuple.Create(invocation, originalInvocation, associatedTaskName));
+				}
+
+				foreach (var continuationTuple in continuations) {
+					string taskName = continuationTuple.Item3 ?? "task";
+					string effectiveTaskName = CreateVariableName(blockStatement, taskName);
+					string resultName = CreateVariableName(blockStatement, taskName + "Result");
+					var continuation = continuationTuple.Item1;
+					var originalInvocation = continuationTuple.Item2;
+
+					var target = continuation.Target.GetChildByRole(Roles.TargetExpression).Detach();
+					var awaitedExpression = new UnaryOperatorExpression(UnaryOperatorType.Await, target);
+					var replacements = new List<Statement>();
+					var lambdaExpression = originalInvocation.Arguments.First();
+					var continuationLambdaResolveResult = ctx.Resolve(lambdaExpression) as LambdaResolveResult;
+
+					if (!continuationLambdaResolveResult.HasParameterList ||
+					    !continuationLambdaResolveResult.Parameters.First().Type.IsParameterized)
+					{
+						//Either precedent is of type Task or the result is not used
+						replacements.Add(new ExpressionStatement(awaitedExpression));
+					} else {
+						//Precedent is of type Task<T>
+						var lambdaParameter = continuationLambdaResolveResult.Parameters.First();
+						var precedentTaskType = lambdaParameter.Type;
+						var precedentResultType = precedentTaskType.TypeArguments.First();
+
+						//We might need to separate the task creation and awaiting
+						var taskIdentifiers = lambdaExpression.Descendants.OfType<IdentifierExpression>().Where(identifier => {
+							if (identifier.Identifier != lambdaParameter.Name)
+								return false;
+							var identifierMre = identifier.Parent as MemberReferenceExpression;
+							return identifierMre == null || identifierMre.MemberName != "Result";
+						});
+						if (taskIdentifiers.Any()) {
+							//Create new task variable
+							var taskExpression = awaitedExpression.Expression;
+							taskExpression.Detach();
+							replacements.Add(new VariableDeclarationStatement(CreateShortType(lambdaExpression, precedentTaskType),
+							                                                  effectiveTaskName,
+							                                                  taskExpression));
+							awaitedExpression.Expression = new IdentifierExpression(effectiveTaskName);
+						}
+
+						replacements.Add(new VariableDeclarationStatement(CreateShortType(originalInvocation, precedentResultType), resultName, awaitedExpression));
+					}
+
+					var parentStatement = continuation.GetParent<Statement>();
+					var grandParentStatement = parentStatement.Parent;
+					var block = grandParentStatement as BlockStatement;
+					if (block == null) {
+						block = new BlockStatement();
+						block.Statements.AddRange(replacements);
+						parentStatement.ReplaceWith(block);
+					} else {
+						foreach (var replacement in replacements) {
+							block.Statements.InsertBefore(parentStatement, replacement);
+						}
+						parentStatement.Remove();
+					}
+
+					var lambdaOrDelegate = continuation.Arguments.Single();
+					Statement lambdaContent;
+					if (lambdaOrDelegate is LambdaExpression) {
+						lambdaContent = (Statement)lambdaOrDelegate.GetChildByRole(LambdaExpression.BodyRole);
+					} else {
+						lambdaContent = lambdaOrDelegate.GetChildByRole(Roles.Body);
+					}
+
+					foreach (var identifierExpression in lambdaContent.Descendants.OfType<IdentifierExpression>()) {
+						if (continuationTuple.Item3 != identifierExpression.Identifier) {
+							continue;
+						}
+
+						var memberReference = identifierExpression.Parent as MemberReferenceExpression;
+
+						if (memberReference == null || memberReference.MemberName != "Result") {
+							identifierExpression.ReplaceWith(new IdentifierExpression(effectiveTaskName));
+							continue;
+						}
+
+						memberReference.ReplaceWith(new IdentifierExpression(resultName));
+					}
+
+					if (lambdaContent is BlockStatement) {
+						Statement previousStatement = replacements.Last();
+						foreach (var statementInContinuation in lambdaContent.GetChildrenByRole(BlockStatement.StatementRole)) {
+							statementInContinuation.Detach();
+							block.Statements.InsertAfter(previousStatement, statementInContinuation);
+							previousStatement = statementInContinuation;
+						}
+					} else {
+						lambdaContent.Detach();
+						block.Statements.InsertAfter(replacements.Last(), lambdaContent);
+					}
+				}
+			}
+
+			AstType CreateShortType(AstNode node, IType type)
+			{
+				return ctx.CreateTypeSystemAstBuilder(node).ConvertType(type);
+			}
+		}
+		
+		static string CreateVariableName(AstNode currentRootNode, string proposedName) {
+			var identifiers = currentRootNode.Descendants.OfType<Identifier>()
+				.Select(identifier => identifier.Name).Where(identifier => identifier.StartsWith(proposedName, StringComparison.InvariantCulture)).ToList();
+			for (int i = 0;; ++i) {
+				string name = proposedName + (i == 0 ? string.Empty : i.ToString());
+				if (!identifiers.Contains(name)) {
+					return name;
+				}
+			}
+		}
+
+		static bool HasReachableNonReturnNodes(ControlFlowNode firstNode)
+		{
+			var visitedNodes = new List<ControlFlowNode>();
+			var nodesToVisit = new HashSet<ControlFlowNode>();
+			nodesToVisit.Add(firstNode);
+
+			while (nodesToVisit.Any()) {
+				var node = nodesToVisit.First();
+				nodesToVisit.Remove(node);
+				visitedNodes.Add(node);
+
+				if (node.Type == ControlFlowNodeType.LoopCondition)
+					return true;
+
+				var nextStatement = node.NextStatement;
+				if (nextStatement != null) {
+					if (!(nextStatement is ReturnStatement ||
+					    nextStatement is GotoStatement ||
+					    nextStatement is GotoCaseStatement ||
+					    nextStatement is GotoDefaultStatement ||
+					    nextStatement is ContinueStatement ||
+					    nextStatement is BreakStatement)) {
+
+						return true;
+					}
+				}
+			}
+
+			return false;
+		}
+
+		static IType GetReturnType(BaseRefactoringContext context, AstNode currentFunction)
+		{
+			var resolveResult = context.Resolve(currentFunction);
+			return resolveResult.IsError ? null : resolveResult.Type;
+		}
+
+		static IEnumerable<Statement> GetStatements(Statement statement)
+		{
+			return statement.DescendantNodesAndSelf(stmt => stmt is Statement).OfType<Statement>();
+		}
+
+		static AstNode GetFunctionToken(AstNode currentFunction)
+		{
+			return (AstNode)currentFunction.GetChildByRole(Roles.Identifier) ??
+			currentFunction.GetChildByRole(LambdaExpression.ArrowRole) ??
+			currentFunction.GetChildByRole(AnonymousMethodExpression.DelegateKeywordRole);
+		}
+
+		static bool IsAsync(AstNode currentFunction)
+		{
+			var method = currentFunction as MethodDeclaration;
+			if (method != null) {
+				return method.HasModifier(Modifiers.Async);
+			}
+			return !currentFunction.GetChildByRole(LambdaExpression.AsyncModifierRole).IsNull;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CallToObjectEqualsViaBaseIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CallToObjectEqualsViaBaseIssue.cs
new file mode 100644
index 0000000000..ccda1e65f8
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CallToObjectEqualsViaBaseIssue.cs
@@ -0,0 +1,92 @@
+//
+// CallToObjectEqualsViaBaseIssue.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Call to base.Equals resolves to Object.Equals, which is reference equality",
+	                  Description = "Finds potentially erroneous calls to Object.Equals.",
+	                  Category = IssueCategories.CodeQualityIssues,
+	                  Severity = Severity.Warning,
+                      AnalysisDisableKeyword = "BaseObjectEqualsIsObjectEquals")]
+	public class CallToObjectEqualsViaBaseIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<CallToObjectEqualsViaBaseIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+
+				if (invocationExpression.Arguments.Count != 1) {
+					return;
+				}
+				var memberExpression = invocationExpression.Target as MemberReferenceExpression;
+				if (memberExpression == null || memberExpression.MemberName != "Equals" || !(memberExpression.Target is BaseReferenceExpression)) {
+					return;
+				}
+				var resolveResult = ctx.Resolve(invocationExpression) as InvocationResolveResult;
+				if (resolveResult == null || !resolveResult.Member.DeclaringTypeDefinition.IsKnownType(KnownTypeCode.Object)) {
+					return;
+				}
+				var title = ctx.TranslateString("Call to base.Equals resolves to Object.Equals, which is reference equality");
+				AddIssue(new CodeIssue(invocationExpression, title, GetActions(invocationExpression)));
+			}
+
+			IEnumerable<CodeAction> GetActions(InvocationExpression invocationExpression)
+			{
+				yield return new CodeAction(ctx.TranslateString("Change invocation to call Object.ReferenceEquals"), script => {
+					var args = Enumerable.Concat(new [] { new ThisReferenceExpression() }, invocationExpression.Arguments.Select(arg => arg.Clone()));
+					var newInvocation = MakeInvocation("object.ReferenceEquals", args);
+					script.Replace(invocationExpression, newInvocation);
+				}, invocationExpression);
+				yield return new CodeAction(ctx.TranslateString("Remove 'base.'"), script => {
+					var newInvocation = MakeInvocation("Equals", invocationExpression.Arguments.Select(arg => arg.Clone()));
+					script.Replace(invocationExpression, newInvocation);
+				}, invocationExpression);
+			}
+
+			static InvocationExpression MakeInvocation(string memberName, IEnumerable<Expression> unClonedArguments)
+			{
+				return new InvocationExpression(new IdentifierExpression(memberName), unClonedArguments);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CastExpressionOfIncompatibleTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CastExpressionOfIncompatibleTypeIssue.cs
new file mode 100644
index 0000000000..2682a147aa
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CastExpressionOfIncompatibleTypeIssue.cs
@@ -0,0 +1,82 @@
+// 
+// CastExpressionOfIncompatibleTypeIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Type cast expression of incompatible type",
+		Description = "Type cast expression of incompatible type",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning)]
+	public class CastExpressionOfIncompatibleTypeIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<CastExpressionOfIncompatibleTypeIssue>
+		{
+			readonly CSharpConversions conversion;
+
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+				conversion = new CSharpConversions(ctx.Compilation);
+			}
+
+			public override void VisitCastExpression(CastExpression castExpression)
+			{
+				base.VisitCastExpression(castExpression);
+
+				VisitTypeCastExpression(castExpression, ctx.Resolve(castExpression.Expression).Type,
+					ctx.ResolveType(castExpression.Type));
+			}
+
+			public override void VisitAsExpression(AsExpression asExpression)
+			{
+				base.VisitAsExpression(asExpression);
+
+				VisitTypeCastExpression(asExpression, ctx.Resolve(asExpression.Expression).Type,
+					ctx.ResolveType(asExpression.Type));
+			}
+
+			void VisitTypeCastExpression(Expression expression, IType exprType, IType castToType)
+			{
+				if (exprType.Kind == TypeKind.Unknown || castToType.Kind == TypeKind.Unknown || castToType.Kind == TypeKind.TypeParameter)
+					return;
+				var foundConversion = conversion.ExplicitConversion(exprType, castToType);
+				if (foundConversion == Conversion.None)
+					AddIssue(new CodeIssue(expression, ctx.TranslateString("Type cast expression of incompatible type")));
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CheckNamespaceIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CheckNamespaceIssue.cs
new file mode 100644
index 0000000000..5b9a86f0ed
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CheckNamespaceIssue.cs
@@ -0,0 +1,88 @@
+//
+// CheckNamespaceIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription (
+		"Check if a namespace corresponds to a file location",
+		Description = "Check if a namespace corresponds to a file location",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "CheckNamespace")]
+	public class CheckNamespaceIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<CheckNamespaceIssue>
+		{
+			readonly string defaultNamespace;
+
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+				defaultNamespace = ctx.DefaultNamespace;
+			}
+
+			public override void VisitSyntaxTree(SyntaxTree syntaxTree)
+			{
+				if (string.IsNullOrEmpty(defaultNamespace))
+					return;
+				base.VisitSyntaxTree(syntaxTree);
+			}
+
+			public override void VisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration)
+			{
+				base.VisitNamespaceDeclaration(namespaceDeclaration);
+				// only check top level namespaces
+				if (namespaceDeclaration.Parent is NamespaceDeclaration ||
+				    namespaceDeclaration.FullName == defaultNamespace)
+					return;
+				AddIssue(new CodeIssue(
+					namespaceDeclaration.NamespaceName,
+					string.Format(ctx.TranslateString("Namespace does not correspond to file location, should be: '{0}'"), ctx.DefaultNamespace)
+				));
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				var ns = typeDeclaration.Parent as NamespaceDeclaration;
+				if (ns == null) {
+					AddIssue(new CodeIssue(
+						typeDeclaration.NameToken,
+						string.Format(ctx.TranslateString("Type should be declared inside the namespace '{0}'"), ctx.DefaultNamespace)
+					));
+				}
+				// skip children
+			}
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CompilerErrors/CS0659OverrideEqualWithoutGetHashCode.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CompilerErrors/CS0659OverrideEqualWithoutGetHashCode.cs
new file mode 100644
index 0000000000..490ec086dc
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CompilerErrors/CS0659OverrideEqualWithoutGetHashCode.cs
@@ -0,0 +1,125 @@
+// 
+// CS0659ClassOverrideEqualsWithoutGetHashCode.cs
+// 
+// Author:
+//      Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("CS0659: Class overrides Object.Equals but not Object.GetHashCode.",
+		Description = "If two objects are equal then they must both have the same hash code",
+		Category = IssueCategories.CompilerWarnings,
+		Severity = Severity.Warning,
+		PragmaWarning = 1717,
+		AnalysisDisableKeyword = "CSharpWarnings::CS0659")]
+	public class CS0659ClassOverrideEqualsWithoutGetHashCode : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context, this);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<CS0659ClassOverrideEqualsWithoutGetHashCode>
+		{
+
+			public GatherVisitor(BaseRefactoringContext ctx, CS0659ClassOverrideEqualsWithoutGetHashCode issueProvider) : base (ctx, issueProvider)
+			{
+			}
+			
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				base.VisitMethodDeclaration(methodDeclaration);
+
+				var resolvedResult = ctx.Resolve(methodDeclaration) as MemberResolveResult;
+				if (resolvedResult == null)
+					return;
+				var method = resolvedResult.Member as IMethod;
+
+				if (method == null || !method.Name.Equals("Equals") || ! method.IsOverride)
+					return;
+
+				if (methodDeclaration.Parameters.Count != 1)
+					return;
+	
+				if (!method.Parameters.Single().Type.FullName.Equals("System.Object"))
+					return;
+
+				var classDeclration = method.DeclaringTypeDefinition;
+				if (classDeclration == null)
+					return;
+
+				List<IMethod> getHashCode = new List<IMethod>();
+				var methods = classDeclration.GetMethods();
+
+				foreach (var m in methods) {
+					if (m.Name.Equals("GetHashCode")) {
+						getHashCode.Add(m);
+					}
+				}
+
+				if (!getHashCode.Any()) {
+					AddIssue(ctx, methodDeclaration);
+					return;
+				} else if (getHashCode.Any(f => (f.IsOverride && f.ReturnType.IsKnownType(KnownTypeCode.Int32)))) {
+					return;
+				}
+				AddIssue(ctx, methodDeclaration);
+			}
+
+			private void AddIssue(BaseRefactoringContext ctx, AstNode node)
+			{
+				var getHashCode = new MethodDeclaration();
+				getHashCode.Name = "GetHashCode";
+				getHashCode.Modifiers = Modifiers.Public;
+				getHashCode.Modifiers |= Modifiers.Override;
+				getHashCode.ReturnType = new PrimitiveType("int");
+
+				var blockStatement = new BlockStatement();
+				var invocationExpression = new InvocationExpression(new MemberReferenceExpression(new BaseReferenceExpression(),"GetHashCode"));
+				var returnStatement = new ReturnStatement(invocationExpression);
+				blockStatement.Add(returnStatement);
+				getHashCode.Body = blockStatement;
+
+				AddIssue(new CodeIssue(
+					(node as MethodDeclaration).NameToken, 
+					ctx.TranslateString("If two objects are equal then they must both have the same hash code"),
+					new CodeAction(
+					ctx.TranslateString("Override GetHashCode"),
+					script => {
+					script.InsertAfter(node, getHashCode); 
+				},
+				node
+					)));
+			}
+		}
+	}
+}
+
+	
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CompilerErrors/CS1729TypeHasNoConstructorWithNArgumentsIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CompilerErrors/CS1729TypeHasNoConstructorWithNArgumentsIssue.cs
new file mode 100644
index 0000000000..7569f79018
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CompilerErrors/CS1729TypeHasNoConstructorWithNArgumentsIssue.cs
@@ -0,0 +1,138 @@
+//
+// CS1729TypeHasNoConstructorWithNArgumentsIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("CS1729: Class does not contain a 0 argument constructor",
+	                   Description = "CS1729: Class does not contain a 0 argument constructor",
+	                   Category = IssueCategories.CompilerErrors,
+	                   Severity = Severity.Error)]
+	public class CS1729TypeHasNoConstructorWithNArgumentsIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		private class GatherVisitor : GatherVisitorBase<CS1729TypeHasNoConstructorWithNArgumentsIssue>
+		{
+			IType currentType;
+			IType baseType;
+			
+			public GatherVisitor(BaseRefactoringContext context)
+				: base(context)
+			{
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration declaration)
+			{
+				IType outerType = currentType;
+				IType outerBaseType = baseType;
+				
+				var result = ctx.Resolve(declaration) as TypeResolveResult;
+				currentType = result != null ? result.Type : SpecialType.UnknownType;
+				baseType = currentType.DirectBaseTypes.FirstOrDefault(t => t.Kind != TypeKind.Interface) ?? SpecialType.UnknownType;
+				
+				base.VisitTypeDeclaration(declaration);
+				
+				if (currentType.Kind == TypeKind.Class && currentType.GetConstructors().All(ctor => ctor.IsSynthetic)) {
+					// current type only has the compiler-provided default ctor
+					if (!BaseTypeHasUsableParameterlessConstructor()) {
+						AddIssue(new CodeIssue(declaration.NameToken, GetIssueText(baseType)));
+					}
+				}
+				
+				currentType = outerType;
+				baseType = outerBaseType;
+			}
+
+			public override void VisitConstructorDeclaration(ConstructorDeclaration declaration)
+			{
+				base.VisitConstructorDeclaration(declaration);
+				
+				if (declaration.Initializer.IsNull && !declaration.HasModifier(Modifiers.Static)) {
+					// Check if parameterless ctor is available:
+					if (!BaseTypeHasUsableParameterlessConstructor()) {
+						AddIssue(new CodeIssue(declaration.NameToken, GetIssueText(baseType)));
+					}
+				}
+			}
+			
+			const OverloadResolutionErrors errorsIndicatingWrongNumberOfArguments =
+					OverloadResolutionErrors.MissingArgumentForRequiredParameter
+					| OverloadResolutionErrors.TooManyPositionalArguments
+					| OverloadResolutionErrors.Inaccessible;
+			
+			public override void VisitConstructorInitializer(ConstructorInitializer constructorInitializer)
+			{
+				base.VisitConstructorInitializer(constructorInitializer);
+				
+				// Check if existing initializer is valid:
+				var rr = ctx.Resolve(constructorInitializer) as CSharpInvocationResolveResult;
+				if (rr != null && (rr.OverloadResolutionErrors & errorsIndicatingWrongNumberOfArguments) != 0) {
+					IType targetType = constructorInitializer.ConstructorInitializerType == ConstructorInitializerType.Base ? baseType : currentType;
+					AddIssue(new CodeIssue(constructorInitializer.Keyword, GetIssueText(targetType, constructorInitializer.Arguments.Count)));
+				}
+			}
+			
+			public override void VisitObjectCreateExpression(ObjectCreateExpression objectCreateExpression)
+			{
+				base.VisitObjectCreateExpression(objectCreateExpression);
+				
+				var rr = ctx.Resolve(objectCreateExpression) as CSharpInvocationResolveResult;
+				if (rr != null && (rr.OverloadResolutionErrors & errorsIndicatingWrongNumberOfArguments) != 0) {
+					AddIssue(new CodeIssue(objectCreateExpression.Type, GetIssueText(rr.Type, objectCreateExpression.Arguments.Count)));
+				}
+			}
+			
+			bool BaseTypeHasUsableParameterlessConstructor()
+			{
+				var memberLookup = new MemberLookup(currentType.GetDefinition(), ctx.Compilation.MainAssembly);
+				OverloadResolution or = new OverloadResolution(ctx.Compilation, new ResolveResult[0]);
+				foreach (var ctor in baseType.GetConstructors()) {
+					if (memberLookup.IsAccessible(ctor, allowProtectedAccess: true)) {
+						if (or.AddCandidate(ctor) == OverloadResolutionErrors.None)
+							return true;
+					}
+				}
+				return false;
+			}
+			
+			string GetIssueText(IType targetType, int argumentCount = 0)
+			{
+				return string.Format(ctx.TranslateString("CS1729: The type '{0}' does not contain a constructor that takes '{1}' arguments"), targetType.Name, argumentCount);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ConstantConditionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ConstantConditionIssue.cs
new file mode 100644
index 0000000000..c6a901e186
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ConstantConditionIssue.cs
@@ -0,0 +1,149 @@
+// 
+// ConstantConditionIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Condition is always 'true' or always 'false'",
+		Description = "Condition is always 'true' or always 'false'.",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning)]
+	public class ConstantConditionIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ConstantConditionIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitConditionalExpression(ConditionalExpression conditionalExpression)
+			{
+				base.VisitConditionalExpression(conditionalExpression);
+
+				CheckCondition(conditionalExpression.Condition);
+			}
+
+			public override void VisitIfElseStatement(IfElseStatement ifElseStatement)
+			{
+				base.VisitIfElseStatement(ifElseStatement);
+
+				CheckCondition(ifElseStatement.Condition);
+			}
+
+			public override void VisitWhileStatement(WhileStatement whileStatement)
+			{
+				base.VisitWhileStatement(whileStatement);
+
+				CheckCondition(whileStatement.Condition);
+			}
+
+			public override void VisitDoWhileStatement(DoWhileStatement doWhileStatement)
+			{
+				base.VisitDoWhileStatement(doWhileStatement);
+
+				CheckCondition(doWhileStatement.Condition);
+			}
+
+			public override void VisitForStatement(ForStatement forStatement)
+			{
+				base.VisitForStatement(forStatement);
+
+				CheckCondition(forStatement.Condition);
+			}
+
+			void CheckCondition(Expression condition)
+			{
+				if (condition is PrimitiveExpression)
+					return;
+
+				var resolveResult = ctx.Resolve(condition);
+				if (!(resolveResult.IsCompileTimeConstant && resolveResult.ConstantValue is bool))
+					return;
+
+				var value = (bool)resolveResult.ConstantValue;
+				var conditionalExpr = condition.Parent as ConditionalExpression;
+				var ifElseStatement = condition.Parent as IfElseStatement;
+				var valueStr = value.ToString().ToLowerInvariant();
+
+				CodeAction action;
+				if (conditionalExpr != null) {
+					var replaceExpr = value ? conditionalExpr.TrueExpression : conditionalExpr.FalseExpression;
+					action = new CodeAction(
+						string.Format(ctx.TranslateString("Replace '?:' with '{0}' branch"), valueStr),
+						script => script.Replace(conditionalExpr, replaceExpr.Clone()),
+						condition);
+				} else if (ifElseStatement != null) {
+					action = new CodeAction(
+						string.Format(ctx.TranslateString("Replace 'if' with '{0}' branch"), valueStr),
+						script => {
+							var statement = value ? ifElseStatement.TrueStatement : ifElseStatement.FalseStatement;
+							var blockStatement = statement as BlockStatement;
+							if (statement.IsNull || (blockStatement != null && blockStatement.Statements.Count == 0)) {
+								script.Remove(ifElseStatement);
+								return;
+							}
+
+							TextLocation start, end;
+							if (blockStatement != null) {
+								start = blockStatement.Statements.FirstOrNullObject().StartLocation;
+								end = blockStatement.Statements.LastOrNullObject().EndLocation;
+							} else {
+								start = statement.StartLocation;
+								end = statement.EndLocation;
+							}
+							RemoveText(script, ifElseStatement.StartLocation, start);
+							RemoveText(script, end, ifElseStatement.EndLocation);
+							script.FormatText(ifElseStatement.Parent);
+						}, condition);
+				} else {
+					action = new CodeAction(
+						string.Format(ctx.TranslateString("Replace expression with '{0}'"), valueStr),
+						script => script.Replace(condition, new PrimitiveExpression(value)), 
+						condition
+					);
+				}
+				AddIssue(new CodeIssue(condition, string.Format(ctx.TranslateString("Condition is always '{0}'"), valueStr), 
+					new [] { action }));
+			}
+
+			void RemoveText(Script script, TextLocation start, TextLocation end)
+			{
+				var startOffset = script.GetCurrentOffset(start);
+				var endOffset = script.GetCurrentOffset(end);
+				if (startOffset < endOffset)
+					script.RemoveText(startOffset, endOffset - startOffset);
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/DisposeMethodInNonIDisposableTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/DisposeMethodInNonIDisposableTypeIssue.cs
new file mode 100644
index 0000000000..ca9690be50
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/DisposeMethodInNonIDisposableTypeIssue.cs
@@ -0,0 +1,214 @@
+// DisposeMethodInNonIDisposableTypeIssue.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+//
+// Copyright (c) 2013 Luís Reis
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Type does not implement IDisposable despite having a Dispose method",
+	                  Description="This type declares a method named Dispose, but it does not implement the System.IDisposable interface",
+	                  Category=IssueCategories.CodeQualityIssues,
+	                  Severity=Severity.Warning)]
+	public class DisposeMethodInNonIDisposableTypeIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		private class GatherVisitor : GatherVisitorBase<DisposeMethodInNonIDisposableTypeIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext context)
+				: base(context)
+			{
+			}
+
+			static bool IsDisposeMethod(MethodDeclaration methodDeclaration)
+			{
+				if (!methodDeclaration.PrivateImplementationType.IsNull) {
+					//Ignore explictly implemented methods
+					return false;
+				}
+				if (methodDeclaration.Name != "Dispose") {
+					return false;
+				}
+				if (methodDeclaration.Parameters.Count != 0) {
+					return false;
+				}
+
+				if (methodDeclaration.HasModifier(Modifiers.Static)) {
+					return false;
+				}
+
+				var primitiveType = methodDeclaration.ReturnType as PrimitiveType;
+				if (primitiveType == null || primitiveType.KnownTypeCode != KnownTypeCode.Void) {
+					return false;
+				}
+
+				return true;
+			}
+
+			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
+			{
+				if (typeDeclaration.ClassType == ClassType.Enum) {
+					//enums have no methods
+					return;
+				}
+
+				var resolve = ctx.Resolve(typeDeclaration) as TypeResolveResult;
+				if (resolve != null && Implements(resolve.Type, "System.IDisposable")) {
+					return;
+				}
+
+				base.VisitTypeDeclaration(typeDeclaration);
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				if (!IsDisposeMethod(methodDeclaration)) {
+					return;
+				}
+
+				var type = methodDeclaration.GetParent<TypeDeclaration>();
+				if (type == null) {
+					return;
+				}
+
+				AddIssue(new CodeIssue(methodDeclaration.NameToken,
+				         ctx.TranslateString("Type does not implement IDisposable despite having a Dispose method"),
+				         ctx.TranslateString("Implement IDisposable"),
+					script => Fix(script, methodDeclaration, type)));
+			}
+
+			static IEnumerable<MethodDeclaration> DisposeMethods(TypeDeclaration newTypeDeclaration)
+			{
+				return newTypeDeclaration.Members
+					.OfType<MethodDeclaration>()
+						.Where(IsDisposeMethod);
+			}
+
+			void Fix(Script script, MethodDeclaration methodDeclaration, TypeDeclaration typeDeclaration)
+			{
+				var newTypeDeclaration = (TypeDeclaration) typeDeclaration.Clone();
+
+				var resolver = ctx.GetResolverStateAfter(typeDeclaration.LBraceToken);
+
+				var typeResolve = resolver.ResolveSimpleName("IDisposable", new List<IType>()) as TypeResolveResult;
+				bool canShortenIDisposable = typeResolve != null && typeResolve.Type.FullName == "System.IDisposable";
+
+				string interfaceName = (canShortenIDisposable ? string.Empty : "System.") + "IDisposable";
+
+				newTypeDeclaration.BaseTypes.Add(new SimpleType(interfaceName));
+
+				foreach (var method in DisposeMethods(newTypeDeclaration).ToList()) {
+					if (typeDeclaration.ClassType == ClassType.Interface) {
+						method.Remove();
+					}
+					else {
+						method.Modifiers &= ~Modifiers.Private;
+						method.Modifiers &= ~Modifiers.Protected;
+						method.Modifiers &= ~Modifiers.Internal;
+						method.Modifiers |= Modifiers.Public;
+					}
+				}
+
+				if (typeDeclaration.ClassType == ClassType.Interface) {
+					var disposeMember = ((MemberResolveResult)ctx.Resolve(methodDeclaration)).Member;
+					script.DoGlobalOperationOn(new List<IEntity>() { disposeMember }, (nCtx, nScript, nodes) => {
+						List<Tuple<AstType, AstType>> pendingChanges = new List<Tuple<AstType, AstType>>();
+						foreach (var node in nodes)
+						{
+							var method = node as MethodDeclaration;
+							if (method != null && !method.PrivateImplementationType.IsNull) {
+								var nResolver = ctx.GetResolverStateAfter(typeDeclaration.LBraceToken);
+
+								var nTypeResolve = nResolver.ResolveSimpleName("IDisposable", new List<IType>()) as TypeResolveResult;
+								bool nCanShortenIDisposable = nTypeResolve != null && nTypeResolve.Type.FullName == "System.IDisposable";
+
+								string nInterfaceName = (nCanShortenIDisposable ? string.Empty : "System.") + "IDisposable";
+
+								pendingChanges.Add(Tuple.Create(method.PrivateImplementationType, AstType.Create(nInterfaceName)));
+							}
+						}
+
+						foreach (var change in pendingChanges) {
+							nScript.Replace(change.Item1, change.Item2);
+						}
+					}, "Fix explicitly implemented members");
+				}
+
+				script.Replace(typeDeclaration, newTypeDeclaration);
+			}
+
+			static bool Implements(IType type, string fullName)
+			{
+				return type.GetAllBaseTypes ().Any (baseType => baseType.FullName == fullName);
+			}
+
+			//Ignore entities that are not methods -- don't visit children
+			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
+			{
+			}
+
+			public override void VisitFixedFieldDeclaration(FixedFieldDeclaration fixedFieldDeclaration)
+			{
+			}
+
+			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
+			{
+			}
+
+			public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
+			{
+			}
+
+			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
+			{
+			}
+
+			public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
+			{
+			}
+
+			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
+			{
+			}
+
+			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
+			{
+			}
+
+			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
+			{
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/DontUseLinqWhenItsVerboseAndInefficientIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/DontUseLinqWhenItsVerboseAndInefficientIssue.cs
new file mode 100644
index 0000000000..6bb4499856
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/DontUseLinqWhenItsVerboseAndInefficientIssue.cs
@@ -0,0 +1,306 @@
+// DontUseLinqWhenItsVerboseAndInefficientIssue.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+//
+// Copyright (c) 2013 Luís Reis
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Use of Linq methods when there's a better alternative",
+	                  Description="Detects usage of Linq when there's a simpler and faster alternative",
+	                  Category=IssueCategories.CodeQualityIssues,
+	                  Severity=Severity.Warning)]
+	public class DontUseLinqWhenItsVerboseAndInefficientIssue : GatherVisitorCodeIssueProvider
+	{
+		class LinqMethod {
+			internal string FullName;
+			internal bool IsLast;
+			/// <summary>
+			/// Indicates that the method should be considered bad even when used alone.
+			/// </summary>
+			internal bool IsPoorStyleAlone;
+			/// <summary>
+			/// The number of parameters the definition has.
+			/// </summary>
+			internal int ParameterCount;
+		}
+
+		static readonly List<LinqMethod> LinqMethods = new List<LinqMethod> {
+			new LinqMethod { FullName = "System.Linq.Enumerable.First", IsLast = true, ParameterCount = 1, IsPoorStyleAlone = true },
+			new LinqMethod { FullName = "System.Linq.Enumerable.Last", IsLast = true, ParameterCount = 1 },
+			new LinqMethod { FullName = "System.Linq.Enumerable.ElementAt", IsLast = true, ParameterCount = 2, IsPoorStyleAlone = true },
+			new LinqMethod { FullName = "System.Linq.Enumerable.Count", IsLast = true, ParameterCount = 1, IsPoorStyleAlone = true },
+			new LinqMethod { FullName = "System.Linq.Enumerable.Any", IsLast = true, ParameterCount = 1 },
+			new LinqMethod { FullName = "System.Linq.Enumerable.Skip", ParameterCount = 2 },
+			//Take(n) is problematic -- it has a weird behavior if n > Count()
+			//new LinqMethod { FullName = "System.Linq.Enumerable.Take", ParameterCount = 2 },
+			new LinqMethod { FullName = "System.Linq.Enumerable.Reverse", ParameterCount = 1 }
+		};
+
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<DontUseLinqWhenItsVerboseAndInefficientIssue>
+		{
+			internal GatherVisitor(BaseRefactoringContext ctx) : base(ctx)
+			{
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				InvocationExpression outerInvocationExpression = invocationExpression;
+				//Note the invocations are in reverse order, so x.Foo().Bar() will have [0] be the Bar() and [1] be the Foo()
+				List<InvocationExpression> invocations = new List<InvocationExpression>();
+				LinqMethod outerMethod = null;
+				Expression target = null;
+
+				for (;;) {
+					var resolveResult = ctx.Resolve(invocationExpression) as MemberResolveResult;
+					if (resolveResult == null || !(resolveResult.Member is IMethod)) {
+						break;
+					}
+
+					var method = LinqMethods.FirstOrDefault(candidate => candidate.FullName == resolveResult.Member.FullName &&
+					                                        candidate.ParameterCount == ((IMethod) resolveResult.Member.MemberDefinition).Parameters.Count);
+					if (method == null || (invocations.Any() && method.IsLast)) {
+						break;
+					}
+
+					var mre = invocationExpression.Target as MemberReferenceExpression;
+					if (mre == null) {
+						break;
+					}
+
+					if (outerMethod == null) {
+						outerMethod = method;
+					}
+					invocations.Add(invocationExpression);
+
+					target = mre.Target;
+
+					var newInvocation = target as InvocationExpression;
+					if (newInvocation == null) {
+						break;
+					}
+
+					invocationExpression = newInvocation;
+				}
+
+				if (target == null) {
+					base.VisitInvocationExpression(invocationExpression);
+					return;
+				}
+				if (!outerMethod.IsPoorStyleAlone && invocations.Count == 1) {
+					base.VisitInvocationExpression(invocationExpression);
+					return;
+				}
+
+				var currentTypeDeclaration = outerInvocationExpression.GetParent<TypeDeclaration>();
+				var currentTypeResolveResult = ctx.Resolve(currentTypeDeclaration) as TypeResolveResult;
+				if (currentTypeResolveResult == null) {
+					base.VisitInvocationExpression(invocationExpression);
+					return;
+				}
+
+				var currentTypeDefinition = currentTypeResolveResult.Type.GetDefinition();
+
+				var targetResolveResult = ctx.Resolve(target);
+				if (!CanIndex(currentTypeDefinition, targetResolveResult)) {
+					base.VisitInvocationExpression(invocationExpression);
+					return;
+				}
+
+				string countPropertyName = GetCountProperty(currentTypeDefinition, targetResolveResult);
+
+				string lastInvocationName = ((MemberReferenceExpression)invocations[0].Target).MemberName;
+
+				bool endsReversed = invocations.Count(invocation => ((MemberReferenceExpression)invocation.Target).MemberName == "Reverse") % 2 != 0;
+				bool requiresCount = lastInvocationName == "Count" || lastInvocationName == "Any" ||
+					(endsReversed ? lastInvocationName == "First" || lastInvocationName == "ElementAt" : lastInvocationName == "Last");
+
+				if (countPropertyName == null && requiresCount) {
+					base.VisitInvocationExpression(invocationExpression);
+					return;
+				}
+
+				AddIssue(new CodeIssue(invocations.Last().LParToken.StartLocation,
+				                       invocations.First().RParToken.EndLocation,
+				                       ctx.TranslateString("Use of Linq method when there's a better alternative"),
+				                       ctx.TranslateString("Replace method by simpler version"),
+				                       script => {
+
+					Expression startOffset = null;
+					Expression endOffset = null;
+
+					bool reversed = false;
+					foreach (var invocation in invocations.AsEnumerable().Reverse()) {
+						string invocationName = ((MemberReferenceExpression)invocation.Target).MemberName;
+
+						switch(invocationName) {
+							case "Skip":
+								Expression offset = reversed ? endOffset : startOffset;
+								if (offset == null)
+									offset = invocation.Arguments.Last().Clone();
+								else
+									offset = new BinaryOperatorExpression(offset,
+									                                      BinaryOperatorType.Add,
+									                                      invocation.Arguments.Last().Clone());
+
+								if (reversed)
+									endOffset = offset;
+								else
+									startOffset = offset;
+
+								break;
+							case "Reverse":
+								reversed = !reversed;
+								break;
+							case "First":
+							case "ElementAt":
+							case "Last":
+							{
+								bool fromEnd = (invocationName == "Last") ^ reversed;
+								Expression index = invocationName == "ElementAt" ? invocation.Arguments.Last().Clone() : null;
+								Expression baseOffset = fromEnd ? endOffset : startOffset;
+								//Our indexWithOffset is baseOffset + index
+								//A baseOffset/index of null is considered "0".
+
+								Expression indexWithOffset = baseOffset == null ? index :
+									index == null ? baseOffset :
+										new BinaryOperatorExpression(baseOffset, BinaryOperatorType.Add, index);
+
+								Expression indexerExpression = indexWithOffset;
+								if (fromEnd) {
+									var endExpression = new BinaryOperatorExpression(new MemberReferenceExpression(target.Clone(), countPropertyName),
+									                                                 BinaryOperatorType.Subtract,
+									                                                 new PrimitiveExpression(1));
+									if (indexerExpression == null) {
+										indexerExpression = endExpression;
+									} else {
+										indexerExpression = new BinaryOperatorExpression(endExpression,
+										                                                 BinaryOperatorType.Subtract,
+										                                                 new ParenthesizedExpression(indexerExpression));
+									}
+								}
+
+								indexerExpression = indexerExpression ?? new PrimitiveExpression(0);
+
+								var newExpression = new IndexerExpression(target.Clone(),
+								                                          indexerExpression);
+
+								script.Replace(outerInvocationExpression, newExpression);
+								break;
+							}
+							case "Count":
+							case "Any":
+							{
+								Expression takenMembers;
+								if (startOffset == null) {
+									takenMembers = endOffset;
+								} else if (endOffset == null) {
+									takenMembers = startOffset;
+								} else {
+									takenMembers = new BinaryOperatorExpression(startOffset,
+									                                            BinaryOperatorType.Add,
+									                                            endOffset);
+								}
+
+								var countExpression = new MemberReferenceExpression(target.Clone(), countPropertyName);
+
+								Expression newExpression;
+								if (invocationName == "Count") {
+									if (takenMembers == null)
+										newExpression = countExpression;
+									else
+										newExpression = new BinaryOperatorExpression(countExpression,
+										                                             BinaryOperatorType.Subtract,
+										                                             new ParenthesizedExpression(takenMembers));
+								} else {
+									newExpression = new BinaryOperatorExpression(countExpression,
+									                                             BinaryOperatorType.GreaterThan,
+									                                             new ParenthesizedExpression(takenMembers));
+								}
+
+								script.Replace(outerInvocationExpression, newExpression);
+								break;
+							}
+						}
+					}
+				}));
+
+				base.VisitInvocationExpression(invocationExpression);
+			}
+
+			bool CanIndex(ITypeDefinition currentTypeDefinition, ResolveResult targetResolveResult)
+			{
+				var type = targetResolveResult.Type;
+				if (type is ArrayType) {
+					return true;
+				}
+
+				var memberLookup = new MemberLookup(currentTypeDefinition, ctx.Compilation.MainAssembly);
+				var indexers = memberLookup.LookupIndexers(type).ToList();
+
+				return indexers.SelectMany(methodList => methodList).Any(
+					member => ((IProperty)member).CanGet && ((IProperty)member).Getter.Parameters.Count == 1);
+			}
+
+			string GetCountProperty(ITypeDefinition currentTypeDefinition, ResolveResult targetResolveResult)
+			{
+				var memberLookup = new MemberLookup(currentTypeDefinition, ctx.Compilation.MainAssembly);
+
+				string countProperty = TryProperty(memberLookup, targetResolveResult, "Count");
+				if (countProperty != null) {
+					return countProperty;
+				}
+
+				return TryProperty(memberLookup, targetResolveResult, "Length");
+			}
+
+			string TryProperty(MemberLookup memberLookup, ResolveResult targetResolveResult, string name)
+			{
+				var countResolveResult = memberLookup.Lookup(targetResolveResult, name, EmptyList<IType>.Instance, false);
+				var countPropertyResolveResult = countResolveResult as MemberResolveResult;
+				if (countPropertyResolveResult == null) {
+					return null;
+				}
+
+				var property = countPropertyResolveResult.Member as IProperty;
+				if (property == null || !property.CanGet) {
+					return null;
+				}
+
+				return name;
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/DuplicatedLinqToListOrArrayIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/DuplicatedLinqToListOrArrayIssue.cs
new file mode 100644
index 0000000000..172f8dfa0c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/DuplicatedLinqToListOrArrayIssue.cs
@@ -0,0 +1,120 @@
+// 
+// DuplicatedLinqToListOrArrayIssue.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.PatternMatching;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Duplicated ToList() or ToArray() call",
+	                   Description = "Duplicated call to ToList() or ToArray()",
+	                   Category = IssueCategories.RedundanciesInCode,
+	                   Severity = Severity.Warning)]
+	public class DuplicatedLinqToListOrArrayIssue : GatherVisitorCodeIssueProvider
+	{
+		const string MemberTarget = "target";
+		const string MemberReference = "member-reference";
+
+		static readonly InvocationExpression NoArgumentPattern = new InvocationExpression {
+			Target = new MemberReferenceExpression {
+				Target = new AnyNode(MemberTarget),
+				MemberName = Pattern.AnyString
+			}.WithName(MemberReference)
+		};
+
+		static readonly string[] RelevantMethods = { "ToArray", "ToList" };
+
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<DuplicatedLinqToListOrArrayIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				int matches = 0;
+				Expression currentExpression = invocationExpression;
+				for (;;) {
+					var match = NoArgumentPattern.Match(WithoutParenthesis(currentExpression));
+					if (!match.Success) {
+						break;
+					}
+					if (!RelevantMethods.Contains(match.Get<MemberReferenceExpression>(MemberReference).Single().MemberName)) {
+						break;
+					}
+					++matches;
+					currentExpression = match.Get<Expression>(MemberTarget).Single();
+				}
+
+				if (matches >= 2) {
+					AddIssue(new CodeIssue(currentExpression.EndLocation,
+					         invocationExpression.EndLocation,
+					         ctx.TranslateString("Redundant Linq method invocations"),
+					         ctx.TranslateString("Remove redundant method invocations"),
+					         script => {
+
+						string lastInvocation = ((MemberReferenceExpression)invocationExpression.Target).MemberName;
+						var newMemberReference = new MemberReferenceExpression(currentExpression.Clone(),
+						                                                       lastInvocation);
+						var newInvocation = new InvocationExpression(newMemberReference);
+
+						script.Replace(invocationExpression, newInvocation);
+
+						}));
+				}
+
+				//Visit the children
+				//We need to make sure currentExpression != invocationExpression
+				//otherwise we get an infinite loop
+				var expressionToVisit = currentExpression == invocationExpression ?
+					invocationExpression.Target : currentExpression;
+				expressionToVisit.AcceptVisitor(this);
+			}
+
+			static Expression WithoutParenthesis(Expression expr) {
+				ParenthesizedExpression parenthesized;
+				while ((parenthesized = expr as ParenthesizedExpression) != null) {
+					expr = parenthesized.Expression;
+				}
+				return expr;
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ExceptionRethrowIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ExceptionRethrowIssue.cs
new file mode 100644
index 0000000000..bc366080c6
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ExceptionRethrowIssue.cs
@@ -0,0 +1,132 @@
+//
+// ExceptionRethrowIssue.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("A throw statement throws the caught exception by passing it explicitly",
+	                  Description = "Finds throws that throws the caught exception and therefore should be empty.",
+	                  Category = IssueCategories.CodeQualityIssues,
+	                  Severity = Severity.Warning,
+                      AnalysisDisableKeyword = "PossibleIntendedRethrow")]
+	public class ExceptionRethrowIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<ExceptionRethrowIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+			}
+			
+			public override void VisitCatchClause(CatchClause catchClause)
+			{
+				base.VisitCatchClause(catchClause);
+				var exceptionResolveResult = ctx.Resolve(catchClause.VariableNameToken) as LocalResolveResult;
+				if (exceptionResolveResult == null)
+					return;
+
+				var catchVisitor = new CatchClauseVisitor(ctx, exceptionResolveResult.Variable);
+				catchClause.Body.AcceptVisitor(catchVisitor);
+
+				foreach (var throwStatement in catchVisitor.OffendingThrows) {
+					var localThrowStatement = throwStatement;
+					var title = ctx.TranslateString("The exception is rethrown with explicit usage of the variable");
+					var action = new CodeAction(ctx.TranslateString("Change to 'throw;'"), script => {
+						script.Replace(localThrowStatement, new ThrowStatement());
+					}, catchClause);
+					AddIssue(new CodeIssue(localThrowStatement, title, action));
+				}
+			}
+		}
+		
+		class CatchClauseVisitor : DepthFirstAstVisitor
+		{
+			BaseRefactoringContext ctx;
+
+			IVariable parameter;
+
+			bool variableWritten = false;
+
+			public CatchClauseVisitor(BaseRefactoringContext context, IVariable parameter)
+			{
+				ctx = context;
+				this.parameter = parameter;
+				OffendingThrows = new List<ThrowStatement>();
+			}
+
+			public IList<ThrowStatement> OffendingThrows { get; private set; }
+
+			void HandlePotentialWrite (Expression expression)
+			{
+				var variableResolveResult = ctx.Resolve(expression) as LocalResolveResult;
+				if (variableResolveResult == null)
+					return;
+				variableWritten |= variableResolveResult.Equals(parameter);
+			}
+
+			public override void VisitAssignmentExpression(AssignmentExpression assignmentExpression)
+			{
+				base.VisitAssignmentExpression(assignmentExpression);
+
+				var variableResolveResult = ctx.Resolve(assignmentExpression.Left) as LocalResolveResult;
+				if (variableResolveResult == null)
+					return;
+				variableWritten |= variableResolveResult.Variable.Equals(parameter);
+			}
+
+			public override void VisitDirectionExpression(DirectionExpression directionExpression)
+			{
+				base.VisitDirectionExpression(directionExpression);
+
+				HandlePotentialWrite(directionExpression);
+			}
+
+			public override void VisitThrowStatement(ThrowStatement throwStatement)
+			{
+				base.VisitThrowStatement(throwStatement);
+
+				if (variableWritten)
+					return;
+
+				var argumentResolveResult = ctx.Resolve(throwStatement.Expression) as LocalResolveResult;
+				if (argumentResolveResult == null)
+					return;
+				if (parameter.Equals(argumentResolveResult.Variable))
+					OffendingThrows.Add(throwStatement);
+			}
+		}
+		
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ExplicitConversionInForEachIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ExplicitConversionInForEachIssue.cs
new file mode 100644
index 0000000000..a5608d0437
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ExplicitConversionInForEachIssue.cs
@@ -0,0 +1,77 @@
+// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Incorrect element type in foreach over generic collection",
+	                  Description= "Detects hidden explicit conversions in foreach loops.",
+	                  Category = IssueCategories.CodeQualityIssues,
+	                  Severity = Severity.Warning)]
+	public class ExplicitConversionInForEachIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ExplicitConversionInForEachIssue>
+		{
+			CSharpConversions conversions;
+			
+			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
+			{
+			}
+			
+			public override void VisitForeachStatement(ForeachStatement foreachStatement)
+			{
+				base.VisitForeachStatement(foreachStatement);
+				var rr = ctx.Resolve(foreachStatement) as ForEachResolveResult;
+				if (rr == null)
+					return;
+				if (rr.ElementType.Kind == TypeKind.Unknown)
+					return;
+				if (ReflectionHelper.GetTypeCode(rr.ElementType) == TypeCode.Object)
+					return;
+				if (conversions == null) {
+					conversions = CSharpConversions.Get(ctx.Compilation);
+				}
+				Conversion c = conversions.ImplicitConversion(rr.ElementType, rr.ElementVariable.Type);
+				if (c.IsValid)
+					return;
+				var csResolver = ctx.GetResolverStateBefore(foreachStatement);
+				var builder = new TypeSystemAstBuilder(csResolver);
+				AstType elementType = builder.ConvertType(rr.ElementType);
+				AstType variableType = foreachStatement.VariableType;
+				string issueText = ctx.TranslateString("Collection element type '{0}' is not implicitly convertible to '{1}'");
+				string fixText = ctx.TranslateString("Use type '{0}'");
+				AddIssue(new CodeIssue(variableType, string.Format(issueText, elementType.ToString(), variableType.ToString()),
+				         new CodeAction(
+								string.Format(fixText, elementType.ToString()),
+								script => script.Replace(variableType, elementType),
+						foreachStatement)));
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ExpressionIsNeverOfProvidedTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ExpressionIsNeverOfProvidedTypeIssue.cs
new file mode 100644
index 0000000000..e920c4fbdd
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ExpressionIsNeverOfProvidedTypeIssue.cs
@@ -0,0 +1,92 @@
+// 
+// ExpressionIsNeverOfProvidedTypeIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("CS0184:Given expression is never of the provided type",
+		Description = "CS0184:Given expression is never of the provided type.",
+		Category = IssueCategories.CompilerWarnings,
+		Severity = Severity.Warning)]
+	public class ExpressionIsNeverOfProvidedTypeIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<ExpressionIsNeverOfProvidedTypeIssue>
+		{
+			readonly CSharpConversions conversions;
+
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+				conversions = CSharpConversions.Get(ctx.Compilation);
+			}
+
+			public override void VisitIsExpression(IsExpression isExpression)
+			{
+				base.VisitIsExpression(isExpression);
+
+//				var conversions = CSharpConversions.Get(ctx.Compilation);
+				var exprType = ctx.Resolve(isExpression.Expression).Type;
+				var providedType = ctx.ResolveType(isExpression.Type);
+
+				if (exprType.Kind == TypeKind.Unknown || providedType.Kind == TypeKind.Unknown)
+					return;
+				if (IsValidReferenceOrBoxingConversion(exprType, providedType))
+					return;
+				
+				var exprTP = exprType as ITypeParameter;
+				var providedTP = providedType as ITypeParameter;
+				if (exprTP != null) {
+					if (IsValidReferenceOrBoxingConversion(exprTP.EffectiveBaseClass, providedType)
+					    && exprTP.EffectiveInterfaceSet.All(i => IsValidReferenceOrBoxingConversion(i, providedType)))
+						return;
+				}
+				if (providedTP != null) {
+					if (IsValidReferenceOrBoxingConversion(exprType, providedTP.EffectiveBaseClass))
+						return;
+				}
+				
+				AddIssue(new CodeIssue(isExpression, ctx.TranslateString("Given expression is never of the provided type")));
+			}
+
+			bool IsValidReferenceOrBoxingConversion(IType fromType, IType toType)
+			{
+				Conversion c = conversions.ExplicitConversion(fromType, toType);
+				return c.IsValid && (c.IsIdentityConversion || c.IsReferenceConversion || c.IsBoxingConversion || c.IsUnboxingConversion);
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/IncorrectCallToObjectGetHashCodeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/IncorrectCallToObjectGetHashCodeIssue.cs
new file mode 100644
index 0000000000..f56a3b935a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/IncorrectCallToObjectGetHashCodeIssue.cs
@@ -0,0 +1,79 @@
+//
+// IncorrectCallToObjectGetHashCodeIssue.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Call resolves to Object.GetHashCode, which is reference based",
+	                   Description = "Finds calls to Object.GetHashCode inside overridden GetHashCode.",
+	                   Category = IssueCategories.CodeQualityIssues,
+	                   Severity = Severity.Warning,
+                       AnalysisDisableKeyword = "BaseObjectGetHashCodeCallInGetHashCode")]
+	public class IncorrectCallToObjectGetHashCodeIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<IncorrectCallToObjectGetHashCodeIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				// Check that this declaration is a GetHashCode override, _then_ continue traversing
+
+				if (methodDeclaration.Name != "GetHashCode") {
+					return;
+				}
+				if (!methodDeclaration.Modifiers.HasFlag(Modifiers.Override)) {
+					return;
+				}
+
+				base.VisitMethodDeclaration(methodDeclaration);
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+
+				var resolveResult = ctx.Resolve(invocationExpression) as InvocationResolveResult;
+				if (resolveResult == null || !(resolveResult.TargetResult is ThisResolveResult) || resolveResult.Member.Name != "GetHashCode" ||
+				    !resolveResult.Member.DeclaringTypeDefinition.IsKnownType(KnownTypeCode.Object)) {
+					return;
+				}
+				AddIssue(new CodeIssue(invocationExpression, ctx.TranslateString("Call resolves to Object.GetHashCode, which is reference based")));
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/MethodOverloadHidesOptionalParameterIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/MethodOverloadHidesOptionalParameterIssue.cs
new file mode 100644
index 0000000000..1c7469a48a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/MethodOverloadHidesOptionalParameterIssue.cs
@@ -0,0 +1,85 @@
+// 
+// MethodOverloadHidesOptionalParameterIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Method with optional parameter is hidden by overload",
+		Description = "Method with optional parameter is hidden by overload",
+		Category = IssueCategories.CodeQualityIssues,
+		Severity = Severity.Warning,
+		AnalysisDisableKeyword = "MethodOverloadWithOptionalParameter")]
+	public class MethodOverloadHidesOptionalParameterIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<MethodOverloadHidesOptionalParameterIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				base.VisitMethodDeclaration(methodDeclaration);
+
+				var resolveResult = ctx.Resolve(methodDeclaration) as MemberResolveResult;
+				if (resolveResult == null)
+					return;
+				var method = resolveResult.Member as IMethod;
+				if (method == null)
+					return;
+
+				if (method.Parameters.Count == 0 || !method.Parameters.Last().IsOptional)
+					return;
+
+				var overloads = method.DeclaringType.GetMethods(m => m.Name == method.Name && m.TypeParameters.Count == method.TypeParameters.Count)
+					.ToArray();
+
+				var parameterNodes = methodDeclaration.Parameters.ToArray();
+				var parameters = new List<IParameter>();
+				for (int i = 0; i < method.Parameters.Count; i++) {
+					if (method.Parameters[i].IsOptional &&
+					    overloads.Any(m => ParameterListComparer.Instance.Equals(parameters, m.Parameters))) {
+						AddIssue(new CodeIssue(parameterNodes[i].StartLocation, parameterNodes.Last().EndLocation,
+							ctx.TranslateString("Method with optional parameter is hidden by overload")));
+						break;
+					}
+					parameters.Add(method.Parameters[i]);
+				}
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/OptionalParameterCouldBeSkippedIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/OptionalParameterCouldBeSkippedIssue.cs
new file mode 100644
index 0000000000..7599150e03
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/OptionalParameterCouldBeSkippedIssue.cs
@@ -0,0 +1,175 @@
+//
+// OptionalParameterCouldBeSkippedIssue.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using System;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Optional argument has default value and can be skipped",
+	                  Description = "Finds calls to functions where optional parameters are used and the passed argument is the same as the default.",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Hint)]
+	public class OptionalParameterCouldBeSkippedIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<OptionalParameterCouldBeSkippedIssue>
+		{
+			static readonly object removeAllRedundantArgumentsKey = new object ();
+
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+			}
+
+			public override void VisitObjectCreateExpression(ObjectCreateExpression objectCreateExpression)
+			{
+				base.VisitObjectCreateExpression(objectCreateExpression);
+				
+				CheckMethodCall(objectCreateExpression, objectCreateExpression.Arguments,
+				                (objectCreation, args) => new ObjectCreateExpression(objectCreation.Type.Clone(), args));
+			}
+
+			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+			{
+				base.VisitInvocationExpression(invocationExpression);
+				
+				CheckMethodCall(invocationExpression, invocationExpression.Arguments,
+				                (invocation, args) => new InvocationExpression(invocation.Target.Clone(), args));
+			}
+
+			void CheckMethodCall<T> (T node, IEnumerable<Expression> args, Func<T, IEnumerable<Expression>, T> generateReplacement) where T: AstNode
+			{
+				// The first two checks are unnecessary, but eliminates the majority of calls early,
+				// improving performance.
+				var arguments = args.ToArray();
+				if (arguments.Length == 0)
+					return;
+				var lastArg = arguments[arguments.Length - 1];
+				if (!(lastArg is PrimitiveExpression || lastArg is NamedArgumentExpression))
+					return;
+
+				var invocationResolveResult = ctx.Resolve(node) as CSharpInvocationResolveResult;
+				if (invocationResolveResult == null)
+					return;
+				
+				string actionMessage = ctx.TranslateString("Remove redundant arguments");
+				
+				var redundantArguments = GetRedundantArguments(arguments, invocationResolveResult);
+				var action = new CodeAction(actionMessage, script => {
+					var newArgumentList = arguments
+						.Where(arg => !redundantArguments.Contains(arg))
+						.Select(arg => arg.Clone());
+					var newInvocation = generateReplacement(node, newArgumentList);
+					script.Replace(node, newInvocation);
+				}, node, removeAllRedundantArgumentsKey);
+				var issueMessage = ctx.TranslateString("Argument is identical to the default value");
+				var lastPositionalArgument = redundantArguments.FirstOrDefault(expression => !(expression is NamedArgumentExpression));
+
+				foreach (var argument in redundantArguments) {
+					var localArgument = argument;
+					var actions = new List<CodeAction>();
+					actions.Add(action);
+
+					if (localArgument is NamedArgumentExpression || localArgument == lastPositionalArgument) {
+						var title = ctx.TranslateString("Remove this argument");
+						actions.Add(new CodeAction(title, script => {
+							var newArgumentList = arguments
+								.Where(arg => arg != localArgument)
+								.Select(arg => arg.Clone());
+							var newInvocation = generateReplacement(node, newArgumentList);
+							script.Replace(node, newInvocation);
+						}, node, null));
+					} else {
+						var title = ctx.TranslateString("Remove this and the following positional arguments");
+						actions.Add(new CodeAction(title, script => {
+							var newArgumentList = arguments
+								.Where(arg => arg.StartLocation < localArgument.StartLocation && !(arg is NamedArgumentExpression))
+								.Select(arg => arg.Clone());
+							var newInvocation = generateReplacement(node, newArgumentList);
+							script.Replace(node, newInvocation);
+						}, node, null));
+					}
+
+					AddIssue(new CodeIssue(localArgument, issueMessage, actions) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+
+			IList<Expression> GetRedundantArguments(Expression[] arguments, CSharpInvocationResolveResult invocationResolveResult)
+			{
+				var argumentToParameterMap = invocationResolveResult.GetArgumentToParameterMap();
+				var resolvedParameters = invocationResolveResult.Member.Parameters;
+
+				IList<Expression> redundantArguments = new List<Expression>();
+
+				for (int i = arguments.Length - 1; i >= 0; i--) {
+					var parameterIndex = argumentToParameterMap[i];
+					if (parameterIndex == -1)
+						// This particular parameter is an error, but keep trying the other ones
+						continue;
+					var parameter = resolvedParameters[parameterIndex];
+					var argument = arguments[i];
+					if (argument is PrimitiveExpression) {
+						if (parameter.IsParams)
+							// before positional params arguments all optional arguments are needed, otherwise some of the
+							// param arguments will be shifted out of the params into the fixed parameters
+							break;
+						if (!parameter.IsOptional)
+							// There can be no optional parameters preceding a required one
+							break;
+						var argumentResolveResult = ctx.Resolve(argument) as ConstantResolveResult;
+						if (argumentResolveResult == null || parameter.ConstantValue != argumentResolveResult.ConstantValue)
+							// Stop here since any arguments before this one has to be there
+							// to enable the passing of this argument
+							break;
+						redundantArguments.Add(argument);
+					} else if (argument is NamedArgumentExpression) {
+						var expression = ((NamedArgumentExpression)argument).Expression as PrimitiveExpression;
+						if (expression == null)
+							continue;
+						var expressionResolveResult = ctx.Resolve(expression) as ConstantResolveResult;
+						if (expressionResolveResult == null || parameter.ConstantValue != expressionResolveResult.ConstantValue)
+							// continue, since there can still be more arguments that are redundant
+							continue;
+						redundantArguments.Add(argument);
+					} else {
+						// This is a non-constant positional argument => no more redundancies are possible
+						break;
+					}
+				}
+				return redundantArguments;
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantAssignmentIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantAssignmentIssue.cs
new file mode 100644
index 0000000000..10a57cfa6f
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantAssignmentIssue.cs
@@ -0,0 +1,470 @@
+// 
+// RedundantAssignmentIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Redundant assignment",
+	                  Description = "Value assigned to a variable or parameter is not used in all execution path.",
+	                  Category = IssueCategories.CodeQualityIssues,
+	                  Severity = Severity.Warning)]
+	public class RedundantAssignmentIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			var unit = context.RootNode as SyntaxTree;
+			if (unit == null)
+				return null;
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantAssignmentIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			public override void VisitParameterDeclaration(ParameterDeclaration parameterDeclaration)
+			{
+				base.VisitParameterDeclaration(parameterDeclaration);
+				if (parameterDeclaration.ParameterModifier == ParameterModifier.Out ||
+					parameterDeclaration.ParameterModifier == ParameterModifier.Ref)
+					return;
+
+				var resolveResult = ctx.Resolve(parameterDeclaration) as LocalResolveResult;
+				BlockStatement rootStatement = null;
+				if (parameterDeclaration.Parent is MethodDeclaration) {
+					rootStatement = ((MethodDeclaration)parameterDeclaration.Parent).Body;
+				} else if (parameterDeclaration.Parent is AnonymousMethodExpression) {
+					rootStatement = ((AnonymousMethodExpression)parameterDeclaration.Parent).Body;
+				} else if (parameterDeclaration.Parent is LambdaExpression) {
+					rootStatement = ((LambdaExpression)parameterDeclaration.Parent).Body as BlockStatement;
+				}
+				CollectIssues(parameterDeclaration, rootStatement, resolveResult);
+			}
+
+			public override void VisitVariableInitializer(VariableInitializer variableInitializer)
+			{
+				base.VisitVariableInitializer(variableInitializer);
+				if (!inUsingStatementResourceAcquisition) {
+					var resolveResult = ctx.Resolve(variableInitializer) as LocalResolveResult;
+					CollectIssues(variableInitializer, variableInitializer.GetParent<BlockStatement>(), resolveResult);
+				}
+			}
+
+			bool inUsingStatementResourceAcquisition;
+
+			public override void VisitUsingStatement(UsingStatement usingStatement)
+			{
+				inUsingStatementResourceAcquisition = true;
+				usingStatement.ResourceAcquisition.AcceptVisitor(this);
+				inUsingStatementResourceAcquisition = false;
+				usingStatement.EmbeddedStatement.AcceptVisitor(this);
+			}
+
+			void CollectIssues(AstNode variableDecl, BlockStatement rootStatement, LocalResolveResult resolveResult)
+			{
+				if (rootStatement == null || resolveResult == null)
+					return;
+
+				var references = new HashSet<AstNode>();
+				var refStatements = new HashSet<Statement>();
+				var usedInLambda = false;
+				var results = ctx.FindReferences(rootStatement, resolveResult.Variable);
+				foreach (var result in results) {
+					var node = result.Node;
+					if (node == variableDecl)
+						continue;
+
+					var parent = node.Parent;
+					while (!(parent == null || parent is Statement || parent is LambdaExpression || parent is QueryExpression))
+						parent = parent.Parent;
+					if (parent == null)
+						continue;
+
+					var statement = parent as Statement;
+					if (statement != null) {
+						references.Add(node);
+						refStatements.Add(statement);
+					}
+
+					while (parent != null && parent != rootStatement) {
+						if (parent is LambdaExpression || parent is AnonymousMethodExpression || parent is QueryExpression) {
+							usedInLambda = true;
+							break;
+						}
+						parent = parent.Parent;
+					}
+					if (usedInLambda) {
+						break;
+					}
+				}
+
+				// stop analyzing if the variable is used in any lambda expression or anonymous method
+				if (usedInLambda)
+					return;
+
+				var startNode = new VariableReferenceGraphBuilder(ctx).Build(rootStatement, references, refStatements, ctx);
+				var variableInitializer = variableDecl as VariableInitializer;
+				if (variableInitializer != null && !variableInitializer.Initializer.IsNull)
+					startNode.References.Insert(0, variableInitializer);
+
+				ProcessNodes(startNode);
+			}
+
+			class SearchInvocationsVisitor : DepthFirstAstVisitor
+			{
+				bool foundInvocations;
+
+				public bool ContainsInvocations(AstNode node)
+				{
+					foundInvocations = false;
+					node.AcceptVisitor(this);
+					return foundInvocations;
+				}
+
+				protected override void VisitChildren(AstNode node)
+				{
+					AstNode next;
+					for (var child = node.FirstChild; child != null && !foundInvocations; child = next) {
+						next = child.NextSibling;
+						child.AcceptVisitor(this);
+					}
+				}
+
+				public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+				{
+					foundInvocations = true;
+				}
+			}
+
+			private class SearchRefOrOutVisitor : DepthFirstAstVisitor
+			{
+				private bool foundInvocations;
+				private string _varName;
+
+				public bool ContainsRefOrOut(VariableInitializer variableInitializer)
+				{
+					var node = variableInitializer.Parent.Parent;
+					foundInvocations = false;
+					_varName = variableInitializer.Name;
+					node.AcceptVisitor(this);
+					return foundInvocations;
+				}
+
+				protected override void VisitChildren(AstNode node)
+				{
+					AstNode next;
+					for (var child = node.FirstChild; child != null && !foundInvocations; child = next) {
+						next = child.NextSibling;
+						child.AcceptVisitor(this);
+					}
+				}
+
+				public override void VisitInvocationExpression(InvocationExpression methodDeclaration)
+				{
+					if (foundInvocations)
+						return;
+					if (methodDeclaration.Arguments.Count == 0)
+						return;
+					foreach (var argument in methodDeclaration.Arguments) {
+						var directionExpression = argument as DirectionExpression;
+						if (directionExpression == null)
+							continue;
+
+						if (directionExpression.FieldDirection != FieldDirection.Out && directionExpression.FieldDirection != FieldDirection.Ref)
+							continue;
+						var idExpression = (directionExpression.Expression) as IdentifierExpression;
+						if (idExpression == null)
+							continue;
+						foundInvocations = (idExpression.Identifier == _varName);
+
+						foundInvocations = true;
+					}
+				}
+			}
+
+			class SearchAssignmentForVarVisitor : DepthFirstAstVisitor
+			{
+				bool _foundInvocations;
+				private VariableInitializer _variableInitializer;
+
+				public bool ContainsLaterAssignments(VariableInitializer variableInitializer)
+				{
+					_foundInvocations = false;
+					_variableInitializer = variableInitializer;
+					variableInitializer.Parent.Parent.AcceptVisitor(this);
+					return _foundInvocations;
+				}
+
+				protected override void VisitChildren(AstNode node)
+				{
+					AstNode next;
+					for (var child = node.FirstChild; child != null && !_foundInvocations; child = next) {
+						next = child.NextSibling;
+						child.AcceptVisitor(this);
+					}
+				}
+
+				public override void VisitAssignmentExpression(AssignmentExpression assignmentExpression)
+				{
+					if (_foundInvocations)
+						return;
+					base.VisitAssignmentExpression(assignmentExpression);
+					if (assignmentExpression.Left.ToString() == _variableInitializer.Name
+						&& assignmentExpression.StartLocation > _variableInitializer.StartLocation) {
+						_foundInvocations = true;
+					}
+				}
+			}
+
+			void AddIssue(AstNode node)
+			{
+				var issueDescription = ctx.TranslateString("Assignment is redundant");
+				var actionDescription = ctx.TranslateString("Remove redundant assignment");
+
+				var variableInitializer = node as VariableInitializer;
+				if (variableInitializer != null) {
+					var containsInvocations =
+						new SearchInvocationsVisitor().ContainsInvocations(variableInitializer.Initializer);
+
+					var varDecl = node.Parent as VariableDeclarationStatement;
+
+					var isDeclareStatement = varDecl != null;
+					var isUsingVar = isDeclareStatement && varDecl.Type.IsVar();
+
+					var expressionType = ctx.Resolve(node).Type;
+
+					var containsLaterAssignments = false;
+					if (isDeclareStatement) {
+						//if it is used later, the redundant removal should remove the assignment 
+						//but not the variable
+						containsLaterAssignments = 
+							new SearchAssignmentForVarVisitor().ContainsLaterAssignments(variableInitializer);
+					}
+
+					AstNode grayOutNode;
+					var containsRefOrOut = new SearchRefOrOutVisitor().ContainsRefOrOut(variableInitializer);
+					if (containsInvocations && isDeclareStatement) {
+						grayOutNode = variableInitializer.AssignToken;
+					} else {
+						if (isDeclareStatement && !containsRefOrOut && !containsLaterAssignments) {
+							grayOutNode = variableInitializer.Parent;
+						} else {
+							grayOutNode = variableInitializer.Initializer;
+						}
+					}
+
+					AddIssue(new CodeIssue(grayOutNode, issueDescription, actionDescription, script => {
+						var variableNode = (VariableInitializer)node;
+						if (containsInvocations && isDeclareStatement) {
+							//add the column ';' that will be removed after the next line replacement
+							var expression = (Statement)variableNode.Initializer.Clone();
+							if (containsLaterAssignments && varDecl != null) {
+								var clonedDefinition = (VariableDeclarationStatement)varDecl.Clone();
+
+								var shortExpressionType = CreateShortType(ctx, expressionType, node);
+								clonedDefinition.Type = shortExpressionType;
+								var variableNodeClone = clonedDefinition.GetVariable(variableNode.Name);
+								variableNodeClone.Initializer = null;
+								script.InsertBefore(node.Parent, clonedDefinition);
+							}
+							script.Replace(node.Parent, expression);
+							return;
+						}
+						if (isDeclareStatement && !containsRefOrOut && !containsLaterAssignments) {
+							script.Remove(node.Parent);
+							return;
+						}
+						var replacement = (VariableInitializer)variableNode.Clone();
+						replacement.Initializer = Expression.Null;
+						if (isUsingVar) {
+							var shortExpressionType = CreateShortType(ctx, expressionType, node);
+							script.Replace(varDecl.Type, shortExpressionType);
+						}
+						script.Replace(node, replacement);
+					}) { IssueMarker = IssueMarker.GrayOut });
+				}
+
+				var assignmentExpr = node.Parent as AssignmentExpression;
+				if (assignmentExpr == null)
+					return;
+				if (assignmentExpr.Parent is ExpressionStatement) {
+					AddIssue(new CodeIssue(assignmentExpr.Parent, issueDescription, actionDescription, script => script.Remove(assignmentExpr.Parent)) { IssueMarker = IssueMarker.GrayOut });
+				} else {
+					AddIssue(new CodeIssue(assignmentExpr.Left.StartLocation, assignmentExpr.OperatorToken.EndLocation, issueDescription, actionDescription,
+						script => script.Replace(assignmentExpr, assignmentExpr.Right.Clone())) { IssueMarker = IssueMarker.GrayOut });
+				}
+			}
+
+			private static AstType CreateShortType(BaseRefactoringContext refactoringContext, IType expressionType, AstNode node)
+			{
+
+				var csResolver = refactoringContext.Resolver.GetResolverStateBefore(node);
+				var builder = new TypeSystemAstBuilder(csResolver);
+				return builder.ConvertType(expressionType);
+			}
+
+			static bool IsAssignment(AstNode node)
+			{
+				if (node is VariableInitializer)
+					return true;
+
+				var assignmentExpr = node.Parent as AssignmentExpression;
+				if (assignmentExpr != null)
+					return assignmentExpr.Left == node && assignmentExpr.Operator == AssignmentOperatorType.Assign;
+
+				var direction = node.Parent as DirectionExpression;
+				if (direction != null)
+					return direction.FieldDirection == FieldDirection.Out && direction.Expression == node;
+
+				return false;
+			}
+
+			static bool IsInsideTryOrCatchBlock(AstNode node)
+			{
+				var tryCatchStatement = node.GetParent<TryCatchStatement>();
+				if (tryCatchStatement != null) {
+					if (tryCatchStatement.TryBlock.Contains(node.StartLocation))
+						return true;
+					foreach (var catchBlock in tryCatchStatement.CatchClauses)
+						if (catchBlock.Body.Contains(node.StartLocation))
+							return true;
+				}
+				return false;
+			}
+
+			enum NodeState
+			{
+				None,
+				UsageReachable,
+				UsageUnreachable,
+				Processing,
+			}
+
+			void ProcessNodes(VariableReferenceNode startNode)
+			{
+				// node state of a node indicates whether it is possible for an upstream node to reach any usage via
+				// the node
+				var nodeStates = new Dictionary<VariableReferenceNode, NodeState>();
+				var assignments = new List<VariableReferenceNode>();
+
+				// dfs to preprocess all nodes and find nodes which end with assignment
+				var stack = new Stack<VariableReferenceNode>();
+				stack.Push(startNode);
+				while (stack.Count > 0) {
+					var node = stack.Pop();
+					if (node == null)
+						continue;
+					if (node.References.Count > 0) {
+						nodeStates [node] = IsAssignment(node.References [0]) ?
+							NodeState.UsageUnreachable : NodeState.UsageReachable;
+					} else {
+						nodeStates [node] = NodeState.None;
+					}
+
+					// find indices of all assignments in node.References
+					var assignmentIndices = new List<int>();
+					for (int i = 0; i < node.References.Count; i++) {
+						if (IsAssignment(node.References [i]))
+							assignmentIndices.Add(i);
+					}
+					// for two consecutive assignments, the first one is redundant
+					for (int i = 0; i < assignmentIndices.Count - 1; i++) {
+						var index1 = assignmentIndices [i];
+						var index2 = assignmentIndices [i + 1];
+						if (index1 + 1 == index2)
+							AddIssue(node.References [index1]);
+					}
+					// if the node ends with an assignment, add it to assignments so as to check if it is redundant
+					// later
+					if (assignmentIndices.Count > 0 &&
+						assignmentIndices [assignmentIndices.Count - 1] == node.References.Count - 1)
+						assignments.Add(node);
+
+					foreach (var nextNode in node.NextNodes) {
+						if (!nodeStates.ContainsKey(nextNode))
+							stack.Push(nextNode);
+					}
+				}
+
+				foreach (var node in assignments) {
+					// we do not analyze an assignment inside a try block as it can jump to any catch block or finally block
+					if (IsInsideTryOrCatchBlock(node.References [0]))
+						continue;
+					ProcessNode(node, true, nodeStates);
+				}
+			}
+
+			void ProcessNode(VariableReferenceNode node, bool addIssue,
+			                 IDictionary<VariableReferenceNode, NodeState> nodeStates)
+			{
+				if (nodeStates [node] == NodeState.None)
+					nodeStates [node] = NodeState.Processing;
+
+				bool? reachable = false;
+				foreach (var nextNode in node.NextNodes) {
+					if (nodeStates [nextNode] == NodeState.None)
+						ProcessNode(nextNode, false, nodeStates);
+
+					if (nodeStates [nextNode] == NodeState.UsageReachable) {
+						reachable = true;
+						break;
+					}
+					// downstream nodes are not fully processed (e.g. due to loop), there is no enough info to
+					// determine the node state
+					if (nodeStates [nextNode] != NodeState.UsageUnreachable)
+						reachable = null;
+				}
+
+				// add issue if it is not possible to reach any usage via NextNodes
+				if (addIssue && reachable == false)
+					AddIssue(node.References [node.References.Count - 1]);
+
+				if (nodeStates [node] != NodeState.Processing)
+					return;
+
+				switch (reachable) {
+					case null:
+						nodeStates [node] = NodeState.None;
+						break;
+					case true:
+						nodeStates [node] = NodeState.UsageReachable;
+						break;
+					case false:
+						nodeStates [node] = NodeState.UsageUnreachable;
+						break;
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantBlockInDifferentBranchesIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantBlockInDifferentBranchesIssue.cs
new file mode 100644
index 0000000000..e1e3f0fb06
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantBlockInDifferentBranchesIssue.cs
@@ -0,0 +1,106 @@
+// RedundantBlockInDifferentBranchesIssue.cs
+//
+// Author:
+//      Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("RedundantBlockInDifferentBranches",
+	                  Description = "Blocks in if/else can be simplified to any of the branches if they have the same block.",
+	                  Category = IssueCategories.RedundanciesInCode,
+	                  Severity = Severity.Hint,
+	                  AnalysisDisableKeyword = "RedundantBlockInDifferentBranches")]
+	public class RedundantBlockInDifferentBranchesIssue : GatherVisitorCodeIssueProvider
+	{
+		
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context, this);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<RedundantBlockInDifferentBranchesIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx, RedundantBlockInDifferentBranchesIssue issueProvider) : base (ctx, issueProvider)
+			{
+			}
+			
+			static readonly AstNode pattern = new Choice{
+				new IfElseStatement(
+					new AnyNode("c"), 
+					new AnyNode("s"), 
+					new BlockStatement{new Backreference("s")}),
+				new IfElseStatement(
+					new AnyNode("c"), 
+					new AnyNode("s"), 
+					new Backreference("s")),
+				new IfElseStatement(
+					new AnyNode("c"), 
+					new BlockStatement{new AnyNode("s")}, 
+					new Backreference("s"))
+			};
+
+			bool IsSafeExpression(Expression expression, BaseRefactoringContext context)
+			{
+				var components = expression.DescendantsAndSelf;
+				foreach (var c in components) {
+					if (c is AssignmentExpression)
+						return false;
+					else if (c is UnaryOperatorExpression) {
+						var ope = ((UnaryOperatorExpression)c).Operator;
+						if (ope == UnaryOperatorType.Decrement || ope == UnaryOperatorType.Increment 
+							|| ope == UnaryOperatorType.PostDecrement || ope == UnaryOperatorType.PostIncrement)
+							return false;
+					} else if (c is IdentifierExpression) {
+						var result = context.Resolve(c);
+						if (result.IsError)
+							return false;
+						if (!(result is LocalResolveResult))
+							return false;
+						if ((((LocalResolveResult)result).IsParameter))
+							return false;
+					}
+				}
+				return true;
+			}
+
+			public override void VisitIfElseStatement(IfElseStatement ifElseStatement)
+			{
+				base.VisitIfElseStatement(ifElseStatement);
+				var m = pattern.Match(ifElseStatement);
+				
+				if (!m.Success)
+					return;
+
+				if (!IsSafeExpression(ifElseStatement.Condition, ctx))
+					return;
+			
+				AddIssue(new CodeIssue(ifElseStatement.ElseToken, ctx.TranslateString("Blocks in if/else or switch branches can be simplified to any of the branches if they have the same block."))
+				{ IssueMarker = IssueMarker.WavedLine });
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantNotNullAttributeInNonNullableTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantNotNullAttributeInNonNullableTypeIssue.cs
new file mode 100644
index 0000000000..33d0a9b63f
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantNotNullAttributeInNonNullableTypeIssue.cs
@@ -0,0 +1,101 @@
+//
+// RedundantNotNullAttributeInNonNullableTypeIssue.cs
+//
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+using System;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Use of NotNullAttribute in non-nullable type is redundant.",
+		Description = "Detects unnecessary usages of the NotNullAttribute.",
+		Category = IssueCategories.RedundanciesInDeclarations,
+		Severity = Severity.Warning)]
+	public class RedundantNotNullAttributeInNonNullableTypeIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<RedundantNotNullAttributeInNonNullableTypeIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext context) : base(context)
+			{
+			}
+
+			public override void VisitBlockStatement(BlockStatement blockStatement)
+			{
+				// This is just here to prevent the visitor from unnecessarily visiting the children.
+			}
+
+			public override void VisitAttribute(Attribute attribute)
+			{
+				var attributeType = ctx.Resolve(attribute).Type;
+				if (attributeType.FullName == AnnotationNames.NotNullAttribute) {
+					if (IsAttributeRedundant(attribute)) {
+						AddIssue(new CodeIssue(attribute,
+							ctx.TranslateString("NotNullAttribute is not needed for non-nullable types"),
+							ctx.TranslateString("Remove redundant NotNullAttribute"),
+							script => script.RemoveAttribute(attribute)));
+					}
+				}
+			}
+
+			bool IsAttributeRedundant(Attribute attribute)
+			{
+				var section = attribute.GetParent<AttributeSection>();
+				var targetDeclaration = section.Parent;
+
+				if (targetDeclaration is FixedFieldDeclaration) {
+					//Fixed fields are never null
+					return true;
+				}
+
+				var fieldDeclaration = targetDeclaration as FieldDeclaration;
+				if (fieldDeclaration != null) {
+					return fieldDeclaration.Variables.All(variable => NullableType.IsNonNullableValueType(ctx.Resolve(variable).Type));
+				}
+
+				var resolveResult = ctx.Resolve(targetDeclaration);
+				var memberResolveResult = resolveResult as MemberResolveResult;
+				if (memberResolveResult != null) {
+					return NullableType.IsNonNullableValueType(memberResolveResult.Member.ReturnType);
+				}
+				var localResolveResult = resolveResult as LocalResolveResult;
+				if (localResolveResult != null) {
+					return NullableType.IsNonNullableValueType(localResolveResult.Type);
+				}
+
+				return false;
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ResultOfAsyncCallShouldNotBeIgnoredIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ResultOfAsyncCallShouldNotBeIgnoredIssue.cs
new file mode 100644
index 0000000000..957178e806
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ResultOfAsyncCallShouldNotBeIgnoredIssue.cs
@@ -0,0 +1,68 @@
+// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Result of async call is ignored",
+	                  Description = "Warns when the task returned by an async call is ignored, which causes exceptions" +
+	                  " thrown by the call to be silently ignored.",
+	                  Category = IssueCategories.CodeQualityIssues,
+	                  Severity = Severity.Warning)]
+	public class ResultOfAsyncCallShouldNotBeIgnoredIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		sealed class GatherVisitor : GatherVisitorBase<ResultOfAsyncCallShouldNotBeIgnoredIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+			}
+
+			AstNode GetNodeToUnderline(Expression target)
+			{
+				if (target is IdentifierExpression)
+					return target;
+				if (target is MemberReferenceExpression)
+					return ((MemberReferenceExpression)target).MemberNameToken;
+				return target;
+			}
+			
+			public override void VisitExpressionStatement(ExpressionStatement expressionStatement)
+			{
+				base.VisitExpressionStatement(expressionStatement);
+				var invocation = expressionStatement.Expression as InvocationExpression;
+				if (invocation == null)
+					return;
+				var rr = ctx.Resolve(invocation) as InvocationResolveResult;
+				if (rr != null && (rr.Type.IsKnownType(KnownTypeCode.Task) || rr.Type.IsKnownType(KnownTypeCode.TaskOfT))) {
+					AddIssue(new CodeIssue(GetNodeToUnderline (invocation.Target), ctx.TranslateString("Exceptions in async call will be silently ignored because the returned task is unused")));
+				}
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/SameGuardConditionExpressionInIfelseBranchesIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/SameGuardConditionExpressionInIfelseBranchesIssue.cs
new file mode 100644
index 0000000000..85192da445
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/SameGuardConditionExpressionInIfelseBranchesIssue.cs
@@ -0,0 +1,101 @@
+//
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+//
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Same guard condition expression in different if else branch",
+	                  Description = "A warning should be given for the case: if (condition) {…} else if (condition) {…}.",
+	                  Category = IssueCategories.Notifications,
+	                  Severity = Severity.Warning)]
+	public class SameGuardConditionExpressionInIfelseBranchesIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<SameGuardConditionExpressionInIfelseBranchesIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext context) : base (context)
+			{
+			}
+
+			bool IsSafeExpression(Expression expression, BaseRefactoringContext context)
+			{
+				var components = expression.DescendantsAndSelf;
+				foreach (var c in components) {
+					if (c is AssignmentExpression)
+						return false;
+					else if (c is UnaryOperatorExpression) {
+						var ope = ((UnaryOperatorExpression)c).Operator;
+						if (ope == UnaryOperatorType.Decrement || ope == UnaryOperatorType.Increment 
+							|| ope == UnaryOperatorType.PostDecrement || ope == UnaryOperatorType.PostIncrement)
+							return false;
+					} else if (c is IdentifierExpression) {
+						var result = context.Resolve(c);
+						if (result.IsError)
+							return false;
+						if (!(result is LocalResolveResult))
+							return false;
+						if ((((LocalResolveResult)result).IsParameter))
+							return false;
+					}
+				}
+				return true;
+			}
+
+			public override void VisitIfElseStatement(IfElseStatement ifElseStatement)
+			{
+				base.VisitIfElseStatement(ifElseStatement);
+				
+				HashSet<string> conditions = new HashSet<string>();
+				conditions.Add(ifElseStatement.Condition.ToString());
+				var temp = ifElseStatement.FalseStatement;
+				AstNode redundantCondition = null;
+				while (temp is IfElseStatement) {
+					var tempCondition = ((IfElseStatement)temp).Condition;
+					if (conditions.Contains(tempCondition.ToString())) {
+						if (IsSafeExpression(tempCondition, ctx)) {
+							redundantCondition = tempCondition;
+							break;
+						}
+					}
+					conditions.Add(tempCondition.ToString());
+					temp = ((IfElseStatement)temp).FalseStatement;
+				}
+				
+				if (redundantCondition == null)
+					return;
+				
+				AddIssue(new CodeIssue(redundantCondition, ctx.TranslateString("Found duplicate condition")));
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UnmatchedSizeSpecificationInArrayCreationIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UnmatchedSizeSpecificationInArrayCreationIssue.cs
new file mode 100644
index 0000000000..c041cede50
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UnmatchedSizeSpecificationInArrayCreationIssue.cs
@@ -0,0 +1,87 @@
+// 
+// UnmatchedSizeSpecificationInArrayCreationIssue.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// When array initializer has the different number of elements as specified in size creation, it is an error.
+	/// </summary>
+	[IssueDescription("Correct size specification in array creation",
+	                  Description= "When array initializer has the different number of elements as specified in size creation, it is an error.",
+	                  Category = IssueCategories.CompilerErrors,
+	                  Severity = Severity.Error,
+	                  AnalysisDisableKeyword = "UnmatchedSizeSpecificationInArrayCreation")]
+	public class UnmatchedSizeSpecificationInArrayCreationIssue : GatherVisitorCodeIssueProvider
+	{	
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+		
+		class GatherVisitor : GatherVisitorBase<UnmatchedSizeSpecificationInArrayCreationIssue>
+		{
+			public GatherVisitor (BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+			
+			public override void VisitArrayCreateExpression(ArrayCreateExpression arrayCreateExpression)
+			{
+				base.VisitArrayCreateExpression(arrayCreateExpression);
+				
+				if (arrayCreateExpression == null)
+					return;
+				if (arrayCreateExpression.Arguments == null || !arrayCreateExpression.Arguments.Any()) {
+					return;
+				}
+				
+				var argument = arrayCreateExpression.Arguments.FirstOrNullObject();
+				if (argument == null || !(argument is PrimitiveExpression))
+					return;
+				
+				int arraySize = (Int32)((PrimitiveExpression)argument).Value;
+				
+				if (arraySize < 1)
+					return;
+				
+				var initializer = arrayCreateExpression.Initializer;
+				if (initializer.IsNull)
+					return;
+				
+				if (arraySize != initializer.Elements.Count) {
+					AddIssue(new CodeIssue(argument, ctx.TranslateString("Unmatched size specification with array initializer"), ctx.TranslateString("Correct array size specification"), script => {
+						var newArgument = new PrimitiveExpression(initializer.Elements.Count);
+						script.Replace(argument, newArgument);}));
+				}
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UnreachableCodeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UnreachableCodeIssue.cs
new file mode 100644
index 0000000000..75817fdb42
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UnreachableCodeIssue.cs
@@ -0,0 +1,217 @@
+// 
+// UnreachableCodeIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Code is unreachable",
+		Description = "Code is unreachable.",
+		Category = IssueCategories.RedundanciesInCode,
+		Severity = Severity.Warning)]
+	public class UnreachableCodeIssue : GatherVisitorCodeIssueProvider
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<UnreachableCodeIssue>
+		{
+			HashSet<AstNode> unreachableNodes;
+
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base(ctx)
+			{
+				unreachableNodes = new HashSet<AstNode>();
+			}
+
+			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+			{
+				StatementIssueCollector.Collect(this, methodDeclaration.Body);
+
+				base.VisitMethodDeclaration(methodDeclaration);
+			}
+
+			public override void VisitLambdaExpression(LambdaExpression lambdaExpression)
+			{
+				var blockStatement = lambdaExpression.Body as BlockStatement;
+				if (blockStatement != null)
+					StatementIssueCollector.Collect(this, blockStatement);
+
+				base.VisitLambdaExpression(lambdaExpression);
+			}
+
+			public override void VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression)
+			{
+				StatementIssueCollector.Collect(this, anonymousMethodExpression.Body);
+
+				base.VisitAnonymousMethodExpression(anonymousMethodExpression);
+			}
+
+			public override void VisitConditionalExpression(ConditionalExpression conditionalExpression)
+			{
+				var resolveResult = ctx.Resolve(conditionalExpression.Condition);
+				if (resolveResult.ConstantValue is bool) {
+					var condition = (bool)resolveResult.ConstantValue;
+					Expression resultExpr, unreachableExpr;
+					if (condition) {
+						resultExpr = conditionalExpression.TrueExpression;
+						unreachableExpr = conditionalExpression.FalseExpression;
+					} else {
+						resultExpr = conditionalExpression.FalseExpression;
+						unreachableExpr = conditionalExpression.TrueExpression;
+					}
+					unreachableNodes.Add(unreachableExpr);
+
+					AddIssue(new CodeIssue(unreachableExpr, ctx.TranslateString("Code is unreachable"), ctx.TranslateString("Remove unreachable code"),
+						script => script.Replace(conditionalExpression, resultExpr.Clone())) { IssueMarker = IssueMarker.GrayOut });
+				}
+				base.VisitConditionalExpression(conditionalExpression);
+			}
+
+			protected override void VisitChildren(AstNode node)
+			{
+				// skip unreachable nodes
+				if (!unreachableNodes.Contains(node))
+					base.VisitChildren(node);
+			}
+
+			class StatementIssueCollector : DepthFirstAstVisitor
+			{
+				GatherVisitor visitor;
+				ReachabilityAnalysis reachability;
+				List<AstNode> collectedStatements;
+
+				private StatementIssueCollector(GatherVisitor visitor, ReachabilityAnalysis reachability)
+				{
+					collectedStatements = new List<AstNode>();
+					this.visitor = visitor;
+					this.reachability = reachability;
+				}
+
+				public static void Collect(GatherVisitor visitor, BlockStatement body)
+				{
+					if (body.IsNull)
+						return;
+					var reachability = visitor.ctx.CreateReachabilityAnalysis(body);
+
+					var collector = new StatementIssueCollector(visitor, reachability);
+					collector.VisitBlockStatement(body);
+				}
+
+				protected override void VisitChildren(AstNode node)
+				{
+					var statement = node as Statement;
+					if (statement == null || !AddStatement(statement))
+						base.VisitChildren(node);
+				}
+
+				bool AddStatement(Statement statement)
+				{
+					if (reachability.IsReachable(statement))
+						return false;
+					if (collectedStatements.Contains(statement))
+						return true;
+
+					if (statement is BlockStatement && statement.GetChildrenByRole<Statement>(BlockStatement.StatementRole).Any(reachability.IsReachable)) {
+						//There's reachable content
+						return false;
+					}
+
+
+					var prevEnd = statement.GetPrevNode(n => !(n is NewLineNode)).EndLocation;
+					TextLocation start;
+					TextLocation end;
+
+					if (statement.Role == IfElseStatement.TrueRole) {
+						var ife = (IfElseStatement)statement.Parent;
+						start = ife.IfToken.StartLocation;
+						collectedStatements.Add(ife.IfToken);
+						prevEnd = ife.IfToken.StartLocation;
+						collectedStatements.Add(statement);
+						visitor.unreachableNodes.Add(statement);
+						collectedStatements.Add(ife.ElseToken);
+						end = ife.ElseToken.GetNextNode(n => !(n is NewLineNode)).StartLocation;
+					} else if (statement.Role == IfElseStatement.FalseRole) {
+						var ife = (IfElseStatement)statement.Parent;
+						start = ife.ElseToken.StartLocation;
+						collectedStatements.Add(ife.ElseToken);
+						prevEnd = ife.ElseToken.GetPrevNode(n => !(n is NewLineNode)).EndLocation;
+						collectedStatements.Add(statement);
+						visitor.unreachableNodes.Add(statement);
+						end = statement.EndLocation;
+					} else {
+						// group multiple continuous statements into one issue
+						start = statement.StartLocation;
+						collectedStatements.Add(statement);
+						visitor.unreachableNodes.Add(statement);
+						Statement nextStatement;
+						while ((nextStatement = (Statement)statement.GetNextSibling(s => s is Statement)) != null && !(nextStatement is LabelStatement)) {
+							if (nextStatement.Role == IfElseStatement.FalseRole)
+								break;
+							statement = nextStatement;
+							collectedStatements.Add(statement);
+							visitor.unreachableNodes.Add(statement);
+						}
+						end = statement.EndLocation;
+					}
+
+					var removeAction = new CodeAction(
+						visitor.ctx.TranslateString("Remove unreachable code"),
+						script => {
+							var startOffset = script.GetCurrentOffset(prevEnd);
+							var endOffset = script.GetCurrentOffset(end);
+							script.RemoveText(startOffset, endOffset - startOffset);
+						}, collectedStatements.First().StartLocation, collectedStatements.Last().EndLocation);
+					var commentAction = new CodeAction(
+						visitor.ctx.TranslateString("Comment unreachable code"),
+						script => {
+							var startOffset = script.GetCurrentOffset(prevEnd);
+							script.InsertText(startOffset, Environment.NewLine + "/*");
+							var endOffset = script.GetCurrentOffset(end);
+							script.InsertText(endOffset, Environment.NewLine + "*/");
+						}, collectedStatements.First().StartLocation, collectedStatements.Last().EndLocation);
+					var actions = new [] { removeAction, commentAction };
+					visitor.AddIssue(new CodeIssue(start, end, visitor.ctx.TranslateString("Code is unreachable"), actions) { IssueMarker = IssueMarker.GrayOut });
+					return true;
+				}
+				// skip lambda and anonymous method
+				public override void VisitLambdaExpression(LambdaExpression lambdaExpression)
+				{
+				}
+
+				public override void VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression)
+				{
+				}
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UseOfMemberOfNullReference.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UseOfMemberOfNullReference.cs
new file mode 100644
index 0000000000..ab941fa33a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UseOfMemberOfNullReference.cs
@@ -0,0 +1,108 @@
+//
+// UseOfMemberInNullReference.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+//
+// Copyright (c) 2013 Luís Reis
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.CSharp.Analysis;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription("Use of (non-extension method) member of null value will cause a NullReferenceException",
+	                  Description = "Detects when a member of a null value is used",
+	                  Category = IssueCategories.CodeQualityIssues,
+	                  Severity = Severity.Warning)]
+	public class UseOfMemberOfNullReference : GatherVisitorCodeIssueProvider
+	{
+		static readonly ISet<NullValueStatus> ProblematicNullStates = new HashSet<NullValueStatus> {
+			NullValueStatus.DefinitelyNull,
+			NullValueStatus.PotentiallyNull
+		};
+
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		class GatherVisitor : GatherVisitorBase<UseOfMemberOfNullReference>
+		{
+			Dictionary<AstNode, NullValueAnalysis> cachedNullAnalysis = new Dictionary<AstNode, NullValueAnalysis>();
+
+			internal GatherVisitor(BaseRefactoringContext ctx): base(ctx) {}
+
+			public override void VisitMemberReferenceExpression(MemberReferenceExpression memberReferenceExpression)
+			{
+				IMember member = GetMember(memberReferenceExpression);
+				if (member == null || member.IsStatic || member.FullName == "System.Nullable.HasValue") {
+					base.VisitMemberReferenceExpression(memberReferenceExpression);
+					return;
+				}
+
+				var parentFunction = ConstantNullCoalescingConditionIssue.GetParentFunctionNode(memberReferenceExpression);
+				var analysis = GetAnalysis(parentFunction);
+
+				var nullStatus = analysis.GetExpressionResult(memberReferenceExpression.Target);
+				if (ProblematicNullStates.Contains(nullStatus)) {
+					AddIssue(new CodeIssue(memberReferenceExpression,
+						ctx.TranslateString("Using member of null value will cause a NullReferenceException")));
+				}
+			}
+
+			IMember GetMember(AstNode expression)
+			{
+				var resolveResult = ctx.Resolve(expression);
+				MemberResolveResult memberResolveResult = resolveResult as MemberResolveResult;
+				if (memberResolveResult != null) {
+					return memberResolveResult.Member;
+				}
+
+				var methodGroupResolveResult = resolveResult as MethodGroupResolveResult;
+				if (methodGroupResolveResult != null && expression.Parent is InvocationExpression) {
+					return GetMember(expression.Parent);
+				}
+
+				return null;
+			}
+
+			NullValueAnalysis GetAnalysis(AstNode parentFunction)
+			{
+				NullValueAnalysis analysis;
+				if (cachedNullAnalysis.TryGetValue(parentFunction, out analysis)) {
+					return analysis;
+				}
+
+				analysis = new NullValueAnalysis(ctx, parentFunction.GetChildByRole(Roles.Body), parentFunction.GetChildrenByRole(Roles.Parameter), ctx.CancellationToken);
+				analysis.Analyze();
+				cachedNullAnalysis [parentFunction] = analysis;
+				return analysis;
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/VariableOnlyAssignedIssues/ParameterOnlyAssignedIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/VariableOnlyAssignedIssues/ParameterOnlyAssignedIssue.cs
new file mode 100644
index 0000000000..aa2c92311a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/VariableOnlyAssignedIssues/ParameterOnlyAssignedIssue.cs
@@ -0,0 +1,67 @@
+// 
+// ParameterOnlyAssignedIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[IssueDescription ("Parameter is only assigned",
+					   Description = "Parameter is assigned but its value is never used.",
+					   Category = IssueCategories.CodeQualityIssues,
+					   Severity = Severity.Warning)]
+	public class ParameterOnlyAssignedIssue : VariableOnlyAssignedIssue
+	{
+		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
+		{
+			return new GatherVisitor(context);
+		}
+
+		private class GatherVisitor : GatherVisitorBase<ParameterOnlyAssignedIssue>
+		{
+			public GatherVisitor(BaseRefactoringContext ctx)
+				: base (ctx)
+			{
+			}
+
+			public override void VisitParameterDeclaration(ParameterDeclaration parameterDeclaration)
+			{
+				base.VisitParameterDeclaration(parameterDeclaration);
+
+				var resolveResult = ctx.Resolve(parameterDeclaration) as LocalResolveResult;
+				if (resolveResult == null)
+					return;
+
+				var parameterModifier = parameterDeclaration.ParameterModifier;
+				if (parameterModifier == ParameterModifier.Out || parameterModifier == ParameterModifier.Ref ||
+					!TestOnlyAssigned(ctx, parameterDeclaration.Parent, resolveResult.Variable)) {
+					return;
+				}
+				AddIssue(new CodeIssue(parameterDeclaration.NameToken, 
+					ctx.TranslateString("Parameter is assigned but its value is never used")));
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/VariableOnlyAssignedIssues/VariableOnlyAssignedIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/VariableOnlyAssignedIssues/VariableOnlyAssignedIssue.cs
new file mode 100644
index 0000000000..d5897d2b26
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/VariableOnlyAssignedIssues/VariableOnlyAssignedIssue.cs
@@ -0,0 +1,85 @@
+// 
+// VariableOnlyAssignedIssue.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	public abstract class VariableOnlyAssignedIssue : GatherVisitorCodeIssueProvider
+	{
+
+		protected static bool TestOnlyAssigned(BaseRefactoringContext ctx, AstNode rootNode, IVariable variable)
+		{
+			var assignment = false;
+			var nonAssignment = false;
+			foreach (var result in ctx.FindReferences(rootNode, variable)) {
+				var node = result.Node;
+				if (node is ParameterDeclaration)
+					continue;
+
+				if (node is VariableInitializer) {
+					if (!(node as VariableInitializer).Initializer.IsNull)
+						assignment = true;
+					continue;
+				}
+
+				if (node is IdentifierExpression) {
+					var parent = node.Parent;
+					if (parent is AssignmentExpression) {
+						if (((AssignmentExpression)parent).Left == node) {
+							assignment = true;
+							continue;
+						}
+					} else if (parent is UnaryOperatorExpression) {
+						var op = ((UnaryOperatorExpression)parent).Operator;
+						switch (op) {
+							case UnaryOperatorType.Increment:
+							case UnaryOperatorType.PostIncrement:
+							case UnaryOperatorType.Decrement:
+							case UnaryOperatorType.PostDecrement:
+								assignment = true;
+								if (!(parent.Parent is ExpressionStatement))
+									nonAssignment = true;
+								continue;
+						}
+					} else if (parent is DirectionExpression) {
+						if (((DirectionExpression)parent).FieldDirection == FieldDirection.Out) {
+							assignment = true;
+							// Using dummy variables is necessary for ignoring
+							// out-arguments, so we don't want to warn for those.
+							nonAssignment = true;
+							continue;
+						}
+					}
+				}
+				nonAssignment = true;
+			}
+			return assignment && !nonAssignment;
+		}
+
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/ICSharpCode.NRefactory.CSharp.Refactoring.csproj b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/ICSharpCode.NRefactory.CSharp.Refactoring.csproj
new file mode 100644
index 0000000000..f5d2ae1d59
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/ICSharpCode.NRefactory.CSharp.Refactoring.csproj
@@ -0,0 +1,460 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>ICSharpCode.NRefactory.CSharp.Refactoring</RootNamespace>
+    <AssemblyName>ICSharpCode.NRefactory.CSharp.Refactoring</AssemblyName>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\ICSharpCode.NRefactory.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>False</DelaySign>
+    <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
+    <DocumentationFile>..\bin\$(Configuration)\ICSharpCode.NRefactory.CSharp.Refactoring.xml</DocumentationFile>
+    <NoWarn>1591,1587,1570</NoWarn>
+    <OutputPath>..\bin\$(Configuration)\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE;FULL_AST;NET_4_0</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE;FULL_AST;NET_4_0</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <OutputPath>..\bin\Release\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <OutputPath>..\bin\Debug\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Debug' ">
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE;FULL_AST;NET_4_0;NET_4_5</DefineConstants>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <OutputPath>..\bin\net_4_5_Debug\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Release' ">
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE;FULL_AST;NET_4_0;NET_4_5</DefineConstants>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <OutputPath>..\bin\net_4_5_Release\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
+      <Link>Properties\GlobalAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="CodeActions\AbstractAndVirtualConversionAction.cs" />
+    <Compile Include="CodeActions\AddAnotherAccessorAction.cs" />
+    <Compile Include="CodeActions\AddArgumentNameAction.cs" />
+    <Compile Include="CodeActions\AddCatchTypeAction.cs" />
+    <Compile Include="CodeActions\AddUsingAction.cs" />
+    <Compile Include="CodeActions\AutoLinqSumAction.cs" />
+    <Compile Include="CodeActions\ChangeAccessModifierAction.cs" />
+    <Compile Include="CodeActions\CheckIfParameterIsNullAction.cs" />
+    <Compile Include="CodeActions\ConvertAnonymousDelegateToLambdaAction.cs" />
+    <Compile Include="CodeActions\ConvertAsToCastAction.cs" />
+    <Compile Include="CodeActions\ConvertCastToAsAction.cs" />
+    <Compile Include="CodeActions\ConvertDecToHexAction.cs" />
+    <Compile Include="CodeActions\ConvertDoWhileToWhileLoopAction.cs" />
+    <Compile Include="CodeActions\ConvertEqualityOperatorToEqualsAction.cs" />
+    <Compile Include="CodeActions\ConvertEqualsToEqualityOperatorAction.cs" />
+    <Compile Include="CodeActions\ConvertExplicitToImplicitImplementationAction.cs" />
+    <Compile Include="CodeActions\ConvertForeachToForAction.cs" />
+    <Compile Include="CodeActions\ConvertHexToDecAction.cs" />
+    <Compile Include="CodeActions\ConvertImplicitToExplicitImplementationAction.cs" />
+    <Compile Include="CodeActions\ConvertLambdaBodyExpressionToStatementAction.cs" />
+    <Compile Include="CodeActions\ConvertLambdaBodyStatementToExpressionAction.cs" />
+    <Compile Include="CodeActions\ConvertLambdaToAnonymousDelegateAction.cs" />
+    <Compile Include="CodeActions\ConvertMethodGroupToAnonymousMethodAction.cs" />
+    <Compile Include="CodeActions\ConvertMethodGroupToLambdaAction.cs" />
+    <Compile Include="CodeActions\ConvertSwitchToIfAction.cs" />
+    <Compile Include="CodeActions\ConvertToInitializer\AccessPath.cs" />
+    <Compile Include="CodeActions\ConvertToInitializer\ConvertInitializerToExplicitInitializationsAction.cs" />
+    <Compile Include="CodeActions\ConvertToInitializer\ConvertToInitializerAction.cs" />
+    <Compile Include="CodeActions\ConvertToInitializer\StatementsToInitializerConverter.cs" />
+    <Compile Include="CodeActions\ConvertWhileToDoWhileLoopAction.cs" />
+    <Compile Include="CodeActions\CopyCommentsFromBase.cs" />
+    <Compile Include="CodeActions\CopyCommentsFromInterface.cs" />
+    <Compile Include="CodeActions\CreateBackingStoreAction.cs" />
+    <Compile Include="CodeActions\CreateChangedEventAction.cs" />
+    <Compile Include="CodeActions\CreateClassDeclarationAction.cs" />
+    <Compile Include="CodeActions\CreateConstructorDeclarationAction.cs" />
+    <Compile Include="CodeActions\CreateCustomEventImplementationAction.cs" />
+    <Compile Include="CodeActions\CreateDelegateAction.cs" />
+    <Compile Include="CodeActions\CreateEnumValue.cs" />
+    <Compile Include="CodeActions\CreateEventInvocatorAction.cs" />
+    <Compile Include="CodeActions\CreateFieldAction.cs" />
+    <Compile Include="CodeActions\CreateIndexerAction.cs" />
+    <Compile Include="CodeActions\CreateLocalVariableAction.cs" />
+    <Compile Include="CodeActions\CreateMethodDeclarationAction.cs" />
+    <Compile Include="CodeActions\CreateOverloadWithoutParameterAction.cs" />
+    <Compile Include="CodeActions\CreatePropertyAction.cs" />
+    <Compile Include="CodeActions\CS1520MethodMustHaveAReturnTypeAction.cs" />
+    <Compile Include="CodeActions\DeclareLocalVariableAction.cs" />
+    <Compile Include="CodeActions\ExtensionMethodInvocationToStaticMethodInvocationAction.cs" />
+    <Compile Include="CodeActions\ExtractAnonymousMethodAction.cs" />
+    <Compile Include="CodeActions\ExtractFieldAction.cs" />
+    <Compile Include="CodeActions\ExtractMethod\ExtractMethodAction.cs" />
+    <Compile Include="CodeActions\ExtractMethod\StaticVisitor.cs" />
+    <Compile Include="CodeActions\ExtractMethod\VariableLookupVisitor.cs" />
+    <Compile Include="CodeActions\ExtractMethod\VariableUsageAnalyzation.cs" />
+    <Compile Include="CodeActions\FlipEqualsTargetAndArgumentAction.cs" />
+    <Compile Include="CodeActions\FlipOperatorArgumentsAction.cs" />
+    <Compile Include="CodeActions\GenerateGetterAction.cs" />
+    <Compile Include="CodeActions\GeneratePropertyAction.cs" />
+    <Compile Include="CodeActions\GenerateSwitchLabelsAction.cs" />
+    <Compile Include="CodeActions\ImplementAbstractMembersAction.cs" />
+    <Compile Include="CodeActions\ImplementInterfaceAction.cs" />
+    <Compile Include="CodeActions\ImplementInterfaceExplicitAction.cs" />
+    <Compile Include="CodeActions\ImplementNotImplementedProperty.cs" />
+    <Compile Include="CodeActions\InlineLocalVariableAction.cs" />
+    <Compile Include="CodeActions\InsertAnonymousMethodSignatureAction.cs" />
+    <Compile Include="CodeActions\IntroduceConstantAction.cs" />
+    <Compile Include="CodeActions\IntroduceFormatItemAction.cs" />
+    <Compile Include="CodeActions\InvertConditionalOperatorAction.cs" />
+    <Compile Include="CodeActions\InvertIfAction.cs" />
+    <Compile Include="CodeActions\InvertIfAndSimplify.cs" />
+    <Compile Include="CodeActions\InvertLogicalExpressionAction.cs" />
+    <Compile Include="CodeActions\IterateViaForeachAction.cs" />
+    <Compile Include="CodeActions\JoinDeclarationAndAssignmentAction.cs" />
+    <Compile Include="CodeActions\JoinStringAction.cs" />
+    <Compile Include="CodeActions\LinqFluentToQueryAction.cs" />
+    <Compile Include="CodeActions\LinqQueryToFluentAction.cs" />
+    <Compile Include="CodeActions\MergeNestedIfAction.cs" />
+    <Compile Include="CodeActions\MoveToOuterScopeAction.cs" />
+    <Compile Include="CodeActions\NegateIsExpressionAction.cs" />
+    <Compile Include="CodeActions\NegateRelationalExpressionAction.cs" />
+    <Compile Include="CodeActions\PutInsideUsingAction.cs" />
+    <Compile Include="CodeActions\RemoveBackingStoreAction.cs" />
+    <Compile Include="CodeActions\RemoveBracesAction.cs" />
+    <Compile Include="CodeActions\RemoveRedundantCatchTypeAction.cs" />
+    <Compile Include="CodeActions\RemoveRegionAction.cs" />
+    <Compile Include="CodeActions\ReplaceEmptyStringAction.cs" />
+    <Compile Include="CodeActions\SimplifyIfFlowAction.cs" />
+    <Compile Include="CodeActions\SimplifyIfInLoopsFlowAction.cs" />
+    <Compile Include="CodeActions\SortUsingsAction.cs" />
+    <Compile Include="CodeActions\SpecializedCodeAction.cs" />
+    <Compile Include="CodeActions\SplitDeclarationAndAssignmentAction.cs" />
+    <Compile Include="CodeActions\SplitDeclarationListAction.cs" />
+    <Compile Include="CodeActions\SplitStringAction.cs" />
+    <Compile Include="CodeActions\UseExplicitTypeAction.cs" />
+    <Compile Include="CodeActions\UseStringFormatAction.cs" />
+    <Compile Include="CodeActions\UseVarKeywordAction.cs" />
+    <Compile Include="CodeIssues\Custom\ConvertIfToAndExpressionIssue.cs" />
+    <Compile Include="CodeIssues\Custom\LockThisIssue.cs" />
+    <Compile Include="CodeIssues\Custom\NegativeRelationalExpressionIssue.cs" />
+    <Compile Include="CodeIssues\Custom\NotImplementedExceptionIssue.cs" />
+    <Compile Include="CodeIssues\Custom\RedundantInternalIssue.cs" />
+    <Compile Include="CodeIssues\Custom\RedundantPrivateIssue.cs" />
+    <Compile Include="CodeIssues\Custom\XmlDocIssue.cs" />
+    <Compile Include="CodeIssues\GatherVisitorBase.cs" />
+    <Compile Include="CodeIssues\IssueCategories.cs" />
+    <Compile Include="CodeIssues\NotWorking\AccessToClosureIssues\AccessToClosureIssue.cs" />
+    <Compile Include="CodeIssues\NotWorking\AccessToClosureIssues\AccessToDisposedClosureIssue.cs" />
+    <Compile Include="CodeIssues\NotWorking\AccessToClosureIssues\AccessToModifiedClosureIssue.cs" />
+    <Compile Include="CodeIssues\NotWorking\AccessToClosureIssues\LocalVariableNamePicker.cs" />
+    <Compile Include="CodeIssues\NotWorking\DuplicateBodyMethodIssue.cs" />
+    <Compile Include="CodeIssues\NotWorking\DuplicateExpressionsInConditionsIssue.cs" />
+    <Compile Include="CodeIssues\NotWorking\ParameterCanBeIEnumerableIssue.cs" />
+    <Compile Include="CodeIssues\NotWorking\VariableDeclaredInWideScopeIssue.cs" />
+    <Compile Include="CodeIssues\RefactoringExtensions.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\BaseMethodCallWithDefaultParameterIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\BitwiseOperatorOnEnumWithoutFlagsIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\CanBeReplacedWithTryCastAndCheckForNullIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\CompareOfFloatsByEqualityOperatorIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\ConditionalTernaryEqualBranchIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\DoNotCallOverridableMethodsInConstructorIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\EmptyGeneralCatchClauseIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\EqualExpressionComparisonIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\EventUnsubscriptionViaAnonymousDelegateIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\ForControlVariableIsNeverModifiedIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\FunctionNeverReturnsIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\LocalVariableHidesMemberIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\LongLiteralEndingLowerLIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\OptionalParameterHierarchyMismatchIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\OptionalParameterRefOutIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\ParameterHidesMemberIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\StaticFieldInGenericTypeIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\ThreadStaticAtInstanceFieldIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\ValueParameterNotUsedIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CompilerWarnings\CS1573ParameterHasNoMatchingParamTagIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CompilerWarnings\CS1717AssignmentMadeToSameVariableIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CompilerWarnings\UnassignedReadonlyFieldIssue.cs" />
+    <Compile Include="CodeIssues\Synced\ConstraintViolations\InconsistentNamingIssue\AffectedEntity.cs" />
+    <Compile Include="CodeIssues\Synced\ConstraintViolations\InconsistentNamingIssue\DefaultRules.cs" />
+    <Compile Include="CodeIssues\Synced\ConstraintViolations\InconsistentNamingIssue\InconsistentNamingIssue.cs" />
+    <Compile Include="CodeIssues\Synced\ConstraintViolations\InconsistentNamingIssue\NamingConventionService.cs" />
+    <Compile Include="CodeIssues\Synced\ConstraintViolations\InconsistentNamingIssue\NamingRule.cs" />
+    <Compile Include="CodeIssues\Synced\ConstraintViolations\InconsistentNamingIssue\NamingStyle.cs" />
+    <Compile Include="CodeIssues\Synced\NUnit\NonPublicMethodWithTestAttributeIssue.cs" />
+    <Compile Include="CodeIssues\Synced\Opportunities\ConvertClosureToMethodGroupIssue.cs" />
+    <Compile Include="CodeIssues\Synced\Opportunities\ConvertConditionalTernaryToNullCoalescingIssue.cs" />
+    <Compile Include="CodeIssues\Synced\Opportunities\ConvertIfStatementToConditionalTernaryExpressionIssue.cs" />
+    <Compile Include="CodeIssues\Synced\Opportunities\ConvertIfStatementToNullCoalescingExpressionIssue.cs" />
+    <Compile Include="CodeIssues\Synced\Opportunities\ConvertNullableToShortFormIssue.cs" />
+    <Compile Include="CodeIssues\Synced\Opportunities\InvokeAsExtensionMethodIssue.cs" />
+    <Compile Include="CodeIssues\Synced\Opportunities\RewriteIfReturnToReturnIssue.cs" />
+    <Compile Include="CodeIssues\Synced\Opportunities\SuggestUseVarKeywordEvidentIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\AccessToStaticMemberViaDerivedTypeIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\BaseMemberHasParamsIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ConvertIfDoToWhileIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ConvertToConstantIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\EmptyEmbeddedStatementIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\FieldCanBeMadeReadOnlyIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\MemberCanBeMadeStaticIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\PublicConstructorInAbstractClass.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithFirstOrDefaultIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithLastOrDefaultIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithOfTypeAny.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithOfTypeCountIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithOfTypeFirstIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithOfTypeFirstOrDefaultIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithOfTypeIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithOfTypeLastIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithOfTypeLastOrDefaultIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithOfTypeLongCountIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithOfTypeSingleIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithOfTypeSingleOrDefaultIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithOfTypeWhereIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithSingleCallToAnyIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithSingleCallToCountIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithSingleCallToFirstIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithSingleCallToFirstOrDefaultIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithSingleCallToLastIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithSingleCallToLastOrDefaultIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithSingleCallToLongCountIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithSingleCallToSingleIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithSingleCallToSingleOrDefaultIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithStringIsNullOrEmptyIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\SimplifyConditionalTernaryExpressionIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\StringEndsWithIsCultureSpecificIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\StringIndexOfIsCultureSpecificIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\StringLastIndexOfIsCultureSpecificIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\StringStartsWithIsCultureSpecificIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\UseMethodAnyIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\UseMethodIsInstanceOfTypeIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\ConstantNullCoalescingConditionIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\DoubleNegationOperatorIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantAttributeParenthesesIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantBaseQualifierIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantBoolCompareIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantCaseLabelIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantCastIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantCommaInArrayInitializerIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantComparisonWithNullIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantEmptyObjectCreationArgumentListssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantExtendsListEntryIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantIfElseBlockIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantNameQualifierIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantObjectOrCollectionInitializerIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantTernaryExpressionIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantThisQualifierIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantToStringCallForValueTypesIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantToStringCallIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantUsingDirectiveIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInDeclaration\EmptyConstructorIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInDeclaration\EmptyDestructorIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInDeclaration\EmptyNamespaceIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInDeclaration\EnumUnderlyingTypeIsIntIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInDeclaration\LocalVariableNotUsedIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInDeclaration\PartialTypeWithSinglePartIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInDeclaration\RedundantBaseConstructorCallIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInDeclaration\RedundantDefaultFieldInitializerIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInDeclaration\RedundantOverridenMemberIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInDeclaration\UnusedTypeParameterIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\CallToObjectEqualsViaBaseIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\CastExpressionOfIncompatibleTypeIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\CompilerErrors\CS0659OverrideEqualWithoutGetHashCode.cs" />
+    <Compile Include="CodeIssues\Uncategorized\CompilerErrors\CS1729TypeHasNoConstructorWithNArgumentsIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\ConstantConditionIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\DisposeMethodInNonIDisposableTypeIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\DuplicatedLinqToListOrArrayIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\ExceptionRethrowIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\ExplicitConversionInForEachIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\ExpressionIsNeverOfProvidedTypeIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\IncorrectCallToObjectGetHashCodeIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\MethodOverloadHidesOptionalParameterIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\OptionalParameterCouldBeSkippedIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\RedundantAssignmentIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\ResultOfAsyncCallShouldNotBeIgnoredIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\UnreachableCodeIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\UseOfMemberOfNullReference.cs" />
+    <Compile Include="CodeIssues\Uncategorized\VariableOnlyAssignedIssues\ParameterOnlyAssignedIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\VariableOnlyAssignedIssues\VariableOnlyAssignedIssue.cs" />
+    <Compile Include="CodeActions\AddExceptionDescriptionAction.cs" />
+    <Compile Include="CodeIssues\Uncategorized\DontUseLinqWhenItsVerboseAndInefficientIssue.cs" />
+    <Compile Include="CodeActions\ConvertIfStatementToConditionalTernaryExpressionAction.cs" />
+    <Compile Include="CodeActions\ConvertIfStatementToReturnStatementAction.cs" />
+    <Compile Include="CodeActions\ConvertIfStatementToNullCoalescingExpressionAction.cs" />
+    <Compile Include="CodeIssues\Synced\Opportunities\ConvertIfStatementToSwitchStatementIssue.cs" />
+    <Compile Include="CodeActions\ConvertIfStatementToSwitchStatementAction.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInDeclaration\RedundantParamsIssue.cs" />
+    <Compile Include="CodeActions\ConvertNullCoalescingToConditionalExpressionAction.cs" />
+    <Compile Include="CodeActions\ConvertReturnStatementToIfAction.cs" />
+    <Compile Include="CodeActions\ConvertAssignmentToIfAction.cs" />
+    <Compile Include="CodeIssues\Synced\Opportunities\ForCanBeConvertedToForeachIssue.cs" />
+    <Compile Include="CodeActions\UseAsAndNullCheckAction.cs" />
+    <Compile Include="CodeIssues\Custom\MixedUseOfFieldsAndGettersIssue.cs" />
+    <Compile Include="CodeActions\ConvertForToWhileAction.cs" />
+    <Compile Include="CodeActions\AddBracesAction.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantEmptyDefaultSwitchBranchIssue.cs" />
+    <Compile Include="CodeIssues\Custom\CompilerErrors\CS0126ReturnMustBeFollowedByAnyExpression.cs" />
+    <Compile Include="CodeIssues\Custom\CompilerErrors\CS0127ReturnMustNotBeFollowedByAnyExpression.cs" />
+    <Compile Include="CodeIssues\Custom\CompilerErrors\CS0152DuplicateCaseLabelValueIssue.cs" />
+    <Compile Include="CodeIssues\Custom\CompilerErrors\CS0759RedundantPartialMethodIssue.cs" />
+    <Compile Include="CodeIssues\Custom\CompilerErrors\CS0029InvalidConversionIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInDeclaration\SealedMemberInSealedClassIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ConvertIfToOrExpressionIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\UnusedAnonymousMethodSignatureIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\EmptyStatementIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantArgumentDefaultValueIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantEmptyFinallyBlockIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\PartialMethodParameterNameMismatchIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReplaceWithSimpleAssignmentIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\StringCompareToIsCultureSpecificIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\StringCompareIsCultureSpecificIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\UseArrayCreationExpressionIssue.cs" />
+    <Compile Include="CodeIssues\Custom\BaseMethodParameterNameMismatchIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantExplicitArraySizeIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantUnsafeContextIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CompilerErrors\ProhibitedModifiersIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RemoveRedundantOrStatementIssue.cs" />
+    <Compile Include="CodeActions\ExtractWhileConditionToInternalIfStatementAction.cs" />
+    <Compile Include="CodeActions\ReverseDirectionForForLoopAction.cs" />
+    <Compile Include="CodeIssues\Uncategorized\AutoAsyncIssue.cs" />
+    <Compile Include="CodeIssues\Custom\AdditionalOfTypeIssues.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantLambdaParameterTypeIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantLambdaSignatureParenthesesIssue.cs" />
+    <Compile Include="CodeIssues\Synced\Opportunities\ConvertToLambdaExpressionIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantArgumentNameIssue.cs" />
+    <Compile Include="CodeActions\AddOptionalParameterToInvocationAction.cs" />
+    <Compile Include="CodeActions\ComputeConstantValueAction.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantCheckBeforeAssignmentIssue.cs" />
+    <Compile Include="CodeActions\ConvertShiftToMultiplyAction.cs" />
+    <Compile Include="CodeActions\ConvertMultiplyToShiftAction.cs" />
+    <Compile Include="CodeActions\SplitIfAction.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantLogicalConditionalExpressionOperandIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\ForStatementConditionIsTrueIssue.cs" />
+    <Compile Include="CodeIssues\Synced\Opportunities\ConvertToStaticTypeIssue.cs" />
+    <Compile Include="CodeActions\ReplaceAssignmentWithPostfixExpressionAction.cs" />
+    <Compile Include="CodeActions\ReplacePostfixExpressionWithAssignmentAction.cs" />
+    <Compile Include="CodeActions\ReplaceWithOperatorAssignmentAction.cs" />
+    <Compile Include="CodeActions\ReplaceOperatorAssignmentWithAssignmentAction.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\OperatorIsCanBeUsedIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\UseIsOperatorIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\FormatStringProblemIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantCatchClauseIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\CheckNamespaceIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\PossibleMultipleEnumerationIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\ConditionIsAlwaysTrueOrFalseIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInDeclaration\UnusedLabelIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\MemberHidesStaticFromOuterClassIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\MethodOverloadWithOptionalParameterIssue.cs" />
+    <Compile Include="CodeIssues\NotWorking\DuplicateIfInIfChainIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ReferenceEqualsWithValueTypeIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\CompareNonConstrainedGenericWithNullIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantDelegateCreationIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantEnumerableCastCallIssue.cs" />
+    <Compile Include="CodeIssues\Custom\CompilerErrors\MissingInterfaceMemberImplementationIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\UnmatchedSizeSpecificationInArrayCreationIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\RedundantBlockInDifferentBranchesIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\NonReadonlyReferencedInGetHashCodeIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\ParameterCanBeDeclaredWithBaseTypeIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\SameGuardConditionExpressionInIfelseBranchesIssue.cs" />
+    <Compile Include="CodeActions\ConvertHasFlagsToBitwiseFlagComparisonAction.cs" />
+    <Compile Include="CodeActions\ConvertBitwiseFlagComparisonToHasFlagsAction.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantExplicitArrayCreationIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\ArrayCreationCanBeReplacedWithArrayInitializerIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantAnonymousTypePropertyNameIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\PossibleAssignmentToReadonlyFieldIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\ObjectCreationAsStatementIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\NotResolvedInTextIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\DelegateSubtractionIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInDeclaration\UnusedParameterIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\SimplifyLinqExpressionIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantExplicitNullableCreationIssue.cs" />
+    <Compile Include="CodeIssues\Synced\RedundanciesInCode\RedundantStringToCharArrayCallIssue.cs" />
+    <Compile Include="CodeIssues\Synced\Opportunities\ConvertToAutoPropertyIssue.cs" />
+    <Compile Include="CodeIssues\Custom\CompilerErrors\StaticConstructorParameterIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CompilerWarnings\CS0183ExpressionIsAlwaysOfProvidedTypeIssue.cs" />
+    <Compile Include="CodeIssues\Synced\CodeQuality\PolymorphicFieldLikeEventInvocationIssue.cs" />
+    <Compile Include="CodeIssues\TODO\ConvertTailRecursiveCallToLoopIssue.cs" />
+    <Compile Include="CodeIssues\TODO\LoopCanBeConvertedToQueryIssue.cs" />
+    <Compile Include="CodeIssues\TODO\PartOfBodyCanBeConvertedToQueryIssue.cs" />
+    <Compile Include="CodeIssues\TODO\RedundantTypeArgumentsOfMethodIssue.cs" />
+    <Compile Include="CodeIssues\Synced\PracticesAndImprovements\PossibleMistakenCallToGetTypeIssue.cs" />
+    <Compile Include="CodeIssues\Uncategorized\RedundantNotNullAttributeInNonNullableTypeIssue.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
+      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
+      <Name>ICSharpCode.NRefactory.CSharp</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.NRefactory.Xml\ICSharpCode.NRefactory.Xml.csproj">
+      <Project>{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}</Project>
+      <Name>ICSharpCode.NRefactory.Xml</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
+      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
+      <Name>ICSharpCode.NRefactory</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties>
+        <Policies>
+          <TextStylePolicy FileWidth="120" TabsToSpaces="False" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/x-csharp" />
+          <CSharpFormattingPolicy IndentSwitchBody="True" BeforeMethodDeclarationParentheses="False" BeforeMethodCallParentheses="False" BeforeConstructorDeclarationParentheses="False" BeforeDelegateDeclarationParentheses="False" NewParentheses="False" SpacesBeforeBrackets="False" inheritsSet="Mono" inheritsScope="text/x-csharp" scope="text/x-csharp" />
+        </Policies>
+      </Properties>
+    </MonoDevelop>
+  </ProjectExtensions>
+  <ItemGroup>
+    <Folder Include="CodeIssues\TODO\" />
+  </ItemGroup>
+</Project>
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/Properties/AssemblyInfo.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..0f7e2c1156
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/Properties/AssemblyInfo.cs
@@ -0,0 +1,30 @@
+//
+// AssemblyInfo.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle ("ICSharpCode.NRefactory.CSharp.Refactoring")]
+[assembly: AssemblyDescription("C# refactorings")]
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/AnnotationNames.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/AnnotationNames.cs
new file mode 100644
index 0000000000..94d19e4b6e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/AnnotationNames.cs
@@ -0,0 +1,48 @@
+// 
+// Annotations.cs
+//  
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	public static class AnnotationNames
+	{
+		//Used const instead of readonly to allow values to be used in switch cases.
+
+		public const string AssertionMethodAttribute = "JetBrains.Annotations.AssertionMethodAttribute";
+		public const string AssertionConditionAttribute = "JetBrains.Annotations.AssertionConditionAttribute";
+		public const string AssertionConditionTypeAttribute = "JetBrains.Annotations.AssertionConditionType";
+
+		public const string AssertionConditionTypeIsTrue = "JetBrains.Annotations.AssertionConditionType.IS_TRUE";
+		public const string AssertionConditionTypeIsFalse = "JetBrains.Annotations.AssertionConditionType.IS_FALSE";
+		public const string AssertionConditionTypeIsNull = "JetBrains.Annotations.AssertionConditionType.IS_NULL";
+		public const string AssertionConditionTypeIsNotNull = "JetBrains.Annotations.AssertionConditionType.IS_NOT_NULL";
+
+		public const string NotNullAttribute = "JetBrains.Annotations.NotNullAttribute";
+		public const string CanBeNullAttribute = "JetBrains.Annotations.CanBeNullAttribute";
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/DeclarationSpace/LocalDeclarationSpace.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/DeclarationSpace/LocalDeclarationSpace.cs
new file mode 100644
index 0000000000..a412cba3aa
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/DeclarationSpace/LocalDeclarationSpace.cs
@@ -0,0 +1,157 @@
+// 
+// LovalVariableDeclarationSpace.cs
+//  
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+// 
+// Copyright (c) 2013 Simon Lindgren
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Utils;
+using System.Collections.Generic;
+using System.Linq;
+using System;
+
+namespace ICSharpCode.NRefactory.CSharp.Analysis
+{
+	/// <summary>
+	/// Represents a declaration space. (§3.3)
+	/// </summary>
+	public class LocalDeclarationSpace
+	{
+		/// <summary>
+		/// Maps from variable name to the declarations in this declaration space.
+		/// </summary>
+		/// <remarks>
+		/// This maps from variable name
+		/// </remarks>
+		MultiDictionary<string, AstNode> declarations = new MultiDictionary<string, AstNode> ();
+
+		public LocalDeclarationSpace()
+		{
+			Children = new List<LocalDeclarationSpace> ();
+		}
+
+		/// <summary>
+		/// The child declaration spaces.
+		/// </summary>
+		public IList<LocalDeclarationSpace> Children {
+			get;
+			private set;
+		}
+
+		/// <summary>
+		/// The parent declaration space.
+		/// </summary>
+		/// <value>The parent.</value>
+		public LocalDeclarationSpace Parent {
+			get;
+			private set;
+		}
+
+		/// <summary>
+		/// The names declared in this declaration space, excluding child spaces.
+		/// </summary>
+		/// <value>The declared names.</value>
+		public ICollection<string> DeclaredNames {
+			get {
+				return declarations.Keys;
+			}
+		}
+
+		/// <summary>
+		/// Get all nodes declaring the name specified in <paramref name="name"/>.
+		/// </summary>
+		/// <returns>The declaring nodes.</returns>
+		/// <param name="name">The declaration name.</param>
+		public IEnumerable<AstNode> GetNameDeclarations(string name)
+		{
+			return declarations [name].Concat(Children.SelectMany(child => child.GetNameDeclarations(name)));
+		}
+
+		/// <summary>
+		/// Adds a child declaration space.
+		/// </summary>
+		/// <param name="child">The <see cref="LocalDeclarationSpace"/> to add.</param>
+		public void AddChildSpace(LocalDeclarationSpace child)
+		{
+			if (child == null)
+				throw new ArgumentNullException("child");
+			if (Children.Contains(child))
+				throw new InvalidOperationException("the child was already added");
+
+			Children.Add(child);
+			child.Parent = this;
+		}
+
+		/// <summary>
+		/// Adds a new declaration to the declaration space.
+		/// </summary>
+		/// <param name="name">The name of the declared variable.</param>
+		/// <param name="node">A node associated with the declaration.</param>
+		public void AddDeclaration(string name, AstNode node)
+		{
+			if (name == null)
+				throw new ArgumentNullException("name");
+			if (node == null)
+				throw new ArgumentNullException("node");
+			declarations.Add(name, node);
+		}
+
+		/// <summary>
+		/// Determines if the name exists in the this declaration space.
+		/// </summary>
+		/// <returns><c>true</c>, if the name specified in <paramref name="name"/> is used in this variable declaration space, <c>false</c> otherwise.</returns>
+		/// <param name="name">The name to look for.</param>
+		/// <param name="includeChildren">When <c>true</c>, child declaration spaces are included in the search.</param>
+		public bool ContainsName(string name, bool includeChildren)
+		{
+			if (name == null)
+				throw new ArgumentNullException("name");
+
+			if (declarations.Keys.Contains(name)) 
+				return true;
+			return includeChildren && Children.Any(child => child.ContainsName(name, true));
+		}
+
+		/// <summary>
+		/// Determines whether the name specified in <paramref name="name"/> is used in surrouding code.
+		/// </summary>
+		/// <returns><c>true</c> if the name is used, <c>false</c> otherwise.</returns>
+		/// <param name="name">The name to check.</param>
+		/// <remarks>
+		/// Contrary to <see cref="ContainsName"/>, this method also checks parent declaration spaces
+		/// for name conflicts. Typically, this will be the right method to use when determining if a name can be used.
+		/// </remarks>
+		public bool IsNameUsed(string name)
+		{
+			if (name == null)
+				throw new ArgumentNullException("name");
+
+			return IsNameUsedBySelfOrParent(name) || Children.Any(child => child.ContainsName(name, true));
+		}
+
+		bool IsNameUsedBySelfOrParent(string name)
+		{
+			if (declarations.Keys.Contains(name))
+				return true;
+			return Parent != null && Parent.IsNameUsedBySelfOrParent(name);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceVisitor.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceVisitor.cs
new file mode 100644
index 0000000000..08389a413a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceVisitor.cs
@@ -0,0 +1,138 @@
+//
+// LocalDeclarationSpaceVisitor.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2013 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Analysis
+{
+	public class LocalDeclarationSpaceVisitor : DepthFirstAstVisitor
+	{
+		LocalDeclarationSpace currentDeclarationSpace;
+		Dictionary<AstNode, LocalDeclarationSpace> nodeDeclarationSpaces = new Dictionary<AstNode, LocalDeclarationSpace>();
+		
+		public LocalDeclarationSpace GetDeclarationSpace(AstNode node)
+		{
+			if (node == null)
+				throw new ArgumentNullException("node");
+			while (node != null) {
+				LocalDeclarationSpace declarationSpace;
+				if (nodeDeclarationSpaces.TryGetValue(node, out declarationSpace))
+					return declarationSpace;
+				node = node.Parent;
+			}
+			return null;
+		}
+
+		#region Visitor
+
+		void AddDeclaration(string name, AstNode node)
+		{
+			if (currentDeclarationSpace != null)
+				currentDeclarationSpace.AddDeclaration(name, node);
+		}
+
+		public override void VisitVariableInitializer(VariableInitializer variableInitializer)
+		{
+			AddDeclaration(variableInitializer.Name, variableInitializer);
+			base.VisitVariableInitializer(variableInitializer);
+		}
+
+		public override void VisitParameterDeclaration(ParameterDeclaration parameterDeclaration)
+		{
+			AddDeclaration(parameterDeclaration.Name, parameterDeclaration);
+			base.VisitParameterDeclaration(parameterDeclaration);
+		}
+
+		void VisitNewDeclarationSpace(AstNode node)
+		{
+			var oldDeclarationSpace = currentDeclarationSpace;
+			currentDeclarationSpace = new LocalDeclarationSpace();
+			if (oldDeclarationSpace != null)
+				oldDeclarationSpace.AddChildSpace(currentDeclarationSpace);
+
+			VisitChildren(node);
+
+			nodeDeclarationSpaces.Add(node, currentDeclarationSpace);
+			currentDeclarationSpace = oldDeclarationSpace;
+		}
+
+		#region Declaration space creating nodes
+		
+		public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
+		{
+			VisitNewDeclarationSpace(methodDeclaration);
+		}
+
+		public override void VisitBlockStatement(BlockStatement blockStatement)
+		{
+			VisitNewDeclarationSpace(blockStatement);
+		}
+
+		public override void VisitSwitchStatement(SwitchStatement switchStatement)
+		{
+			VisitNewDeclarationSpace(switchStatement);
+		}
+
+		public override void VisitForeachStatement(ForeachStatement foreachStatement)
+		{
+			AddDeclaration(foreachStatement.VariableName, foreachStatement);
+			VisitNewDeclarationSpace(foreachStatement);
+		}
+		
+		public override void VisitForStatement(ForStatement forStatement)
+		{
+			VisitNewDeclarationSpace(forStatement);
+		}
+
+		public override void VisitUsingStatement(UsingStatement usingStatement)
+		{
+			VisitNewDeclarationSpace(usingStatement);
+		}
+
+		public override void VisitLambdaExpression(LambdaExpression lambdaExpression)
+		{
+			VisitNewDeclarationSpace(lambdaExpression);
+		}
+
+		public override void VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression)
+		{
+			VisitNewDeclarationSpace(anonymousMethodExpression);
+		}
+
+		public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
+		{
+			AddDeclaration(eventDeclaration.Name, eventDeclaration);
+		}
+
+		public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
+		{
+			VisitNewDeclarationSpace(eventDeclaration);
+		}
+
+		#endregion
+		#endregion
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/NullValueAnalysis.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/NullValueAnalysis.cs
new file mode 100644
index 0000000000..39fca43e61
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/NullValueAnalysis.cs
@@ -0,0 +1,2203 @@
+// 
+// NullValueAnalysis.cs
+//  
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using System.Text;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory.Utils;
+
+namespace ICSharpCode.NRefactory.CSharp.Analysis
+{
+	public class NullValueAnalysis
+	{
+		sealed class VariableStatusInfo : IEquatable<VariableStatusInfo>, IEnumerable<KeyValuePair<string, NullValueStatus>>
+		{
+			readonly Dictionary<string, NullValueStatus> VariableStatus = new Dictionary<string, NullValueStatus>();
+
+			public NullValueStatus this[string name]
+			{
+				get {
+					NullValueStatus status;
+					if (VariableStatus.TryGetValue(name, out status)) {
+						return status;
+					}
+					return NullValueStatus.UnreachableOrInexistent;
+				}
+				set {
+					if (value == NullValueStatus.UnreachableOrInexistent) {
+						VariableStatus.Remove(name);
+					} else {
+						VariableStatus [name] = value;
+					}
+				}
+			}
+
+			/// <summary>
+			/// Modifies the variable state to consider a new incoming path
+			/// </summary>
+			/// <returns><c>true</c>, if the state has changed, <c>false</c> otherwise.</returns>
+			/// <param name="incomingState">The variable state of the incoming path</param>
+			public bool ReceiveIncoming(VariableStatusInfo incomingState)
+			{
+				bool changed = false;
+				var listOfVariables = VariableStatus.Keys.Concat(incomingState.VariableStatus.Keys).ToList();
+				foreach (string variable in listOfVariables)
+				{
+					var newValue = CombineStatus(this [variable], incomingState [variable]);
+					if (this [variable] != newValue) {
+						this [variable] = newValue;
+						changed = true;
+					}
+				}
+
+				return changed;
+			}
+
+			public static NullValueStatus CombineStatus(NullValueStatus oldValue, NullValueStatus incomingValue)
+			{
+				if (oldValue == NullValueStatus.Error || incomingValue == NullValueStatus.Error)
+					return NullValueStatus.Error;
+
+				if (oldValue == NullValueStatus.UnreachableOrInexistent ||
+				    oldValue == NullValueStatus.Unassigned)
+					return incomingValue;
+
+				if (incomingValue == NullValueStatus.Unassigned) {
+					return NullValueStatus.Unassigned;
+				}
+
+				if (oldValue == NullValueStatus.CapturedUnknown || incomingValue == NullValueStatus.CapturedUnknown) {
+					//TODO: Check if this is right
+					return NullValueStatus.CapturedUnknown;
+				}
+
+				if (oldValue == NullValueStatus.Unknown) {
+					return NullValueStatus.Unknown;
+				}
+
+				if (oldValue == NullValueStatus.DefinitelyNull) {
+					return incomingValue == NullValueStatus.DefinitelyNull ?
+						NullValueStatus.DefinitelyNull : NullValueStatus.PotentiallyNull;
+				}
+
+				if (oldValue == NullValueStatus.DefinitelyNotNull) {
+					if (incomingValue == NullValueStatus.Unknown)
+						return NullValueStatus.Unknown;
+					if (incomingValue == NullValueStatus.DefinitelyNotNull)
+						return NullValueStatus.DefinitelyNotNull;
+					return NullValueStatus.PotentiallyNull;
+				}
+
+				Debug.Assert(oldValue == NullValueStatus.PotentiallyNull);
+				return NullValueStatus.PotentiallyNull;
+			}
+
+			public bool HasVariable(string variable) {
+				return VariableStatus.ContainsKey(variable);
+			}
+
+			public VariableStatusInfo Clone() {
+				var clone = new VariableStatusInfo();
+				foreach (var item in VariableStatus) {
+					clone.VariableStatus.Add(item.Key, item.Value);
+				}
+				return clone;
+			}
+
+			public override bool Equals(object obj)
+			{
+				return Equals(obj as VariableStatusInfo);
+			}
+
+			public bool Equals(VariableStatusInfo obj)
+			{
+				if (obj == null) {
+					return false;
+				}
+
+				if (VariableStatus.Count != obj.VariableStatus.Count)
+					return false;
+
+				return VariableStatus.All(item => item.Value == obj[item.Key]);
+			}
+
+			public override int GetHashCode()
+			{
+				//STUB
+				return VariableStatus.Count.GetHashCode();
+			}
+
+			public static bool operator ==(VariableStatusInfo obj1, VariableStatusInfo obj2) {
+				return object.ReferenceEquals(obj1, null) ?
+					object.ReferenceEquals(obj2, null) : obj1.Equals(obj2);
+			}
+
+			public static bool operator !=(VariableStatusInfo obj1, VariableStatusInfo obj2) {
+				return !(obj1 == obj2);
+			}
+
+			public IEnumerator<KeyValuePair<string, NullValueStatus>> GetEnumerator()
+			{
+				return VariableStatus.GetEnumerator();
+			}
+
+			IEnumerator IEnumerable.GetEnumerator()
+			{
+				return GetEnumerator();
+			}
+
+			public override string ToString()
+			{
+				var builder = new StringBuilder("[");
+				foreach (var item in this) {
+					builder.Append(item.Key);
+					builder.Append("=");
+					builder.Append(item.Value);
+				}
+				builder.Append("]");
+				return builder.ToString();
+			}
+		}
+
+		sealed class NullAnalysisNode : ControlFlowNode
+		{
+			public readonly VariableStatusInfo VariableState = new VariableStatusInfo();
+			public bool Visited { get; private set; }
+
+			public NullAnalysisNode(Statement previousStatement, Statement nextStatement, ControlFlowNodeType type)
+				: base(previousStatement, nextStatement, type)
+			{
+			}
+
+			public bool ReceiveIncoming(VariableStatusInfo incomingState)
+			{
+				bool changed = VariableState.ReceiveIncoming(incomingState);
+				if (!Visited) {
+					Visited = true;
+					return true;
+				}
+				return changed;
+			}
+		}
+
+		sealed class NullAnalysisGraphBuilder : ControlFlowGraphBuilder
+		{
+			protected override ControlFlowNode CreateNode(Statement previousStatement, Statement nextStatement, ControlFlowNodeType type)
+			{
+				return new NullAnalysisNode(previousStatement, nextStatement, type);
+			}
+		}
+
+		class PendingNode : IEquatable<PendingNode> {
+			internal readonly NullAnalysisNode nodeToVisit;
+			internal readonly VariableStatusInfo statusInfo;
+			internal readonly ComparableList<NullAnalysisNode> pendingTryFinallyNodes;
+			internal readonly NullAnalysisNode nodeAfterFinally;
+
+			internal PendingNode(NullAnalysisNode nodeToVisit, VariableStatusInfo statusInfo)
+				: this(nodeToVisit, statusInfo, new ComparableList<NullAnalysisNode>(), null)
+			{
+			}
+
+			public PendingNode(NullAnalysisNode nodeToVisit, VariableStatusInfo statusInfo, ComparableList<NullAnalysisNode> pendingFinallyNodes, NullAnalysisNode nodeAfterFinally)
+			{
+				this.nodeToVisit = nodeToVisit;
+				this.statusInfo = statusInfo;
+				this.pendingTryFinallyNodes = pendingFinallyNodes;
+				this.nodeAfterFinally = nodeAfterFinally;
+			}
+
+			public override bool Equals(object obj)
+			{
+				return Equals(obj as PendingNode);
+			}
+
+			public bool Equals(PendingNode obj) {
+				if (obj == null) return false;
+
+				if (nodeToVisit != obj.nodeToVisit) return false;
+				if (statusInfo != obj.statusInfo) return false;
+				if (pendingTryFinallyNodes != obj.pendingTryFinallyNodes) return false;
+				if (nodeAfterFinally != obj.nodeAfterFinally) return false;
+
+				return true;
+			}
+
+			public override int GetHashCode()
+			{
+				return nodeToVisit.GetHashCode() ^
+					statusInfo.GetHashCode() ^
+					pendingTryFinallyNodes.GetHashCode() ^
+					(nodeAfterFinally == null ? 0 : nodeAfterFinally.GetHashCode());
+			}
+		}
+
+		readonly BaseRefactoringContext context;
+		readonly NullAnalysisVisitor visitor;
+		List<NullAnalysisNode> allNodes;
+		readonly HashSet<PendingNode> nodesToVisit = new HashSet<PendingNode>();
+		Dictionary<Statement, NullAnalysisNode> nodeBeforeStatementDict;
+		Dictionary<Statement, NullAnalysisNode> nodeAfterStatementDict;
+		readonly Dictionary<Expression, NullValueStatus> expressionResult = new Dictionary<Expression, NullValueStatus>();
+
+		public NullValueAnalysis(BaseRefactoringContext context, MethodDeclaration methodDeclaration, CancellationToken cancellationToken)
+			: this(context, methodDeclaration.Body, methodDeclaration.Parameters, cancellationToken)
+		{
+		}
+
+		readonly IEnumerable<ParameterDeclaration> parameters;
+		readonly Statement rootStatement;
+
+		readonly CancellationToken cancellationToken;
+
+		public NullValueAnalysis(BaseRefactoringContext context, Statement rootStatement, IEnumerable<ParameterDeclaration> parameters, CancellationToken cancellationToken)
+		{
+			if (rootStatement == null)
+				throw new ArgumentNullException("rootStatement");
+			if (context == null)
+				throw new ArgumentNullException("context");
+
+			this.context = context;
+			this.rootStatement = rootStatement;
+			this.parameters = parameters;
+			this.visitor = new NullAnalysisVisitor(this);
+			this.cancellationToken = cancellationToken;
+		}
+
+		/// <summary>
+		/// Sets the local variable value.
+		/// This method does not change anything if identifier does not refer to a local variable.
+		/// Do not use this in variable declarations since resolving the variable won't work yet.
+		/// </summary>
+		/// <returns><c>true</c>, if local variable value was set, <c>false</c> otherwise.</returns>
+		/// <param name="data">The variable status data to change.</param>
+		/// <param name="identifierNode">The identifier to set.</param>
+		/// <param name="identifierName">The name of the identifier to set.</param>
+		/// <param name="value">The value to set the identifier.</param>
+		bool SetLocalVariableValue (VariableStatusInfo data, AstNode identifierNode, string identifierName, NullValueStatus value) {
+			var resolveResult = context.Resolve(identifierNode);
+			if (resolveResult is LocalResolveResult) {
+				if (data [identifierName] != NullValueStatus.CapturedUnknown) {
+					data [identifierName] = value;
+
+					return true;
+				}
+			}
+			return false;
+		}
+
+		bool SetLocalVariableValue (VariableStatusInfo data, IdentifierExpression identifierExpression, NullValueStatus value) {
+			return SetLocalVariableValue(data, identifierExpression, identifierExpression.Identifier, value);
+		}
+
+		bool SetLocalVariableValue (VariableStatusInfo data, Identifier identifier, NullValueStatus value) {
+			return SetLocalVariableValue(data, identifier, identifier.Name, value);
+		}
+
+		void SetupNode(NullAnalysisNode node)
+		{
+			foreach (var parameter in parameters) {
+				var resolveResult = context.Resolve(parameter.Type);
+				node.VariableState[parameter.Name] = GetInitialVariableStatus(resolveResult);
+			}
+
+			nodesToVisit.Add(new PendingNode(node, node.VariableState));
+		}
+
+		static bool IsTypeNullable(IType type)
+		{
+			return type.IsReferenceType == true || type.FullName == "System.Nullable";
+		}
+
+		public bool IsParametersAreUninitialized {
+			get;
+			set;
+		}
+
+		NullValueStatus GetInitialVariableStatus(ResolveResult resolveResult)
+		{
+			var typeResolveResult = resolveResult as TypeResolveResult;
+			if (typeResolveResult == null) {
+				return NullValueStatus.Error;
+			}
+			var type = typeResolveResult.Type;
+			if (type.IsReferenceType == null) {
+				return NullValueStatus.Error;
+			}
+			if (!IsParametersAreUninitialized)
+				return NullValueStatus.DefinitelyNotNull;
+			return IsTypeNullable(type) ? NullValueStatus.PotentiallyNull : NullValueStatus.DefinitelyNotNull;
+		}
+
+		public void Analyze()
+		{
+			var cfgBuilder = new NullAnalysisGraphBuilder();
+			allNodes = cfgBuilder.BuildControlFlowGraph(rootStatement, cancellationToken).Cast<NullAnalysisNode>().ToList();
+			nodeBeforeStatementDict = allNodes.Where(node => node.Type == ControlFlowNodeType.StartNode || node.Type == ControlFlowNodeType.BetweenStatements)
+				.ToDictionary(node => node.NextStatement);
+			nodeAfterStatementDict = allNodes.Where(node => node.Type == ControlFlowNodeType.BetweenStatements || node.Type == ControlFlowNodeType.EndNode)
+				.ToDictionary(node => node.PreviousStatement);
+
+			foreach (var node in allNodes) {
+				if (node.Type == ControlFlowNodeType.StartNode && node.NextStatement == rootStatement) {
+					Debug.Assert(!nodesToVisit.Any());
+
+					SetupNode(node);
+				}
+			}
+
+			while (nodesToVisit.Any()) {
+				var nodeToVisit = nodesToVisit.First();
+				nodesToVisit.Remove(nodeToVisit);
+
+				Visit(nodeToVisit);
+			}
+		}
+
+		int visits = 0;
+
+		public int NodeVisits
+		{
+			get {
+				return visits;
+			}
+		}
+
+		void Visit(PendingNode nodeInfo)
+		{
+			cancellationToken.ThrowIfCancellationRequested();
+
+			var node = nodeInfo.nodeToVisit;
+			var statusInfo = nodeInfo.statusInfo;
+
+			visits++;
+			if (visits > 100) {
+				//Visiting way too often, let's enter fast mode
+				//Fast mode is slighly less accurate but visits each node less times
+				nodesToVisit.RemoveWhere(candidate => candidate.nodeToVisit == nodeInfo.nodeToVisit &&
+				                         candidate.pendingTryFinallyNodes.Equals(nodeInfo.pendingTryFinallyNodes) &&
+				                         candidate.nodeAfterFinally == nodeInfo.nodeAfterFinally);
+				statusInfo = node.VariableState;
+			}
+
+			var nextStatement = node.NextStatement;
+			VariableStatusInfo outgoingStatusInfo = statusInfo;
+			VisitorResult result = null;
+
+			if (nextStatement != null && (!(nextStatement is DoWhileStatement) || node.Type == ControlFlowNodeType.LoopCondition)) {
+				result = nextStatement.AcceptVisitor(visitor, statusInfo);
+				if (result == null) {
+					Console.WriteLine("Failure in {0}", nextStatement);
+					throw new InvalidOperationException();
+				}
+
+				outgoingStatusInfo = result.Variables;
+			}
+
+			if ((result == null || !result.ThrowsException) && node.Outgoing.Any()) {
+				var tryFinallyStatement = nextStatement as TryCatchStatement;
+
+				foreach (var outgoingEdge in node.Outgoing) {
+					VariableStatusInfo edgeInfo;
+					edgeInfo = outgoingStatusInfo.Clone();
+
+					if (node.Type == ControlFlowNodeType.EndNode) {
+						var previousBlock = node.PreviousStatement as BlockStatement;
+						if (previousBlock != null) {
+							//We're leaving a block statement.
+							//As such, we'll remove the variables that were declared *in* the loop
+							//This helps GetVariableStatusAfter/BeforeStatement be more accurate
+							//and prevents some redundant revisiting.
+
+							foreach (var variableInitializer in previousBlock.Statements
+							         .OfType<VariableDeclarationStatement>()
+							         .SelectMany(declaration => declaration.Variables)) {
+
+								edgeInfo [variableInitializer.Name] = NullValueStatus.UnreachableOrInexistent;
+							}
+						}
+					}
+
+					if (tryFinallyStatement != null) {
+						//With the exception of try statements, this needs special handling:
+						//we'll set all changed variables to Unknown or CapturedUnknown
+						if (outgoingEdge.To.NextStatement == tryFinallyStatement.FinallyBlock) {
+							foreach (var identifierExpression in tryFinallyStatement.TryBlock.Descendants.OfType<IdentifierExpression>()) {
+								//TODO: Investigate CaptureUnknown
+								SetLocalVariableValue(edgeInfo, identifierExpression, NullValueStatus.Unknown);
+							}
+						} else {
+							var clause = tryFinallyStatement.CatchClauses
+								.FirstOrDefault(candidateClause => candidateClause.Body == outgoingEdge.To.NextStatement);
+
+							if (clause != null) {
+								SetLocalVariableValue(edgeInfo, clause.VariableNameToken, NullValueStatus.DefinitelyNotNull);
+
+								foreach (var identifierExpression in tryFinallyStatement.TryBlock.Descendants.OfType<IdentifierExpression>()) {
+									//TODO: Investigate CaptureUnknown
+									SetLocalVariableValue(edgeInfo, identifierExpression, NullValueStatus.Unknown);
+								}
+							}
+						}
+					}
+
+					if (result != null) {
+						switch (outgoingEdge.Type) {
+							case ControlFlowEdgeType.ConditionTrue:
+								if (result.KnownBoolResult == false) {
+									//No need to explore this path -- expression is known to be false
+									continue;
+								}
+								edgeInfo = result.TruePathVariables;
+								break;
+							case ControlFlowEdgeType.ConditionFalse:
+								if (result.KnownBoolResult == true) {
+									//No need to explore this path -- expression is known to be true
+									continue;
+								}
+								edgeInfo = result.FalsePathVariables;
+								break;
+						}
+					}
+
+					if (outgoingEdge.IsLeavingTryFinally) {
+						var nodeAfterFinally = (NullAnalysisNode)outgoingEdge.To;
+						var finallyNodes = outgoingEdge.TryFinallyStatements.Select(tryFinally => nodeBeforeStatementDict [tryFinally.FinallyBlock]).ToList();
+						var nextNode = finallyNodes.First();
+						var remainingFinallyNodes = new ComparableList<NullAnalysisNode>(finallyNodes.Skip(1));
+						//We have to visit the node even if ReceiveIncoming returns false
+						//since the finallyNodes/nodeAfterFinally might be different even if the values of variables are the same -- and they need to be visited either way!
+						//TODO 1: Is there any point in visiting the finally statement here?
+						//TODO 2: Do we need the ReceiveIncoming at all?
+						nextNode.ReceiveIncoming(edgeInfo);
+						nodesToVisit.Add(new PendingNode(nextNode, edgeInfo, remainingFinallyNodes, nodeAfterFinally));
+					} else {
+						var outgoingNode = (NullAnalysisNode)outgoingEdge.To;
+						if (outgoingNode.ReceiveIncoming(edgeInfo)) {
+							nodesToVisit.Add(new PendingNode(outgoingNode, edgeInfo));
+						}
+					}
+				}
+			} else {
+				//We found a return/throw/yield break or some other termination node
+				var finallyBlockStarts = nodeInfo.pendingTryFinallyNodes;
+				var nodeAfterFinally = nodeInfo.nodeAfterFinally;
+
+				if (finallyBlockStarts.Any()) {
+					var nextNode = finallyBlockStarts.First();
+					if (nextNode.ReceiveIncoming(outgoingStatusInfo))
+						nodesToVisit.Add(new PendingNode(nextNode, outgoingStatusInfo, new ComparableList<NullAnalysisNode>(finallyBlockStarts.Skip(1)), nodeInfo.nodeAfterFinally));
+				} else if (nodeAfterFinally != null && nodeAfterFinally.ReceiveIncoming(outgoingStatusInfo)) {
+					nodesToVisit.Add(new PendingNode(nodeAfterFinally, outgoingStatusInfo));
+				} else {
+					//Maybe we finished a try/catch/finally statement the "normal" way (no direct jumps)
+					//so let's check that case
+					var statement = node.PreviousStatement ?? node.NextStatement;
+					Debug.Assert(statement != null);
+					var parent = statement.GetParent<Statement>();
+					var parentTryCatch = parent as TryCatchStatement;
+					if (parentTryCatch != null) {
+						var nextNode = nodeAfterStatementDict [parentTryCatch];
+						if (nextNode.ReceiveIncoming(outgoingStatusInfo)) {
+							nodesToVisit.Add(new PendingNode(nextNode, outgoingStatusInfo));
+						}
+					}
+				}
+			}
+		}
+
+		public NullValueStatus GetExpressionResult(Expression expr)
+		{
+			if (expr == null)
+				throw new ArgumentNullException("expr");
+
+			NullValueStatus info;
+			if (expressionResult.TryGetValue(expr, out info)) {
+				return info;
+			}
+
+			return NullValueStatus.UnreachableOrInexistent;
+		}
+
+		public NullValueStatus GetVariableStatusBeforeStatement(Statement stmt, string variableName)
+		{
+			if (stmt == null)
+				throw new ArgumentNullException("stmt");
+			if (variableName == null)
+				throw new ArgumentNullException("variableName");
+
+			NullAnalysisNode node;
+			if (nodeBeforeStatementDict.TryGetValue(stmt, out node)) {
+				return node.VariableState [variableName];
+			}
+
+			return NullValueStatus.UnreachableOrInexistent;
+		}
+
+		public NullValueStatus GetVariableStatusAfterStatement(Statement stmt, string variableName)
+		{
+			if (stmt == null)
+				throw new ArgumentNullException("stmt");
+			if (variableName == null)
+				throw new ArgumentNullException("variableName");
+
+			NullAnalysisNode node;
+			if (nodeAfterStatementDict.TryGetValue(stmt, out node)) {
+				return node.VariableState [variableName];
+			}
+
+			return NullValueStatus.UnreachableOrInexistent;
+		}
+
+		class ConditionalBranchInfo
+		{
+			/// <summary>
+			/// True if the variable is null for the true path, false if it is false for the true path.
+			/// </summary>
+			public Dictionary<string, bool> TrueResultVariableNullStates = new Dictionary<string, bool>();
+			/// <summary>
+			/// True if the variable is null for the false path, false if it is false for the false path.
+			/// </summary>
+			public Dictionary<string, bool> FalseResultVariableNullStates = new Dictionary<string, bool>();
+		}
+
+		class VisitorResult
+		{
+			/// <summary>
+			/// Indicates the return value of the expression.
+			/// </summary>
+			/// <remarks>
+			/// Only applicable for expressions.
+			/// </remarks>
+			public NullValueStatus NullableReturnResult;
+
+			/// <summary>
+			/// Indicates the value of each item in an array or linq query.
+			/// </summary>
+			public NullValueStatus EnumeratedValueResult;
+
+			/// <summary>
+			/// Information that indicates the restrictions to add
+			/// when branching.
+			/// </summary>
+			/// <remarks>
+			/// Used in if/else statements, conditional expressions and
+			/// while statements.
+			/// </remarks>
+			public ConditionalBranchInfo ConditionalBranchInfo;
+
+			/// <summary>
+			/// The state of the variables after the expression is executed.
+			/// </summary>
+			public VariableStatusInfo Variables;
+
+			/// <summary>
+			/// The expression is known to be invalid and trigger an error
+			/// (e.g. a NullReferenceException)
+			/// </summary>
+			public bool ThrowsException;
+
+			/// <summary>
+			/// The known bool result of an expression.
+			/// </summary>
+			public bool? KnownBoolResult;
+
+			public static VisitorResult ForEnumeratedValue(VariableStatusInfo variables, NullValueStatus itemValues)
+			{
+				var result = new VisitorResult();
+				result.NullableReturnResult = NullValueStatus.DefinitelyNotNull;
+				result.EnumeratedValueResult = itemValues;
+				result.Variables = variables.Clone();
+				return result;
+			}
+
+			public static VisitorResult ForValue(VariableStatusInfo variables, NullValueStatus returnValue)
+			{
+				var result = new VisitorResult();
+				result.NullableReturnResult = returnValue;
+				result.Variables = variables.Clone();
+				return result;
+			}
+
+			public static VisitorResult ForBoolValue(VariableStatusInfo variables, bool newValue)
+			{
+				var result = new VisitorResult();
+				result.NullableReturnResult = NullValueStatus.DefinitelyNotNull; //Bool expressions are never null
+				result.KnownBoolResult = newValue;
+				result.Variables = variables.Clone();
+				return result;
+			}
+
+			public static VisitorResult ForException(VariableStatusInfo variables) {
+				var result = new VisitorResult();
+				result.NullableReturnResult = NullValueStatus.UnreachableOrInexistent;
+				result.ThrowsException = true;
+				result.Variables = variables.Clone();
+				return result;
+			}
+
+			public VisitorResult Negated {
+				get {
+					var result = new VisitorResult();
+					if (NullableReturnResult.IsDefiniteValue()) {
+						result.NullableReturnResult = NullableReturnResult == NullValueStatus.DefinitelyNull
+							? NullValueStatus.DefinitelyNotNull : NullValueStatus.DefinitelyNull;
+					} else {
+						result.NullableReturnResult = NullableReturnResult;
+					}
+					result.Variables = Variables.Clone();
+					result.KnownBoolResult = !KnownBoolResult;
+					if (ConditionalBranchInfo != null) {
+						result.ConditionalBranchInfo = new ConditionalBranchInfo();
+						foreach (var item in ConditionalBranchInfo.TrueResultVariableNullStates) {
+							result.ConditionalBranchInfo.FalseResultVariableNullStates [item.Key] = item.Value;
+						}
+						foreach (var item in ConditionalBranchInfo.FalseResultVariableNullStates) {
+							result.ConditionalBranchInfo.TrueResultVariableNullStates [item.Key] = item.Value;
+						}
+					}
+					return result;
+				}
+			}
+
+			public VariableStatusInfo TruePathVariables {
+				get {
+					var variables = Variables.Clone();
+					if (ConditionalBranchInfo != null) {
+						foreach (var item in ConditionalBranchInfo.TrueResultVariableNullStates) {
+							variables [item.Key] = item.Value ? NullValueStatus.DefinitelyNull : NullValueStatus.DefinitelyNotNull;
+						}
+					}
+					return variables;
+				}
+			}
+
+			public VariableStatusInfo FalsePathVariables {
+				get {
+					var variables = Variables.Clone();
+					if (ConditionalBranchInfo != null) {
+						foreach (var item in ConditionalBranchInfo.FalseResultVariableNullStates) {
+							variables [item.Key] = item.Value ? NullValueStatus.DefinitelyNull : NullValueStatus.DefinitelyNotNull;
+						}
+					}
+					return variables;
+				}
+			}
+
+			public static VisitorResult AndOperation(VisitorResult tentativeLeftResult, VisitorResult tentativeRightResult)
+			{
+				var result = new VisitorResult();
+				result.KnownBoolResult = tentativeLeftResult.KnownBoolResult & tentativeRightResult.KnownBoolResult;
+
+				var trueTruePath = tentativeRightResult.TruePathVariables;
+				var trueFalsePath = tentativeRightResult.FalsePathVariables;
+				var falsePath = tentativeLeftResult.FalsePathVariables;
+
+				var trueVariables = trueTruePath;
+
+				var falseVariables = trueFalsePath.Clone();
+				falseVariables.ReceiveIncoming(falsePath);
+				result.Variables = trueVariables.Clone();
+				result.Variables.ReceiveIncoming(falseVariables);
+
+				result.ConditionalBranchInfo = new ConditionalBranchInfo();
+
+				foreach (var variable in trueVariables) {
+					if (!variable.Value.IsDefiniteValue())
+						continue;
+
+					string variableName = variable.Key;
+
+					if (variable.Value != result.Variables[variableName]) {
+						bool isNull = variable.Value == NullValueStatus.DefinitelyNull;
+						result.ConditionalBranchInfo.TrueResultVariableNullStates.Add(variableName, isNull);
+					}
+				}
+
+				foreach (var variable in falseVariables) {
+					if (!variable.Value.IsDefiniteValue())
+						continue;
+
+					string variableName = variable.Key;
+
+					if (variable.Value != result.Variables [variableName]) {
+						bool isNull = variable.Value == NullValueStatus.DefinitelyNull;
+						result.ConditionalBranchInfo.FalseResultVariableNullStates.Add(variableName, isNull);
+					}
+				}
+
+				return result;
+			}
+
+			public static VisitorResult OrOperation(VisitorResult tentativeLeftResult, VisitorResult tentativeRightResult)
+			{
+				return VisitorResult.AndOperation(tentativeLeftResult.Negated, tentativeRightResult.Negated).Negated;
+			}
+		}
+
+		class NullAnalysisVisitor : DepthFirstAstVisitor<VariableStatusInfo, VisitorResult>
+		{
+			NullValueAnalysis analysis;
+
+			public NullAnalysisVisitor(NullValueAnalysis analysis) {
+				this.analysis = analysis;
+			}
+
+			public override VisitorResult VisitEmptyStatement(EmptyStatement emptyStatement, VariableStatusInfo data)
+			{
+				return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitBlockStatement(BlockStatement blockStatement, VariableStatusInfo data)
+			{
+				//We'll visit the child statements later (we'll visit each one directly from the CFG)
+				//As such this is mostly a dummy node.
+				return new VisitorResult { Variables = data };
+			}
+
+			public override VisitorResult VisitVariableDeclarationStatement(VariableDeclarationStatement variableDeclarationStatement, VariableStatusInfo data)
+			{
+				foreach (var variable in variableDeclarationStatement.Variables) {
+					var result = variable.AcceptVisitor(this, data);
+					if (result.ThrowsException)
+						return result;
+					data = result.Variables;
+				}
+
+				return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitVariableInitializer(VariableInitializer variableInitializer, VariableStatusInfo data)
+			{
+				if (variableInitializer.Initializer.IsNull) {
+					data = data.Clone();
+					data[variableInitializer.Name] = NullValueStatus.Unassigned;
+				} else {
+					var result = variableInitializer.Initializer.AcceptVisitor(this, data);
+					if (result.ThrowsException)
+						return result;
+					data = result.Variables.Clone();
+					data[variableInitializer.Name] = result.NullableReturnResult;
+				}
+
+				return VisitorResult.ForValue(data, data [variableInitializer.Name]);
+			}
+
+			public override VisitorResult VisitIfElseStatement(IfElseStatement ifElseStatement, VariableStatusInfo data)
+			{
+				//We'll visit the true/false statements later (directly from the CFG)
+				return ifElseStatement.Condition.AcceptVisitor(this, data);
+			}
+
+			public override VisitorResult VisitWhileStatement(WhileStatement whileStatement, VariableStatusInfo data)
+			{
+				return whileStatement.Condition.AcceptVisitor(this, data);
+			}
+
+			public override VisitorResult VisitDoWhileStatement(DoWhileStatement doWhileStatement, VariableStatusInfo data)
+			{
+				return doWhileStatement.Condition.AcceptVisitor(this, data);
+			}
+
+			public override VisitorResult VisitForStatement(ForStatement forStatement, VariableStatusInfo data)
+			{
+				//The initializers, the embedded statement and the iterators aren't visited here
+				//because they have their own CFG nodes.
+				if (forStatement.Condition.IsNull)
+					return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+				return forStatement.Condition.AcceptVisitor(this, data);
+			}
+
+			public override VisitorResult VisitForeachStatement(ForeachStatement foreachStatement, VariableStatusInfo data)
+			{
+				var newVariable = foreachStatement.VariableNameToken;
+				var inExpressionResult = foreachStatement.InExpression.AcceptVisitor(this, data);
+				if (inExpressionResult.ThrowsException)
+					return inExpressionResult;
+
+				var newData = inExpressionResult.Variables.Clone();
+
+				var resolveResult = analysis.context.Resolve(foreachStatement.VariableNameToken) as LocalResolveResult;
+				if (resolveResult != null) {
+					//C# 5.0 changed the meaning of foreach so that each iteration declares a new variable
+					//as such, the variable is "uncaptured" only for C# >= 5.0
+					if (analysis.context.Supports(new Version(5, 0)) || data[newVariable.Name] != NullValueStatus.CapturedUnknown) {
+						newData[newVariable.Name] = NullValueAnalysis.IsTypeNullable(resolveResult.Type) ? inExpressionResult.EnumeratedValueResult : NullValueStatus.DefinitelyNotNull;
+					}
+				}
+
+				return VisitorResult.ForValue(newData, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitUsingStatement(UsingStatement usingStatement, VariableStatusInfo data)
+			{
+				return usingStatement.ResourceAcquisition.AcceptVisitor(this, data);
+			}
+
+			public override VisitorResult VisitFixedStatement(FixedStatement fixedStatement, VariableStatusInfo data)
+			{
+				foreach (var variable in fixedStatement.Variables) {
+					var result = variable.AcceptVisitor(this, data);
+					if (result.ThrowsException)
+						return result;
+					data = result.Variables;
+				}
+
+				return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitSwitchStatement(SwitchStatement switchStatement, VariableStatusInfo data)
+			{
+				//We could do better than this, but it would require special handling outside the visitor
+				//so for now, for simplicity, we'll just take the easy way
+
+				var tentativeResult = switchStatement.Expression.AcceptVisitor(this, data);
+				if (tentativeResult.ThrowsException) {
+					return tentativeResult;
+				}
+
+				foreach (var section in switchStatement.SwitchSections) {
+					//No need to check for ThrowsException, since it will always be false (see VisitSwitchSection)
+					section.AcceptVisitor(this, tentativeResult.Variables);
+				}
+
+				return VisitorResult.ForValue(tentativeResult.Variables, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitSwitchSection(SwitchSection switchSection, VariableStatusInfo data)
+			{
+				return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitExpressionStatement(ExpressionStatement expressionStatement, VariableStatusInfo data)
+			{
+				return expressionStatement.Expression.AcceptVisitor(this, data);
+			}
+
+			public override VisitorResult VisitReturnStatement(ReturnStatement returnStatement, VariableStatusInfo data)
+			{
+				if (returnStatement.Expression.IsNull)
+					return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+				return returnStatement.Expression.AcceptVisitor(this, data);
+			}
+
+			public override VisitorResult VisitTryCatchStatement(TryCatchStatement tryCatchStatement, VariableStatusInfo data)
+			{
+				//The needs special treatment in the analyser itself
+				return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitBreakStatement(BreakStatement breakStatement, VariableStatusInfo data)
+			{
+				return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitContinueStatement(ContinueStatement continueStatement, VariableStatusInfo data)
+			{
+				return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitGotoStatement(GotoStatement gotoStatement, VariableStatusInfo data)
+			{
+				return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitGotoCaseStatement(GotoCaseStatement gotoCaseStatement, VariableStatusInfo data)
+			{
+				return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitGotoDefaultStatement(GotoDefaultStatement gotoDefaultStatement, VariableStatusInfo data)
+			{
+				return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitLabelStatement(LabelStatement labelStatement, VariableStatusInfo data)
+			{
+				return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitUnsafeStatement(UnsafeStatement unsafeStatement, VariableStatusInfo data)
+			{
+				return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitLockStatement(LockStatement lockStatement, VariableStatusInfo data)
+			{
+				var expressionResult = lockStatement.Expression.AcceptVisitor(this, data);
+				if (expressionResult.ThrowsException)
+					return expressionResult;
+
+				if (expressionResult.NullableReturnResult == NullValueStatus.DefinitelyNull) {
+					return VisitorResult.ForException(expressionResult.Variables);
+				}
+
+				var identifier = CSharpUtil.GetInnerMostExpression(lockStatement.Expression) as IdentifierExpression;
+				if (identifier != null) {
+					var identifierValue = expressionResult.Variables [identifier.Identifier];
+					if (identifierValue != NullValueStatus.CapturedUnknown) {
+						var newVariables = expressionResult.Variables.Clone();
+						analysis.SetLocalVariableValue(newVariables, identifier, NullValueStatus.DefinitelyNotNull);
+
+						return VisitorResult.ForValue(newVariables, NullValueStatus.Unknown);
+					}
+				}
+
+				return VisitorResult.ForValue(expressionResult.Variables, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitThrowStatement(ThrowStatement throwStatement, VariableStatusInfo data)
+			{
+				if (throwStatement.Expression.IsNull)
+					return VisitorResult.ForValue(data, NullValueStatus.DefinitelyNotNull);
+				return throwStatement.Expression.AcceptVisitor(this, data);
+			}
+
+			public override VisitorResult VisitYieldBreakStatement(YieldBreakStatement yieldBreakStatement, VariableStatusInfo data)
+			{
+				return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitYieldReturnStatement(YieldReturnStatement yieldReturnStatement, VariableStatusInfo data)
+			{
+				return yieldReturnStatement.Expression.AcceptVisitor(this, data);
+			}
+
+			public override VisitorResult VisitCheckedStatement(CheckedStatement checkedStatement, VariableStatusInfo data)
+			{
+				return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitUncheckedStatement(UncheckedStatement uncheckedStatement, VariableStatusInfo data)
+			{
+				return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+			}
+
+			void RegisterExpressionResult(Expression expression, NullValueStatus expressionResult)
+			{
+				NullValueStatus oldStatus;
+				if (analysis.expressionResult.TryGetValue(expression, out oldStatus)) {
+					analysis.expressionResult[expression] = VariableStatusInfo.CombineStatus(analysis.expressionResult[expression], expressionResult);
+				}
+				else {
+					analysis.expressionResult[expression] = expressionResult;
+				}
+			}
+
+			VisitorResult HandleExpressionResult(Expression expression, VariableStatusInfo dataAfterExpression, NullValueStatus expressionResult) {
+				RegisterExpressionResult(expression, expressionResult);
+
+				return VisitorResult.ForValue(dataAfterExpression, expressionResult);
+			}
+
+			VisitorResult HandleExpressionResult(Expression expression, VariableStatusInfo dataAfterExpression, bool expressionResult) {
+				RegisterExpressionResult(expression, NullValueStatus.DefinitelyNotNull);
+
+				return VisitorResult.ForBoolValue(dataAfterExpression, expressionResult);
+			}
+
+			VisitorResult HandleExpressionResult(Expression expression, VisitorResult result) {
+				RegisterExpressionResult(expression, result.NullableReturnResult);
+
+				return result;
+			}
+
+			public override VisitorResult VisitAssignmentExpression(AssignmentExpression assignmentExpression, VariableStatusInfo data)
+			{
+				var tentativeResult = assignmentExpression.Left.AcceptVisitor(this, data);
+				if (tentativeResult.ThrowsException)
+					return HandleExpressionResult(assignmentExpression, tentativeResult);
+				tentativeResult = assignmentExpression.Right.AcceptVisitor(this, tentativeResult.Variables);
+				if (tentativeResult.ThrowsException)
+					return HandleExpressionResult(assignmentExpression, tentativeResult);
+
+				var leftIdentifier = assignmentExpression.Left as IdentifierExpression;
+				if (leftIdentifier != null) {
+					var resolveResult = analysis.context.Resolve(leftIdentifier);
+					if (resolveResult.IsError) {
+						return HandleExpressionResult(assignmentExpression, data, NullValueStatus.Error);
+					}
+
+					if (resolveResult is LocalResolveResult) {
+						var result = new VisitorResult();
+						result.NullableReturnResult = tentativeResult.NullableReturnResult;
+						result.Variables = tentativeResult.Variables.Clone();
+						var oldValue = result.Variables [leftIdentifier.Identifier];
+
+						if (assignmentExpression.Operator == AssignmentOperatorType.Assign ||
+						    oldValue == NullValueStatus.Unassigned ||
+						    oldValue == NullValueStatus.DefinitelyNotNull ||
+						    tentativeResult.NullableReturnResult == NullValueStatus.Error ||
+						    tentativeResult.NullableReturnResult == NullValueStatus.Unknown) {
+							analysis.SetLocalVariableValue(result.Variables, leftIdentifier, tentativeResult.NullableReturnResult);
+						} else {
+							if (oldValue == NullValueStatus.DefinitelyNull) {
+								//Do nothing --it'll remain null
+							} else {
+								analysis.SetLocalVariableValue(result.Variables, leftIdentifier, NullValueStatus.PotentiallyNull);
+							}
+						}
+
+						return HandleExpressionResult(assignmentExpression, result);
+					}
+				}
+
+				return HandleExpressionResult(assignmentExpression, tentativeResult);
+			}
+
+			public override VisitorResult VisitIdentifierExpression(IdentifierExpression identifierExpression, VariableStatusInfo data)
+			{
+				var resolveResult = analysis.context.Resolve(identifierExpression);
+				if (resolveResult.IsError) {
+					return HandleExpressionResult(identifierExpression, data, NullValueStatus.Error);
+				}
+				var local = resolveResult as LocalResolveResult;
+				if (local != null) {
+					var value = data [local.Variable.Name];
+					if (value == NullValueStatus.CapturedUnknown)
+						value = NullValueStatus.Unknown;
+					return HandleExpressionResult(identifierExpression, data, value);
+				}
+				if (resolveResult.IsCompileTimeConstant) {
+					object value = resolveResult.ConstantValue;
+					if (value == null) {
+						return HandleExpressionResult(identifierExpression, data, NullValueStatus.DefinitelyNull);
+					}
+					var boolValue = value as bool?;
+					if (boolValue != null) {
+						return VisitorResult.ForBoolValue(data, (bool)boolValue);
+					}
+					return HandleExpressionResult(identifierExpression, data, NullValueStatus.DefinitelyNotNull);
+				}
+
+				var memberResolveResult = resolveResult as MemberResolveResult;
+
+				var returnValue = GetFieldReturnValue(memberResolveResult, data);
+
+				return HandleExpressionResult(identifierExpression, data, returnValue);
+			}
+
+			public override VisitorResult VisitDefaultValueExpression(DefaultValueExpression defaultValueExpression, VariableStatusInfo data)
+			{
+				var resolveResult = analysis.context.Resolve(defaultValueExpression);
+				if (resolveResult.IsError) {
+					return HandleExpressionResult(defaultValueExpression, data, NullValueStatus.Unknown);
+				}
+
+				Debug.Assert(resolveResult.IsCompileTimeConstant);
+
+				var status = resolveResult.ConstantValue == null  && resolveResult.Type.IsReferenceType != false ? NullValueStatus.DefinitelyNull : NullValueStatus.DefinitelyNotNull;
+				return HandleExpressionResult(defaultValueExpression, data, status);
+			}
+
+			public override VisitorResult VisitNullReferenceExpression(NullReferenceExpression nullReferenceExpression, VariableStatusInfo data)
+			{
+				return HandleExpressionResult(nullReferenceExpression, data, NullValueStatus.DefinitelyNull);
+			}
+
+			public override VisitorResult VisitPrimitiveExpression(PrimitiveExpression primitiveExpression, VariableStatusInfo data)
+			{
+				return HandleExpressionResult(primitiveExpression, data, NullValueStatus.DefinitelyNotNull);
+			}
+
+			public override VisitorResult VisitParenthesizedExpression(ParenthesizedExpression parenthesizedExpression, VariableStatusInfo data)
+			{
+				return HandleExpressionResult(parenthesizedExpression, parenthesizedExpression.Expression.AcceptVisitor(this, data));
+			}
+
+			public override VisitorResult VisitConditionalExpression(ConditionalExpression conditionalExpression, VariableStatusInfo data)
+			{
+				var tentativeBaseResult = conditionalExpression.Condition.AcceptVisitor(this, data);
+				if (tentativeBaseResult.ThrowsException)
+					return HandleExpressionResult(conditionalExpression, tentativeBaseResult);
+
+				var conditionResolveResult = analysis.context.Resolve(conditionalExpression.Condition);
+
+				if (tentativeBaseResult.KnownBoolResult == true || true.Equals(conditionResolveResult.ConstantValue)) {
+					return HandleExpressionResult(conditionalExpression, conditionalExpression.TrueExpression.AcceptVisitor(this, tentativeBaseResult.TruePathVariables));
+				}
+				if (tentativeBaseResult.KnownBoolResult == false || false.Equals(conditionResolveResult.ConstantValue)) {
+					return HandleExpressionResult(conditionalExpression, conditionalExpression.FalseExpression.AcceptVisitor(this, tentativeBaseResult.FalsePathVariables));
+				}
+
+				//No known bool result
+				var trueCaseResult = conditionalExpression.TrueExpression.AcceptVisitor(this, tentativeBaseResult.TruePathVariables);
+				if (trueCaseResult.ThrowsException) {
+					//We know that the true case will never be completed, then the right case is the only possible route.
+					return HandleExpressionResult(conditionalExpression, conditionalExpression.FalseExpression.AcceptVisitor(this, tentativeBaseResult.FalsePathVariables));
+				}
+				var falseCaseResult = conditionalExpression.FalseExpression.AcceptVisitor(this, tentativeBaseResult.FalsePathVariables);
+				if (falseCaseResult.ThrowsException) {
+					return HandleExpressionResult(conditionalExpression, trueCaseResult.Variables, true);
+				}
+
+				return HandleExpressionResult(conditionalExpression, VisitorResult.OrOperation(trueCaseResult, falseCaseResult));
+			}
+
+			public override VisitorResult VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression, VariableStatusInfo data)
+			{
+				//Let's not evaluate the sides just yet because of ??, && and ||
+
+				//We'll register the results here (with HandleExpressionResult)
+				//so each Visit*Expression won't have to do it itself
+				switch (binaryOperatorExpression.Operator) {
+					case BinaryOperatorType.ConditionalAnd:
+						return HandleExpressionResult(binaryOperatorExpression, VisitConditionalAndExpression(binaryOperatorExpression, data));
+					case BinaryOperatorType.ConditionalOr:
+						return HandleExpressionResult(binaryOperatorExpression, VisitConditionalOrExpression(binaryOperatorExpression, data));
+					case BinaryOperatorType.NullCoalescing:
+						return HandleExpressionResult(binaryOperatorExpression, VisitNullCoalescing(binaryOperatorExpression, data));
+					case BinaryOperatorType.Equality:
+						return HandleExpressionResult(binaryOperatorExpression, VisitEquality(binaryOperatorExpression, data));
+					case BinaryOperatorType.InEquality:
+						return HandleExpressionResult(binaryOperatorExpression, VisitEquality(binaryOperatorExpression, data).Negated);
+					default:
+						return HandleExpressionResult(binaryOperatorExpression, VisitOtherBinaryExpression(binaryOperatorExpression, data));
+				}
+			}
+
+			VisitorResult VisitOtherBinaryExpression(BinaryOperatorExpression binaryOperatorExpression, VariableStatusInfo data)
+			{
+				var leftTentativeResult = binaryOperatorExpression.Left.AcceptVisitor(this, data);
+				if (leftTentativeResult.ThrowsException)
+					return leftTentativeResult;
+				var rightTentativeResult = binaryOperatorExpression.Right.AcceptVisitor(this, leftTentativeResult.Variables);
+				if (rightTentativeResult.ThrowsException)
+					return rightTentativeResult;
+
+				//TODO: Assuming operators are not overloaded by users
+				// (or, if they are, that they retain similar behavior to the default ones)
+
+				switch (binaryOperatorExpression.Operator) {
+					case BinaryOperatorType.LessThan:
+					case BinaryOperatorType.GreaterThan:
+						//Operations < and > with nulls always return false
+						//Those same operations will other values may or may not return false
+						if (leftTentativeResult.NullableReturnResult == NullValueStatus.DefinitelyNull &&
+							rightTentativeResult.NullableReturnResult == NullValueStatus.DefinitelyNull) {
+							return VisitorResult.ForBoolValue(rightTentativeResult.Variables, false);
+						}
+						//We don't know what the value is, but we know that both true and false are != null.
+						return VisitorResult.ForValue(rightTentativeResult.Variables, NullValueStatus.DefinitelyNotNull);
+					case BinaryOperatorType.LessThanOrEqual:
+					case BinaryOperatorType.GreaterThanOrEqual:
+						if (leftTentativeResult.NullableReturnResult == NullValueStatus.DefinitelyNull) {
+							if (rightTentativeResult.NullableReturnResult == NullValueStatus.DefinitelyNull)
+								return VisitorResult.ForBoolValue(rightTentativeResult.Variables, true);
+							if (rightTentativeResult.NullableReturnResult == NullValueStatus.DefinitelyNotNull)
+								return VisitorResult.ForBoolValue(rightTentativeResult.Variables, false);
+						} else if (leftTentativeResult.NullableReturnResult == NullValueStatus.DefinitelyNotNull) {
+							if (rightTentativeResult.NullableReturnResult == NullValueStatus.DefinitelyNull)
+								return VisitorResult.ForBoolValue(rightTentativeResult.Variables, false);
+						}
+
+						return VisitorResult.ForValue(rightTentativeResult.Variables, NullValueStatus.Unknown);
+					default:
+						//Anything else: null + anything == anything + null == null.
+						//not null + not null = not null
+						if (leftTentativeResult.NullableReturnResult == NullValueStatus.DefinitelyNull) {
+							return VisitorResult.ForValue(rightTentativeResult.Variables, NullValueStatus.DefinitelyNull);
+						}
+						if (leftTentativeResult.NullableReturnResult == NullValueStatus.DefinitelyNotNull) {
+							if (rightTentativeResult.NullableReturnResult == NullValueStatus.DefinitelyNull)
+								return VisitorResult.ForValue(rightTentativeResult.Variables, NullValueStatus.DefinitelyNull);
+							if (rightTentativeResult.NullableReturnResult == NullValueStatus.DefinitelyNotNull)
+								return VisitorResult.ForValue(rightTentativeResult.Variables, NullValueStatus.DefinitelyNotNull);
+						}
+
+						return VisitorResult.ForValue(rightTentativeResult.Variables, NullValueStatus.Unknown);
+				}
+			}
+
+			VisitorResult WithVariableValue(VisitorResult result, IdentifierExpression identifier, bool isNull)
+			{
+				var localVariableResult = analysis.context.Resolve(identifier) as LocalResolveResult;
+				if (localVariableResult != null) {
+					result.ConditionalBranchInfo.TrueResultVariableNullStates[identifier.Identifier] = isNull;
+					if (isNull) {
+						result.ConditionalBranchInfo.FalseResultVariableNullStates[identifier.Identifier] = false;
+					}
+				}
+				return result;
+			}
+
+			VisitorResult VisitEquality(BinaryOperatorExpression binaryOperatorExpression, VariableStatusInfo data)
+			{
+				//TODO: Should this check for user operators?
+
+				var tentativeLeftResult = binaryOperatorExpression.Left.AcceptVisitor(this, data);
+				if (tentativeLeftResult.ThrowsException)
+					return tentativeLeftResult;
+				var tentativeRightResult = binaryOperatorExpression.Right.AcceptVisitor(this, tentativeLeftResult.Variables);
+				if (tentativeRightResult.ThrowsException)
+					return tentativeRightResult;
+
+				if (tentativeLeftResult.KnownBoolResult != null && tentativeLeftResult.KnownBoolResult == tentativeRightResult.KnownBoolResult) {
+					return VisitorResult.ForBoolValue(tentativeRightResult.Variables, true);
+				}
+
+				if (tentativeLeftResult.KnownBoolResult != null && tentativeLeftResult.KnownBoolResult == !tentativeRightResult.KnownBoolResult) {
+					return VisitorResult.ForBoolValue(tentativeRightResult.Variables, false);
+				}
+
+				if (tentativeLeftResult.NullableReturnResult.IsDefiniteValue()) {
+					if (tentativeRightResult.NullableReturnResult.IsDefiniteValue()) {
+						if (tentativeLeftResult.NullableReturnResult == NullValueStatus.DefinitelyNull || tentativeRightResult.NullableReturnResult == NullValueStatus.DefinitelyNull) {
+							return VisitorResult.ForBoolValue(tentativeRightResult.Variables, tentativeLeftResult.NullableReturnResult == tentativeRightResult.NullableReturnResult);
+						}
+					}
+				}
+
+				var result = new VisitorResult();
+				result.Variables = tentativeRightResult.Variables;
+				result.NullableReturnResult = NullValueStatus.Unknown;
+				result.ConditionalBranchInfo = new ConditionalBranchInfo();
+
+				if (tentativeRightResult.NullableReturnResult.IsDefiniteValue()) {
+					var identifier = CSharpUtil.GetInnerMostExpression(binaryOperatorExpression.Left) as IdentifierExpression;
+
+					if (identifier != null) {
+						bool isNull = (tentativeRightResult.NullableReturnResult == NullValueStatus.DefinitelyNull);
+
+						WithVariableValue(result, identifier, isNull);
+					}
+				}
+
+				if (tentativeLeftResult.NullableReturnResult.IsDefiniteValue()) {
+					var identifier = CSharpUtil.GetInnerMostExpression(binaryOperatorExpression.Right) as IdentifierExpression;
+
+					if (identifier != null) {
+						bool isNull = (tentativeLeftResult.NullableReturnResult == NullValueStatus.DefinitelyNull);
+
+						WithVariableValue(result, identifier, isNull);
+					}
+				}
+
+				return result;
+			}
+
+			VisitorResult VisitConditionalAndExpression(BinaryOperatorExpression binaryOperatorExpression, VariableStatusInfo data)
+			{
+				var tentativeLeftResult = binaryOperatorExpression.Left.AcceptVisitor(this, data);
+				if (tentativeLeftResult.KnownBoolResult == false || tentativeLeftResult.ThrowsException) {
+					return tentativeLeftResult;
+				}
+
+				var truePath = tentativeLeftResult.TruePathVariables;
+				var tentativeRightResult = binaryOperatorExpression.Right.AcceptVisitor(this, truePath);
+				if (tentativeRightResult.ThrowsException) {
+					//If the true path throws an exception, then the only way for the expression to complete
+					//successfully is if the left expression is false
+					return VisitorResult.ForBoolValue(tentativeLeftResult.FalsePathVariables, false);
+				}
+
+				return VisitorResult.AndOperation(tentativeLeftResult, tentativeRightResult);
+			}
+
+			VisitorResult VisitConditionalOrExpression(BinaryOperatorExpression binaryOperatorExpression, VariableStatusInfo data)
+			{
+				var tentativeLeftResult = binaryOperatorExpression.Left.AcceptVisitor(this, data);
+				if (tentativeLeftResult.KnownBoolResult == true || tentativeLeftResult.ThrowsException) {
+					return tentativeLeftResult;
+				}
+
+				var falsePath = tentativeLeftResult.FalsePathVariables;
+				var tentativeRightResult = binaryOperatorExpression.Right.AcceptVisitor(this, falsePath);
+				if (tentativeRightResult.ThrowsException) {
+					//If the false path throws an exception, then the only way for the expression to complete
+					//successfully is if the left expression is true
+					return VisitorResult.ForBoolValue(tentativeLeftResult.TruePathVariables, true);
+				}
+
+				return VisitorResult.OrOperation(tentativeLeftResult, tentativeRightResult);
+			}
+
+			VisitorResult VisitNullCoalescing(BinaryOperatorExpression binaryOperatorExpression, VariableStatusInfo data)
+			{
+				var leftTentativeResult = binaryOperatorExpression.Left.AcceptVisitor(this, data);
+				if (leftTentativeResult.NullableReturnResult == NullValueStatus.DefinitelyNotNull || leftTentativeResult.ThrowsException) {
+					return leftTentativeResult;
+				}
+
+				//If the right side is found, then the left side is known to be null
+				var newData = leftTentativeResult.Variables;
+				var leftIdentifier = CSharpUtil.GetInnerMostExpression(binaryOperatorExpression.Left) as IdentifierExpression;
+				if (leftIdentifier != null) {
+					newData = newData.Clone();
+					analysis.SetLocalVariableValue(newData, leftIdentifier, NullValueStatus.DefinitelyNull);
+				}
+
+				var rightTentativeResult = binaryOperatorExpression.Right.AcceptVisitor(this, newData);
+				if (rightTentativeResult.ThrowsException) {
+					//This means the left expression was not null all along (or else the expression will throw an exception)
+
+					if (leftIdentifier != null) {
+						newData = newData.Clone();
+						analysis.SetLocalVariableValue(newData, leftIdentifier, NullValueStatus.DefinitelyNotNull);
+						return VisitorResult.ForValue(newData, NullValueStatus.DefinitelyNotNull);
+					}
+
+					return VisitorResult.ForValue(leftTentativeResult.Variables, NullValueStatus.DefinitelyNotNull);
+				}
+
+				var mergedVariables = rightTentativeResult.Variables;
+				var nullValue = rightTentativeResult.NullableReturnResult;
+
+				if (leftTentativeResult.NullableReturnResult != NullValueStatus.DefinitelyNull) {
+					mergedVariables = mergedVariables.Clone();
+					mergedVariables.ReceiveIncoming(leftTentativeResult.Variables);
+					if (nullValue == NullValueStatus.DefinitelyNull) {
+						nullValue = NullValueStatus.PotentiallyNull;
+					}
+				}
+
+				return VisitorResult.ForValue(mergedVariables, nullValue);
+			}
+
+			public override VisitorResult VisitUnaryOperatorExpression(UnaryOperatorExpression unaryOperatorExpression, VariableStatusInfo data)
+			{
+				//TODO: Again, what to do when overloaded operators are found?
+
+				var tentativeResult = unaryOperatorExpression.Expression.AcceptVisitor(this, data);
+				if (tentativeResult.ThrowsException)
+					return HandleExpressionResult(unaryOperatorExpression, tentativeResult);
+
+				if (unaryOperatorExpression.Operator == UnaryOperatorType.Not) {
+					return HandleExpressionResult(unaryOperatorExpression, tentativeResult.Negated);
+				}
+				return HandleExpressionResult(unaryOperatorExpression, tentativeResult);
+			}
+
+			public override VisitorResult VisitInvocationExpression(InvocationExpression invocationExpression, VariableStatusInfo data)
+			{
+				//TODO: Handle some common methods such as string.IsNullOrEmpty
+
+				var targetResult = invocationExpression.Target.AcceptVisitor(this, data);
+				if (targetResult.ThrowsException)
+					return HandleExpressionResult(invocationExpression, targetResult);
+
+				data = targetResult.Variables;
+
+				var methodResolveResult = analysis.context.Resolve(invocationExpression) as CSharpInvocationResolveResult;
+
+				List<VisitorResult> parameterResults = new List<VisitorResult>();
+
+				foreach (var argumentToHandle in invocationExpression.Arguments.Select((argument, parameterIndex) => new { argument, parameterIndex })) {
+					var argument = argumentToHandle.argument;
+					var parameterIndex = argumentToHandle.parameterIndex;
+
+					var result = argument.AcceptVisitor(this, data);
+					if (result.ThrowsException)
+						return HandleExpressionResult(invocationExpression, result);
+					parameterResults.Add(result);
+
+					var namedArgument = argument as NamedArgumentExpression;
+					
+					var directionExpression = (namedArgument == null ? argument : namedArgument.Expression) as DirectionExpression;
+					if (directionExpression != null && methodResolveResult != null) {
+						var identifier = directionExpression.Expression as IdentifierExpression;
+						if (identifier != null) {
+							//out and ref parameters do *NOT* capture the variable (since they must stop changing it by the time they return)
+							var identifierResolveResult = analysis.context.Resolve(identifier) as LocalResolveResult;
+							if (identifierResolveResult != null && IsTypeNullable(identifierResolveResult.Type)) {
+								data = data.Clone();
+
+								FixParameter(argument, methodResolveResult.Member.Parameters, parameterIndex, identifier, data);
+							}
+						}
+
+
+						continue;
+					}
+
+					data = result.Variables;
+				}
+
+				var identifierExpression = CSharpUtil.GetInnerMostExpression(invocationExpression.Target) as IdentifierExpression;
+				if (identifierExpression != null) {
+					if (targetResult.NullableReturnResult == NullValueStatus.DefinitelyNull) {
+						return HandleExpressionResult(invocationExpression, VisitorResult.ForException(data));
+					}
+
+					var descendentIdentifiers = invocationExpression.Arguments.SelectMany(argument => argument.DescendantsAndSelf).OfType<IdentifierExpression>();
+					if (!descendentIdentifiers.Any(identifier => identifier.Identifier == identifierExpression.Identifier)) {
+						//TODO: We can make this check better (see VisitIndexerExpression for more details)
+						data = data.Clone();
+						analysis.SetLocalVariableValue(data, identifierExpression, NullValueStatus.DefinitelyNotNull);
+					}
+				}
+
+				return HandleExpressionResult(invocationExpression, GetMethodVisitorResult(methodResolveResult, data, parameterResults));
+			}
+
+			static VisitorResult GetMethodVisitorResult(CSharpInvocationResolveResult methodResolveResult, VariableStatusInfo data, List<VisitorResult> parameterResults)
+			{
+				if (methodResolveResult == null)
+					return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+
+				var method = methodResolveResult.Member as IMethod;
+				if (method != null) {
+					if (method.GetAttribute(new FullTypeName(AnnotationNames.AssertionMethodAttribute)) != null) {
+						var assertionParameters = method.Parameters.Select((parameter, index) => new { index, parameter })
+							.Select(parameter => new { parameter.index, parameter.parameter, attributes = parameter.parameter.Attributes.Where(attribute => attribute.AttributeType.FullName == AnnotationNames.AssertionConditionAttribute).ToList() })
+							.Where(parameter => parameter.attributes.Count() == 1)
+							.Select(parameter => new { parameter.index, parameter.parameter, attribute = parameter.attributes[0] })
+							.ToList();
+
+						//Unclear what should be done if there are multiple assertion conditions
+						if (assertionParameters.Count() == 1) {
+							Debug.Assert(methodResolveResult.Arguments.Count == parameterResults.Count);
+
+							var assertionParameter = assertionParameters [0];
+							VisitorResult assertionParameterResult = null;
+
+							object intendedResult = true;
+							var positionalArgument = assertionParameter.attribute.PositionalArguments.FirstOrDefault() as MemberResolveResult;
+							if (positionalArgument != null && positionalArgument.Type.FullName == AnnotationNames.AssertionConditionTypeAttribute) {
+								switch (positionalArgument.Member.FullName) {
+									case AnnotationNames.AssertionConditionTypeIsTrue:
+										intendedResult = true;
+										break;
+									case AnnotationNames.AssertionConditionTypeIsFalse:
+										intendedResult = false;
+										break;
+									case AnnotationNames.AssertionConditionTypeIsNull:
+										intendedResult = null;
+										break;
+									case AnnotationNames.AssertionConditionTypeIsNotNull:
+										intendedResult = "<not-null>";
+										break;
+								}
+							}
+
+							int parameterIndex = assertionParameter.index;
+							if (assertionParameter.index < methodResolveResult.Arguments.Count && !(methodResolveResult.Arguments [assertionParameter.index] is NamedArgumentResolveResult)) {
+								//Use index
+								assertionParameterResult = parameterResults [assertionParameter.index];
+							} else {
+								//Use named argument
+								int? nameIndex = methodResolveResult.Arguments.Select((argument, index) => new { argument, index})
+									.Where(argument => {
+										var namedArgument = argument.argument as NamedArgumentResolveResult;
+										return namedArgument != null && namedArgument.ParameterName == assertionParameter.parameter.Name;
+									}).Select(argument => (int?)argument.index).FirstOrDefault();
+
+								if (nameIndex != null) {
+									parameterIndex = nameIndex.Value;
+									assertionParameterResult = parameterResults [nameIndex.Value];
+								} else if (assertionParameter.parameter.IsOptional) {
+									//Try to use default value
+
+									if (intendedResult is string) {
+										if (assertionParameter.parameter.ConstantValue == null) {
+											return VisitorResult.ForException(data);
+										}
+									} else {
+										if (!object.Equals(assertionParameter.parameter.ConstantValue, intendedResult)) {
+											return VisitorResult.ForException(data);
+										}
+									}
+								} else {
+									//The parameter was not specified, yet it is not optional?
+									return VisitorResult.ForException(data);
+								}
+							}
+
+							//Now check assertion
+							if (assertionParameterResult != null) {
+								if (intendedResult is bool) {
+									if (assertionParameterResult.KnownBoolResult == !(bool)intendedResult) {
+										return VisitorResult.ForException(data);
+									}
+
+									data = (bool)intendedResult ? assertionParameterResult.TruePathVariables : assertionParameterResult.FalsePathVariables;
+								} else {
+									bool shouldBeNull = intendedResult == null;
+
+									if (assertionParameterResult.NullableReturnResult == (shouldBeNull ? NullValueStatus.DefinitelyNotNull : NullValueStatus.DefinitelyNull)) {
+										return VisitorResult.ForException(data);
+									}
+
+									var parameterResolveResult = methodResolveResult.Arguments [parameterIndex];
+
+									LocalResolveResult localVariableResult = null;
+
+									var conversionResolveResult = parameterResolveResult as ConversionResolveResult;
+									if (conversionResolveResult != null) {
+										if (!IsTypeNullable(conversionResolveResult.Type)) {
+											if (intendedResult == null) {
+												return VisitorResult.ForException(data);
+											}
+										} else {
+											localVariableResult = conversionResolveResult.Input as LocalResolveResult;
+										}
+									} else {
+										localVariableResult = parameterResolveResult as LocalResolveResult;
+									}
+
+									if (localVariableResult != null && data[localVariableResult.Variable.Name] != NullValueStatus.CapturedUnknown) {
+										data = data.Clone();
+										data [localVariableResult.Variable.Name] = shouldBeNull ? NullValueStatus.DefinitelyNull : NullValueStatus.DefinitelyNotNull;
+									}
+								}
+							}
+						}
+					}
+				}
+
+				bool isNullable = IsTypeNullable(methodResolveResult.Type);
+				if (!isNullable) {
+					return VisitorResult.ForValue(data, NullValueStatus.DefinitelyNotNull);
+				}
+
+				if (method != null)
+					return VisitorResult.ForValue(data, GetNullableStatus(method));
+
+				return VisitorResult.ForValue(data, GetNullableStatus(methodResolveResult.TargetResult.Type.GetDefinition()));
+			}
+
+			static NullValueStatus GetNullableStatus(IEntity entity)
+			{
+				if (entity.DeclaringType != null && entity.DeclaringType.Kind == TypeKind.Delegate) {
+					//Handle Delegate.Invoke method
+					return GetNullableStatus(entity.DeclaringTypeDefinition);
+				}
+				
+				return GetNullableStatus(fullTypeName => entity.GetAttribute(new FullTypeName(fullTypeName)));
+			}
+
+			static NullValueStatus GetNullableStatus(IParameter parameter)
+			{
+				return GetNullableStatus(fullTypeName => parameter.Attributes.FirstOrDefault(attribute => attribute.AttributeType.FullName == fullTypeName));
+			}
+
+			static NullValueStatus GetNullableStatus(Func<string, IAttribute> attributeGetter)
+			{
+				if (attributeGetter(AnnotationNames.NotNullAttribute) != null) {
+					return NullValueStatus.DefinitelyNotNull;
+				}
+				if (attributeGetter(AnnotationNames.CanBeNullAttribute) != null) {
+					return NullValueStatus.PotentiallyNull;
+				}
+				return NullValueStatus.Unknown;
+			}
+
+			public override VisitorResult VisitMemberReferenceExpression(MemberReferenceExpression memberReferenceExpression, VariableStatusInfo data)
+			{
+				var targetResult = memberReferenceExpression.Target.AcceptVisitor(this, data);
+				if (targetResult.ThrowsException)
+					return HandleExpressionResult(memberReferenceExpression, targetResult);
+
+				var variables = targetResult.Variables;
+
+				var memberResolveResult = analysis.context.Resolve(memberReferenceExpression) as MemberResolveResult;
+
+				var targetIdentifier = CSharpUtil.GetInnerMostExpression(memberReferenceExpression.Target) as IdentifierExpression;
+				if (targetIdentifier != null) {
+					if (memberResolveResult == null) {
+						var invocation = memberReferenceExpression.Parent as InvocationExpression;
+						if (invocation != null) {
+							memberResolveResult = analysis.context.Resolve(invocation) as MemberResolveResult;
+						}
+					}
+
+					if (memberResolveResult != null && memberResolveResult.Member.FullName != "System.Nullable.HasValue") {
+						var method = memberResolveResult.Member as IMethod;
+						if (method == null || !method.IsExtensionMethod) {
+							if (targetResult.NullableReturnResult == NullValueStatus.DefinitelyNull) {
+								return HandleExpressionResult(memberReferenceExpression, VisitorResult.ForException(variables));
+							}
+							if (variables [targetIdentifier.Identifier] != NullValueStatus.CapturedUnknown) {
+								variables = variables.Clone();
+								analysis.SetLocalVariableValue(variables, targetIdentifier, NullValueStatus.DefinitelyNotNull);
+							}
+						}
+					}
+				}
+
+				var returnValue = GetFieldReturnValue(memberResolveResult, data);
+				return HandleExpressionResult(memberReferenceExpression, variables, returnValue);
+			}
+
+			static NullValueStatus GetFieldReturnValue(MemberResolveResult memberResolveResult, VariableStatusInfo data)
+			{
+				bool isNullable = memberResolveResult == null || IsTypeNullable(memberResolveResult.Type);
+				if (!isNullable) {
+					return NullValueStatus.DefinitelyNotNull;
+				}
+
+				if (memberResolveResult != null) {
+					return GetNullableStatus(memberResolveResult.Member);
+				}
+
+				return NullValueStatus.Unknown;
+			}
+
+			public override VisitorResult VisitTypeReferenceExpression(TypeReferenceExpression typeReferenceExpression, VariableStatusInfo data)
+			{
+				return HandleExpressionResult(typeReferenceExpression, data, NullValueStatus.Unknown);
+
+			}
+
+			void FixParameter(Expression argument, IList<IParameter> parameters, int parameterIndex, IdentifierExpression identifier, VariableStatusInfo data)
+			{
+				NullValueStatus newValue = NullValueStatus.Unknown;
+				if (argument is NamedArgumentExpression) {
+					var namedResolveResult = analysis.context.Resolve(argument) as NamedArgumentResolveResult;
+					if (namedResolveResult != null) {
+						newValue = GetNullableStatus(namedResolveResult.Parameter);
+					}
+				}
+				else {
+					var parameter = parameters[parameterIndex];
+					newValue = GetNullableStatus(parameter);
+				}
+				analysis.SetLocalVariableValue(data, identifier, newValue);
+			}
+
+			public override VisitorResult VisitObjectCreateExpression(ObjectCreateExpression objectCreateExpression, VariableStatusInfo data)
+			{
+				var constructorResolveResult = analysis.context.Resolve(objectCreateExpression) as CSharpInvocationResolveResult;
+
+				foreach (var argumentToHandle in objectCreateExpression.Arguments.Select((argument, parameterIndex) => new { argument, parameterIndex })) {
+					var argument = argumentToHandle.argument;
+					var parameterIndex = argumentToHandle.parameterIndex;
+
+					var namedArgument = argument as NamedArgumentExpression;
+
+					var directionExpression = (namedArgument == null ? argument : namedArgument.Expression) as DirectionExpression;
+					if (directionExpression != null) {
+						var identifier = directionExpression.Expression as IdentifierExpression;
+						if (identifier != null && data [identifier.Identifier] != NullValueStatus.CapturedUnknown) {
+							//out and ref parameters do *NOT* capture the variable (since they must stop changing it by the time they return)
+							data = data.Clone();
+
+							FixParameter(argument, constructorResolveResult.Member.Parameters, parameterIndex, identifier, data);
+						}
+						continue;
+					}
+
+					var argumentResult = argument.AcceptVisitor(this, data);
+					if (argumentResult.ThrowsException)
+						return argumentResult;
+
+					data = argumentResult.Variables;
+				}
+
+				//Constructors never return null
+				return HandleExpressionResult(objectCreateExpression, data, NullValueStatus.DefinitelyNotNull);
+			}
+
+			public override VisitorResult VisitArrayCreateExpression(ArrayCreateExpression arrayCreateExpression, VariableStatusInfo data)
+			{
+				foreach (var argument in arrayCreateExpression.Arguments) {
+					var result = argument.AcceptVisitor(this, data);
+					if (result.ThrowsException)
+						return result;
+					data = result.Variables.Clone();
+				}
+
+				if (arrayCreateExpression.Initializer.IsNull) {
+					return HandleExpressionResult(arrayCreateExpression, data, NullValueStatus.DefinitelyNotNull);
+				}
+
+				return HandleExpressionResult(arrayCreateExpression, arrayCreateExpression.Initializer.AcceptVisitor(this, data));
+			}
+
+			public override VisitorResult VisitArrayInitializerExpression(ArrayInitializerExpression arrayInitializerExpression, VariableStatusInfo data)
+			{
+				if (arrayInitializerExpression.IsSingleElement) {
+					return HandleExpressionResult(arrayInitializerExpression, arrayInitializerExpression.Elements.Single().AcceptVisitor(this, data));
+				}
+				if (!arrayInitializerExpression.Elements.Any()) {
+					//Empty array
+					return HandleExpressionResult(arrayInitializerExpression, VisitorResult.ForValue(data, NullValueStatus.Unknown));
+				}
+
+				NullValueStatus enumeratedValue = NullValueStatus.UnreachableOrInexistent;
+				foreach (var element in arrayInitializerExpression.Elements) {
+					var result = element.AcceptVisitor(this, data);
+					if (result.ThrowsException)
+						return result;
+					data = result.Variables.Clone();
+					enumeratedValue = VariableStatusInfo.CombineStatus(enumeratedValue, result.NullableReturnResult);
+
+				}
+				return HandleExpressionResult(arrayInitializerExpression, VisitorResult.ForEnumeratedValue(data, enumeratedValue));
+			}
+
+			public override VisitorResult VisitAnonymousTypeCreateExpression(AnonymousTypeCreateExpression anonymousTypeCreateExpression, VariableStatusInfo data)
+			{
+				foreach (var initializer in anonymousTypeCreateExpression.Initializers) {
+					var result = initializer.AcceptVisitor(this, data);
+					if (result.ThrowsException)
+						return result;
+					data = result.Variables;
+				}
+
+				return HandleExpressionResult(anonymousTypeCreateExpression, data, NullValueStatus.DefinitelyNotNull);
+			}
+
+			public override VisitorResult VisitLambdaExpression(LambdaExpression lambdaExpression, VariableStatusInfo data)
+			{
+				var newData = data.Clone();
+
+				var identifiers = lambdaExpression.Descendants.OfType<IdentifierExpression>();
+				foreach (var identifier in identifiers) {
+					//Check if it is in a "change-null-state" context
+					//For instance, x++ does not change the null state
+					//but `x = y` does.
+					if (identifier.Parent is AssignmentExpression && identifier.Role == AssignmentExpression.LeftRole) {
+						var parent = (AssignmentExpression)identifier.Parent;
+						if (parent.Operator != AssignmentOperatorType.Assign) {
+							continue;
+						}
+					} else {
+						//No other context matters
+						//Captured variables are never passed by reference (out/ref)
+						continue;
+					}
+
+					//At this point, we know there's a good chance the variable has been changed
+					var identifierResolveResult = analysis.context.Resolve(identifier) as LocalResolveResult;
+					if (identifierResolveResult != null && IsTypeNullable(identifierResolveResult.Type)) {
+						analysis.SetLocalVariableValue(newData, identifier, NullValueStatus.CapturedUnknown);
+					}
+				}
+
+				//The lambda itself is known not to be null
+				return HandleExpressionResult(lambdaExpression, newData, NullValueStatus.DefinitelyNotNull);
+			}
+
+			public override VisitorResult VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression, VariableStatusInfo data)
+			{
+				var newData = data.Clone();
+
+				var identifiers = anonymousMethodExpression.Descendants.OfType<IdentifierExpression>();
+				foreach (var identifier in identifiers) {
+					//Check if it is in a "change-null-state" context
+					//For instance, x++ does not change the null state
+					//but `x = y` does.
+					if (identifier.Parent is AssignmentExpression && identifier.Role == AssignmentExpression.LeftRole) {
+						var parent = (AssignmentExpression)identifier.Parent;
+						if (parent.Operator != AssignmentOperatorType.Assign) {
+							continue;
+						}
+					} else {
+						//No other context matters
+						//Captured variables are never passed by reference (out/ref)
+						continue;
+					}
+
+					//At this point, we know there's a good chance the variable has been changed
+					var identifierResolveResult = analysis.context.Resolve(identifier) as LocalResolveResult;
+					if (identifierResolveResult != null && IsTypeNullable(identifierResolveResult.Type)) {
+						analysis.SetLocalVariableValue(newData, identifier, NullValueStatus.CapturedUnknown);
+					}
+				}
+
+				//The anonymous method itself is known not to be null
+				return HandleExpressionResult(anonymousMethodExpression, newData, NullValueStatus.DefinitelyNotNull);
+			}
+
+
+			public override VisitorResult VisitNamedExpression(NamedExpression namedExpression, VariableStatusInfo data)
+			{
+				return HandleExpressionResult(namedExpression, namedExpression.Expression.AcceptVisitor(this, data));
+			}
+
+			public override VisitorResult VisitAsExpression(AsExpression asExpression, VariableStatusInfo data)
+			{
+				var tentativeResult = asExpression.Expression.AcceptVisitor(this, data);
+				if (tentativeResult.ThrowsException)
+					return tentativeResult;
+
+				NullValueStatus result;
+				if (tentativeResult.NullableReturnResult == NullValueStatus.DefinitelyNull) {
+					result = NullValueStatus.DefinitelyNull;
+				} else {
+					var asResolveResult = analysis.context.Resolve(asExpression) as CastResolveResult;
+					if (asResolveResult == null ||
+					    asResolveResult.IsError ||
+					    asResolveResult.Input.Type.Kind == TypeKind.Unknown ||
+					    asResolveResult.Type.Kind == TypeKind.Unknown) {
+
+						result = NullValueStatus.Unknown;
+					} else {
+						var conversion = new CSharpConversions(analysis.context.Compilation);
+						var foundConversion = conversion.ExplicitConversion(asResolveResult.Input.Type, asResolveResult.Type);
+
+						if (foundConversion == Conversion.None) {
+							result = NullValueStatus.DefinitelyNull;
+						} else if (foundConversion == Conversion.IdentityConversion) {
+							result = tentativeResult.NullableReturnResult;
+						} else {
+							result = NullValueStatus.PotentiallyNull;
+						}
+					}
+				}
+				return HandleExpressionResult(asExpression, tentativeResult.Variables, result);
+			}
+
+			public override VisitorResult VisitCastExpression(CastExpression castExpression, VariableStatusInfo data)
+			{
+				var tentativeResult = castExpression.Expression.AcceptVisitor(this, data);
+				if (tentativeResult.ThrowsException)
+					return tentativeResult;
+
+				NullValueStatus result;
+				if (tentativeResult.NullableReturnResult == NullValueStatus.DefinitelyNull) {
+					result = NullValueStatus.DefinitelyNull;
+				} else {
+					result = NullValueStatus.Unknown;
+				}
+
+				VariableStatusInfo variables = tentativeResult.Variables;
+
+				var resolveResult = analysis.context.Resolve(castExpression) as CastResolveResult;
+				if (resolveResult != null && !IsTypeNullable(resolveResult.Type)) {
+					if (result == NullValueStatus.DefinitelyNull) {
+						return HandleExpressionResult(castExpression, VisitorResult.ForException(tentativeResult.Variables));
+					}
+
+					var identifierExpression = CSharpUtil.GetInnerMostExpression(castExpression.Expression) as IdentifierExpression;
+					if (identifierExpression != null) {
+						var currentValue = variables [identifierExpression.Identifier];
+						if (currentValue != NullValueStatus.CapturedUnknown &&
+						    currentValue != NullValueStatus.UnreachableOrInexistent &&
+						    currentValue != NullValueStatus.DefinitelyNotNull) {
+							//DefinitelyNotNull is included in this list because if that's the status
+							// then we don't need to change anything
+
+							variables = variables.Clone();
+							variables [identifierExpression.Identifier] = NullValueStatus.DefinitelyNotNull;
+						}
+					}
+
+					result = NullValueStatus.DefinitelyNotNull;
+				}
+
+				return HandleExpressionResult(castExpression, variables, result);
+			}
+
+			public override VisitorResult VisitIsExpression(IsExpression isExpression, VariableStatusInfo data)
+			{
+				var tentativeResult = isExpression.Expression.AcceptVisitor(this, data);
+				if (tentativeResult.ThrowsException)
+					return tentativeResult;
+
+				//TODO: Consider, for instance: new X() is X. The result is known to be true, so we can use KnownBoolValue
+				return HandleExpressionResult(isExpression, tentativeResult.Variables, NullValueStatus.DefinitelyNotNull);
+			}
+
+			public override VisitorResult VisitDirectionExpression(DirectionExpression directionExpression, VariableStatusInfo data)
+			{
+				return HandleExpressionResult(directionExpression, directionExpression.Expression.AcceptVisitor(this, data));
+			}
+
+			public override VisitorResult VisitCheckedExpression(CheckedExpression checkedExpression, VariableStatusInfo data)
+			{
+				return HandleExpressionResult(checkedExpression, checkedExpression.Expression.AcceptVisitor(this, data));
+			}
+
+			public override VisitorResult VisitUncheckedExpression(UncheckedExpression uncheckedExpression, VariableStatusInfo data)
+			{
+				return HandleExpressionResult(uncheckedExpression, uncheckedExpression.Expression.AcceptVisitor(this, data));
+			}
+
+			public override VisitorResult VisitThisReferenceExpression(ThisReferenceExpression thisReferenceExpression, VariableStatusInfo data)
+			{
+				return HandleExpressionResult(thisReferenceExpression, data, NullValueStatus.DefinitelyNotNull);
+			}
+
+			public override VisitorResult VisitIndexerExpression(IndexerExpression indexerExpression, VariableStatusInfo data)
+			{
+				var tentativeResult = indexerExpression.Target.AcceptVisitor(this, data);
+				if (tentativeResult.ThrowsException)
+					return tentativeResult;
+
+				data = tentativeResult.Variables;
+
+				foreach (var argument in indexerExpression.Arguments) {
+					var result = argument.AcceptVisitor(this, data);
+					if (result.ThrowsException)
+						return result;
+					data = result.Variables.Clone();
+				}
+
+				IdentifierExpression targetAsIdentifier = CSharpUtil.GetInnerMostExpression(indexerExpression.Target) as IdentifierExpression;
+				if (targetAsIdentifier != null) {
+					if (tentativeResult.NullableReturnResult == NullValueStatus.DefinitelyNull)
+						return HandleExpressionResult(indexerExpression, VisitorResult.ForException(data));
+
+					//If this doesn't cause an exception, then the target is not null
+					//But we won't set it if it has been changed
+					var descendentIdentifiers = indexerExpression.Arguments
+						.SelectMany(argument => argument.DescendantsAndSelf).OfType<IdentifierExpression>();
+					if (!descendentIdentifiers.Any(identifier => identifier.Identifier == targetAsIdentifier.Identifier)) {
+						//TODO: this check might be improved to include more legitimate cases
+						//A good check will necessarily have to consider captured variables
+						data = data.Clone();
+						analysis.SetLocalVariableValue(data, targetAsIdentifier, NullValueStatus.DefinitelyNotNull);
+					}
+				}
+
+				var indexerResolveResult = analysis.context.Resolve(indexerExpression) as CSharpInvocationResolveResult;
+				bool isNullable = indexerResolveResult == null || IsTypeNullable(indexerResolveResult.Type);
+				
+				var returnValue = isNullable ? NullValueStatus.Unknown : NullValueStatus.DefinitelyNotNull;
+				return HandleExpressionResult(indexerExpression, data, returnValue);
+			}
+
+			public override VisitorResult VisitBaseReferenceExpression(BaseReferenceExpression baseReferenceExpression, VariableStatusInfo data)
+			{
+				return HandleExpressionResult(baseReferenceExpression, data, NullValueStatus.DefinitelyNotNull);
+			}
+
+			public override VisitorResult VisitTypeOfExpression(TypeOfExpression typeOfExpression, VariableStatusInfo data)
+			{
+				return HandleExpressionResult(typeOfExpression, data, NullValueStatus.DefinitelyNotNull);
+			}
+
+			public override VisitorResult VisitSizeOfExpression(SizeOfExpression sizeOfExpression, VariableStatusInfo data)
+			{
+				return HandleExpressionResult(sizeOfExpression, data, NullValueStatus.DefinitelyNotNull);
+			}
+
+			public override VisitorResult VisitPointerReferenceExpression(PointerReferenceExpression pointerReferenceExpression, VariableStatusInfo data)
+			{
+				var targetResult = pointerReferenceExpression.Target.AcceptVisitor(this, data);
+				if (targetResult.ThrowsException)
+					return targetResult;
+				return HandleExpressionResult(pointerReferenceExpression, targetResult.Variables, NullValueStatus.DefinitelyNotNull);
+			}
+
+			public override VisitorResult VisitStackAllocExpression(StackAllocExpression stackAllocExpression, VariableStatusInfo data)
+			{
+				var countResult = stackAllocExpression.CountExpression.AcceptVisitor(this, data);
+				if (countResult.ThrowsException)
+					return countResult;
+				return HandleExpressionResult(stackAllocExpression, countResult.Variables, NullValueStatus.DefinitelyNotNull);
+			}
+
+			public override VisitorResult VisitNamedArgumentExpression(NamedArgumentExpression namedArgumentExpression, VariableStatusInfo data)
+			{
+				return HandleExpressionResult(namedArgumentExpression, namedArgumentExpression.Expression.AcceptVisitor(this, data));
+			}
+
+			public override VisitorResult VisitUndocumentedExpression(UndocumentedExpression undocumentedExpression, VariableStatusInfo data)
+			{
+				throw new NotImplementedException();
+			}
+
+			public override VisitorResult VisitQueryExpression(QueryExpression queryExpression, VariableStatusInfo data)
+			{
+				VariableStatusInfo outgoingData = data.Clone();
+				NullValueStatus? outgoingEnumeratedValue = null;
+				var clauses = queryExpression.Clauses.ToList();
+
+				var backtracingClauses = (from item in clauses.Select((clause, i) => new { clause, i })
+				                                where item.clause is QueryFromClause || item.clause is QueryJoinClause || item.clause is QueryContinuationClause
+				                                select item.i).ToList();
+
+				var beforeClauseVariableStates = Enumerable.Range(0, clauses.Count).ToDictionary(clauseIndex => clauseIndex,
+				                                                                                 clauseIndex => new VariableStatusInfo());
+				var afterClauseVariableStates = Enumerable.Range(0, clauses.Count).ToDictionary(clauseIndex => clauseIndex,
+				                                                                                clauseIndex => new VariableStatusInfo());
+
+				VisitorResult lastValidResult = null;
+				int currentClauseIndex = 0;
+				for (;;) {
+					VisitorResult result = null;
+					QueryClause clause = null;
+					bool backtrack = false;
+
+					if (currentClauseIndex >= clauses.Count) {
+						backtrack = true;
+					} else {
+						clause = clauses [currentClauseIndex];
+						beforeClauseVariableStates [currentClauseIndex].ReceiveIncoming(data);
+						result = clause.AcceptVisitor(this, data);
+						data = result.Variables;
+						lastValidResult = result;
+						if (result.KnownBoolResult == false) {
+							backtrack = true;
+						}
+						if (result.ThrowsException) {
+							//Don't backtrack. Exceptions completely stop the query.
+							break;
+						}
+						else {
+							afterClauseVariableStates [currentClauseIndex].ReceiveIncoming(data);
+						}
+					}
+
+					if (backtrack) {
+						int? newIndex;
+						for (;;) {
+							newIndex = backtracingClauses.LastOrDefault(index => index < currentClauseIndex);
+							if (newIndex == null) {
+								//We've reached the end
+								break;
+							}
+
+							currentClauseIndex = (int)newIndex + 1;
+
+							if (!beforeClauseVariableStates[currentClauseIndex].ReceiveIncoming(lastValidResult.Variables)) {
+								newIndex = null;
+								break;
+							}
+						}
+
+						if (newIndex == null) {
+							break;
+						}
+
+					} else {
+						if (clause is QuerySelectClause) {
+							outgoingData.ReceiveIncoming(data);
+							if (outgoingEnumeratedValue == null)
+								outgoingEnumeratedValue = result.EnumeratedValueResult;
+							else
+								outgoingEnumeratedValue = VariableStatusInfo.CombineStatus(outgoingEnumeratedValue.Value, result.EnumeratedValueResult);
+						}
+
+						++currentClauseIndex;
+					}
+				}
+
+				var finalData = new VariableStatusInfo();
+				var endingClauseIndices = from item in clauses.Select((clause, i) => new { clause, i })
+					let clause = item.clause
+						where clause is QueryFromClause ||
+					clause is QueryContinuationClause ||
+					clause is QueryJoinClause ||
+					clause is QuerySelectClause ||
+					clause is QueryWhereClause
+						select item.i;
+				foreach (var clauseIndex in endingClauseIndices) {
+					finalData.ReceiveIncoming(afterClauseVariableStates [clauseIndex]);
+				}
+
+				return VisitorResult.ForEnumeratedValue(finalData, outgoingEnumeratedValue ?? NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitQueryContinuationClause(QueryContinuationClause queryContinuationClause, VariableStatusInfo data)
+			{
+				return IntroduceVariableFromEnumeratedValue(queryContinuationClause.Identifier, queryContinuationClause.PrecedingQuery, data);
+			}
+
+			VisitorResult IntroduceVariableFromEnumeratedValue(string newVariable, Expression expression, VariableStatusInfo data)
+			{
+				var result = expression.AcceptVisitor(this, data);
+				var newVariables = result.Variables.Clone();
+				newVariables[newVariable] = result.EnumeratedValueResult;
+				return VisitorResult.ForValue(newVariables, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitQueryFromClause(QueryFromClause queryFromClause, VariableStatusInfo data)
+			{
+				return IntroduceVariableFromEnumeratedValue(queryFromClause.Identifier, queryFromClause.Expression, data);
+			}
+
+			public override VisitorResult VisitQueryJoinClause(QueryJoinClause queryJoinClause, VariableStatusInfo data)
+			{
+				//TODO: Check if this really works in weird edge-cases.
+				var tentativeResult = IntroduceVariableFromEnumeratedValue(queryJoinClause.JoinIdentifier, queryJoinClause.InExpression, data);
+				tentativeResult = queryJoinClause.OnExpression.AcceptVisitor(this, tentativeResult.Variables);
+				tentativeResult = queryJoinClause.EqualsExpression.AcceptVisitor(this, tentativeResult.Variables);
+
+				if (queryJoinClause.IsGroupJoin) {
+					var newVariables = tentativeResult.Variables.Clone();
+					analysis.SetLocalVariableValue(newVariables, queryJoinClause.IntoIdentifierToken, NullValueStatus.DefinitelyNotNull);
+					return VisitorResult.ForValue(newVariables, NullValueStatus.Unknown);
+				}
+
+				return tentativeResult;
+			}
+
+			public override VisitorResult VisitQueryLetClause(QueryLetClause queryLetClause, VariableStatusInfo data)
+			{
+				var result = queryLetClause.Expression.AcceptVisitor(this, data);
+
+				string newVariable = queryLetClause.Identifier;
+				var newVariables = result.Variables.Clone();
+				newVariables [newVariable] = result.NullableReturnResult;
+
+				return VisitorResult.ForValue(newVariables, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitQuerySelectClause(QuerySelectClause querySelectClause, VariableStatusInfo data)
+			{
+				var result = querySelectClause.Expression.AcceptVisitor(this, data);
+
+				//The value of the expression in select becomes the "enumerated" value
+				return VisitorResult.ForEnumeratedValue(result.Variables, result.NullableReturnResult);
+			}
+
+			public override VisitorResult VisitQueryWhereClause(QueryWhereClause queryWhereClause, VariableStatusInfo data)
+			{
+				var result = queryWhereClause.Condition.AcceptVisitor(this, data);
+
+				return VisitorResult.ForEnumeratedValue(result.TruePathVariables, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitQueryOrderClause(QueryOrderClause queryOrderClause, VariableStatusInfo data)
+			{
+				foreach (var ordering in queryOrderClause.Orderings) {
+					data = ordering.AcceptVisitor(this, data).Variables;
+				}
+
+				return VisitorResult.ForValue(data, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitQueryOrdering(QueryOrdering queryOrdering, VariableStatusInfo data)
+			{
+				return VisitorResult.ForValue(queryOrdering.Expression.AcceptVisitor(this, data).Variables, NullValueStatus.Unknown);
+			}
+
+			public override VisitorResult VisitQueryGroupClause(QueryGroupClause queryGroupClause, VariableStatusInfo data)
+			{
+				var projectionResult = queryGroupClause.Projection.AcceptVisitor(this, data);
+				data = projectionResult.Variables;
+				data = queryGroupClause.Key.AcceptVisitor(this, data).Variables;
+
+				return VisitorResult.ForEnumeratedValue(data, projectionResult.NullableReturnResult);
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/NullValueStatus.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/NullValueStatus.cs
new file mode 100644
index 0000000000..f6816dfd58
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/NullValueStatus.cs
@@ -0,0 +1,84 @@
+// 
+// NullValueAnalysis.cs
+//  
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace ICSharpCode.NRefactory.CSharp.Analysis
+{
+	/// <summary>
+	/// Represents the null value status of a variable at a specific location.
+	/// </summary>
+	public enum NullValueStatus
+	{
+		/// <summary>
+		/// The value of the variable is unknown, possibly due to limitations
+		/// of the null value analysis.
+		/// </summary>
+		Unknown = 0,
+		/// <summary>
+		/// The value of the variable is unknown and even assigning it to a
+		/// value won't change its state, since it has been captured by a lambda
+		/// that may change it at any time (potentially even from a different thread).
+		/// Only going out of scope and creating a new variable may change the value
+		/// of this variable.
+		/// </summary>
+		CapturedUnknown,
+		/// <summary>
+		/// This variable is potentially unassigned.
+		/// </summary>
+		Unassigned,
+		/// <summary>
+		/// The value of the variable is provably null.
+		/// </summary>
+		DefinitelyNull,
+		/// <summary>
+		/// The value of the variable might or might not be null
+		/// </summary>
+		PotentiallyNull,
+		/// <summary>
+		/// The value of the variable is provably not null
+		/// </summary>
+		DefinitelyNotNull,
+		/// <summary>
+		/// The position of this node is unreachable, therefore the value
+		/// of the variable is not meaningful.
+		/// Alternatively, it might mean no local variable exists with the requested name.
+		/// </summary>
+		UnreachableOrInexistent,
+		/// <summary>
+		/// The analyser has encountered an error when attempting to find the value
+		/// of this variable.
+		/// </summary>
+		Error
+	}
+
+	public static class NullValueStatusExtensions
+	{
+		public static bool IsDefiniteValue (this NullValueStatus self) {
+			return self == NullValueStatus.DefinitelyNull || self == NullValueStatus.DefinitelyNotNull;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/ReachabilityAnalysis.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/ReachabilityAnalysis.cs
index 80ce0209b5..ce64f5f3b0 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/ReachabilityAnalysis.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/ReachabilityAnalysis.cs
@@ -18,10 +18,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using ICSharpCode.NRefactory.CSharp.Resolver;
 using ICSharpCode.NRefactory.CSharp.TypeSystem;
 using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.CSharp;
 
 namespace ICSharpCode.NRefactory.CSharp.Analysis
 {
@@ -34,28 +36,30 @@ namespace ICSharpCode.NRefactory.CSharp.Analysis
 		HashSet<Statement> reachableEndPoints = new HashSet<Statement>();
 		HashSet<ControlFlowNode> visitedNodes = new HashSet<ControlFlowNode>();
 		Stack<ControlFlowNode> stack = new Stack<ControlFlowNode>();
+		RecursiveDetectorVisitor recursiveDetectorVisitor = null;
 		
 		private ReachabilityAnalysis() {}
 		
-		public static ReachabilityAnalysis Create(Statement statement, CSharpAstResolver resolver = null, CancellationToken cancellationToken = default(CancellationToken))
+		public static ReachabilityAnalysis Create(Statement statement, CSharpAstResolver resolver = null, RecursiveDetectorVisitor recursiveDetectorVisitor = null, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			var cfgBuilder = new ControlFlowGraphBuilder();
 			var cfg = cfgBuilder.BuildControlFlowGraph(statement, resolver, cancellationToken);
-			return Create(cfg, cancellationToken);
+			return Create(cfg, recursiveDetectorVisitor, cancellationToken);
 		}
 		
 		internal static ReachabilityAnalysis Create(Statement statement, Func<AstNode, CancellationToken, ResolveResult> resolver, CSharpTypeResolveContext typeResolveContext, CancellationToken cancellationToken)
 		{
 			var cfgBuilder = new ControlFlowGraphBuilder();
 			var cfg = cfgBuilder.BuildControlFlowGraph(statement, resolver, typeResolveContext, cancellationToken);
-			return Create(cfg, cancellationToken);
+			return Create(cfg, null, cancellationToken);
 		}
 		
-		public static ReachabilityAnalysis Create(IList<ControlFlowNode> controlFlowGraph, CancellationToken cancellationToken = default(CancellationToken))
+		public static ReachabilityAnalysis Create(IList<ControlFlowNode> controlFlowGraph, RecursiveDetectorVisitor recursiveDetectorVisitor = null, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			if (controlFlowGraph == null)
 				throw new ArgumentNullException("controlFlowGraph");
 			ReachabilityAnalysis ra = new ReachabilityAnalysis();
+			ra.recursiveDetectorVisitor = recursiveDetectorVisitor;
 			// Analysing a null node can result in an empty control flow graph
 			if (controlFlowGraph.Count > 0) {
 				ra.stack.Push(controlFlowGraph[0]);
@@ -71,15 +75,28 @@ namespace ICSharpCode.NRefactory.CSharp.Analysis
 		
 		void MarkReachable(ControlFlowNode node)
 		{
-			if (node.PreviousStatement != null)
+			if (node.PreviousStatement != null) {
+				if (node.PreviousStatement is LabelStatement) {
+					reachableStatements.Add(node.PreviousStatement);
+				}
 				reachableEndPoints.Add(node.PreviousStatement);
-			if (node.NextStatement != null)
+			}
+			if (node.NextStatement != null) {
 				reachableStatements.Add(node.NextStatement);
+				if (IsRecursive(node.NextStatement)) {
+					return;
+				}
+			}
 			foreach (var edge in node.Outgoing) {
 				if (visitedNodes.Add(edge.To))
 					stack.Push(edge.To);
 			}
 		}
+
+		bool IsRecursive(Statement statement)
+		{
+			return recursiveDetectorVisitor != null && statement.AcceptVisitor(recursiveDetectorVisitor);
+		}
 		
 		public IEnumerable<Statement> ReachableStatements {
 			get { return reachableStatements; }
@@ -94,5 +111,99 @@ namespace ICSharpCode.NRefactory.CSharp.Analysis
 		{
 			return reachableEndPoints.Contains(statement);
 		}
+
+		public class RecursiveDetectorVisitor : DepthFirstAstVisitor<bool>
+		{
+			public override bool VisitConditionalExpression(ConditionalExpression conditionalExpression)
+			{
+				if (conditionalExpression.Condition.AcceptVisitor(this))
+					return true;
+
+				if (!conditionalExpression.TrueExpression.AcceptVisitor(this))
+					return false;
+
+				return conditionalExpression.FalseExpression.AcceptVisitor(this);
+			}
+
+			public override bool VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
+			{
+				if (binaryOperatorExpression.Operator == BinaryOperatorType.NullCoalescing) {
+					return binaryOperatorExpression.Left.AcceptVisitor(this);
+				}
+				return base.VisitBinaryOperatorExpression(binaryOperatorExpression);
+			}
+
+			public override bool VisitIfElseStatement(IfElseStatement ifElseStatement)
+			{
+				if (ifElseStatement.Condition.AcceptVisitor(this))
+					return true;
+
+				if (!ifElseStatement.TrueStatement.AcceptVisitor(this))
+					return false;
+
+				//No need to worry about null ast nodes, since AcceptVisitor will just
+				//return false in those cases
+				return ifElseStatement.FalseStatement.AcceptVisitor(this);
+			}
+
+			public override bool VisitForeachStatement(ForeachStatement foreachStatement)
+			{
+				//Even if the body is always recursive, the function may stop if the collection
+				// is empty.
+				return foreachStatement.InExpression.AcceptVisitor(this);
+			}
+
+			public override bool VisitForStatement(ForStatement forStatement)
+			{
+				if (forStatement.Initializers.Any(initializer => initializer.AcceptVisitor(this)))
+					return true;
+
+				return forStatement.Condition.AcceptVisitor(this);
+			}
+
+			public override bool VisitSwitchStatement(SwitchStatement switchStatement)
+			{
+				if (switchStatement.Expression.AcceptVisitor(this)) {
+					return true;
+				}
+
+				bool foundDefault = false;
+				foreach (var section in switchStatement.SwitchSections) {
+					foundDefault = foundDefault || section.CaseLabels.Any(label => label.Expression.IsNull);
+					if (!section.AcceptVisitor(this))
+						return false;
+				}
+
+				return foundDefault;
+			}
+
+			public override bool VisitBlockStatement(BlockStatement blockStatement)
+			{
+				//If the block has a recursive statement, then that statement will be visited
+				//individually by the CFG construction algorithm later.
+				return false;
+			}
+
+			protected override bool VisitChildren(AstNode node)
+			{
+				return VisitNodeList(node.Children);
+			}
+
+			bool VisitNodeList(IEnumerable<AstNode> nodes) {
+				return nodes.Any(node => node.AcceptVisitor(this));
+			}
+
+			public override bool VisitQueryExpression(QueryExpression queryExpression)
+			{
+				//We only care about the first from clause because:
+				//in "from x in Method() select x", Method() might be recursive
+				//but in "from x in Bar() from y in Method() select x + y", even if Method() is recursive
+				//Bar might still be empty.
+				var queryFromClause = queryExpression.Clauses.OfType<QueryFromClause>().FirstOrDefault();
+				if (queryFromClause == null)
+					return true;
+				return queryFromClause.AcceptVisitor(this);
+			}
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/SemanticHighlightingVisitor.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/SemanticHighlightingVisitor.cs
index 8db19292a7..7fc20fe986 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/SemanticHighlightingVisitor.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Analysis/SemanticHighlightingVisitor.cs
@@ -24,6 +24,8 @@ using ICSharpCode.NRefactory.CSharp.Resolver;
 using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using System.Threading;
+using ICSharpCode.NRefactory.CSharp.Completion;
+using System.Collections.ObjectModel;
 
 namespace ICSharpCode.NRefactory.CSharp.Analysis
 {
@@ -77,7 +79,10 @@ namespace ICSharpCode.NRefactory.CSharp.Analysis
 		/// Used for inactive code (excluded by preprocessor or ConditionalAttribute)
 		/// </summary>
 		protected TColor inactiveCodeColor;
-		
+
+		protected TColor stringFormatItemColor;
+
+
 		protected TColor syntaxErrorColor;
 		
 		protected TextLocation regionStart;
@@ -260,18 +265,67 @@ namespace ICSharpCode.NRefactory.CSharp.Analysis
 			Colorize(memberNameToken, rr);
 			VisitChildrenAfter(memberReferenceExpression, memberNameToken);
 		}
-		
+
+		void HighlightStringFormatItems(PrimitiveExpression expr)
+		{
+			if (!(expr.Value is string))
+				return;
+			int line = expr.StartLocation.Line;
+			int col = expr.StartLocation.Column;
+			TextLocation start = TextLocation.Empty;
+			for (int i = 0; i < expr.LiteralValue.Length; i++) {
+				char ch = expr.LiteralValue [i];
+
+				if (NewLine.GetDelimiterType(ch, i + 1 < expr.LiteralValue.Length ? expr.LiteralValue [i + 1] : '\0') != UnicodeNewline.Unknown) {
+					line++;
+					col = 1;
+					continue;
+				}
+
+
+				if (ch == '{' && start.IsEmpty) {
+					char next = i + 1 < expr.LiteralValue.Length ? expr.LiteralValue [i + 1] : '\0';
+					if (next == '{') {
+						i++;
+						col += 2;
+						continue;
+					}
+					start = new TextLocation(line, col);
+				}
+				col++;
+				if (ch == '}' &&!start.IsEmpty) {
+					char next = i + 1 < expr.LiteralValue.Length ? expr.LiteralValue [i + 1] : '\0';
+					if (next == '}') {
+						i++;
+						col += 2;
+						continue;
+					}
+					Colorize(start, new TextLocation(line, col), stringFormatItemColor);
+					start = TextLocation.Empty;
+				}
+			}
+
+		}
+
 		public override void VisitInvocationExpression(InvocationExpression invocationExpression)
 		{
 			Expression target = invocationExpression.Target;
 			if (target is IdentifierExpression || target is MemberReferenceExpression || target is PointerReferenceExpression) {
 				var invocationRR = resolver.Resolve(invocationExpression, cancellationToken) as CSharpInvocationResolveResult;
-				if (invocationRR != null && invocationExpression.Parent is ExpressionStatement && IsInactiveConditionalMethod(invocationRR.Member)) {
-					// mark the whole invocation statement as inactive code
-					Colorize(invocationExpression.Parent, inactiveCodeColor);
-					return;
+				if (invocationRR != null) {
+					if (invocationExpression.Parent is ExpressionStatement && (IsInactiveConditionalMethod(invocationRR.Member) || IsEmptyPartialMethod(invocationRR.Member))) {
+						// mark the whole invocation statement as inactive code
+						Colorize(invocationExpression.Parent, inactiveCodeColor);
+						return;
+					}
+
+					if (invocationRR.Arguments.Count > 1 && CSharpCompletionEngine.FormatItemMethods.Contains(invocationRR.Member.FullName)) {
+						var expr = invocationExpression.Arguments.First() as PrimitiveExpression; 
+						if (expr != null)
+							HighlightStringFormatItems(expr);
+					}
 				}
-				
+
 				VisitChildrenUntil(invocationExpression, target);
 				
 				// highlight the method call
@@ -302,7 +356,15 @@ namespace ICSharpCode.NRefactory.CSharp.Analysis
 			}
 			return IsInactiveConditional(member.Attributes);
 		}
-		
+
+		static bool IsEmptyPartialMethod(IParameterizedMember member)
+		{
+			if (member.SymbolKind != SymbolKind.Method || member.ReturnType.Kind != TypeKind.Void)
+				return false;
+			var method = (IMethod)member;
+			return method.IsPartial && !method.HasBody;
+		}
+
 		bool IsInactiveConditional(IList<IAttribute> attributes)
 		{
 			bool hasConditionalAttribute = false;
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/AstNode.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/AstNode.cs
index 282a8dddfa..eb89e59160 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/AstNode.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/AstNode.cs
@@ -384,7 +384,12 @@ namespace ICSharpCode.NRefactory.CSharp
 		{
 			return Ancestors.OfType<T>().FirstOrDefault();
 		}
-		
+
+		public AstNode GetParent(Func<AstNode, bool> pred)
+		{
+			return Ancestors.FirstOrDefault(pred);
+		}
+
 		public AstNodeCollection<T> GetChildrenByRole<T> (Role<T> role) where T : AstNode
 		{
 			return new AstNodeCollection<T> (this, role);
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/AstType.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/AstType.cs
index e120d0cdbb..1dd05391c2 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/AstType.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/AstType.cs
@@ -275,5 +275,10 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 			return type;
 		}
+
+		public static implicit operator Expression (AstType type)
+		{
+			return new TypeReferenceExpression(type);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/CSharpUtil.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/CSharpUtil.cs
index 4a9b8e980f..a2a07ad6e5 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/CSharpUtil.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/CSharpUtil.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 using System;
 using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory.PatternMatching;
 
 namespace ICSharpCode.NRefactory.CSharp
 {
@@ -34,46 +35,77 @@ namespace ICSharpCode.NRefactory.CSharp
 		/// Inverts a boolean condition. Note: The condition object can be frozen (from AST) it's cloned internally.
 		/// </summary>
 		/// <param name="condition">The condition to invert.</param>
-		public static Expression InvertCondition (Expression condition)
+		public static Expression InvertCondition(Expression condition)
 		{
-			return InvertConditionInternal (condition.Clone ());
+			return InvertConditionInternal(condition);
 		}
 		
-		static Expression InvertConditionInternal (Expression condition)
+		static Expression InvertConditionInternal(Expression condition)
 		{
 			if (condition is ParenthesizedExpression) {
-				((ParenthesizedExpression)condition).Expression = InvertCondition (((ParenthesizedExpression)condition).Expression);
-				return condition;
+				return new ParenthesizedExpression(InvertCondition(((ParenthesizedExpression)condition).Expression));
 			}
 			
 			if (condition is UnaryOperatorExpression) {
 				var uOp = (UnaryOperatorExpression)condition;
-				if (uOp.Operator == UnaryOperatorType.Not)
-					return uOp.Expression;
-				return new UnaryOperatorExpression (UnaryOperatorType.Not, uOp);
+				if (uOp.Operator == UnaryOperatorType.Not) {
+					if (!(uOp.Parent is Expression))
+						return GetInnerMostExpression(uOp.Expression).Clone();
+					return uOp.Expression.Clone();
+				}
+				return new UnaryOperatorExpression(UnaryOperatorType.Not, uOp.Clone());
 			}
 			
 			if (condition is BinaryOperatorExpression) {
 				var bOp = (BinaryOperatorExpression)condition;
-				var negatedOp = NegateRelationalOperator (bOp.Operator);
-				if (negatedOp == BinaryOperatorType.Any)
-					return new UnaryOperatorExpression (UnaryOperatorType.Not, new ParenthesizedExpression (condition));
-				bOp.Operator = negatedOp;
-				return bOp;
+
+				if ((bOp.Operator == BinaryOperatorType.ConditionalAnd) || (bOp.Operator == BinaryOperatorType.ConditionalOr)) {
+					return new BinaryOperatorExpression(InvertCondition(bOp.Left), NegateConditionOperator(bOp.Operator), InvertCondition(bOp.Right));
+				} else if ((bOp.Operator == BinaryOperatorType.Equality) || (bOp.Operator == BinaryOperatorType.InEquality) || (bOp.Operator == BinaryOperatorType.GreaterThan)
+					|| (bOp.Operator == BinaryOperatorType.GreaterThanOrEqual) || (bOp.Operator == BinaryOperatorType.LessThan) || 
+					(bOp.Operator == BinaryOperatorType.LessThanOrEqual)) {
+					return new BinaryOperatorExpression(bOp.Left.Clone(), NegateRelationalOperator(bOp.Operator), bOp.Right.Clone());
+				} else {
+					var negatedOp = NegateRelationalOperator(bOp.Operator);
+					if (negatedOp == BinaryOperatorType.Any)
+						return new UnaryOperatorExpression(UnaryOperatorType.Not, new ParenthesizedExpression(condition.Clone()));
+					bOp = (BinaryOperatorExpression)bOp.Clone();
+					bOp.Operator = negatedOp;
+					return bOp;
+				}
 			}
 			if (condition is ConditionalExpression) {
-				var cEx = condition as ConditionalExpression;
-				cEx.Condition = InvertCondition (cEx.Condition);
+				var cEx = condition.Clone() as ConditionalExpression;
+				cEx.Condition = InvertCondition(cEx.Condition);
 				return cEx;
 			}
 			if (condition is PrimitiveExpression) {
 				var pex = condition as PrimitiveExpression;
 				if (pex.Value is bool) {
-					return new PrimitiveExpression (!((bool)pex.Value)); 
+					return new PrimitiveExpression(!((bool)pex.Value)); 
 				}
 			}
 			
-			return new UnaryOperatorExpression (UnaryOperatorType.Not, condition);
+			return new UnaryOperatorExpression(UnaryOperatorType.Not, AddParensForUnaryExpressionIfRequired(condition.Clone()));
+		}
+
+		/// <summary>
+		/// When negating an expression this is required, otherwise you would end up with
+		/// a or b -> !a or b
+		/// </summary>
+		internal static Expression AddParensForUnaryExpressionIfRequired(Expression expression)
+		{
+			if ((expression is BinaryOperatorExpression) ||
+			    (expression is AssignmentExpression) ||
+			    (expression is CastExpression) ||
+			    (expression is AsExpression) ||
+			    (expression is IsExpression) ||
+			    (expression is LambdaExpression) ||
+			    (expression is ConditionalExpression)) {
+				return new ParenthesizedExpression(expression);
+			}
+
+			return expression;
 		}
 
 		/// <summary>
@@ -82,7 +114,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		/// <returns>
 		/// negation of the specified relational operator, or BinaryOperatorType.Any if it's not a relational operator
 		/// </returns>
-		public static BinaryOperatorType NegateRelationalOperator (BinaryOperatorType op)
+		public static BinaryOperatorType NegateRelationalOperator(BinaryOperatorType op)
 		{
 			switch (op) {
 				case BinaryOperatorType.GreaterThan:
@@ -97,9 +129,52 @@ namespace ICSharpCode.NRefactory.CSharp
 					return BinaryOperatorType.GreaterThanOrEqual;
 				case BinaryOperatorType.LessThanOrEqual:
 					return BinaryOperatorType.GreaterThan;
+				case BinaryOperatorType.ConditionalOr:
+					return BinaryOperatorType.ConditionalAnd;
+				case BinaryOperatorType.ConditionalAnd:
+					return BinaryOperatorType.ConditionalOr;
 			}
 			return BinaryOperatorType.Any;
 		}
+
+		/// <summary>
+		/// Returns true, if the specified operator is a relational operator
+		/// </summary>
+		public static bool IsRelationalOperator(BinaryOperatorType op)
+		{
+			return NegateRelationalOperator(op) != BinaryOperatorType.Any;
+		}
+
+		/// <summary>
+		/// Get negation of the condition operator
+		/// </summary>
+		/// <returns>
+		/// negation of the specified condition operator, or BinaryOperatorType.Any if it's not a condition operator
+		/// </returns>
+		public static BinaryOperatorType NegateConditionOperator(BinaryOperatorType op)
+		{
+			switch (op) {
+				case BinaryOperatorType.ConditionalOr:
+					return BinaryOperatorType.ConditionalAnd;
+				case BinaryOperatorType.ConditionalAnd:
+					return BinaryOperatorType.ConditionalOr;
+			}
+			return BinaryOperatorType.Any;
+		}
+
+		public static bool AreConditionsEqual(Expression cond1, Expression cond2)
+		{
+			if (cond1 == null || cond2 == null)
+				return false;
+			return GetInnerMostExpression(cond1).IsMatch(GetInnerMostExpression(cond2));
+		}
+
+		public static Expression GetInnerMostExpression(Expression target)
+		{
+			while (target is ParenthesizedExpression)
+				target = ((ParenthesizedExpression)target).Expression;
+			return target;
+		}
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/AnonymousMethodExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/AnonymousMethodExpression.cs
index c1f1acd606..e8de954311 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/AnonymousMethodExpression.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/AnonymousMethodExpression.cs
@@ -48,7 +48,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		bool hasParameterList;
 		
 		public bool HasParameterList {
-			get { return hasParameterList; }
+			get { return hasParameterList || Parameters.Any(); }
 			set { ThrowIfFrozen(); hasParameterList = value; }
 		}
 		
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/AsExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/AsExpression.cs
index cf9cfb4f9a..5a7b5ac5dc 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/AsExpression.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/AsExpression.cs
@@ -23,6 +23,8 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
+using System.Collections.Generic;
+using System;
 
 namespace ICSharpCode.NRefactory.CSharp
 {
@@ -56,7 +58,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			AddChild (expression, Roles.Expression);
 			AddChild (type, Roles.Type);
 		}
-		
+
 		public override void AcceptVisitor (IAstVisitor visitor)
 		{
 			visitor.VisitAsExpression (this);
@@ -77,6 +79,72 @@ namespace ICSharpCode.NRefactory.CSharp
 			AsExpression o = other as AsExpression;
 			return o != null && this.Expression.DoMatch(o.Expression, match) && this.Type.DoMatch(o.Type, match);
 		}
+
+		#region Builder methods
+		public override MemberReferenceExpression Member(string memberName)
+		{
+			return new MemberReferenceExpression { Target = this, MemberName = memberName };
+		}
+
+		public override IndexerExpression Indexer(IEnumerable<Expression> arguments)
+		{
+			IndexerExpression expr = new IndexerExpression();
+			expr.Target = new ParenthesizedExpression(this);
+			expr.Arguments.AddRange(arguments);
+			return expr;
+		}
+
+		public override IndexerExpression Indexer(params Expression[] arguments)
+		{
+			IndexerExpression expr = new IndexerExpression();
+			expr.Target = new ParenthesizedExpression(this);
+			expr.Arguments.AddRange(arguments);
+			return expr;
+		}
+
+		public override InvocationExpression Invoke(string methodName, IEnumerable<AstType> typeArguments, IEnumerable<Expression> arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			MemberReferenceExpression mre = new MemberReferenceExpression();
+			mre.Target = new ParenthesizedExpression(this);
+			mre.MemberName = methodName;
+			mre.TypeArguments.AddRange(typeArguments);
+			ie.Target = mre;
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override InvocationExpression Invoke(IEnumerable<Expression> arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			ie.Target = new ParenthesizedExpression(this);
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override InvocationExpression Invoke(params Expression[] arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			ie.Target = new ParenthesizedExpression(this);
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override CastExpression CastTo(AstType type)
+		{
+			return new CastExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+
+		public override AsExpression CastAs(AstType type)
+		{
+			return new AsExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+
+		public override IsExpression IsType(AstType type)
+		{
+			return new IsExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+		#endregion
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/AssignmentExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/AssignmentExpression.cs
index 14021d3236..95d0cdf289 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/AssignmentExpression.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/AssignmentExpression.cs
@@ -26,6 +26,7 @@
 
 using System;
 using System.Linq.Expressions;
+using System.Collections.Generic;
 
 namespace ICSharpCode.NRefactory.CSharp
 {
@@ -201,6 +202,72 @@ namespace ICSharpCode.NRefactory.CSharp
 					throw new NotSupportedException("Invalid value for AssignmentOperatorType");
 			}
 		}
+
+		#region Builder methods
+		public override MemberReferenceExpression Member(string memberName)
+		{
+			return new MemberReferenceExpression { Target = this, MemberName = memberName };
+		}
+
+		public override IndexerExpression Indexer(IEnumerable<Expression> arguments)
+		{
+			IndexerExpression expr = new IndexerExpression();
+			expr.Target = new ParenthesizedExpression(this);
+			expr.Arguments.AddRange(arguments);
+			return expr;
+		}
+
+		public override IndexerExpression Indexer(params Expression[] arguments)
+		{
+			IndexerExpression expr = new IndexerExpression();
+			expr.Target = new ParenthesizedExpression(this);
+			expr.Arguments.AddRange(arguments);
+			return expr;
+		}
+
+		public override InvocationExpression Invoke(string methodName, IEnumerable<AstType> typeArguments, IEnumerable<Expression> arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			MemberReferenceExpression mre = new MemberReferenceExpression();
+			mre.Target = new ParenthesizedExpression(this);
+			mre.MemberName = methodName;
+			mre.TypeArguments.AddRange(typeArguments);
+			ie.Target = mre;
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override InvocationExpression Invoke(IEnumerable<Expression> arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			ie.Target = new ParenthesizedExpression(this);
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override InvocationExpression Invoke(params Expression[] arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			ie.Target = new ParenthesizedExpression(this);
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override CastExpression CastTo(AstType type)
+		{
+			return new CastExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+
+		public override AsExpression CastAs(AstType type)
+		{
+			return new AsExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+
+		public override IsExpression IsType(AstType type)
+		{
+			return new IsExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+		#endregion
 	}
 	
 	public enum AssignmentOperatorType
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/BinaryOperatorExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/BinaryOperatorExpression.cs
index 819d90f534..e4408e1849 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/BinaryOperatorExpression.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/BinaryOperatorExpression.cs
@@ -26,6 +26,7 @@
 
 using System;
 using System.Linq.Expressions;
+using System.Collections.Generic;
 
 namespace ICSharpCode.NRefactory.CSharp
 {
@@ -200,6 +201,71 @@ namespace ICSharpCode.NRefactory.CSharp
 					throw new NotSupportedException("Invalid value for BinaryOperatorType");
 			}
 		}
+		#region Builder methods
+		public override MemberReferenceExpression Member(string memberName)
+		{
+			return new MemberReferenceExpression { Target = this, MemberName = memberName };
+		}
+
+		public override IndexerExpression Indexer(IEnumerable<Expression> arguments)
+		{
+			IndexerExpression expr = new IndexerExpression();
+			expr.Target = new ParenthesizedExpression(this);
+			expr.Arguments.AddRange(arguments);
+			return expr;
+		}
+
+		public override IndexerExpression Indexer(params Expression[] arguments)
+		{
+			IndexerExpression expr = new IndexerExpression();
+			expr.Target = new ParenthesizedExpression(this);
+			expr.Arguments.AddRange(arguments);
+			return expr;
+		}
+
+		public override InvocationExpression Invoke(string methodName, IEnumerable<AstType> typeArguments, IEnumerable<Expression> arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			MemberReferenceExpression mre = new MemberReferenceExpression();
+			mre.Target = new ParenthesizedExpression(this);
+			mre.MemberName = methodName;
+			mre.TypeArguments.AddRange(typeArguments);
+			ie.Target = mre;
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override InvocationExpression Invoke(IEnumerable<Expression> arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			ie.Target = new ParenthesizedExpression(this);
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override InvocationExpression Invoke(params Expression[] arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			ie.Target = new ParenthesizedExpression(this);
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override CastExpression CastTo(AstType type)
+		{
+			return new CastExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+
+		public override AsExpression CastAs(AstType type)
+		{
+			return new AsExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+
+		public override IsExpression IsType(AstType type)
+		{
+			return new IsExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+		#endregion
 	}
 	
 	public enum BinaryOperatorType
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/CastExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/CastExpression.cs
index 96f41bcf34..e771d18fe7 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/CastExpression.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/CastExpression.cs
@@ -23,6 +23,8 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
+using System.Collections.Generic;
+using System;
 
 namespace ICSharpCode.NRefactory.CSharp
 {
@@ -52,13 +54,13 @@ namespace ICSharpCode.NRefactory.CSharp
 		public CastExpression ()
 		{
 		}
-		
+
 		public CastExpression (AstType castToType, Expression expression)
 		{
 			AddChild (castToType, Roles.Type);
 			AddChild (expression, Roles.Expression);
 		}
-		
+
 		public override void AcceptVisitor (IAstVisitor visitor)
 		{
 			visitor.VisitCastExpression (this);
@@ -79,6 +81,72 @@ namespace ICSharpCode.NRefactory.CSharp
 			CastExpression o = other as CastExpression;
 			return o != null && this.Type.DoMatch(o.Type, match) && this.Expression.DoMatch(o.Expression, match);
 		}
+
+		#region Builder methods
+		public override MemberReferenceExpression Member(string memberName)
+		{
+			return new MemberReferenceExpression { Target = this, MemberName = memberName };
+		}
+
+		public override IndexerExpression Indexer(IEnumerable<Expression> arguments)
+		{
+			IndexerExpression expr = new IndexerExpression();
+			expr.Target = new ParenthesizedExpression(this);
+			expr.Arguments.AddRange(arguments);
+			return expr;
+		}
+
+		public override IndexerExpression Indexer(params Expression[] arguments)
+		{
+			IndexerExpression expr = new IndexerExpression();
+			expr.Target = new ParenthesizedExpression(this);
+			expr.Arguments.AddRange(arguments);
+			return expr;
+		}
+
+		public override InvocationExpression Invoke(string methodName, IEnumerable<AstType> typeArguments, IEnumerable<Expression> arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			MemberReferenceExpression mre = new MemberReferenceExpression();
+			mre.Target = new ParenthesizedExpression(this);
+			mre.MemberName = methodName;
+			mre.TypeArguments.AddRange(typeArguments);
+			ie.Target = mre;
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override InvocationExpression Invoke(IEnumerable<Expression> arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			ie.Target = new ParenthesizedExpression(this);
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override InvocationExpression Invoke(params Expression[] arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			ie.Target = new ParenthesizedExpression(this);
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override CastExpression CastTo(AstType type)
+		{
+			return new CastExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+
+		public override AsExpression CastAs(AstType type)
+		{
+			return new AsExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+
+		public override IsExpression IsType(AstType type)
+		{
+			return new IsExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+		#endregion
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/ConditionalExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/ConditionalExpression.cs
index fb2d5cb594..4367a0cced 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/ConditionalExpression.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/ConditionalExpression.cs
@@ -23,6 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
+using System.Collections.Generic;
 
 namespace ICSharpCode.NRefactory.CSharp
 {
@@ -91,5 +92,71 @@ namespace ICSharpCode.NRefactory.CSharp
 			ConditionalExpression o = other as ConditionalExpression;
 			return o != null && this.Condition.DoMatch(o.Condition, match) && this.TrueExpression.DoMatch(o.TrueExpression, match) && this.FalseExpression.DoMatch(o.FalseExpression, match);
 		}
+
+		#region Builder methods
+		public override MemberReferenceExpression Member(string memberName)
+		{
+			return new MemberReferenceExpression { Target = this, MemberName = memberName };
+		}
+
+		public override IndexerExpression Indexer(IEnumerable<Expression> arguments)
+		{
+			IndexerExpression expr = new IndexerExpression();
+			expr.Target = new ParenthesizedExpression(this);
+			expr.Arguments.AddRange(arguments);
+			return expr;
+		}
+
+		public override IndexerExpression Indexer(params Expression[] arguments)
+		{
+			IndexerExpression expr = new IndexerExpression();
+			expr.Target = new ParenthesizedExpression(this);
+			expr.Arguments.AddRange(arguments);
+			return expr;
+		}
+
+		public override InvocationExpression Invoke(string methodName, IEnumerable<AstType> typeArguments, IEnumerable<Expression> arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			MemberReferenceExpression mre = new MemberReferenceExpression();
+			mre.Target = new ParenthesizedExpression(this);
+			mre.MemberName = methodName;
+			mre.TypeArguments.AddRange(typeArguments);
+			ie.Target = mre;
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override InvocationExpression Invoke(IEnumerable<Expression> arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			ie.Target = new ParenthesizedExpression(this);
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override InvocationExpression Invoke(params Expression[] arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			ie.Target = new ParenthesizedExpression(this);
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override CastExpression CastTo(AstType type)
+		{
+			return new CastExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+
+		public override AsExpression CastAs(AstType type)
+		{
+			return new AsExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+
+		public override IsExpression IsType(AstType type)
+		{
+			return new IsExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+		#endregion
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/Expression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/Expression.cs
index 212aecdb5d..c71d8e51d2 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/Expression.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/Expression.cs
@@ -130,7 +130,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		/// <summary>
 		/// Builds an member reference expression using this expression as target.
 		/// </summary>
-		public MemberReferenceExpression Member(string memberName)
+		public virtual MemberReferenceExpression Member(string memberName)
 		{
 			return new MemberReferenceExpression { Target = this, MemberName = memberName };
 		}
@@ -138,7 +138,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		/// <summary>
 		/// Builds an indexer expression using this expression as target.
 		/// </summary>
-		public IndexerExpression Indexer(IEnumerable<Expression> arguments)
+		public virtual IndexerExpression Indexer(IEnumerable<Expression> arguments)
 		{
 			IndexerExpression expr = new IndexerExpression();
 			expr.Target = this;
@@ -149,7 +149,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		/// <summary>
 		/// Builds an indexer expression using this expression as target.
 		/// </summary>
-		public IndexerExpression Indexer(params Expression[] arguments)
+		public virtual IndexerExpression Indexer(params Expression[] arguments)
 		{
 			IndexerExpression expr = new IndexerExpression();
 			expr.Target = this;
@@ -160,7 +160,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		/// <summary>
 		/// Builds an invocation expression using this expression as target.
 		/// </summary>
-		public InvocationExpression Invoke(string methodName, IEnumerable<Expression> arguments)
+		public virtual InvocationExpression Invoke(string methodName, IEnumerable<Expression> arguments)
 		{
 			return Invoke(methodName, null, arguments);
 		}
@@ -168,7 +168,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		/// <summary>
 		/// Builds an invocation expression using this expression as target.
 		/// </summary>
-		public InvocationExpression Invoke(string methodName, params Expression[] arguments)
+		public virtual InvocationExpression Invoke(string methodName, params Expression[] arguments)
 		{
 			return Invoke(methodName, null, arguments);
 		}
@@ -176,7 +176,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		/// <summary>
 		/// Builds an invocation expression using this expression as target.
 		/// </summary>
-		public InvocationExpression Invoke(string methodName, IEnumerable<AstType> typeArguments, IEnumerable<Expression> arguments)
+		public virtual InvocationExpression Invoke(string methodName, IEnumerable<AstType> typeArguments, IEnumerable<Expression> arguments)
 		{
 			InvocationExpression ie = new InvocationExpression();
 			MemberReferenceExpression mre = new MemberReferenceExpression();
@@ -191,7 +191,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		/// <summary>
 		/// Builds an invocation expression using this expression as target.
 		/// </summary>
-		public InvocationExpression Invoke(IEnumerable<Expression> arguments)
+		public virtual InvocationExpression Invoke(IEnumerable<Expression> arguments)
 		{
 			InvocationExpression ie = new InvocationExpression();
 			ie.Target = this;
@@ -202,7 +202,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		/// <summary>
 		/// Builds an invocation expression using this expression as target.
 		/// </summary>
-		public InvocationExpression Invoke(params Expression[] arguments)
+		public virtual InvocationExpression Invoke(params Expression[] arguments)
 		{
 			InvocationExpression ie = new InvocationExpression();
 			ie.Target = this;
@@ -210,17 +210,17 @@ namespace ICSharpCode.NRefactory.CSharp
 			return ie;
 		}
 		
-		public CastExpression CastTo(AstType type)
+		public virtual CastExpression CastTo(AstType type)
 		{
 			return new CastExpression { Type = type,  Expression = this };
 		}
 		
-		public AsExpression CastAs(AstType type)
+		public virtual AsExpression CastAs(AstType type)
 		{
 			return new AsExpression { Type = type,  Expression = this };
 		}
 		
-		public IsExpression IsType(AstType type)
+		public virtual IsExpression IsType(AstType type)
 		{
 			return new IsExpression { Type = type,  Expression = this };
 		}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/IsExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/IsExpression.cs
index 163cef0412..791ab25d72 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/IsExpression.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/IsExpression.cs
@@ -23,6 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
+using System.Collections.Generic;
 
 namespace ICSharpCode.NRefactory.CSharp
 {
@@ -46,6 +47,17 @@ namespace ICSharpCode.NRefactory.CSharp
 			get { return GetChildByRole(Roles.Type); }
 			set { SetChildByRole(Roles.Type, value); }
 		}
+
+		public IsExpression()
+		{
+		}
+
+		public IsExpression (Expression expression, AstType type)
+		{
+			AddChild (expression, Roles.Expression);
+			AddChild (type, Roles.Type);
+		}
+
 		
 		public override void AcceptVisitor (IAstVisitor visitor)
 		{
@@ -67,6 +79,72 @@ namespace ICSharpCode.NRefactory.CSharp
 			IsExpression o = other as IsExpression;
 			return o != null && this.Expression.DoMatch(o.Expression, match) && this.Type.DoMatch(o.Type, match);
 		}
+
+		#region Builder methods
+		public override MemberReferenceExpression Member(string memberName)
+		{
+			return new MemberReferenceExpression { Target = this, MemberName = memberName };
+		}
+
+		public override IndexerExpression Indexer(IEnumerable<Expression> arguments)
+		{
+			IndexerExpression expr = new IndexerExpression();
+			expr.Target = new ParenthesizedExpression(this);
+			expr.Arguments.AddRange(arguments);
+			return expr;
+		}
+
+		public override IndexerExpression Indexer(params Expression[] arguments)
+		{
+			IndexerExpression expr = new IndexerExpression();
+			expr.Target = new ParenthesizedExpression(this);
+			expr.Arguments.AddRange(arguments);
+			return expr;
+		}
+
+		public override InvocationExpression Invoke(string methodName, IEnumerable<AstType> typeArguments, IEnumerable<Expression> arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			MemberReferenceExpression mre = new MemberReferenceExpression();
+			mre.Target = new ParenthesizedExpression(this);
+			mre.MemberName = methodName;
+			mre.TypeArguments.AddRange(typeArguments);
+			ie.Target = mre;
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override InvocationExpression Invoke(IEnumerable<Expression> arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			ie.Target = new ParenthesizedExpression(this);
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override InvocationExpression Invoke(params Expression[] arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			ie.Target = new ParenthesizedExpression(this);
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override CastExpression CastTo(AstType type)
+		{
+			return new CastExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+
+		public override AsExpression CastAs(AstType type)
+		{
+			return new AsExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+
+		public override IsExpression IsType(AstType type)
+		{
+			return new IsExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+		#endregion
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/LambdaExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/LambdaExpression.cs
index 001ffcb323..e85902d842 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/LambdaExpression.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/LambdaExpression.cs
@@ -44,10 +44,18 @@ namespace ICSharpCode.NRefactory.CSharp
 			set { ThrowIfFrozen(); isAsync = value; }
 		}
 		
+		public CSharpTokenNode LParToken {
+			get { return GetChildByRole (Roles.LPar); }
+		}
+
 		public AstNodeCollection<ParameterDeclaration> Parameters {
 			get { return GetChildrenByRole (Roles.Parameter); }
 		}
 		
+		public CSharpTokenNode RParToken {
+			get { return GetChildByRole (Roles.RPar); }
+		}
+
 		public CSharpTokenNode ArrowToken {
 			get { return GetChildByRole (ArrowRole); }
 		}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/PrimitiveExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/PrimitiveExpression.cs
index 514bd9b027..e9e9ea620f 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/PrimitiveExpression.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/PrimitiveExpression.cs
@@ -116,19 +116,19 @@ namespace ICSharpCode.NRefactory.CSharp
 				char* p = start;
 				char* endPtr = start + str.Length;
 				while (p < endPtr) {
-					switch (*p) {
-						case '\r':
-							char* nextp = p + 1;
-							if (nextp < endPtr && *nextp == '\n') 
-								p++;
-							goto case '\n';
-						case '\n':
-							line++;
-							col = 1;
-							break;
-						default:
-							col++;
-							break;
+					var nl = NewLine.GetDelimiterLength(*p, () => {
+						char* nextp = p + 1;
+						if (nextp < endPtr)
+							return *nextp;
+						return '\0';
+					});
+					if (nl > 0) {
+						line++;
+						col = 1;
+						if (nl == 2)
+							p++;
+					} else {
+						col++;
 					}
 					p++;
 				}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/QueryExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/QueryExpression.cs
index bb136f260a..5d82da2fd7 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/QueryExpression.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Expressions/QueryExpression.cs
@@ -81,6 +81,72 @@ namespace ICSharpCode.NRefactory.CSharp
 			QueryExpression o = other as QueryExpression;
 			return o != null && !o.IsNull && this.Clauses.DoMatch(o.Clauses, match);
 		}
+
+		#region Builder methods
+		public override MemberReferenceExpression Member(string memberName)
+		{
+			return new MemberReferenceExpression { Target = this, MemberName = memberName };
+		}
+
+		public override IndexerExpression Indexer(IEnumerable<Expression> arguments)
+		{
+			IndexerExpression expr = new IndexerExpression();
+			expr.Target = new ParenthesizedExpression(this);
+			expr.Arguments.AddRange(arguments);
+			return expr;
+		}
+
+		public override IndexerExpression Indexer(params Expression[] arguments)
+		{
+			IndexerExpression expr = new IndexerExpression();
+			expr.Target = new ParenthesizedExpression(this);
+			expr.Arguments.AddRange(arguments);
+			return expr;
+		}
+
+		public override InvocationExpression Invoke(string methodName, IEnumerable<AstType> typeArguments, IEnumerable<Expression> arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			MemberReferenceExpression mre = new MemberReferenceExpression();
+			mre.Target = new ParenthesizedExpression(this);
+			mre.MemberName = methodName;
+			mre.TypeArguments.AddRange(typeArguments);
+			ie.Target = mre;
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override InvocationExpression Invoke(IEnumerable<Expression> arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			ie.Target = new ParenthesizedExpression(this);
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override InvocationExpression Invoke(params Expression[] arguments)
+		{
+			InvocationExpression ie = new InvocationExpression();
+			ie.Target = new ParenthesizedExpression(this);
+			ie.Arguments.AddRange(arguments);
+			return ie;
+		}
+
+		public override CastExpression CastTo(AstType type)
+		{
+			return new CastExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+
+		public override AsExpression CastAs(AstType type)
+		{
+			return new AsExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+
+		public override IsExpression IsType(AstType type)
+		{
+			return new IsExpression { Type = type,  Expression = new ParenthesizedExpression(this) };
+		}
+		#endregion
 	}
 	
 	public abstract class QueryClause : AstNode
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/Attribute.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/Attribute.cs
index 5a3b8985a7..cc99936e51 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/Attribute.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/Attribute.cs
@@ -43,11 +43,19 @@ namespace ICSharpCode.NRefactory.CSharp
 			get { return GetChildByRole (Roles.Type); }
 			set { SetChildByRole (Roles.Type, value); }
 		}
-		
+
+		public CSharpTokenNode LParToken {
+			get { return GetChildByRole (Roles.LPar); }
+		}
+
 		public AstNodeCollection<Expression> Arguments {
 			get { return base.GetChildrenByRole (Roles.Argument); }
 		}
-		
+
+		public CSharpTokenNode RParToken {
+			get { return GetChildByRole (Roles.RPar); }
+		}
+
 		// HasArgumentList == false: [Empty]
 		public bool HasArgumentList {
 			get;
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/NamespaceDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/NamespaceDeclaration.cs
index a374f490d7..3b662a95a4 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/NamespaceDeclaration.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/NamespaceDeclaration.cs
@@ -23,10 +23,10 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System;
 
 namespace ICSharpCode.NRefactory.CSharp
 {
@@ -36,36 +36,42 @@ namespace ICSharpCode.NRefactory.CSharp
 	public class NamespaceDeclaration : AstNode
 	{
 		public static readonly Role<AstNode> MemberRole = SyntaxTree.MemberRole;
-		
+		public static readonly Role<AstType> NamespaceNameRole = new Role<AstType>("NamespaceName", AstType.Null);
+
 		public override NodeType NodeType {
 			get {
 				return NodeType.Unknown;
 			}
 		}
-		
+
 		public CSharpTokenNode NamespaceToken {
-			get { return GetChildByRole (Roles.NamespaceKeyword); }
+			get { return GetChildByRole(Roles.NamespaceKeyword); }
 		}
-		
+
+		public AstType NamespaceName {
+			get { return GetChildByRole(NamespaceNameRole) ?? AstType.Null; }
+			set { SetChildByRole(NamespaceNameRole, value); }
+		}
+
 		public string Name {
 			get {
-				StringBuilder builder = new StringBuilder ();
-				foreach (Identifier identifier in GetChildrenByRole (Roles.Identifier)) {
-					if (builder.Length > 0)
-						builder.Append ('.');
-					builder.Append (identifier.Name);
-				}
-				return builder.ToString ();
+				return NamespaceName.ToString();
 			}
 			set {
-				GetChildrenByRole(Roles.Identifier).ReplaceWith(value.Split('.').Select(ident => Identifier.Create (ident)));
+				var arr = value.Split('.');
+				NamespaceName = ConstructType(arr, arr.Length - 1);
 			}
 		}
-		
-		public AstNodeCollection<Identifier> Identifiers {
-			get { return GetChildrenByRole (Roles.Identifier); }
+
+		static AstType ConstructType(string[] arr, int i)
+		{
+			if (i < 0 || i >= arr.Length)
+				throw new ArgumentOutOfRangeException("i");
+			if (i == 0)
+				return new SimpleType(arr[i]);
+			return new MemberType(ConstructType(arr, i - 1), arr[i]);
 		}
-		
+
 		/// <summary>
 		/// Gets the full namespace name (including any parent namespaces)
 		/// </summary>
@@ -73,65 +79,80 @@ namespace ICSharpCode.NRefactory.CSharp
 			get {
 				NamespaceDeclaration parentNamespace = Parent as NamespaceDeclaration;
 				if (parentNamespace != null)
-					return BuildQualifiedName (parentNamespace.FullName, Name);
+					return BuildQualifiedName(parentNamespace.FullName, Name);
 				return Name;
 			}
 		}
-		
+
+		public IEnumerable<string> Identifiers {
+			get {
+				var result = new Stack<string>();
+				AstType type = NamespaceName;
+				while (type is MemberType) {
+					var mt = (MemberType)type;
+					result.Push(mt.MemberName);
+					type = mt.Target;
+				}
+				if (type is SimpleType)
+					result.Push(((SimpleType)type).Identifier);
+				return result;
+			}
+		}
+
 		public CSharpTokenNode LBraceToken {
-			get { return GetChildByRole (Roles.LBrace); }
+			get { return GetChildByRole(Roles.LBrace); }
 		}
-		
+
 		public AstNodeCollection<AstNode> Members {
 			get { return GetChildrenByRole(MemberRole); }
 		}
-		
+
 		public CSharpTokenNode RBraceToken {
-			get { return GetChildByRole (Roles.RBrace); }
+			get { return GetChildByRole(Roles.RBrace); }
 		}
-		
-		public NamespaceDeclaration ()
+
+		public NamespaceDeclaration()
 		{
 		}
-		
-		public NamespaceDeclaration (string name)
+
+		public NamespaceDeclaration(string name)
 		{
 			this.Name = name;
 		}
-		
-		public static string BuildQualifiedName (string name1, string name2)
+
+		public static string BuildQualifiedName(string name1, string name2)
 		{
-			if (string.IsNullOrEmpty (name1))
+			if (string.IsNullOrEmpty(name1))
 				return name2;
-			if (string.IsNullOrEmpty (name2))
+			if (string.IsNullOrEmpty(name2))
 				return name1;
 			return name1 + "." + name2;
 		}
-		
-		public void AddMember (AstNode child)
+
+		public void AddMember(AstNode child)
 		{
-			AddChild (child, MemberRole);
+			AddChild(child, MemberRole);
 		}
-		
-		public override void AcceptVisitor (IAstVisitor visitor)
+
+		public override void AcceptVisitor(IAstVisitor visitor)
 		{
-			visitor.VisitNamespaceDeclaration (this);
+			visitor.VisitNamespaceDeclaration(this);
 		}
-			
-		public override T AcceptVisitor<T> (IAstVisitor<T> visitor)
+
+		public override T AcceptVisitor<T>(IAstVisitor<T> visitor)
 		{
-			return visitor.VisitNamespaceDeclaration (this);
+			return visitor.VisitNamespaceDeclaration(this);
 		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
+
+		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
 		{
-			return visitor.VisitNamespaceDeclaration (this, data);
+			return visitor.VisitNamespaceDeclaration(this, data);
 		}
-		
+
 		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
 		{
 			NamespaceDeclaration o = other as NamespaceDeclaration;
 			return o != null && MatchString(this.Name, o.Name) && this.Members.DoMatch(o.Members, match);
 		}
 	}
-};
+}			;
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/NewLineNode.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/NewLineNode.cs
index 5eb148694b..12b0044209 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/NewLineNode.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/NewLineNode.cs
@@ -1,16 +1,11 @@
 using System;
 namespace ICSharpCode.NRefactory.CSharp
 {
-	public enum NewLineType {
-		Unix,
-		Windows,
-		Mac
-	}
 
 	/// <summary>
 	/// A New line node represents a line break in the text.
 	/// </summary>
-	public abstract class NewLineNode : AstNode
+	public sealed class NewLineNode : AstNode
 	{
 		public override NodeType NodeType {
 			get {
@@ -18,8 +13,31 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 		}
 
-		public abstract NewLineType NewLineType {
-			get;
+		const uint newLineMask = 0xfu << AstNodeFlagsUsedBits;
+		static readonly UnicodeNewline[] newLineTypes = {
+			UnicodeNewline.Unknown,
+			UnicodeNewline.LF,
+			UnicodeNewline.CRLF,
+			UnicodeNewline.CR,
+			UnicodeNewline.NEL,
+			UnicodeNewline.VT,
+			UnicodeNewline.FF,
+			UnicodeNewline.LS,
+			UnicodeNewline.PS
+		};
+		
+		public UnicodeNewline NewLineType {
+			get {
+				return newLineTypes[(flags & newLineMask) >> AstNodeFlagsUsedBits];
+			}
+			set {
+				ThrowIfFrozen();
+				int pos = Array.IndexOf(newLineTypes, value);
+				if (pos < 0)
+					pos = 0;
+				flags &= ~newLineMask; // clear old newline type
+				flags |= (uint)pos << AstNodeFlagsUsedBits;
+			}
 		}
 
 		TextLocation startLocation;
@@ -44,6 +62,11 @@ namespace ICSharpCode.NRefactory.CSharp
 			this.startLocation = startLocation;
 		}
 
+		public sealed override string ToString(CSharpFormattingOptions formattingOptions)
+		{
+			return NewLine.GetString (NewLineType);
+		}
+
 		public override void AcceptVisitor(IAstVisitor visitor)
 		{
 			visitor.VisitNewLine (this);
@@ -58,89 +81,10 @@ namespace ICSharpCode.NRefactory.CSharp
 		{
 			return visitor.VisitNewLine (this, data);
 		}
-	}
-
-	public class UnixNewLine : NewLineNode
-	{
-		public override NewLineType NewLineType {
-			get {
-				return NewLineType.Unix;
-			}
-		}
-
-		public UnixNewLine()
-		{
-		}
-
-		public UnixNewLine(TextLocation startLocation) : base (startLocation)
-		{
-		}
-
-		public override string ToString(CSharpFormattingOptions formattingOptions)
-		{
-			return "\n";
-		}
-
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			var o = other as UnixNewLine;
-			return o != null;
-		}
-	}
-
-	public class WindowsNewLine : NewLineNode
-	{
-		public override NewLineType NewLineType {
-			get {
-				return NewLineType.Windows;
-			}
-		}
-
-		public WindowsNewLine()
-		{
-		}
-
-		public WindowsNewLine(TextLocation startLocation) : base (startLocation)
-		{
-		}
-
-		public override string ToString(CSharpFormattingOptions formattingOptions)
-		{
-			return "\r\n";
-		}
-
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			var o = other as WindowsNewLine;
-			return o != null;
-		}
-	}
-
-	public class MacNewLine : NewLineNode
-	{
-		public override NewLineType NewLineType {
-			get {
-				return NewLineType.Mac;
-			}
-		}
-
-		public MacNewLine()
-		{
-		}
-
-		public MacNewLine(TextLocation startLocation) : base (startLocation)
-		{
-		}
-
-		public override string ToString(CSharpFormattingOptions formattingOptions)
-		{
-			return "\r";
-		}
-
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
+		
+		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
 		{
-			var o = other as MacNewLine;
-			return o != null;
+			return other is NewLineNode;
 		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/PreProcessorDirective.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/PreProcessorDirective.cs
index 60496f6c99..631f35e98b 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/PreProcessorDirective.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/PreProcessorDirective.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace ICSharpCode.NRefactory.CSharp
 {
@@ -47,7 +48,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		Line = 12
 	}
 
-	public class LinePreprocssorDirective : PreProcessorDirective
+	public class LinePreprocessorDirective : PreProcessorDirective
 	{
 		public int LineNumber {
 			get;
@@ -59,45 +60,70 @@ namespace ICSharpCode.NRefactory.CSharp
 			set;
 		}
 
-		public LinePreprocssorDirective(TextLocation startLocation, TextLocation endLocation) : base (PreProcessorDirectiveType.Line, startLocation, endLocation)
+		public LinePreprocessorDirective(TextLocation startLocation, TextLocation endLocation) : base (PreProcessorDirectiveType.Line, startLocation, endLocation)
 		{
 		}
 
-		public LinePreprocssorDirective(string argument = null) : base (PreProcessorDirectiveType.Line, argument)
+		public LinePreprocessorDirective(string argument = null) : base (PreProcessorDirectiveType.Line, argument)
 		{
 		}
 	}
 
-	public class PragmaWarningPreprocssorDirective : PreProcessorDirective
+	public class PragmaWarningPreprocessorDirective : PreProcessorDirective
 	{
-		public bool Disable {
-			get;
-			set;
-		}
+		public static readonly Role<PrimitiveExpression>  WarningRole = new Role<PrimitiveExpression> ("Warning");
+
+		public static readonly TokenRole PragmaKeywordRole = new TokenRole ("#pragma");
+		public static readonly TokenRole WarningKeywordRole = new TokenRole ("warning");
+		public static readonly TokenRole DisableKeywordRole = new TokenRole ("disable");
+		public static readonly TokenRole RestoreKeywordRole = new TokenRole ("restore");
 
-		List<int> warningList = new List<int> ();
-		public IList<int> WarningList {
+		public bool Disable {
 			get {
-				return warningList;
+				return !DisableToken.IsNull;
 			}
 		}
 
-		public PragmaWarningPreprocssorDirective(TextLocation startLocation, TextLocation endLocation) : base (PreProcessorDirectiveType.Pragma, startLocation, endLocation)
-		{
+		public CSharpTokenNode PragmaToken {
+			get { return GetChildByRole (PragmaKeywordRole); }
+		}
+
+		public CSharpTokenNode WarningToken {
+			get { return GetChildByRole (WarningKeywordRole); }
+		}
+
+		public CSharpTokenNode DisableToken {
+			get { return GetChildByRole (DisableKeywordRole); }
+		}
+
+		public CSharpTokenNode RestoreToken {
+			get { return GetChildByRole (RestoreKeywordRole); }
+		}
+
+		public AstNodeCollection<PrimitiveExpression> Warnings {
+			get { return GetChildrenByRole(WarningRole); }
+		}
+
+		public override TextLocation EndLocation {
+			get {
+				var child = LastChild;
+				if (child == null)
+					return base.EndLocation;
+				return child.EndLocation;
+			}
 		}
 
-		public PragmaWarningPreprocssorDirective(string argument = null) : base (PreProcessorDirectiveType.Pragma, argument)
+		public PragmaWarningPreprocessorDirective(TextLocation startLocation, TextLocation endLocation) : base (PreProcessorDirectiveType.Pragma, startLocation, endLocation)
 		{
 		}
 
-		public void AddWarnings(IEnumerable<int> warningCodes)
+		public PragmaWarningPreprocessorDirective(string argument = null) : base (PreProcessorDirectiveType.Pragma, argument)
 		{
-			warningList.AddRange(warningCodes);
 		}
 
-		public void AddWarnings(params int[] warningCodes)
+		public bool IsDefined(int pragmaWarning)
 		{
-			warningList.AddRange(warningCodes);
+			return Warnings.Select(w => (int)w.Value).Any(n => n == pragmaWarning);
 		}
 	}
 	
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/TypeDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/TypeDeclaration.cs
index 1aba4f3313..f2dedfa16b 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/TypeDeclaration.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/TypeDeclaration.cs
@@ -78,9 +78,25 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 		}
 
+		public CSharpTokenNode LChevronToken {
+			get { return GetChildByRole (Roles.LChevron); }
+		}
+
 		public AstNodeCollection<TypeParameterDeclaration> TypeParameters {
 			get { return GetChildrenByRole (Roles.TypeParameter); }
 		}
+
+		public CSharpTokenNode RChevronToken {
+			get { return GetChildByRole (Roles.RChevron); }
+		}
+
+
+
+		public CSharpTokenNode ColonToken {
+			get {
+				return GetChildByRole(Roles.Colon);
+			}
+		}
 		
 		public AstNodeCollection<AstType> BaseTypes {
 			get { return GetChildrenByRole(Roles.BaseType); }
@@ -93,7 +109,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		public CSharpTokenNode LBraceToken {
 			get { return GetChildByRole (Roles.LBrace); }
 		}
-		
+
 		public AstNodeCollection<EntityDeclaration> Members {
 			get { return GetChildrenByRole (Roles.TypeMemberRole); }
 		}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/BlockStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/BlockStatement.cs
index d30484d8dc..456ec68245 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/BlockStatement.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/BlockStatement.cs
@@ -150,11 +150,6 @@ namespace ICSharpCode.NRefactory.CSharp
 			AddChild(statement, StatementRole);
 		}
 		
-		public void Add(Expression expression)
-		{
-			AddChild(new ExpressionStatement(expression), StatementRole);
-		}
-		
 		IEnumerator<Statement> IEnumerable<Statement>.GetEnumerator()
 		{
 			return this.Statements.GetEnumerator();
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/DoWhileStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/DoWhileStatement.cs
index ec6e2ce269..280ca7ceac 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/DoWhileStatement.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/DoWhileStatement.cs
@@ -84,6 +84,16 @@ namespace ICSharpCode.NRefactory.CSharp
 			DoWhileStatement o = other as DoWhileStatement;
 			return o != null && this.EmbeddedStatement.DoMatch(o.EmbeddedStatement, match) && this.Condition.DoMatch(o.Condition, match);
 		}
+
+		public DoWhileStatement()
+		{
+		}
+
+		public DoWhileStatement(Expression condition, Statement embeddedStatement)
+		{
+			this.Condition = condition;
+			this.EmbeddedStatement = embeddedStatement;
+		}
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/LabelStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/LabelStatement.cs
index ef2190bfe8..43d22cea7c 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/LabelStatement.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/LabelStatement.cs
@@ -45,7 +45,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			set { SetChildByRole (Roles.Identifier, value); }
 		}
 
-		public CSharpTokenNode Colon {
+		public CSharpTokenNode ColonToken {
 			get { return GetChildByRole (Roles.Colon); }
 		}
 		
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/Statement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/Statement.cs
index c7046dab7e..0c2862787d 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/Statement.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/Statement.cs
@@ -122,5 +122,10 @@ namespace ICSharpCode.NRefactory.CSharp
 		public override NodeType NodeType {
 			get { return NodeType.Statement; }
 		}
+
+		public static implicit operator Statement (Expression type)
+		{
+			return new ExpressionStatement(type);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/WhileStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/WhileStatement.cs
index 256ddb8641..e38daa1449 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/WhileStatement.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/Statements/WhileStatement.cs
@@ -75,5 +75,15 @@ namespace ICSharpCode.NRefactory.CSharp
 			WhileStatement o = other as WhileStatement;
 			return o != null && this.Condition.DoMatch(o.Condition, match) && this.EmbeddedStatement.DoMatch(o.EmbeddedStatement, match);
 		}
+
+		public WhileStatement()
+		{
+		}
+
+		public WhileStatement(Expression condition, Statement embeddedStatement)
+		{
+			this.Condition = condition;
+			this.EmbeddedStatement = embeddedStatement;
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/ConstructorDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/ConstructorDeclaration.cs
index 6a3f59aecf..4b9d628557 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/ConstructorDeclaration.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/ConstructorDeclaration.cs
@@ -142,6 +142,15 @@ namespace ICSharpCode.NRefactory.CSharp
 			set;
 		}
 		
+		public CSharpTokenNode Keyword {
+			get {
+				if (ConstructorInitializerType == ConstructorInitializerType.Base)
+					return GetChildByRole(BaseKeywordRole);
+				else
+					return GetChildByRole(ThisKeywordRole);
+			}
+		}
+		
 		public CSharpTokenNode LParToken {
 			get { return GetChildByRole (Roles.LPar); }
 		}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/IndexerDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/IndexerDeclaration.cs
index a958797e80..56156dd194 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/IndexerDeclaration.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/IndexerDeclaration.cs
@@ -59,10 +59,14 @@ namespace ICSharpCode.NRefactory.CSharp
 			get { return Identifier.Null; }
 			set { throw new NotSupportedException(); }
 		}
-		
+
 		public CSharpTokenNode LBracketToken {
 			get { return GetChildByRole (Roles.LBracket); }
 		}
+
+		public CSharpTokenNode ThisToken {
+			get { return GetChildByRole (ThisKeywordRole); }
+		}
 		
 		public AstNodeCollection<ParameterDeclaration> Parameters {
 			get { return GetChildrenByRole (Roles.Parameter); }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/ParameterDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/ParameterDeclaration.cs
index 15b4993d23..cc69ff1fdb 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/ParameterDeclaration.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/ParameterDeclaration.cs
@@ -88,7 +88,11 @@ namespace ICSharpCode.NRefactory.CSharp
 				SetChildByRole (Roles.Identifier, value);
 			}
 		}
-		
+
+		public CSharpTokenNode AssignToken {
+			get { return GetChildByRole (Roles.Assign); }
+		}
+
 		public Expression DefaultExpression {
 			get { return GetChildByRole (Roles.Expression); }
 			set { SetChildByRole (Roles.Expression, value); }
@@ -127,6 +131,17 @@ namespace ICSharpCode.NRefactory.CSharp
 			Name = name;
 			ParameterModifier = modifier;
 		}
+
+		public ParameterDeclaration(string name, ParameterModifier modifier = ParameterModifier.None)
+		{
+			Name = name;
+			ParameterModifier = modifier;
+		}
+
+		public new ParameterDeclaration Clone()
+		{
+			return (ParameterDeclaration)base.Clone();
+		}
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/CombineQueryExpressions.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/CombineQueryExpressions.cs
new file mode 100644
index 0000000000..5311d9a242
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/CombineQueryExpressions.cs
@@ -0,0 +1,216 @@
+//
+// CombineQueryExpressions.cs
+//
+// Modified by Luís Reis <luiscubal@gmail.com> (Copyright (C) 2013)
+//
+// Copyright header of the original version follows:
+//
+// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	/// <summary>
+	/// Combines query expressions and removes transparent identifiers.
+	/// </summary>
+	public class CombineQueryExpressions
+	{
+		static readonly InvocationExpression castPattern = new InvocationExpression {
+			Target = new MemberReferenceExpression {
+				Target = new AnyNode("inExpr"),
+				MemberName = "Cast",
+				TypeArguments = { new AnyNode("targetType") }
+			}};
+
+		public string CombineQuery(AstNode node, AstNode rootQuery = null)
+		{
+			if (rootQuery == null) {
+				rootQuery = node;
+			}
+
+			QueryExpression query = node as QueryExpression;
+			if (query != null) {
+				string continuationIdentifier = null;
+
+				foreach (var clause in query.Clauses) {
+					var continuation = clause as QueryContinuationClause;
+					if (continuation != null) {
+						CombineQuery(continuation.PrecedingQuery);
+					}
+
+					var from = clause as QueryFromClause;
+					if (from != null) {
+						continuationIdentifier = CombineQuery(from.Expression, rootQuery);
+					}
+				}
+
+				QueryFromClause fromClause = (QueryFromClause)query.Clauses.First();
+				QueryExpression innerQuery = fromClause.Expression as QueryExpression;
+				if (innerQuery != null) {
+					continuationIdentifier = continuationIdentifier ?? ((QueryFromClause)innerQuery.Clauses.First()).Identifier;
+
+					string transparentIdentifier;
+					if (TryRemoveTransparentIdentifier(query, fromClause, innerQuery, continuationIdentifier, out transparentIdentifier)) {
+						RemoveTransparentIdentifierReferences(rootQuery, transparentIdentifier);
+					} else if (fromClause.Type.IsNull) {
+						QueryContinuationClause continuation = new QueryContinuationClause();
+						continuation.PrecedingQuery = innerQuery.Detach();
+						continuation.Identifier = fromClause.Identifier;
+						fromClause.ReplaceWith(continuation);
+					}
+
+					return transparentIdentifier;
+				} else {
+					Match m = castPattern.Match(fromClause.Expression);
+					if (m.Success) {
+						fromClause.Type = m.Get<AstType>("targetType").Single().Detach();
+						fromClause.Expression = m.Get<Expression>("inExpr").Single().Detach();
+					}
+				}
+			}
+
+			return null;
+		}
+
+		static readonly QuerySelectClause selectTransparentIdentifierPattern = new QuerySelectClause {
+			Expression = new AnonymousTypeCreateExpression {
+					Initializers = {
+						new AnyNode("nae1"),
+						new AnyNode("nae2")
+					}
+				}
+			};
+
+		bool TryRemoveTransparentIdentifier(QueryExpression query, QueryFromClause fromClause, QueryExpression innerQuery, string continuationIdentifier, out string transparentIdentifier)
+		{
+			transparentIdentifier = fromClause.Identifier;
+
+			Match match = selectTransparentIdentifierPattern.Match(innerQuery.Clauses.Last());
+			if (!match.Success)
+				return false;
+			QuerySelectClause selectClause = (QuerySelectClause)innerQuery.Clauses.Last();
+			Expression nae1 = match.Get<Expression>("nae1").SingleOrDefault();
+			string nae1Name = ExtractExpressionName(ref nae1);
+			if (nae1Name == null)
+				return false;
+
+			Expression nae2 = match.Get<Expression>("nae2").SingleOrDefault();
+			string nae2Name = ExtractExpressionName(ref nae2);
+			if (nae1Name == null)
+				return false;
+
+			bool introduceLetClause = true;
+			var nae1Identifier = nae1 as IdentifierExpression;
+			var nae2Identifier = nae2 as IdentifierExpression;
+			if (nae1Identifier != null && nae2Identifier != null && nae1Identifier.Identifier == nae1Name && nae2Identifier.Identifier == nae2Name) {
+				introduceLetClause = false;
+			}
+
+			if (nae1Name != continuationIdentifier) {
+				if (nae2Name == continuationIdentifier) {
+					//Members are in reversed order
+					string tempName = nae1Name;
+					Expression tempNae = nae1;
+
+					nae1Name = nae2Name;
+					nae1 = nae2;
+					nae2Name = tempName;
+					nae2 = tempNae;
+				} else {
+					return false;
+				}
+			}
+
+			if (introduceLetClause && innerQuery.Clauses.OfType<QueryFromClause>().Any(from => from.Identifier == nae2Name)) {
+				return false;
+			}
+			if (introduceLetClause && innerQuery.Clauses.OfType<QueryJoinClause>().Any(join => join.JoinIdentifier == nae2Name)) {
+				return false;
+			}
+
+			// from * in (from x in ... select new { x = x, y = expr }) ...
+			// =>
+			// from x in ... let y = expr ...
+			fromClause.Remove();
+			selectClause.Remove();
+			// Move clauses from innerQuery to query
+			QueryClause insertionPos = null;
+			foreach (var clause in innerQuery.Clauses) {
+				query.Clauses.InsertAfter(insertionPos, insertionPos = clause.Detach());
+			}
+			if (introduceLetClause) {
+				query.Clauses.InsertAfter(insertionPos, new QueryLetClause { Identifier = nae2Name, Expression = nae2.Detach() });
+			}
+			return true;
+		}
+
+		/// <summary>
+		/// Removes all occurrences of transparent identifiers
+		/// </summary>
+		void RemoveTransparentIdentifierReferences(AstNode node, string transparentIdentifier)
+		{
+			foreach (AstNode child in node.Children) {
+				RemoveTransparentIdentifierReferences(child, transparentIdentifier);
+			}
+			MemberReferenceExpression mre = node as MemberReferenceExpression;
+			if (mre != null) {
+				IdentifierExpression ident = mre.Target as IdentifierExpression;
+				if (ident != null && ident.Identifier == transparentIdentifier) {
+					IdentifierExpression newIdent = new IdentifierExpression(mre.MemberName);
+					mre.TypeArguments.MoveTo(newIdent.TypeArguments);
+					newIdent.CopyAnnotationsFrom(mre);
+					newIdent.RemoveAnnotations<PropertyDeclaration>(); // remove the reference to the property of the anonymous type
+					mre.ReplaceWith(newIdent);
+					return;
+				} else if (mre.MemberName == transparentIdentifier) {
+					var newVar = mre.Target.Detach();
+					newVar.CopyAnnotationsFrom(mre);
+					newVar.RemoveAnnotations<PropertyDeclaration>(); // remove the reference to the property of the anonymous type
+					mre.ReplaceWith(newVar);
+					return;
+				}
+			}
+		}
+
+		string ExtractExpressionName(ref Expression expr)
+		{
+			NamedExpression namedExpr = expr as NamedExpression;
+			if (namedExpr != null) {
+				expr = namedExpr.Expression;
+				return namedExpr.Name;
+			}
+
+			IdentifierExpression identifier = expr as IdentifierExpression;
+			if (identifier != null) {
+				return identifier.Identifier;
+			}
+
+			MemberReferenceExpression memberRef = expr as MemberReferenceExpression;
+			if (memberRef != null) {
+				return memberRef.MemberName;
+			}
+
+			return null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
index 093990990a..c36fb5fb1d 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // CSharpCompletionEngine.cs
 //  
 // Author:
@@ -27,7 +27,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-
 using ICSharpCode.NRefactory.Completion;
 using ICSharpCode.NRefactory.CSharp.Refactoring;
 using ICSharpCode.NRefactory.CSharp.Resolver;
@@ -38,32 +37,56 @@ using ICSharpCode.NRefactory.CSharp.TypeSystem;
 
 namespace ICSharpCode.NRefactory.CSharp.Completion
 {
+	public enum EditorBrowsableBehavior
+	{
+		Ignore,
+		Normal,
+		IncludeAdvanced
+	}
+
+	public class CompletionEngineCache
+	{
+		public List<INamespace>  namespaces;
+		public ICompletionData[] importCompletion;
+	}
+
 	public class CSharpCompletionEngine : CSharpCompletionEngineBase
 	{
 		internal ICompletionDataFactory factory;
-		
+
 		#region Additional input properties
+
 		public CSharpFormattingOptions FormattingPolicy { get; set; }
-		
+
 		public string EolMarker { get; set; }
-		
+
 		public string IndentString { get; set; }
+
+		public bool AutomaticallyAddImports { get; set; }
+
+		public bool IncludeKeywordsInCompletionList { get; set; }
+
+		public EditorBrowsableBehavior EditorBrowsableBehavior { get; set; }
+
+		public CompletionEngineCache CompletionEngineCache { get; set; }
+
 		#endregion
-		
+
 		#region Result properties
-		public bool AutoCompleteEmptyMatch;
 
+		public bool AutoCompleteEmptyMatch;
 		/// <summary>
 		/// The auto complete empty match on curly bracket. (only taken into account when AutoCompleteEmptyMatch is true )
 		/// </summary>
 		public bool AutoCompleteEmptyMatchOnCurlyBracket = true;
-
 		public bool AutoSelect;
 		public string DefaultCompletionString;
 		public bool CloseOnSquareBrackets;
+		public readonly List<IMethod> PossibleDelegates = new List<IMethod>();
+
 		#endregion
-		
-		public CSharpCompletionEngine(IDocument document, ICompletionContextProvider completionContextProvider, ICompletionDataFactory factory, IProjectContent content, CSharpTypeResolveContext ctx) : base (content, completionContextProvider, ctx)
+
+		public CSharpCompletionEngine(IDocument document, ICompletionContextProvider completionContextProvider, ICompletionDataFactory factory, IProjectContent content, CSharpTypeResolveContext ctx) : base(content, completionContextProvider, ctx)
 		{
 			if (document == null) {
 				throw new ArgumentNullException("document");
@@ -76,9 +99,11 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			// Set defaults for additional input properties
 			this.FormattingPolicy = FormattingOptionsFactory.CreateMono();
 			this.EolMarker = Environment.NewLine;
+			this.IncludeKeywordsInCompletionList = true;
+			EditorBrowsableBehavior = EditorBrowsableBehavior.IncludeAdvanced;
 			this.IndentString = "\t";
 		}
-		
+
 		public bool TryGetCompletionWord(int offset, out int startPos, out int wordLength)
 		{
 			startPos = wordLength = 0;
@@ -91,10 +116,10 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 			if (pos == -1)
 				return false;
-			
+
 			pos++;
 			startPos = pos;
-			
+
 			while (pos < document.TextLength) {
 				char c = document.GetCharAt(pos);
 				if (!char.IsLetterOrDigit(c) && c != '_')
@@ -104,7 +129,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			wordLength = pos - startPos;
 			return true;
 		}
-		
+
 		public IEnumerable<ICompletionData> GetCompletionData(int offset, bool controlSpace)
 		{
 			this.AutoCompleteEmptyMatch = true;
@@ -116,21 +141,21 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				var result = MagicKeyCompletion(lastChar, controlSpace) ?? Enumerable.Empty<ICompletionData>();
 				if (controlSpace && char.IsWhiteSpace(lastChar)) {
 					offset -= 2;
-					while (offset >= 0 && char.IsWhiteSpace (document.GetCharAt (offset))) {
+					while (offset >= 0 && char.IsWhiteSpace(document.GetCharAt(offset))) {
 						offset--;
 					}
 					if (offset > 0) {
 						var nonWsResult = MagicKeyCompletion(
 							document.GetCharAt(offset),
 							controlSpace
-							);
+						);
 						if (nonWsResult != null) {
 							var text = new HashSet<string>(result.Select(r => r.CompletionText));
 							result = result.Concat(nonWsResult.Where(r => !text.Contains(r.CompletionText)));
 						}
 					}
 				}
-				
+
 				return result;
 			}
 			return Enumerable.Empty<ICompletionData>();
@@ -141,30 +166,30 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 		/// </summary>
 		public IEnumerable<ICompletionData> GetImportCompletionData(int offset)
 		{
-			var generalLookup = new MemberLookup (null, Compilation.MainAssembly);
+			var generalLookup = new MemberLookup(null, Compilation.MainAssembly);
 			SetOffset(offset);
 
 			// flatten usings
 			var namespaces = new List<INamespace>();
 			for (var n = ctx.CurrentUsingScope; n != null; n = n.Parent) {
-				namespaces.Add (n.Namespace);
+				namespaces.Add(n.Namespace);
 				foreach (var u in n.Usings)
-					namespaces.Add (u);
+					namespaces.Add(u);
 			}
 
 			foreach (var type in Compilation.GetAllTypeDefinitions ()) {
-				if (!generalLookup.IsAccessible (type, false))
+				if (!generalLookup.IsAccessible(type, false))
 					continue;	
-				if (namespaces.Any (n => n.FullName == type.Namespace))
+				if (namespaces.Any(n => n.FullName == type.Namespace))
 					continue;
 				bool useFullName = false;
 				foreach (var ns in namespaces) {
-					if (ns.GetTypeDefinition (type.Name, type.TypeParameterCount) != null) {
+					if (ns.GetTypeDefinition(type.Name, type.TypeParameterCount) != null) {
 						useFullName = true;
 						break;
 					}
 				}
-				yield return factory.CreateImportCompletionData (type, useFullName);
+				yield return factory.CreateImportCompletionData(type, useFullName, false);
 			}
 		}
 
@@ -204,9 +229,9 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			} else {
 				yield break;
 			}
-			
+
 			var names = WordParser.BreakWords(name);
-			
+
 			var possibleName = new StringBuilder();
 			for (int i = 0; i < names.Count; i++) {
 				possibleName.Length = 0;
@@ -222,16 +247,17 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				yield return possibleName.ToString();
 			}
 		}
-		
+
 		IEnumerable<ICompletionData> HandleMemberReferenceCompletion(ExpressionResult expr)
 		{
-			if (expr == null) 
+			if (expr == null)
 				return null;
-			// do not complete <number>. (but <number>.<number>.)
+
+			// do not auto select <number>. (but <number>.<number>.) (0.ToString() is valid)
 			if (expr.Node is PrimitiveExpression) {
 				var pexpr = (PrimitiveExpression)expr.Node;
 				if (!(pexpr.Value is string || pexpr.Value is char) && !pexpr.LiteralValue.Contains('.')) {
-					return null;
+					AutoSelect = false;
 				}
 			}
 			var resolveResult = ResolveExpression(expr);
@@ -240,26 +266,33 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				return null;
 			}
 			if (expr.Node is AstType) {
+
+				// check for namespace names
+				if (expr.Node.AncestorsAndSelf
+					.TakeWhile(n => n is AstType)
+					.Any(m => m.Role == NamespaceDeclaration.NamespaceNameRole))
+					return null;
+
 				// need to look at paren.parent because of "catch (<Type>.A" expression
 				if (expr.Node.Parent != null && expr.Node.Parent.Parent is CatchClause)
 					return HandleCatchClauseType(expr);
 				return CreateTypeAndNamespaceCompletionData(
 					location,
-					resolveResult.Item1,
+					resolveResult.Result,
 					expr.Node,
-					resolveResult.Item2
-					);
+					resolveResult.Resolver
+				);
 			}
-			
-			
+
+
 			return CreateCompletionData(
 				location,
-				resolveResult.Item1,
+				resolveResult.Result,
 				expr.Node,
-				resolveResult.Item2
-				);
+				resolveResult.Resolver
+			);
 		}
-		
+
 		bool IsInPreprocessorDirective()
 		{
 			var text = GetMemberTextToCaret().Item1;
@@ -267,7 +300,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			miniLexer.Parse();
 			return miniLexer.IsInPreprocessorDirective;
 		}
-		
+
 		IEnumerable<ICompletionData> HandleObjectInitializer(SyntaxTree unit, AstNode n)
 		{
 			var p = n.Parent;
@@ -284,13 +317,13 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				var initializerResult = ResolveExpression(p);
 				IType initializerType = null;
 
-				if (initializerResult.Item1 is DynamicInvocationResolveResult) {
-					var dr = (DynamicInvocationResolveResult)initializerResult.Item1;
+				if (initializerResult.Result is DynamicInvocationResolveResult) {
+					var dr = (DynamicInvocationResolveResult)initializerResult.Result;
 					var constructor = (dr.Target as MethodGroupResolveResult).Methods.FirstOrDefault();
 					if (constructor != null)
 						initializerType = constructor.DeclaringType;
 				} else {
-					initializerType = initializerResult != null ? initializerResult.Item1.Type : null;
+					initializerType = initializerResult != null ? initializerResult.Result.Type : null;
 				}
 
 
@@ -300,14 +333,14 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					// 2) Object initializer { prop = val1, field = val2, xpr
 					// 3) Array initializer { new Foo (), a, xpr
 					// in case 1 all object/array initializer options should be given - in the others not.
-					
+
 					AstNode prev = null;
 					if (parent.Elements.Count > 1) {
 						prev = parent.Elements.First();
-						if (prev is ArrayInitializerExpression && ((ArrayInitializerExpression)prev).IsSingleElement) 
+						if (prev is ArrayInitializerExpression && ((ArrayInitializerExpression)prev).IsSingleElement)
 							prev = ((ArrayInitializerExpression)prev).Elements.FirstOrDefault();
 					}
-					
+
 					if (prev != null && !(prev is NamedExpression)) {
 						AddContextCompletion(contextList, GetState(), n);
 						// case 3)
@@ -315,27 +348,32 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					}
 					var lookup = new MemberLookup(ctx.CurrentTypeDefinition, Compilation.MainAssembly);
 					bool isProtectedAllowed = ctx.CurrentTypeDefinition != null && initializerType.GetDefinition() != null ? 
-						ctx.CurrentTypeDefinition.IsDerivedFrom(initializerType.GetDefinition()) : 
-							false;
+					                          ctx.CurrentTypeDefinition.IsDerivedFrom(initializerType.GetDefinition()) : 
+					                          false;
 					foreach (var m in initializerType.GetMembers (m => m.SymbolKind == SymbolKind.Field)) {
 						var f = m as IField;
 						if (f != null && (f.IsReadOnly || f.IsConst))
-						    continue;
-						if (lookup.IsAccessible (m, isProtectedAllowed))
-							contextList.AddMember(m);
+							continue;
+						if (lookup.IsAccessible(m, isProtectedAllowed)) {
+							var data = contextList.AddMember(m);
+							data.DisplayFlags |= DisplayFlags.NamedArgument;
+						}
 					}
+
 					foreach (IProperty m in initializerType.GetMembers (m => m.SymbolKind == SymbolKind.Property)) {
-						if (m.CanSet && lookup.IsAccessible (m.Setter, isProtectedAllowed))
-							contextList.AddMember(m);
+						if (m.CanSet && lookup.IsAccessible(m.Setter, isProtectedAllowed)) {
+							var data = contextList.AddMember(m);
+							data.DisplayFlags |= DisplayFlags.NamedArgument;
+						}
 					}
 
 					if (prev != null && (prev is NamedExpression)) {
 						// case 2)
 						return contextList.Result;
 					}
-					
+
 					// case 1)
-					
+
 					// check if the object is a list, if not only provide object initalizers
 					var list = typeof(System.Collections.IList).ToTypeReference().Resolve(Compilation);
 					if (initializerType.Kind != TypeKind.Array && list != null) {
@@ -343,7 +381,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						if (def != null && !def.IsDerivedFrom(list.GetDefinition()))
 							return contextList.Result;
 					}
-					
+
 					AddContextCompletion(contextList, GetState(), n);
 					return contextList.Result;
 				}
@@ -351,12 +389,265 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			return null;
 		}
 
+		internal static readonly string[] FormatItemMethods = {
+			"System.String.Format",
+			"System.Console.Write",
+			"System.Console.WriteLine",
+			"System.IO.StringWriter.Write",
+			"System.IO.StringWriter.WriteLine"
+		};
+		static readonly DateTime curDate = DateTime.Now;
+
+		IEnumerable<ICompletionData> GenerateNumberFormatitems(bool isFloatingPoint)
+		{
+			yield return factory.CreateFormatItemCompletionData("D", "decimal", 123);
+			yield return factory.CreateFormatItemCompletionData("D5", "decimal", 123);
+			yield return factory.CreateFormatItemCompletionData("C", "currency", 123);
+			yield return factory.CreateFormatItemCompletionData("C0", "currency", 123);
+			yield return factory.CreateFormatItemCompletionData("E", "exponential", 1.23E4);
+			yield return factory.CreateFormatItemCompletionData("E2", "exponential", 1.234);
+			yield return factory.CreateFormatItemCompletionData("e2", "exponential", 1.234);
+			yield return factory.CreateFormatItemCompletionData("F", "fixed-point", 123.45);
+			yield return factory.CreateFormatItemCompletionData("F1", "fixed-point", 123.45);
+			yield return factory.CreateFormatItemCompletionData("G", "general", 1.23E+56);
+			yield return factory.CreateFormatItemCompletionData("g2", "general", 1.23E+56);
+			yield return factory.CreateFormatItemCompletionData("N", "number", 12345.68);
+			yield return factory.CreateFormatItemCompletionData("N1", "number", 12345.68);
+			yield return factory.CreateFormatItemCompletionData("P", "percent", 12.34);
+			yield return factory.CreateFormatItemCompletionData("P1", "percent", 12.34);
+			yield return factory.CreateFormatItemCompletionData("R", "round-trip", 0.1230000001);
+			yield return factory.CreateFormatItemCompletionData("X", "hexadecimal", 1234);
+			yield return factory.CreateFormatItemCompletionData("x8", "hexadecimal", 1234);
+			yield return factory.CreateFormatItemCompletionData("0000", "custom", 123);
+			yield return factory.CreateFormatItemCompletionData("####", "custom", 123);
+			yield return factory.CreateFormatItemCompletionData("##.###", "custom", 1.23);
+			yield return factory.CreateFormatItemCompletionData("##.000", "custom", 1.23);
+			yield return factory.CreateFormatItemCompletionData("## 'items'", "custom", 12);
+		}
+
+		IEnumerable<ICompletionData> GenerateDateTimeFormatitems()
+		{
+			yield return factory.CreateFormatItemCompletionData("D", "long date", curDate);
+			yield return factory.CreateFormatItemCompletionData("d", "short date", curDate);
+			yield return factory.CreateFormatItemCompletionData("F", "full date long", curDate);
+			yield return factory.CreateFormatItemCompletionData("f", "full date short", curDate);
+			yield return factory.CreateFormatItemCompletionData("G", "general long", curDate);
+			yield return factory.CreateFormatItemCompletionData("g", "general short", curDate);
+			yield return factory.CreateFormatItemCompletionData("M", "month", curDate);
+			yield return factory.CreateFormatItemCompletionData("O", "ISO 8601", curDate);
+			yield return factory.CreateFormatItemCompletionData("R", "RFC 1123", curDate);
+			yield return factory.CreateFormatItemCompletionData("s", "sortable", curDate);
+			yield return factory.CreateFormatItemCompletionData("T", "long time", curDate);
+			yield return factory.CreateFormatItemCompletionData("t", "short time", curDate);
+			yield return factory.CreateFormatItemCompletionData("U", "universal full", curDate);
+			yield return factory.CreateFormatItemCompletionData("u", "universal sortable", curDate);
+			yield return factory.CreateFormatItemCompletionData("Y", "year month", curDate);
+			yield return factory.CreateFormatItemCompletionData("yy-MM-dd", "custom", curDate);
+			yield return factory.CreateFormatItemCompletionData("yyyy MMMMM dd", "custom", curDate);
+			yield return factory.CreateFormatItemCompletionData("yy-MMM-dd ddd", "custom", curDate);
+			yield return factory.CreateFormatItemCompletionData("yyyy-M-d dddd", "custom", curDate);
+			yield return factory.CreateFormatItemCompletionData("hh:mm:ss t z", "custom", curDate);
+			yield return factory.CreateFormatItemCompletionData("hh:mm:ss tt zz", "custom", curDate);
+			yield return factory.CreateFormatItemCompletionData("HH:mm:ss tt zz", "custom", curDate);
+			yield return factory.CreateFormatItemCompletionData("HH:m:s tt zz", "custom", curDate);
+
+		}
+
+		[Flags]
+		enum TestEnum
+		{
+			EnumCaseName = 0,
+			Flag1 = 1,
+			Flag2 = 2,
+			Flags
+
+		}
+
+		IEnumerable<ICompletionData> GenerateEnumFormatitems()
+		{
+			yield return factory.CreateFormatItemCompletionData("G", "string value", TestEnum.EnumCaseName);
+			yield return factory.CreateFormatItemCompletionData("F", "flags value", TestEnum.Flags);
+			yield return factory.CreateFormatItemCompletionData("D", "integer value", TestEnum.Flags);
+			yield return factory.CreateFormatItemCompletionData("X", "hexadecimal", TestEnum.Flags);
+		}
+
+		IEnumerable<ICompletionData> GenerateTimeSpanFormatitems()
+		{
+			yield return factory.CreateFormatItemCompletionData("c", "invariant", new TimeSpan(0, 1, 23, 456));
+			yield return factory.CreateFormatItemCompletionData("G", "general long", new TimeSpan(0, 1, 23, 456));
+			yield return factory.CreateFormatItemCompletionData("g", "general short", new TimeSpan(0, 1, 23, 456));
+		}
+
+		static Guid defaultGuid = Guid.NewGuid();
+
+		IEnumerable<ICompletionData> GenerateGuidFormatitems()
+		{
+			yield return factory.CreateFormatItemCompletionData("N", "digits", defaultGuid);
+			yield return factory.CreateFormatItemCompletionData("D", "hypens", defaultGuid);
+			yield return factory.CreateFormatItemCompletionData("B", "braces", defaultGuid);
+			yield return factory.CreateFormatItemCompletionData("P", "parentheses", defaultGuid);
+		}
+
+		int GetFormatItemNumber()
+		{
+			int number = 0;
+			var o = offset - 2;
+			while (o > 0) {
+				char ch = document.GetCharAt(o);
+				if (ch == '{')
+					return number;
+				if (!char.IsDigit(ch))
+					break;
+				number = number * 10 + ch - '0';
+				o--;
+			}
+			return -1;
+		}
+
+		IEnumerable<ICompletionData> HandleStringFormatItems()
+		{
+			var formatArgument = GetFormatItemNumber();
+			if (formatArgument < 0)
+				return Enumerable.Empty<ICompletionData>();
+			var followUp = new StringBuilder();
+
+			var o = offset;
+			while (o < document.TextLength) {
+				char ch = document.GetCharAt(o);
+				followUp.Append(ch); 
+				o++;
+				if (ch == ';')
+					break;
+			}
+			var unit = ParseStub(followUp.ToString(), false);
+
+			var invoke = unit.GetNodeAt<InvocationExpression>(location);
+
+			if (invoke != null) {
+				var resolveResult = ResolveExpression(new ExpressionResult(invoke, unit));
+				var invokeResult = resolveResult.Result as InvocationResolveResult;
+				if (invokeResult != null) {
+					var arg = formatArgument + 1; // First argument is the format string
+					if (arg < invoke.Arguments.Count) {
+						var invokeArgument = ResolveExpression(new ExpressionResult(invoke.Arguments.ElementAt(arg), unit));
+						if (invokeArgument != null) {
+							var provider = GetFormatCompletionData(invokeArgument.Result.Type);
+							if (provider != null)
+								return provider;
+							if (!invokeArgument.Result.Type.IsKnownType(KnownTypeCode.Object))
+								return Enumerable.Empty<ICompletionData>();
+						}
+					}
+				}
+			}
+			return HandleStringFormatItemsFallback();
+		}
+
+		IEnumerable<ICompletionData> HandleStringFormatItemsFallback()
+		{
+			var unit = ParseStub("a}\");", false);
+
+			var invoke = unit.GetNodeAt<InvocationExpression>(location);
+
+			if (invoke == null)
+				return Enumerable.Empty<ICompletionData>();
+
+			var resolveResult = ResolveExpression(new ExpressionResult(invoke, unit));
+			var invokeResult = resolveResult.Result as InvocationResolveResult;
+			if (invokeResult == null)
+				return Enumerable.Empty<ICompletionData>();
+
+			if (FormatItemMethods.Contains(invokeResult.Member.FullName)) {
+				return GenerateNumberFormatitems(false)
+					.Concat(GenerateDateTimeFormatitems())
+					.Concat(GenerateTimeSpanFormatitems())
+					.Concat(GenerateEnumFormatitems())
+					.Concat(GenerateGuidFormatitems());
+			}
+			return Enumerable.Empty<ICompletionData>();
+
+		}
+
+		IEnumerable<ICompletionData> GetFormatCompletionData(IType type)
+		{
+			if (type.Namespace != "System")
+				return null;
+			switch (type.Name) {
+				case "Int64":
+				case "UInt64":
+				case "Int32":
+				case "UInt32":
+				case "Int16":
+				case "UInt16":
+				case "Byte":
+				case "SByte":
+					return GenerateNumberFormatitems(false);
+				case "Single":
+				case "Double":
+				case "Decimal":
+					return GenerateNumberFormatitems(true);
+				case "Enum":
+					return GenerateEnumFormatitems();
+				case "DateTime":
+					return GenerateDateTimeFormatitems();
+				case "TimeSpan":
+					return GenerateTimeSpanFormatitems();
+				case "Guid":
+					return GenerateGuidFormatitems();
+			}
+			return null;
+		}
+
+		IEnumerable<ICompletionData> HandleToStringFormatItems()
+		{
+			var unit = ParseStub("\");", false);
+
+			var invoke = unit.GetNodeAt<InvocationExpression>(location);
+			if (invoke == null)
+				return Enumerable.Empty<ICompletionData>();
+
+			var resolveResult = ResolveExpression(new ExpressionResult(invoke, unit));
+			var invokeResult = resolveResult.Result as InvocationResolveResult;
+			if (invokeResult == null)
+				return Enumerable.Empty<ICompletionData>();
+			if (invokeResult.Member.Name == "ToString")
+				return GetFormatCompletionData(invokeResult.Member.DeclaringType) ?? Enumerable.Empty<ICompletionData>();
+			return Enumerable.Empty<ICompletionData>();
+		}
+
 		IEnumerable<ICompletionData> MagicKeyCompletion(char completionChar, bool controlSpace)
 		{
-			Tuple<ResolveResult, CSharpResolver> resolveResult;
+			ExpressionResolveResult resolveResult;
 			switch (completionChar) {
 				// Magic key completion
 				case ':':
+					var text = GetMemberTextToCaret();
+					var lexer = new MiniLexer(text.Item1);
+					lexer.Parse();
+					if (lexer.IsInSingleComment ||
+						lexer.IsInChar ||
+						lexer.IsInMultiLineComment ||
+						lexer.IsInPreprocessorDirective) {
+						return Enumerable.Empty<ICompletionData>();
+					}
+
+					if (lexer.IsInString || lexer.IsInVerbatimString)
+						return HandleStringFormatItems();
+					return HandleMemberReferenceCompletion(GetExpressionBeforeCursor());
+				case '"':
+					text = GetMemberTextToCaret();
+					lexer = new MiniLexer(text.Item1);
+					lexer.Parse();
+					if (lexer.IsInSingleComment ||
+						lexer.IsInChar ||
+						lexer.IsInMultiLineComment ||
+						lexer.IsInPreprocessorDirective) {
+						return Enumerable.Empty<ICompletionData>();
+					}
+
+					if (lexer.IsInString || lexer.IsInVerbatimString)
+						return HandleToStringFormatItems();
+					return Enumerable.Empty<ICompletionData>();
 				case '.':
 					if (IsInsideCommentStringOrDirective()) {
 						return Enumerable.Empty<ICompletionData>();
@@ -383,7 +674,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						return null;
 					}
 					return null;
-					
+
 					// Parameter completion
 				case '(':
 					if (IsInsideCommentStringOrDirective()) {
@@ -402,18 +693,18 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					if (invocationResult == null) {
 						return null;
 					}
-					var methodGroup = invocationResult.Item1 as MethodGroupResolveResult;
+					var methodGroup = invocationResult.Result as MethodGroupResolveResult;
 					if (methodGroup != null) {
 						return CreateParameterCompletion(
 							methodGroup,
-							invocationResult.Item2,
+							invocationResult.Resolver,
 							invoke.Node,
 							invoke.Unit,
 							0,
 							controlSpace
-							);
+						);
 					}
-					
+
 					if (controlSpace) {
 						return DefaultControlSpaceItems(invoke);
 					}
@@ -429,7 +720,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					//	int currentParameter2 = MethodParameterDataProvider.GetCurrentParameterIndex (CompletionWidget, completionContext) - 1;
 					//				return CreateParameterCompletion (CreateResolver (), location, ExpressionContext.MethodBody, provider.Methods, currentParameter);	
 					break;
-					
+
 					// Completion on space:
 				case ' ':
 					int tokenIndex = offset;
@@ -445,13 +736,13 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						var proposeNameList = new CompletionDataWrapper(this);
 						if (parent.Variables.Count != 1)
 							return DefaultControlSpaceItems(isAsExpression, controlSpace);
-						
+
 						foreach (var possibleName in GenerateNameProposals (parent.Type)) {
 							if (possibleName.Length > 0) {
 								proposeNameList.Result.Add(factory.CreateLiteralCompletionData(possibleName.ToString()));
 							}
 						}
-						
+
 						AutoSelect = false;
 						AutoCompleteEmptyMatch = false;
 						return proposeNameList.Result;
@@ -492,11 +783,11 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 							if (invocationResult == null) {
 								return null;
 							}
-							methodGroup = invocationResult.Item1 as MethodGroupResolveResult;
+							methodGroup = invocationResult.Result as MethodGroupResolveResult;
 							if (methodGroup != null) {
 								return CreateParameterCompletion(
 									methodGroup,
-									invocationResult.Item2,
+									invocationResult.Resolver,
 									invoke.Node,
 									invoke.Unit,
 									currentParameter,
@@ -515,13 +806,13 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 							if (resolveResult == null) {
 								return null;
 							}
-							if (resolveResult.Item1.Type.Kind == TypeKind.Enum) {
+							if (resolveResult.Result.Type.Kind == TypeKind.Enum) {
 								var wrapper = new CompletionDataWrapper(this);
 								AddContextCompletion(
 									wrapper,
-									resolveResult.Item2,
+									resolveResult.Resolver,
 									expressionOrVariableDeclaration.Node);
-								AddEnumMembers(wrapper, resolveResult.Item1.Type, resolveResult.Item2);
+								AddEnumMembers(wrapper, resolveResult.Result.Type, resolveResult.Resolver);
 								AutoCompleteEmptyMatch = false;
 								return wrapper.Result;
 							}
@@ -553,19 +844,19 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						case "+=":
 						case "-=":
 							GetPreviousToken(ref tokenIndex, false);
-							
+
 							expressionOrVariableDeclaration = GetExpressionAt(tokenIndex);
 							if (expressionOrVariableDeclaration == null) {
 								return null;
 							}
-							
+
 							resolveResult = ResolveExpression(expressionOrVariableDeclaration);
 							if (resolveResult == null) {
 								return null;
 							}
-							
-							
-							var mrr = resolveResult.Item1 as MemberResolveResult;
+
+
+							var mrr = resolveResult.Result as MemberResolveResult;
 							if (mrr != null) {
 								var evt = mrr.Member as IEvent;
 								if (evt == null) {
@@ -575,12 +866,12 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 								if (delegateType.Kind != TypeKind.Delegate) {
 									return null;
 								}
-								
+
 								var wrapper = new CompletionDataWrapper(this);
 								if (currentType != null) {
 									//							bool includeProtected = DomType.IncludeProtected (dom, typeFromDatabase, resolver.CallingType);
 									foreach (var method in ctx.CurrentTypeDefinition.Methods) {
-										if (MatchDelegate(delegateType, method) /*&& method.IsAccessibleFrom (dom, resolver.CallingType, resolver.CallingMember, includeProtected) &&*/) {
+										if (MatchDelegate(delegateType, method) /*										&& method.IsAccessibleFrom (dom, resolver.CallingType, resolver.CallingMember, includeProtected) &&*/) {
 											wrapper.AddMember(method);
 											//									data.SetText (data.CompletionText + ";");
 										}
@@ -590,19 +881,19 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 									string parameterDefinition = AddDelegateHandlers(
 										wrapper,
 										delegateType
-										);
+									);
 									string varName = GetPreviousMemberReferenceExpression(tokenIndex);
 									wrapper.Result.Add(
 										factory.CreateEventCreationCompletionData(
-										varName,
-										delegateType,
-										evt,
-										parameterDefinition,
-										currentMember,
-										currentType)
-										);
+											varName,
+											delegateType,
+											evt,
+											parameterDefinition,
+											currentMember,
+											currentType)
+									);
 								}
-								
+
 								return wrapper.Result;
 							}
 							return null;
@@ -613,18 +904,24 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 								if (token == "enum")
 									return HandleEnumContext();
 								var wrapper = new CompletionDataWrapper(this);
-								
 								AddTypesAndNamespaces(
 									wrapper,
 									GetState(),
 									null,
-									t => currentType != null && !currentType.ReflectionName.Equals(t.ReflectionName) ? t : null
-									);
+									t =>  {
+										if (currentType != null && currentType.ReflectionName.Equals(t.ReflectionName))
+											return null;
+										var def = t.GetDefinition();
+										if (def != null && t.Kind != TypeKind.Interface && (def.IsSealed ||def.IsStatic))
+											return null;
+										return t;
+									}
+								);
 								return wrapper.Result;
 							}
 							return null;
 					}
-					
+
 					var keywordCompletion = HandleKeywordCompletion(tokenIndex, token);
 					if (keywordCompletion == null && controlSpace) {
 						goto default;
@@ -636,7 +933,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						tokenIndex = offset;
 						token = GetPreviousToken(ref tokenIndex, false);
 						if (IsInPreprocessorDirective() && (token.Length == 1 && char.IsLetter(completionChar) || controlSpace)) {
-							while (token != null && document.GetCharAt (tokenIndex - 1) != '#') {
+							while (token != null && document.GetCharAt(tokenIndex - 1) != '#') {
 								token = GetPreviousToken(ref tokenIndex, false);
 							}
 							if (token != null)
@@ -664,7 +961,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 							token = GetPreviousToken(ref tokenIndex, false);
 						}
 						// token last typed
-						
+
 						if (linqKeywords.Contains(token)) {
 							if (token == "from") {
 								// after from no auto code completion.
@@ -690,17 +987,20 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						if (identifierStart.Node is TypeParameterDeclaration) {
 							return null;
 						}
-						
+
 						if (identifierStart.Node is MemberReferenceExpression) {
 							return HandleMemberReferenceCompletion(
 								new ExpressionResult(
-								((MemberReferenceExpression)identifierStart.Node).Target,
-								identifierStart.Unit
-							)
+									((MemberReferenceExpression)identifierStart.Node).Target,
+									identifierStart.Unit
+								)
 							);
 						}
-						
+
 						if (identifierStart.Node is Identifier) {
+							if (identifierStart.Node.Parent is GotoStatement)
+								return null;
+
 							// May happen in variable names
 							return controlSpace ? DefaultControlSpaceItems(identifierStart) : null;
 						}
@@ -759,6 +1059,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					AstNode n = identifierStart.Node;
 					if (n.Parent is NamedArgumentExpression)
 						n = n.Parent;
+
 					if (n != null && n.Parent is AnonymousTypeCreateExpression) {
 						AutoSelect = false;
 					}
@@ -772,7 +1073,8 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						var prev = n.GetPrevNode() as ForeachStatement;
 						if (prev != null && prev.InExpression.IsNull) {
 							if (controlSpace) {
-								contextList.AddCustom("in");
+								if (IncludeKeywordsInCompletionList)
+									contextList.AddCustom("in");
 								return contextList.Result;
 							}
 							return null;
@@ -784,13 +1086,16 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						if (result != null)
 							return result;
 					}
-					
-					if (n != null && n.Parent is InvocationExpression) {
+
+					if (n != null && n.Parent is InvocationExpression ||
+						n.Parent is ParenthesizedExpression && n.Parent.Parent is InvocationExpression) {
+						if (n.Parent is ParenthesizedExpression)
+							n = n.Parent;
 						var invokeParent = (InvocationExpression)n.Parent;
 						var invokeResult = ResolveExpression(
 							invokeParent.Target
-							);
-						var mgr = invokeResult != null ? invokeResult.Item1 as MethodGroupResolveResult : null;
+						);
+						var mgr = invokeResult != null ? invokeResult.Result as MethodGroupResolveResult : null;
 						if (mgr != null) {
 							int idx = 0;
 							foreach (var arg in invokeParent.Arguments) {
@@ -799,7 +1104,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 								}
 								idx++;
 							}
-							
+
 							foreach (var method in mgr.Methods) {
 								if (idx < method.Parameters.Count && method.Parameters [idx].Type.Kind == TypeKind.Delegate) {
 									AutoSelect = false;
@@ -823,7 +1128,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 
 					if (n != null && n.Parent is ObjectCreateExpression) {
 						var invokeResult = ResolveExpression(n.Parent);
-						var mgr = invokeResult != null ? invokeResult.Item1 as ResolveResult : null;
+						var mgr = invokeResult != null ? invokeResult.Result as ResolveResult : null;
 						if (mgr != null) {
 							foreach (var constructor in mgr.Type.GetConstructors ()) {
 								foreach (var p in constructor.Parameters) {
@@ -832,65 +1137,67 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 							}
 						}
 					}
-					
+
 					if (n is IdentifierExpression) {
 						var bop = n.Parent as BinaryOperatorExpression;
 						Expression evaluationExpr = null;
-						
+
 						if (bop != null && bop.Right == n && (bop.Operator == BinaryOperatorType.Equality || bop.Operator == BinaryOperatorType.InEquality)) {
 							evaluationExpr = bop.Left;
 						}
 						// check for compare to enum case 
 						if (evaluationExpr != null) {
 							resolveResult = ResolveExpression(evaluationExpr);
-							if (resolveResult != null && resolveResult.Item1.Type.Kind == TypeKind.Enum) {
+							if (resolveResult != null && resolveResult.Result.Type.Kind == TypeKind.Enum) {
 								var wrapper = new CompletionDataWrapper(this);
 								AddContextCompletion(
 									wrapper,
-									resolveResult.Item2,
+									resolveResult.Resolver,
 									evaluationExpr
-									);
-								AddEnumMembers(wrapper, resolveResult.Item1.Type, resolveResult.Item2);
+								);
+								AddEnumMembers(wrapper, resolveResult.Result.Type, resolveResult.Resolver);
 								AutoCompleteEmptyMatch = false;
 								return wrapper.Result;
 							}
 						}
 					}
-					
+
 					if (n is Identifier && n.Parent is ForeachStatement) {
 						if (controlSpace) {
 							return DefaultControlSpaceItems();
 						}
 						return null;
 					}
-					
+
 					if (n is ArrayInitializerExpression) {
 						// check for new [] {...} expression -> no need to resolve the type there
 						var parent = n.Parent as ArrayCreateExpression;
 						if (parent != null && parent.Type.IsNull) {
 							return DefaultControlSpaceItems();
 						}
-						
+
 						var initalizerResult = ResolveExpression(n.Parent);
-						
+
 						var concreteNode = identifierStart.Unit.GetNodeAt<IdentifierExpression>(location);
 						// check if we're on the right side of an initializer expression
 						if (concreteNode != null && concreteNode.Parent != null && concreteNode.Parent.Parent != null && concreteNode.Identifier != "a" && concreteNode.Parent.Parent is NamedExpression) {
 							return DefaultControlSpaceItems();
 						}
-						if (initalizerResult != null && initalizerResult.Item1.Type.Kind != TypeKind.Unknown) { 
-							
-							foreach (var property in initalizerResult.Item1.Type.GetProperties ()) {
+						if (initalizerResult != null && initalizerResult.Result.Type.Kind != TypeKind.Unknown) { 
+
+							foreach (var property in initalizerResult.Result.Type.GetProperties ()) {
 								if (!property.IsPublic) {
 									continue;
 								}
-								contextList.AddMember(property);
+								var data = contextList.AddMember(property);
+								data.DisplayFlags |= DisplayFlags.NamedArgument;
 							}
-							foreach (var field in initalizerResult.Item1.Type.GetFields ()) {       
+							foreach (var field in initalizerResult.Result.Type.GetFields ()) {       
 								if (!field.IsPublic) {
 									continue;
 								}
-								contextList.AddMember(field);
+								var data = contextList.AddMember(field);
+								data.DisplayFlags |= DisplayFlags.NamedArgument;
 							}
 							return contextList.Result;
 						}
@@ -915,15 +1222,15 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					if (n is MemberType) {
 						resolveResult = ResolveExpression(
 							((MemberType)n).Target
-							);
+						);
 						return CreateTypeAndNamespaceCompletionData(
 							location,
-							resolveResult.Item1,
+							resolveResult.Result,
 							((MemberType)n).Target,
-							resolveResult.Item2
-							);
+							resolveResult.Resolver
+						);
 					}
-					if (n != null/* && !(identifierStart.Item2 is TypeDeclaration)*/) {
+					if (n != null/*					 && !(identifierStart.Item2 is TypeDeclaration)*/) {
 						csResolver = new CSharpResolver(ctx);
 						var nodes = new List<AstNode>();
 						nodes.Add(n);
@@ -941,7 +1248,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						if (n.Parent is ICSharpCode.NRefactory.CSharp.Attribute) {
 							var rr = ResolveExpression(n.Parent);
 							if (rr != null)
-								AddAttributeProperties(contextList, rr.Item1);
+								AddAttributeProperties(contextList, rr.Result);
 						}
 					} else {
 						csResolver = GetState();
@@ -952,10 +1259,10 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						contextList,
 						csResolver,
 						identifierStart.Node
-						);
+					);
 					return contextList.Result;
 					//				if (stub.Parent is BlockStatement)
-					
+
 					//				result = FindExpression (dom, completionContext, -1);
 					//				if (result == null)
 					//					return null;
@@ -1021,13 +1328,14 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					//				break;
 			}
 			return null;
+
 		}
-		
+
 		IEnumerable<ICompletionData> HandleCatchClauseType(ExpressionResult identifierStart)
 		{
 			Func<IType, IType> typePred = delegate (IType type) {
 				if (type.GetAllBaseTypes().Any(t => t.ReflectionName == "System.Exception"))
-				return type;
+					return type;
 				return null;
 			};
 			if (identifierStart.Node.Parent is CatchClause) {
@@ -1038,20 +1346,20 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					identifierStart.Node,
 					typePred,
 					m => false
-					);
+				);
 				return wrapper.Result;
 			}
-			
+
 			var resolveResult = ResolveExpression(identifierStart);
 			return CreateCompletionData(
 				location,
-				resolveResult.Item1,
+				resolveResult.Result,
 				identifierStart.Node,
-				resolveResult.Item2,
+				resolveResult.Resolver,
 				typePred
-				);
+			);
 		}
-		
+
 		string[] validEnumBaseTypes = {
 			"byte",
 			"sbyte",
@@ -1062,14 +1370,14 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			"uint",
 			"ulong"
 		};
-		
+
 		IEnumerable<ICompletionData> HandleEnumContext()
 		{
 			var syntaxTree = ParseStub("a", false);
 			if (syntaxTree == null) {
 				return null;
 			}
-			
+
 			var curType = syntaxTree.GetNodeAt<TypeDeclaration>(location);
 			if (curType == null || curType.ClassType != ClassType.Enum) {
 				syntaxTree = ParseStub("a {}", false);
@@ -1080,7 +1388,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					return wrapper.Result;
 				}
 			}
-			
+
 			var member = syntaxTree.GetNodeAt<EnumMemberDeclaration>(location);
 			if (member != null && member.NameToken.EndLocation < location) {
 				if (currentMember == null && currentType != null) {
@@ -1094,7 +1402,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			var attribute = syntaxTree.GetNodeAt<Attribute>(location);
 			if (attribute != null) {
 				var contextList = new CompletionDataWrapper(this);
-				var astResolver = CompletionContextProvider.GetResolver(GetState (), syntaxTree);
+				var astResolver = CompletionContextProvider.GetResolver(GetState(), syntaxTree);
 				var csResolver = astResolver.GetResolverStateBefore(attribute);
 				AddContextCompletion(
 					contextList,
@@ -1105,12 +1413,12 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 			return null;
 		}
-		
+
 		bool IsInLinqContext(int offset)
 		{
 			string token;
-			while (null != (token = GetPreviousToken (ref offset, true)) && !IsInsideCommentStringOrDirective ()) {
-				
+			while (null != (token = GetPreviousToken(ref offset, true)) && !IsInsideCommentStringOrDirective()) {
+
 				if (token == "from") {
 					return !IsInsideCommentStringOrDirective(offset);
 				}
@@ -1120,7 +1428,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 			return false;
 		}
-		
+
 		IEnumerable<ICompletionData> HandleAccessorContext()
 		{
 			var unit = ParseStub("get; }", false);
@@ -1130,24 +1438,29 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 			var contextList = new CompletionDataWrapper(this);
 			if (node is PropertyDeclaration || node is IndexerDeclaration) {
-				contextList.AddCustom("get");
-				contextList.AddCustom("set");
-				AddKeywords(contextList, accessorModifierKeywords);
+				if (IncludeKeywordsInCompletionList) {
+					contextList.AddCustom("get");
+					contextList.AddCustom("set");
+					AddKeywords(contextList, accessorModifierKeywords);
+				}
 			} else if (node is CustomEventDeclaration) {
-				contextList.AddCustom("add");
-				contextList.AddCustom("remove");
+				if (IncludeKeywordsInCompletionList) {
+					contextList.AddCustom("add");
+					contextList.AddCustom("remove");
+				}
 			} else {
 				return null;
 			}
-			
+
 			return contextList.Result;
 		}
+
 		class IfVisitor :DepthFirstAstVisitor
 		{
 			TextLocation loc;
 			ICompletionContextProvider completionContextProvider;
 			public bool IsValid;
-			
+
 			public IfVisitor(TextLocation loc, ICompletionContextProvider completionContextProvider)
 			{
 				this.loc = loc;
@@ -1164,48 +1477,50 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				IsValid &= completionContextProvider.ConditionalSymbols.Contains(argument);
 			}
 
-			Stack<PreProcessorDirective> ifStack = new Stack<PreProcessorDirective> ();
+			Stack<PreProcessorDirective> ifStack = new Stack<PreProcessorDirective>();
 
 			public override void VisitPreProcessorDirective(PreProcessorDirective preProcessorDirective)
 			{
 				if (preProcessorDirective.Type == PreProcessorDirectiveType.If) {
-					ifStack.Push (preProcessorDirective);
+					ifStack.Push(preProcessorDirective);
 				} else if (preProcessorDirective.Type == PreProcessorDirectiveType.Endif) {
 					if (ifStack.Count == 0)
 						return;
-					var ifDirective = ifStack.Pop ();
+					var ifDirective = ifStack.Pop();
 					if (ifDirective.StartLocation < loc && loc < preProcessorDirective.EndLocation) {
-						Check (ifDirective.Argument);
+						Check(ifDirective.Argument);
 					}
 
 				}
-			
+
 				base.VisitPreProcessorDirective(preProcessorDirective);
 			}
-			public void End ()
+
+			public void End()
 			{
 				while (ifStack.Count > 0) {
-					Check (ifStack.Pop ().Argument);
+					Check(ifStack.Pop().Argument);
 				}
 			}
 		}
+
 		IEnumerable<ICompletionData> DefaultControlSpaceItems(ExpressionResult xp = null, bool controlSpace = true)
 		{
 			var wrapper = new CompletionDataWrapper(this);
 			if (offset >= document.TextLength) {
 				offset = document.TextLength - 1;
 			}
-			while (offset > 1 && char.IsWhiteSpace (document.GetCharAt (offset))) {
+			while (offset > 1 && char.IsWhiteSpace(document.GetCharAt(offset))) {
 				offset--;
 			}
 			location = document.GetLocation(offset);
-			
+
 			if (xp == null) {
 				xp = GetExpressionAtCursor();
 			}
 			AstNode node;
 			SyntaxTree unit;
-			Tuple<ResolveResult, CSharpResolver> rr;
+			ExpressionResolveResult rr;
 			if (xp != null) {
 				node = xp.Node;
 				rr = ResolveExpression(node);
@@ -1219,7 +1534,6 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				);
 				rr = ResolveExpression(node);
 			}
-
 			var ifvisitor = new IfVisitor(location, CompletionContextProvider);
 			unit.AcceptVisitor(ifvisitor);
 			ifvisitor.End();
@@ -1229,7 +1543,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			// namespace name case
 			var ns = node as NamespaceDeclaration;
 			if (ns != null) {
-				var last = ns.Identifiers.LastOrDefault ();
+				var last = ns.NamespaceName;
 				if (last != null && location < last.EndLocation)
 					return null;
 			}
@@ -1240,12 +1554,12 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						wrapper.Result.Add(factory.CreateLiteralCompletionData(possibleName.ToString()));
 					}
 				}
-				
+
 				AutoSelect = false;
 				AutoCompleteEmptyMatch = false;
 				return wrapper.Result;
 			}
-			
+
 			if (node is Identifier && node.Parent is ParameterDeclaration) {
 				if (!controlSpace) {
 					return null;
@@ -1264,7 +1578,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				}
 			}
 
-			/*			if (Unit != null && (node == null || node is TypeDeclaration)) {
+			/*						if (Unit != null && (node == null || node is TypeDeclaration)) {
 				var constructor = Unit.GetNodeAt<ConstructorDeclaration>(
 					location.Line,
 					location.Column - 3
@@ -1275,7 +1589,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					return wrapper.Result;
 				}
 			}*/
-			
+
 			var initializer = node != null ? node.Parent as ArrayInitializerExpression : null;
 			if (initializer != null) {
 				var result = HandleObjectInitializer(unit, initializer);
@@ -1284,36 +1598,52 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 			CSharpResolver csResolver = null;
 			if (rr != null) {
-				csResolver = rr.Item2;
+				csResolver = rr.Resolver;
 			}
 
 			if (csResolver == null) {
 				if (node != null) {
 					csResolver = GetState();
 					//var astResolver = new CSharpAstResolver (csResolver, node, xp != null ? xp.Item1 : CSharpUnresolvedFile);
-					
+
 					try {
 						//csResolver = astResolver.GetResolverStateBefore (node);
 						Console.WriteLine(csResolver.LocalVariables.Count());
 					} catch (Exception  e) {
 						Console.WriteLine("E!!!" + e);
 					}
-					
+
 				} else {
 					csResolver = GetState();
 				}
 			}
-			
+
 			if (node is Attribute) {
 				// add attribute properties.
 				var astResolver = CompletionContextProvider.GetResolver(csResolver, unit);
-				var resolved = astResolver.Resolve (node);
-				AddAttributeProperties (wrapper, resolved);
+				var resolved = astResolver.Resolve(node);
+				AddAttributeProperties(wrapper, resolved);
+			}
+
+
+			if (node == null) {
+				// try lambda
+				unit = ParseStub("foo) => {}", true);
+				var pd = unit.GetNodeAt<ParameterDeclaration>(
+					location.Line,
+					location.Column
+				);
+				if (pd != null) {
+					var astResolver = unit != null ? CompletionContextProvider.GetResolver(GetState(), unit) : null;
+					var parameterType = astResolver.Resolve(pd.Type);
+					// Type <name> is always a name context -> return null
+					if (parameterType != null && !parameterType.IsError)
+						return null;
+				}
 			}
-			
 
 			AddContextCompletion(wrapper, csResolver, node);
-			
+
 			return wrapper.Result;
 		}
 
@@ -1323,10 +1653,12 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				return;
 
 			foreach (var property in resolved.Type.GetProperties (p => p.Accessibility == Accessibility.Public)) {
-				wrapper.AddMember(property);
+				var data = wrapper.AddMember(property);
+				data.DisplayFlags |= DisplayFlags.NamedArgument;
 			}
 			foreach (var field in resolved.Type.GetFields (p => p.Accessibility == Accessibility.Public)) {
-				wrapper.AddMember(field);
+				var data = wrapper.AddMember(field);
+				data.DisplayFlags |= DisplayFlags.NamedArgument;
 			}
 			foreach (var constructor in resolved.Type.GetConstructors (p => p.Accessibility == Accessibility.Public)) {
 				foreach (var p in constructor.Parameters) {
@@ -1334,7 +1666,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				}
 			}
 		}
-		
+
 		void AddContextCompletion(CompletionDataWrapper wrapper, CSharpResolver state, AstNode node)
 		{
 			int i = offset - 1;
@@ -1355,31 +1687,38 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					wrapper.AddVariable(p);
 				}
 			}
-			
+
 			if (state.CurrentMember is IMethod) {
 				var method = (IMethod)state.CurrentMember;
 				foreach (var p in method.TypeParameters) {
 					wrapper.AddTypeParameter(p);
 				}
 			}
-			
+
 			Func<IType, IType> typePred = null;
 			if (IsAttributeContext(node)) {
 				var attribute = Compilation.FindType(KnownTypeCode.Attribute);
+				typePred = t => t.GetAllBaseTypeDefinitions().Any(bt => bt.Equals(attribute)) ? t : null;
+			}
+			if (node != null && node.Role == Roles.BaseType) {
 				typePred = t => {
-					return t.GetAllBaseTypeDefinitions().Any(bt => bt.Equals(attribute)) ? t : null;
+					var def = t.GetDefinition();
+					if (def != null && t.Kind != TypeKind.Interface && (def.IsSealed || def.IsStatic))
+						return null;
+					return t;
 				};
 			}
+
 			if (node != null && !(node is NamespaceDeclaration) || state.CurrentTypeDefinition != null || isInGlobalDelegate) {
 				AddTypesAndNamespaces(wrapper, state, node, typePred);
-				
+
 				wrapper.Result.Add(factory.CreateLiteralCompletionData("global"));
 			}
 
 			if (!(node is AstType)) {
 				if (currentMember != null || node is Expression) {
 					AddKeywords(wrapper, statementStartKeywords);
-					if (LanguageVersion.Major >= 5) 
+					if (LanguageVersion.Major >= 5)
 						AddKeywords(wrapper, new [] { "await" });
 					AddKeywords(wrapper, expressionLevelKeywords);
 					if (node == null || node is TypeDeclaration)
@@ -1387,7 +1726,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				} else if (currentType != null) {
 					AddKeywords(wrapper, typeLevelKeywords);
 				} else {
-					if (!isInGlobalDelegate && !(node is Attribute) )
+					if (!isInGlobalDelegate && !(node is Attribute))
 						AddKeywords(wrapper, globalLevelKeywords);
 				}
 				var prop = currentMember as IUnresolvedProperty;
@@ -1397,9 +1736,10 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				if (currentMember is IUnresolvedEvent) {
 					wrapper.AddCustom("value");
 				} 
-				
+
 				if (IsInSwitchContext(node)) {
-					wrapper.AddCustom("case"); 
+					if (IncludeKeywordsInCompletionList)
+						wrapper.AddCustom("case"); 
 				}
 			} else {
 				if (((AstType)node).Parent is ParameterDeclaration) {
@@ -1410,13 +1750,15 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			if (node != null || state.CurrentTypeDefinition != null || isInGlobalDelegate)
 				AddKeywords(wrapper, primitiveTypesKeywords);
 			if (currentMember != null && (node is IdentifierExpression || node is SimpleType) && (node.Parent is ExpressionStatement || node.Parent is ForeachStatement || node.Parent is UsingStatement)) {
-				wrapper.AddCustom("var");
-				wrapper.AddCustom("dynamic");
+				if (IncludeKeywordsInCompletionList) {
+					wrapper.AddCustom("var");
+					wrapper.AddCustom("dynamic");
+				}
 			} 
 			wrapper.Result.AddRange(factory.CreateCodeTemplateCompletionData());
 			if (node != null && node.Role == Roles.Argument) {
 				var resolved = ResolveExpression(node.Parent);
-				var invokeResult = resolved != null ? resolved.Item1 as CSharpInvocationResolveResult : null;
+				var invokeResult = resolved != null ? resolved.Result as CSharpInvocationResolveResult : null;
 				if (invokeResult != null) {
 					int argNum = 0;
 					foreach (var arg in node.Parent.Children.Where (c => c.Role == Roles.Argument)) {
@@ -1431,13 +1773,13 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					}
 				}
 			}
-			
+
 			if (node is Expression) {
 				var root = node;
 				while (root.Parent != null)
 					root = root.Parent;
 				var astResolver = CompletionContextProvider.GetResolver(state, root);
-				foreach (var type in CreateFieldAction.GetValidTypes(astResolver, (Expression)node)) {
+				foreach (var type in TypeGuessing.GetValidTypes(astResolver, (Expression)node)) {
 					if (type.Kind == TypeKind.Enum) {
 						AddEnumMembers(wrapper, type, state);
 					} else if (type.Kind == TypeKind.Delegate) {
@@ -1447,14 +1789,14 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					}
 				}
 			}
-			
+
 			// Add 'this' keyword for first parameter (extension method case)
-			if (node != null && node.Parent is ParameterDeclaration && 
-			    node.Parent.PrevSibling != null && node.Parent.PrevSibling.Role == Roles.LPar) {
+			if (node != null && node.Parent is ParameterDeclaration &&
+				node.Parent.PrevSibling != null && node.Parent.PrevSibling.Role == Roles.LPar && IncludeKeywordsInCompletionList) {
 				wrapper.AddCustom("this");
 			}
 		}
-		
+
 		static bool IsInSwitchContext(AstNode node)
 		{
 			var n = node;
@@ -1470,24 +1812,43 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			return false;
 		}
 
-		void AddTypesAndNamespaces(CompletionDataWrapper wrapper, CSharpResolver state, AstNode node, Func<IType, IType> typePred = null, Predicate<IMember> memberPred = null, Action<ICompletionData, IType> callback = null)
+		static bool ListEquals(List<INamespace> curNamespaces, List<INamespace> oldNamespaces)
+		{
+			if (oldNamespaces == null || curNamespaces.Count != oldNamespaces.Count)
+				return false;
+			for (int i = 0; i < curNamespaces.Count; i++) {
+				if (curNamespaces [i].FullName != oldNamespaces [i].FullName) {
+					return false;
+				}
+			}
+			return true;
+		}
+
+		void AddTypesAndNamespaces(CompletionDataWrapper wrapper, CSharpResolver state, AstNode node, Func<IType, IType> typePred = null, Predicate<IMember> memberPred = null, Action<ICompletionData, IType> callback = null, bool onlyAddConstructors = false)
 		{
 			var lookup = new MemberLookup(ctx.CurrentTypeDefinition, Compilation.MainAssembly);
 
 			if (currentType != null) {
 				for (var ct = ctx.CurrentTypeDefinition; ct != null; ct = ct.DeclaringTypeDefinition) {
 					foreach (var nestedType in ct.GetNestedTypes ()) {
-						if (!lookup.IsAccessible (nestedType.GetDefinition (), true))
+						if (!lookup.IsAccessible(nestedType.GetDefinition(), true))
 							continue;
-						
+						if (onlyAddConstructors) {
+							if (!nestedType.GetConstructors().Any(c => lookup.IsAccessible(c, true)))
+								continue;
+						}
+
 						if (typePred == null) {
-							wrapper.AddType(nestedType, false, IsAttributeContext(node));
+							if (onlyAddConstructors)
+								wrapper.AddConstructors(nestedType, false, IsAttributeContext(node));
+							else
+								wrapper.AddType(nestedType, false, IsAttributeContext(node));
 							continue;
 						}
-						
+
 						var type = typePred(nestedType);
 						if (type != null) {
-							var a2 = wrapper.AddType(type, false, IsAttributeContext(node));
+							var a2 = onlyAddConstructors ? wrapper.AddConstructors(type, false, IsAttributeContext(node)) : wrapper.AddType(type, false, IsAttributeContext(node));
 							if (a2 != null && callback != null) {
 								callback(a2, type);
 							}
@@ -1495,6 +1856,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						continue;
 					}
 				}
+
 				if (this.currentMember != null && !(node is AstType)) {
 					var def = ctx.CurrentTypeDefinition;
 					if (def == null && currentType != null)
@@ -1537,7 +1899,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				}
 			}
 			var scope = ctx.CurrentUsingScope;
-			
+
 			for (var n = scope; n != null; n = n.Parent) {
 				foreach (var pair in n.UsingAliases) {
 					wrapper.AddAlias(pair.Key);
@@ -1549,39 +1911,116 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					foreach (var type in u.Types) {
 						if (!lookup.IsAccessible(type, false))
 							continue;
-						
+
 						IType addType = typePred != null ? typePred(type) : type;
+
+						if (onlyAddConstructors && addType != null) {
+							if (!addType.GetConstructors().Any(c => lookup.IsAccessible(c, true)))
+								continue;
+						}
+
 						if (addType != null) {
-							var a = wrapper.AddType(addType, false, IsAttributeContext(node));
+							var a = onlyAddConstructors ? wrapper.AddConstructors(addType, false, IsAttributeContext(node)) : wrapper.AddType(addType, false, IsAttributeContext(node));
 							if (a != null && callback != null) {
 								callback(a, type);
 							}
 						}
 					}
 				}
-				
+
 				foreach (var type in n.Namespace.Types) {
 					if (!lookup.IsAccessible(type, false))
 						continue;
 					IType addType = typePred != null ? typePred(type) : type;
+
+					if (onlyAddConstructors && addType != null) {
+						if (!addType.GetConstructors().Any(c => lookup.IsAccessible(c, true)))
+							continue;
+					}
+
 					if (addType != null) {
-						var a2 = wrapper.AddType(addType, false);
+						var a2 = onlyAddConstructors ? wrapper.AddConstructors(addType, false, IsAttributeContext(node)) : wrapper.AddType(addType, false);
 						if (a2 != null && callback != null) {
 							callback(a2, type);
 						}
 					}
-				}
+				}
+			}
+
+			for (var n = scope; n != null; n = n.Parent) {
+				foreach (var curNs in n.Namespace.ChildNamespaces) {
+					wrapper.AddNamespace(lookup, curNs);
+				}
+			}
+
+			if (node is AstType && node.Parent is Constraint && IncludeKeywordsInCompletionList) {
+				wrapper.AddCustom("new()");
+			}
+
+			if (AutomaticallyAddImports) {
+				state = GetState();
+				ICompletionData[] importData;
+
+				var namespaces = new List<INamespace>();
+				for (var n = ctx.CurrentUsingScope; n != null; n = n.Parent) {
+					namespaces.Add(n.Namespace);
+					foreach (var u in n.Usings)
+						namespaces.Add(u);
+				}
+
+				if (this.CompletionEngineCache != null && ListEquals(namespaces, CompletionEngineCache.namespaces)) {
+					importData = CompletionEngineCache.importCompletion;
+				} else {
+					// flatten usings
+					var importList = new List<ICompletionData>();
+					var dict = new Dictionary<string, Dictionary<string, ICompletionData>>();
+					foreach (var type in Compilation.GetAllTypeDefinitions ()) {
+						if (!lookup.IsAccessible(type, false))
+							continue;
+						if (namespaces.Any(n => n.FullName == type.Namespace))
+							continue;
+						bool useFullName = false;
+						foreach (var ns in namespaces) {
+							if (ns.GetTypeDefinition(type.Name, type.TypeParameterCount) != null) {
+								useFullName = true;
+								break;
+							}
+						}
+
+						if (onlyAddConstructors) {
+							if (!type.GetConstructors().Any(c => lookup.IsAccessible(c, true)))
+								continue;
+						}
+						var data = factory.CreateImportCompletionData(type, useFullName, onlyAddConstructors);
+						Dictionary<string, ICompletionData> createdDict;
+						if (!dict.TryGetValue(type.Name, out createdDict)) {
+							createdDict = new Dictionary<string, ICompletionData>();
+							dict.Add(type.Name, createdDict);
+						}
+						ICompletionData oldData;
+						if (!createdDict.TryGetValue(type.Namespace, out oldData)) {
+							importList.Add(data);
+							createdDict.Add(type.Namespace, data);
+						} else {
+							oldData.AddOverload(data); 
+						}
+					}
 
-				foreach (var curNs in n.Namespace.ChildNamespaces) {
-					wrapper.AddNamespace(lookup, curNs);
+					importData = importList.ToArray();
+					if (CompletionEngineCache != null) {
+						CompletionEngineCache.namespaces = namespaces;
+						CompletionEngineCache.importCompletion = importData;
+					}
+				}
+				foreach (var data in importData) {
+					wrapper.Result.Add(data);
 				}
-			}
 
-			if (node is AstType && node.Parent is Constraint) {
-				wrapper.AddCustom ("new()");
+
 			}
+
 		}
-		
+
 		IEnumerable<ICompletionData> HandleKeywordCompletion(int wordStart, string word)
 		{
 			if (IsInsideCommentStringOrDirective()) {
@@ -1680,7 +2119,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						if (parent is VariableDeclarationStatement) {
 							var resolved = ResolveExpression(parent);
 							if (resolved != null) {
-								isAsType = resolved.Item1.Type;
+								isAsType = resolved.Result.Type;
 							}
 						}
 					}
@@ -1785,13 +2224,13 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						return null;
 					}
 					var state = GetState();
-					
+
 					if (state.CurrentTypeDefinition != null && (state.CurrentTypeDefinition.Kind == TypeKind.Class || state.CurrentTypeDefinition.Kind == TypeKind.Struct)) {
 						string modifiers = document.GetText(firstMod, wordStart - firstMod);
 						return GetPartialCompletionData(state.CurrentTypeDefinition, modifiers);
 					}
 					return null;
-					
+
 				case "public":
 				case "protected":
 				case "private":
@@ -1802,54 +2241,48 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					if (accessorContext != null) {
 						return accessorContext;
 					}
-					wrapper = new CompletionDataWrapper(this);
-					state = GetState();
-					if (currentType != null) {
-						AddTypesAndNamespaces(wrapper, state, null, null, m => false);
-						AddKeywords(wrapper, primitiveTypesKeywords);
-					}
-					AddKeywords(wrapper, typeLevelKeywords);
-					return wrapper.Result;
+					return null;
 				case "new":
 					int j = offset - 4;
 					//				string token = GetPreviousToken (ref j, true);
-					
+
 					IType hintType = null;
 					var expressionOrVariableDeclaration = GetNewExpressionAt(j);
 					if (expressionOrVariableDeclaration == null)
 						return null;
-					var astResolver = CompletionContextProvider.GetResolver(GetState(), expressionOrVariableDeclaration.Unit);
-					hintType = CreateFieldAction.GetValidTypes(
+					var astResolver = CompletionContextProvider.GetResolver(GetState(), expressionOrVariableDeclaration.Node.Ancestors.FirstOrDefault(n => n is EntityDeclaration || n is SyntaxTree));
+					hintType = TypeGuessing.GetValidTypes(
 						astResolver,
-						expressionOrVariableDeclaration.Node as Expression
-						)
-						.FirstOrDefault();
-					
-					return CreateTypeCompletionData(hintType);
+						expressionOrVariableDeclaration.Node
+					).FirstOrDefault();
+
+					return CreateConstructorCompletionData(hintType);
 				case "yield":
 					var yieldDataList = new CompletionDataWrapper(this);
 					DefaultCompletionString = "return";
-					yieldDataList.AddCustom("break");
-					yieldDataList.AddCustom("return");
+					if (IncludeKeywordsInCompletionList) {
+						yieldDataList.AddCustom("break");
+						yieldDataList.AddCustom("return");
+					}
 					return yieldDataList.Result;
 				case "in":
 					var inList = new CompletionDataWrapper(this);
-					
+
 					var expr = GetExpressionAtCursor();
 					if (expr == null)
 						return null;
 					var rr = ResolveExpression(expr);
-					
+
 					AddContextCompletion(
 						inList,
-						rr != null ? rr.Item2 : GetState(),
+						rr != null ? rr.Resolver : GetState(),
 						expr.Node
-						);
+					);
 					return inList.Result;
 			}
 			return null;
 		}
-		
+
 		bool IsLineEmptyUpToEol()
 		{
 			var line = document.GetLineByNumber(location.Line);
@@ -1861,7 +2294,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 			return true;
 		}
-		
+
 		string GetLineIndent(int lineNr)
 		{
 			var line = document.GetLineByNumber(lineNr);
@@ -1873,22 +2306,20 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 			return "";
 		}
-		
-//		static CSharpAmbience amb = new CSharpAmbience();
-		
+		//		static CSharpAmbience amb = new CSharpAmbience();
 		class Category : CompletionCategory
 		{
-			public Category(string displayText, string icon) : base (displayText, icon)
+			public Category(string displayText, string icon) : base(displayText, icon)
 			{
 			}
-			
+
 			public override int CompareTo(CompletionCategory other)
 			{
 				return 0;
 			}
 		}
-		
-		IEnumerable<ICompletionData> CreateTypeCompletionData(IType hintType)
+
+		IEnumerable<ICompletionData> CreateConstructorCompletionData(IType hintType)
 		{
 			var wrapper = new CompletionDataWrapper(this);
 			var state = GetState();
@@ -1901,12 +2332,12 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					var lookup = new MemberLookup(
 						ctx.CurrentTypeDefinition,
 						Compilation.MainAssembly
-						);
+					);
 					typeCallback = (data, t) => {
 						//check if type is in inheritance tree.
 						if (hintType.GetDefinition() != null &&
-						    t.GetDefinition() != null &&
-						    t.GetDefinition().IsDerivedFrom(hintType.GetDefinition())) {
+							t.GetDefinition() != null &&
+							t.GetDefinition().IsDerivedFrom(hintType.GetDefinition())) {
 							data.CompletionCategory = derivedTypesCategory;
 						}
 					};
@@ -1917,7 +2348,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						// check for valid constructors
 						if (t.GetConstructors().Count() > 0) {
 							bool isProtectedAllowed = currentType != null ? 
-								currentType.Resolve(ctx).GetDefinition().IsDerivedFrom(t.GetDefinition()) : false;
+							                          currentType.Resolve(ctx).GetDefinition().IsDerivedFrom(t.GetDefinition()) : false;
 							if (!t.GetConstructors().Any(m => lookup.IsAccessible(m, isProtectedAllowed))) {
 								return null;
 							}
@@ -1932,12 +2363,12 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 								newType.CompletionCategory = inferredTypesCategory;
 							}
 						}
-						
+
 						// check type inference
 						var typeInference = new TypeInference(Compilation);
 						typeInference.Algorithm = TypeInferenceAlgorithm.ImprovedReturnAllResults;
 
-						var inferedType = typeInference.FindTypeInBounds (new [] { t }, new [] { hintType });
+						var inferedType = typeInference.FindTypeInBounds(new [] { t }, new [] { hintType });
 						if (inferedType != SpecialType.UnknownType) {
 							var newType = wrapper.AddType(inferedType, true);
 							if (newType != null) {
@@ -1957,7 +2388,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					if (hintType is ParameterizedType && hintType.TypeParameterCount == 1 && hintType.FullName == "System.Collections.Generic.IEnumerable") {
 						var arg = ((ParameterizedType)hintType).TypeArguments.FirstOrDefault();
 						if (arg.Kind != TypeKind.TypeParameter) {
-							var array = new ArrayType (ctx.Compilation, arg, 1);
+							var array = new ArrayType(ctx.Compilation, arg, 1);
 							wrapper.AddType(array, true);
 						}
 					}
@@ -1969,23 +2400,23 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					}
 				}
 			} 
-			AddTypesAndNamespaces(wrapper, state, null, pred, m => false, typeCallback);
+			AddTypesAndNamespaces(wrapper, state, null, pred, m => false, typeCallback, true);
 			if (hintType == null || hintType == SpecialType.UnknownType) {
 				AddKeywords(wrapper, primitiveTypesKeywords.Where(k => k != "void"));
 			}
-			
+
 			CloseOnSquareBrackets = true;
 			AutoCompleteEmptyMatch = true;
 			AutoCompleteEmptyMatchOnCurlyBracket = false;
 			return wrapper.Result;
 		}
-		
+
 		IEnumerable<ICompletionData> GetOverrideCompletionData(IUnresolvedTypeDefinition type, string modifiers)
 		{
 			var wrapper = new CompletionDataWrapper(this);
 			var alreadyInserted = new List<IMember>();
 			//bool addedVirtuals = false;
-			
+
 			int declarationBegin = offset;
 			int j = declarationBegin;
 			for (int i = 0; i < 3; i++) {
@@ -2010,10 +2441,10 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				modifiers,
 				type.Resolve(ctx),
 				declarationBegin
-				);
+			);
 			return wrapper.Result;
 		}
-		
+
 		IEnumerable<ICompletionData> GetPartialCompletionData(ITypeDefinition type, string modifiers)
 		{
 			var wrapper = new CompletionDataWrapper(this);
@@ -2035,9 +2466,9 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						return null; // don't add override completion for static members
 				}
 			}
-			
+
 			var methods = new List<IUnresolvedMethod>();
-			
+
 			foreach (var part in type.Parts) {
 				foreach (var method in part.Methods) {
 					if (method.BodyRegion.IsEmpty) {
@@ -2048,25 +2479,25 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					}
 				}	
 			}
-			
+
 			foreach (var method in methods) {
 				wrapper.Add(factory.CreateNewPartialCompletionData(
 					declarationBegin,
 					method.DeclaringTypeDefinition,
 					method
-					)
-				            );
+				)
+				);
 			} 
-			
+
 			return wrapper.Result;
 		}
-		
+
 		IMethod GetImplementation(ITypeDefinition type, IUnresolvedMethod method)
 		{
 			foreach (var cur in type.Methods) {
 				if (cur.Name == method.Name && cur.Parameters.Count == method.Parameters.Count && !cur.BodyRegion.IsEmpty) {
 					bool equal = true;
-					/*for (int i = 0; i < cur.Parameters.Count; i++) {
+					/*					for (int i = 0; i < cur.Parameters.Count; i++) {
 						if (!cur.Parameters [i].Type.Equals (method.Parameters [i].Type)) {
 							equal = false;
 							break;
@@ -2079,8 +2510,8 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 			return null;
 		}
-		
-		void AddVirtuals(List<IMember> alreadyInserted, CompletionDataWrapper col, string modifiers, IType curType, int declarationBegin)
+
+		protected virtual void AddVirtuals(List<IMember> alreadyInserted, CompletionDataWrapper col, string modifiers, IType curType, int declarationBegin)
 		{
 			if (curType == null) {
 				return;
@@ -2093,18 +2524,18 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				if (m is IMethod && m.Name == "Finalize") {
 					continue;
 				}
-				
+
 				var data = factory.CreateNewOverrideCompletionData(
 					declarationBegin,
 					currentType,
 					m
-					);
+				);
 				// check if the member is already implemented
 				bool foundMember = curType.GetMembers().Any(cm => SignatureComparer.Ordinal.Equals(
 					cm,
 					m
-					) && cm.DeclaringTypeDefinition == curType.GetDefinition()
-				                                            );
+				) && cm.DeclaringTypeDefinition == curType.GetDefinition()
+				);
 				if (foundMember) {
 					continue;
 				}
@@ -2115,16 +2546,18 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				col.Add(data);
 			}
 		}
-		
-		static void AddKeywords(CompletionDataWrapper wrapper, IEnumerable<string> keywords)
+
+		void AddKeywords(CompletionDataWrapper wrapper, IEnumerable<string> keywords)
 		{
+			if (!IncludeKeywordsInCompletionList)
+				return;
 			foreach (string keyword in keywords) {
 				if (wrapper.Result.Any(data => data.DisplayText == keyword))
 					continue;
 				wrapper.AddCustom(keyword);
 			}
 		}
-		
+
 		public string GetPreviousMemberReferenceExpression(int tokenIndex)
 		{
 			string result = GetPreviousToken(ref tokenIndex, false);
@@ -2156,7 +2589,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 			return result;
 		}
-		
+
 		bool MatchDelegate(IType delegateType, IMethod method)
 		{
 			if (method.SymbolKind != SymbolKind.Method)
@@ -2165,7 +2598,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			if (delegateMethod == null || delegateMethod.Parameters.Count != method.Parameters.Count) {
 				return false;
 			}
-			
+
 			for (int i = 0; i < delegateMethod.Parameters.Count; i++) {
 				if (!delegateMethod.Parameters [i].Type.Equals(method.Parameters [i].Type)) {
 					return false;
@@ -2173,14 +2606,16 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 			return true;
 		}
-		
+
 		string AddDelegateHandlers(CompletionDataWrapper completionList, IType delegateType, bool addSemicolon = true, bool addDefault = true)
 		{
 			IMethod delegateMethod = delegateType.GetDelegateInvokeMethod();
+			PossibleDelegates.Add(delegateMethod);
 			var thisLineIndent = GetLineIndent(location.Line);
 			string delegateEndString = EolMarker + thisLineIndent + "}" + (addSemicolon ? ";" : "");
 			//bool containsDelegateData = completionList.Result.Any(d => d.DisplayText.StartsWith("delegate("));
-			if (addDefault) {
+			if (addDefault && !completionList.AnonymousDelegateAdded) {
+				completionList.AnonymousDelegateAdded = true;
 				var oldDelegate = completionList.Result.FirstOrDefault(cd => cd.DisplayText == "delegate");
 				if (oldDelegate != null)
 					completionList.Result.Remove(oldDelegate);
@@ -2188,20 +2623,20 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					"delegate",
 					"Creates anonymous delegate.",
 					"delegate {" + EolMarker + thisLineIndent + IndentString + "|" + delegateEndString
-					);
+				);
 				if (LanguageVersion.Major >= 5) {
 					completionList.AddCustom(
 						"async delegate",
 						"Creates anonymous async delegate.",
 						"async delegate {" + EolMarker + thisLineIndent + IndentString + "|" + delegateEndString
-						);
+					);
 				}
 			}
 			var sb = new StringBuilder("(");
 			var sbWithoutTypes = new StringBuilder("(");
 			var state = GetState();
 			var builder = new TypeSystemAstBuilder(state);
-			
+
 			for (int k = 0; k < delegateMethod.Parameters.Count; k++) {
 				if (k > 0) {
 					sb.Append(", ");
@@ -2213,51 +2648,57 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				sb.Append(convertedParameter.ToString(FormattingPolicy));
 				sbWithoutTypes.Append(delegateMethod.Parameters [k].Name);
 			}
-			
+
 			sb.Append(")");
 			sbWithoutTypes.Append(")");
-			completionList.AddCustom(
-				"delegate" + sb,
-				"Creates anonymous delegate.",
-				"delegate" + sb + " {" + EolMarker + thisLineIndent + IndentString + "|" + delegateEndString
-			);
-			if (LanguageVersion.Major >= 5) {
+			var signature = sb.ToString();
+			if (!completionList.HasAnonymousDelegateAdded(signature)) {
+				completionList.AddAnonymousDelegateAdded(signature);
+
 				completionList.AddCustom(
-					"async delegate" + sb,
-					"Creates anonymous async delegate.",
-					"async delegate" + sb + " {" + EolMarker + thisLineIndent + IndentString + "|" + delegateEndString
+					"delegate" + signature,
+					"Creates anonymous delegate.",
+					"delegate" + signature + " {" + EolMarker + thisLineIndent + IndentString + "|" + delegateEndString
 				);
-			}
-			if (!completionList.Result.Any(data => data.DisplayText == sb.ToString())) {
-				completionList.AddCustom(
-					sb.ToString(),
-					"Creates typed lambda expression.",
-					sb + " => |" + (addSemicolon ? ";" : "")
-					);
 				if (LanguageVersion.Major >= 5) {
 					completionList.AddCustom(
-						"async " + sb.ToString(),
-						"Creates typed async lambda expression.",
-						"async " + sb + " => |" + (addSemicolon ? ";" : "")
+						"async delegate" + signature,
+						"Creates anonymous async delegate.",
+						"async delegate" + signature + " {" + EolMarker + thisLineIndent + IndentString + "|" + delegateEndString
 					);
 				}
-			}
-
-			if (!delegateMethod.Parameters.Any(p => p.IsOut || p.IsRef) && !completionList.Result.Any(data => data.DisplayText == sbWithoutTypes.ToString())) {
-				completionList.AddCustom(
-					sbWithoutTypes.ToString(),
-					"Creates lambda expression.",
-					sbWithoutTypes + " => |" + (addSemicolon ? ";" : "")
-				);
-				if (LanguageVersion.Major >= 5) {
+				if (!completionList.Result.Any(data => data.DisplayText == sb.ToString())) {
 					completionList.AddCustom(
-						"async " + sbWithoutTypes.ToString(),
-						"Creates async lambda expression.",
-						"async " + sbWithoutTypes + " => |" + (addSemicolon ? ";" : "")
+						signature,
+						"Creates typed lambda expression.",
+						signature + " => |" + (addSemicolon ? ";" : "")
 					);
+					if (LanguageVersion.Major >= 5) {
+						completionList.AddCustom(
+							"async " + signature,
+							"Creates typed async lambda expression.",
+							"async " + signature + " => |" + (addSemicolon ? ";" : "")
+						);
+					}
+
+					if (!delegateMethod.Parameters.Any(p => p.IsOut || p.IsRef) && !completionList.Result.Any(data => data.DisplayText == sbWithoutTypes.ToString())) {
+						completionList.AddCustom(
+							sbWithoutTypes.ToString(),
+							"Creates lambda expression.",
+							sbWithoutTypes + " => |" + (addSemicolon ? ";" : "")
+						);
+						if (LanguageVersion.Major >= 5) {
+							completionList.AddCustom(
+								"async " + sbWithoutTypes,
+								"Creates async lambda expression.",
+								"async " + sbWithoutTypes + " => |" + (addSemicolon ? ";" : "")
+							);
+						}
+					}
 				}
+
 			}
-			/* TODO:Make factory method out of it.
+			/*			 TODO:Make factory method out of it.
 			// It's  needed to temporarly disable inserting auto matching bracket because the anonymous delegates are selectable with '('
 			// otherwise we would end up with () => )
 			if (!containsDelegateData) {
@@ -2289,9 +2730,9 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						calledType,
 						currentMember,
 						includeProtected
-						);
+					);
 				}
-				
+
 				if (member.IsProtected && !(member.DeclaringTypeDefinition.IsProtectedOrInternal && !includeProtected)) {
 					return includeProtected;
 				}
@@ -2301,7 +2742,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				//var type2 = currentMember is ITypeDefinition ? (ITypeDefinition)currentMember : currentMember.DeclaringTypeDefinition;
 				bool result = true;
 				// easy case, projects are the same
-				/*//				if (type1.ProjectContent == type2.ProjectContent) {
+				/*				//				if (type1.ProjectContent == type2.ProjectContent) {
 				//					result = true; 
 				//				} else 
 				if (type1.ProjectContent != null) {
@@ -2317,13 +2758,13 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					// should never happen !
 					result = true;
 				}*/
-					return member.IsProtectedAndInternal ? includeProtected && result : result;
+				return member.IsProtectedAndInternal ? includeProtected && result : result;
 			}
-			
+
 			if (!(currentMember is IType) && (currentMember.DeclaringTypeDefinition == null || member.DeclaringTypeDefinition == null)) {
 				return false;
 			}
-			
+
 			// inner class 
 			var declaringType = currentMember.DeclaringTypeDefinition;
 			while (declaringType != null) {
@@ -2332,11 +2773,11 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				}
 				declaringType = declaringType.DeclaringTypeDefinition;
 			}
-			
-			
+
+
 			return currentMember.DeclaringTypeDefinition != null && member.DeclaringTypeDefinition.FullName == currentMember.DeclaringTypeDefinition.FullName;
 		}
-		
+
 		static bool IsAttributeContext(AstNode node)
 		{
 			AstNode n = node;
@@ -2345,7 +2786,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 			return n is Attribute;
 		}
-		
+
 		IEnumerable<ICompletionData> CreateTypeAndNamespaceCompletionData(TextLocation location, ResolveResult resolveResult, AstNode resolvedNode, CSharpResolver state)
 		{
 			if (resolveResult == null || resolveResult.IsError) {
@@ -2353,16 +2794,16 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 			var exprParent = resolvedNode.GetParent<Expression>();
 			var unit = exprParent != null ? exprParent.GetParent<SyntaxTree>() : null;
-			
+
 			var astResolver = unit != null ? CompletionContextProvider.GetResolver(state, unit) : null;
 			IType hintType = exprParent != null && astResolver != null ? 
-				CreateFieldAction.GetValidTypes(astResolver, exprParent) .FirstOrDefault() :
-					null;
+			                 TypeGuessing.GetValidTypes(astResolver, exprParent).FirstOrDefault() :
+			                 null;
 			var result = new CompletionDataWrapper(this);
 			var lookup = new MemberLookup(
 				ctx.CurrentTypeDefinition,
 				Compilation.MainAssembly
-				);
+			);
 			if (resolveResult is NamespaceResolveResult) {
 				var nr = (NamespaceResolveResult)resolveResult;
 				if (!(resolvedNode.Parent is UsingDeclaration || resolvedNode.Parent != null && resolvedNode.Parent.Parent is UsingDeclaration)) {
@@ -2370,7 +2811,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						if (hintType != null && hintType.Kind != TypeKind.Array && cl.Kind == TypeKind.Interface) {
 							continue;
 						}
-						if (!lookup.IsAccessible (cl, false))
+						if (!lookup.IsAccessible(cl, false))
 							continue;
 						result.AddType(cl, false, IsAttributeContext(resolvedNode));
 					}
@@ -2385,20 +2826,20 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						continue;
 					}
 					var def = nested.GetDefinition();
-					if (def != null && !lookup.IsAccessible (def, false))
+					if (def != null && !lookup.IsAccessible(def, false))
 						continue;
 					result.AddType(nested, false);
 				}
 			}
 			return result.Result;
 		}
-		
+
 		IEnumerable<ICompletionData> CreateTypeList()
 		{
 			foreach (var cl in Compilation.RootNamespace.Types) {
-				yield return factory.CreateTypeCompletionData(cl, false, false);
+				yield return factory.CreateTypeCompletionData(cl, false, false, false);
 			}
-			
+
 			foreach (var ns in Compilation.RootNamespace.ChildNamespaces) {
 				yield return factory.CreateNamespaceCompletionData(ns);
 			}
@@ -2409,7 +2850,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			if (method.Parameters.Count <= parameter) {
 				return;
 			}
-			var resolvedType = method.Parameters[parameter].Type;
+			var resolvedType = method.Parameters [parameter].Type;
 			if (resolvedType.Kind == TypeKind.Enum) {
 				if (addedEnums.Contains(resolvedType.ReflectionName)) {
 					return;
@@ -2421,30 +2862,30 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 
 			if (resolvedType.Kind == TypeKind.Delegate) {
 				if (addedDelegates.Contains(resolvedType.ReflectionName))
-				return;
+					return;
 				string parameterDefinition = AddDelegateHandlers(result, resolvedType, false);
-				string varName = "Handle" + method.Parameters[parameter].Type.Name + method.Parameters[parameter].Name;
+				string varName = "Handle" + method.Parameters [parameter].Type.Name + method.Parameters [parameter].Name;
 				result.Result.Add(factory.CreateEventCreationCompletionData(varName, resolvedType, null, parameterDefinition, currentMember, currentType));
 			}
 		}
-		
+
 		IEnumerable<ICompletionData> CreateParameterCompletion(MethodGroupResolveResult resolveResult, CSharpResolver state, AstNode invocation, SyntaxTree unit, int parameter, bool controlSpace)
 		{
 			var result = new CompletionDataWrapper(this);
 			var addedEnums = new HashSet<string>();
 			var addedDelegates = new HashSet<string>();
-			
+
 			foreach (var method in resolveResult.Methods) {
 				CreateParameterForInvocation(result, method, state, parameter, addedEnums, addedDelegates);
 			}
 			foreach (var methods in resolveResult.GetEligibleExtensionMethods (true)) {
 				foreach (var method in methods) {
-					if (resolveResult.Methods.Contains (method))
+					if (resolveResult.Methods.Contains(method))
 						continue;
-					CreateParameterForInvocation(result, new ReducedExtensionMethod (method), state, parameter, addedEnums, addedDelegates);
+					CreateParameterForInvocation(result, new ReducedExtensionMethod(method), state, parameter, addedEnums, addedDelegates);
 				}
 			}
-			
+
 			foreach (var method in resolveResult.Methods) {
 				if (parameter < method.Parameters.Count && method.Parameters [parameter].Type.Kind == TypeKind.Delegate) {
 					AutoSelect = false;
@@ -2454,7 +2895,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					result.AddNamedParameterVariable(p);
 				}
 			}
-			
+
 			if (!controlSpace) {
 				if (addedEnums.Count + addedDelegates.Count == 0) {
 					return Enumerable.Empty<ICompletionData>();
@@ -2463,7 +2904,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				AutoSelect = false;
 			}
 			AddContextCompletion(result, state, invocation);
-			
+
 			//			resolver.AddAccessibleCodeCompletionData (ExpressionContext.MethodBody, cdc);
 			//			if (addedDelegates.Count > 0) {
 			//				foreach (var data in result.Result) {
@@ -2483,22 +2924,22 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			if (type != null)
 				DefaultCompletionString = type.DisplayText;
 		}
-		
+
 		IEnumerable<ICompletionData> CreateCompletionData(TextLocation location, ResolveResult resolveResult, AstNode resolvedNode, CSharpResolver state, Func<IType, IType> typePred = null)
 		{
-			if (resolveResult == null /*|| resolveResult.IsError*/) {
+			if (resolveResult == null /*			|| resolveResult.IsError*/) {
 				return null;
 			}
-			
+
 			var lookup = new MemberLookup(
 				ctx.CurrentTypeDefinition,
 				Compilation.MainAssembly
-				);
+			);
 
 			if (resolveResult is NamespaceResolveResult) {
 				var nr = (NamespaceResolveResult)resolveResult;
 				var namespaceContents = new CompletionDataWrapper(this);
-				
+
 				foreach (var cl in nr.Namespace.Types) {
 					if (!lookup.IsAccessible(cl, false))
 						continue;
@@ -2506,7 +2947,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					if (addType != null)
 						namespaceContents.AddType(addType, false);
 				}
-				
+
 				foreach (var ns in nr.Namespace.ChildNamespaces) {
 					namespaceContents.AddNamespace(lookup, ns);
 				}
@@ -2518,9 +2959,9 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				return null;
 
 			if (resolvedNode.Parent is PointerReferenceExpression && (type is PointerType)) {
-				resolveResult = new OperatorResolveResult (((PointerType)type).ElementType, System.Linq.Expressions.ExpressionType.Extension, resolveResult);
+				resolveResult = new OperatorResolveResult(((PointerType)type).ElementType, System.Linq.Expressions.ExpressionType.Extension, resolveResult);
 			}
-			
+
 			//var typeDef = resolveResult.Type.GetDefinition();
 			var result = new CompletionDataWrapper(this);
 			bool includeStaticMembers = false;
@@ -2539,26 +2980,26 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				}
 				return result.Result;
 			}
-			
+
 			bool isProtectedAllowed = resolveResult is ThisResolveResult ? true : lookup.IsProtectedAccessAllowed(type);
 			bool skipNonStaticMembers = (resolveResult is TypeResolveResult);
-			
+
 			if (resolveResult is MemberResolveResult && resolvedNode is IdentifierExpression) {
 				var mrr = (MemberResolveResult)resolveResult;
 				includeStaticMembers = mrr.Member.Name == mrr.Type.Name;
-				
+
 				TypeResolveResult trr;
 				if (state.IsVariableReferenceWithSameType(
 					resolveResult,
 					((IdentifierExpression)resolvedNode).Identifier,
 					out trr
-					)) {
+				)) {
 					if (currentMember != null && mrr.Member.IsStatic ^ currentMember.IsStatic) {
 						skipNonStaticMembers = true;
-						
+
 						if (trr.Type.Kind == TypeKind.Enum) {
 							foreach (var field in trr.Type.GetFields ()) {
-								if (lookup.IsAccessible (field, false))
+								if (lookup.IsAccessible(field, false))
 									result.AddMember(field);
 							}
 							return result.Result;
@@ -2567,7 +3008,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				}
 				// ADD Aliases
 				var scope = ctx.CurrentUsingScope;
-				
+
 				for (var n = scope; n != null; n = n.Parent) {
 					foreach (var pair in n.UsingAliases) {
 						if (pair.Key == mrr.Member.Name) {
@@ -2581,23 +3022,23 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						}
 					}
 				}				
-				
-				
+
+
 			}
 			if (resolveResult is TypeResolveResult && (resolvedNode is IdentifierExpression || resolvedNode is MemberReferenceExpression)) {
 				includeStaticMembers = true;
 			}
-			
+
 			//			Console.WriteLine ("type:" + type +"/"+type.GetType ());
 			//			Console.WriteLine ("current:" + ctx.CurrentTypeDefinition);
 			//			Console.WriteLine ("IS PROT ALLOWED:" + isProtectedAllowed + " static: "+ includeStaticMembers);
 			//			Console.WriteLine (resolveResult);
 			//			Console.WriteLine ("node:" + resolvedNode);
 			//			Console.WriteLine (currentMember !=  null ? currentMember.IsStatic : "currentMember == null");
-			
+
 			if (resolvedNode.Annotation<ObjectCreateExpression>() == null) {
 				//tags the created expression as part of an object create expression.
-				/*
+				/*				
 				var filteredList = new List<IMember>();
 				foreach (var member in type.GetMembers ()) {
 					filteredList.Add(member);
@@ -2635,7 +3076,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					if (!memberIsStatic && skipNonStaticMembers) {
 						continue;
 					}
-					
+
 					if (member is IMethod && ((IMethod)member).FullName == "System.Object.Finalize") {
 						continue;
 					}
@@ -2644,7 +3085,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					}
 
 					if (member is IMember) {
-						result.AddMember ((IMember)member);
+						result.AddMember((IMember)member);
 					}
 				}
 			}
@@ -2654,11 +3095,11 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					foreach (var m in meths) {
 						if (!lookup.IsAccessible(m, isProtectedAllowed))
 							continue;
-						result.AddMember(new ReducedExtensionMethod (m));
+						result.AddMember(new ReducedExtensionMethod(m));
 					}
 				}
 			}
-			
+
 			//			IEnumerable<object> objects = resolveResult.CreateResolveResult (dom, resolver != null ? resolver.CallingMember : null);
 			//			CompletionDataCollector col = new CompletionDataCollector (this, dom, result, Document.CompilationUnit, resolver != null ? resolver.CallingType : null, location);
 			//			col.HideExtensionParameter = !resolveResult.StaticResolve;
@@ -2679,7 +3120,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			//					}
 			//				}
 			//			}
-			
+
 			return result.Result;
 		}
 
@@ -2693,24 +3134,25 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			if (s == null) {
 				return null;
 			}
-			
+
 			var offset = document.GetOffset(s.Expression.StartLocation);
 			var expr = GetExpressionAt(offset);
 			if (expr == null) {
 				return null;
 			}
-			
+
 			var resolveResult = ResolveExpression(expr);
-			if (resolveResult == null || resolveResult.Item1.Type.Kind != TypeKind.Enum) { 
+			if (resolveResult == null || resolveResult.Result.Type.Kind != TypeKind.Enum) { 
 				return null;
 			}
 			var wrapper = new CompletionDataWrapper(this);
-			AddEnumMembers(wrapper, resolveResult.Item1.Type, resolveResult.Item2);
+			AddEnumMembers(wrapper, resolveResult.Result.Type, resolveResult.Resolver);
 			AutoCompleteEmptyMatch = false;
 			return wrapper.Result;
 		}
-		
+
 		#region Parsing methods
+
 		ExpressionResult GetExpressionBeforeCursor()
 		{
 			SyntaxTree baseUnit;
@@ -2721,7 +3163,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					baseUnit = ParseStub("a;", false);
 					type = baseUnit.GetNodeAt<MemberType>(location);
 				}
-				
+
 				if (type == null) {
 					baseUnit = ParseStub("A a;", false);
 					type = baseUnit.GetNodeAt<MemberType>(location);
@@ -2730,15 +3172,15 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					return new ExpressionResult((AstNode)type.Target, baseUnit);
 				}
 			}
-			
-			baseUnit = ParseStub("a", false);
+
+			baseUnit = ParseStub("ToString()", false);
 			var curNode = baseUnit.GetNodeAt(location);
 			// hack for local variable declaration missing ';' issue - remove that if it works.
 			if (curNode is EntityDeclaration || baseUnit.GetNodeAt<Expression>(location) == null && baseUnit.GetNodeAt<MemberType>(location) == null) {
 				baseUnit = ParseStub("a");
 				curNode = baseUnit.GetNodeAt(location);
 			}
-			
+
 			// Hack for handle object initializer continuation expressions
 			if (curNode is EntityDeclaration || baseUnit.GetNodeAt<Expression>(location) == null && baseUnit.GetNodeAt<MemberType>(location) == null) {
 				baseUnit = ParseStub("a};");
@@ -2750,14 +3192,14 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				}
 				return null;
 			}
-			
+
 			//var memberLocation = currentMember != null ? currentMember.Region.Begin : currentType.Region.Begin;
 			if (mref == null) {
 				var type = baseUnit.GetNodeAt<MemberType>(location); 
 				if (type != null) {
 					return new ExpressionResult((AstNode)type.Target, baseUnit);
 				}
-				
+
 				var pref = baseUnit.GetNodeAt<PointerReferenceExpression>(location); 
 				if (pref != null) {
 					return new ExpressionResult((AstNode)pref.Target, baseUnit);
@@ -2789,29 +3231,29 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						} else {
 							tref = baseUnit.GetNodeAt<Expression>(location); 
 							if (tref == null) {
-								tref = new TypeReferenceExpression(memberType.Clone());
+								tref = memberType.Clone();
 								memberType.Parent.AddChild(tref, Roles.Expression);
 							}
 							if (tref is ObjectCreateExpression) {
-								expr = new TypeReferenceExpression(memberType.Target.Clone());
+								expr = memberType.Target.Clone();
 								expr.AddAnnotation(new ObjectCreateExpression());
 							}
 						}
 					}
 				}
-				
+
 				if (memberType == null) {
 					return null;
 				}
 				if (expr == null) {
-					expr = new TypeReferenceExpression(memberType.Target.Clone());
+					expr = memberType.Target.Clone();
 				}
 				tref.ReplaceWith(expr);
 			}
-		exit:
-				return new ExpressionResult((AstNode)expr, baseUnit);
+			exit:
+			return new ExpressionResult((AstNode)expr, baseUnit);
 		}
-		
+
 		ExpressionResult GetExpressionAtCursor()
 		{
 			//			TextLocation memberLocation;
@@ -2827,8 +3269,8 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			AstNode expr = baseUnit.GetNodeAt(
 				location,
 				n => n is IdentifierExpression || n is MemberReferenceExpression
-				);
-			
+			);
+
 			if (expr == null) {
 				expr = baseUnit.GetNodeAt<AstType>(location.Line, location.Column - 1);
 			}
@@ -2838,61 +3280,61 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			if (expr == null && baseUnit.GetNodeAt<EmptyStatement>(
 				location.Line,
 				location.Column
-				) != null) {
+			) != null) {
 				tmpUnit = baseUnit = ParseStub("a();", false);
 				expr = baseUnit.GetNodeAt<InvocationExpression>(
 					location.Line,
 					location.Column + 1
-					); 
+				); 
 			}
-			
+
 			if (expr == null) {
 				baseUnit = ParseStub("()");
 				expr = baseUnit.GetNodeAt<IdentifierExpression>(
 					location.Line,
 					location.Column - 1
-					); 
+				); 
 				if (expr == null) {
 					expr = baseUnit.GetNodeAt<MemberType>(location.Line, location.Column - 1); 
 				}
 			}
-			
+
 			if (expr == null) {
 				baseUnit = ParseStub("a", false);
 				expr = baseUnit.GetNodeAt(
 					location,
 					n => n is IdentifierExpression || n is MemberReferenceExpression || n is CatchClause
-					);
+				);
 			}
-			
+
 			// try statement 
 			if (expr == null) {
 				expr = tmpUnit.GetNodeAt<SwitchStatement>(
 					location.Line,
 					location.Column - 1
-					); 
+				); 
 				baseUnit = tmpUnit;
 			}
-			
+
 			if (expr == null) {
 				var block = tmpUnit.GetNodeAt<BlockStatement>(location); 
 				var node = block != null ? block.Statements.LastOrDefault() : null;
-				
+
 				var forStmt = node != null ? node.PrevSibling as ForStatement : null;
 				if (forStmt != null && forStmt.EmbeddedStatement.IsNull) {
 					expr = forStmt;
 					var id = new IdentifierExpression("stub");
-					forStmt.EmbeddedStatement = new BlockStatement() { Statements = { new ExpressionStatement (id) }};
+					forStmt.EmbeddedStatement = new BlockStatement() { Statements = { new ExpressionStatement(id) } };
 					expr = id;
 					baseUnit = tmpUnit;
 				}
 			}
-			
+
 			if (expr == null) {
 				var forStmt = tmpUnit.GetNodeAt<ForeachStatement>(
 					location.Line,
 					location.Column - 3
-					); 
+				); 
 				if (forStmt != null && forStmt.EmbeddedStatement.IsNull) {
 					forStmt.VariableNameToken = Identifier.Create("stub");
 					expr = forStmt.VariableNameToken;
@@ -2903,35 +3345,35 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				expr = tmpUnit.GetNodeAt<VariableInitializer>(
 					location.Line,
 					location.Column - 1
-					);
+				);
 				baseUnit = tmpUnit;
 			}
-			
+
 			// try parameter declaration type
 			if (expr == null) {
 				baseUnit = ParseStub(">", false, "{}");
 				expr = baseUnit.GetNodeAt<TypeParameterDeclaration>(
 					location.Line,
 					location.Column - 1
-					); 
+				); 
 			}
-			
+
 			// try parameter declaration method
 			if (expr == null) {
 				baseUnit = ParseStub("> ()", false, "{}");
 				expr = baseUnit.GetNodeAt<TypeParameterDeclaration>(
 					location.Line,
 					location.Column - 1
-					); 
+				); 
 			}
-			
+
 			// try expression in anonymous type "new { sample = x$" case
 			if (expr == null) {
 				baseUnit = ParseStub("a", false);
 				expr = baseUnit.GetNodeAt<AnonymousTypeCreateExpression>(
 					location.Line,
 					location.Column
-					); 
+				); 
 				if (expr != null) {
 					expr = baseUnit.GetNodeAt<Expression>(location.Line, location.Column) ?? expr;
 				} 
@@ -2939,53 +3381,51 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					expr = baseUnit.GetNodeAt<AstType>(location.Line, location.Column);
 				} 
 			}
-			
+
 			if (expr == null) {
 				return null;
 			}
 			return new ExpressionResult(expr, baseUnit);
 		}
-		
+
 		ExpressionResult GetExpressionAt(int offset)
 		{
 			var parser = new CSharpParser();
-			string text = this.document.GetText(0, this.offset); 
-			var sb = new StringBuilder(text);
-			sb.Append("a;");
-			AppendMissingClosingBrackets(sb, text, false);
+			var text = GetMemberTextToCaret(); 
+
+			int closingBrackets = 0, generatedLines = 0;
+			var sb = CreateWrapper("a;", false, "", text.Item1, text.Item2, ref closingBrackets, ref generatedLines);
+
 			var completionUnit = parser.Parse(sb.ToString());
-			var loc = document.GetLocation(offset);
-			
+			var offsetLocation = document.GetLocation(offset);
+			var loc = new TextLocation(offsetLocation.Line - text.Item2.Line + generatedLines + 1, offsetLocation.Column);
+
 			var expr = completionUnit.GetNodeAt(
 				loc,
 				n => n is Expression || n is VariableDeclarationStatement
-				);
-			if (expr == null) {
+			);
+			if (expr == null)
 				return null;
-			}
 			return new ExpressionResult(expr, completionUnit);
 		}
-		
+
 		ExpressionResult GetNewExpressionAt(int offset)
 		{
 			var parser = new CSharpParser();
-			string text = this.document.GetText(0, this.offset); 
-			var sb = new StringBuilder(text);
-			sb.Append("a ();");
-			AppendMissingClosingBrackets(sb, text, false);
-			
+			var text = GetMemberTextToCaret();
+			int closingBrackets = 0, generatedLines = 0;
+			var sb = CreateWrapper("a ();", false, "", text.Item1, text.Item2, ref closingBrackets, ref generatedLines);
+
 			var completionUnit = parser.Parse(sb.ToString());
-			var loc = document.GetLocation(offset);
-			
+			var offsetLocation = document.GetLocation(offset);
+			var loc = new TextLocation(offsetLocation.Line - text.Item2.Line + generatedLines + 1, offsetLocation.Column);
+
 			var expr = completionUnit.GetNodeAt(loc, n => n is Expression);
 			if (expr == null) {
 				// try without ";"
-				sb = new StringBuilder(text);
-				sb.Append("a ()");
-				AppendMissingClosingBrackets(sb, text, false);
+				sb = CreateWrapper("a ()", false, "", text.Item1, text.Item2, ref closingBrackets, ref generatedLines);
 				completionUnit = parser.Parse(sb.ToString());
-				loc = document.GetLocation(offset);
-				
+
 				expr = completionUnit.GetNodeAt(loc, n => n is Expression);
 				if (expr == null) {
 					return null;
@@ -2993,48 +3433,48 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 			return new ExpressionResult(expr, completionUnit);
 		}
-		
-		
+
 		#endregion
-		
+
 		#region Helper methods
+
 		string GetPreviousToken(ref int i, bool allowLineChange)
 		{
 			char c;
 			if (i <= 0) {
 				return null;
 			}
-			
+
 			do {
 				c = document.GetCharAt(--i);
-			} while (i > 0 && char.IsWhiteSpace (c) && (allowLineChange ? true : c != '\n'));
-			
+			} while (i > 0 && char.IsWhiteSpace(c) && (allowLineChange ? true : c != '\n'));
+
 			if (i == 0) {
 				return null;
 			}
-			
+
 			if (!char.IsLetterOrDigit(c)) {
 				return new string(c, 1);
 			}
-			
+
 			int endOffset = i + 1;
-			
+
 			do {
 				c = document.GetCharAt(i - 1);
 				if (!(char.IsLetterOrDigit(c) || c == '_')) {
 					break;
 				}
-				
+
 				i--;
 			} while (i > 0);
-			
+
 			return document.GetText(i, endOffset - i);
 		}
-		
+
 		#endregion
-		
+
 		#region Preprocessor
-		
+
 		IEnumerable<ICompletionData> GetDirectiveCompletionData()
 		{
 			yield return factory.CreateLiteralCompletionData("if");
@@ -3052,9 +3492,11 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			yield return factory.CreateLiteralCompletionData("region");
 			yield return factory.CreateLiteralCompletionData("endregion");
 		}
+
 		#endregion
-		
+
 		#region Xml Comments
+
 		static readonly List<string> commentTags = new List<string>(new string[] {
 			"c",
 			"code",
@@ -3084,13 +3526,13 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				return commentTags;
 			}
 		}
-		
+
 		string GetLastClosingXmlCommentTag()
 		{
 			var line = document.GetLineByNumber(location.Line);
-			
-		restart:
-				string lineText = document.GetText(line);
+
+			restart:
+			string lineText = document.GetText(line);
 			if (!lineText.Trim().StartsWith("///", StringComparison.Ordinal))
 				return null;
 			int startIndex = Math.Min(location.Column - 1, lineText.Length - 1) - 1;
@@ -3106,10 +3548,10 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				line = line.PreviousLine;
 				goto restart;
 			}
-			
+
 			if (startIndex >= 0) {
 				int endIndex = startIndex;
-				while (endIndex + 1 < lineText.Length && lineText [endIndex] != '>' && !char.IsWhiteSpace (lineText [endIndex])) {
+				while (endIndex + 1 < lineText.Length && lineText [endIndex] != '>' && !char.IsWhiteSpace(lineText [endIndex])) {
 					endIndex++;
 				}
 				string tag = endIndex - startIndex - 1 > 0 ? lineText.Substring(
@@ -3122,122 +3564,124 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 			return null;
 		}
-		
+
 		IEnumerable<ICompletionData> GetXmlDocumentationCompletionData()
 		{
 			var closingTag = GetLastClosingXmlCommentTag();
 			if (closingTag != null) {
 				yield return factory.CreateLiteralCompletionData(
 					"/" + closingTag + ">"
-					);
+				);
 			}
-			
-			yield return factory.CreateLiteralCompletionData(
+
+			yield return factory.CreateXmlDocCompletionData(
 				"c",
 				"Set text in a code-like font"
-				);
-			yield return factory.CreateLiteralCompletionData(
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"code",
 				"Set one or more lines of source code or program output"
-				);
-			yield return factory.CreateLiteralCompletionData(
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"example",
 				"Indicate an example"
-				);
-			yield return factory.CreateLiteralCompletionData(
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"exception",
 				"Identifies the exceptions a method can throw",
-				"exception cref=\"|\"></exception>"
-				);
-			yield return factory.CreateLiteralCompletionData(
+				"exception cref=\"|\"></exception"
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"include",
 				"Includes comments from a external file",
-				"include file=\"|\" path=\"\">"
-				);
-			yield return factory.CreateLiteralCompletionData(
+				"include file=\"|\" path=\"\""
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"inheritdoc",
 				"Inherit documentation from a base class or interface",
 				"inheritdoc/"
-				);
-			yield return factory.CreateLiteralCompletionData(
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"list",
 				"Create a list or table",
-				"list type=\"|\">"
-				);
-			yield return factory.CreateLiteralCompletionData(
+				"list type=\"|\""
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"listheader",
 				"Define the heading row"
-				);
-			yield return factory.CreateLiteralCompletionData(
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"item",
 				"Defines list or table item"
-				);
-			
-			yield return factory.CreateLiteralCompletionData("term", "A term to define");
-			yield return factory.CreateLiteralCompletionData(
+			);
+
+			yield return factory.CreateXmlDocCompletionData("term", "A term to define");
+			yield return factory.CreateXmlDocCompletionData(
 				"description",
 				"Describes a list item"
-				);
-			yield return factory.CreateLiteralCompletionData(
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"para",
 				"Permit structure to be added to text"
-				);
-			
-			yield return factory.CreateLiteralCompletionData(
+			);
+
+			yield return factory.CreateXmlDocCompletionData(
 				"param",
 				"Describe a parameter for a method or constructor",
-				"param name=\"|\">"
-				);
-			yield return factory.CreateLiteralCompletionData(
+				"param name=\"|\""
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"paramref",
 				"Identify that a word is a parameter name",
-				"paramref name=\"|\"/>"
-				);
-			
-			yield return factory.CreateLiteralCompletionData(
+				"paramref name=\"|\"/"
+			);
+
+			yield return factory.CreateXmlDocCompletionData(
 				"permission",
 				"Document the security accessibility of a member",
 				"permission cref=\"|\""
-				);
-			yield return factory.CreateLiteralCompletionData(
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"remarks",
 				"Describe a type"
-				);
-			yield return factory.CreateLiteralCompletionData(
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"returns",
 				"Describe the return value of a method"
-				);
-			yield return factory.CreateLiteralCompletionData(
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"see",
 				"Specify a link",
-				"see cref=\"|\"/>"
-				);
-			yield return factory.CreateLiteralCompletionData(
+				"see cref=\"|\"/"
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"seealso",
 				"Generate a See Also entry",
-				"seealso cref=\"|\"/>"
-				);
-			yield return factory.CreateLiteralCompletionData(
+				"seealso cref=\"|\"/"
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"summary",
 				"Describe a member of a type"
-				);
-			yield return factory.CreateLiteralCompletionData(
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"typeparam",
 				"Describe a type parameter for a generic type or method"
-				);
-			yield return factory.CreateLiteralCompletionData(
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"typeparamref",
 				"Identify that a word is a type parameter name"
-				);
-			yield return factory.CreateLiteralCompletionData(
+			);
+			yield return factory.CreateXmlDocCompletionData(
 				"value",
 				"Describe a property"
-				);
-			
+			);
+
 		}
+
 		#endregion
-		
+
 		#region Keywords
+
 		static string[] expressionLevelKeywords = new string [] {
 			"as",
 			"is",
@@ -3285,7 +3729,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			"public", "internal", "protected", "private", "async",
 			"class", "interface", "struct", "enum", "delegate",
 			"abstract", "sealed", "static", "unsafe", "partial",
-			"const", "event", "extern", "fixed","new", 
+			"const", "event", "extern", "fixed", "new", 
 			"operator", "explicit", "implicit", 
 			"override", "readonly", "virtual", "volatile"
 		};
@@ -3310,7 +3754,9 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			"ref",
 			"params"
 		};
+
 		#endregion
+
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs
index 34542683bd..14a8dfdb42 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs
@@ -185,6 +185,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				}
 				if (!char.IsWhiteSpace(ch) && parameter.Count > 0)
 					foundCharAfterOpenBracket = true;
+
 				switch (ch) {
 					case '{':
 						if (inString || inChar || inVerbatimString || inSingleComment || inMultiLineComment) {
@@ -279,12 +280,6 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 							inVerbatimString = true;
 						}
 						break;
-					case '\n':
-					case '\r':
-						inSingleComment = false;
-						inString = false;
-						inChar = false;
-						break;
 					case '\\':
 						if (inString || inChar) {
 							i++;
@@ -310,6 +305,13 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						}
 						inChar = !inChar;
 						break;
+					default:
+						if (NewLine.IsNewLine(ch)) {
+							inSingleComment = false;
+							inString = false;
+							inChar = false;
+						}
+						break;
 				}
 			}
 			if (parameter.Count != 1 || bracketStack.Count > 0) {
@@ -354,7 +356,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 								IsInPreprocessorDirective = true;
 							break; 
 						case '/':
-							if (IsInString || IsInChar || IsInVerbatimString || IsInSingleComment)
+							if (IsInString || IsInChar || IsInVerbatimString || IsInSingleComment || IsInMultiLineComment)
 								break;
 							if (nextCh == '/') {
 								i++;
@@ -442,11 +444,11 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			lexer.Parse();
 			return
 				lexer.IsInSingleComment || 
-				lexer.IsInString ||
-				lexer.IsInVerbatimString ||
-				lexer.IsInChar ||
-				lexer.IsInMultiLineComment || 
-				lexer.IsInPreprocessorDirective;
+					lexer.IsInString ||
+					lexer.IsInVerbatimString ||
+					lexer.IsInChar ||
+					lexer.IsInMultiLineComment || 
+					lexer.IsInPreprocessorDirective;
 		}
 
 		protected bool IsInsideDocComment ()
@@ -603,12 +605,6 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						inVerbatimString = true;
 					}
 					break;
-				case '\n':
-				case '\r':
-					inSingleComment = false;
-					inString = false;
-					inChar = false;
-					break;
 				case '\\':
 					if (inString || inChar)
 						i++;
@@ -632,15 +628,21 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					inChar = !inChar;
 					break;
 				default :
+					if (NewLine.IsNewLine(ch)) {
+						inSingleComment = false;
+						inString = false;
+						inChar = false;
+					}
 					break;
 				}
 			}
 			return bracketStack;
 		}
 		
-		public static void AppendMissingClosingBrackets (StringBuilder wrapper, string memberText, bool appendSemicolon)
+		public static void AppendMissingClosingBrackets (StringBuilder wrapper, bool appendSemicolon)
 		{
-			var bracketStack = GetBracketStack (memberText);
+			var memberText = wrapper.ToString();
+			var bracketStack = GetBracketStack(memberText);
 			bool didAppendSemicolon = !appendSemicolon;
 			//char lastBracket = '\0';
 			while (bracketStack.Count > 0) {
@@ -692,17 +694,8 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				wrapper.Append (';');
 		}
 
-		protected SyntaxTree ParseStub(string continuation, bool appendSemicolon = true, string afterContinuation = null)
+		protected StringBuilder CreateWrapper(string continuation, bool appendSemicolon, string afterContinuation, string memberText, TextLocation memberLocation, ref int closingBrackets, ref int generatedLines)
 		{
-			var mt = GetMemberTextToCaret();
-			if (mt == null) {
-				return null;
-			}
-
-			string memberText = mt.Item1;
-			var memberLocation = mt.Item2;
-			int closingBrackets = 1;
-			int generatedLines = 0;
 			var wrapper = new StringBuilder();
 			bool wrapInClass = memberLocation != new TextLocation(1, 1);
 			if (wrapInClass) {
@@ -713,11 +706,26 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 			wrapper.Append(memberText);
 			wrapper.Append(continuation);
-			AppendMissingClosingBrackets(wrapper, memberText, appendSemicolon);
+			AppendMissingClosingBrackets(wrapper, appendSemicolon);
 			wrapper.Append(afterContinuation);
-			if (closingBrackets > 0) { 
+			if (closingBrackets > 0) {
 				wrapper.Append(new string('}', closingBrackets));
 			}
+			return wrapper;
+		}
+
+		protected SyntaxTree ParseStub(string continuation, bool appendSemicolon = true, string afterContinuation = null)
+		{
+			var mt = GetMemberTextToCaret();
+			if (mt == null) {
+				return null;
+			}
+
+			string memberText = mt.Item1;
+			var memberLocation = mt.Item2;
+			int closingBrackets = 1;
+			int generatedLines = 0;
+			var wrapper = CreateWrapper(continuation, appendSemicolon, afterContinuation, memberText, memberLocation, ref closingBrackets, ref generatedLines);
 			var parser = new CSharpParser ();
 			foreach (var sym in CompletionContextProvider.ConditionalSymbols)
 				parser.CompilerSettings.ConditionalSymbols.Add (sym);
@@ -726,18 +734,19 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			return result;
 		}
 		
-//		string cachedText = null;
-		
 		protected virtual void Reset ()
 		{
-//			cachedText = null;
+			memberText = null;
 		}
-		
+
+		Tuple<string, TextLocation> memberText;
 		protected Tuple<string, TextLocation> GetMemberTextToCaret()
 		{
-			return CompletionContextProvider.GetMemberTextToCaret(offset, currentType, currentMember);
+			if (memberText == null)
+				memberText = CompletionContextProvider.GetMemberTextToCaret(offset, currentType, currentMember);
+			return memberText;
 		}
-		
+
 		protected ExpressionResult GetInvocationBeforeCursor(bool afterBracket)
 		{
 			SyntaxTree baseUnit;
@@ -810,12 +819,26 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 		}
 		
-		protected Tuple<ResolveResult, CSharpResolver> ResolveExpression (ExpressionResult tuple)
+		protected ExpressionResolveResult ResolveExpression (ExpressionResult tuple)
 		{
 			return ResolveExpression (tuple.Node);
 		}
 
-		protected Tuple<ResolveResult, CSharpResolver> ResolveExpression(AstNode expr)
+		protected class ExpressionResolveResult
+		{
+			public ResolveResult Result { get; set; }
+			public CSharpResolver Resolver { get; set; }
+			public CSharpAstResolver AstResolver { get; set; }
+
+			public ExpressionResolveResult(ResolveResult item1, CSharpResolver item2, CSharpAstResolver item3)
+			{
+				this.Result = item1;
+				this.Resolver = item2;
+				this.AstResolver = item3;
+			}
+		}
+
+		protected ExpressionResolveResult ResolveExpression(AstNode expr)
 		{
 			if (expr == null) {
 				return null;
@@ -833,12 +856,29 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				if (root == null) {
 					return null;
 				}
-				if (root is Accessor)
-					root = root.Parent;
-				var csResolver = CompletionContextProvider.GetResolver (GetState(), root);
+				var curState = GetState();
+				// current member needs to be in the setter because of the 'value' parameter
+				if (root is Accessor) {
+					var prop = curState.CurrentMember as IProperty;
+					if (prop != null && prop.CanSet && (root.Role == IndexerDeclaration.SetterRole || root.Role == PropertyDeclaration.SetterRole))
+					    curState = curState.WithCurrentMember(prop.Setter);
+				}
+
+				// Rood should be the 'body' - otherwise the state -> current member isn't correct.
+				var body = root.Children.FirstOrDefault(r => r.Role == Roles.Body);
+				if (body != null && body.Contains(expr.StartLocation))
+					root = body;
+
+				var csResolver = CompletionContextProvider.GetResolver (curState, root);
 				var result = csResolver.Resolve(resolveNode);
 				var state = csResolver.GetResolverStateBefore(resolveNode);
-				return Tuple.Create(result, state);
+				if (state.CurrentMember == null)
+					state = state.WithCurrentMember(curState.CurrentMember);
+				if (state.CurrentTypeDefinition == null)
+					state = state.WithCurrentTypeDefinition(curState.CurrentTypeDefinition);
+				if (state.CurrentUsingScope == null)
+					state = state.WithCurrentUsingScope(curState.CurrentUsingScope);
+				return new ExpressionResolveResult(result, state, csResolver);
 			} catch (Exception e) {
 				Console.WriteLine(e);
 				return null;
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/CSharpParameterCompletionEngine.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/CSharpParameterCompletionEngine.cs
index b986805171..b86c9bb489 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/CSharpParameterCompletionEngine.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/CSharpParameterCompletionEngine.cs
@@ -216,23 +216,23 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					}
 					if (invoke.Node is ObjectCreateExpression) {
 						var createType = ResolveExpression(((ObjectCreateExpression)invoke.Node).Type);
-						if (createType.Item1.Type.Kind == TypeKind.Unknown)
+						if (createType.Result.Type.Kind == TypeKind.Unknown)
 							return null;
-						return factory.CreateConstructorProvider(document.GetOffset(invoke.Node.StartLocation), createType.Item1.Type);
+						return factory.CreateConstructorProvider(document.GetOffset(invoke.Node.StartLocation), createType.Result.Type);
 					}
 					
 					if (invoke.Node is ICSharpCode.NRefactory.CSharp.Attribute) {
 						var attribute = ResolveExpression(invoke);
-						if (attribute == null || attribute.Item1 == null) {
+						if (attribute == null || attribute.Result == null) {
 							return null;
 						}
-						return factory.CreateConstructorProvider(document.GetOffset(invoke.Node.StartLocation), attribute.Item1.Type);
+						return factory.CreateConstructorProvider(document.GetOffset(invoke.Node.StartLocation), attribute.Result.Type);
 					}
 					var invocationExpression = ResolveExpression(invoke);
-					if (invocationExpression == null || invocationExpression.Item1 == null || invocationExpression.Item1.IsError) {
+					if (invocationExpression == null || invocationExpression.Result == null || invocationExpression.Result.IsError) {
 						return null;
 					}
-					resolveResult = invocationExpression.Item1;
+					resolveResult = invocationExpression.Result;
 					if (resolveResult is MethodGroupResolveResult) {
 						return factory.CreateMethodDataProvider(document.GetOffset(invoke.Node.StartLocation), CollectMethods(invoke.Node, resolveResult as MethodGroupResolveResult));
 					}
@@ -267,11 +267,11 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 							if (GetCurrentParameterIndex(document.GetOffset(invoke.Node.StartLocation), offset) < 0)
 								return null;
 							var typeExpression = ResolveExpression(invoke);
-							if (typeExpression == null || typeExpression.Item1 == null || typeExpression.Item1.IsError) {
+							if (typeExpression == null || typeExpression.Result == null || typeExpression.Result.IsError) {
 								return null;
 							}
 							
-							return factory.CreateTypeParameterDataProvider(document.GetOffset(invoke.Node.StartLocation), CollectAllTypes(typeExpression.Item1.Type));
+							return factory.CreateTypeParameterDataProvider(document.GetOffset(invoke.Node.StartLocation), CollectAllTypes(typeExpression.Result.Type));
 						}
 						return null;
 					}
@@ -281,24 +281,24 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						return null;
 					if (invoke.Node is ObjectCreateExpression) {
 						var createType = ResolveExpression(((ObjectCreateExpression)invoke.Node).Type);
-						return factory.CreateConstructorProvider(document.GetOffset(invoke.Node.StartLocation), createType.Item1.Type);
+						return factory.CreateConstructorProvider(document.GetOffset(invoke.Node.StartLocation), createType.Result.Type);
 					}
 					
 					if (invoke.Node is ICSharpCode.NRefactory.CSharp.Attribute) {
 						var attribute = ResolveExpression(invoke);
-						if (attribute == null || attribute.Item1 == null) {
+						if (attribute == null || attribute.Result == null) {
 							return null;
 						}
-						return factory.CreateConstructorProvider(document.GetOffset(invoke.Node.StartLocation), attribute.Item1.Type);
+						return factory.CreateConstructorProvider(document.GetOffset(invoke.Node.StartLocation), attribute.Result.Type);
 					}
 					
 					invocationExpression = ResolveExpression(invoke);
 					
-					if (invocationExpression == null || invocationExpression.Item1 == null || invocationExpression.Item1.IsError) {
+					if (invocationExpression == null || invocationExpression.Result == null || invocationExpression.Result.IsError) {
 						return null;
 					}
 					
-					resolveResult = invocationExpression.Item1;
+					resolveResult = invocationExpression.Result;
 					if (resolveResult is MethodGroupResolveResult) {
 						return factory.CreateMethodDataProvider(document.GetOffset(invoke.Node.StartLocation), CollectMethods(invoke.Node, resolveResult as MethodGroupResolveResult));
 					}
@@ -319,8 +319,8 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					invoke = GetMethodTypeArgumentInvocationBeforeCursor();
 					if (invoke != null) {
 						var tExpr2 = ResolveExpression(invoke);
-						if (tExpr2 != null && tExpr2.Item1 is MethodGroupResolveResult && !tExpr2.Item1.IsError) {
-							return factory.CreateTypeParameterDataProvider(document.GetOffset(invoke.Node.StartLocation), CollectMethods(invoke.Node, tExpr2.Item1 as MethodGroupResolveResult));
+						if (tExpr2 != null && tExpr2.Result is MethodGroupResolveResult && !tExpr2.Result.IsError) {
+							return factory.CreateTypeParameterDataProvider(document.GetOffset(invoke.Node.StartLocation), CollectMethods(invoke.Node, tExpr2.Result as MethodGroupResolveResult));
 						}
 					}
 					invoke = GetTypeBeforeCursor();
@@ -328,11 +328,11 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						return null;
 					}
 					var tExpr = ResolveExpression(invoke);
-					if (tExpr == null || tExpr.Item1 == null || tExpr.Item1.IsError) {
+					if (tExpr == null || tExpr.Result == null || tExpr.Result.IsError) {
 						return null;
 					}
 
-					return factory.CreateTypeParameterDataProvider(document.GetOffset(invoke.Node.StartLocation), CollectAllTypes(tExpr.Item1.Type));
+					return factory.CreateTypeParameterDataProvider(document.GetOffset(invoke.Node.StartLocation), CollectAllTypes(tExpr.Result.Type));
 				case '[':
 					invoke = GetIndexerBeforeCursor();
 					if (invoke == null) {
@@ -342,10 +342,10 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						return null;
 					}
 					var indexerExpression = ResolveExpression(invoke);
-					if (indexerExpression == null || indexerExpression.Item1 == null || indexerExpression.Item1.IsError) {
+					if (indexerExpression == null || indexerExpression.Result == null || indexerExpression.Result.IsError) {
 						return null;
 					}
-					return factory.CreateIndexerParameterDataProvider(document.GetOffset(invoke.Node.StartLocation), indexerExpression.Item1.Type, GetAccessibleIndexers (indexerExpression.Item1.Type), invoke.Node);
+					return factory.CreateIndexerParameterDataProvider(document.GetOffset(invoke.Node.StartLocation), indexerExpression.Result.Type, GetAccessibleIndexers (indexerExpression.Result.Type), invoke.Node);
 			}
 			return null;
 		}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/CompletionDataWrapper.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/CompletionDataWrapper.cs
index 24e18d8181..39cbba279f 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/CompletionDataWrapper.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/CompletionDataWrapper.cs
@@ -32,7 +32,7 @@ using ICSharpCode.NRefactory.CSharp.Resolver;
 
 namespace ICSharpCode.NRefactory.CSharp.Completion
 {
-	class CompletionDataWrapper
+	public class CompletionDataWrapper
 	{
 		CSharpCompletionEngine completion;
 		List<ICompletionData> result = new List<ICompletionData> ();
@@ -48,6 +48,11 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				return completion.factory;
 			}
 		}
+
+		internal bool AnonymousDelegateAdded {
+			get;
+			set;
+		}
 		
 		public CompletionDataWrapper (CSharpCompletionEngine completion)
 		{
@@ -96,7 +101,18 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 
 		Dictionary<string, ICompletionData> typeDisplayText = new Dictionary<string, ICompletionData> ();
 		Dictionary<IType, ICompletionData> addedTypes = new Dictionary<IType, ICompletionData> ();
+
+		public ICompletionData AddConstructors(IType type, bool showFullName, bool isInAttributeContext = false)
+		{
+			return InternalAddType(type, showFullName, isInAttributeContext, true);
+		}
+
 		public ICompletionData AddType(IType type, bool showFullName, bool isInAttributeContext = false)
+		{
+			return InternalAddType(type, showFullName, isInAttributeContext, false);
+		}
+
+		ICompletionData InternalAddType(IType type, bool showFullName, bool isInAttributeContext, bool addConstrurs)
 		{
 			if (type == null)
 				throw new ArgumentNullException("type");
@@ -104,12 +120,27 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				return null;
 			if (addedTypes.ContainsKey (type))
 				return addedTypes[type];
-
+			usedNamespaces.Add(type.Name);
 			var def = type.GetDefinition();
-			if (def != null && def.ParentAssembly != completion.ctx.CurrentAssembly && !def.IsBrowsable())
-				return null;
+			if (def != null && def.ParentAssembly != completion.ctx.CurrentAssembly) {
+				switch (completion.EditorBrowsableBehavior) {
+					case EditorBrowsableBehavior.Ignore:
+						break;
+					case EditorBrowsableBehavior.Normal:
+						var state = def.GetEditorBrowsableState();
+						if (state != System.ComponentModel.EditorBrowsableState.Always)
+							return null;
+						break;
+					case EditorBrowsableBehavior.IncludeAdvanced:
+						if (!def.IsBrowsable())
+							return null;
+						break;
+					default:
+						throw new ArgumentOutOfRangeException();
+				}
+			}
 			ICompletionData usedType;
-			var data = Factory.CreateTypeCompletionData(type, showFullName, isInAttributeContext);
+			var data = Factory.CreateTypeCompletionData(type, showFullName, isInAttributeContext, addConstrurs);
 			var text = data.DisplayText;
 			if (typeDisplayText.TryGetValue(text, out usedType)) {
 				usedType.AddOverload(data);
@@ -155,20 +186,38 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			result.Add (Factory.CreateVariableCompletionData (variable));
 		}
 
+		public void AddTypeImport(ITypeDefinition type, bool useFullName, bool addForTypeCreation)
+		{
+			result.Add(Factory.CreateImportCompletionData(type, useFullName, addForTypeCreation));
+		}
+
 		public ICompletionData AddMember (IMember member)
 		{
 			var newData = Factory.CreateEntityCompletionData (member);
 			
-			if (member.ParentAssembly != completion.ctx.CurrentAssembly && !member.IsBrowsable ())
-				return null;
-
+			if (member.ParentAssembly != completion.ctx.CurrentAssembly) {
+				switch (completion.EditorBrowsableBehavior) {
+					case EditorBrowsableBehavior.Ignore:
+						break;
+					case EditorBrowsableBehavior.Normal:
+						var state = member.GetEditorBrowsableState();
+						if (state != System.ComponentModel.EditorBrowsableState.Always)
+							return null;
+						break;
+					case EditorBrowsableBehavior.IncludeAdvanced:
+						if (!member.IsBrowsable())
+							return null;
+						break;
+					default:
+						throw new ArgumentOutOfRangeException();
+				}
+			}
 			string memberKey = newData.DisplayText;
 			if (memberKey == null)
 				return null;
 
-			if (member is IMember) {
-				newData.CompletionCategory = GetCompletionCategory (member.DeclaringTypeDefinition);
-			}
+			newData.CompletionCategory = GetCompletionCategory (member.DeclaringTypeDefinition);
+
 			List<ICompletionData> existingData;
 			data.TryGetValue (memberKey, out existingData);
 			if (existingData != null) {
@@ -260,6 +309,17 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 			return result;
 		}
+		HashSet<string> anonymousSignatures = new HashSet<string> ();
+
+		public bool HasAnonymousDelegateAdded(string signature)
+		{
+			return anonymousSignatures.Contains(signature); 
+		}
+
+		public void AddAnonymousDelegateAdded(string signature)
+		{
+			anonymousSignatures.Add(signature); 
+		}
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/ICompletionContextProvider.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/ICompletionContextProvider.cs
index c590007fbe..ed70580e66 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/ICompletionContextProvider.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/ICompletionContextProvider.cs
@@ -149,10 +149,6 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						if (bracketStack.Count > 0)
 							bracketStack.Pop ();
 						break;
-					case '\r':
-					case '\n':
-						isInLineComment = false;
-						break;
 					case '/':
 						if (isInBlockComment) {
 							if (i > 0 && document.GetCharAt (i - 1) == '*') 
@@ -173,7 +169,10 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						if (!(isInString || isInLineComment || isInBlockComment)) 
 							isInChar = !isInChar;
 						break;
-					default :
+					default :			
+						if (NewLine.IsNewLine(ch)) {
+							isInLineComment = false;
+						}
 						break;
 					}
 				}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/ICompletionDataFactory.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/ICompletionDataFactory.cs
index 30de549c82..10d7a04d10 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/ICompletionDataFactory.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/ICompletionDataFactory.cs
@@ -35,7 +35,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 		ICompletionData CreateEntityCompletionData (IEntity entity);
 		ICompletionData CreateEntityCompletionData (IEntity entity, string text);
 		
-		ICompletionData CreateTypeCompletionData (IType type, bool showFullName, bool isInAttributeContext);
+		ICompletionData CreateTypeCompletionData (IType type, bool showFullName, bool isInAttributeContext, bool addForTypeCreation);
 
 		/// <summary>
 		/// Creates the member completion data. 
@@ -78,6 +78,12 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 		/// </summary>
 		/// <param name="type">The type to import</param>
 		/// <param name="useFullName">If set to true the full name of the type needs to be used.</param>
-		ICompletionData CreateImportCompletionData(IType type, bool useFullName);
+		/// <param name="addForTypeCreation">If true the completion data is used in 'new' context.</param>
+		ICompletionData CreateImportCompletionData(IType type, bool useFullName, bool addForTypeCreation);
+
+		ICompletionData CreateFormatItemCompletionData(string format, string description, object example);
+
+		ICompletionData CreateXmlDocCompletionData (string tag, string description = null, string tagInsertionText = null);
+
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/CSharpFormattingOptions.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/CSharpFormattingOptions.cs
index f0c26b9f90..458531c7cc 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/CSharpFormattingOptions.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/CSharpFormattingOptions.cs
@@ -66,6 +66,12 @@ namespace ICSharpCode.NRefactory.CSharp
 		InsideNamespace
 	}
 
+	public enum EmptyLineFormatting {
+		DoNotChange,
+		Indent,
+		DoNotIndent
+	}
+
 	public class CSharpFormattingOptions
 	{
 		public string Name {
@@ -154,11 +160,30 @@ namespace ICSharpCode.NRefactory.CSharp
 			set;
 		}
 
-		public PropertyFormatting PropertyFormatting { // tested
+		public PropertyFormatting AutoPropertyFormatting { // tested
+			get;
+			set;
+		}
+
+		public PropertyFormatting SimplePropertyFormatting { // tested
+			get;
+			set;
+		}
+
+		public EmptyLineFormatting EmptyLineFormatting {
+			get;
+			set;
+		}
+
+		public bool IndentPreprocessorDirectives { // tested
 			get;
 			set;
 		}
 
+		public bool AlignToMemberReferenceDot { // TODO!
+			get;
+			set;
+		}
 		#endregion
 		
 		#region Braces
@@ -222,12 +247,12 @@ namespace ICSharpCode.NRefactory.CSharp
 			set;
 		}
 
-		public bool AllowPropertyGetBlockInline { // tested
+		public PropertyFormatting SimpleGetBlockFormatting { // tested
 			get;
 			set;
 		}
 
-		public bool AllowPropertySetBlockInline { // tested
+		public PropertyFormatting SimpleSetBlockFormatting { // tested
 			get;
 			set;
 		}
@@ -303,6 +328,16 @@ namespace ICSharpCode.NRefactory.CSharp
 			get;
 			set;
 		}
+
+		NewLinePlacement embeddedStatementPlacement = NewLinePlacement.NewLine;
+		public NewLinePlacement EmbeddedStatementPlacement {
+			get {
+				return embeddedStatementPlacement;
+			}
+			set {
+				embeddedStatementPlacement = value;
+			}
+		}
 		#endregion
 		
 		#region Spaces
@@ -542,7 +577,22 @@ namespace ICSharpCode.NRefactory.CSharp
 			set;
 		}
 
-		public bool SpaceAroundNullCoalescingOperator {
+		public bool SpaceAroundNullCoalescingOperator { // Tested
+			get;
+			set;
+		}
+
+		public bool SpaceAfterUnsafeAddressOfOperator { // Tested
+			get;
+			set;
+		}
+
+		public bool SpaceAfterUnsafeAsteriskOfOperator { // Tested
+			get;
+			set;
+		}
+
+		public bool SpaceAroundUnsafeArrowOperator { // Tested
 			get;
 			set;
 		}
@@ -707,6 +757,11 @@ namespace ICSharpCode.NRefactory.CSharp
 			get;
 			set;
 		}
+
+		public bool RemoveEndOfLineWhiteSpace {
+			get;
+			set;
+		}
 		#endregion
 		
 		#region Blank Lines
@@ -745,6 +800,16 @@ namespace ICSharpCode.NRefactory.CSharp
 			set;
 		}
 
+		public int BlankLinesAroundRegion {
+			get;
+			set;
+		}
+
+		public int BlankLinesInsideRegion {
+			get;
+			set;
+		}
+
 		#endregion
 
 
@@ -852,6 +917,11 @@ namespace ICSharpCode.NRefactory.CSharp
 			set;
 		}
 
+		public NewLinePlacement NewLineBeforeNewQueryClause {
+			get;
+			set;
+		}
+
 		#endregion
 
 		#region Using Declarations
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/CSharpIndentEngine.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/CSharpIndentEngine.cs
deleted file mode 100644
index 73eee7e479..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/CSharpIndentEngine.cs
+++ /dev/null
@@ -1,692 +0,0 @@
-//
-// CSharpIndentEngine.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.Editor;
-using System.Text;
-using System.Collections.Generic;
-using System.Linq;
-using System.Globalization;
-
-namespace ICSharpCode.NRefactory.CSharp
-{
-	public class CSharpIndentEngine
-	{
-		readonly IDocument document;
-		readonly CSharpFormattingOptions options;
-		readonly TextEditorOptions textEditorOptions;
-		readonly StringBuilder wordBuf = new StringBuilder();
-		readonly StringBuilder currentIndent = new StringBuilder();
-		Indent thisLineindent;
-		Indent indent;
-		Indent indentDelta;
-
-		public IList<string> ConditionalSymbols {
-			get;
-			set;
-		}
-
-		public TextLocation Location {
-			get {
-				return new TextLocation(line, col);
-			}
-		}
-
-		public int Offset {
-			get {
-				return offset;
-			}
-		}
-
-		public string ThisLineIndent {
-			get {
-				return thisLineindent.IndentString;
-			}
-		}
-
-		public string NewLineIndent {
-			get {
-				return indent.IndentString + indentDelta.IndentString;
-			}
-		}
-
-		public bool NeedsReindent {
-			get {
-				return ThisLineIndent != currentIndent.ToString();
-			}
-		}
-
-		public CSharpIndentEngine(IDocument document, TextEditorOptions textEditorOptions, CSharpFormattingOptions formattingOptions)
-		{
-			this.document = document;
-			this.options = formattingOptions;
-			this.textEditorOptions = textEditorOptions;
-			this.indent = new Indent(textEditorOptions);
-			this.indentDelta = new Indent(textEditorOptions);
-			this.thisLineindent = new Indent(textEditorOptions);
-		}
-
-		CSharpIndentEngine(CSharpIndentEngine prototype)
-		{
-			this.document = prototype.document;
-			this.options = prototype.options;
-			this.textEditorOptions = prototype.textEditorOptions;
-			this.indent = prototype.indent.Clone();
-			this.indentDelta = prototype.indentDelta.Clone();
-			this.thisLineindent = prototype.thisLineindent.Clone();
-			this.offset = prototype.offset;
-			this.inside = prototype.inside;
-			this.IsLineStart = prototype.IsLineStart;
-			this.pc = prototype.pc;
-			this.parenStack = new Stack<TextLocation>(prototype.parenStack.Reverse());
-			this.currentBody = prototype.currentBody;
-			this.nextBody = prototype.nextBody;
-			this.addContinuation = prototype.addContinuation;
-			this.line = prototype.line;
-			this.col = prototype.col;
-			this.popNextParenBlock = prototype.popNextParenBlock;
-		}
-
-		public CSharpIndentEngine Clone()
-		{
-			return new CSharpIndentEngine(this);
-		}
-
-		int offset;
-		Inside inside = Inside.Empty;
-		bool IsLineStart = true;
-		char pc;
-		Stack<TextLocation> parenStack = new Stack<TextLocation>();
-		Body currentBody;
-		Body nextBody;
-		bool addContinuation;
-		int line, col;
-		bool popNextParenBlock;
-		bool readPreprocessorExpression;
-
-		public void Reset()
-		{
-			offset = 0;
-			thisLineindent.Reset();
-			indent.Reset();
-			pc = '\0';
-			IsLineStart = true;
-			addContinuation = false;
-			popNextParenBlock = false;
-			parenStack.Clear();
-			inside = Inside.Empty;
-			nextBody = currentBody = Body.None;
-			line = col = 1;
-		}
-
-		public void UpdateToOffset(int toOffset)
-		{
-			if (toOffset < offset)
-				Reset();
-			for (int i = offset; i < toOffset; i++)
-				Push(document.GetCharAt(i));
-		}
-
-		public bool IsInStringOrChar {
-			get {
-				return inside.HasFlag(Inside.StringOrChar);
-			}
-		}
-
-		public bool IsInComment {
-			get {
-				return inside.HasFlag(Inside.Comment);
-			}
-		}
-
-		public bool IsInPreProcessorComment {
-			get {
-				return inside.HasFlag(Inside.PreProcessorComment);
-			}
-		}
-
-		public bool IsInPreProcessorDirective {
-			get {
-				return inside.HasFlag(Inside.PreProcessor);
-			}
-		}
-
-		public bool IsInVerbatimString {
-			get {
-				return inside.HasFlag(Inside.VerbatimString);
-			}
-		}
-
-		public bool IsInsideDocLineComment {
-			get {
-				return inside.HasFlag(Inside.DocComment);
-			}
-		}
-
-		public bool IsInsideMultiLineComment {
-			get {
-				return inside.HasFlag(Inside.MultiLineComment);
-			}
-		}
-
-		public bool IsInsideStringLiteral {
-			get {
-				return inside.HasFlag(Inside.StringLiteral);
-			}
-		}
-
-		[Flags]
-		public enum Inside
-		{
-			Empty              = 0,
-
-			PreProcessor       = (1 << 0),
-			PreProcessorComment = (1 << 12),
-
-			MultiLineComment   = (1 << 1),
-			LineComment        = (1 << 2),
-			DocComment         = (1 << 11),
-			Comment            = (MultiLineComment | LineComment | DocComment),
-
-			VerbatimString     = (1 << 3),
-			StringLiteral      = (1 << 4),
-			CharLiteral        = (1 << 5),
-			String             = (VerbatimString | StringLiteral),
-			StringOrChar       = (String | CharLiteral),
-
-			Attribute          = (1 << 6),
-			ParenList          = (1 << 7),
-
-			FoldedStatement    = (1 << 8),
-			Block              = (1 << 9),
-			Case               = (1 << 10),
-
-			FoldedOrBlock      = (FoldedStatement | Block),
-			FoldedBlockOrCase  = (FoldedStatement | Block | Case)
-		}
-
-																#region Pre processor evaluation (from cs-tokenizer.cs)
-		static bool is_identifier_start_character(int c)
-		{
-			return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_' || Char.IsLetter((char)c);
-		}
-
-		static bool is_identifier_part_character(char c)
-		{
-			if (c >= 'a' && c <= 'z')
-				return true;
-
-			if (c >= 'A' && c <= 'Z')
-				return true;
-
-			if (c == '_' || (c >= '0' && c <= '9'))
-				return true;
-
-			if (c < 0x80)
-				return false;
-
-			return Char.IsLetter(c) || Char.GetUnicodeCategory(c) == UnicodeCategory.ConnectorPunctuation;
-		}
-
-		bool eval_val(string s)
-		{
-			if (s == "true")
-				return true;
-			if (s == "false")
-				return false;
-
-			return ConditionalSymbols != null && ConditionalSymbols.Contains(s);
-		}
-
-		bool pp_primary(ref string s)
-		{
-			s = s.Trim();
-			int len = s.Length;
-
-			if (len > 0) {
-				char c = s [0];
-
-				if (c == '(') {
-					s = s.Substring(1);
-					bool val = pp_expr(ref s, false);
-					if (s.Length > 0 && s [0] == ')') {
-						s = s.Substring(1);
-						return val;
-					}
-					return false;
-				}
-
-				if (is_identifier_start_character(c)) {
-					int j = 1;
-
-					while (j < len) {
-						c = s [j];
-
-						if (is_identifier_part_character(c)) {
-							j++;
-							continue;
-						}
-						bool v = eval_val(s.Substring(0, j));
-						s = s.Substring(j);
-						return v;
-					}
-					bool vv = eval_val(s);
-					s = "";
-					return vv;
-				}
-			}
-			return false;
-		}
-
-		bool pp_unary(ref string s)
-		{
-			s = s.Trim();
-			int len = s.Length;
-
-			if (len > 0) {
-				if (s [0] == '!') {
-					if (len > 1 && s [1] == '=') {
-						return false;
-					}
-					s = s.Substring(1);
-					return ! pp_primary(ref s);
-				} else
-					return pp_primary(ref s);
-			} else {
-				return false;
-			}
-		}
-
-		bool pp_eq(ref string s)
-		{
-			bool va = pp_unary(ref s);
-
-			s = s.Trim();
-			int len = s.Length;
-			if (len > 0) {
-				if (s [0] == '=') {
-					if (len > 2 && s [1] == '=') {
-						s = s.Substring(2);
-						return va == pp_unary(ref s);
-					} else {
-						return false;
-					}
-				} else if (s [0] == '!' && len > 1 && s [1] == '=') {
-					s = s.Substring(2);
-
-					return va != pp_unary(ref s);
-
-				} 
-			}
-
-			return va;
-
-		}
-
-		bool pp_and(ref string s)
-		{
-			bool va = pp_eq(ref s);
-
-			s = s.Trim();
-			int len = s.Length;
-			if (len > 0) {
-				if (s [0] == '&') {
-					if (len > 2 && s [1] == '&') {
-						s = s.Substring(2);
-						return (va & pp_and(ref s));
-					} else {
-						return false;
-					}
-				} 
-			}
-			return va;
-		}
-
-		//
-		// Evaluates an expression for `#if' or `#elif'
-		//
-		bool pp_expr(ref string s, bool isTerm)
-		{
-			bool va = pp_and(ref s);
-			s = s.Trim();
-			int len = s.Length;
-			if (len > 0) {
-				char c = s [0];
-
-				if (c == '|') {
-					if (len > 2 && s [1] == '|') {
-						s = s.Substring(2);
-						return va | pp_expr(ref s, isTerm);
-					} else {
-
-						return false;
-					}
-				}
-				if (isTerm) {
-					return false;
-				}
-			}
-
-			return va;
-		}
-
-		bool eval(string s)
-		{
-			bool v = pp_expr(ref s, true);
-			s = s.Trim();
-			if (s.Length != 0) {
-				return false;
-			}
-
-			return v;
-		}
-		#endregion
-		
-		public void Push(char ch)
-		{
-			if (readPreprocessorExpression) {
-				wordBuf.Append(ch);
-			}
-
-			if (inside.HasFlag(Inside.VerbatimString) && pc == '"' && ch != '"') {
-				inside &= ~Inside.StringLiteral;
-			}
-			switch (ch) {
-				case '#':
-					if (IsLineStart)
-						inside = Inside.PreProcessor;
-					break;
-				case '/':
-					if (IsInStringOrChar || IsInPreProcessorComment)
-						break;
-					if (pc == '/') {
-						if (inside.HasFlag(Inside.Comment)) {
-							inside |= Inside.DocComment;
-						} else {
-							inside |= Inside.Comment;
-						}
-					}
-					break;
-				case '*':
-					if (IsInStringOrChar || IsInComment || IsInPreProcessorComment)
-						break;
-					if (pc == '/')
-						inside |= Inside.MultiLineComment;
-					break;
-				case ' ':
-					currentIndent.Append(' ');
-					break;
-				case '\t':
-					var nextTabStop = (col - 1 + textEditorOptions.IndentSize) / textEditorOptions.IndentSize;
-					col = 1 + nextTabStop * textEditorOptions.IndentSize;
-					currentIndent.Append('\t');
-					offset++;
-					return;
-				case '\r':
-
-					if (readPreprocessorExpression) {
-						if (!eval(wordBuf.ToString()))
-							inside |= Inside.PreProcessorComment;
-					}
-
-					inside &= ~(Inside.Comment | Inside.String | Inside.CharLiteral | Inside.PreProcessor);
-					CheckKeyword(wordBuf.ToString());
-					wordBuf.Length = 0;
-					indent.Push(indentDelta);
-					indentDelta = new Indent(textEditorOptions);
-
-
-					if (addContinuation) {
-						indent.Push(IndentType.Continuation);
-					}
-					thisLineindent = indent.Clone();
-					addContinuation = false;
-					IsLineStart = true;
-					readPreprocessorExpression = false;
-					col = 1;
-					line++;
-					currentIndent.Length = 0;
-					break;
-				case '\n':
-					if (pc == '\r')
-						break;
-					goto case '\r';
-				case '"':
-					if (IsInComment || IsInPreProcessorComment)
-						break;
-					if (inside.HasFlag(Inside.StringLiteral)) {
-						if (pc != '\\')
-							inside &= ~Inside.StringLiteral;
-						break;
-					}
-
-					if (pc == '@') {
-						inside |= Inside.VerbatimString;
-					} else {
-						inside |= Inside.StringLiteral;
-					}
-					break;
-				case '<':
-				case '[':
-				case '(':
-					if (IsInComment || IsInStringOrChar || IsInPreProcessorComment)
-						break;
-					parenStack.Push(new TextLocation(line, col));
-					popNextParenBlock = true;
-					indent.Push(IndentType.Block);
-					break;
-				case '>':
-				case ']':
-				case ')':
-					if (IsInComment || IsInStringOrChar || IsInPreProcessorComment)
-						break;
-					if (popNextParenBlock && parenStack.Count > 0)
-						parenStack.Pop();
-					if (indent.Count > 0)
-						indent.Pop();
-					indent.ExtraSpaces = 0;
-					break;
-				case ',':
-					if (IsInComment || IsInStringOrChar || IsInPreProcessorComment)
-						break;
-					if (parenStack.Count > 0 && parenStack.Peek().Line == line) {
-						if (indent.Count > 0)
-							indent.Pop();
-						popNextParenBlock = false;
-						indent.ExtraSpaces = parenStack.Peek().Column - 1 - thisLineindent.CurIndent;
-					}
-					break;
-				case '{':
-					if (IsInComment || IsInStringOrChar || IsInPreProcessorComment)
-						break;
-					currentBody = nextBody;
-					if (indent.Count > 0 && indent.Peek() == IndentType.Continuation)
-						indent.Pop();
-					addContinuation = false;
-					AddIndentation(currentBody);
-					break;
-				case '}':
-					if (IsInComment || IsInStringOrChar || IsInPreProcessorComment)
-						break;
-					if (indentDelta.CurIndent > 0) {
-						indentDelta.Pop();
-						if (indentDelta.Count > 0 && indentDelta.Peek() == IndentType.Continuation)
-							indentDelta.Pop();
-					} else {
-						if (thisLineindent.Count > 0)
-							thisLineindent.Pop();
-						if (indent.Count > 0)
-							indent.Pop();
-					}
-					break;
-				case ';':
-					if (IsInComment || IsInStringOrChar || IsInPreProcessorComment)
-						break;
-					if (indent.Count > 0 && indent.Peek() == IndentType.Continuation)
-						indent.Pop();
-					break;
-				case '\'':
-					if (IsInComment || inside.HasFlag(Inside.StringLiteral) || IsInPreProcessorComment)
-						break;
-					if (inside.HasFlag(Inside.CharLiteral)) {
-						if (pc != '\\')
-							inside &= ~Inside.CharLiteral;
-					} else {
-						inside &= Inside.CharLiteral;
-					}
-					break;
-			}
-
-			if (!IsInComment && !IsInStringOrChar && !readPreprocessorExpression) {
-				if ((wordBuf.Length == 0 ? char.IsLetter(ch) : char.IsLetterOrDigit(ch)) || ch == '_') {
-					wordBuf.Append(ch);
-				} else {
-					if (inside.HasFlag(Inside.PreProcessor)) {
-						if (wordBuf.ToString() == "endif") {
-							inside &= ~Inside.PreProcessorComment;
-						} else if (wordBuf.ToString() == "if") {
-							readPreprocessorExpression = true;
-						} else if (wordBuf.ToString() == "elif") {
-							inside &= ~Inside.PreProcessorComment;
-							readPreprocessorExpression = true;
-						}
-					} else {
-						CheckKeyword(wordBuf.ToString());
-					}
-					wordBuf.Length = 0;
-				}
-			}
-			if (addContinuation) {
-				indent.Push(IndentType.Continuation);
-				addContinuation = false;
-			}
-			IsLineStart &= ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r';
-			pc = ch;
-			if (ch != '\n' && ch != '\r')
-				col++;
-			offset++;
-		}
-
-		void AddIndentation(BraceStyle braceStyle)
-		{
-			switch (braceStyle) {
-				case BraceStyle.DoNotChange:
-				case BraceStyle.EndOfLine:
-				case BraceStyle.EndOfLineWithoutSpace:
-				case BraceStyle.NextLine:
-				case BraceStyle.NextLineShifted:
-				case BraceStyle.BannerStyle:
-					indentDelta.Push(IndentType.Block);
-					break;
-
-				case BraceStyle.NextLineShifted2:
-					indentDelta.Push(IndentType.DoubleBlock);
-					break;
-			}
-		}
-
-		void AddIndentation(Body body)
-		{
-			switch (body) {
-				case Body.None:
-					indentDelta.Push(IndentType.Block);
-					break;
-				case Body.Namespace:
-					AddIndentation(options.NamespaceBraceStyle);
-					break;
-				case Body.Class:
-					AddIndentation(options.ClassBraceStyle);
-					break;
-				case Body.Struct:
-					AddIndentation(options.StructBraceStyle);
-					break;
-				case Body.Interface:
-					AddIndentation(options.InterfaceBraceStyle);
-					break;
-				case Body.Enum:
-					AddIndentation(options.EnumBraceStyle);
-					break;
-				case Body.Switch:
-					if (options.IndentSwitchBody)
-						indentDelta.Push(IndentType.Empty);
-					break;
-				default:
-					throw new ArgumentOutOfRangeException();
-			}
-		}
-
-		enum Body
-		{
-			None,
-			Namespace,
-			Class,
-			Struct,
-			Interface,
-			Enum,
-			Switch
-		}
-
-		void CheckKeyword(string keyword)
-		{
-			switch (currentBody) {
-				case Body.None:
-					if (keyword == "namespace") {
-						nextBody = Body.Namespace;
-						return;
-					}
-					goto case Body.Namespace;
-				case Body.Namespace:
-					if (keyword == "class") {
-						nextBody = Body.Class;
-						return;
-					}
-					if (keyword == "enum") {
-						nextBody = Body.Enum;
-						return;
-					}
-					if (keyword == "struct") {
-						nextBody = Body.Struct;
-						return;
-					}
-					if (keyword == "interface") {
-						nextBody = Body.Interface;
-						return;
-					}
-					break;
-				case Body.Class:
-				case Body.Enum:
-				case Body.Struct:
-				case Body.Interface:
-					if (keyword == "switch")
-						nextBody = Body.Switch;
-					if (keyword == "do" || keyword == "if" || keyword == "for" || keyword == "foreach" || keyword == "while") {
-						addContinuation = true;
-					}
-					break;
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingChanges.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingChanges.cs
index 385a70f419..f60b58bbd3 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingChanges.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingChanges.cs
@@ -49,6 +49,12 @@ namespace ICSharpCode.NRefactory.CSharp
 			this.document = document;
 		}
 
+		public int Count {
+			get {
+				return changes.Count;
+			}
+		}
+
 		/// <summary>
 		/// Applies the changes to the input document.
 		/// </summary>
@@ -111,6 +117,14 @@ namespace ICSharpCode.NRefactory.CSharp
 
 		internal TextReplaceAction AddChange(int offset, int removedChars, string insertedText)
 		{
+			if (offset < 0)
+				throw new ArgumentOutOfRangeException("offset", "Should be >= 0");
+			if (offset >= document.TextLength)
+				throw new ArgumentOutOfRangeException("offset", "Should be < document.TextLength");
+			if (removedChars < 0)
+				throw new ArgumentOutOfRangeException("removedChars", "Should be >= 0");
+			if (removedChars > offset + document.TextLength)
+				throw new ArgumentOutOfRangeException("removedChars", "Tried to remove beyond end of text");
 			if (removedChars == 0 && string.IsNullOrEmpty (insertedText))
 				return null;
 			var action = new TextReplaceAction (offset, removedChars, insertedText);
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingOptionsFactory.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingOptionsFactory.cs
index 1112f46cac..7486ad08bd 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingOptionsFactory.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingOptionsFactory.cs
@@ -43,9 +43,9 @@ namespace ICSharpCode.NRefactory.CSharp
 		/// <summary>
 		/// Creates mono indent style CSharpFormatting options.
 		/// </summary>
-		public static CSharpFormattingOptions CreateMono ()
+		public static CSharpFormattingOptions CreateMono()
 		{
-			return new CSharpFormattingOptions () {
+			return new CSharpFormattingOptions {
 				IndentNamespaceBody = true,
 				IndentClassBody = true,
 				IndentInterfaceBody = true,
@@ -58,6 +58,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				IndentSwitchBody = false,
 				IndentCaseBody = true,
 				IndentBreakStatements = true,
+				IndentPreprocessorDirectives = true,
 				NamespaceBraceStyle = BraceStyle.NextLine,
 				ClassBraceStyle = BraceStyle.NextLine,
 				InterfaceBraceStyle = BraceStyle.NextLine,
@@ -71,9 +72,9 @@ namespace ICSharpCode.NRefactory.CSharp
 				PropertyBraceStyle = BraceStyle.EndOfLine,
 				PropertyGetBraceStyle = BraceStyle.EndOfLine,
 				PropertySetBraceStyle = BraceStyle.EndOfLine,
-				AllowPropertyGetBlockInline = true,
-				AllowPropertySetBlockInline = true,
-	
+				SimpleGetBlockFormatting = PropertyFormatting.AllowOneLine,
+				SimpleSetBlockFormatting = PropertyFormatting.AllowOneLine,
+
 				EventBraceStyle = BraceStyle.EndOfLine,
 				EventAddBraceStyle = BraceStyle.EndOfLine,
 				EventRemoveBraceStyle = BraceStyle.EndOfLine,
@@ -151,7 +152,9 @@ namespace ICSharpCode.NRefactory.CSharp
 				
 				AlignEmbeddedIfStatements = true,
 				AlignEmbeddedUsingStatements = true,
-				PropertyFormatting = PropertyFormatting.AllowOneLine,
+				SimplePropertyFormatting = PropertyFormatting.AllowOneLine,
+				AutoPropertyFormatting = PropertyFormatting.AllowOneLine,
+				EmptyLineFormatting = EmptyLineFormatting.DoNotIndent,
 				SpaceBeforeMethodDeclarationParameterComma = false,
 				SpaceAfterMethodDeclarationParameterComma = true,
 				SpaceAfterDelegateDeclarationParameterComma = true,
@@ -164,6 +167,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				SpaceWithinIndexerDeclarationBracket = false,
 				SpaceBeforeIndexerDeclarationParameterComma = false,
 				SpaceInNamedArgumentAfterDoubleColon = true,
+				RemoveEndOfLineWhiteSpace = true,
 			
 				SpaceAfterIndexerDeclarationParameterComma = true,
 				
@@ -176,9 +180,11 @@ namespace ICSharpCode.NRefactory.CSharp
 				BlankLinesBetweenFields = 0,
 				BlankLinesBetweenEventFields = 0,
 				BlankLinesBetweenMembers = 1,
-				AlignToFirstIndexerArgument = true,
+				BlankLinesAroundRegion = 1,
+				BlankLinesInsideRegion = 1,
+				AlignToFirstIndexerArgument = false,
 				AlignToFirstIndexerDeclarationParameter = true,
-				AlignToFirstMethodCallArgument = true,
+				AlignToFirstMethodCallArgument = false,
 				AlignToFirstMethodDeclarationParameter = true,
 				KeepCommentsAtFirstColumn = true,
 				ChainedMethodCallWrapping = Wrapping.DoNotChange,
@@ -188,7 +194,9 @@ namespace ICSharpCode.NRefactory.CSharp
 
 				IndexerArgumentWrapping = Wrapping.DoNotChange,
 				NewLineAferIndexerOpenBracket = NewLinePlacement.DoNotCare,
-				IndexerClosingBracketOnNewLine = NewLinePlacement.DoNotCare
+				IndexerClosingBracketOnNewLine = NewLinePlacement.DoNotCare,
+
+				NewLineBeforeNewQueryClause = NewLinePlacement.NewLine
 			};
 		}
 
@@ -205,9 +213,9 @@ namespace ICSharpCode.NRefactory.CSharp
 		/// The K&R style, so named because it was used in Kernighan and Ritchie's book The C Programming Language,
 		/// is commonly used in C. It is less common for C++, C#, and others.
 		/// </summary>
-		public static CSharpFormattingOptions CreateKRStyle ()
+		public static CSharpFormattingOptions CreateKRStyle()
 		{
-			return new CSharpFormattingOptions () {
+			return new CSharpFormattingOptions() {
 				IndentNamespaceBody = true,
 				IndentClassBody = true,
 				IndentInterfaceBody = true,
@@ -220,7 +228,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				IndentSwitchBody = true,
 				IndentCaseBody = true,
 				IndentBreakStatements = true,
-
+				IndentPreprocessorDirectives = true,
 				NamespaceBraceStyle = BraceStyle.NextLine,
 				ClassBraceStyle = BraceStyle.NextLine,
 				InterfaceBraceStyle = BraceStyle.NextLine,
@@ -233,8 +241,8 @@ namespace ICSharpCode.NRefactory.CSharp
 				PropertyBraceStyle = BraceStyle.EndOfLine,
 				PropertyGetBraceStyle = BraceStyle.EndOfLine,
 				PropertySetBraceStyle = BraceStyle.EndOfLine,
-				AllowPropertyGetBlockInline = true,
-				AllowPropertySetBlockInline = true,
+				SimpleGetBlockFormatting = PropertyFormatting.AllowOneLine,
+				SimpleSetBlockFormatting = PropertyFormatting.AllowOneLine,
 	
 				EventBraceStyle = BraceStyle.EndOfLine,
 				EventAddBraceStyle = BraceStyle.EndOfLine,
@@ -244,6 +252,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				StatementBraceStyle = BraceStyle.EndOfLine,
 	
 				ElseNewLinePlacement = NewLinePlacement.SameLine,
+				ElseIfNewLinePlacement = NewLinePlacement.SameLine,
 				CatchNewLinePlacement = NewLinePlacement.SameLine,
 				FinallyNewLinePlacement = NewLinePlacement.SameLine,
 				WhileNewLinePlacement = NewLinePlacement.SameLine,
@@ -314,7 +323,9 @@ namespace ICSharpCode.NRefactory.CSharp
 				
 				AlignEmbeddedIfStatements = true,
 				AlignEmbeddedUsingStatements = true,
-				PropertyFormatting = PropertyFormatting.AllowOneLine,
+				SimplePropertyFormatting = PropertyFormatting.AllowOneLine,
+				AutoPropertyFormatting = PropertyFormatting.AllowOneLine,
+				EmptyLineFormatting = EmptyLineFormatting.DoNotIndent,
 				SpaceBeforeMethodDeclarationParameterComma = false,
 				SpaceAfterMethodDeclarationParameterComma = true,
 				SpaceAfterDelegateDeclarationParameterComma = true,
@@ -328,6 +339,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				SpaceInNamedArgumentAfterDoubleColon = true,
 			
 				SpaceAfterIndexerDeclarationParameterComma = true,
+				RemoveEndOfLineWhiteSpace = true,
 				
 				BlankLinesBeforeUsings = 0,
 				BlankLinesAfterUsings = 1,
@@ -337,6 +349,8 @@ namespace ICSharpCode.NRefactory.CSharp
 				BlankLinesBetweenFields = 0,
 				BlankLinesBetweenEventFields = 0,
 				BlankLinesBetweenMembers = 1,
+				BlankLinesAroundRegion = 1,
+				BlankLinesInsideRegion = 1,
 	
 				KeepCommentsAtFirstColumn = true,
 				ChainedMethodCallWrapping = Wrapping.DoNotChange,
@@ -348,6 +362,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				NewLineAferIndexerOpenBracket = NewLinePlacement.DoNotCare,
 				IndexerClosingBracketOnNewLine = NewLinePlacement.DoNotCare,
 
+				NewLineBeforeNewQueryClause = NewLinePlacement.NewLine
 			};
 		}
 
@@ -370,13 +385,15 @@ namespace ICSharpCode.NRefactory.CSharp
 
 			baseOptions.CatchNewLinePlacement = NewLinePlacement.NewLine;
 			baseOptions.ElseNewLinePlacement = NewLinePlacement.NewLine;
+			baseOptions.ElseIfNewLinePlacement = NewLinePlacement.SameLine;
+
 			baseOptions.FinallyNewLinePlacement = NewLinePlacement.NewLine;
 			baseOptions.WhileNewLinePlacement = NewLinePlacement.DoNotCare;
 			baseOptions.ArrayInitializerWrapping = Wrapping.DoNotChange;
 
 			return baseOptions;
 		}
-	
+
 		/// <summary>
 		/// The Whitesmiths style, also called Wishart style to a lesser extent, is less common today than the previous three. It was originally used in the documentation for the first commercial C compiler, the Whitesmiths Compiler.
 		/// </summary>
@@ -421,7 +438,6 @@ namespace ICSharpCode.NRefactory.CSharp
 			baseOptions.StatementBraceStyle = BraceStyle.NextLineShifted2;
 			return baseOptions;
 		}
-
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor.cs
index 4a72d3951a..d83954f10d 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor.cs
@@ -30,13 +30,15 @@ using System.Linq;
 using ICSharpCode.NRefactory.Editor;
 using ICSharpCode.NRefactory.TypeSystem;
 using System.Threading;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Utils;
 
 namespace ICSharpCode.NRefactory.CSharp
 {
 	[Obsolete("This class was replaced by CSharpFormatter.")]
 	public class AstFormattingVisitor {}
 
-	partial class FormattingVisitor : DepthFirstAstVisitor
+	partial class FormattingVisitor  
 	{
 		readonly CSharpFormatter formatter;
 		readonly FormattingChanges changes;
@@ -115,29 +117,83 @@ namespace ICSharpCode.NRefactory.CSharp
 			VisitChildrenToFormat (node, n => n.AcceptVisitor (this));
 		}
 
-		public void EnsureNewLinesAfter(AstNode node, int blankLines)
+		#region NewLines
+
+		void AdjustNewLineBlock(AstNode startNode, int targetNewLineCount)
 		{
-			if (formatter.FormattingMode != FormattingMode.Intrusive)
-				blankLines = 1;
-			int foundBlankLines = 0;
-			var nextNode = node.GetNextNode ();
-			AstNode lastNewLine = null;
-			while (nextNode != null) {
-				if (!(nextNode is NewLineNode))
+			var indentString = policy.EmptyLineFormatting == EmptyLineFormatting.Indent ? curIndent.IndentString : "";
+
+			TextLocation newLineInsertPosition = startNode.EndLocation;
+			var node = startNode.NextSibling;
+			int currentNewLineCount = 0;
+			// Check the existing newlines
+			for (; currentNewLineCount < targetNewLineCount; node = node.NextSibling) {
+				if (node is WhitespaceNode)
+					continue;
+				if (!(node is NewLineNode))
+					break;
+				newLineInsertPosition = node.EndLocation;
+				currentNewLineCount++;
+				if (policy.EmptyLineFormatting == EmptyLineFormatting.DoNotChange) {
+					if (node.NextSibling == null)
+						// end of file/block etc, nothing more to do but break before assigning null to node
+						break;
+					continue;
+				}
+				var isBlankLine = IsSpacing(document.GetLineByNumber(node.StartLocation.Line));
+				if (!isBlankLine) {
+					// remove EOL whitespace if appropriate
+					if (policy.RemoveEndOfLineWhiteSpace) {
+						var offset = document.GetOffset(node.StartLocation);
+						var start = SearchWhitespaceStart(offset);
+						if (start != offset)
+							AddChange(start, offset - start, null);
+					}
+				} else {
+					var actualIndent = GetIndentation(node.StartLocation.Line);
+					if (actualIndent != indentString) {
+						var start = document.GetOffset(new TextLocation(node.StartLocation.Line, 0));
+						AddChange(start, actualIndent.Length, indentString);
+					}
+				}
+				if (node.NextSibling == null)
+					// end of file/block etc, nothing more to do but break before assigning null to node
 					break;
-				lastNewLine = nextNode;
-				foundBlankLines++;
-				nextNode = nextNode.GetNextNode ();
 			}
-			if (nextNode == null)
-				return;
-			var start = document.GetOffset(node.EndLocation);
-			var end = document.GetOffset((lastNewLine ?? nextNode).StartLocation);
-			var sb = new StringBuilder(options.EolMarker.Length *  blankLines);
-			for (int i = 0; i < blankLines + (lastNewLine != null ? -1 : 0); i++) {
-				sb.Append(options.EolMarker);
+			if (currentNewLineCount < targetNewLineCount) {
+				// We need to add more newlines
+				var builder = new StringBuilder();
+				for (; currentNewLineCount < targetNewLineCount; currentNewLineCount++) {
+					if (currentNewLineCount > 0)
+						// Don't indent the first line in the block since that is not an empty line.
+						builder.Append(indentString);
+					builder.Append(options.EolMarker);
+				}
+				var offset = document.GetOffset(newLineInsertPosition);
+				AddChange(offset, 0, builder.ToString());
+			} else if (currentNewLineCount == targetNewLineCount && node is NewLineNode){
+				// Check to see if there are any newlines to remove
+				var endNode = node.GetNextSibling(n => !(n is NewLineNode || n is WhitespaceNode));
+				if (endNode != null) {
+					var startOffset = document.GetOffset(newLineInsertPosition);
+					var endOffset = document.GetOffset(new TextLocation(endNode.StartLocation.Line, 0));
+					EnsureText(startOffset, endOffset, null);
+				}
 			}
-			AddChange(start, end - start, sb.ToString());
+		}
+
+		public void EnsureNewLinesAfter(AstNode node, int blankLines)
+		{
+			if (node is PreProcessorDirective) {
+				var directive = (PreProcessorDirective)node;
+				if (directive.Type == PreProcessorDirectiveType.Pragma)
+					return;
+			}
+			if (blankLines < 0)
+				return;
+			if (formatter.FormattingMode != FormattingMode.Intrusive)
+				blankLines = Math.Min(1, blankLines);
+			AdjustNewLineBlock(node, blankLines);
 		}
 		
 		public void EnsureBlankLinesBefore(AstNode node, int blankLines)
@@ -151,30 +207,46 @@ namespace ICSharpCode.NRefactory.CSharp
 			} while (line > 0 && IsSpacing(document.GetLineByNumber(line)));
 			if (line > 0 && !IsSpacing(document.GetLineByNumber(line)))
 			    line++;
-			int end = document.GetOffset(loc.Line, 1);
-			int start = document.GetOffset(line + 1, 1);
+			if (loc.Line - line == blankLines)
+				return;
+
 			var sb = new StringBuilder ();
-			for (int i = 0; i < blankLines; i++) {
+			for (int i = 0; i < blankLines; i++)
 				sb.Append(options.EolMarker);
+			int end = document.GetOffset(loc.Line, 1);
+			if (loc.Line == line) {
+				AddChange(end, 0, sb.ToString());
+				return;
 			}
-			if (end - start == 0 && sb.Length == 0)
+			if (line + 1 > document.LineCount)
+				return;
+			int start = document.GetOffset(line + 1, 1);
+			if (end - start <= 0 && sb.Length == 0)
 				return;
 			AddChange(start, end - start, sb.ToString());
 		}
 
+		#endregion
+
 		bool IsSimpleAccessor(Accessor accessor)
 		{
 			if (accessor.IsNull || accessor.Body.IsNull || accessor.Body.FirstChild == null) {
 				return true;
 			}
-			if (accessor.Body.Statements.Count() != 1) {
+			var firstStatement = accessor.Body.Statements.FirstOrDefault();
+			if (firstStatement == null)
+				return true;
+
+			if (!(firstStatement is ReturnStatement || firstStatement is ExpressionStatement|| firstStatement is EmptyStatement || firstStatement is ThrowStatement))
 				return false;
-			}
+
+			if (firstStatement.GetNextSibling(s => s.Role == BlockStatement.StatementRole) != null)
+				return false;
+
 			return !(accessor.Body.Statements.FirstOrDefault() is BlockStatement);
-			
 		}
 		
-		bool IsSpacing(char ch)
+		static bool IsSpacing(char ch)
 		{
 			return ch == ' ' || ch == '\t';
 		}
@@ -228,8 +300,20 @@ namespace ICSharpCode.NRefactory.CSharp
 		void ForceSpace(int startOffset, int endOffset, bool forceSpace)
 		{
 			int lastNonWs = SearchLastNonWsChar(startOffset, endOffset);
-			if (lastNonWs >= 0)
-				AddChange(lastNonWs + 1, Math.Max(0, endOffset - lastNonWs - 1), forceSpace ? " " : "");
+			if (lastNonWs < 0)
+				return;
+
+			var spaceCount = Math.Max(0, endOffset - lastNonWs - 1);
+			if (forceSpace) {
+				if (spaceCount != 1) {
+					// Here we could technically remove spaceCount - 1 chars instead
+					// and skip replacing that with new space, but we want to trigger the
+					// overlap detection if this space is changed again for some reason
+					AddChange(lastNonWs + 1, spaceCount, " ");
+				}
+			} else if (spaceCount > 0 && !forceSpace) {
+				AddChange(lastNonWs + 1, spaceCount, "");
+			}
 		}
 		
 		void ForceSpacesAfter(AstNode n, bool forceSpaces)
@@ -303,41 +387,20 @@ namespace ICSharpCode.NRefactory.CSharp
 				return true;
 			if (placement == NewLinePlacement.SameLine)
 				return false;
+			if (token.IsNull)
+				return false;
 			var prevMeaningfulNode = token.GetPrevNode (n =>n.Role !=Roles.NewLine && n.Role != Roles.Whitespace && n.Role !=Roles.Comment);
 			return prevMeaningfulNode.EndLocation.Line != token.StartLocation.Line;
 		}
 
 		void ForceSpaceBefore(AstNode node, bool forceSpace)
 		{
-			_ForceSpaceBefore(document.GetOffset(node.StartLocation), forceSpace);
-		}
-
-		void _ForceSpaceBefore(int offset, bool forceSpace)
-		{
-			bool insertedSpace = false;
-			do {
-				char ch = document.GetCharAt(offset);
-				//Console.WriteLine (ch);
-				if (!IsSpacing(ch) && (insertedSpace || !forceSpace)) {
-					break;
-				}
-				if (ch == ' ' && forceSpace) {
-					if (insertedSpace) {
-						AddChange(offset, 1, null);
-					} else {
-						insertedSpace = true;
-					}
-				} else if (forceSpace) {
-					if (!insertedSpace) {
-						AddChange(offset, IsSpacing(ch) ? 1 : 0, " ");
-						insertedSpace = true;
-					} else if (IsSpacing(ch)) {
-						AddChange(offset, 1, null);
-					}
-				}
-				
-				offset--;
-			} while (offset >= 0);
+			var offset = document.GetOffset(node.StartLocation);
+			int end = offset;
+			// ForceSpace inserts a space one char after start in the case of a missing space
+			// Therefore, make sure that start < offset by starting at offset - 1
+			int start = SearchWhitespaceStart(offset - 1);
+			ForceSpace(start, end, forceSpace);
 		}
 
 		public void FixSemicolon(CSharpTokenNode semicolon)
@@ -357,14 +420,16 @@ namespace ICSharpCode.NRefactory.CSharp
 		
 		void PlaceOnNewLine(NewLinePlacement newLine, AstNode keywordNode)
 		{
-			if (keywordNode == null || newLine == NewLinePlacement.DoNotCare) {
+			if (keywordNode == null || keywordNode.StartLocation.IsEmpty)
 				return;
-			}
 			
 			var prev = keywordNode.GetPrevNode (NoWhitespacePredicate);
 			if (prev is Comment || prev is PreProcessorDirective)
 				return;
-			
+
+			if (newLine == NewLinePlacement.DoNotCare)
+				newLine = prev.EndLocation.Line == keywordNode.StartLocation.Line ? NewLinePlacement.SameLine : NewLinePlacement.NewLine;
+
 			int offset = document.GetOffset(keywordNode.StartLocation);
 			
 			int whitespaceStart = SearchWhitespaceStart(offset);
@@ -390,7 +455,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			int lineStart = SearchWhitespaceLineStart(offset);
 			string indentString = nextStatementIndent ?? (isEmpty ? "" : options.EolMarker) + curIndent.IndentString;
 			nextStatementIndent = null;
-			AddChange(lineStart, offset - lineStart, indentString);
+			EnsureText(lineStart, offset, indentString);
 		}
 
 		void FixIndentation (AstNode node)
@@ -415,11 +480,34 @@ namespace ICSharpCode.NRefactory.CSharp
 		
 		void FixIndentationForceNewLine(AstNode node)
 		{
+			var directive = node as PreProcessorDirective;
 			if (node.GetPrevNode () is NewLineNode) {
-				FixIndentation(node);
+				if (directive != null && !policy.IndentPreprocessorDirectives) {
+					var startNode = node.GetPrevNode ();
+					var startOffset = document.GetOffset(startNode.EndLocation);
+					int endOffset = document.GetOffset(node.StartLocation);
+					AddChange(startOffset, endOffset - startOffset, "");
+					return;
+				} else {
+					FixIndentation(node);
+				}
 			} else {
-				int offset = document.GetOffset(node.StartLocation);
-				AddChange(offset, 0, curIndent.IndentString);
+				// if no new line preceeds an #endif directive it's excluded
+				if (directive != null) {
+					if (directive.Type == PreProcessorDirectiveType.Endif)
+						return;
+				}
+				var startNode = node.GetPrevSibling(n => !(n is WhitespaceNode)) ?? node;
+				var startOffset = document.GetOffset(startNode.EndLocation);
+				int endOffset = document.GetOffset(node.StartLocation);
+				if (startOffset >= endOffset)
+					return;
+				if (directive != null && !policy.IndentPreprocessorDirectives) {
+					AddChange(startOffset, endOffset - startOffset, "");
+					return;
+				}
+
+				AddChange(startOffset, endOffset - startOffset, curIndent.IndentString);
 			}
 		}
 
@@ -438,6 +526,22 @@ namespace ICSharpCode.NRefactory.CSharp
 			return b.ToString();
 		}
 
+		void EnsureText(int start, int end, string replacementText)
+		{
+			var length = end - start;
+			if (length == 0 && string.IsNullOrEmpty(replacementText))
+				return;
+			if (replacementText == null || replacementText.Length != length) {
+				AddChange(start, length, replacementText);
+				return;
+			}
+			for (int i = 0; i < length; i++) {
+				if (document.GetCharAt(start + i) != replacementText[i]) {
+					AddChange(start, length, replacementText);
+					break;
+				}
+			}
+		}
 		
 		void FixOpenBrace(BraceStyle braceStyle, AstNode lbrace)
 		{
@@ -456,14 +560,14 @@ namespace ICSharpCode.NRefactory.CSharp
 
 					if (prev is Comment || prev is PreProcessorDirective) {
 						int next = document.GetOffset(lbrace.GetNextNode ().StartLocation);
-						AddChange(prevOffset, next - prevOffset, "");
+						EnsureText(prevOffset, next, "");
 						while (prev is Comment || prev is PreProcessorDirective)
 							prev = prev.GetPrevNode();
 						prevOffset = document.GetOffset(prev.EndLocation);
 						AddChange(prevOffset, 0, " {");
 					} else {
 						int braceOffset2 = document.GetOffset(lbrace.StartLocation);
-						AddChange(prevOffset, braceOffset2 - prevOffset, " ");
+						EnsureText(prevOffset, braceOffset2, " ");
 					}
 					break;
 				case BraceStyle.EndOfLineWithoutSpace:
@@ -472,7 +576,7 @@ namespace ICSharpCode.NRefactory.CSharp
 						return;
 					prevOffset = document.GetOffset(prev.EndLocation);
 					int braceOffset = document.GetOffset(lbrace.StartLocation);
-					AddChange(prevOffset, braceOffset - prevOffset, "");
+					EnsureText(prevOffset, braceOffset, "");
 					break;
 
 				case BraceStyle.NextLine:
@@ -481,7 +585,7 @@ namespace ICSharpCode.NRefactory.CSharp
 						return;
 					prevOffset = document.GetOffset(prev.EndLocation);
 					braceOffset = document.GetOffset(lbrace.StartLocation);
-					AddChange(prevOffset, braceOffset - prevOffset, options.EolMarker + curIndent.IndentString);
+					EnsureText(prevOffset, braceOffset, options.EolMarker + curIndent.IndentString);
 					break;
 				case BraceStyle.NextLineShifted:
 					prev = lbrace.GetPrevNode (NoWhitespacePredicate);
@@ -490,7 +594,7 @@ namespace ICSharpCode.NRefactory.CSharp
 					prevOffset = document.GetOffset(prev.EndLocation);
 					braceOffset = document.GetOffset(lbrace.StartLocation);
 					curIndent.Push(IndentType.Block);
-					AddChange(prevOffset, braceOffset - prevOffset, options.EolMarker + curIndent.IndentString);
+					EnsureText(prevOffset, braceOffset, options.EolMarker + curIndent.IndentString);
 					curIndent.Pop();
 					break;
 				case BraceStyle.NextLineShifted2:
@@ -500,7 +604,7 @@ namespace ICSharpCode.NRefactory.CSharp
 					prevOffset = document.GetOffset(prev.EndLocation);
 					braceOffset = document.GetOffset(lbrace.StartLocation);
 					curIndent.Push(IndentType.Block);
-					AddChange(prevOffset, braceOffset - prevOffset, options.EolMarker + curIndent.IndentString);
+					EnsureText(prevOffset, braceOffset, options.EolMarker + curIndent.IndentString);
 					curIndent.Pop();
 					break;
 			}
@@ -508,13 +612,15 @@ namespace ICSharpCode.NRefactory.CSharp
 
 		void CorrectClosingBrace (AstNode rbrace)
 		{
+			if (rbrace.IsNull)
+				return;
 			int braceOffset = document.GetOffset(rbrace.StartLocation);
 			var prevNode = rbrace.GetPrevNode();
 			int prevNodeOffset = prevNode != null ? document.GetOffset(prevNode.EndLocation) : 0;
 			if (prevNode is NewLineNode) {
-				AddChange(prevNodeOffset, braceOffset - prevNodeOffset, curIndent.IndentString);
+				EnsureText(prevNodeOffset, braceOffset, curIndent.IndentString);
 			} else {
-				AddChange(prevNodeOffset, braceOffset - prevNodeOffset, options.EolMarker + curIndent.IndentString);
+				EnsureText(prevNodeOffset, braceOffset, options.EolMarker + curIndent.IndentString);
 			}
 		}
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Expressions.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Expressions.cs
index e21194f88d..d3d7cb8190 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Expressions.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Expressions.cs
@@ -47,19 +47,19 @@ namespace ICSharpCode.NRefactory.CSharp
 			base.VisitComposedType(composedType);
 		}
 
-		public override void VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression)
+		public override void VisitAnonymousMethodExpression(AnonymousMethodExpression lambdaExpression)
 		{
-			if (!anonymousMethodExpression.Body.IsNull) {
-				if (anonymousMethodExpression.Body.LBraceToken.GetNextNode(NoWhitespacePredicate) != anonymousMethodExpression.Body.RBraceToken) {
-					FixOpenBrace(policy.AnonymousMethodBraceStyle, anonymousMethodExpression.Body.LBraceToken);
-					VisitBlockWithoutFixingBraces(anonymousMethodExpression.Body, policy.IndentBlocks);
-					FixClosingBrace(policy.AnonymousMethodBraceStyle, anonymousMethodExpression.Body.RBraceToken);
-				} else {
-					VisitBlockWithoutFixingBraces(anonymousMethodExpression.Body, policy.IndentBlocks);
-				}
-				return;
+			FormatArguments(lambdaExpression);
+
+			if (!lambdaExpression.Body.IsNull) {
+				var old = curIndent;
+				this.curIndent = curIndent.GetIndentWithoutSpace ();
+				FixOpenBrace(policy.AnonymousMethodBraceStyle, lambdaExpression.Body.LBraceToken);
+				VisitBlockWithoutFixingBraces(lambdaExpression.Body, policy.IndentBlocks);
+				FixClosingBrace(policy.AnonymousMethodBraceStyle, lambdaExpression.Body.RBraceToken);
+				curIndent = old;
 			}
-			base.VisitAnonymousMethodExpression(anonymousMethodExpression);
+
 		}
 
 		public override void VisitAssignmentExpression(AssignmentExpression assignmentExpression)
@@ -73,54 +73,60 @@ namespace ICSharpCode.NRefactory.CSharp
 			bool forceSpaces = false;
 			switch (binaryOperatorExpression.Operator) {
 				case BinaryOperatorType.Equality:
-					case BinaryOperatorType.InEquality:
+				case BinaryOperatorType.InEquality:
 					forceSpaces = policy.SpaceAroundEqualityOperator;
 					break;
-					case BinaryOperatorType.GreaterThan:
-					case BinaryOperatorType.GreaterThanOrEqual:
-					case BinaryOperatorType.LessThan:
-					case BinaryOperatorType.LessThanOrEqual:
+				case BinaryOperatorType.GreaterThan:
+				case BinaryOperatorType.GreaterThanOrEqual:
+				case BinaryOperatorType.LessThan:
+				case BinaryOperatorType.LessThanOrEqual:
 					forceSpaces = policy.SpaceAroundRelationalOperator;
 					break;
-					case BinaryOperatorType.ConditionalAnd:
-					case BinaryOperatorType.ConditionalOr:
+				case BinaryOperatorType.ConditionalAnd:
+				case BinaryOperatorType.ConditionalOr:
 					forceSpaces = policy.SpaceAroundLogicalOperator;
 					break;
-					case BinaryOperatorType.BitwiseAnd:
-					case BinaryOperatorType.BitwiseOr:
-					case BinaryOperatorType.ExclusiveOr:
+				case BinaryOperatorType.BitwiseAnd:
+				case BinaryOperatorType.BitwiseOr:
+				case BinaryOperatorType.ExclusiveOr:
 					forceSpaces = policy.SpaceAroundBitwiseOperator;
 					break;
-					case BinaryOperatorType.Add:
-					case BinaryOperatorType.Subtract:
+				case BinaryOperatorType.Add:
+				case BinaryOperatorType.Subtract:
 					forceSpaces = policy.SpaceAroundAdditiveOperator;
 					break;
-					case BinaryOperatorType.Multiply:
-					case BinaryOperatorType.Divide:
-					case BinaryOperatorType.Modulus:
+				case BinaryOperatorType.Multiply:
+				case BinaryOperatorType.Divide:
+				case BinaryOperatorType.Modulus:
 					forceSpaces = policy.SpaceAroundMultiplicativeOperator;
 					break;
-					case BinaryOperatorType.ShiftLeft:
-					case BinaryOperatorType.ShiftRight:
+				case BinaryOperatorType.ShiftLeft:
+				case BinaryOperatorType.ShiftRight:
 					forceSpaces = policy.SpaceAroundShiftOperator;
 					break;
-					case BinaryOperatorType.NullCoalescing:
+				case BinaryOperatorType.NullCoalescing:
 					forceSpaces = policy.SpaceAroundNullCoalescingOperator;
 					break;
 			}
-			ForceSpacesAround(binaryOperatorExpression.OperatorToken, forceSpaces);
+			var opToken = binaryOperatorExpression.OperatorToken;
+			if (opToken.PrevSibling != null && opToken.PrevSibling.Role != Roles.NewLine) {
+				ForceSpacesBefore(opToken, forceSpaces);
+			} else {
+				ForceSpacesAfter(binaryOperatorExpression.Left, false);
+				FixIndentation(opToken);
+			}
+			ForceSpacesAfter(opToken, opToken.NextSibling != null && opToken.NextSibling.Role != Roles.NewLine && forceSpaces);
 
-			base.VisitBinaryOperatorExpression(binaryOperatorExpression);
+			binaryOperatorExpression.Left.AcceptVisitor(this);
 			// Handle line breaks in binary opeartor expression.
 			if (binaryOperatorExpression.Left.EndLocation.Line != binaryOperatorExpression.Right.StartLocation.Line) {
-				curIndent.Push(IndentType.Block);
-				if (binaryOperatorExpression.OperatorToken.StartLocation.Line == binaryOperatorExpression.Right.StartLocation.Line) {
-					FixStatementIndentation(binaryOperatorExpression.OperatorToken.StartLocation);
+				if (opToken.StartLocation.Line == binaryOperatorExpression.Right.StartLocation.Line) {
+					FixStatementIndentation(opToken.StartLocation);
 				} else {
 					FixStatementIndentation(binaryOperatorExpression.Right.StartLocation);
 				}
-				curIndent.Pop ();
 			}
+			binaryOperatorExpression.Right.AcceptVisitor(this);
 		}
 
 		public override void VisitConditionalExpression(ConditionalExpression conditionalExpression)
@@ -145,9 +151,8 @@ namespace ICSharpCode.NRefactory.CSharp
 
 		void ForceSpacesAround(AstNode node, bool forceSpaces)
 		{
-			if (node.IsNull) {
+			if (node.IsNull)
 				return;
-			}
 			ForceSpacesBefore(node, forceSpaces);
 			ForceSpacesAfter(node, forceSpaces);
 		}
@@ -163,7 +168,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 		}
 
-		bool DoWrap (Wrapping wrapping, AstNode wrapNode, int argumentCount)
+		bool DoWrap(Wrapping wrapping, AstNode wrapNode, int argumentCount)
 		{
 			return wrapping == Wrapping.WrapAlways || 
 				options.WrapLineLength > 0 && argumentCount > 1 && wrapping == Wrapping.WrapIfTooLong && wrapNode.StartLocation.Column >= options.WrapLineLength;
@@ -195,7 +200,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				spaceWithinEmptyParentheses = policy.SpaceBetweenEmptyMethodDeclarationParentheses;
 				lParToken = constructorDeclaration.LParToken;
 				rParToken = constructorDeclaration.RParToken;
-				arguments = constructorDeclaration.Parameters.Cast<AstNode> ().ToList ();
+				arguments = constructorDeclaration.Parameters.Cast<AstNode>().ToList();
 			} else if (node is IndexerDeclaration) {
 				var indexer = (IndexerDeclaration)node;
 				methodCallArgumentWrapping = policy.IndexerDeclarationParameterWrapping;
@@ -208,7 +213,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				spaceWithinEmptyParentheses = policy.SpaceBetweenEmptyMethodDeclarationParentheses;
 				lParToken = indexer.LBracketToken;
 				rParToken = indexer.RBracketToken;
-				arguments = indexer.Parameters.Cast<AstNode> ().ToList ();
+				arguments = indexer.Parameters.Cast<AstNode>().ToList();
 			} else if (node is OperatorDeclaration) {
 				var op = (OperatorDeclaration)node;
 				methodCallArgumentWrapping = policy.MethodDeclarationParameterWrapping;
@@ -221,8 +226,8 @@ namespace ICSharpCode.NRefactory.CSharp
 				spaceWithinEmptyParentheses = policy.SpaceBetweenEmptyMethodDeclarationParentheses;
 				lParToken = op.LParToken;
 				rParToken = op.RParToken;
-				arguments = op.Parameters.Cast<AstNode> ().ToList ();
-			} else if (node is MethodDeclaration)  {
+				arguments = op.Parameters.Cast<AstNode>().ToList();
+			} else if (node is MethodDeclaration) {
 				var methodDeclaration = node as MethodDeclaration;
 				methodCallArgumentWrapping = policy.MethodDeclarationParameterWrapping;
 				newLineAferMethodCallOpenParentheses = policy.NewLineAferMethodDeclarationOpenParentheses;
@@ -234,7 +239,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				spaceWithinEmptyParentheses = policy.SpaceBetweenEmptyMethodDeclarationParentheses;
 				lParToken = methodDeclaration.LParToken;
 				rParToken = methodDeclaration.RParToken;
-				arguments = methodDeclaration.Parameters.Cast<AstNode> ().ToList ();
+				arguments = methodDeclaration.Parameters.Cast<AstNode>().ToList();
 			} else if (node is IndexerExpression) {
 				var indexer = (IndexerExpression)node;
 				methodCallArgumentWrapping = policy.IndexerArgumentWrapping;
@@ -247,7 +252,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				spaceBeforeMethodCallParameterComma = policy.SpaceBeforeBracketComma;
 				rParToken = indexer.RBracketToken;
 				lParToken = indexer.LBracketToken;
-				arguments = indexer.Arguments.Cast<AstNode> ().ToList ();
+				arguments = indexer.Arguments.Cast<AstNode>().ToList();
 			} else if (node is ObjectCreateExpression) {
 				var oce = node as ObjectCreateExpression;
 				methodCallArgumentWrapping = policy.MethodCallArgumentWrapping;
@@ -261,7 +266,60 @@ namespace ICSharpCode.NRefactory.CSharp
 
 				rParToken = oce.RParToken;
 				lParToken = oce.LParToken;
-				arguments = oce.Arguments.Cast<AstNode> ().ToList ();
+				arguments = oce.Arguments.Cast<AstNode>().ToList();
+			} else if (node is Attribute) {
+				var oce = node as Attribute;
+				methodCallArgumentWrapping = policy.MethodCallArgumentWrapping;
+				newLineAferMethodCallOpenParentheses = policy.NewLineAferMethodCallOpenParentheses;
+				doAlignToFirstArgument = policy.AlignToFirstMethodCallArgument;
+				methodClosingParenthesesOnNewLine = policy.MethodCallClosingParenthesesOnNewLine;
+				spaceWithinMethodCallParentheses = policy.SpacesWithinNewParentheses;
+				spaceAfterMethodCallParameterComma = policy.SpaceAfterNewParameterComma;
+				spaceBeforeMethodCallParameterComma = policy.SpaceBeforeNewParameterComma;
+				spaceWithinEmptyParentheses = policy.SpacesBetweenEmptyNewParentheses;
+
+				rParToken = oce.RParToken;
+				lParToken = oce.LParToken;
+				arguments = oce.Arguments.Cast<AstNode>().ToList();
+			} else if (node is LambdaExpression) {
+				var methodDeclaration = node as LambdaExpression;
+				methodCallArgumentWrapping = policy.MethodDeclarationParameterWrapping;
+				newLineAferMethodCallOpenParentheses = policy.NewLineAferMethodDeclarationOpenParentheses;
+				methodClosingParenthesesOnNewLine = policy.MethodDeclarationClosingParenthesesOnNewLine;
+				doAlignToFirstArgument = policy.AlignToFirstMethodDeclarationParameter;
+				spaceWithinMethodCallParentheses = policy.SpaceWithinMethodDeclarationParentheses;
+				spaceAfterMethodCallParameterComma = policy.SpaceAfterMethodDeclarationParameterComma;
+				spaceBeforeMethodCallParameterComma = policy.SpaceBeforeMethodDeclarationParameterComma;
+				spaceWithinEmptyParentheses = policy.SpaceBetweenEmptyMethodDeclarationParentheses;
+				lParToken = methodDeclaration.LParToken;
+				rParToken = methodDeclaration.RParToken;
+				arguments = methodDeclaration.Parameters.Cast<AstNode>().ToList();
+			} else if (node is AnonymousMethodExpression) {
+				var methodDeclaration = node as AnonymousMethodExpression;
+				methodCallArgumentWrapping = policy.MethodDeclarationParameterWrapping;
+				newLineAferMethodCallOpenParentheses = policy.NewLineAferMethodDeclarationOpenParentheses;
+				methodClosingParenthesesOnNewLine = policy.MethodDeclarationClosingParenthesesOnNewLine;
+				doAlignToFirstArgument = policy.AlignToFirstMethodDeclarationParameter;
+				spaceWithinMethodCallParentheses = policy.SpaceWithinMethodDeclarationParentheses;
+				spaceAfterMethodCallParameterComma = policy.SpaceAfterMethodDeclarationParameterComma;
+				spaceBeforeMethodCallParameterComma = policy.SpaceBeforeMethodDeclarationParameterComma;
+				spaceWithinEmptyParentheses = policy.SpaceBetweenEmptyMethodDeclarationParentheses;
+				lParToken = methodDeclaration.LParToken;
+				rParToken = methodDeclaration.RParToken;
+				arguments = methodDeclaration.Parameters.Cast<AstNode>().ToList();
+			}  else if (node is ConstructorInitializer) {
+				var constructorInitializer = node as ConstructorInitializer;
+				methodCallArgumentWrapping = policy.MethodDeclarationParameterWrapping;
+				newLineAferMethodCallOpenParentheses = policy.NewLineAferMethodDeclarationOpenParentheses;
+				methodClosingParenthesesOnNewLine = policy.MethodDeclarationClosingParenthesesOnNewLine;
+				doAlignToFirstArgument = policy.AlignToFirstMethodDeclarationParameter;
+				spaceWithinMethodCallParentheses = policy.SpaceWithinMethodDeclarationParentheses;
+				spaceAfterMethodCallParameterComma = policy.SpaceAfterMethodDeclarationParameterComma;
+				spaceBeforeMethodCallParameterComma = policy.SpaceBeforeMethodDeclarationParameterComma;
+				spaceWithinEmptyParentheses = policy.SpaceBetweenEmptyMethodDeclarationParentheses;
+				lParToken = constructorInitializer.LParToken;
+				rParToken = constructorInitializer.RParToken;
+				arguments = constructorInitializer.Arguments.Cast<AstNode>().ToList();
 			} else {
 				InvocationExpression invocationExpression = node as InvocationExpression;
 				methodCallArgumentWrapping = policy.MethodCallArgumentWrapping;
@@ -275,7 +333,7 @@ namespace ICSharpCode.NRefactory.CSharp
 
 				rParToken = invocationExpression.RParToken;
 				lParToken = invocationExpression.LParToken;
-				arguments = invocationExpression.Arguments.Cast<AstNode> ().ToList ();
+				arguments = invocationExpression.Arguments.Cast<AstNode>().ToList();
 			}
 
 			if (formatter.FormattingMode == ICSharpCode.NRefactory.CSharp.FormattingMode.OnTheFly)
@@ -288,7 +346,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 			bool wrapMethodCall = DoWrap(methodCallArgumentWrapping, rParToken, arguments.Count);
 			if (wrapMethodCall && arguments.Any()) {
-				if (ShouldBreakLine (newLineAferMethodCallOpenParentheses, lParToken)) {
+				if (ShouldBreakLine(newLineAferMethodCallOpenParentheses, lParToken)) {
 					curIndent.Push(IndentType.Continuation);
 					foreach (var arg in arguments) {
 						FixStatementIndentation(arg.StartLocation);
@@ -296,6 +354,7 @@ namespace ICSharpCode.NRefactory.CSharp
 					}
 					curIndent.Pop();
 				} else {
+
 					if (!doAlignToFirstArgument) {
 						curIndent.Push(IndentType.Continuation);
 						foreach (var arg in arguments.Take (argumentStart)) {
@@ -307,7 +366,7 @@ namespace ICSharpCode.NRefactory.CSharp
 						}
 						curIndent.Pop();
 					} else {
-						int extraSpaces = arguments.First().StartLocation.Column - 1 - curIndent.IndentString.Length;
+						int extraSpaces = Math.Max(0, arguments.First().StartLocation.Column - 1 - curIndent.IndentString.Length);
 						curIndent.ExtraSpaces += extraSpaces;
 						foreach (var arg in arguments.Take (argumentStart)) {
 							arg.AcceptVisitor(this);
@@ -321,13 +380,14 @@ namespace ICSharpCode.NRefactory.CSharp
 				}
 
 				if (!rParToken.IsNull) {
-					if (ShouldBreakLine (methodClosingParenthesesOnNewLine, rParToken)) {
+					if (ShouldBreakLine(methodClosingParenthesesOnNewLine, rParToken)) {
 						FixStatementIndentation(rParToken.StartLocation);
 					} else if (methodClosingParenthesesOnNewLine == NewLinePlacement.SameLine) {
 						ForceSpacesBeforeRemoveNewLines(rParToken, spaceWithinMethodCallParentheses);
 					}
 				}
 			} else {
+
 				foreach (var arg in arguments.Take (argumentStart)) {
 					arg.AcceptVisitor(this);
 				}
@@ -335,24 +395,29 @@ namespace ICSharpCode.NRefactory.CSharp
 					if (arg.GetPrevSibling(NoWhitespacePredicate) != null) {
 						if (methodCallArgumentWrapping == Wrapping.DoNotWrap) {
 							ForceSpacesBeforeRemoveNewLines(arg, spaceAfterMethodCallParameterComma && arg.GetPrevSibling(NoWhitespacePredicate).Role == Roles.Comma);
+							arg.AcceptVisitor(this);
 						} else {
 							if (!doAlignToFirstArgument && arg.PrevSibling.Role == Roles.NewLine) {
 								curIndent.Push(IndentType.Continuation);
 								FixStatementIndentation(arg.StartLocation);
+								arg.AcceptVisitor(this);
 								curIndent.Pop();
 							} else {
 								if (arg.PrevSibling.StartLocation.Line == arg.StartLocation.Line) {
 									ForceSpacesBefore(arg, spaceAfterMethodCallParameterComma && arg.GetPrevSibling(NoWhitespacePredicate).Role == Roles.Comma);
+									arg.AcceptVisitor(this);
 								} else {
-									int extraSpaces = arguments.First().StartLocation.Column - 1 - curIndent.IndentString.Length;
+									int extraSpaces = Math.Max(0, arguments.First().StartLocation.Column - 1 - curIndent.IndentString.Length);
 									curIndent.ExtraSpaces += extraSpaces;
 									FixStatementIndentation(arg.StartLocation);
+									arg.AcceptVisitor(this);
 									curIndent.ExtraSpaces -= extraSpaces;
 								}
 							}
 						}
+					} else {
+						arg.AcceptVisitor(this);
 					}
-					arg.AcceptVisitor(this);
 				}
 				if (!rParToken.IsNull) {
 					if (methodCallArgumentWrapping == Wrapping.DoNotWrap) {
@@ -376,6 +441,9 @@ namespace ICSharpCode.NRefactory.CSharp
 
 		public override void VisitInvocationExpression(InvocationExpression invocationExpression)
 		{
+			if (!invocationExpression.Target.IsNull)
+				invocationExpression.Target.AcceptVisitor(this);
+
 			ForceSpacesBefore(invocationExpression.LParToken, policy.SpaceBeforeMethodCallParentheses);
 			if (invocationExpression.Arguments.Any()) {
 				ForceSpacesAfter(invocationExpression.LParToken, policy.SpaceWithinMethodCallParentheses);
@@ -384,9 +452,6 @@ namespace ICSharpCode.NRefactory.CSharp
 				ForceSpacesBefore(invocationExpression.RParToken, policy.SpaceBetweenEmptyMethodCallParentheses);
 			}
 
-			if (!invocationExpression.Target.IsNull)
-				invocationExpression.Target.AcceptVisitor(this);
-
 			if (invocationExpression.Target is MemberReferenceExpression) {
 				var mt = (MemberReferenceExpression)invocationExpression.Target;
 				if (mt.Target is InvocationExpression) {
@@ -405,7 +470,7 @@ namespace ICSharpCode.NRefactory.CSharp
 
 		public override void VisitIndexerExpression(IndexerExpression indexerExpression)
 		{
-			ForceSpacesBefore(indexerExpression.LBracketToken, policy.SpacesBeforeBrackets);
+			ForceSpacesBeforeRemoveNewLines(indexerExpression.LBracketToken, policy.SpacesBeforeBrackets);
 			ForceSpacesAfter(indexerExpression.LBracketToken, policy.SpacesWithinBrackets);
 
 			if (!indexerExpression.Target.IsNull)
@@ -419,44 +484,62 @@ namespace ICSharpCode.NRefactory.CSharp
 
 		public override void VisitParenthesizedExpression(ParenthesizedExpression parenthesizedExpression)
 		{
-			ForceSpacesAfter(parenthesizedExpression.LParToken, policy.SpacesWithinParentheses);
-			ForceSpacesBefore(parenthesizedExpression.RParToken, policy.SpacesWithinParentheses);
+			var lp = parenthesizedExpression.LParToken;
+			var expr = parenthesizedExpression.Expression;
+			int extraSpaces = 0;
+			if (lp.StartLocation.Line == expr.StartLocation.Line) {
+				ForceSpacesAfter(lp, policy.SpacesWithinParentheses);
+			} else {
+				extraSpaces += options.IndentSize;
+				curIndent.ExtraSpaces += extraSpaces;
+				FixIndentation(expr);
+			}
+
 			base.VisitParenthesizedExpression(parenthesizedExpression);
+
+			var rp = parenthesizedExpression.RParToken;
+
+			curIndent.ExtraSpaces -= extraSpaces;
+			if (rp.StartLocation.Line == expr.EndLocation.Line) {
+				ForceSpacesBefore(rp, policy.SpacesWithinParentheses);
+			} else {
+				FixIndentation(rp);
+			}
 		}
 
 		public override void VisitSizeOfExpression(SizeOfExpression sizeOfExpression)
 		{
-			ForceSpacesBefore(sizeOfExpression.LParToken, policy.SpaceBeforeSizeOfParentheses);
+			ForceSpacesBeforeRemoveNewLines(sizeOfExpression.LParToken, policy.SpaceBeforeSizeOfParentheses);
 			ForceSpacesAfter(sizeOfExpression.LParToken, policy.SpacesWithinSizeOfParentheses);
-			ForceSpacesBefore(sizeOfExpression.RParToken, policy.SpacesWithinSizeOfParentheses);
+			ForceSpacesBeforeRemoveNewLines(sizeOfExpression.RParToken, policy.SpacesWithinSizeOfParentheses);
 			base.VisitSizeOfExpression(sizeOfExpression);
 		}
 
 		public override void VisitTypeOfExpression(TypeOfExpression typeOfExpression)
 		{
-			ForceSpacesBefore(typeOfExpression.LParToken, policy.SpaceBeforeTypeOfParentheses);
+			ForceSpacesBeforeRemoveNewLines(typeOfExpression.LParToken, policy.SpaceBeforeTypeOfParentheses);
 			ForceSpacesAfter(typeOfExpression.LParToken, policy.SpacesWithinTypeOfParentheses);
-			ForceSpacesBefore(typeOfExpression.RParToken, policy.SpacesWithinTypeOfParentheses);
+			ForceSpacesBeforeRemoveNewLines(typeOfExpression.RParToken, policy.SpacesWithinTypeOfParentheses);
 			base.VisitTypeOfExpression(typeOfExpression);
 		}
 
 		public override void VisitCheckedExpression(CheckedExpression checkedExpression)
 		{
 			ForceSpacesAfter(checkedExpression.LParToken, policy.SpacesWithinCheckedExpressionParantheses);
-			ForceSpacesBefore(checkedExpression.RParToken, policy.SpacesWithinCheckedExpressionParantheses);
+			ForceSpacesBeforeRemoveNewLines(checkedExpression.RParToken, policy.SpacesWithinCheckedExpressionParantheses);
 			base.VisitCheckedExpression(checkedExpression);
 		}
 
 		public override void VisitUncheckedExpression(UncheckedExpression uncheckedExpression)
 		{
 			ForceSpacesAfter(uncheckedExpression.LParToken, policy.SpacesWithinCheckedExpressionParantheses);
-			ForceSpacesBefore(uncheckedExpression.RParToken, policy.SpacesWithinCheckedExpressionParantheses);
+			ForceSpacesBeforeRemoveNewLines(uncheckedExpression.RParToken, policy.SpacesWithinCheckedExpressionParantheses);
 			base.VisitUncheckedExpression(uncheckedExpression);
 		}
 
 		public override void VisitObjectCreateExpression(ObjectCreateExpression objectCreateExpression)
 		{
-			ForceSpacesBefore(objectCreateExpression.LParToken, policy.SpaceBeforeNewParentheses);
+			ForceSpacesBeforeRemoveNewLines(objectCreateExpression.LParToken, policy.SpaceBeforeNewParentheses);
 
 			if (objectCreateExpression.Arguments.Any()) {
 				if (!objectCreateExpression.LParToken.IsNull)
@@ -470,7 +553,6 @@ namespace ICSharpCode.NRefactory.CSharp
 				objectCreateExpression.Type.AcceptVisitor(this);
 			objectCreateExpression.Initializer.AcceptVisitor(this);
 			FormatArguments(objectCreateExpression);
-
 		}
 
 		public override void VisitArrayCreateExpression(ArrayCreateExpression arrayObjectCreateExpression)
@@ -481,6 +563,10 @@ namespace ICSharpCode.NRefactory.CSharp
 
 		public override void VisitArrayInitializerExpression(ArrayInitializerExpression arrayInitializerExpression)
 		{
+			var old = curIndent;
+			curIndent = curIndent.Clone();
+			curIndent.ExtraSpaces = 0;
+
 			if (DoWrap(policy.ArrayInitializerWrapping, arrayInitializerExpression.RBraceToken, arrayInitializerExpression.Elements.Count)) {
 				FixOpenBrace(policy.ArrayInitializerBraceStyle, arrayInitializerExpression.LBraceToken);
 				curIndent.Push(IndentType.Block);
@@ -492,11 +578,11 @@ namespace ICSharpCode.NRefactory.CSharp
 				FixClosingBrace(policy.ArrayInitializerBraceStyle, arrayInitializerExpression.RBraceToken);
 			} else if (policy.ArrayInitializerWrapping == Wrapping.DoNotWrap) {
 				ForceSpacesBeforeRemoveNewLines(arrayInitializerExpression.LBraceToken);
-				ForceSpacesBeforeRemoveNewLines(arrayInitializerExpression.RBraceToken);
 				foreach (var init in arrayInitializerExpression.Elements) {
 					ForceSpacesBeforeRemoveNewLines(init);
 					init.AcceptVisitor(this);
 				}
+				ForceSpacesBeforeRemoveNewLines(arrayInitializerExpression.RBraceToken);
 			} else {
 				var lBrace = arrayInitializerExpression.LBraceToken;
 				var rBrace = arrayInitializerExpression.RBraceToken;
@@ -504,7 +590,6 @@ namespace ICSharpCode.NRefactory.CSharp
 				foreach (var child in arrayInitializerExpression.Children) {
 					if (child.Role == Roles.LBrace) {
 						if (lBrace.StartLocation.Line == rBrace.StartLocation.Line && policy.AllowOneLinedArrayInitialziers) {
-							ForceSpaceBefore(child, true);
 							ForceSpacesAfter(child, true);
 						} else {
 							FixOpenBrace(policy.ArrayInitializerBraceStyle, child);
@@ -523,11 +608,16 @@ namespace ICSharpCode.NRefactory.CSharp
 						continue;
 					}
 					if (child.Role == Roles.Expression) {
-						if (child.PrevSibling.Role == Roles.NewLine)
-							FixIndentation(child);
-						if (child.PrevSibling.Role == Roles.Comma)
-							ForceSpaceBefore(child, true);
-						if (child.NextSibling.Role == Roles.Comma)
+						if (child.PrevSibling != null) {
+							if (child.PrevSibling.Role == Roles.NewLine) {
+								FixIndentation(child);
+							}
+							if (child.PrevSibling.Role == Roles.Comma) {
+								ForceSpaceBefore(child, true);
+							}
+						}
+						child.AcceptVisitor(this);
+						if (child.NextSibling != null && child.NextSibling.Role == Roles.Comma)
 							ForceSpacesAfter(child, false);
 						continue;
 					}
@@ -535,19 +625,48 @@ namespace ICSharpCode.NRefactory.CSharp
 					child.AcceptVisitor(this);
 				}
 			}
+			curIndent = old;
+		}
+
+		public override void VisitParameterDeclaration(ParameterDeclaration parameterDeclaration)
+		{
+			var assignToken = parameterDeclaration.AssignToken;
+			if (!assignToken.IsNull)
+				ForceSpacesAround(assignToken, policy.SpaceAroundAssignment);
+			base.VisitParameterDeclaration(parameterDeclaration);
 		}
 
 		public override void VisitLambdaExpression(LambdaExpression lambdaExpression)
 		{
-			ForceSpacesAfter(lambdaExpression.ArrowToken, true);
-			ForceSpacesBefore(lambdaExpression.ArrowToken, true);
+			FormatArguments(lambdaExpression);
+			ForceSpacesBeforeRemoveNewLines(lambdaExpression.ArrowToken, true);
+
+			if (!lambdaExpression.Body.IsNull) {
+				var body = lambdaExpression.Body as BlockStatement;
+				if (body != null) {
+					var old = curIndent;
+					this.curIndent = curIndent.GetIndentWithoutSpace ();
+					FixOpenBrace(policy.AnonymousMethodBraceStyle, body.LBraceToken);
+					VisitBlockWithoutFixingBraces(body, policy.IndentMethodBody);
+					FixClosingBrace(policy.AnonymousMethodBraceStyle, body.RBraceToken);
+					curIndent = old;
+				} else {
+					ForceSpacesAfter(lambdaExpression.ArrowToken, true);
+					lambdaExpression.Body.AcceptVisitor(this);
+				}
+			}
+		}
 
-			base.VisitLambdaExpression(lambdaExpression);
+		public override void VisitNamedExpression(NamedExpression namedExpression)
+		{
+			ForceSpacesAround(namedExpression.AssignToken, policy.SpaceAroundAssignment);
+			base.VisitNamedExpression(namedExpression);
 		}
 
 		public override void VisitNamedArgumentExpression(NamedArgumentExpression namedArgumentExpression)
 		{
 			ForceSpacesAfter(namedArgumentExpression.ColonToken, policy.SpaceInNamedArgumentAfterDoubleColon);
+
 			base.VisitNamedArgumentExpression(namedArgumentExpression);
 		}
 
@@ -559,6 +678,44 @@ namespace ICSharpCode.NRefactory.CSharp
 			ForceSpacesAfter(dot, false);
 			base.VisitMemberReferenceExpression(memberReferenceExpression);
 		}
+
+		public override void VisitPointerReferenceExpression(PointerReferenceExpression pointerReferenceExpression)
+		{
+			ForceSpacesAround(pointerReferenceExpression.ArrowToken, policy.SpaceAroundUnsafeArrowOperator);
+			base.VisitPointerReferenceExpression(pointerReferenceExpression);
+		}
+
+		public override void VisitUnaryOperatorExpression(UnaryOperatorExpression unaryOperatorExpression)
+		{
+			base.VisitUnaryOperatorExpression(unaryOperatorExpression);
+			switch (unaryOperatorExpression.Operator) {
+				case UnaryOperatorType.Any:
+					break;
+				case UnaryOperatorType.Not:
+				case UnaryOperatorType.BitNot:
+				case UnaryOperatorType.Minus:
+				case UnaryOperatorType.Plus:
+				case UnaryOperatorType.Increment:
+				case UnaryOperatorType.Decrement:
+					ForceSpacesBeforeRemoveNewLines(unaryOperatorExpression.Expression, false);
+					break;
+				case UnaryOperatorType.PostIncrement:
+				case UnaryOperatorType.PostDecrement:
+					ForceSpacesBeforeRemoveNewLines(unaryOperatorExpression.OperatorToken, false);
+					break;
+				case UnaryOperatorType.Dereference:
+					ForceSpacesAfter(unaryOperatorExpression.OperatorToken, policy.SpaceAfterUnsafeAsteriskOfOperator);
+					break;
+				case UnaryOperatorType.AddressOf:
+					ForceSpacesAfter(unaryOperatorExpression.OperatorToken, policy.SpaceAfterUnsafeAddressOfOperator);
+					break;
+				case UnaryOperatorType.Await:
+					ForceSpacesBeforeRemoveNewLines(unaryOperatorExpression.Expression, true);
+					break;
+				default:
+					throw new ArgumentOutOfRangeException();
+			}
+		}
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Global.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Global.cs
index daedfd6e9e..a8720aa0af 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Global.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Global.cs
@@ -32,8 +32,22 @@ namespace ICSharpCode.NRefactory.CSharp
 	{
 		int GetGlobalNewLinesFor(AstNode child)
 		{
+			if (child.NextSibling == null)
+				// last node in the document => no extra newlines
+				return 0;
+			if (child.NextSibling.Role == Roles.RBrace)
+				// Last node in a block => no extra newlines, it's handled later by FixClosingBrace()
+				return 0;
+
 			int newLines = 1;
 			var nextSibling = child.GetNextSibling(NoWhitespacePredicate);
+			if (nextSibling is PreProcessorDirective) {
+				var directive = (PreProcessorDirective)nextSibling;
+				if (directive.Type == PreProcessorDirectiveType.Endif)
+					return -1;
+				if (directive.Type == PreProcessorDirectiveType.Undef)
+					return -1;
+			}
 			if ((child is UsingDeclaration || child is UsingAliasDeclaration) && !(nextSibling is UsingDeclaration || nextSibling is UsingAliasDeclaration)) {
 				newLines += policy.BlankLinesAfterUsings;
 			} else if ((child is TypeDeclaration) && (nextSibling is TypeDeclaration)) {
@@ -54,11 +68,35 @@ namespace ICSharpCode.NRefactory.CSharp
 				if (NoWhitespacePredicate(child))
 					FixIndentation(child);
 				child.AcceptVisitor(this);
-				if (NoWhitespacePredicate(child))
+				if (NoWhitespacePredicate(child) && !first)
 					EnsureNewLinesAfter(child, GetGlobalNewLinesFor(child));
 			});
 		}
 
+		public override void VisitAttributeSection(AttributeSection attributeSection)
+		{
+			VisitChildrenToFormat(attributeSection, child => {
+				child.AcceptVisitor(this);
+				if (child.NextSibling != null && child.NextSibling.Role == Roles.RBracket) {
+					ForceSpacesAfter(child, false);
+				}
+			});
+		}
+
+		public override void VisitAttribute(Attribute attribute)
+		{
+			if (attribute.HasArgumentList) {
+				ForceSpacesBefore(attribute.LParToken, policy.SpaceBeforeMethodCallParentheses);
+				if (attribute.Arguments.Any()) {
+					ForceSpacesAfter(attribute.LParToken, policy.SpaceWithinMethodCallParentheses);
+				} else {
+					ForceSpacesAfter(attribute.LParToken, policy.SpaceBetweenEmptyMethodCallParentheses);
+					ForceSpacesBefore(attribute.RParToken, policy.SpaceBetweenEmptyMethodCallParentheses);
+				}
+				FormatArguments(attribute);
+			}
+		}
+
 		public override void VisitUsingDeclaration(UsingDeclaration usingDeclaration)
 		{
 			ForceSpacesAfter(usingDeclaration.UsingToken, true);
@@ -68,6 +106,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		public override void VisitUsingAliasDeclaration(UsingAliasDeclaration usingDeclaration)
 		{
 			ForceSpacesAfter(usingDeclaration.UsingToken, true);
+			ForceSpacesAround(usingDeclaration.AssignToken, policy.SpaceAroundAssignment);
 			FixSemicolon(usingDeclaration.SemicolonToken);
 		}
 
@@ -127,8 +166,10 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 			if (entity.Attributes.Count > 0) {
 				AstNode n = null;
+				entity.Attributes.First().AcceptVisitor(this);
 				foreach (var attr in entity.Attributes.Skip (1)) {
 					FixIndentation(attr);
+					attr.AcceptVisitor(this);
 					n = attr;
 				}
 				if (n != null) {
@@ -181,6 +222,8 @@ namespace ICSharpCode.NRefactory.CSharp
 				}
 				if (child.Role == Roles.LBrace) {
 					startFormat = true;
+					if (braceStyle != BraceStyle.DoNotChange)
+						EnsureNewLinesAfter(child, GetTypeLevelNewLinesFor(child));
 					return;
 				}
 				if (child.Role == Roles.RBrace) {
@@ -211,7 +254,30 @@ namespace ICSharpCode.NRefactory.CSharp
 		{
 			var blankLines = 1;
 			var nextSibling = child.GetNextSibling(NoWhitespacePredicate);
-			if (child is PreProcessorDirective || child is Comment)
+			if (child is PreProcessorDirective) {
+				var directive = (PreProcessorDirective)child;
+				if (directive.Type == PreProcessorDirectiveType.Region)
+					blankLines += policy.BlankLinesInsideRegion;
+				if (directive.Type == PreProcessorDirectiveType.Endregion)
+					blankLines += policy.BlankLinesAroundRegion;
+				return blankLines;
+			}
+
+			if (nextSibling is PreProcessorDirective) {
+				var directive = (PreProcessorDirective)nextSibling;
+				if (directive.Type == PreProcessorDirectiveType.Region)
+					blankLines += policy.BlankLinesAroundRegion;
+				if (directive.Type == PreProcessorDirectiveType.Endregion)
+					blankLines += policy.BlankLinesInsideRegion;
+				if (directive.Type == PreProcessorDirectiveType.Endif)
+					return -1;
+				if (directive.Type == PreProcessorDirectiveType.Undef)
+					return -1;
+				return blankLines;
+			}
+			if (child.Role == Roles.LBrace)
+				return 1;
+			if (child is Comment)
 				return 1;
 			if (child is EventDeclaration) {
 				if (nextSibling is EventDeclaration) {
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Query.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Query.cs
new file mode 100644
index 0000000000..bfdc476407
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Query.cs
@@ -0,0 +1,124 @@
+//
+// AstFormattingVisitor_Query.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+//
+// Copyright (c) 2013 Luís Reis
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	partial class FormattingVisitor
+	{
+		int GetUpdatedStartLocation(QueryExpression queryExpression)
+		{
+			//TODO
+			return queryExpression.StartLocation.Column;
+		}
+
+		public override void VisitQueryExpression(QueryExpression queryExpression)
+		{
+			var oldIndent = curIndent.Clone();
+
+			var column = GetUpdatedStartLocation(queryExpression);
+
+			int extraSpaces = column - 1 - (curIndent.CurIndent / options.TabSize);
+			if (extraSpaces < 0) {
+				//This check should probably be removed in the future, when GetUpdatedStartLocation is implemented
+				extraSpaces = 0;
+			}
+
+			curIndent.ExtraSpaces = extraSpaces;
+			VisitChildren(queryExpression);
+
+			curIndent = oldIndent;
+		}
+
+		public override void VisitQueryFromClause(QueryFromClause queryFromClause)
+		{
+			FixClauseIndentation(queryFromClause, queryFromClause.FromKeyword);
+		}
+
+		public override void VisitQueryContinuationClause(QueryContinuationClause queryContinuationClause)
+		{
+			VisitChildren(queryContinuationClause);
+		}
+
+		public override void VisitQueryGroupClause(QueryGroupClause queryGroupClause)
+		{
+			FixClauseIndentation(queryGroupClause, queryGroupClause.GroupKeyword);
+		}
+
+		public override void VisitQueryJoinClause(QueryJoinClause queryJoinClause)
+		{
+			FixClauseIndentation(queryJoinClause, queryJoinClause.JoinKeyword);
+		}
+
+		public override void VisitQueryLetClause(QueryLetClause queryLetClause)
+		{
+			FixClauseIndentation(queryLetClause, queryLetClause.LetKeyword);
+		}
+
+		public override void VisitQuerySelectClause(QuerySelectClause querySelectClause)
+		{
+			FixClauseIndentation(querySelectClause, querySelectClause.SelectKeyword);
+		}
+
+		public override void VisitQueryOrderClause(QueryOrderClause queryOrderClause)
+		{
+			FixClauseIndentation(queryOrderClause, queryOrderClause.OrderbyToken);
+		}
+
+		public override void VisitQueryWhereClause(QueryWhereClause queryWhereClause)
+		{
+			FixClauseIndentation(queryWhereClause, queryWhereClause.WhereKeyword);
+		}
+
+		void FixClauseIndentation(QueryClause clause, AstNode keyword) {
+			var parentExpression = clause.GetParent<QueryExpression>();
+			bool isFirstClause = parentExpression.Clauses.First() == clause;
+			if (!isFirstClause) {
+				PlaceOnNewLine(policy.NewLineBeforeNewQueryClause, keyword);
+			}
+
+			int extraSpaces = options.IndentSize;
+			curIndent.ExtraSpaces += extraSpaces;
+			foreach (var child in clause.Children) {
+				var expression = child as Expression;
+				if (expression != null) {
+					FixIndentation(child);
+					child.AcceptVisitor(this);
+				}
+
+				var tokenNode = child as CSharpTokenNode;
+				if (tokenNode != null) {
+					if (tokenNode.GetNextSibling(NoWhitespacePredicate).StartLocation.Line != tokenNode.EndLocation.Line) {
+						ForceSpacesAfter(tokenNode, false);
+					}
+				}
+			}
+			curIndent.ExtraSpaces -= extraSpaces;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Statements.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Statements.cs
index 7cb067723e..19485e5654 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Statements.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Statements.cs
@@ -101,11 +101,11 @@ namespace ICSharpCode.NRefactory.CSharp
 
 		public override void VisitForeachStatement(ForeachStatement foreachStatement)
 		{
-			ForceSpacesBefore(foreachStatement.LParToken, policy.SpaceBeforeForeachParentheses);
+			ForceSpacesBeforeRemoveNewLines(foreachStatement.LParToken, policy.SpaceBeforeForeachParentheses);
 
 			ForceSpacesAfter(foreachStatement.LParToken, policy.SpacesWithinForeachParentheses);
-			ForceSpacesBefore(foreachStatement.RParToken, policy.SpacesWithinForeachParentheses);
-
+			ForceSpacesBeforeRemoveNewLines(foreachStatement.RParToken, policy.SpacesWithinForeachParentheses);
+			
 			FixEmbeddedStatment(policy.StatementBraceStyle, foreachStatement.EmbeddedStatement);
 		}
 
@@ -141,15 +141,20 @@ namespace ICSharpCode.NRefactory.CSharp
 				}
 			}
 			bool pushed = false;
-			if (policy.IndentBlocks && !(policy.AlignEmbeddedIfStatements && node is IfElseStatement && node.Parent is IfElseStatement || policy.AlignEmbeddedUsingStatements && node is UsingStatement && node.Parent is UsingStatement)) { 
+
+			if (policy.IndentBlocks && !(
+					policy.AlignEmbeddedIfStatements && node is IfElseStatement && node.Parent is IfElseStatement || 
+					policy.AlignEmbeddedUsingStatements && node is UsingStatement && node.Parent is UsingStatement)) { 
 				curIndent.Push(IndentType.Block);
 				pushed = true;
 			}
 			if (isBlock) {
 				VisitBlockWithoutFixingBraces((BlockStatement)node, false);
 			} else {
-				if (!statementAlreadyIndented)
-					FixStatementIndentation(node.StartLocation);
+				if (!statementAlreadyIndented) {
+					PlaceOnNewLine(policy.EmbeddedStatementPlacement, node);
+					nextStatementIndent = null;
+				}
 				node.AcceptVisitor(this);
 			}
 			if (pushed)
@@ -177,7 +182,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			for (int offset = startOffset - 1; offset >= 0; offset--) {
 				char ch = document.GetCharAt(offset);
 				if (ch != ' ' && ch != '\t') {
-					return ch == '\n' || ch == '\r';
+					return NewLine.IsNewLine (ch);
 				}
 			}
 			return true;
@@ -234,15 +239,17 @@ namespace ICSharpCode.NRefactory.CSharp
 					}
 					ForceSpacesBefore(node, policy.SpaceBeforeForSemicolon);
 					ForceSpacesAfter(node, policy.SpaceAfterForSemicolon);
+				} else if (node.Role == Roles.LPar) {
+					ForceSpacesBeforeRemoveNewLines(node, policy.SpaceBeforeForParentheses);
+					ForceSpacesAfter(node, policy.SpacesWithinForParentheses);
+				} else if (node.Role == Roles.RPar) {
+					ForceSpacesBeforeRemoveNewLines(node, policy.SpacesWithinForParentheses);
+				} else if (node.Role == Roles.EmbeddedStatement) {
+					FixEmbeddedStatment(policy.StatementBraceStyle, node);
+				} else {
+					node.AcceptVisitor(this); 
 				}
 			}
-
-			ForceSpacesBefore(forStatement.LParToken, policy.SpaceBeforeForParentheses);
-
-			ForceSpacesAfter(forStatement.LParToken, policy.SpacesWithinForParentheses);
-			ForceSpacesBefore(forStatement.RParToken, policy.SpacesWithinForParentheses);
-
-			FixEmbeddedStatment(policy.StatementBraceStyle, forStatement.EmbeddedStatement);
 		}
 
 		public override void VisitGotoStatement(GotoStatement gotoStatement)
@@ -253,18 +260,10 @@ namespace ICSharpCode.NRefactory.CSharp
 
 		public override void VisitIfElseStatement(IfElseStatement ifElseStatement)
 		{
-			ForceSpacesBefore(ifElseStatement.LParToken, policy.SpaceBeforeIfParentheses);
-
-			ForceSpacesAfter(ifElseStatement.LParToken, policy.SpacesWithinIfParentheses);
-			ForceSpacesBefore(ifElseStatement.RParToken, policy.SpacesWithinIfParentheses);
+			ForceSpacesBeforeRemoveNewLines(ifElseStatement.LParToken, policy.SpaceBeforeIfParentheses);
+			Align(ifElseStatement.LParToken, ifElseStatement.Condition, policy.SpacesWithinIfParentheses);
+			ForceSpacesBeforeRemoveNewLines(ifElseStatement.RParToken, policy.SpacesWithinIfParentheses);
 
-			if (!(ifElseStatement.Parent is IfElseStatement && ((IfElseStatement)ifElseStatement.Parent).FalseStatement == ifElseStatement)) {
-				FixStatementIndentation(ifElseStatement.StartLocation);
-			}
-
-			if (!ifElseStatement.Condition.IsNull) {
-				ifElseStatement.Condition.AcceptVisitor(this);
-			}
 
 			if (!ifElseStatement.TrueStatement.IsNull) {
 				FixEmbeddedStatment(policy.StatementBraceStyle, ifElseStatement.IfToken, policy.AllowIfBlockInline, ifElseStatement.TrueStatement);
@@ -272,8 +271,9 @@ namespace ICSharpCode.NRefactory.CSharp
 
 			if (!ifElseStatement.FalseStatement.IsNull) {
 				var placeElseOnNewLine = policy.ElseNewLinePlacement;
-				if (!(ifElseStatement.TrueStatement is BlockStatement))
+				if (!(ifElseStatement.TrueStatement is BlockStatement)) {
 					placeElseOnNewLine = NewLinePlacement.NewLine;
+				}
 				PlaceOnNewLine(placeElseOnNewLine, ifElseStatement.ElseToken);
 				if (ifElseStatement.FalseStatement is IfElseStatement) {
 					PlaceOnNewLine(policy.ElseIfNewLinePlacement, ((IfElseStatement)ifElseStatement.FalseStatement).IfToken);
@@ -290,10 +290,10 @@ namespace ICSharpCode.NRefactory.CSharp
 
 		public override void VisitLockStatement(LockStatement lockStatement)
 		{
-			ForceSpacesBefore(lockStatement.LParToken, policy.SpaceBeforeLockParentheses);
+			ForceSpacesBeforeRemoveNewLines(lockStatement.LParToken, policy.SpaceBeforeLockParentheses);
 
 			ForceSpacesAfter(lockStatement.LParToken, policy.SpacesWithinLockParentheses);
-			ForceSpacesBefore(lockStatement.RParToken, policy.SpacesWithinLockParentheses);
+			ForceSpacesBeforeRemoveNewLines(lockStatement.RParToken, policy.SpacesWithinLockParentheses);
 
 			FixEmbeddedStatment(policy.StatementBraceStyle, lockStatement.EmbeddedStatement);
 		}
@@ -306,10 +306,10 @@ namespace ICSharpCode.NRefactory.CSharp
 
 		public override void VisitSwitchStatement(SwitchStatement switchStatement)
 		{
-			ForceSpacesBefore(switchStatement.LParToken, policy.SpaceBeforeSwitchParentheses);
+			ForceSpacesBeforeRemoveNewLines(switchStatement.LParToken, policy.SpaceBeforeSwitchParentheses);
 
 			ForceSpacesAfter(switchStatement.LParToken, policy.SpacesWithinSwitchParentheses);
-			ForceSpacesBefore(switchStatement.RParToken, policy.SpacesWithinSwitchParentheses);
+			ForceSpacesBeforeRemoveNewLines(switchStatement.RParToken, policy.SpacesWithinSwitchParentheses);
 
 			FixOpenBrace(policy.StatementBraceStyle, switchStatement.LBraceToken);
 			VisitChildren(switchStatement);
@@ -370,10 +370,10 @@ namespace ICSharpCode.NRefactory.CSharp
 			foreach (CatchClause clause in tryCatchStatement.CatchClauses) {
 				PlaceOnNewLine(policy.CatchNewLinePlacement, clause.CatchToken);
 				if (!clause.LParToken.IsNull) {
-					ForceSpacesBefore(clause.LParToken, policy.SpaceBeforeCatchParentheses);
+					ForceSpacesBeforeRemoveNewLines(clause.LParToken, policy.SpaceBeforeCatchParentheses);
 
 					ForceSpacesAfter(clause.LParToken, policy.SpacesWithinCatchParentheses);
-					ForceSpacesBefore(clause.RParToken, policy.SpacesWithinCatchParentheses);
+					ForceSpacesBeforeRemoveNewLines(clause.RParToken, policy.SpacesWithinCatchParentheses);
 				}
 				FixEmbeddedStatment(policy.StatementBraceStyle, clause.Body);
 			}
@@ -403,10 +403,11 @@ namespace ICSharpCode.NRefactory.CSharp
 
 		public override void VisitUsingStatement(UsingStatement usingStatement)
 		{
-			ForceSpacesBefore(usingStatement.LParToken, policy.SpaceBeforeUsingParentheses);
+			ForceSpacesBeforeRemoveNewLines(usingStatement.LParToken, policy.SpaceBeforeUsingParentheses);
 
-			ForceSpacesAfter(usingStatement.LParToken, policy.SpacesWithinUsingParentheses);
-			ForceSpacesBefore(usingStatement.RParToken, policy.SpacesWithinUsingParentheses);
+			Align(usingStatement.LParToken, usingStatement.ResourceAcquisition, policy.SpacesWithinUsingParentheses);
+
+			ForceSpacesBeforeRemoveNewLines(usingStatement.RParToken, policy.SpacesWithinUsingParentheses);
 
 			FixEmbeddedStatment(policy.StatementBraceStyle, usingStatement.EmbeddedStatement);
 		}
@@ -435,16 +436,40 @@ namespace ICSharpCode.NRefactory.CSharp
 
 		public override void VisitDoWhileStatement(DoWhileStatement doWhileStatement)
 		{
-			PlaceOnNewLine(policy.WhileNewLinePlacement, doWhileStatement.WhileToken);
 			FixEmbeddedStatment(policy.StatementBraceStyle, doWhileStatement.EmbeddedStatement);
+			PlaceOnNewLine(doWhileStatement.EmbeddedStatement is BlockStatement ? policy.WhileNewLinePlacement : NewLinePlacement.NewLine, doWhileStatement.WhileToken);
+
+			Align(doWhileStatement.LParToken, doWhileStatement.Condition, policy.SpacesWithinWhileParentheses);
+			ForceSpacesBeforeRemoveNewLines(doWhileStatement.RParToken, policy.SpacesWithinWhileParentheses);
 		}
 
-		public override void VisitWhileStatement(WhileStatement whileStatement)
+		void Align(AstNode lPar, AstNode alignNode, bool space)
 		{
-			ForceSpacesBefore(whileStatement.LParToken, policy.SpaceBeforeWhileParentheses);
+			int extraSpaces = 0;
+			var useExtraSpaces = lPar.StartLocation.Line == alignNode.StartLocation.Line;
+			if (useExtraSpaces) {
+				extraSpaces = Math.Max(0, lPar.StartLocation.Column + (space ? 1 : 0) - curIndent.IndentString.Length);
+				curIndent.ExtraSpaces += extraSpaces;
+				ForceSpacesAfter(lPar, space);
+			} else {
+				curIndent.Push(IndentType.Continuation); 
+				FixIndentation(alignNode);
+			}
+			alignNode.AcceptVisitor(this);
+
+			if (useExtraSpaces) {
+				curIndent.ExtraSpaces -= extraSpaces;
+			} else {
+				curIndent.Pop();
+			}
+
+		}
 
-			ForceSpacesAfter(whileStatement.LParToken, policy.SpacesWithinWhileParentheses);
-			ForceSpacesBefore(whileStatement.RParToken, policy.SpacesWithinWhileParentheses);
+		public override void VisitWhileStatement(WhileStatement whileStatement)
+		{
+			ForceSpacesBeforeRemoveNewLines(whileStatement.LParToken, policy.SpaceBeforeWhileParentheses);
+			Align(whileStatement.LParToken, whileStatement.Condition, policy.SpacesWithinWhileParentheses);
+			ForceSpacesBeforeRemoveNewLines(whileStatement.RParToken, policy.SpacesWithinWhileParentheses);
 
 			FixEmbeddedStatment(policy.StatementBraceStyle, whileStatement.EmbeddedStatement);
 		}
@@ -466,8 +491,24 @@ namespace ICSharpCode.NRefactory.CSharp
 				ForceSpacesAround(variableInitializer.AssignToken, policy.SpaceAroundAssignment);
 			}
 			if (!variableInitializer.Initializer.IsNull) {
+				int extraSpaces = 0;
+				var useExtraSpaces = variableInitializer.AssignToken.StartLocation.Line == variableInitializer.Initializer.StartLocation.Line;
+				if (useExtraSpaces) {
+					extraSpaces = Math.Max(0, variableInitializer.AssignToken.StartLocation.Column + 1 - curIndent.IndentString.Length);
+					curIndent.ExtraSpaces += extraSpaces;
+				} else {
+					curIndent.Push(IndentType.Continuation); 
+					FixIndentation(variableInitializer.Initializer);
+				}
 				variableInitializer.Initializer.AcceptVisitor(this);
+
+				if (useExtraSpaces) {
+					curIndent.ExtraSpaces -= extraSpaces;
+				} else {
+					curIndent.Pop();
+				}
 			}
+
 		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_TypeMembers.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_TypeMembers.cs
index 415450457e..8762f1f697 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_TypeMembers.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_TypeMembers.cs
@@ -35,7 +35,16 @@ namespace ICSharpCode.NRefactory.CSharp
 			FixAttributesAndDocComment(propertyDeclaration);
 			bool oneLine = false;
 			bool fixClosingBrace = false;
-			switch (policy.PropertyFormatting) {
+			PropertyFormatting propertyFormatting;
+
+			if ((propertyDeclaration.Getter.IsNull || propertyDeclaration.Getter.Body.IsNull) &&
+			    (propertyDeclaration.Setter.IsNull || propertyDeclaration.Setter.Body.IsNull)) {
+				propertyFormatting = policy.AutoPropertyFormatting;
+			} else {
+				propertyFormatting = policy.SimplePropertyFormatting;
+			}
+
+			switch (propertyFormatting) {
 				case PropertyFormatting.AllowOneLine:
 					bool isSimple = IsSimpleAccessor(propertyDeclaration.Getter) && IsSimpleAccessor(propertyDeclaration.Setter);
 					int accessorLine = propertyDeclaration.RBraceToken.StartLocation.Line;
@@ -48,6 +57,10 @@ namespace ICSharpCode.NRefactory.CSharp
 							propertyDeclaration.Getter : propertyDeclaration.Setter;
 						accessorLine = acc.StartLocation.Line;
 					}
+					if (isSimple && 
+					    Math.Min(propertyDeclaration.Getter.StartLocation.Line, propertyDeclaration.Setter.StartLocation.Line) == propertyDeclaration.LBraceToken.StartLocation.Line &&
+				        propertyDeclaration.Getter.StartLocation.Line != propertyDeclaration.Setter.StartLocation.Line)
+						goto case PropertyFormatting.ForceOneLine;
 					if (!isSimple || propertyDeclaration.LBraceToken.StartLocation.Line != accessorLine) {
 						fixClosingBrace = true;
 						FixOpenBrace(policy.PropertyBraceStyle, propertyDeclaration.LBraceToken);
@@ -58,102 +71,103 @@ namespace ICSharpCode.NRefactory.CSharp
 						oneLine = true;
 					}
 					break;
-					case PropertyFormatting.ForceNewLine:
+				case PropertyFormatting.ForceNewLine:
+					fixClosingBrace = true;
+					FixOpenBrace(policy.PropertyBraceStyle, propertyDeclaration.LBraceToken);
+					break;
+				case PropertyFormatting.ForceOneLine:
+					isSimple = IsSimpleAccessor(propertyDeclaration.Getter) && IsSimpleAccessor(propertyDeclaration.Setter);
+					if (isSimple) {
+						var lBraceToken = propertyDeclaration.LBraceToken;
+						var rBraceToken = propertyDeclaration.RBraceToken;
+						ForceSpacesBeforeRemoveNewLines(lBraceToken, true);
+						if (!propertyDeclaration.Getter.IsNull)
+							ForceSpacesBeforeRemoveNewLines(propertyDeclaration.Getter, true);
+						if (!propertyDeclaration.Setter.IsNull)
+							ForceSpacesBeforeRemoveNewLines(propertyDeclaration.Setter, true);
+
+						ForceSpacesBeforeRemoveNewLines(rBraceToken, true);
+						oneLine = true;
+					} else {
 						fixClosingBrace = true;
 						FixOpenBrace(policy.PropertyBraceStyle, propertyDeclaration.LBraceToken);
-						break;
-					case PropertyFormatting.ForceOneLine:
-						isSimple = IsSimpleAccessor(propertyDeclaration.Getter) && IsSimpleAccessor(propertyDeclaration.Setter);
-						if (isSimple) {
-							int offset = this.document.GetOffset(propertyDeclaration.LBraceToken.StartLocation);
-
-							int start = SearchWhitespaceStart(offset);
-							int end = SearchWhitespaceEnd(offset);
-							AddChange(start, offset - start, " ");
-							AddChange(offset + 1, end - offset - 2, " ");
-
-							offset = this.document.GetOffset(propertyDeclaration.RBraceToken.StartLocation);
-							start = SearchWhitespaceStart(offset);
-							AddChange(start, offset - start, " ");
-							oneLine = true;
-
-						} else {
-							fixClosingBrace = true;
-							FixOpenBrace(policy.PropertyBraceStyle, propertyDeclaration.LBraceToken);
-						}
+					}
 					break;
 			}
 			if (policy.IndentPropertyBody)
 				curIndent.Push(IndentType.Block);
 
-			///System.Console.WriteLine ("one line: " + oneLine);
-			if (!propertyDeclaration.Getter.IsNull) {
-				if (!oneLine) {
-					if (!IsLineIsEmptyUpToEol(propertyDeclaration.Getter.StartLocation)) {
-						int offset = this.document.GetOffset(propertyDeclaration.Getter.StartLocation);
-						int start = SearchWhitespaceStart(offset);
-						string indentString = this.curIndent.IndentString;
-						AddChange(start, offset - start, this.options.EolMarker + indentString);
-					} else {
-						FixIndentation(propertyDeclaration.Getter);
-					}
-				} else {
-					int offset = this.document.GetOffset(propertyDeclaration.Getter.StartLocation);
-					int start = SearchWhitespaceStart(offset);
-					AddChange(start, offset - start, " ");
-
-					ForceSpacesBefore(propertyDeclaration.Getter.Body.LBraceToken, true);
-					ForceSpacesBefore(propertyDeclaration.Getter.Body.RBraceToken, true);
-				}
-				if (!propertyDeclaration.Getter.Body.IsNull) {
-					if (!policy.AllowPropertyGetBlockInline || propertyDeclaration.Getter.Body.LBraceToken.StartLocation.Line != propertyDeclaration.Getter.Body.RBraceToken.StartLocation.Line) {
-						FixOpenBrace(policy.PropertyGetBraceStyle, propertyDeclaration.Getter.Body.LBraceToken);
-						VisitBlockWithoutFixingBraces(propertyDeclaration.Getter.Body, policy.IndentBlocks);
-						FixClosingBrace(policy.PropertyGetBraceStyle, propertyDeclaration.Getter.Body.RBraceToken);
-					} else {
-						nextStatementIndent = " ";
-						VisitBlockWithoutFixingBraces(propertyDeclaration.Getter.Body, policy.IndentBlocks);
+			FormatAccessor(propertyDeclaration.Getter, policy.PropertyGetBraceStyle, policy.SimpleGetBlockFormatting, oneLine);
+			FormatAccessor(propertyDeclaration.Setter, policy.PropertySetBraceStyle, policy.SimpleSetBlockFormatting, oneLine);
 
-					}
-				}
+			if (policy.IndentPropertyBody) {
+				curIndent.Pop();
 			}
+			if (fixClosingBrace)
+				FixClosingBrace(policy.PropertyBraceStyle, propertyDeclaration.RBraceToken);
 
-			if (!propertyDeclaration.Setter.IsNull) {
-				if (!oneLine) {
-					if (!IsLineIsEmptyUpToEol(propertyDeclaration.Setter.StartLocation)) {
-						int offset = document.GetOffset(propertyDeclaration.Setter.StartLocation);
-						int start = SearchWhitespaceStart(offset);
-						string indentString = curIndent.IndentString;
-						AddChange(start, offset - start, options.EolMarker + indentString);
-					} else {
-						FixIndentation(propertyDeclaration.Setter);
-					}
-				} else {
-					int offset = this.document.GetOffset(propertyDeclaration.Setter.StartLocation);
-					int start = SearchWhitespaceStart(offset);
-					AddChange(start, offset - start, " ");
+		}
 
-					ForceSpacesBefore(propertyDeclaration.Setter.Body.LBraceToken, true);
-					ForceSpacesBefore(propertyDeclaration.Setter.Body.RBraceToken, true);
+		void FormatAccessor(Accessor accessor, BraceStyle braceStyle, PropertyFormatting blockFormatting, bool oneLine)
+		{
+			if (accessor.IsNull)
+				return;
+			if (!oneLine) {
+				if (!IsLineIsEmptyUpToEol(accessor.StartLocation)) {
+					int offset = this.document.GetOffset(accessor.StartLocation);
+					int start = SearchWhitespaceStart(offset);
+					string indentString = this.curIndent.IndentString;
+					AddChange(start, offset - start, this.options.EolMarker + indentString);
+				} else {
+					FixIndentation(accessor);
 				}
-				if (!propertyDeclaration.Setter.Body.IsNull) {
-					if (!policy.AllowPropertySetBlockInline || propertyDeclaration.Setter.Body.LBraceToken.StartLocation.Line != propertyDeclaration.Setter.Body.RBraceToken.StartLocation.Line) {
-						FixOpenBrace(policy.PropertySetBraceStyle, propertyDeclaration.Setter.Body.LBraceToken);
-						VisitBlockWithoutFixingBraces(propertyDeclaration.Setter.Body, policy.IndentBlocks);
-						FixClosingBrace(policy.PropertySetBraceStyle, propertyDeclaration.Setter.Body.RBraceToken);
-					} else {
-						nextStatementIndent = " ";
-						VisitBlockWithoutFixingBraces(propertyDeclaration.Setter.Body, policy.IndentBlocks);
-					}
+			} else {
+				blockFormatting = PropertyFormatting.ForceOneLine;
+				if (!accessor.Body.IsNull) {
+					ForceSpacesBeforeRemoveNewLines(accessor.Body.LBraceToken, true);
+					ForceSpacesBeforeRemoveNewLines(accessor.Body.RBraceToken, true);
 				}
 			}
 
-			if (policy.IndentPropertyBody) {
-				curIndent.Pop ();
+		
+			if (!accessor.IsNull) {
+				if (!accessor.Body.IsNull) {
+					if (IsSimpleAccessor (accessor)) {
+						switch (blockFormatting) {
+							case PropertyFormatting.AllowOneLine:
+								if (accessor.Body.LBraceToken.StartLocation.Line != accessor.Body.RBraceToken.StartLocation.Line)
+									goto case PropertyFormatting.ForceNewLine;
+								nextStatementIndent = " ";
+								VisitBlockWithoutFixingBraces(accessor.Body, policy.IndentBlocks);
+								if (!oneLine)
+									ForceSpacesBeforeRemoveNewLines(accessor.Body.RBraceToken, true);
+								break;
+							case PropertyFormatting.ForceOneLine:
+								FixOpenBrace(BraceStyle.EndOfLine, accessor.Body.LBraceToken);
+
+
+								var statement = accessor.Body.Statements.FirstOrDefault();
+								if (statement != null) {
+									ForceSpacesBeforeRemoveNewLines(statement, true);
+									statement.AcceptVisitor(this);
+								}
+								if (!oneLine)
+									ForceSpacesBeforeRemoveNewLines(accessor.Body.RBraceToken, true);
+								break;
+							case PropertyFormatting.ForceNewLine:
+								FixOpenBrace(braceStyle, accessor.Body.LBraceToken);
+								VisitBlockWithoutFixingBraces(accessor.Body, policy.IndentBlocks);
+								if (!oneLine)
+									FixClosingBrace(braceStyle, accessor.Body.RBraceToken);
+								break;
+						}
+					} else {
+						FixOpenBrace(braceStyle, accessor.Body.LBraceToken);
+						VisitBlockWithoutFixingBraces(accessor.Body, policy.IndentBlocks);
+						FixClosingBrace(braceStyle, accessor.Body.RBraceToken);
+					}
+				} 
 			}
-			if (fixClosingBrace)
-				FixClosingBrace(policy.PropertyBraceStyle, propertyDeclaration.RBraceToken);
-
 		}
 
 		public override void VisitAccessor(Accessor accessor)
@@ -163,7 +177,6 @@ namespace ICSharpCode.NRefactory.CSharp
 			base.VisitAccessor(accessor);
 		}
 
-
 		public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
 		{
 			FixAttributesAndDocComment(indexerDeclaration);
@@ -173,41 +186,67 @@ namespace ICSharpCode.NRefactory.CSharp
 
 			FormatArguments(indexerDeclaration);
 
-			FixOpenBrace(policy.PropertyBraceStyle, indexerDeclaration.LBraceToken);
-			if (policy.IndentPropertyBody)
-				curIndent.Push(IndentType.Block);
-
-			if (!indexerDeclaration.Getter.IsNull) {
-				FixIndentation(indexerDeclaration.Getter);
-				if (!indexerDeclaration.Getter.Body.IsNull) {
-					if (!policy.AllowPropertyGetBlockInline || indexerDeclaration.Getter.Body.LBraceToken.StartLocation.Line != indexerDeclaration.Getter.Body.RBraceToken.StartLocation.Line) {
-						FixOpenBrace(policy.PropertyGetBraceStyle, indexerDeclaration.Getter.Body.LBraceToken);
-						VisitBlockWithoutFixingBraces(indexerDeclaration.Getter.Body, policy.IndentBlocks);
-						FixClosingBrace(policy.PropertyGetBraceStyle, indexerDeclaration.Getter.Body.RBraceToken);
+			bool oneLine = false;
+			bool fixClosingBrace = false;
+			switch (policy.SimplePropertyFormatting) {
+				case PropertyFormatting.AllowOneLine:
+					bool isSimple = IsSimpleAccessor(indexerDeclaration.Getter) && IsSimpleAccessor(indexerDeclaration.Setter);
+					int accessorLine = indexerDeclaration.RBraceToken.StartLocation.Line;
+					if (!indexerDeclaration.Getter.IsNull && indexerDeclaration.Setter.IsNull) {
+						accessorLine = indexerDeclaration.Getter.StartLocation.Line;
+					} else if (indexerDeclaration.Getter.IsNull && !indexerDeclaration.Setter.IsNull) {
+						accessorLine = indexerDeclaration.Setter.StartLocation.Line;
 					} else {
-						nextStatementIndent = " ";
-						VisitBlockWithoutFixingBraces(indexerDeclaration.Getter.Body, policy.IndentBlocks);
+						var acc = indexerDeclaration.Getter.StartLocation < indexerDeclaration.Setter.StartLocation ?
+							indexerDeclaration.Getter : indexerDeclaration.Setter;
+						accessorLine = acc.StartLocation.Line;
 					}
-				}
-			}
+					if (!isSimple || indexerDeclaration.LBraceToken.StartLocation.Line != accessorLine) {
+						fixClosingBrace = true;
+						FixOpenBrace(policy.PropertyBraceStyle, indexerDeclaration.LBraceToken);
+					} else {
+						ForceSpacesBefore(indexerDeclaration.Getter, true);
+						ForceSpacesBefore(indexerDeclaration.Setter, true);
+						ForceSpacesBeforeRemoveNewLines(indexerDeclaration.RBraceToken, true);
+						oneLine = true;
+					}
+					break;
+				case PropertyFormatting.ForceNewLine:
+					fixClosingBrace = true;
+					FixOpenBrace(policy.PropertyBraceStyle, indexerDeclaration.LBraceToken);
+					break;
+				case PropertyFormatting.ForceOneLine:
+					isSimple = IsSimpleAccessor(indexerDeclaration.Getter) && IsSimpleAccessor(indexerDeclaration.Setter);
+					if (isSimple) {
+						int offset = this.document.GetOffset(indexerDeclaration.LBraceToken.StartLocation);
+
+						int start = SearchWhitespaceStart(offset);
+						int end = SearchWhitespaceEnd(offset);
+						AddChange(start, offset - start, " ");
+						AddChange(offset + 1, end - offset - 2, " ");
+
+						offset = this.document.GetOffset(indexerDeclaration.RBraceToken.StartLocation);
+						start = SearchWhitespaceStart(offset);
+						AddChange(start, offset - start, " ");
+						oneLine = true;
 
-			if (!indexerDeclaration.Setter.IsNull) {
-				FixIndentation(indexerDeclaration.Setter);
-				if (!indexerDeclaration.Setter.Body.IsNull) {
-					if (!policy.AllowPropertySetBlockInline || indexerDeclaration.Setter.Body.LBraceToken.StartLocation.Line != indexerDeclaration.Setter.Body.RBraceToken.StartLocation.Line) {
-						FixOpenBrace(policy.PropertySetBraceStyle, indexerDeclaration.Setter.Body.LBraceToken);
-						VisitBlockWithoutFixingBraces(indexerDeclaration.Setter.Body, policy.IndentBlocks);
-						FixClosingBrace(policy.PropertySetBraceStyle, indexerDeclaration.Setter.Body.RBraceToken);
 					} else {
-						nextStatementIndent = " ";
-						VisitBlockWithoutFixingBraces(indexerDeclaration.Setter.Body, policy.IndentBlocks);
+						fixClosingBrace = true;
+						FixOpenBrace(policy.PropertyBraceStyle, indexerDeclaration.LBraceToken);
 					}
-				}
+					break;
 			}
+
+			if (policy.IndentPropertyBody)
+				curIndent.Push(IndentType.Block);
+
+			FormatAccessor(indexerDeclaration.Getter, policy.PropertyGetBraceStyle, policy.SimpleGetBlockFormatting, oneLine);
+			FormatAccessor(indexerDeclaration.Setter, policy.PropertySetBraceStyle, policy.SimpleSetBlockFormatting, oneLine);
 			if (policy.IndentPropertyBody)
 				curIndent.Pop();
 
-			FixClosingBrace(policy.PropertyBraceStyle, indexerDeclaration.RBraceToken);
+			if (fixClosingBrace)
+				FixClosingBrace(policy.PropertyBraceStyle, indexerDeclaration.RBraceToken);
 		}
 
 		static bool IsSimpleEvent(AstNode node)
@@ -265,7 +304,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				ForceSpacesAfter(m, true);
 			}
 
-			ForceSpacesBeforeRemoveNewLines(eventDeclaration.EventToken.GetNextSibling (NoWhitespacePredicate), true);
+			ForceSpacesBeforeRemoveNewLines(eventDeclaration.EventToken.GetNextSibling(NoWhitespacePredicate), true);
 			eventDeclaration.ReturnType.AcceptVisitor(this);
 			ForceSpacesAfter(eventDeclaration.ReturnType, true);
 			/*
@@ -283,7 +322,6 @@ namespace ICSharpCode.NRefactory.CSharp
 			FixSemicolon(eventDeclaration.SemicolonToken);
 		}
 
-		
 		public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
 		{
 			FixAttributesAndDocComment(fieldDeclaration);
@@ -298,7 +336,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				if (lastLoc.Line != initializer.StartLocation.Line) {
 					curIndent.Push(IndentType.Block);
 					FixStatementIndentation(initializer.StartLocation);
-					curIndent.Pop ();
+					curIndent.Pop();
 					lastLoc = initializer.StartLocation;
 				}
 				initializer.AcceptVisitor(this);
@@ -321,7 +359,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				}
 				initializer.AcceptVisitor(this);
 			}
-			curIndent.Pop ();
+			curIndent.Pop();
 			FixSemicolon(fixedFieldDeclaration.SemicolonToken);
 		}
 
@@ -331,7 +369,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			var initializer = enumMemberDeclaration.Initializer;
 			if (!initializer.IsNull) {
 				ForceSpacesAround(enumMemberDeclaration.AssignToken, policy.SpaceAroundAssignment);
-				initializer.AcceptVisitor (this);
+				initializer.AcceptVisitor(this);
 			}
 		}
 
@@ -349,7 +387,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 			
 			foreach (var constraint in methodDeclaration.Constraints)
-				constraint.AcceptVisitor (this);
+				constraint.AcceptVisitor(this);
 
 			if (!methodDeclaration.Body.IsNull) {
 				FixOpenBrace(policy.MethodBraceStyle, methodDeclaration.Body.LBraceToken);
@@ -391,13 +429,38 @@ namespace ICSharpCode.NRefactory.CSharp
 				ForceSpacesBefore(constructorDeclaration.RParToken, policy.SpaceBetweenEmptyConstructorDeclarationParentheses);
 			}
 
+			var initializer = constructorDeclaration.Initializer;
+			if (!initializer.IsNull) {
+				ForceSpacesBefore(constructorDeclaration.ColonToken, true);
+				ForceSpacesAfter(constructorDeclaration.ColonToken, true);
+				bool popIndent = initializer.StartLocation.Line != constructorDeclaration.ColonToken.StartLocation.Line;
+				if (popIndent) {
+					curIndent.Push(IndentType.Block);
+					FixIndentation(initializer);
+				}
+				initializer.AcceptVisitor(this);
+				if (popIndent)
+					curIndent.Pop();
+			}
 			if (!constructorDeclaration.Body.IsNull) {
 				FixOpenBrace(policy.ConstructorBraceStyle, constructorDeclaration.Body.LBraceToken);
 				VisitBlockWithoutFixingBraces(constructorDeclaration.Body, policy.IndentMethodBody);
 				FixClosingBrace(policy.ConstructorBraceStyle, constructorDeclaration.Body.RBraceToken);
 			}
 		}
+		public override void VisitConstructorInitializer(ConstructorInitializer constructorInitializer)
+		{
+			ForceSpacesBefore(constructorInitializer.LParToken, policy.SpaceBeforeMethodCallParentheses);
+			if (constructorInitializer.Arguments.Any()) {
+				ForceSpacesAfter(constructorInitializer.LParToken, policy.SpaceWithinMethodCallParentheses);
+			} else {
+				ForceSpacesAfter(constructorInitializer.LParToken, policy.SpaceBetweenEmptyMethodCallParentheses);
+				ForceSpacesBefore(constructorInitializer.RParToken, policy.SpaceBetweenEmptyMethodCallParentheses);
+			}
 
+			FormatArguments(constructorInitializer);
+
+		}
 		public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
 		{
 			FixAttributesAndDocComment(destructorDeclaration);
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/GeneratedCodeSettings.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/GeneratedCodeSettings.cs
index ac40469287..dd2df993e1 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/GeneratedCodeSettings.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/GeneratedCodeSettings.cs
@@ -164,7 +164,7 @@ namespace ICSharpCode.NRefactory.CSharp
 					var curCat = GeneratedCodeMember.Unknown;
 					foreach (var mem in entities) {
 						if (mem.NextSibling is EntityDeclaration)
-							mem.Parent.InsertChildAfter (mem, new UnixNewLine (), Roles.NewLine);
+							mem.Parent.InsertChildAfter (mem, new NewLineNode (), Roles.NewLine);
 
 						var cat = GetCodeMemberCategory (mem);
 						if (cat == curCat)
@@ -181,7 +181,7 @@ namespace ICSharpCode.NRefactory.CSharp
 						mem.Parent.InsertChildBefore (mem, cmt2, Roles.Comment);
 						mem.Parent.InsertChildBefore (mem, cmt3, Roles.Comment);
 						if (cmt.PrevSibling is EntityDeclaration)
-							mem.Parent.InsertChildBefore (cmt, new UnixNewLine (), Roles.NewLine);
+							mem.Parent.InsertChildBefore (cmt, new NewLineNode (), Roles.NewLine);
 					}
 				}
 			}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/Indent.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/Indent.cs
index 4b9bfa9f2b..737f4408fc 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/Indent.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Formatter/Indent.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace ICSharpCode.NRefactory.CSharp
 {
@@ -33,6 +34,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		Block,
 		DoubleBlock,
 		Continuation,
+		Alignment,
 		Label,
 		Empty
 	}
@@ -42,6 +44,8 @@ namespace ICSharpCode.NRefactory.CSharp
 		readonly Stack<IndentType> indentStack = new Stack<IndentType>();
 		readonly TextEditorOptions options;
 		int curIndent;
+		int extraSpaces;
+		string indentString;
 
 		public int CurIndent {
 			get {
@@ -55,17 +59,18 @@ namespace ICSharpCode.NRefactory.CSharp
 			Reset();
 		}
 
-		Indent(TextEditorOptions options, Stack<IndentType> indentStack, int curIndent) : this(options)
+		Indent(Indent engine)
 		{
-			this.indentStack = indentStack;
-			this.curIndent = curIndent;
+			this.indentStack = new Stack<IndentType>(engine.indentStack.Reverse());
+			this.options = engine.options;
+			this.curIndent = engine.curIndent;
+			this.extraSpaces = engine.extraSpaces;
+			this.indentString = engine.indentString;
 		}
 
 		public Indent Clone()
 		{
-			var result = new Indent(options, new Stack<IndentType>(indentStack), curIndent);
-			result.indentString = indentString;
-			return result;
+			return new Indent(this);
 		}
 
 		public void Reset()
@@ -94,6 +99,36 @@ namespace ICSharpCode.NRefactory.CSharp
 			Update();
 		}
 
+		public bool PopIf(IndentType type)
+		{
+			if (Count > 0 && Peek() == type)
+			{
+				Pop();
+				return true;
+			}
+
+			return false;
+		}
+
+		public void PopWhile(IndentType type)
+		{
+			while (Count > 0 && Peek() == type)
+			{
+				Pop();
+			}
+		}
+
+		public bool PopTry()
+		{
+			if (Count > 0)
+			{
+				Pop();
+				return true;
+			}
+
+			return false;
+		}
+
 		public int Count {
 			get {
 				return indentStack.Count;
@@ -112,6 +147,7 @@ namespace ICSharpCode.NRefactory.CSharp
 					return options.IndentSize;
 				case IndentType.DoubleBlock:
 					return options.IndentSize * 2;
+				case IndentType.Alignment:
 				case IndentType.Continuation:
 					return options.ContinuationIndent;
 				case IndentType.Label:
@@ -132,8 +168,6 @@ namespace ICSharpCode.NRefactory.CSharp
 			indentString = new string('\t', curIndent / options.TabSize) + new string(' ', curIndent % options.TabSize) + new string(' ', ExtraSpaces);
 		}
 
-		int extraSpaces;
-
 		public int ExtraSpaces {
 			get {
 				return extraSpaces;
@@ -146,7 +180,6 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 		}
 
-		string indentString;
 
 		public string IndentString {
 			get {
@@ -158,5 +191,56 @@ namespace ICSharpCode.NRefactory.CSharp
 		{
 			return string.Format("[Indent: curIndent={0}]", curIndent);
 		}
+
+		public Indent GetIndentWithoutSpace ()
+		{
+			var result = new Indent(options);
+			foreach (var i in indentStack)
+					result.Push(i);
+			return result;
+		}
+
+		public static Indent ConvertFrom(string indentString, Indent correctIndent, TextEditorOptions options = null)
+		{
+			options = options ?? TextEditorOptions.Default;
+			var result = new Indent(options);
+
+			var indent = string.Concat(indentString.Where(c => c == ' ' || c == '\t'));
+			var indentTypes = new Stack<IndentType>(correctIndent.indentStack);
+
+			foreach (var _ in indent.TakeWhile(c => c == '\t'))
+			{
+				if (indentTypes.Count > 0)
+					result.Push(indentTypes.Pop());
+				else
+					result.Push(IndentType.Continuation);
+			}
+
+			result.ExtraSpaces = indent
+				.SkipWhile(c => c == '\t')
+				.TakeWhile(c => c == ' ')
+				.Count();
+
+			return result;
+		}
+
+		public void RemoveAlignment()
+		{
+			ExtraSpaces = 0;
+			if (Count > 0 && Peek() == IndentType.Alignment)
+				Pop();
+		}
+
+		public void SetAlignment(int i, bool forceSpaces = false)
+		{
+			var alignChars = Math.Max(0, i);
+			if (forceSpaces) {
+				ExtraSpaces = alignChars;
+				return;
+			}
+			RemoveAlignment();
+			Push(IndentType.Alignment);
+		}
+
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
index aa3954d20b..eab91fc31e 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
@@ -1,568 +1,416 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <PropertyGroup>
-    <ProjectGuid>{53DCA265-3C3C-42F9-B647-F72BA678122B}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <OutputType>Library</OutputType>
-    <RootNamespace>ICSharpCode.NRefactory.CSharp</RootNamespace>
-    <AssemblyName>ICSharpCode.NRefactory.CSharp</AssemblyName>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <NoStdLib>False</NoStdLib>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\ICSharpCode.NRefactory.snk</AssemblyOriginatorKeyFile>
-    <DelaySign>False</DelaySign>
-    <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
-    <DocumentationFile>..\bin\$(Configuration)\ICSharpCode.NRefactory.CSharp.xml</DocumentationFile>
-    <NoWarn>1591,1587,1570</NoWarn>
-    <OutputPath>..\bin\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>4194304</BaseAddress>
-    <FileAlignment>4096</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <Optimize>False</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG;TRACE;FULL_AST;NET_4_0</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <Optimize>True</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>TRACE;FULL_AST;NET_4_0</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <OutputPath>..\bin\Release\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <OutputPath>..\bin\Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Debug' ">
-    <Optimize>False</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG;TRACE;FULL_AST;NET_4_0;NET_4_5</DefineConstants>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <OutputPath>..\bin\net_4_5_Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Release' ">
-    <Optimize>True</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>TRACE;FULL_AST;NET_4_0;NET_4_5</DefineConstants>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <OutputPath>..\bin\net_4_5_Release\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Analysis\ControlFlow.cs" />
-    <Compile Include="Analysis\DefiniteAssignmentAnalysis.cs" />
-    <Compile Include="Analysis\ReachabilityAnalysis.cs" />
-    <Compile Include="Analysis\SemanticHighlightingVisitor.cs" />
-    <Compile Include="Ast\AstNode.cs" />
-    <Compile Include="Ast\AstNodeCollection.cs" />
-    <Compile Include="Ast\AstType.cs" />
-    <Compile Include="Ast\DocumentationReference.cs" />
-    <Compile Include="Ast\IdentifierExpressionBackreference.cs" />
-    <Compile Include="Ast\SyntaxExtensions.cs" />
-    <Compile Include="Ast\SyntaxTree.cs" />
-    <Compile Include="Ast\ComposedType.cs" />
-    <Compile Include="Ast\CSharpModifierToken.cs" />
-    <Compile Include="Ast\CSharpTokenNode.cs" />
-    <Compile Include="Ast\CSharpUtil.cs" />
-    <Compile Include="Ast\DepthFirstAstVisitor.cs" />
-    <Compile Include="Ast\ErrorNode.cs" />
-    <Compile Include="Ast\Expressions\AnonymousMethodExpression.cs" />
-    <Compile Include="Ast\Expressions\AnonymousTypeCreateExpression.cs" />
-    <Compile Include="Ast\Expressions\ArrayCreateExpression.cs" />
-    <Compile Include="Ast\Expressions\ArrayInitializerExpression.cs" />
-    <Compile Include="Ast\Expressions\AsExpression.cs" />
-    <Compile Include="Ast\Expressions\AssignmentExpression.cs" />
-    <Compile Include="Ast\Expressions\BaseReferenceExpression.cs" />
-    <Compile Include="Ast\Expressions\BinaryOperatorExpression.cs" />
-    <Compile Include="Ast\Expressions\CastExpression.cs" />
-    <Compile Include="Ast\Expressions\CheckedExpression.cs" />
-    <Compile Include="Ast\Expressions\ConditionalExpression.cs" />
-    <Compile Include="Ast\Expressions\DefaultValueExpression.cs" />
-    <Compile Include="Ast\Expressions\DirectionExpression.cs" />
-    <Compile Include="Ast\Expressions\Expression.cs" />
-    <Compile Include="Ast\Expressions\IdentifierExpression.cs" />
-    <Compile Include="Ast\Expressions\IndexerExpression.cs" />
-    <Compile Include="Ast\Expressions\InvocationExpression.cs" />
-    <Compile Include="Ast\Expressions\IsExpression.cs" />
-    <Compile Include="Ast\Expressions\LambdaExpression.cs" />
-    <Compile Include="Ast\Expressions\MemberReferenceExpression.cs" />
-    <Compile Include="Ast\Expressions\NamedArgumentExpression.cs" />
-    <Compile Include="Ast\Expressions\NamedExpression.cs" />
-    <Compile Include="Ast\Expressions\NullReferenceExpression.cs" />
-    <Compile Include="Ast\Expressions\ObjectCreateExpression.cs" />
-    <Compile Include="Ast\Expressions\ParenthesizedExpression.cs" />
-    <Compile Include="Ast\Expressions\PointerReferenceExpression.cs" />
-    <Compile Include="Ast\Expressions\PrimitiveExpression.cs" />
-    <Compile Include="Ast\Expressions\QueryExpression.cs" />
-    <Compile Include="Ast\Expressions\SizeOfExpression.cs" />
-    <Compile Include="Ast\Expressions\StackAllocExpression.cs" />
-    <Compile Include="Ast\Expressions\ThisReferenceExpression.cs" />
-    <Compile Include="Ast\Expressions\TypeOfExpression.cs" />
-    <Compile Include="Ast\Expressions\TypeReferenceExpression.cs" />
-    <Compile Include="Ast\Expressions\UnaryOperatorExpression.cs" />
-    <Compile Include="Ast\Expressions\UncheckedExpression.cs" />
-    <Compile Include="Ast\Expressions\UndocumentedExpression.cs" />
-    <Compile Include="Ast\GeneralScope\Attribute.cs" />
-    <Compile Include="Ast\GeneralScope\AttributeSection.cs" />
-    <Compile Include="Ast\GeneralScope\Comment.cs" />
-    <Compile Include="Ast\GeneralScope\Constraint.cs" />
-    <Compile Include="Ast\GeneralScope\DelegateDeclaration.cs" />
-    <Compile Include="Ast\GeneralScope\ExternAliasDeclaration.cs" />
-    <Compile Include="Ast\GeneralScope\NamespaceDeclaration.cs" />
-    <Compile Include="Ast\GeneralScope\TypeDeclaration.cs" />
-    <Compile Include="Ast\GeneralScope\TypeParameterDeclaration.cs" />
-    <Compile Include="Ast\GeneralScope\UsingAliasDeclaration.cs" />
-    <Compile Include="Ast\GeneralScope\UsingDeclaration.cs" />
-    <Compile Include="Ast\IAstVisitor.cs" />
-    <Compile Include="Ast\Identifier.cs" />
-    <Compile Include="Ast\MemberType.cs" />
-    <Compile Include="Ast\Modifiers.cs" />
-    <Compile Include="Ast\NodeType.cs" />
-    <Compile Include="Ast\ObservableAstVisitor.cs" />
-    <Compile Include="Ast\PrimitiveType.cs" />
-    <Compile Include="Ast\SimpleType.cs" />
-    <Compile Include="Ast\Statements\BlockStatement.cs" />
-    <Compile Include="Ast\Statements\BreakStatement.cs" />
-    <Compile Include="Ast\Statements\CheckedStatement.cs" />
-    <Compile Include="Ast\Statements\ContinueStatement.cs" />
-    <Compile Include="Ast\Statements\DoWhileStatement.cs" />
-    <Compile Include="Ast\Statements\EmptyStatement.cs" />
-    <Compile Include="Ast\Statements\ExpressionStatement.cs" />
-    <Compile Include="Ast\Statements\FixedStatement.cs" />
-    <Compile Include="Ast\Statements\ForeachStatement.cs" />
-    <Compile Include="Ast\Statements\ForStatement.cs" />
-    <Compile Include="Ast\Statements\GotoStatement.cs" />
-    <Compile Include="Ast\Statements\IfElseStatement.cs" />
-    <Compile Include="Ast\Statements\LabelStatement.cs" />
-    <Compile Include="Ast\Statements\LockStatement.cs" />
-    <Compile Include="Ast\Statements\ReturnStatement.cs" />
-    <Compile Include="Ast\Statements\Statement.cs" />
-    <Compile Include="Ast\Statements\SwitchStatement.cs" />
-    <Compile Include="Ast\Statements\ThrowStatement.cs" />
-    <Compile Include="Ast\Statements\TryCatchStatement.cs" />
-    <Compile Include="Ast\Statements\UncheckedStatement.cs" />
-    <Compile Include="Ast\Statements\UnsafeStatement.cs" />
-    <Compile Include="Ast\Statements\UsingStatement.cs" />
-    <Compile Include="Ast\Statements\VariableDeclarationStatement.cs" />
-    <Compile Include="Ast\Statements\WhileStatement.cs" />
-    <Compile Include="Ast\Statements\YieldBreakStatement.cs" />
-    <Compile Include="Ast\Statements\YieldReturnStatement.cs" />
-    <Compile Include="Ast\TypeMembers\Accessor.cs" />
-    <Compile Include="Ast\TypeMembers\EntityDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\ConstructorDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\DestructorDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\EnumMemberDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\EventDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\FieldDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\FixedFieldDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\FixedVariableInitializer.cs" />
-    <Compile Include="Ast\TypeMembers\IndexerDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\MethodDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\OperatorDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\ParameterDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\PropertyDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\VariableInitializer.cs" />
-    <Compile Include="CSharpProjectContent.cs" />
-    <Compile Include="Formatter\CSharpFormattingOptions.cs" />
-    <Compile Include="Formatter\Indent.cs" />
-    <Compile Include="OutputVisitor\CodeDomConvertVisitor.cs" />
-    <Compile Include="OutputVisitor\CSharpAmbience.cs" />
-    <Compile Include="OutputVisitor\InsertParenthesesVisitor.cs" />
-    <Compile Include="OutputVisitor\IOutputFormatter.cs" />
-    <Compile Include="OutputVisitor\CSharpOutputVisitor.cs" />
-    <Compile Include="OutputVisitor\TextWriterOutputFormatter.cs" />
-    <Compile Include="Parser\CompilerSettings.cs" />
-    <Compile Include="Parser\CSharpParser.cs" />
-    <Compile Include="Parser\mcs\anonymous.cs" />
-    <Compile Include="Parser\mcs\argument.cs" />
-    <Compile Include="Parser\mcs\assembly.cs" />
-    <Compile Include="Parser\mcs\assign.cs" />
-    <Compile Include="Parser\mcs\async.cs" />
-    <Compile Include="Parser\mcs\attribute.cs" />
-    <Compile Include="Parser\mcs\cfold.cs" />
-    <Compile Include="Parser\mcs\class.cs" />
-    <Compile Include="Parser\mcs\codegen.cs" />
-    <Compile Include="Parser\mcs\complete.cs" />
-    <Compile Include="Parser\mcs\const.cs" />
-    <Compile Include="Parser\mcs\constant.cs" />
-    <Compile Include="Parser\mcs\context.cs" />
-    <Compile Include="Parser\mcs\convert.cs" />
-    <Compile Include="Parser\mcs\CryptoConvert.cs" />
-    <Compile Include="Parser\mcs\cs-parser.cs" />
-    <Compile Include="Parser\mcs\cs-tokenizer.cs" />
-    <Compile Include="Parser\mcs\decl.cs" />
-    <Compile Include="Parser\mcs\delegate.cs" />
-    <Compile Include="Parser\mcs\doc.cs" />
-    <Compile Include="Parser\mcs\driver.cs" />
-    <Compile Include="Parser\mcs\dynamic.cs" />
-    <Compile Include="Parser\mcs\ecore.cs" />
-    <Compile Include="Parser\mcs\enum.cs" />
-    <Compile Include="Parser\mcs\eval.cs" />
-    <Compile Include="Parser\mcs\expression.cs" />
-    <Compile Include="Parser\mcs\field.cs" />
-    <Compile Include="Parser\mcs\flowanalysis.cs" />
-    <Compile Include="Parser\mcs\generic.cs" />
-    <Compile Include="Parser\mcs\import.cs" />
-    <Compile Include="Parser\mcs\iterators.cs" />
-    <Compile Include="Parser\mcs\lambda.cs" />
-    <Compile Include="Parser\mcs\linq.cs" />
-    <Compile Include="Parser\mcs\literal.cs" />
-    <Compile Include="Parser\mcs\location.cs" />
-    <Compile Include="Parser\mcs\membercache.cs" />
-    <Compile Include="Parser\mcs\method.cs" />
-    <Compile Include="Parser\mcs\modifiers.cs" />
-    <Compile Include="Parser\mcs\MonoSymbolFile.cs" />
-    <Compile Include="Parser\mcs\MonoSymbolTable.cs" />
-    <Compile Include="Parser\mcs\MonoSymbolWriter.cs" />
-    <Compile Include="Parser\mcs\namespace.cs" />
-    <Compile Include="Parser\mcs\nullable.cs" />
-    <Compile Include="Parser\mcs\outline.cs" />
-    <Compile Include="Parser\mcs\parameter.cs" />
-    <Compile Include="Parser\mcs\pending.cs" />
-    <Compile Include="Parser\mcs\property.cs" />
-    <Compile Include="Parser\mcs\reflection.cs" />
-    <Compile Include="Parser\mcs\report.cs" />
-    <Compile Include="Parser\mcs\statement.cs" />
-    <Compile Include="Parser\mcs\support.cs" />
-    <Compile Include="Parser\mcs\symbolwriter.cs" />
-    <Compile Include="Parser\mcs\typemanager.cs" />
-    <Compile Include="Parser\mcs\typespec.cs" />
-    <Compile Include="Parser\mcs\visit.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="QueryExpressionExpander.cs" />
-    <Compile Include="Refactoring\CodeActions\AddUsingAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertAsToCastAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertCastToAsAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertConditionalToIfAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertExplicitToImplicitImplementationAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertIfToConditionalAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertIfToSwitchAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertImplicitToExplicitImplementationAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertLambdaBodyExpressionToStatementAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertLambdaBodyStatementToExpressionAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertSwitchToIfAction.cs" />
-    <Compile Include="Refactoring\CodeActions\CreateCustomEventImplementationAction.cs" />
-    <Compile Include="Refactoring\CodeActions\CreateOverloadWithoutParameterAction.cs" />
-    <Compile Include="Refactoring\CodeActions\JoinDeclarationAndAssignmentAction.cs" />
-    <Compile Include="Refactoring\CodeActions\JoinStringAction.cs" />
-    <Compile Include="Refactoring\CodeActions\MergeNestedIfAction.cs" />
-    <Compile Include="Refactoring\CodeActions\NegateRelationalExpressionAction.cs" />
-    <Compile Include="Refactoring\CodeActions\PutInsideUsingAction.cs" />
-    <Compile Include="Refactoring\CodeActions\SplitDeclarationListAction.cs" />
-    <Compile Include="Refactoring\CodeActions\UseStringFormatAction.cs" />
-    <Compile Include="Refactoring\CodeIssues\AccessToClosureIssues\AccessToClosureIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\AccessToClosureIssues\AccessToDisposedClosureIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\AccessToClosureIssues\AccessToModifiedClosureIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\AccessToClosureIssues\LocalVariableNamePicker.cs" />
-    <Compile Include="Refactoring\CodeIssues\AssignmentMadeToSameVariableIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\BitwiseOperationOnNonFlagsEnumIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\CastExpressionOfIncompatibleTypeIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\CompareBooleanWithTrueOrFalseIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\CompareFloatWithEqualityOperatorIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\CompilerErrors\CS0029InvalidConversionIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\ConstantConditionIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\DoubleNegationIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\ExpressionIsAlwaysOfProvidedTypeIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\ExpressionIsNeverOfProvidedTypeIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\MethodNeverReturnsIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\MethodOverloadHidesOptionalParameterIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\MissingStringComparisonIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\NegativeRelationalExpressionIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\ExplicitConversionInForEachIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\ForControlVariableNotModifiedIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\IdenticalConditionalBranchIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\MultipleEnumerationIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantArrayInitializerCommaIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantAssignmentIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantAttributeParenthesesIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantCaseLabelIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantElseIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantFieldInitializerIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantObjectCreationArgumentListIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantObjectOrCollectionInitializerIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantTypeCastIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\ReferenceEqualsCalledWithValueTypeIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\ResultOfAsyncCallShouldNotBeIgnoredIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\UnreachableCodeIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\VariableHidesMemberIssue\LocalVariableHidesMemberIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\VariableHidesMemberIssue\ParameterHidesMemberIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\VariableHidesMemberIssue\VariableHidesMemberIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\VariableNotUsedIssues\LocalVariableNotUsedIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\VariableNotUsedIssues\ParameterNotUsedIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\TypeParameterNotUsedIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\VariableOnlyAssignedIssues\ParameterOnlyAssignedIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\VariableOnlyAssignedIssues\VariableOnlyAssignedIssue.cs" />
-    <Compile Include="Refactoring\DocumentScript.cs" />
-    <Compile Include="Refactoring\CodeActions\ExtractAnonymousMethodAction.cs" />
-    <Compile Include="Refactoring\UsingHelper.cs" />
-    <Compile Include="Refactoring\LambdaHelper.cs" />
-    <Compile Include="Refactoring\PatternHelper.cs" />
-    <Compile Include="Refactoring\RefactoringAstHelper.cs" />
-    <Compile Include="Refactoring\RefactoringContext.cs" />
-    <Compile Include="Refactoring\Script.cs" />
-    <Compile Include="Refactoring\TypeSystemAstBuilder.cs" />
-    <Compile Include="Refactoring\VariableReferenceGraph.cs" />
-    <Compile Include="Resolver\CompositeResolveVisitorNavigator.cs" />
-    <Compile Include="Resolver\AwaitResolveResult.cs" />
-    <Compile Include="Resolver\DynamicInvocationResolveResult.cs" />
-    <Compile Include="Resolver\DynamicMemberResolveResult.cs" />
-    <Compile Include="Resolver\CSharpConversions.cs" />
-    <Compile Include="Resolver\CSharpAstResolver.cs" />
-    <Compile Include="Resolver\CSharpInvocationResolveResult.cs" />
-    <Compile Include="Resolver\CSharpOperators.cs" />
-    <Compile Include="Resolver\CSharpResolver.cs" />
-    <Compile Include="Resolver\DetectSkippableNodesNavigator.cs" />
-    <Compile Include="Resolver\FindReferencedEntities.cs" />
-    <Compile Include="Resolver\FindReferences.cs" />
-    <Compile Include="Resolver\FindReferenceSearchScope.cs" />
-    <Compile Include="Resolver\IResolveVisitorNavigator.cs" />
-    <Compile Include="Resolver\LambdaResolveResult.cs" />
-    <Compile Include="Resolver\Log.cs" />
-    <Compile Include="Resolver\MemberLookup.cs" />
-    <Compile Include="Resolver\MethodGroupResolveResult.cs" />
-    <Compile Include="Resolver\NodeListResolveVisitorNavigator.cs" />
-    <Compile Include="Resolver\OverloadResolution.cs" />
-    <Compile Include="Resolver\OverloadResolutionErrors.cs" />
-    <Compile Include="Resolver\RenameCallbackArguments.cs" />
-    <Compile Include="Resolver\ResolveAtLocation.cs" />
-    <Compile Include="Resolver\ResolveVisitor.cs" />
-    <Compile Include="Resolver\TypeInference.cs" />
-    <Compile Include="Completion\ICompletionDataFactory.cs" />
-    <Compile Include="Completion\IParameterCompletionDataFactory.cs" />
-    <Compile Include="NameLookupMode.cs" />
-    <Compile Include="TypeSystem\AliasNamespaceReference.cs" />
-    <Compile Include="TypeSystem\AttributeTypeReference.cs" />
-    <Compile Include="TypeSystem\ConstantValues.cs" />
-    <Compile Include="TypeSystem\CSharpAssembly.cs" />
-    <Compile Include="TypeSystem\CSharpAttribute.cs" />
-    <Compile Include="TypeSystem\CSharpDocumentationComment.cs" />
-    <Compile Include="TypeSystem\CSharpUnresolvedFile.cs" />
-    <Compile Include="TypeSystem\CSharpUnresolvedTypeDefinition.cs" />
-    <Compile Include="TypeSystem\CSharpTypeResolveContext.cs" />
-    <Compile Include="TypeSystem\ResolvedUsingScope.cs" />
-    <Compile Include="TypeSystem\TypeOrNamespaceReference.cs" />
-    <Compile Include="TypeSystem\MemberTypeOrNamespaceReference.cs" />
-    <Compile Include="TypeSystem\SimpleTypeOrNamespaceReference.cs" />
-    <Compile Include="TypeSystem\MethodTypeParameterWithInheritedConstraints.cs" />
-    <Compile Include="TypeSystem\TypeSystemConvertVisitor.cs" />
-    <Compile Include="TypeSystem\UsingScope.cs" />
-    <Compile Include="Ast\GeneralScope\PreProcessorDirective.cs" />
-    <Compile Include="Ast\Expressions\ErrorExpression.cs" />
-    <Compile Include="Completion\CompletionDataWrapper.cs" />
-    <Compile Include="Completion\CSharpCompletionEngine.cs" />
-    <Compile Include="Completion\CSharpCompletionEngineBase.cs" />
-    <Compile Include="Completion\CSharpParameterCompletionEngine.cs" />
-    <Compile Include="Parser\mcs\module.cs" />
-    <Compile Include="Parser\mcs\settings.cs" />
-    <Compile Include="Parser\mcs\SourceMethodBuilder.cs" />
-    <Compile Include="Ast\TokenRole.cs" />
-    <Compile Include="Ast\Roles.cs" />
-    <Compile Include="Refactoring\BaseRefactoringContext.cs" />
-    <Compile Include="Refactoring\CodeIssue.cs" />
-    <Compile Include="Refactoring\CodeAction.cs" />
-    <Compile Include="Refactoring\ICodeActionProvider.cs" />
-    <Compile Include="Refactoring\ICodeIssueProvider.cs" />
-    <Compile Include="Refactoring\ContextActionAttribute.cs" />
-    <Compile Include="Refactoring\IssueAttribute.cs" />
-    <Compile Include="Refactoring\CodeIssues\IssueCategories.cs" />
-    <Compile Include="Refactoring\CodeIssues\GatherVisitorBase.cs" />
-    <Compile Include="Refactoring\CodeIssues\ConditionalToNullCoalescingIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\NotImplementedExceptionIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantInternalIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantNamespaceUsageIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantPrivateIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantThisIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantUsingIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\StringIsNullOrEmptyIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\UseVarKeywordIssue.cs" />
-    <Compile Include="Refactoring\CodeActions\UseVarKeywordAction.cs" />
-    <Compile Include="Refactoring\CodeActions\UseExplicitTypeAction.cs" />
-    <Compile Include="Refactoring\CodeActions\SplitStringAction.cs" />
-    <Compile Include="Refactoring\CodeActions\SplitDeclarationAndAssignmentAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ReplaceEmptyStringAction.cs" />
-    <Compile Include="Refactoring\CodeActions\RemoveRegionAction.cs" />
-    <Compile Include="Refactoring\CodeActions\RemoveBracesAction.cs" />
-    <Compile Include="Refactoring\CodeActions\RemoveBackingStoreAction.cs" />
-    <Compile Include="Refactoring\CodeActions\InvertIfAction.cs" />
-    <Compile Include="Refactoring\CodeActions\IntroduceFormatItemAction.cs" />
-    <Compile Include="Refactoring\CodeActions\InsertAnonymousMethodSignatureAction.cs" />
-    <Compile Include="Refactoring\CodeActions\GenerateSwitchLabelsAction.cs" />
-    <Compile Include="Refactoring\CodeActions\GeneratePropertyAction.cs" />
-    <Compile Include="Refactoring\CodeActions\GenerateGetterAction.cs" />
-    <Compile Include="Refactoring\CodeActions\FlipOperatorArgumentsAction.cs" />
-    <Compile Include="Refactoring\CodeActions\CreatePropertyAction.cs" />
-    <Compile Include="Refactoring\CodeActions\CreateLocalVariableAction.cs" />
-    <Compile Include="Refactoring\CodeActions\CreateFieldAction.cs" />
-    <Compile Include="Refactoring\CodeActions\CreateEventInvocatorAction.cs" />
-    <Compile Include="Refactoring\CodeActions\CreateBackingStoreAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertHexToDecAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertForeachToForAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertDecToHexAction.cs" />
-    <Compile Include="Refactoring\CodeActions\CheckIfParameterIsNullAction.cs" />
-    <Compile Include="Refactoring\CodeActions\AddAnotherAccessorAction.cs" />
-    <Compile Include="Refactoring\CodeIssues\InconsistentNamingIssue\NamingStyle.cs" />
-    <Compile Include="Refactoring\CodeIssues\InconsistentNamingIssue\NamingRule.cs" />
-    <Compile Include="Refactoring\CodeIssues\InconsistentNamingIssue\AffectedEntity.cs" />
-    <Compile Include="Refactoring\CodeIssues\InconsistentNamingIssue\DefaultRules.cs" />
-    <Compile Include="Refactoring\CodeIssues\InconsistentNamingIssue\InconsistentNamingIssue.cs" />
-    <Compile Include="Refactoring\CodeActions\CreateMethodDeclarationAction.cs" />
-    <Compile Include="Refactoring\CodeIssues\InconsistentNamingIssue\NamingConventionService.cs" />
-    <Compile Include="Refactoring\CodeActions\CreateIndexerAction.cs" />
-    <Compile Include="Refactoring\CodeActions\InlineLocalVariableAction.cs" />
-    <Compile Include="Refactoring\CodeActions\DeclareLocalVariableAction.cs" />
-    <Compile Include="Refactoring\CodeIssues\InconsistentNamingIssue\WordParser.cs" />
-    <Compile Include="Refactoring\CodeActions\CreateConstructorDeclarationAction.cs" />
-    <Compile Include="Refactoring\CodeActions\CreateClassDeclarationAction.cs" />
-    <Compile Include="Refactoring\CodeActions\CreateDelegateAction.cs" />
-    <Compile Include="Formatter\TextEditorOptions.cs" />
-    <Compile Include="Refactoring\CodeActions\IntroduceConstantAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ExtractMethod\ExtractMethodAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ExtractMethod\StaticVisitor.cs" />
-    <Compile Include="Refactoring\CodeActions\ExtractMethod\VariableLookupVisitor.cs" />
-    <Compile Include="Refactoring\CodeActions\SpecializedCodeAction.cs" />
-    <Compile Include="Formatter\GeneratedCodeSettings.cs" />
-    <Compile Include="Ast\GeneralScope\NewLineNode.cs" />
-    <Compile Include="Ast\GeneralScope\WhitespaceNode.cs" />
-    <Compile Include="Ast\GeneralScope\TextNode.cs" />
-    <Compile Include="Formatter\FormattingOptionsFactory.cs" />
-    <Compile Include="Refactoring\CodeActions\ImplementInterfaceAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ImplementInterfaceExplicitAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ImplementAbstractMembersAction.cs" />
-    <Compile Include="Refactoring\CodeActions\RemoveRedundantCatchTypeAction.cs" />
-    <Compile Include="Refactoring\CodeActions\AddCatchTypeAction.cs" />
-    <Compile Include="Refactoring\CodeIssues\IncorrectExceptionParameterOrderingIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\CallToVirtualFunctionFromConstructorIssue.cs" />
-    <Compile Include="Refactoring\CodeActions\StaticMethodInvocationToExtensionMethodInvocationAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ExtensionMethodInvocationToStaticMethodInvocationAction.cs" />
-    <Compile Include="Refactoring\CodeActions\IterateViaForeachAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ExtractFieldAction.cs" />
-    <Compile Include="Completion\ICompletionContextProvider.cs" />
-    <Compile Include="Refactoring\CodeIssues\ValueParameterUnusedIssue.cs" />
-    <Compile Include="Refactoring\NamingHelper.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertToInitializer\ConvertToInitializerAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertToInitializer\StatementsToInitializerConverter.cs" />
-    <Compile Include="Refactoring\CodeActions\MoveToOuterScopeAction.cs" />
-    <Compile Include="Refactoring\CodeIssues\VariableDeclaredInWideScopeIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\ParameterCanBeDemotedIssue\ParameterCanBeDemotedIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\ParameterCanBeDemotedIssue\ITypeCriterion.cs" />
-    <Compile Include="Refactoring\CodeIssues\ParameterCanBeDemotedIssue\HasMemberCriterion.cs" />
-    <Compile Include="Refactoring\CodeIssues\ParameterCanBeDemotedIssue\TypeCriteriaCollector.cs" />
-    <Compile Include="Refactoring\CodeIssues\ReferenceToStaticMemberViaDerivedTypeIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\ParameterCanBeDemotedIssue\IsTypeCriterion.cs" />
-    <Compile Include="Refactoring\CodeIssues\OptionalParameterCouldBeSkippedIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantCatchIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantToStringIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\CallToObjectEqualsViaBaseIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\IncorrectCallToObjectGetHashCodeIssue.cs" />
-    <Compile Include="Refactoring\CodeActions\ExtractMethod\VariableUsageAnalyzation.cs" />
-    <Compile Include="Refactoring\CodeIssues\FormatStringIssues\FormatStringIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\FormatStringIssues\FormatStringHelper.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertToInitializer\ConvertInitializerToExplicitInitializationsAction.cs" />
-    <Compile Include="Refactoring\CodeIssues\ExceptionRethrowIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\ThreadStaticOnInstanceFieldIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\StaticFieldInGenericTypeIssue.cs" />
-    <Compile Include="Parser\SeekableStreamReader.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertAnonymousDelegateToLambdaAction.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertLambdaToAnonymousDelegateAction.cs" />
-    <Compile Include="Refactoring\CodeIssues\ParameterCanBeDemotedIssue\IsArrayTypeCriterion.cs" />
-    <Compile Include="Refactoring\CodeIssues\ParameterCanBeDemotedIssue\SupportsIndexingCriterion.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantWhereWithPredicateIssue.cs" />
-    <Compile Include="Refactoring\CodeActions\ConvertToInitializer\AccessPath.cs" />
-    <Compile Include="Refactoring\LocalReferenceFinder.cs" />
-    <Compile Include="Refactoring\CodeActions\SortUsingsAction.cs" />
-    <Compile Include="Formatter\CSharpIndentEngine.cs" />
-    <Compile Include="Refactoring\CodeActions\CreateEnumValue.cs" />
-    <Compile Include="Resolver\AliasTypeResolveResult.cs" />
-    <Compile Include="Resolver\AliasNamespaceResolveResult.cs" />
-    <Compile Include="Resolver\ReducedExtensionMethod.cs" />
-    <Compile Include="Refactoring\CodeIssues\SimplifyAnonymousMethodToDelegateIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\CompilerErrors\CS0127ReturnMustNotBeFollowedByAnyExpression.cs" />
-    <Compile Include="Refactoring\CreateChangedEvent.cs" />
-    <Compile Include="Refactoring\CodeActions\SimplifyIfFlowAction.cs" />
-    <Compile Include="Refactoring\CodeActions\SimplifyIfInLoopsFlowAction.cs" />
-    <Compile Include="Refactoring\CodeIssues\NoDefaultConstructorIssue.cs" />
-    <Compile Include="Refactoring\CodeActions\InvertIfAndSimplify.cs" />
-    <Compile Include="Formatter\CSharpFormatter.cs" />
-    <Compile Include="Formatter\FormattingVisitor.cs" />
-    <Compile Include="Formatter\FormattingVisitor_TypeMembers.cs" />
-    <Compile Include="Formatter\FormattingVisitor_Global.cs" />
-    <Compile Include="Formatter\FormattingVisitor_Statements.cs" />
-    <Compile Include="Formatter\FormattingVisitor_Expressions.cs" />
-    <Compile Include="Formatter\FormattingChanges.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantNullCheckIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\ConstructorIssues\StaticConstructorParameterIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\ConstructorIssues\StaticConstructorAccessModifierIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\RedundantBaseConstructorIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\ConstructorIssues\RedudantConstructorIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\ConstructorIssues\PublicConstructorInAbstractClass.cs" />
-    <Compile Include="Refactoring\CodeIssues\ConvertToStaticMethodIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\ParameterCanBeDemotedIssue\ParameterCanBeIEnumerableIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\DuplicateBodyMethodIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\DuplicateExpressionsInConditionsIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\DuplicateIfInIfChainIssue.cs" />
-    <Compile Include="Refactoring\CodeIssues\UseBlockInsteadColonIssue.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-  <ItemGroup />
-  <ProjectExtensions>
-    <MonoDevelop>
-      <Properties>
-        <Policies>
-          <TextStylePolicy TabsToSpaces="False" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/plain" />
-          <TextStylePolicy FileWidth="120" TabsToSpaces="False" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/x-csharp" />
-          <CSharpFormattingPolicy IndentSwitchBody="True" BeforeMethodDeclarationParentheses="False" BeforeMethodCallParentheses="False" BeforeConstructorDeclarationParentheses="False" BeforeDelegateDeclarationParentheses="False" NewParentheses="False" inheritsSet="Mono" inheritsScope="text/x-csharp" scope="text/x-csharp" />
-          <TextStylePolicy inheritsSet="null" scope="text/x-jay" />
-        </Policies>
-      </Properties>
-    </MonoDevelop>
-  </ProjectExtensions>
-  <ItemGroup>
-    <None Include="Parser\mcs\cs-parser.jay" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <PropertyGroup>
+    <ProjectGuid>{53DCA265-3C3C-42F9-B647-F72BA678122B}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <OutputType>Library</OutputType>
+    <RootNamespace>ICSharpCode.NRefactory.CSharp</RootNamespace>
+    <AssemblyName>ICSharpCode.NRefactory.CSharp</AssemblyName>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <NoStdLib>False</NoStdLib>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\ICSharpCode.NRefactory.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>False</DelaySign>
+    <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
+    <DocumentationFile>..\bin\$(Configuration)\ICSharpCode.NRefactory.CSharp.xml</DocumentationFile>
+    <NoWarn>1591,1587,1570</NoWarn>
+    <OutputPath>..\bin\$(Configuration)\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE;FULL_AST;NET_4_0</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE;FULL_AST;NET_4_0</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <OutputPath>..\bin\Release\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <OutputPath>..\bin\Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Debug' ">
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE;FULL_AST;NET_4_0;NET_4_5</DefineConstants>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <OutputPath>..\bin\net_4_5_Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Release' ">
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE;FULL_AST;NET_4_0;NET_4_5</DefineConstants>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <OutputPath>..\bin\net_4_5_Release\</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
+      <Link>Properties\GlobalAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="Analysis\ControlFlow.cs" />
+    <Compile Include="Analysis\DefiniteAssignmentAnalysis.cs" />
+    <Compile Include="Analysis\ReachabilityAnalysis.cs" />
+    <Compile Include="Analysis\SemanticHighlightingVisitor.cs" />
+    <Compile Include="Ast\AstNode.cs" />
+    <Compile Include="Ast\AstNodeCollection.cs" />
+    <Compile Include="Ast\AstType.cs" />
+    <Compile Include="Ast\DocumentationReference.cs" />
+    <Compile Include="Ast\IdentifierExpressionBackreference.cs" />
+    <Compile Include="Ast\SyntaxExtensions.cs" />
+    <Compile Include="Ast\SyntaxTree.cs" />
+    <Compile Include="Ast\ComposedType.cs" />
+    <Compile Include="Ast\CSharpModifierToken.cs" />
+    <Compile Include="Ast\CSharpTokenNode.cs" />
+    <Compile Include="Ast\CSharpUtil.cs" />
+    <Compile Include="Ast\DepthFirstAstVisitor.cs" />
+    <Compile Include="Ast\ErrorNode.cs" />
+    <Compile Include="Ast\Expressions\AnonymousMethodExpression.cs" />
+    <Compile Include="Ast\Expressions\AnonymousTypeCreateExpression.cs" />
+    <Compile Include="Ast\Expressions\ArrayCreateExpression.cs">
+      <DependentUpon>ArrayInitializerExpression.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Ast\Expressions\ArrayInitializerExpression.cs" />
+    <Compile Include="Ast\Expressions\AsExpression.cs" />
+    <Compile Include="Ast\Expressions\AssignmentExpression.cs" />
+    <Compile Include="Ast\Expressions\BaseReferenceExpression.cs" />
+    <Compile Include="Ast\Expressions\BinaryOperatorExpression.cs" />
+    <Compile Include="Ast\Expressions\CastExpression.cs" />
+    <Compile Include="Ast\Expressions\CheckedExpression.cs" />
+    <Compile Include="Ast\Expressions\ConditionalExpression.cs" />
+    <Compile Include="Ast\Expressions\DefaultValueExpression.cs" />
+    <Compile Include="Ast\Expressions\DirectionExpression.cs" />
+    <Compile Include="Ast\Expressions\Expression.cs" />
+    <Compile Include="Ast\Expressions\IdentifierExpression.cs" />
+    <Compile Include="Ast\Expressions\IndexerExpression.cs" />
+    <Compile Include="Ast\Expressions\InvocationExpression.cs" />
+    <Compile Include="Ast\Expressions\IsExpression.cs" />
+    <Compile Include="Ast\Expressions\LambdaExpression.cs" />
+    <Compile Include="Ast\Expressions\MemberReferenceExpression.cs" />
+    <Compile Include="Ast\Expressions\NamedArgumentExpression.cs" />
+    <Compile Include="Ast\Expressions\NamedExpression.cs" />
+    <Compile Include="Ast\Expressions\NullReferenceExpression.cs" />
+    <Compile Include="Ast\Expressions\ObjectCreateExpression.cs" />
+    <Compile Include="Ast\Expressions\ParenthesizedExpression.cs" />
+    <Compile Include="Ast\Expressions\PointerReferenceExpression.cs" />
+    <Compile Include="Ast\Expressions\PrimitiveExpression.cs" />
+    <Compile Include="Ast\Expressions\QueryExpression.cs" />
+    <Compile Include="Ast\Expressions\SizeOfExpression.cs" />
+    <Compile Include="Ast\Expressions\StackAllocExpression.cs" />
+    <Compile Include="Ast\Expressions\ThisReferenceExpression.cs" />
+    <Compile Include="Ast\Expressions\TypeOfExpression.cs" />
+    <Compile Include="Ast\Expressions\TypeReferenceExpression.cs" />
+    <Compile Include="Ast\Expressions\UnaryOperatorExpression.cs" />
+    <Compile Include="Ast\Expressions\UncheckedExpression.cs" />
+    <Compile Include="Ast\Expressions\UndocumentedExpression.cs" />
+    <Compile Include="Ast\GeneralScope\Attribute.cs" />
+    <Compile Include="Ast\GeneralScope\AttributeSection.cs" />
+    <Compile Include="Ast\GeneralScope\Comment.cs" />
+    <Compile Include="Ast\GeneralScope\Constraint.cs" />
+    <Compile Include="Ast\GeneralScope\DelegateDeclaration.cs" />
+    <Compile Include="Ast\GeneralScope\ExternAliasDeclaration.cs" />
+    <Compile Include="Ast\GeneralScope\NamespaceDeclaration.cs" />
+    <Compile Include="Ast\GeneralScope\TypeDeclaration.cs" />
+    <Compile Include="Ast\GeneralScope\TypeParameterDeclaration.cs" />
+    <Compile Include="Ast\GeneralScope\UsingAliasDeclaration.cs" />
+    <Compile Include="Ast\GeneralScope\UsingDeclaration.cs" />
+    <Compile Include="Ast\IAstVisitor.cs" />
+    <Compile Include="Ast\Identifier.cs" />
+    <Compile Include="Ast\MemberType.cs" />
+    <Compile Include="Ast\Modifiers.cs" />
+    <Compile Include="Ast\NodeType.cs" />
+    <Compile Include="Ast\ObservableAstVisitor.cs" />
+    <Compile Include="Ast\PrimitiveType.cs" />
+    <Compile Include="Ast\SimpleType.cs" />
+    <Compile Include="Ast\Statements\BlockStatement.cs" />
+    <Compile Include="Ast\Statements\BreakStatement.cs" />
+    <Compile Include="Ast\Statements\CheckedStatement.cs" />
+    <Compile Include="Ast\Statements\ContinueStatement.cs" />
+    <Compile Include="Ast\Statements\DoWhileStatement.cs" />
+    <Compile Include="Ast\Statements\EmptyStatement.cs" />
+    <Compile Include="Ast\Statements\ExpressionStatement.cs" />
+    <Compile Include="Ast\Statements\FixedStatement.cs" />
+    <Compile Include="Ast\Statements\ForeachStatement.cs" />
+    <Compile Include="Ast\Statements\ForStatement.cs" />
+    <Compile Include="Ast\Statements\GotoStatement.cs" />
+    <Compile Include="Ast\Statements\IfElseStatement.cs" />
+    <Compile Include="Ast\Statements\LabelStatement.cs" />
+    <Compile Include="Ast\Statements\LockStatement.cs" />
+    <Compile Include="Ast\Statements\ReturnStatement.cs" />
+    <Compile Include="Ast\Statements\Statement.cs" />
+    <Compile Include="Ast\Statements\SwitchStatement.cs" />
+    <Compile Include="Ast\Statements\ThrowStatement.cs" />
+    <Compile Include="Ast\Statements\TryCatchStatement.cs" />
+    <Compile Include="Ast\Statements\UncheckedStatement.cs" />
+    <Compile Include="Ast\Statements\UnsafeStatement.cs" />
+    <Compile Include="Ast\Statements\UsingStatement.cs" />
+    <Compile Include="Ast\Statements\VariableDeclarationStatement.cs" />
+    <Compile Include="Ast\Statements\WhileStatement.cs" />
+    <Compile Include="Ast\Statements\YieldBreakStatement.cs" />
+    <Compile Include="Ast\Statements\YieldReturnStatement.cs" />
+    <Compile Include="Ast\TypeMembers\Accessor.cs" />
+    <Compile Include="Ast\TypeMembers\EntityDeclaration.cs" />
+    <Compile Include="Ast\TypeMembers\ConstructorDeclaration.cs" />
+    <Compile Include="Ast\TypeMembers\DestructorDeclaration.cs" />
+    <Compile Include="Ast\TypeMembers\EnumMemberDeclaration.cs" />
+    <Compile Include="Ast\TypeMembers\EventDeclaration.cs" />
+    <Compile Include="Ast\TypeMembers\FieldDeclaration.cs" />
+    <Compile Include="Ast\TypeMembers\FixedFieldDeclaration.cs" />
+    <Compile Include="Ast\TypeMembers\FixedVariableInitializer.cs" />
+    <Compile Include="Ast\TypeMembers\IndexerDeclaration.cs" />
+    <Compile Include="Ast\TypeMembers\MethodDeclaration.cs" />
+    <Compile Include="Ast\TypeMembers\OperatorDeclaration.cs" />
+    <Compile Include="Ast\TypeMembers\ParameterDeclaration.cs" />
+    <Compile Include="Ast\TypeMembers\PropertyDeclaration.cs" />
+    <Compile Include="Ast\TypeMembers\VariableInitializer.cs" />
+    <Compile Include="CSharpProjectContent.cs" />
+    <Compile Include="Formatter\CSharpFormattingOptions.cs" />
+    <Compile Include="Formatter\Indent.cs" />
+    <Compile Include="OutputVisitor\CodeDomConvertVisitor.cs" />
+    <Compile Include="OutputVisitor\CSharpAmbience.cs" />
+    <Compile Include="OutputVisitor\InsertParenthesesVisitor.cs" />
+    <Compile Include="OutputVisitor\IOutputFormatter.cs" />
+    <Compile Include="OutputVisitor\CSharpOutputVisitor.cs" />
+    <Compile Include="OutputVisitor\TextWriterOutputFormatter.cs" />
+    <Compile Include="Parser\CompilerSettings.cs" />
+    <Compile Include="Parser\CSharpParser.cs" />
+    <Compile Include="Parser\mcs\anonymous.cs" />
+    <Compile Include="Parser\mcs\argument.cs" />
+    <Compile Include="Parser\mcs\assembly.cs" />
+    <Compile Include="Parser\mcs\assign.cs" />
+    <Compile Include="Parser\mcs\async.cs" />
+    <Compile Include="Parser\mcs\attribute.cs" />
+    <Compile Include="Parser\mcs\cfold.cs" />
+    <Compile Include="Parser\mcs\class.cs" />
+    <Compile Include="Parser\mcs\codegen.cs" />
+    <Compile Include="Parser\mcs\complete.cs" />
+    <Compile Include="Parser\mcs\const.cs" />
+    <Compile Include="Parser\mcs\constant.cs" />
+    <Compile Include="Parser\mcs\context.cs" />
+    <Compile Include="Parser\mcs\convert.cs" />
+    <Compile Include="Parser\mcs\CryptoConvert.cs" />
+    <Compile Include="Parser\mcs\cs-parser.cs" />
+    <Compile Include="Parser\mcs\cs-tokenizer.cs" />
+    <Compile Include="Parser\mcs\decl.cs" />
+    <Compile Include="Parser\mcs\delegate.cs" />
+    <Compile Include="Parser\mcs\doc.cs" />
+    <Compile Include="Parser\mcs\driver.cs" />
+    <Compile Include="Parser\mcs\dynamic.cs" />
+    <Compile Include="Parser\mcs\ecore.cs" />
+    <Compile Include="Parser\mcs\enum.cs" />
+    <Compile Include="Parser\mcs\eval.cs" />
+    <Compile Include="Parser\mcs\expression.cs" />
+    <Compile Include="Parser\mcs\field.cs" />
+    <Compile Include="Parser\mcs\flowanalysis.cs" />
+    <Compile Include="Parser\mcs\generic.cs" />
+    <Compile Include="Parser\mcs\import.cs" />
+    <Compile Include="Parser\mcs\iterators.cs" />
+    <Compile Include="Parser\mcs\lambda.cs" />
+    <Compile Include="Parser\mcs\linq.cs" />
+    <Compile Include="Parser\mcs\literal.cs" />
+    <Compile Include="Parser\mcs\location.cs" />
+    <Compile Include="Parser\mcs\membercache.cs" />
+    <Compile Include="Parser\mcs\method.cs" />
+    <Compile Include="Parser\mcs\modifiers.cs" />
+    <Compile Include="Parser\mcs\MonoSymbolFile.cs" />
+    <Compile Include="Parser\mcs\MonoSymbolTable.cs" />
+    <Compile Include="Parser\mcs\MonoSymbolWriter.cs" />
+    <Compile Include="Parser\mcs\namespace.cs" />
+    <Compile Include="Parser\mcs\nullable.cs" />
+    <Compile Include="Parser\mcs\outline.cs" />
+    <Compile Include="Parser\mcs\parameter.cs" />
+    <Compile Include="Parser\mcs\pending.cs" />
+    <Compile Include="Parser\mcs\property.cs" />
+    <Compile Include="Parser\mcs\reflection.cs" />
+    <Compile Include="Parser\mcs\report.cs" />
+    <Compile Include="Parser\mcs\statement.cs" />
+    <Compile Include="Parser\mcs\support.cs" />
+    <Compile Include="Parser\mcs\symbolwriter.cs" />
+    <Compile Include="Parser\mcs\typemanager.cs" />
+    <Compile Include="Parser\mcs\typespec.cs" />
+    <Compile Include="Parser\mcs\visit.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="QueryExpressionExpander.cs" />
+    <Compile Include="Refactoring\DocumentScript.cs" />
+    <Compile Include="Refactoring\UsingHelper.cs" />
+    <Compile Include="Refactoring\LambdaHelper.cs" />
+    <Compile Include="Refactoring\PatternHelper.cs" />
+    <Compile Include="Refactoring\RefactoringAstHelper.cs" />
+    <Compile Include="Refactoring\RefactoringContext.cs" />
+    <Compile Include="Refactoring\Script.cs" />
+    <Compile Include="Refactoring\TypeSystemAstBuilder.cs" />
+    <Compile Include="Refactoring\VariableReferenceGraph.cs" />
+    <Compile Include="Resolver\CompositeResolveVisitorNavigator.cs" />
+    <Compile Include="Resolver\AwaitResolveResult.cs" />
+    <Compile Include="Resolver\DynamicInvocationResolveResult.cs" />
+    <Compile Include="Resolver\DynamicMemberResolveResult.cs" />
+    <Compile Include="Resolver\CSharpConversions.cs" />
+    <Compile Include="Resolver\CSharpAstResolver.cs" />
+    <Compile Include="Resolver\CSharpInvocationResolveResult.cs" />
+    <Compile Include="Resolver\CSharpOperators.cs" />
+    <Compile Include="Resolver\CSharpResolver.cs" />
+    <Compile Include="Resolver\DetectSkippableNodesNavigator.cs" />
+    <Compile Include="Resolver\CastResolveResult.cs" />
+    <Compile Include="Resolver\FindReferencedEntities.cs" />
+    <Compile Include="Resolver\FindReferences.cs" />
+    <Compile Include="Resolver\FindReferenceSearchScope.cs" />
+    <Compile Include="Resolver\IResolveVisitorNavigator.cs" />
+    <Compile Include="Resolver\LambdaResolveResult.cs" />
+    <Compile Include="Resolver\Log.cs" />
+    <Compile Include="Resolver\MemberLookup.cs" />
+    <Compile Include="Resolver\MethodGroupResolveResult.cs" />
+    <Compile Include="Resolver\NodeListResolveVisitorNavigator.cs" />
+    <Compile Include="Resolver\OverloadResolution.cs" />
+    <Compile Include="Resolver\OverloadResolutionErrors.cs" />
+    <Compile Include="Resolver\RenameCallbackArguments.cs" />
+    <Compile Include="Resolver\ResolveAtLocation.cs" />
+    <Compile Include="Resolver\ResolveVisitor.cs" />
+    <Compile Include="Resolver\TypeInference.cs" />
+    <Compile Include="Completion\ICompletionDataFactory.cs" />
+    <Compile Include="Completion\IParameterCompletionDataFactory.cs" />
+    <Compile Include="NameLookupMode.cs" />
+    <Compile Include="TypeSystem\AliasNamespaceReference.cs" />
+    <Compile Include="TypeSystem\AttributeTypeReference.cs" />
+    <Compile Include="TypeSystem\ConstantValues.cs" />
+    <Compile Include="TypeSystem\CSharpAssembly.cs" />
+    <Compile Include="TypeSystem\CSharpAttribute.cs" />
+    <Compile Include="TypeSystem\CSharpDocumentationComment.cs" />
+    <Compile Include="TypeSystem\CSharpUnresolvedFile.cs" />
+    <Compile Include="TypeSystem\CSharpUnresolvedTypeDefinition.cs" />
+    <Compile Include="TypeSystem\CSharpTypeResolveContext.cs" />
+    <Compile Include="TypeSystem\ResolvedUsingScope.cs" />
+    <Compile Include="TypeSystem\TypeOrNamespaceReference.cs" />
+    <Compile Include="TypeSystem\MemberTypeOrNamespaceReference.cs" />
+    <Compile Include="TypeSystem\SimpleTypeOrNamespaceReference.cs" />
+    <Compile Include="TypeSystem\MethodTypeParameterWithInheritedConstraints.cs" />
+    <Compile Include="TypeSystem\TypeSystemConvertVisitor.cs" />
+    <Compile Include="TypeSystem\UsingScope.cs" />
+    <Compile Include="Ast\GeneralScope\PreProcessorDirective.cs" />
+    <Compile Include="Ast\Expressions\ErrorExpression.cs" />
+    <Compile Include="Completion\CompletionDataWrapper.cs" />
+    <Compile Include="Completion\CSharpCompletionEngine.cs" />
+    <Compile Include="Completion\CSharpCompletionEngineBase.cs" />
+    <Compile Include="Completion\CSharpParameterCompletionEngine.cs" />
+    <Compile Include="Parser\mcs\module.cs" />
+    <Compile Include="Parser\mcs\settings.cs" />
+    <Compile Include="Parser\mcs\SourceMethodBuilder.cs" />
+    <Compile Include="Ast\TokenRole.cs" />
+    <Compile Include="Ast\Roles.cs" />
+    <Compile Include="Refactoring\BaseRefactoringContext.cs" />
+    <Compile Include="Refactoring\CodeIssue.cs" />
+    <Compile Include="Refactoring\CodeAction.cs" />
+    <Compile Include="Refactoring\ContextActionAttribute.cs" />
+    <Compile Include="Refactoring\IssueAttribute.cs" />
+    <Compile Include="Formatter\TextEditorOptions.cs" />
+    <Compile Include="Formatter\GeneratedCodeSettings.cs" />
+    <Compile Include="Ast\GeneralScope\NewLineNode.cs" />
+    <Compile Include="Ast\GeneralScope\WhitespaceNode.cs" />
+    <Compile Include="Ast\GeneralScope\TextNode.cs" />
+    <Compile Include="Formatter\FormattingOptionsFactory.cs" />
+    <Compile Include="Completion\ICompletionContextProvider.cs" />
+    <Compile Include="Refactoring\NamingHelper.cs" />
+    <Compile Include="Parser\SeekableStreamReader.cs" />
+    <Compile Include="Refactoring\LocalReferenceFinder.cs" />
+    <Compile Include="Resolver\AliasTypeResolveResult.cs" />
+    <Compile Include="Resolver\AliasNamespaceResolveResult.cs" />
+    <Compile Include="Resolver\ReducedExtensionMethod.cs" />
+    <Compile Include="Formatter\CSharpFormatter.cs" />
+    <Compile Include="Formatter\FormattingVisitor.cs" />
+    <Compile Include="Formatter\FormattingVisitor_TypeMembers.cs" />
+    <Compile Include="Formatter\FormattingVisitor_Global.cs" />
+    <Compile Include="Formatter\FormattingVisitor_Statements.cs" />
+    <Compile Include="Formatter\FormattingVisitor_Expressions.cs" />
+    <Compile Include="Formatter\FormattingChanges.cs" />
+    <Compile Include="IntroduceQueryExpressions.cs" />
+    <Compile Include="CombineQueryExpressions.cs" />
+    <Compile Include="Refactoring\CodeIssueProvider.cs" />
+    <Compile Include="Refactoring\CodeActionProvider.cs" />
+    <Compile Include="Refactoring\CommonSubIssues.cs" />
+    <Compile Include="PatternMatching\AnyType.cs" />
+    <Compile Include="Analysis\NullValueAnalysis.cs" />
+    <Compile Include="Analysis\NullValueStatus.cs" />
+    <Compile Include="Analysis\DeclarationSpace\LocalDeclarationSpace.cs" />
+    <Compile Include="Analysis\DeclarationSpace\LocalDeclarationSpaceVisitor.cs" />
+    <Compile Include="Refactoring\WordParser.cs" />
+    <Compile Include="Refactoring\TypeGuessing.cs" />
+    <Compile Include="Refactoring\FormatStringHelper.cs" />
+    <Compile Include="IndentEngine\CSharpIndentEngine.cs" />
+    <Compile Include="IndentEngine\CacheIndentEngine.cs" />
+    <Compile Include="IndentEngine\IDocumentIndentEngine.cs" />
+    <Compile Include="IndentEngine\IStateMachineIndentEngine.cs" />
+    <Compile Include="IndentEngine\IndentState.cs" />
+    <Compile Include="IndentEngine\TextPasteIndentEngine.cs" />
+    <Compile Include="IndentEngine\NullIStateMachineIndentEngine.cs" />
+    <Compile Include="Refactoring\CodeGenerationService.cs" />
+    <Compile Include="Formatter\FormattingVisitor_Query.cs" />
+    <Compile Include="Analysis\AnnotationNames.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
+      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
+      <Name>ICSharpCode.NRefactory</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+  <ItemGroup />
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties>
+        <Policies>
+          <TextStylePolicy TabsToSpaces="False" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/plain" />
+          <TextStylePolicy FileWidth="120" TabsToSpaces="False" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/x-csharp" />
+          <CSharpFormattingPolicy IndentSwitchBody="True" BeforeMethodDeclarationParentheses="False" BeforeMethodCallParentheses="False" BeforeConstructorDeclarationParentheses="False" BeforeDelegateDeclarationParentheses="False" NewParentheses="False" inheritsSet="Mono" inheritsScope="text/x-csharp" scope="text/x-csharp" />
+          <TextStylePolicy inheritsSet="null" scope="text/x-jay" />
+        </Policies>
+      </Properties>
+    </MonoDevelop>
+  </ProjectExtensions>
+  <ItemGroup>
+    <None Include="Parser\mcs\cs-parser.jay" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="PatternMatching\" />
+    <Folder Include="IndentEngine\" />
+  </ItemGroup>
+</Project>
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/CSharpIndentEngine.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/CSharpIndentEngine.cs
new file mode 100644
index 0000000000..d961f335b4
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/CSharpIndentEngine.cs
@@ -0,0 +1,559 @@
+//
+// CSharpIndentEngine.cs
+//
+// Author:
+//       Matej Mikle�ić <matej.miklecic@gmail.com>
+//
+// Copyright (c) 2013 Matej Mikle�ić (matej.miklecic@gmail.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Editor;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	/// <summary>
+	///     Indentation engine based on a state machine.
+	///     Supports only pushing new chars to the end.
+	/// </summary>
+	/// <remarks>
+	///     Represents the context for transitions between <see cref="IndentState"/>.
+	///     Delegates the responsibility for pushing a new char to the current 
+	///     state and changes between states depending on the pushed chars.
+	/// </remarks>
+	public class CSharpIndentEngine : IStateMachineIndentEngine
+	{
+		#region Properties
+
+		/// <summary>
+		///     Formatting options.
+		/// </summary>
+		internal readonly CSharpFormattingOptions formattingOptions;
+
+		/// <summary>
+		///     Text editor options.
+		/// </summary>
+		internal readonly TextEditorOptions textEditorOptions;
+
+		/// <summary>
+		///     A readonly reference to the document that's parsed
+		///     by the engine.
+		/// </summary>
+		internal readonly IDocument document;
+
+		/// <summary>
+		///     Represents the new line character.
+		/// </summary>
+		internal readonly char newLineChar;
+
+		/// <summary>
+		///     The current indentation state.
+		/// </summary>
+		internal IndentState currentState;
+
+		/// <summary>
+		///     Stores conditional symbols of #define directives.
+		/// </summary>
+		internal HashSet<string> conditionalSymbols;
+
+		/// <summary>
+		///     Stores custom conditional symbols.
+		/// </summary>
+		internal HashSet<string> customConditionalSymbols;
+
+
+		/// <summary>
+		///     True if any of the preprocessor if/elif directives in the current
+		///     block (between #if and #endif) were evaluated to true.
+		/// </summary>
+		internal Stack<bool> ifDirectiveEvalResult = new Stack<bool> ();
+
+		/// <summary>
+		///     Stores the last sequence of characters that can form a
+		///     valid keyword or variable name.
+		/// </summary>
+		internal StringBuilder wordToken;
+
+		/// <summary>
+		///     Stores the previous sequence of chars that formed a
+		///     valid keyword or variable name.
+		/// </summary>
+		internal string previousKeyword;
+
+		#endregion
+
+		#region IDocumentIndentEngine
+
+		/// <inheritdoc />
+		public IDocument Document
+		{
+			get { return document; }
+		}
+
+		/// <inheritdoc />
+		public string ThisLineIndent
+		{
+			get
+			{
+				// OPTION: IndentBlankLines
+				// remove the indentation of this line if isLineStart is true
+//				if (!textEditorOptions.IndentBlankLines && isLineStart)
+//				{
+//					return string.Empty;
+//				}
+
+				return currentState.ThisLineIndent.IndentString;
+			}
+		}
+
+		/// <inheritdoc />
+		public string NextLineIndent
+		{
+			get
+			{
+				return currentState.NextLineIndent.IndentString;
+			}
+		}
+
+		/// <inheritdoc />
+		public string CurrentIndent
+		{
+			get
+			{
+				return currentIndent.ToString();
+			}
+		}
+
+		/// <inheritdoc />
+		/// <remarks>
+		///     This is set depending on the current <see cref="Location"/> and
+		///     can change its value until the <see cref="newLineChar"/> char is
+		///     pushed. If this is true, that doesn't necessarily mean that the
+		///     current line has an incorrect indent (this can be determined
+		///     only at the end of the current line).
+		/// </remarks>
+		public bool NeedsReindent
+		{
+			get
+			{
+				// return true if it's the first column of the line and it has an indent
+				if (Location.Column == 1)
+				{
+					return ThisLineIndent.Length > 0;
+				}
+
+				// ignore incorrect indentations when there's only ws on this line
+				if (isLineStart)
+				{
+					return false;
+				}
+
+				return ThisLineIndent != CurrentIndent.ToString();
+			}
+		}
+
+		/// <inheritdoc />
+		public int Offset
+		{
+			get
+			{
+				return offset;
+			}
+		}
+
+		/// <inheritdoc />
+		public TextLocation Location
+		{
+			get
+			{
+				return new TextLocation(line, column);
+			}
+		}
+
+		/// <inheritdoc />
+		public bool EnableCustomIndentLevels
+		{
+			get;
+			set;
+		}
+
+		#endregion
+
+		#region Fields
+
+		/// <summary>
+		///    Represents the number of pushed chars.
+		/// </summary>
+		internal int offset = 0;
+
+		/// <summary>
+		///    The current line number.
+		/// </summary>
+		internal int line = 1;
+
+		/// <summary>
+		///    The current column number.
+		/// </summary>
+		/// <remarks>
+		///    One char can take up multiple columns (e.g. \t).
+		/// </remarks>
+		internal int column = 1;
+
+		/// <summary>
+		///    True if <see cref="char.IsWhiteSpace(char)"/> is true for all
+		///    chars at the current line.
+		/// </summary>
+		internal bool isLineStart = true;
+
+		/// <summary>
+		///    True if <see cref="isLineStart"/> was true before the current
+		///    <see cref="wordToken"/>.
+		/// </summary>
+		internal bool isLineStartBeforeWordToken = true;
+
+		/// <summary>
+		///    Current char that's being pushed.
+		/// </summary>
+		internal char currentChar = '\0';
+
+		/// <summary>
+		///    Last non-whitespace char that has been pushed.
+		/// </summary>
+		internal char previousChar = '\0';
+
+		/// <summary>
+		///    Previous new line char
+		/// </summary>
+		internal char previousNewline = '\0';
+
+
+		/// <summary>
+		///    Current indent level on this line.
+		/// </summary>
+		internal StringBuilder currentIndent = new StringBuilder();
+
+		/// <summary>
+		///     True if this line began in <see cref="VerbatimStringState"/>.
+		/// </summary>
+		internal bool lineBeganInsideVerbatimString = false;
+
+		/// <summary>
+		///     True if this line began in <see cref="MultiLineCommentState"/>.
+		/// </summary>
+		internal bool lineBeganInsideMultiLineComment = false;
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		///     Creates a new CSharpIndentEngine instance.
+		/// </summary>
+		/// <param name="document">
+		///     An instance of <see cref="IDocument"/> which is being parsed.
+		/// </param>
+		/// <param name="formattingOptions">
+		///     C# formatting options.
+		/// </param>
+		/// <param name="textEditorOptions">
+		///    Text editor options for indentation.
+		/// </param>
+		public CSharpIndentEngine(IDocument document, TextEditorOptions textEditorOptions, CSharpFormattingOptions formattingOptions)
+		{
+			this.formattingOptions = formattingOptions;
+			this.textEditorOptions = textEditorOptions;
+			this.document = document;
+
+			this.currentState = IndentStateFactory.Default(this);
+
+			this.conditionalSymbols = new HashSet<string>();
+			this.customConditionalSymbols = new HashSet<string>();
+			this.wordToken = new StringBuilder();
+			this.previousKeyword = string.Empty;
+			this.newLineChar = textEditorOptions.EolMarker[0];
+		}
+
+		/// <summary>
+		///     Creates a new CSharpIndentEngine instance from the given prototype.
+		/// </summary>
+		/// <param name="prototype">
+		///     An CSharpIndentEngine instance.
+		/// </param>
+		public CSharpIndentEngine(CSharpIndentEngine prototype)
+		{
+			this.formattingOptions = prototype.formattingOptions;
+			this.textEditorOptions = prototype.textEditorOptions;
+			this.document = prototype.document;
+
+			this.newLineChar = prototype.newLineChar;
+			this.currentState = prototype.currentState.Clone(this);
+			this.conditionalSymbols = new HashSet<string>(prototype.conditionalSymbols);
+			this.customConditionalSymbols = new HashSet<string>(prototype.customConditionalSymbols);
+
+			this.wordToken = new StringBuilder(prototype.wordToken.ToString());
+			this.previousKeyword = string.Copy(prototype.previousKeyword);
+			this.ifDirectiveEvalResult = prototype.ifDirectiveEvalResult;
+
+			this.offset = prototype.offset;
+			this.line = prototype.line;
+			this.column = prototype.column;
+			this.isLineStart = prototype.isLineStart;
+			this.isLineStartBeforeWordToken = prototype.isLineStartBeforeWordToken;
+			this.currentChar = prototype.currentChar;
+			this.previousChar = prototype.previousChar;
+			this.previousNewline = prototype.previousNewline;
+			this.currentIndent = new StringBuilder(prototype.CurrentIndent.ToString());
+			this.lineBeganInsideMultiLineComment = prototype.lineBeganInsideMultiLineComment;
+			this.lineBeganInsideVerbatimString = prototype.lineBeganInsideVerbatimString;
+			this.ifDirectiveEvalResult = new Stack<bool>(prototype.ifDirectiveEvalResult.Reverse());
+
+			this.EnableCustomIndentLevels = prototype.EnableCustomIndentLevels;
+		}
+
+		#endregion
+
+		#region IClonable
+
+		object ICloneable.Clone()
+		{
+			return Clone();
+		}
+
+		/// <inheritdoc />
+		IDocumentIndentEngine IDocumentIndentEngine.Clone()
+		{
+			return Clone();
+		}
+
+		public IStateMachineIndentEngine Clone()
+		{
+			return new CSharpIndentEngine(this);
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <inheritdoc />
+		public void Push(char ch)
+		{
+			// append this char to the wordbuf if it can form a valid keyword, otherwise check
+			// if the last sequence of chars form a valid keyword and reset the wordbuf.
+			if ((wordToken.Length == 0 ? char.IsLetter(ch) : char.IsLetterOrDigit(ch)) || ch == '_')
+			{
+				wordToken.Append(ch);
+			}
+			else if (wordToken.Length > 0)
+			{
+				currentState.CheckKeyword(wordToken.ToString());
+				previousKeyword = wordToken.ToString();
+				wordToken.Length = 0;
+				isLineStartBeforeWordToken = false;
+			}
+
+			var isNewLine = NewLine.IsNewLine(ch);
+			if (!isNewLine) {
+				currentState.Push(currentChar = ch);
+			} else {
+				if (ch == NewLine.LF && previousNewline == NewLine.CR) {
+					offset++;
+					return;
+				}
+				currentState.Push(currentChar = newLineChar);
+			}
+
+			offset++;
+
+			if (!isNewLine)
+			{
+				previousNewline = '\0';
+				// ignore whitespace and newline chars
+				if (!char.IsWhiteSpace(currentChar))
+				{
+					previousChar = currentChar;
+				}
+
+				isLineStart &= char.IsWhiteSpace(ch);
+
+				if (isLineStart)
+				{
+					currentIndent.Append(ch);
+				}
+
+				if (ch == '\t')
+				{
+					var nextTabStop = (column - 1 + textEditorOptions.IndentSize) / textEditorOptions.IndentSize;
+					column = 1 + nextTabStop * textEditorOptions.IndentSize;
+				}
+				else
+				{
+					column++;
+				}
+			}
+			else
+			{
+				previousNewline = ch;
+				// there can be more than one chars that determine the EOL,
+				// the engine uses only one of them defined with newLineChar
+				if (currentChar != newLineChar)
+				{
+					return;
+				}
+				currentIndent.Length = 0;
+				isLineStart = true;
+				isLineStartBeforeWordToken = true;
+				column = 1;
+				line++;
+
+				lineBeganInsideMultiLineComment = IsInsideMultiLineComment;
+				lineBeganInsideVerbatimString = IsInsideVerbatimString;
+			}
+		}
+
+		/// <inheritdoc />
+		public void Reset()
+		{
+			currentState = IndentStateFactory.Default(this);
+			conditionalSymbols.Clear();
+			ifDirectiveEvalResult.Clear();
+
+			offset = 0;
+			line = 1;
+			column = 1;
+			isLineStart = true;
+			currentChar = '\0';
+			previousChar = '\0';
+			currentIndent.Length = 0;
+			lineBeganInsideMultiLineComment = false;
+			lineBeganInsideVerbatimString = false;
+		}
+
+		/// <inheritdoc />
+		public void Update(int offset)
+		{
+			if (Offset > offset)
+			{
+				Reset();
+			}
+
+			while (Offset < offset)
+			{
+				Push(Document.GetCharAt(Offset));
+			}
+		}
+
+		/// <summary>
+		/// Defines the conditional symbol.
+		/// </summary>
+		/// <param name="defineSymbol">The symbol to define.</param>
+		public void DefineSymbol(string defineSymbol)
+		{
+			if (!customConditionalSymbols.Contains(defineSymbol))
+				customConditionalSymbols.Add(defineSymbol);
+		}
+
+		/// <summary>
+		/// Removes the symbol.
+		/// </summary>
+		/// <param name="undefineSymbol">The symbol to undefine.</param>
+		public void RemoveSymbol(string undefineSymbol)
+		{
+			if (customConditionalSymbols.Contains(undefineSymbol))
+				customConditionalSymbols.Remove(undefineSymbol);
+		}
+		#endregion
+
+		#region IStateMachineIndentEngine
+
+		public bool IsInsidePreprocessorDirective
+		{
+			get { return currentState is PreProcessorState; }
+		}
+
+		public bool IsInsidePreprocessorComment
+		{
+			get { return currentState is PreProcessorCommentState; }
+		}
+
+		public bool IsInsideStringLiteral
+		{
+			get { return currentState is StringLiteralState; }
+		}
+
+		public bool IsInsideVerbatimString
+		{
+			get { return currentState is VerbatimStringState; }
+		}
+
+		public bool IsInsideCharacter
+		{
+			get { return currentState is CharacterState; }
+		}
+
+		public bool IsInsideString
+		{
+			get { return IsInsideStringLiteral || IsInsideVerbatimString || IsInsideCharacter; }
+		}
+
+		public bool IsInsideLineComment
+		{
+			get { return currentState is LineCommentState; }
+		}
+
+		public bool IsInsideMultiLineComment
+		{
+			get { return currentState is MultiLineCommentState; }
+		}
+
+		public bool IsInsideDocLineComment
+		{
+			get { return currentState is DocCommentState; }
+		}
+
+		public bool IsInsideComment
+		{
+			get { return IsInsideLineComment || IsInsideMultiLineComment || IsInsideDocLineComment; }
+		}
+
+		public bool IsInsideOrdinaryComment
+		{
+			get { return IsInsideLineComment || IsInsideMultiLineComment; }
+		}
+
+		public bool IsInsideOrdinaryCommentOrString
+		{
+			get { return IsInsideOrdinaryComment || IsInsideString; }
+		}
+
+		public bool LineBeganInsideVerbatimString
+		{
+			get { return lineBeganInsideVerbatimString; }
+		}
+
+		public bool LineBeganInsideMultiLineComment
+		{
+			get { return lineBeganInsideMultiLineComment; }
+		}
+
+		#endregion
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/CacheIndentEngine.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/CacheIndentEngine.cs
new file mode 100644
index 0000000000..b19f388680
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/CacheIndentEngine.cs
@@ -0,0 +1,627 @@
+//
+// CacheIndentEngine.cs
+//
+// Author:
+//       Matej Mikle�ić <matej.miklecic@gmail.com>
+//
+// Copyright (c) 2013 Matej Mikle�ić (matej.miklecic@gmail.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Editor;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	/// <summary>
+	///     Represents a decorator of an IStateMachineIndentEngine instance that provides
+	///     logic for reseting and updating the engine on text changed events.
+	/// </summary>
+	/// <remarks>
+	///     The decorator is based on periodical caching of the engine's state and
+	///     delegating all logic behind indentation to the currently active engine.
+	/// </remarks>
+	public class CacheIndentEngine : IStateMachineIndentEngine
+	{
+
+		#region Properties
+
+		IStateMachineIndentEngine currentEngine;
+		Stack<IStateMachineIndentEngine> cachedEngines = new Stack<IStateMachineIndentEngine>();
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		///     Creates a new CacheIndentEngine instance.
+		/// </summary>
+		/// <param name="decoratedEngine">
+		///     An instance of <see cref="IStateMachineIndentEngine"/> to which the
+		///     logic for indentation will be delegated.
+		/// </param>
+		/// <param name="cacheRate">
+		///     The number of chars between caching.
+		/// </param>
+		public CacheIndentEngine(IStateMachineIndentEngine decoratedEngine, int cacheRate = 2000)
+		{
+			this.currentEngine = decoratedEngine;
+		}
+
+		/// <summary>
+		///     Creates a new CacheIndentEngine instance from the given prototype.
+		/// </summary>
+		/// <param name="prototype">
+		///     A CacheIndentEngine instance.
+		/// </param>
+		public CacheIndentEngine(CacheIndentEngine prototype)
+		{
+			this.currentEngine = prototype.currentEngine.Clone();
+		}
+
+		#endregion
+
+		#region IDocumentIndentEngine
+
+		/// <inheritdoc />
+		public IDocument Document {
+			get { return currentEngine.Document; }
+		}
+
+		/// <inheritdoc />
+		public string ThisLineIndent {
+			get { return currentEngine.ThisLineIndent; }
+		}
+
+		/// <inheritdoc />
+		public string NextLineIndent {
+			get { return currentEngine.NextLineIndent; }
+		}
+
+		/// <inheritdoc />
+		public string CurrentIndent {
+			get { return currentEngine.CurrentIndent; }
+		}
+
+		/// <inheritdoc />
+		public bool NeedsReindent {
+			get { return currentEngine.NeedsReindent; }
+		}
+
+		/// <inheritdoc />
+		public int Offset {
+			get { return currentEngine.Offset; }
+		}
+
+		/// <inheritdoc />
+		public TextLocation Location {
+			get { return currentEngine.Location; }
+		}
+
+		/// <inheritdoc />
+		public bool EnableCustomIndentLevels
+		{
+			get { return currentEngine.EnableCustomIndentLevels; }
+			set { currentEngine.EnableCustomIndentLevels = value; }
+		}
+
+		/// <inheritdoc />
+		public void Push(char ch)
+		{
+			currentEngine.Push(ch);
+		}
+
+		/// <inheritdoc />
+		public void Reset()
+		{
+			currentEngine.Reset();
+			cachedEngines.Clear();
+		}
+
+		/// <summary>
+		/// Resets the engine to offset. Clears all cached engines after the given offset.
+		/// </summary>
+		public void ResetEngineToPosition(int offset)
+		{
+			// We are already there
+			if (currentEngine.Offset <= offset)
+				return;
+			
+			bool gotCachedEngine = false;
+			while (cachedEngines.Count > 0) {
+				var topEngine = cachedEngines.Peek();
+				if (topEngine.Offset <= offset) {
+					currentEngine = topEngine.Clone();
+					gotCachedEngine = true;
+					break;
+				} else {
+					cachedEngines.Pop();
+				}
+			}
+			if (!gotCachedEngine)
+				currentEngine.Reset();
+		}
+
+		/// <inheritdoc />
+		/// <remarks>
+		///     If the <paramref name="position"/> is negative, the engine will
+		///     update to: document.TextLength + (offset % document.TextLength+1)
+		///     Otherwise it will update to: offset % document.TextLength+1
+		/// </remarks>
+		public void Update(int position)
+		{
+			const int BUFFER_SIZE = 2000;
+			
+			if (currentEngine.Offset == position) {
+				//positions match, nothing to be done
+				return;
+			} else if (currentEngine.Offset > position) {
+				//moving backwards, so reset from previous saved location
+				ResetEngineToPosition(position);
+			}
+
+			// get the engine caught up
+			int nextSave = (cachedEngines.Count == 0) ? BUFFER_SIZE : cachedEngines.Peek().Offset + BUFFER_SIZE;
+			if (currentEngine.Offset + 1 == position) {
+				char ch = currentEngine.Document.GetCharAt(currentEngine.Offset);
+				currentEngine.Push(ch);
+				if (currentEngine.Offset == nextSave)
+					cachedEngines.Push(currentEngine.Clone());
+			} else {
+				//bulk copy characters in case buffer is unmanaged 
+				//(faster if we reduce managed/unmanaged transitions)
+				while (currentEngine.Offset < position) {
+					int endCut = currentEngine.Offset + BUFFER_SIZE;
+					if (endCut > position)
+						endCut = position;
+					string buffer = currentEngine.Document.GetText(currentEngine.Offset, endCut - currentEngine.Offset);
+					foreach (char ch in buffer) {
+						currentEngine.Push(ch);
+						//ConsoleWrite ("pushing character '{0}'", ch);
+						if (currentEngine.Offset == nextSave) {
+							cachedEngines.Push(currentEngine.Clone());
+							nextSave += BUFFER_SIZE;
+						}
+					}
+				}
+			}
+		}
+
+		public IStateMachineIndentEngine GetEngine(int offset)
+		{
+			ResetEngineToPosition(offset);
+			return currentEngine;
+		}
+
+		#endregion
+
+		#region IClonable
+
+		/// <inheritdoc />
+		public IStateMachineIndentEngine Clone()
+		{
+			return new CacheIndentEngine(this);
+		}
+
+		/// <inheritdoc />
+		IDocumentIndentEngine IDocumentIndentEngine.Clone()
+		{
+			return Clone();
+		}
+
+		object ICloneable.Clone()
+		{
+			return Clone();
+		}
+
+		#endregion
+
+		#region IStateMachineIndentEngine
+
+		public bool IsInsidePreprocessorDirective {
+			get { return currentEngine.IsInsidePreprocessorDirective; }
+		}
+
+		public bool IsInsidePreprocessorComment {
+			get { return currentEngine.IsInsidePreprocessorComment; }
+		}
+
+		public bool IsInsideStringLiteral {
+			get { return currentEngine.IsInsideStringLiteral; }
+		}
+
+		public bool IsInsideVerbatimString {
+			get { return currentEngine.IsInsideVerbatimString; }
+		}
+
+		public bool IsInsideCharacter {
+			get { return currentEngine.IsInsideCharacter; }
+		}
+
+		public bool IsInsideString {
+			get { return currentEngine.IsInsideString; }
+		}
+
+		public bool IsInsideLineComment {
+			get { return currentEngine.IsInsideLineComment; }
+		}
+
+		public bool IsInsideMultiLineComment {
+			get { return currentEngine.IsInsideMultiLineComment; }
+		}
+
+		public bool IsInsideDocLineComment {
+			get { return currentEngine.IsInsideDocLineComment; }
+		}
+
+		public bool IsInsideComment {
+			get { return currentEngine.IsInsideComment; }
+		}
+
+		public bool IsInsideOrdinaryComment {
+			get { return currentEngine.IsInsideOrdinaryComment; }
+		}
+
+		public bool IsInsideOrdinaryCommentOrString {
+			get { return currentEngine.IsInsideOrdinaryCommentOrString; }
+		}
+
+		public bool LineBeganInsideVerbatimString {
+			get { return currentEngine.LineBeganInsideVerbatimString; }
+		}
+
+		public bool LineBeganInsideMultiLineComment {
+			get { return currentEngine.LineBeganInsideMultiLineComment; }
+		}
+
+		#endregion
+
+	}
+	/*
+/		// <summary>
+	///     Represents a decorator of an IStateMachineIndentEngine instance that provides
+	///     logic for reseting and updating the engine on text changed events.
+	/// </summary>
+	/// <remarks>
+	///     The decorator is based on periodical caching of the engine's state and
+	///     delegating all logic behind indentation to the currently active engine.
+	/// </remarks>
+	public class CacheIndentEngine : IStateMachineIndentEngine
+	{
+		#region Properties
+		
+		/// <summary>
+		///     Represents the cache interval in number of chars pushed to the engine.
+		/// </summary>
+		/// <remarks>
+		///     When this many new chars are pushed to the engine, the currently active
+		///     engine gets cloned and added to the end of <see cref="cachedEngines"/>.
+		/// </remarks>
+		readonly int cacheRate;
+		
+		/// <summary>
+		///     Determines how much memory to reserve on initialization for the
+		///     cached engines.
+		/// </summary>
+		const int cacheCapacity = 25;
+		
+		/// <summary>
+		///     Currently active engine.
+		/// </summary>
+		/// <remarks>
+		///     Should be equal to the last engine in <see cref="cachedEngines"/>.
+		/// </remarks>
+		IStateMachineIndentEngine currentEngine;
+		
+		/// <summary>
+		///     List of cached engines sorted ascending by 
+		///     <see cref="IDocumentIndentEngine.Offset"/>.
+		/// </summary>
+		IStateMachineIndentEngine[] cachedEngines;
+		
+		/// <summary>
+		///     The index of the last cached engine in cachedEngines.
+		/// </summary>
+		/// <remarks>
+		///     Should be equal to: currentEngine.Offset / CacheRate
+		/// </remarks>
+		int lastCachedEngine;
+		
+		#endregion
+		
+		#region Constructors
+		
+		/// <summary>
+		///     Creates a new CacheIndentEngine instance.
+		/// </summary>
+		/// <param name="decoratedEngine">
+		///     An instance of <see cref="IStateMachineIndentEngine"/> to which the
+		///     logic for indentation will be delegated.
+		/// </param>
+		/// <param name="cacheRate">
+		///     The number of chars between caching.
+		/// </param>
+		public CacheIndentEngine(IStateMachineIndentEngine decoratedEngine, int cacheRate = 2000)
+		{
+			this.cachedEngines = new IStateMachineIndentEngine[cacheCapacity];
+			
+			this.cachedEngines[0] = decoratedEngine.Clone();
+			this.currentEngine = this.cachedEngines[0].Clone();
+			this.cacheRate = cacheRate;
+		}
+		
+		/// <summary>
+		///     Creates a new CacheIndentEngine instance from the given prototype.
+		/// </summary>
+		/// <param name="prototype">
+		///     A CacheIndentEngine instance.
+		/// </param>
+		public CacheIndentEngine(CacheIndentEngine prototype)
+		{
+			this.cachedEngines = new IStateMachineIndentEngine[prototype.cachedEngines.Length];
+			Array.Copy(prototype.cachedEngines, this.cachedEngines, prototype.cachedEngines.Length);
+			
+			this.lastCachedEngine = prototype.lastCachedEngine;
+			this.currentEngine = prototype.currentEngine.Clone();
+			this.cacheRate = prototype.cacheRate;
+		}
+		
+		#endregion
+		
+		#region Methods
+		
+		/// <summary>
+		///     Performs caching of the <see cref="CacheIndentEngine.currentEngine"/>.
+		/// </summary>
+		void cache()
+		{
+			if (currentEngine.Offset % cacheRate != 0)
+			{
+				throw new Exception("The current engine's offset is not divisable with the cacheRate.");
+			}
+			
+			// determine the new current engine from cachedEngines
+			lastCachedEngine = currentEngine.Offset / cacheRate;
+			
+			if (cachedEngines.Length < lastCachedEngine + 1)
+			{
+				Array.Resize(ref cachedEngines, lastCachedEngine * 2);
+			}
+			
+			cachedEngines[lastCachedEngine] = currentEngine.Clone();
+		}
+		
+		#endregion
+		
+		#region IDocumentIndentEngine
+		
+		/// <inheritdoc />
+		public IDocument Document
+		{
+			get { return currentEngine.Document; }
+		}
+		
+		/// <inheritdoc />
+		public string ThisLineIndent
+		{
+			get { return currentEngine.ThisLineIndent; }
+		}
+		
+		/// <inheritdoc />
+		public string NextLineIndent
+		{
+			get { return currentEngine.NextLineIndent; }
+		}
+		
+		/// <inheritdoc />
+		public string CurrentIndent
+		{
+			get { return currentEngine.CurrentIndent; }
+		}
+		
+		/// <inheritdoc />
+		public bool NeedsReindent
+		{
+			get { return currentEngine.NeedsReindent; }
+		}
+		
+		/// <inheritdoc />
+		public int Offset
+		{
+			get { return currentEngine.Offset; }
+		}
+		
+		/// <inheritdoc />
+		public TextLocation Location
+		{
+			get { return currentEngine.Location; }
+		}
+		
+		/// <inheritdoc />
+		public void Push(char ch)
+		{
+			currentEngine.Push(ch);
+			
+			if (currentEngine.Offset % cacheRate == 0)
+			{
+				cache();
+			}
+		}
+		
+		/// <inheritdoc />
+		public void Reset()
+		{
+			currentEngine = cachedEngines[lastCachedEngine = 0];
+		}
+		
+		/// <inheritdoc />
+		/// <remarks>
+		///     If the <paramref name="offset"/> is negative, the engine will
+		///     update to: document.TextLength + (offset % document.TextLength+1)
+		///     Otherwise it will update to: offset % document.TextLength+1
+		/// </remarks>
+		public void Update(int offset)
+		{
+			// map the given offset to the [0, document.TextLength] interval
+			// using modulo arithmetics
+			offset %= Document.TextLength + 1;
+			if (offset < 0)
+			{
+				offset += Document.TextLength + 1;
+			}
+			
+			// check if the engine has to be updated to some previous offset
+			if (currentEngine.Offset > offset)
+			{
+				// replace the currentEngine with the first one whose offset
+				// is less then the given <paramref name="offset"/>
+				lastCachedEngine =  offset / cacheRate;
+				currentEngine = cachedEngines[lastCachedEngine].Clone();
+			}
+			
+			// update the engine to the given offset
+			while (Offset < offset)
+			{
+				Push(Document.GetCharAt(Offset));
+			}
+		}
+		
+		public IStateMachineIndentEngine GetEngine(int offset)
+		{
+			// map the given offset to the [0, document.TextLength] interval
+			// using modulo arithmetics
+			offset %= Document.TextLength + 1;
+			if (offset < 0)
+			{
+				offset += Document.TextLength + 1;
+			}
+			
+			// check if the engine has to be updated to some previous offset
+			if (currentEngine.Offset > offset)
+			{
+				// replace the currentEngine with the first one whose offset
+				// is less then the given <paramref name="offset"/>
+				lastCachedEngine =  offset / cacheRate;
+				return cachedEngines[lastCachedEngine].Clone();
+			}
+			
+			return currentEngine;
+		}
+		
+		#endregion
+		
+		#region IClonable
+		
+		/// <inheritdoc />
+		public IStateMachineIndentEngine Clone()
+		{
+			return new CacheIndentEngine(this);
+		}
+		
+		/// <inheritdoc />
+		IDocumentIndentEngine IDocumentIndentEngine.Clone()
+		{
+			return Clone();
+		}
+		
+		object ICloneable.Clone()
+		{
+			return Clone();
+		}
+		
+		#endregion
+		
+		#region IStateMachineIndentEngine
+		
+		public bool IsInsidePreprocessorDirective
+		{
+			get { return currentEngine.IsInsidePreprocessorDirective; }
+		}
+		
+		public bool IsInsidePreprocessorComment
+		{
+			get { return currentEngine.IsInsidePreprocessorComment; }
+		}
+		
+		public bool IsInsideStringLiteral
+		{
+			get { return currentEngine.IsInsideStringLiteral; }
+		}
+		
+		public bool IsInsideVerbatimString
+		{
+			get { return currentEngine.IsInsideVerbatimString; }
+		}
+		
+		public bool IsInsideCharacter
+		{
+			get { return currentEngine.IsInsideCharacter; }
+		}
+		
+		public bool IsInsideString
+		{
+			get { return currentEngine.IsInsideString; }
+		}
+		
+		public bool IsInsideLineComment
+		{
+			get { return currentEngine.IsInsideLineComment; }
+		}
+		
+		public bool IsInsideMultiLineComment
+		{
+			get { return currentEngine.IsInsideMultiLineComment; }
+		}
+		
+		public bool IsInsideDocLineComment
+		{
+			get { return currentEngine.IsInsideDocLineComment; }
+		}
+		
+		public bool IsInsideComment
+		{
+			get { return currentEngine.IsInsideComment; }
+		}
+		
+		public bool IsInsideOrdinaryComment
+		{
+			get { return currentEngine.IsInsideOrdinaryComment; }
+		}
+		
+		public bool IsInsideOrdinaryCommentOrString
+		{
+			get { return currentEngine.IsInsideOrdinaryCommentOrString; }
+		}
+		
+		public bool LineBeganInsideVerbatimString
+		{
+			get { return currentEngine.LineBeganInsideVerbatimString; }
+		}
+		
+		public bool LineBeganInsideMultiLineComment
+		{
+			get { return currentEngine.LineBeganInsideMultiLineComment; }
+		}
+		
+		#endregion
+	}
+	
+	*/
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/IDocumentIndentEngine.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/IDocumentIndentEngine.cs
new file mode 100644
index 0000000000..821aa0bc8b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/IDocumentIndentEngine.cs
@@ -0,0 +1,108 @@
+//
+// IDocumentIndentEngine.cs
+//
+// Author:
+//       Matej Mikle�ić <matej.miklecic@gmail.com>
+//
+// Copyright (c) 2013 Matej Mikle�ić (matej.miklecic@gmail.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Editor;
+using System;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	/// <summary>
+	///     The base interface for all indent engines.
+	/// </summary>
+	public interface IDocumentIndentEngine : ICloneable
+	{
+		/// <summary>
+		///     A reference to the document that's parsed by the engine.
+		/// </summary>
+		IDocument Document { get; }
+
+		/// <summary>
+		///     The indentation string of the current line.
+		/// </summary>
+		string ThisLineIndent { get; }
+
+		/// <summary>
+		///     The indentation string of the next line.
+		/// </summary>
+		string NextLineIndent { get; }
+
+		/// <summary>
+		///     The indent string on the beginning of the current line.
+		/// </summary>
+		string CurrentIndent { get; }
+
+		/// <summary>
+		///     True if the current line needs to be reindented.
+		/// </summary>
+		bool NeedsReindent { get; }
+
+		/// <summary>
+		///     The current offset of the engine.
+		/// </summary>
+		int Offset { get; }
+
+		/// <summary>
+		///     The current location of the engine.
+		/// </summary>
+		TextLocation Location { get; }
+
+		/// <summary>
+		///     If this is true, the engine should try to adjust its indent 
+		///     levels to manual user's corrections, even if they are wrong.
+		/// </summary>
+		bool EnableCustomIndentLevels { get; set; }
+
+		/// <summary>
+		///     Pushes a new char into the engine which calculates the new
+		///     indentation levels.
+		/// </summary>
+		/// <param name="ch">
+		///     A new character.
+		/// </param>
+		void Push(char ch);
+
+		/// <summary>
+		///     Resets the engine.
+		/// </summary>
+		void Reset();
+
+		/// <summary>
+		///     Updates the engine to the given offset.
+		/// </summary>
+		/// <param name="offset">
+		///     Valid offset in <see cref="Document"/>.
+		/// </param>
+		void Update(int offset);
+
+		/// <summary>
+		///     Clones the engine and preserves the current state.
+		/// </summary>
+		/// <returns>
+		///     An indentical clone which can operate without interference
+		///     with this engine.
+		/// </returns>
+		new IDocumentIndentEngine Clone();
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/IStateMachineIndentEngine.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/IStateMachineIndentEngine.cs
new file mode 100644
index 0000000000..44c3949cf7
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/IStateMachineIndentEngine.cs
@@ -0,0 +1,60 @@
+//
+// IStateMachineIndentEngine.cs
+//
+// Author:
+//       Matej Mikle�ić <matej.miklecic@gmail.com>
+//
+// Copyright (c) 2013 Matej Mikle�ić (matej.miklecic@gmail.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+namespace ICSharpCode.NRefactory.CSharp
+{
+	public interface IStateMachineIndentEngine : IDocumentIndentEngine
+	{
+		bool IsInsidePreprocessorDirective { get; }
+
+		bool IsInsidePreprocessorComment { get; }
+
+		bool IsInsideStringLiteral { get; }
+
+		bool IsInsideVerbatimString { get; }
+
+		bool IsInsideCharacter { get; }
+
+		bool IsInsideString { get; }
+
+		bool IsInsideLineComment { get; }
+
+		bool IsInsideMultiLineComment { get; }
+
+		bool IsInsideDocLineComment { get; }
+
+		bool IsInsideComment { get; }
+
+		bool IsInsideOrdinaryComment { get; }
+
+		bool IsInsideOrdinaryCommentOrString { get; }
+
+		bool LineBeganInsideVerbatimString { get; }
+
+		bool LineBeganInsideMultiLineComment { get; }
+
+		new IStateMachineIndentEngine Clone();
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/IndentState.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/IndentState.cs
new file mode 100644
index 0000000000..47dfb46ebf
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/IndentState.cs
@@ -0,0 +1,1990 @@
+//
+// IndentState.cs
+//
+// Author:
+//       Matej Mikle�ić <matej.miklecic@gmail.com>
+//
+// Copyright (c) 2013 Matej Mikle�ić (matej.miklecic@gmail.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	#region IndentState
+
+	/// <summary>
+	///     The base class for all indentation states. 
+	///     Each state defines the logic for indentation based on chars that
+	///     are pushed to it.
+	/// </summary>
+	public abstract class IndentState : ICloneable
+	{
+		#region Properties
+
+		/// <summary>
+		///     The indentation engine using this state.
+		/// </summary>
+		public CSharpIndentEngine Engine;
+
+		/// <summary>
+		///     The parent state. 
+		///     This state can use the indentation levels of its parent.
+		///     When this state exits, the engine returns to the parent.
+		/// </summary>
+		public IndentState Parent;
+
+		/// <summary>
+		///     The indentation of the current line.
+		///     This is set when the state is created and will be changed to
+		///     <see cref="NextLineIndent"/> when the <see cref="CSharpIndentEngine.newLineChar"/> 
+		///     is pushed.
+		/// </summary>
+		public Indent ThisLineIndent;
+
+		/// <summary>
+		///     The indentation of the next line.
+		///     This is set when the state is created and can change depending
+		///     on the pushed chars.
+		/// </summary>
+		public Indent NextLineIndent;
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		///     Creates a new indentation state.
+		/// </summary>
+		/// <param name="engine">
+		///     The indentation engine that uses this state.
+		/// </param>
+		/// <param name="parent">
+		///     The parent state, or null if this state doesn't have one ->
+		///         e.g. the state represents the global space.
+		/// </param>
+		protected IndentState(CSharpIndentEngine engine, IndentState parent = null)
+		{
+			Parent = parent;
+			Engine = engine;
+
+			InitializeState();
+		}
+
+		/// <summary>
+		///     Creates a new indentation state that is a copy of the given
+		///     prototype.
+		/// </summary>
+		/// <param name="prototype">
+		///     The prototype state.
+		/// </param>
+		/// <param name="engine">
+		///     The engine of the new state.
+		/// </param>
+		protected IndentState(IndentState prototype, CSharpIndentEngine engine)
+		{
+			Engine = engine;
+			Parent = prototype.Parent != null ? prototype.Parent.Clone(engine) : null;
+
+			ThisLineIndent = prototype.ThisLineIndent.Clone();
+			NextLineIndent = prototype.NextLineIndent.Clone();
+		}
+
+		#endregion
+
+		#region IClonable
+
+		object ICloneable.Clone()
+		{
+			return Clone(Engine);
+		}
+
+		public abstract IndentState Clone(CSharpIndentEngine engine);
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		///     Initializes the state:
+		///       - sets the default indentation levels.
+		/// </summary>
+		/// <remarks>
+		///     Each state can override this method if it needs a different
+		///     logic for setting up the default indentations.
+		/// </remarks>
+		public virtual void InitializeState()
+		{
+			ThisLineIndent = new Indent(Engine.textEditorOptions);
+			NextLineIndent = ThisLineIndent.Clone();
+		}
+
+		/// <summary>
+		///     Actions performed when this state exits.
+		/// </summary>
+		public virtual void OnExit()
+		{
+			if (Parent != null)
+			{
+				// if a state exits on the newline character, it has to push
+				// it back to its parent (and so on recursively if the parent 
+				// state also exits). Otherwise, the parent state wouldn't
+				// know that the engine isn't on the same line anymore.
+				if (Engine.currentChar == Engine.newLineChar)
+				{
+					Parent.Push(Engine.newLineChar);
+				}
+
+				// when a state exits the engine stays on the same line and this
+				// state has to override the Parent.ThisLineIndent.
+				Parent.ThisLineIndent = ThisLineIndent.Clone();
+			}
+		}
+
+		/// <summary>
+		///     Changes the current state of the <see cref="CSharpIndentEngine"/> using the current
+		///     state as the parent for the new one.
+		/// </summary>
+		/// <typeparam name="T">
+		///     The type of the new state. Must be assignable from <see cref="IndentState"/>.
+		/// </typeparam>
+		public void ChangeState<T>()
+			where T : IndentState
+		{
+			Engine.currentState = IndentStateFactory.Create<T>(Engine.currentState);
+		}
+
+		/// <summary>
+		///     Exits this state by setting the current state of the
+		///     <see cref="CSharpIndentEngine"/> to this state's parent.
+		/// </summary>
+		public void ExitState()
+		{
+			OnExit();
+			Engine.currentState = Engine.currentState.Parent ?? IndentStateFactory.Default(Engine);
+		}
+
+		/// <summary>
+		///     Common logic behind the push method.
+		///     Each state can override this method and implement its own logic.
+		/// </summary>
+		/// <param name="ch">
+		///     The current character that's being pushed.
+		/// </param>
+		public virtual void Push(char ch)
+		{
+			// replace ThisLineIndent with NextLineIndent if the newLineChar is pushed
+			if (ch == Engine.newLineChar)
+			{
+				ThisLineIndent = NextLineIndent.Clone();
+			}
+		}
+
+		/// <summary>
+		///     When derived, checks if the given sequence of chars form
+		///     a valid keyword or variable name, depending on the state.
+		/// </summary>
+		/// <param name="keyword">
+		///     A possible keyword.
+		/// </param>
+		public virtual void CheckKeyword(string keyword)
+		{ }
+
+		#endregion
+	}
+
+	#endregion
+
+	#region IndentStateFactory
+
+	/// <summary>
+	///     Indentation state factory.
+	/// </summary>
+	public static class IndentStateFactory
+	{
+		/// <summary>
+		///     Creates a new state.
+		/// </summary>
+		/// <param name="stateType">
+		///     Type of the state. Must be assignable from <see cref="IndentState"/>.
+		/// </param>
+		/// <param name="engine">
+		///     Indentation engine for the state.
+		/// </param>
+		/// <param name="parent">
+		///     Parent state.
+		/// </param>
+		/// <returns>
+		///     A new state of type <paramref name="stateType"/>.
+		/// </returns>
+		static IndentState Create(Type stateType, CSharpIndentEngine engine, IndentState parent = null)
+		{
+			return (IndentState)Activator.CreateInstance(stateType, engine, parent);
+		}
+
+		/// <summary>
+		///     Creates a new state.
+		/// </summary>
+		/// <typeparam name="T">
+		///     Type of the state. Must be assignable from <see cref="IndentState"/>.
+		/// </typeparam>
+		/// <param name="engine">
+		///     Indentation engine for the state.
+		/// </param>
+		/// <param name="parent">
+		///     Parent state.
+		/// </param>
+		/// <returns>
+		///     A new state of type <typeparamref name="T"/>.
+		/// </returns>
+		public static IndentState Create<T>(CSharpIndentEngine engine, IndentState parent = null)
+			where T : IndentState
+		{
+			return Create(typeof(T), engine, parent);
+		}
+
+		/// <summary>
+		///     Creates a new state.
+		/// </summary>
+		/// <typeparam name="T">
+		///     Type of the state. Must be assignable from <see cref="IndentState"/>.
+		/// </typeparam>
+		/// <param name="prototype">
+		///     Parent state. Also, the indentation engine of the prototype is
+		///     used as the engine for the new state.
+		/// </param>
+		/// <returns>
+		///     A new state of type <typeparamref name="T"/>.
+		/// </returns>
+		public static IndentState Create<T>(IndentState prototype)
+			where T : IndentState
+		{
+			return Create(typeof(T), prototype.Engine, prototype);
+		}
+
+		/// <summary>
+		///     The default state, used for the global space.
+		/// </summary>
+		public static Func<CSharpIndentEngine, IndentState> Default = engine => Create<GlobalBodyState>(engine);
+	}
+
+	#endregion
+
+	#region Null state
+
+	/// <summary>
+	///     Null state.
+	/// </summary>
+	/// <remarks>
+	///     Doesn't define any transitions to new states.
+	/// </remarks>
+	public class NullState : IndentState
+	{
+		public NullState(CSharpIndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public NullState(NullState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{ }
+
+		public override void Push(char ch)
+		{ }
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new NullState(this, engine);
+		}
+	}
+
+	#endregion
+
+	#region Brackets body states
+
+	#region Brackets body base
+
+	/// <summary>
+	///     The base for all brackets body states.
+	/// </summary>
+	/// <remarks>
+	///     Represents a block of code between a pair of brackets.
+	/// </remarks>
+	public abstract class BracketsBodyBaseState : IndentState
+	{
+		/// <summary>
+		///     Defines transitions for all types of open brackets.
+		/// </summary>
+		public static Dictionary<char, Action<IndentState>> OpenBrackets =
+			new Dictionary<char, Action<IndentState>>
+		{ 
+			{ '{', state => state.ChangeState<BracesBodyState>() }, 
+			{ '(', state => state.ChangeState<ParenthesesBodyState>() }, 
+			{ '[', state => state.ChangeState<SquareBracketsBodyState>() },
+		};
+
+		/// <summary>
+		///     When derived in a concrete bracket body state, represents
+		///     the closed bracket character pair.
+		/// </summary>
+		public abstract char ClosedBracket { get; }
+
+		protected BracketsBodyBaseState(CSharpIndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		protected BracketsBodyBaseState(BracketsBodyBaseState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{ }
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == '#' && Engine.isLineStart)
+			{
+				ChangeState<PreProcessorState>();
+			}
+			else if (ch == '/' && Engine.previousChar == '/')
+			{
+				ChangeState<LineCommentState>();
+			}
+			else if (ch == '*' && Engine.previousChar == '/')
+			{
+				ChangeState<MultiLineCommentState>();
+			}
+			else if (ch == '"')
+			{
+				if (Engine.previousChar == '@')
+				{
+					ChangeState<VerbatimStringState>();
+				}
+				else
+				{
+					ChangeState<StringLiteralState>();
+				}
+			}
+			else if (ch == '\'')
+			{
+				ChangeState<CharacterState>();
+			}
+			else if (OpenBrackets.ContainsKey(ch))
+			{
+				OpenBrackets[ch](this);
+			}
+			else if (ch == ClosedBracket)
+			{
+				ExitState();
+			}
+		}
+	}
+
+	#endregion
+
+	#region Braces body state
+
+	/// <summary>
+	///     Braces body state.
+	/// </summary>
+	/// <remarks>
+	///     Represents a block of code between { and }.
+	/// </remarks>
+	public class BracesBodyState : BracketsBodyBaseState
+	{
+		/// <summary>
+		///     Type of the current block body.
+		/// </summary>
+		public Body CurrentBody;
+
+		/// <summary>
+		///     Type of the next block body.
+		///     Same as <see cref="CurrentBody"/> if none of the
+		///     <see cref="Body"/> keywords have been read.
+		/// </summary>
+		public Body NextBody;
+
+		/// <summary>
+		///     Type of the current statement.
+		/// </summary>
+		public Statement CurrentStatement
+		{
+			get
+			{
+				return currentStatement;
+			}
+			set
+			{
+				// clear NestedIfStatementLevels if this statement breaks the sequence
+				if (currentStatement == Statement.None && value != Statement.Else)
+				{
+					NestedIfStatementLevels.Clear();
+				}
+
+				currentStatement = value;
+			}
+		}
+		Statement currentStatement;
+
+		/// <summary>
+		///    Contains indent levels of nested if statements.
+		/// </summary>
+		public Stack<Indent> NestedIfStatementLevels = new Stack<Indent>();
+
+		/// <summary>
+		///    Contains the indent level of the last statement or body keyword.
+		/// </summary>
+		public Indent LastBlockIndent;
+
+		/// <summary>
+		///     True if the engine is on the right side of the equal operator '='.
+		/// </summary>
+		public bool IsRightHandExpression;
+
+		/// <summary>
+		///     True if the '=' char has been pushed and it's not
+		///     a part of a relational operator (&gt;=, &lt;=, !=, ==).
+		/// </summary>
+		public bool IsEqualCharPushed;
+
+		/// <summary>
+		///     True if the dot member (e.g. method invocation) indentation has
+		///     been handled in the current statement.
+		/// </summary>
+		public bool IsMemberReferenceDotHandled;
+
+		public override char ClosedBracket
+		{
+			get { return '}'; }
+		}
+
+		public BracesBodyState(CSharpIndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public BracesBodyState(BracesBodyState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			CurrentBody = prototype.CurrentBody;
+			NextBody = prototype.NextBody;
+			CurrentStatement = prototype.CurrentStatement;
+			NestedIfStatementLevels = new Stack<Indent>(prototype.NestedIfStatementLevels);
+			IsRightHandExpression = prototype.IsRightHandExpression;
+			IsEqualCharPushed = prototype.IsEqualCharPushed;
+			IsMemberReferenceDotHandled = prototype.IsMemberReferenceDotHandled;
+			LastBlockIndent = prototype.LastBlockIndent;
+		}
+
+		public override void Push(char ch)
+		{
+			// handle IsRightHandExpression property
+			if (IsEqualCharPushed)
+			{
+				if (IsRightHandExpression)
+				{
+					if (ch == Engine.newLineChar)
+					{
+						NextLineIndent.RemoveAlignment();
+						NextLineIndent.Push(IndentType.Continuation);
+					}
+				}
+				// ignore "==" and "=>" operators
+				else if (ch != '=' && ch != '>')
+				{
+					IsRightHandExpression = true;
+
+					if (ch == Engine.newLineChar)
+					{
+						NextLineIndent.Push(IndentType.Continuation);
+					}
+					else
+					{
+						NextLineIndent.SetAlignment(Engine.column - NextLineIndent.CurIndent);
+					}
+				}
+
+				IsEqualCharPushed = ch == ' ' || ch == '\t';
+			}
+
+			if (ch == ';' || (ch == ',' && IsRightHandExpression))
+			{
+				OnStatementExit();
+			}
+			else if (ch == '=' && !new[] { '=', '<', '>', '!' }.Contains(Engine.previousChar))
+			{
+				IsEqualCharPushed = true;
+			}
+			else if (ch == '.' && !IsMemberReferenceDotHandled)
+			{
+				// OPTION: CSharpFormattingOptions.AlignToMemberReferenceDot
+				if (Engine.formattingOptions.AlignToMemberReferenceDot && !Engine.isLineStart)
+				{
+					IsMemberReferenceDotHandled = true;
+					NextLineIndent.RemoveAlignment();
+					NextLineIndent.SetAlignment(Engine.column - NextLineIndent.CurIndent - 1, true);
+				}
+				else if (Engine.isLineStart)
+				{
+					IsMemberReferenceDotHandled = true;
+
+					ThisLineIndent.RemoveAlignment();
+					ThisLineIndent.Push(IndentType.Continuation);
+					NextLineIndent = ThisLineIndent.Clone();
+				}
+			}
+			else if (ch == ':' && Engine.isLineStart && !IsRightHandExpression)
+			{
+				// try to capture ': base(...)', ': this(...)' and inherit statements when they are on a new line
+				ThisLineIndent.Push(IndentType.Continuation);
+			}
+
+			base.Push(ch);
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = Parent.NextLineIndent.Clone();
+
+			// OPTION: IDocumentIndentEngine.EnableCustomIndentLevels
+			var parent = Parent as BracesBodyState;
+			if (parent == null || parent.LastBlockIndent == null || !Engine.EnableCustomIndentLevels)
+			{
+				NextLineIndent.RemoveAlignment();
+				NextLineIndent.PopIf(IndentType.Continuation);
+			}
+			else
+			{
+				NextLineIndent = parent.LastBlockIndent.Clone();
+			}
+
+			if (Engine.isLineStart)
+			{
+				ThisLineIndent = NextLineIndent.Clone();
+			}
+
+			CurrentBody = extractBody(Parent);
+			NextBody = Body.None;
+			CurrentStatement = Statement.None;
+
+			AddIndentation(CurrentBody);
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new BracesBodyState(this, engine);
+		}
+
+		public override void OnExit()
+		{
+			if (Parent is BracesBodyState)
+			{
+				((BracesBodyState)Parent).OnStatementExit();
+			}
+
+			if (Engine.isLineStart)
+			{
+				ThisLineIndent.RemoveAlignment();
+				ThisLineIndent.PopTry();
+			}
+
+			base.OnExit();
+		}
+
+		/// <summary>
+		///     Actions performed when the current statement exits.
+		/// </summary>
+		public virtual void OnStatementExit()
+		{
+			IsRightHandExpression = false;
+			IsMemberReferenceDotHandled = false;
+
+			NextLineIndent.RemoveAlignment();
+			NextLineIndent.PopWhile(IndentType.Continuation);
+
+			CurrentStatement = Statement.None;
+			LastBlockIndent = null;
+		}
+
+		#region Helpers
+
+		/// <summary>
+		///     Types of braces bodies.
+		/// </summary>
+		public enum Body
+		{
+			None,
+			Namespace,
+			Class,
+			Struct,
+			Interface,
+			Enum,
+			Switch,
+			Case,
+			Try,
+			Catch,
+			Finally
+		}
+
+		/// <summary>
+		///     Types of statements.
+		/// </summary>
+		public enum Statement
+		{
+			None,
+			If,
+			Else,
+			Do,
+			While,
+			For,
+			Foreach,
+			Lock,
+			Using,
+			Return
+		}
+
+		static readonly Dictionary<string, Body> bodies = new Dictionary<string, Body>
+		{
+			{ "namespace", Body.Namespace },
+			{ "class", Body.Class },
+			{ "struct", Body.Struct },
+			{ "interface", Body.Interface },
+			{ "enum", Body.Enum },
+			{ "switch", Body.Switch },
+			{ "try", Body.Try },
+			{ "catch", Body.Catch },
+			{ "finally", Body.Finally },
+		};
+
+		static readonly Dictionary<string, Statement> statements = new Dictionary<string, Statement>
+		{
+			{ "if", Statement.If },
+			{ "else", Statement.Else },
+			{ "do", Statement.Do },
+			{ "while", Statement.While },
+			{ "for", Statement.For },
+			{ "foreach", Statement.Foreach },
+			{ "lock", Statement.Lock },
+			{ "using", Statement.Using },
+			{ "return", Statement.Return },
+		};
+
+		static readonly HashSet<string> blocks = new HashSet<string>
+		{
+			"namespace",
+			"class",
+			"struct",
+			"interface",
+			"enum",
+			"switch",
+			"try",
+			"catch",
+			"finally",
+			"if",
+			"else",
+			"do",
+			"while",
+			"for",
+			"foreach",
+			"lock",
+			"using",
+		};
+
+		readonly string[] caseDefaultKeywords = {
+			"case",
+			"default"
+		};
+
+		readonly string[] classStructKeywords = {
+			"class",
+			"struct"
+		};
+
+		/// <summary>
+		///     Checks if the given string is a keyword and sets the
+		///     <see cref="NextBody"/> and the <see cref="CurrentStatement"/>
+		///     variables appropriately.
+		/// </summary>
+		/// <param name="keyword">
+		///     A possible keyword.
+		/// </param>
+		public override void CheckKeyword(string keyword)
+		{
+			if (bodies.ContainsKey(keyword))
+			{
+				var isKeywordTemplateConstraint =
+					classStructKeywords.Contains(keyword) &&
+					(NextBody == Body.Class || NextBody == Body.Struct || NextBody == Body.Interface);
+
+				if (!isKeywordTemplateConstraint)
+				{
+					NextBody = bodies[keyword];
+				}
+			}
+			else if (caseDefaultKeywords.Contains(keyword) && CurrentBody == Body.Switch && Engine.isLineStartBeforeWordToken)
+			{
+				ChangeState<SwitchCaseState>();
+			}
+			else if (keyword == "where" && Engine.isLineStartBeforeWordToken)
+			{
+				// try to capture where (generic type constraint)
+				ThisLineIndent.Push(IndentType.Continuation);
+			}
+			else if (statements.ContainsKey(keyword))
+			{
+				Statement previousStatement = CurrentStatement;
+				CurrentStatement = statements[keyword];
+
+				// return if this is a using declaration or alias
+				if (CurrentStatement == Statement.Using &&
+				   (this is GlobalBodyState || CurrentBody == Body.Namespace))
+				{
+					return;
+				}
+
+				// OPTION: CSharpFormattingOptions.AlignEmbeddedIfStatements
+				if (Engine.formattingOptions.AlignEmbeddedIfStatements &&
+					previousStatement == Statement.If &&
+					CurrentStatement == Statement.If)
+				{
+					ThisLineIndent.PopIf(IndentType.Continuation);
+					NextLineIndent.PopIf(IndentType.Continuation);
+				}
+
+				// OPTION: CSharpFormattingOptions.AlignEmbeddedUsingStatements
+				if (Engine.formattingOptions.AlignEmbeddedUsingStatements &&
+					previousStatement == Statement.Using &&
+					CurrentStatement == Statement.Using)
+				{
+					ThisLineIndent.PopIf(IndentType.Continuation);
+					NextLineIndent.PopIf(IndentType.Continuation);
+				}
+
+				// else statement is handled differently
+				if (CurrentStatement == Statement.Else)
+				{
+					if (NestedIfStatementLevels.Count > 0)
+					{
+						ThisLineIndent = NestedIfStatementLevels.Pop().Clone();
+						NextLineIndent = ThisLineIndent.Clone();
+					}
+
+					NextLineIndent.Push(IndentType.Continuation);
+				}
+				else
+				{
+					// only add continuation for 'else' in 'else if' statement.
+					if (!(CurrentStatement == Statement.If && previousStatement == Statement.Else && !Engine.isLineStartBeforeWordToken))
+					{
+						NextLineIndent.Push(IndentType.Continuation);
+					}
+
+					if (CurrentStatement == Statement.If)
+					{
+						NestedIfStatementLevels.Push(ThisLineIndent);
+					}
+				}
+			}
+
+			if (blocks.Contains(keyword) && Engine.NeedsReindent)
+			{
+				LastBlockIndent = Indent.ConvertFrom(Engine.CurrentIndent, ThisLineIndent, Engine.textEditorOptions);
+			}
+		}
+
+		/// <summary>
+		///     Pushes a new level of indentation depending on the given
+		///     <paramref name="braceStyle"/>.
+		/// </summary>
+		void AddIndentation(BraceStyle braceStyle)
+		{
+			switch (braceStyle)
+			{
+				case BraceStyle.DoNotChange:
+				case BraceStyle.EndOfLine:
+				case BraceStyle.EndOfLineWithoutSpace:
+				case BraceStyle.NextLine:
+				case BraceStyle.NextLineShifted:
+				case BraceStyle.BannerStyle:
+					NextLineIndent.Push(IndentType.Block);
+					break;
+				case BraceStyle.NextLineShifted2:
+					NextLineIndent.Push(IndentType.DoubleBlock);
+					break;
+			}
+		}
+
+		/// <summary>
+		///     Pushes a new level of indentation depending on the given
+		///     <paramref name="body"/>.
+		/// </summary>
+		void AddIndentation(Body body)
+		{
+			switch (body)
+			{
+				case Body.None:
+					if (Engine.formattingOptions.IndentBlocks)
+						NextLineIndent.Push(IndentType.Block);
+					else
+						NextLineIndent.Push(IndentType.Empty);
+					break;
+				case Body.Namespace:
+					if (Engine.formattingOptions.IndentNamespaceBody)
+						AddIndentation(Engine.formattingOptions.NamespaceBraceStyle);
+					else
+						NextLineIndent.Push(IndentType.Empty);
+					break;
+				case Body.Class:
+					if (Engine.formattingOptions.IndentClassBody)
+						AddIndentation(Engine.formattingOptions.ClassBraceStyle);
+					else
+						NextLineIndent.Push(IndentType.Empty);
+					break;
+				case Body.Struct:
+					if (Engine.formattingOptions.IndentStructBody)
+						AddIndentation(Engine.formattingOptions.StructBraceStyle);
+					else
+						NextLineIndent.Push(IndentType.Empty);
+					break;
+				case Body.Interface:
+					if (Engine.formattingOptions.IndentInterfaceBody)
+						AddIndentation(Engine.formattingOptions.InterfaceBraceStyle);
+					else
+						NextLineIndent.Push(IndentType.Empty);
+					break;
+				case Body.Enum:
+					if (Engine.formattingOptions.IndentEnumBody)
+						AddIndentation(Engine.formattingOptions.EnumBraceStyle);
+					else
+						NextLineIndent.Push(IndentType.Empty);
+					break;
+				case Body.Switch:
+					if (Engine.formattingOptions.IndentSwitchBody)
+						AddIndentation(Engine.formattingOptions.StatementBraceStyle);
+					else
+						NextLineIndent.Push(IndentType.Empty);
+					break;
+				case Body.Try:
+				case Body.Catch:
+				case Body.Finally:
+					AddIndentation(Engine.formattingOptions.StatementBraceStyle);
+					break;
+				default:
+					throw new ArgumentOutOfRangeException();
+			}
+		}
+
+		/// <summary>
+		///     Extracts the <see cref="CurrentBody"/> from the given state.
+		/// </summary>
+		/// <returns>
+		///     The correct <see cref="Body"/> type for this state.
+		/// </returns>
+		static Body extractBody(IndentState state)
+		{
+			if (state != null && state is BracesBodyState)
+			{
+				return ((BracesBodyState)state).NextBody;
+			}
+
+			return Body.None;
+		}
+
+		#endregion
+	}
+
+	#endregion
+
+	#region Global body state
+
+	/// <summary>
+	///     Global body state.
+	/// </summary>
+	/// <remarks>
+	///     Represents the global space of the program.
+	/// </remarks>
+	public class GlobalBodyState : BracesBodyState
+	{
+		public override char ClosedBracket
+		{
+			get { return '\0'; }
+		}
+
+		public GlobalBodyState(CSharpIndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public GlobalBodyState(GlobalBodyState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{ }
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new GlobalBodyState(this, engine);
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = new Indent(Engine.textEditorOptions);
+			NextLineIndent = ThisLineIndent.Clone();
+		}
+	}
+
+	#endregion
+
+	#region Switch-case body state
+
+	/// <summary>
+	///     Switch-case statement state.
+	/// </summary>
+	/// <remarks>
+	///     Represents the block of code in one switch case (including default).
+	/// </remarks>
+	public class SwitchCaseState : BracesBodyState
+	{
+		public SwitchCaseState(CSharpIndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public SwitchCaseState(SwitchCaseState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{ }
+
+		public override void Push(char ch)
+		{
+			// on ClosedBracket both this state (a case or a default statement)
+			// and also the whole switch block (handled in the base class) must exit.
+			if (ch == ClosedBracket)
+			{
+				ExitState();
+			}
+
+			base.Push(ch);
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = ThisLineIndent.Clone();
+
+			// remove all continuations and extra spaces
+			ThisLineIndent.RemoveAlignment(); 
+			ThisLineIndent.PopWhile(IndentType.Continuation);
+
+			NextLineIndent.RemoveAlignment();
+			NextLineIndent.PopWhile(IndentType.Continuation);
+
+			if (Engine.formattingOptions.IndentCaseBody)
+			{
+				NextLineIndent.Push(IndentType.Block);
+			}
+			else
+			{
+				NextLineIndent.Push(IndentType.Empty);
+			}
+		}
+
+		static readonly string[] caseDefaultKeywords = {
+			"case",
+			"default"
+		};
+
+		static readonly string[] breakContinueReturnGotoKeywords = {
+			"break",
+			"continue",
+			"return",
+			"goto"
+		};
+
+		public override void CheckKeyword(string keyword)
+		{
+			if (caseDefaultKeywords.Contains(keyword) && Engine.isLineStartBeforeWordToken)
+			{
+				ExitState();
+				ChangeState<SwitchCaseState>();
+			}
+			else if (breakContinueReturnGotoKeywords.Contains(keyword) && Engine.isLineStartBeforeWordToken)
+			{
+				// OPTION: Engine.formattingOptions.IndentBreakStatements
+				if (!Engine.formattingOptions.IndentBreakStatements)
+				{
+					ThisLineIndent = Parent.ThisLineIndent.Clone();
+				}
+			}
+
+			base.CheckKeyword(keyword);
+		}
+
+		public override void OnExit()
+		{
+			// override the base.OnExit() logic
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new SwitchCaseState(this, engine);
+		}
+	}
+
+	#endregion
+
+	#region Parentheses body state
+
+	/// <summary>
+	///     Parentheses body state.
+	/// </summary>
+	/// <remarks>
+	///     Represents a block of code between ( and ).
+	/// </remarks>
+	public class ParenthesesBodyState : BracketsBodyBaseState
+	{
+		/// <summary>
+		///     True if any char has been pushed.
+		/// </summary>
+		public bool IsSomethingPushed;
+
+		public override char ClosedBracket
+		{
+			get { return ')'; }
+		}
+
+		public ParenthesesBodyState(CSharpIndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public ParenthesesBodyState(ParenthesesBodyState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			IsSomethingPushed = prototype.IsSomethingPushed;
+		}
+
+		public override void Push(char ch)
+		{
+			if (ch == Engine.newLineChar)
+			{
+				if (NextLineIndent.PopIf(IndentType.Continuation))
+				{
+					NextLineIndent.Push(IndentType.Block);
+				}
+			}
+			else if (!IsSomethingPushed)
+			{
+				// OPTION: CSharpFormattingOptions.AlignToFirstMethodCallArgument
+				if (Engine.formattingOptions.AlignToFirstMethodCallArgument)
+				{
+					NextLineIndent.PopTry();
+					// align the next line at the beginning of the open bracket
+					NextLineIndent.ExtraSpaces = Math.Max(0, Engine.column - NextLineIndent.CurIndent - 1);
+				}
+			}
+
+			base.Push(ch);
+			IsSomethingPushed = true;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = ThisLineIndent.Clone();
+			NextLineIndent.Push(IndentType.Continuation);
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new ParenthesesBodyState(this, engine);
+		}
+
+		public override void OnExit()
+		{
+			if (Engine.isLineStart)
+			{
+				if (ThisLineIndent.ExtraSpaces > 0)
+				{
+					ThisLineIndent.ExtraSpaces--;
+				}
+				else
+				{
+					ThisLineIndent.PopTry();
+				}
+			}
+
+			base.OnExit();
+		}
+	}
+
+	#endregion
+
+	#region Square brackets body state
+
+	/// <summary>
+	///     Square brackets body state.
+	/// </summary>
+	/// <remarks>
+	///     Represents a block of code between [ and ].
+	/// </remarks>
+	public class SquareBracketsBodyState : BracketsBodyBaseState
+	{
+		/// <summary>
+		///     True if any char has been pushed.
+		/// </summary>
+		public bool IsSomethingPushed;
+
+		public override char ClosedBracket
+		{
+			get { return ']'; }
+		}
+
+		public SquareBracketsBodyState(CSharpIndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public SquareBracketsBodyState(SquareBracketsBodyState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			IsSomethingPushed = prototype.IsSomethingPushed;
+		}
+
+		public override void Push(char ch)
+		{
+			if (ch == Engine.newLineChar)
+			{
+				if (NextLineIndent.PopIf(IndentType.Continuation))
+				{
+					NextLineIndent.Push(IndentType.Block);
+				}
+			}
+			else if (!IsSomethingPushed)
+			{
+				// OPTION: CSharpFormattingOptions.AlignToFirstIndexerArgument
+				if (Engine.formattingOptions.AlignToFirstIndexerArgument)
+				{
+					NextLineIndent.PopTry();
+					// align the next line at the beginning of the open bracket
+					NextLineIndent.ExtraSpaces = Math.Max(0, Engine.column - NextLineIndent.CurIndent - 1);
+				}
+			}
+
+			base.Push(ch);
+			IsSomethingPushed = true;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = ThisLineIndent.Clone();
+			NextLineIndent.Push(IndentType.Continuation);
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new SquareBracketsBodyState(this, engine);
+		}
+
+		public override void OnExit()
+		{
+			if (Engine.isLineStart)
+			{
+				if (ThisLineIndent.ExtraSpaces > 0)
+				{
+					ThisLineIndent.ExtraSpaces--;
+				}
+				else
+				{
+					ThisLineIndent.PopTry();
+				}
+			}
+
+			base.OnExit();
+		}
+	}
+
+	#endregion
+
+	#endregion
+
+	#region PreProcessor state
+
+	/// <summary>
+	///     PreProcessor directive state.
+	/// </summary>
+	/// <remarks>
+	///     Activated when the '#' char is pushed and the 
+	///     <see cref="CSharpIndentEngine.isLineStart"/> is true.
+	/// </remarks>
+	public class PreProcessorState : IndentState
+	{
+		/// <summary>
+		///     The type of the preprocessor directive.
+		/// </summary>
+		public PreProcessorDirective DirectiveType;
+
+		/// <summary>
+		///     If <see cref="DirectiveType"/> is set (not equal to 'None'), this
+		///     stores the expression of the directive.
+		/// </summary>
+		public StringBuilder DirectiveStatement;
+
+		public PreProcessorState(CSharpIndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{
+			DirectiveType = PreProcessorDirective.None;
+			DirectiveStatement = new StringBuilder();
+		}
+
+		public PreProcessorState(PreProcessorState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			DirectiveType = prototype.DirectiveType;
+			DirectiveStatement = new StringBuilder(prototype.DirectiveStatement.ToString());
+		}
+
+		public override void Push(char ch)
+		{
+			// HACK: if this change would be left for the CheckKeyword method, we will lose
+			//       it if the next pushed char is newLineChar since ThisLineIndent will be 
+			//       immediately replaced with NextLineIndent. As this most likely will
+			//       happen, we check for "endregion" on every push.
+			if (Engine.wordToken.ToString() == "endregion")
+			{
+				ThisLineIndent = Parent.NextLineIndent.Clone();
+			}
+
+			base.Push(ch);
+
+			if (DirectiveType != PreProcessorDirective.None)
+			{
+				DirectiveStatement.Append(ch);
+			}
+
+			if (ch == Engine.newLineChar)
+			{
+				ExitState();
+				switch (DirectiveType)
+				{
+					case PreProcessorDirective.If:
+						Engine.ifDirectiveEvalResult.Push(eval(DirectiveStatement.ToString()));
+						if (Engine.ifDirectiveEvalResult.Peek())
+						{
+							// the if/elif directive is true -> continue with the previous state
+						}
+						else
+						{
+							// the if/elif directive is false -> change to a state that will 
+							// ignore any chars until #endif or #elif
+							ChangeState<PreProcessorCommentState>();
+						}
+						break;
+					case PreProcessorDirective.Elif:
+						if (Engine.ifDirectiveEvalResult.Count > 0)
+						{
+							if (!Engine.ifDirectiveEvalResult.Peek())
+							{
+								Engine.ifDirectiveEvalResult.Pop();
+								goto case PreProcessorDirective.If;
+							}
+						}
+						// previous if was true -> comment
+						ChangeState<PreProcessorCommentState>();
+						break;
+					case PreProcessorDirective.Else:
+						if (Engine.ifDirectiveEvalResult.Count > 0 && Engine.ifDirectiveEvalResult.Peek())
+						{
+							// some if/elif directive was true -> change to a state that will 
+							// ignore any chars until #endif
+							ChangeState<PreProcessorCommentState>();
+						}
+						else
+						{
+							// none if/elif directives were true -> continue with the previous state
+						}
+						break;
+					case PreProcessorDirective.Define:
+						var defineSymbol = DirectiveStatement.ToString().Trim();
+						if (!Engine.conditionalSymbols.Contains(defineSymbol))
+						{
+							Engine.conditionalSymbols.Add(defineSymbol);
+						}
+						break;
+					case PreProcessorDirective.Undef:
+						var undefineSymbol = DirectiveStatement.ToString().Trim();
+						if (Engine.conditionalSymbols.Contains(undefineSymbol))
+						{
+							Engine.conditionalSymbols.Remove(undefineSymbol);
+						}
+						break;
+					case PreProcessorDirective.Endif:
+						// marks the end of this block
+						Engine.ifDirectiveEvalResult.Pop();
+						break;
+					case PreProcessorDirective.Region:
+					case PreProcessorDirective.Pragma:
+					case PreProcessorDirective.Warning:
+					case PreProcessorDirective.Error:
+					case PreProcessorDirective.Line:
+						// continue with the previous state
+						break;
+				}
+			}
+		}
+
+		public override void InitializeState()
+		{
+			// OPTION: IndentPreprocessorStatements
+			if (Engine.formattingOptions.IndentPreprocessorDirectives)
+			{
+				ThisLineIndent = Parent.ThisLineIndent.Clone();
+			}
+			else
+			{
+				ThisLineIndent = new Indent(Engine.textEditorOptions);
+			}
+
+			NextLineIndent = Parent.NextLineIndent.Clone();
+		}
+
+		static readonly Dictionary<string, PreProcessorDirective> preProcessorDirectives = new Dictionary<string, PreProcessorDirective>
+		{
+			{ "if", PreProcessorDirective.If },
+			{ "elif", PreProcessorDirective.Elif },
+			{ "else", PreProcessorDirective.Else },
+			{ "endif", PreProcessorDirective.Endif },
+			{ "region", PreProcessorDirective.Region },
+			{ "endregion", PreProcessorDirective.Region },
+			{ "pragma", PreProcessorDirective.Pragma },
+			{ "warning", PreProcessorDirective.Warning },
+			{ "error", PreProcessorDirective.Error },
+			{ "line", PreProcessorDirective.Line },
+			{ "define", PreProcessorDirective.Define },
+			{ "undef", PreProcessorDirective.Undef }
+		};
+
+		public override void CheckKeyword(string keyword)
+		{
+			// check if the directive type has already been set
+			if (DirectiveType != PreProcessorDirective.None)
+			{
+				return;
+			}
+
+			if (preProcessorDirectives.ContainsKey(keyword))
+			{
+				DirectiveType = preProcessorDirectives[keyword];
+
+				// adjust the indentation for the region/endregion directives
+				if (DirectiveType == PreProcessorDirective.Region)
+				{
+					ThisLineIndent = Parent.NextLineIndent.Clone();
+				}
+			}
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new PreProcessorState(this, engine);
+		}
+
+		/// <summary>
+		///     Types of preprocessor directives.
+		/// </summary>
+		public enum PreProcessorDirective
+		{
+			None,
+			If,
+			Elif,
+			Else,
+			Endif,
+			Region,
+			// EndRegion, // use Region instead
+			Pragma,
+			Warning,
+			Error,
+			Line,
+			Define,
+			Undef
+		}
+
+		#region Pre processor evaluation (from cs-tokenizer.cs)
+
+		static bool is_identifier_start_character(int c)
+		{
+			return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_' || Char.IsLetter((char)c);
+		}
+
+		static bool is_identifier_part_character(char c)
+		{
+			if (c >= 'a' && c <= 'z')
+				return true;
+
+			if (c >= 'A' && c <= 'Z')
+				return true;
+
+			if (c == '_' || (c >= '0' && c <= '9'))
+				return true;
+
+			if (c < 0x80)
+				return false;
+
+			return Char.IsLetter(c) || Char.GetUnicodeCategory(c) == UnicodeCategory.ConnectorPunctuation;
+		}
+
+		bool eval_val(string s)
+		{
+			if (s == "true")
+				return true;
+			if (s == "false")
+				return false;
+
+			return Engine.conditionalSymbols != null && Engine.conditionalSymbols.Contains(s) ||
+				Engine.customConditionalSymbols != null && Engine.customConditionalSymbols.Contains(s);
+		}
+
+		bool pp_primary(ref string s)
+		{
+			s = s.Trim();
+			int len = s.Length;
+
+			if (len > 0)
+			{
+				char c = s[0];
+
+				if (c == '(')
+				{
+					s = s.Substring(1);
+					bool val = pp_expr(ref s, false);
+					if (s.Length > 0 && s[0] == ')')
+					{
+						s = s.Substring(1);
+						return val;
+					}
+					return false;
+				}
+
+				if (is_identifier_start_character(c))
+				{
+					int j = 1;
+
+					while (j < len)
+					{
+						c = s[j];
+
+						if (is_identifier_part_character(c))
+						{
+							j++;
+							continue;
+						}
+						bool v = eval_val(s.Substring(0, j));
+						s = s.Substring(j);
+						return v;
+					}
+					bool vv = eval_val(s);
+					s = "";
+					return vv;
+				}
+			}
+			return false;
+		}
+
+		bool pp_unary(ref string s)
+		{
+			s = s.Trim();
+			int len = s.Length;
+
+			if (len > 0)
+			{
+				if (s[0] == '!')
+				{
+					if (len > 1 && s[1] == '=')
+					{
+						return false;
+					}
+					s = s.Substring(1);
+					return !pp_primary(ref s);
+				}
+				else
+					return pp_primary(ref s);
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		bool pp_eq(ref string s)
+		{
+			bool va = pp_unary(ref s);
+
+			s = s.Trim();
+			int len = s.Length;
+			if (len > 0)
+			{
+				if (s[0] == '=')
+				{
+					if (len > 2 && s[1] == '=')
+					{
+						s = s.Substring(2);
+						return va == pp_unary(ref s);
+					}
+					else
+					{
+						return false;
+					}
+				}
+				else if (s[0] == '!' && len > 1 && s[1] == '=')
+				{
+					s = s.Substring(2);
+
+					return va != pp_unary(ref s);
+
+				}
+			}
+
+			return va;
+
+		}
+
+		bool pp_and(ref string s)
+		{
+			bool va = pp_eq(ref s);
+
+			s = s.Trim();
+			int len = s.Length;
+			if (len > 0)
+			{
+				if (s[0] == '&')
+				{
+					if (len > 2 && s[1] == '&')
+					{
+						s = s.Substring(2);
+						return (va & pp_and(ref s));
+					}
+					else
+					{
+						return false;
+					}
+				}
+			}
+			return va;
+		}
+
+		//
+		// Evaluates an expression for `#if' or `#elif'
+		//
+		bool pp_expr(ref string s, bool isTerm)
+		{
+			bool va = pp_and(ref s);
+			s = s.Trim();
+			int len = s.Length;
+			if (len > 0)
+			{
+				char c = s[0];
+
+				if (c == '|')
+				{
+					if (len > 2 && s[1] == '|')
+					{
+						s = s.Substring(2);
+						return va | pp_expr(ref s, isTerm);
+					}
+					else
+					{
+
+						return false;
+					}
+				}
+				if (isTerm)
+				{
+					return false;
+				}
+			}
+
+			return va;
+		}
+
+		bool eval(string s)
+		{
+			bool v = pp_expr(ref s, true);
+			s = s.Trim();
+			if (s.Length != 0)
+			{
+				return false;
+			}
+
+			return v;
+		}
+
+		#endregion
+	}
+
+	#endregion
+
+	#region PreProcessorComment state
+
+	/// <summary>
+	///     PreProcessor comment state.
+	/// </summary>
+	/// <remarks>
+	///     Activates when the #if or #elif directive is false and ignores
+	///     all pushed chars until the next '#'.
+	/// </remarks>
+	public class PreProcessorCommentState : IndentState
+	{
+		public PreProcessorCommentState(CSharpIndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public PreProcessorCommentState(PreProcessorCommentState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{ }
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == '#' && Engine.isLineStart)
+			{
+				// TODO: Return back only on #if/#elif/#else/#endif
+				// Ignore any of the other directives (especially #define/#undef)
+				ExitState();
+				ChangeState<PreProcessorState>();
+			}
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.NextLineIndent.Clone();
+			NextLineIndent = ThisLineIndent.Clone();
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new PreProcessorCommentState(this, engine);
+		}
+	}
+
+	#endregion
+
+	#region LineComment state
+
+	/// <summary>
+	///     Single-line comment state.
+	/// </summary>
+	public class LineCommentState : IndentState
+	{
+		/// <summary>
+		///     It's possible that this should be the DocComment state:
+		///         check if the first next pushed char is equal to '/'.
+		/// </summary>
+		public bool CheckForDocComment = true;
+
+		public LineCommentState(CSharpIndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{
+			if (engine.formattingOptions.KeepCommentsAtFirstColumn && engine.column == 2)
+				ThisLineIndent.Reset();
+		}
+
+		public LineCommentState(LineCommentState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			CheckForDocComment = prototype.CheckForDocComment;
+		}
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == Engine.newLineChar)
+			{
+				// to handle cases like //\n/*
+				// Otherwise line 2 would be treated as line comment.
+				Engine.previousChar = '\0';
+				ExitState();
+			}
+			else if (ch == '/' && CheckForDocComment)
+			{
+				// wrong state, should be DocComment.
+				ExitState();
+				ChangeState<DocCommentState>();
+			}
+
+			CheckForDocComment = false;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = Parent.NextLineIndent.Clone();
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new LineCommentState(this, engine);
+		}
+	}
+
+	#endregion
+
+	#region DocComment state
+
+	/// <summary>
+	///     XML documentation comment state.
+	/// </summary>
+	public class DocCommentState : IndentState
+	{
+		public DocCommentState(CSharpIndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public DocCommentState(DocCommentState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{ }
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == Engine.newLineChar)
+			{
+				ExitState();
+			}
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = Parent.NextLineIndent.Clone();
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new DocCommentState(this, engine);
+		}
+	}
+
+	#endregion
+
+	#region MultiLineComment state
+
+	/// <summary>
+	///     Multi-line comment state.
+	/// </summary>
+	public class MultiLineCommentState : IndentState
+	{
+		/// <summary>
+		///     True if any char has been pushed to this state.
+		/// </summary>
+		/// <remarks>
+		///     Needed to resolve an issue when the first pushed char is '/'.
+		///     The state would falsely exit on this sequence of chars '/*/',
+		///     since it only checks if the last two chars are '/' and '*'.
+		/// </remarks>
+		public bool IsAnyCharPushed;
+
+		public MultiLineCommentState(CSharpIndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public MultiLineCommentState(MultiLineCommentState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			IsAnyCharPushed = prototype.IsAnyCharPushed;
+		}
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == '/' && Engine.previousChar == '*' && IsAnyCharPushed)
+			{
+				ExitState();
+			}
+
+			IsAnyCharPushed = true;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = ThisLineIndent.Clone();
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new MultiLineCommentState(this, engine);
+		}
+	}
+
+	#endregion
+
+	#region StringLiteral state
+
+	/// <summary>
+	///     StringLiteral state.
+	/// </summary>
+	public class StringLiteralState : IndentState
+	{
+		/// <summary>
+		///     True if the next char is escaped with '\'.
+		/// </summary>
+		public bool IsEscaped;
+
+		public StringLiteralState(CSharpIndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public StringLiteralState(StringLiteralState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			IsEscaped = prototype.IsEscaped;
+		}
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == Engine.newLineChar)
+			{
+				ExitState();
+			}
+			else if (!IsEscaped && ch == '"')
+			{
+				ExitState();
+			}
+
+			IsEscaped = ch == '\\' && !IsEscaped;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = Parent.NextLineIndent.Clone();
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new StringLiteralState(this, engine);
+		}
+	}
+
+	#endregion
+
+	#region Verbatim string state
+
+	/// <summary>
+	///     Verbatim string state.
+	/// </summary>
+	public class VerbatimStringState : IndentState
+	{
+		/// <summary>
+		///     True if there is an odd number of '"' in a row.
+		/// </summary>
+		public bool IsEscaped;
+
+		public VerbatimStringState(CSharpIndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public VerbatimStringState(VerbatimStringState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			IsEscaped = prototype.IsEscaped;
+		}
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (IsEscaped && ch != '"')
+			{
+				ExitState();
+				// the char has been pushed to the wrong state, push it back
+				Engine.currentState.Push(ch);
+			}
+
+			IsEscaped = ch == '"' && !IsEscaped;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = new Indent(Engine.textEditorOptions);
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new VerbatimStringState(this, engine);
+		}
+	}
+
+	#endregion
+
+	#region Character state
+
+	/// <summary>
+	///     Character state.
+	/// </summary>
+	public class CharacterState : IndentState
+	{
+		/// <summary>
+		///     True if the next char is escaped with '\'.
+		/// </summary>
+		public bool IsEscaped;
+
+		public CharacterState(CSharpIndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public CharacterState(CharacterState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			IsEscaped = prototype.IsEscaped;
+		}
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == Engine.newLineChar)
+			{
+				ExitState();
+			}
+			else if (!IsEscaped && ch == '\'')
+			{
+				ExitState();
+			}
+
+			IsEscaped = ch == '\\' && !IsEscaped;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = Parent.NextLineIndent.Clone();
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new CharacterState(this, engine);
+		}
+	}
+
+	#endregion
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/NullIStateMachineIndentEngine.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/NullIStateMachineIndentEngine.cs
new file mode 100644
index 0000000000..b62932e5bf
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/NullIStateMachineIndentEngine.cs
@@ -0,0 +1,215 @@
+//
+// NullIStateMachineIndentEngine.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	/// <summary>
+	/// An empty IStateMachineIndentEngine implementation that does nothing.
+	/// </summary>
+	public sealed class NullIStateMachineIndentEngine : IStateMachineIndentEngine
+	{
+		readonly ICSharpCode.NRefactory.Editor.IDocument document;
+		int offset;
+
+		public NullIStateMachineIndentEngine(ICSharpCode.NRefactory.Editor.IDocument document)
+		{
+			if (document == null)
+				throw new ArgumentNullException("document");
+			this.document = document;
+		}
+
+		#region IStateMachineIndentEngine implementation
+		public IStateMachineIndentEngine Clone()
+		{
+			return new NullIStateMachineIndentEngine(document) { offset = this.offset };
+		}
+
+		bool IStateMachineIndentEngine.IsInsidePreprocessorDirective {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsidePreprocessorComment {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideStringLiteral {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideVerbatimString {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideCharacter {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideString {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideLineComment {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideMultiLineComment {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideDocLineComment {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideComment {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideOrdinaryComment {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideOrdinaryCommentOrString {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.LineBeganInsideVerbatimString {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.LineBeganInsideMultiLineComment {
+			get {
+				return false;
+			}
+		}
+		#endregion
+
+		#region IDocumentIndentEngine implementation
+		void IDocumentIndentEngine.Push(char ch)
+		{
+			offset++;
+		}
+
+		void IDocumentIndentEngine.Reset()
+		{
+			this.offset = 0;
+		}
+
+		void IDocumentIndentEngine.Update(int offset)
+		{
+			this.offset = offset;
+		}
+
+		IDocumentIndentEngine IDocumentIndentEngine.Clone()
+		{
+			return Clone();
+		}
+
+		ICSharpCode.NRefactory.Editor.IDocument IDocumentIndentEngine.Document {
+			get {
+				return document;
+			}
+		}
+
+		string IDocumentIndentEngine.ThisLineIndent {
+			get {
+				return "";
+			}
+		}
+
+		string IDocumentIndentEngine.NextLineIndent {
+			get {
+				return "";
+			}
+		}
+
+		string IDocumentIndentEngine.CurrentIndent {
+			get {
+				return "";
+			}
+		}
+
+		bool IDocumentIndentEngine.NeedsReindent {
+			get {
+				return false;
+			}
+		}
+
+		int IDocumentIndentEngine.Offset {
+			get {
+				return offset;
+			}
+		}
+		TextLocation IDocumentIndentEngine.Location {
+			get {
+				return TextLocation.Empty;
+			}
+		}
+
+		/// <inheritdoc />
+		public bool EnableCustomIndentLevels
+		{
+			get { return false; }
+			set { }
+		}
+
+		#endregion
+
+		#region ICloneable implementation
+		object ICloneable.Clone()
+		{
+			return Clone();
+		}
+		#endregion
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/TextPasteIndentEngine.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/TextPasteIndentEngine.cs
new file mode 100644
index 0000000000..c085556315
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IndentEngine/TextPasteIndentEngine.cs
@@ -0,0 +1,523 @@
+//
+// TextPasteIndentEngine.cs
+//
+// Author:
+//       Matej Mikle�ić <matej.miklecic@gmail.com>
+//
+// Copyright (c) 2013 Matej Mikle�ić (matej.miklecic@gmail.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Editor;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	/// <summary>
+	///     Represents a decorator of an IStateMachineIndentEngine instance
+	///     that provides logic for text paste events.
+	/// </summary>
+	public class TextPasteIndentEngine : IDocumentIndentEngine, ITextPasteHandler
+	{
+
+		#region Properties
+
+		/// <summary>
+		///     An instance of IStateMachineIndentEngine which handles
+		///     the indentation logic.
+		/// </summary>
+		IStateMachineIndentEngine engine;
+		/// <summary>
+		///     Text editor options.
+		/// </summary>
+		internal readonly TextEditorOptions textEditorOptions;
+		internal readonly CSharpFormattingOptions formattingOptions;
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		///     Creates a new TextPasteIndentEngine instance.
+		/// </summary>
+		/// <param name="decoratedEngine">
+		///     An instance of <see cref="IStateMachineIndentEngine"/> to which the
+		///     logic for indentation will be delegated.
+		/// </param>
+		/// <param name="textEditorOptions">
+		///    Text editor options for indentation.
+		/// </param>
+		/// <param name="formattingOptions">
+		///     C# formatting options.
+		/// </param>
+		public TextPasteIndentEngine(IStateMachineIndentEngine decoratedEngine, TextEditorOptions textEditorOptions, CSharpFormattingOptions formattingOptions)
+		{
+			this.engine = decoratedEngine;
+			this.textEditorOptions = textEditorOptions;
+			this.formattingOptions = formattingOptions;
+
+			this.engine.EnableCustomIndentLevels = false;
+		}
+
+		#endregion
+
+		#region ITextPasteHandler
+
+		/// <inheritdoc />
+		string ITextPasteHandler.FormatPlainText(int offset, string text, byte[] copyData)
+		{
+			if (copyData != null && copyData.Length == 1) {
+				var strategy = TextPasteUtils.Strategies [(PasteStrategy)copyData [0]];
+				text = strategy.Decode(text);
+			}
+			engine.Update(offset);
+			if (engine.IsInsideStringLiteral) {
+				return TextPasteUtils.StringLiteralStrategy.Encode(text);
+			} else if (engine.IsInsideVerbatimString) {
+				return TextPasteUtils.VerbatimStringStrategy.Encode(text);
+			}
+			var line = engine.Document.GetLineByOffset(offset);
+			var pasteAtLineStart = line.Offset == offset;
+			var indentedText = new StringBuilder();
+			var curLine = new StringBuilder();
+			var clonedEngine = engine.Clone();
+			bool isNewLine = false, gotNewLine = false;
+			for (int i = 0; i < text.Length; i++) {
+				var ch = text [i];
+				if (clonedEngine.IsInsideVerbatimString || clonedEngine.IsInsideMultiLineComment) {
+					clonedEngine.Push(ch);
+					curLine.Append(ch);
+					continue;
+				}
+
+				var delimiterLength = NewLine.GetDelimiterLength(ch, i + 1 < text.Length ? text[i + 1] : ' ');
+				if (delimiterLength > 0) {
+					isNewLine = true;
+					if (gotNewLine || pasteAtLineStart) {
+						if (curLine.Length > 0 || formattingOptions.EmptyLineFormatting == EmptyLineFormatting.Indent)
+							indentedText.Append(clonedEngine.ThisLineIndent);
+					}
+					indentedText.Append(curLine);
+					indentedText.Append(textEditorOptions.EolMarker);
+					curLine.Length = 0;
+					gotNewLine = true;
+					i += delimiterLength - 1;
+					// textEditorOptions.EolMarker[0] is the newLineChar used by the indentation engine.
+					clonedEngine.Push(textEditorOptions.EolMarker[0]);
+				} else {
+					if (isNewLine) {
+						if (ch == '\t' || ch == ' ') {
+							clonedEngine.Push(ch);
+							continue;
+						}
+						isNewLine = false;
+					}
+					curLine.Append(ch);
+					clonedEngine.Push(ch);
+				}
+				if (clonedEngine.IsInsideVerbatimString || clonedEngine.IsInsideMultiLineComment && 
+				    !(clonedEngine.LineBeganInsideVerbatimString || clonedEngine.LineBeganInsideMultiLineComment)) {
+					if (gotNewLine) {
+						if (curLine.Length > 0 || formattingOptions.EmptyLineFormatting == EmptyLineFormatting.Indent)
+							indentedText.Append(clonedEngine.ThisLineIndent);
+					}
+					pasteAtLineStart = false;
+					indentedText.Append(curLine);
+					curLine.Length = 0;
+					continue;
+				}
+			}
+			if (gotNewLine && (!pasteAtLineStart || curLine.Length > 0)) {
+				indentedText.Append(clonedEngine.ThisLineIndent);
+			}
+			if (curLine.Length > 0) {
+				indentedText.Append(curLine);
+			}
+			return indentedText.ToString();
+		}
+
+		/// <inheritdoc />
+		byte[] ITextPasteHandler.GetCopyData(ISegment segment)
+		{
+			engine.Update(segment.Offset);
+			
+			if (engine.IsInsideStringLiteral) {
+				return new[] { (byte)PasteStrategy.StringLiteral };
+			} else if (engine.IsInsideVerbatimString) {
+				return new[] { (byte)PasteStrategy.VerbatimString };
+			}
+			
+			return null;
+		}
+
+		#endregion
+
+		#region IDocumentIndentEngine
+
+		/// <inheritdoc />
+		public IDocument Document {
+			get { return engine.Document; }
+		}
+
+		/// <inheritdoc />
+		public string ThisLineIndent {
+			get { return engine.ThisLineIndent; }
+		}
+
+		/// <inheritdoc />
+		public string NextLineIndent {
+			get { return engine.NextLineIndent; }
+		}
+
+		/// <inheritdoc />
+		public string CurrentIndent {
+			get { return engine.CurrentIndent; }
+		}
+
+		/// <inheritdoc />
+		public bool NeedsReindent {
+			get { return engine.NeedsReindent; }
+		}
+
+		/// <inheritdoc />
+		public int Offset {
+			get { return engine.Offset; }
+		}
+
+		/// <inheritdoc />
+		public TextLocation Location {
+			get { return engine.Location; }
+		}
+
+		/// <inheritdoc />
+		public bool EnableCustomIndentLevels {
+			get { return engine.EnableCustomIndentLevels; }
+			set { engine.EnableCustomIndentLevels = value; }
+		}
+		
+		/// <inheritdoc />
+		public void Push(char ch)
+		{
+			engine.Push(ch);
+		}
+
+		/// <inheritdoc />
+		public void Reset()
+		{
+			engine.Reset();
+		}
+
+		/// <inheritdoc />
+		public void Update(int offset)
+		{
+			engine.Update(offset);
+		}
+
+		#endregion
+
+		#region IClonable
+
+		public IDocumentIndentEngine Clone()
+		{
+			return new TextPasteIndentEngine(engine, textEditorOptions, formattingOptions);
+		}
+
+		object ICloneable.Clone()
+		{
+			return Clone();
+		}
+
+		#endregion
+
+	}
+
+	/// <summary>
+	///     Types of text-paste strategies.
+	/// </summary>
+	public enum PasteStrategy : byte
+	{
+		PlainText = 0,
+		StringLiteral = 1,
+		VerbatimString = 2
+	}
+
+	/// <summary>
+	///     Defines some helper methods for dealing with text-paste events.
+	/// </summary>
+	public static class TextPasteUtils
+	{
+		/// <summary>
+		///     Collection of text-paste strategies.
+		/// </summary>
+		public static TextPasteStrategies Strategies = new TextPasteStrategies();
+
+		/// <summary>
+		///     The interface for a text-paste strategy.
+		/// </summary>
+		public interface IPasteStrategy
+		{
+			/// <summary>
+			///     Formats the given text according with this strategy rules.
+			/// </summary>
+			/// <param name="text">
+			///    The text to format.
+			/// </param>
+			/// <returns>
+			///     Formatted text.
+			/// </returns>
+			string Encode(string text);
+
+			/// <summary>
+			///     Converts text formatted according with this strategy rules
+			///     to its original form.
+			/// </summary>
+			/// <param name="text">
+			///     Formatted text to convert.
+			/// </param>
+			/// <returns>
+			///     Original form of the given formatted text.
+			/// </returns>
+			string Decode(string text);
+
+			/// <summary>
+			///     Type of this strategy.
+			/// </summary>
+			PasteStrategy Type { get; }
+		}
+
+		/// <summary>
+		///     Wrapper that discovers all defined text-paste strategies and defines a way
+		///     to easily access them through their <see cref="PasteStrategy"/> type.
+		/// </summary>
+		public sealed class TextPasteStrategies
+		{
+			/// <summary>
+			///     Collection of discovered text-paste strategies.
+			/// </summary>
+			IDictionary<PasteStrategy, IPasteStrategy> strategies;
+
+			/// <summary>
+			///     Uses reflection to find all types derived from <see cref="IPasteStrategy"/>
+			///     and adds an instance of each strategy to <see cref="strategies"/>.
+			/// </summary>
+			public TextPasteStrategies()
+			{
+				strategies = Assembly.GetExecutingAssembly()
+				     .GetTypes()
+				.Where(t => typeof(IPasteStrategy).IsAssignableFrom(t) && t.IsClass)
+				.Select(t => (IPasteStrategy)t.GetProperty("Instance").GetValue(null, null))
+				.ToDictionary(s => s.Type);
+			}
+
+			/// <summary>
+			///     Checks if there is a strategy of the given type and returns it.
+			/// </summary>
+			/// <param name="strategy">
+			///     Type of the strategy instance.
+			/// </param>
+			/// <returns>
+			///     A strategy instance of the requested type,
+			///     or <see cref="DefaultStrategy"/> if it wasn't found.
+			/// </returns>
+			public IPasteStrategy this [PasteStrategy strategy] {
+				get {
+					if (strategies.ContainsKey(strategy)) {
+						return strategies [strategy];
+					}
+					
+					return DefaultStrategy;
+				}
+			}
+		}
+
+		/// <summary>
+		///     Doesn't do any formatting. Serves as the default strategy.
+		/// </summary>
+		public class PlainTextPasteStrategy : IPasteStrategy
+		{
+
+			#region Singleton
+
+			public static IPasteStrategy Instance {
+				get {
+					return instance ?? (instance = new PlainTextPasteStrategy());
+				}
+			}
+
+			static PlainTextPasteStrategy instance;
+
+			protected PlainTextPasteStrategy()
+			{
+			}
+
+			#endregion
+
+			/// <inheritdoc />
+			public string Encode(string text)
+			{
+				return text;
+			}
+
+			/// <inheritdoc />
+			public string Decode(string text)
+			{
+				return text;
+			}
+
+			/// <inheritdoc />
+			public PasteStrategy Type {
+				get { return PasteStrategy.PlainText; }
+			}
+		}
+
+		/// <summary>
+		///     Escapes chars in the given text so that they don't
+		///     break a valid string literal.
+		/// </summary>
+		public class StringLiteralPasteStrategy : IPasteStrategy
+		{
+
+			#region Singleton
+
+			public static IPasteStrategy Instance {
+				get {
+					return instance ?? (instance = new StringLiteralPasteStrategy());
+				}
+			}
+
+			static StringLiteralPasteStrategy instance;
+
+			protected StringLiteralPasteStrategy()
+			{
+			}
+
+			#endregion
+
+			Dictionary<char, IEnumerable<char>> encodeReplace = new Dictionary<char, IEnumerable<char>> {
+				{ '\"', "\\\"" },
+				{ '\\', "\\\\" },
+				{ '\n', "\\n" },
+				{ '\r', "\\r" },
+				{ '\t', "\\t" },
+			};
+			Dictionary<char, char> decodeReplace = new Dictionary<char, char> {
+				{ '"', '"' },
+				{ '\\', '\\' },
+				{ 'n', '\n' },
+				{ 'r', '\r' },
+				{ 't', '\t' },
+			};
+
+			/// <inheritdoc />
+			public string Encode(string text)
+			{
+				return string.Concat(text.SelectMany(c => encodeReplace.ContainsKey(c) ? encodeReplace [c] : new[] { c }));
+			}
+
+			/// <inheritdoc />
+			public string Decode(string text)
+			{
+				var result = new StringBuilder();
+				bool isEscaped = false;
+				
+				foreach (var ch in text) {
+					if (isEscaped) {
+						if (decodeReplace.ContainsKey(ch)) {
+							result.Append(decodeReplace [ch]);
+						} else {
+							result.Append('\\', ch);
+						}
+					} else if (ch != '\\') {
+						result.Append(ch);
+					}
+					
+					isEscaped = !isEscaped && ch == '\\';
+				}
+				
+				return result.ToString();
+			}
+
+			/// <inheritdoc />
+			public PasteStrategy Type {
+				get { return PasteStrategy.StringLiteral; }
+			}
+		}
+
+		/// <summary>
+		///     Escapes chars in the given text so that they don't
+		///     break a valid verbatim string.
+		/// </summary>
+		public class VerbatimStringPasteStrategy : IPasteStrategy
+		{
+
+			#region Singleton
+
+			public static IPasteStrategy Instance {
+				get {
+					return instance ?? (instance = new VerbatimStringPasteStrategy());
+				}
+			}
+
+			static VerbatimStringPasteStrategy instance;
+
+			protected VerbatimStringPasteStrategy()
+			{
+			}
+
+			#endregion
+
+			Dictionary<char, IEnumerable<char>> encodeReplace = new Dictionary<char, IEnumerable<char>> {
+				{ '\"', "\"\"" },
+			};
+
+			/// <inheritdoc />
+			public string Encode(string text)
+			{
+				return string.Concat(text.SelectMany(c => encodeReplace.ContainsKey(c) ? encodeReplace [c] : new[] { c }));
+			}
+
+			/// <inheritdoc />
+			public string Decode(string text)
+			{
+				bool isEscaped = false;
+				return string.Concat(text.Where(c => !(isEscaped = !isEscaped && c == '"')));
+			}
+
+			/// <inheritdoc />
+			public PasteStrategy Type {
+				get { return PasteStrategy.VerbatimString; }
+			}
+		}
+
+		/// <summary>
+		///     The default text-paste strategy.
+		/// </summary>
+		public static IPasteStrategy DefaultStrategy = PlainTextPasteStrategy.Instance;
+		/// <summary>
+		///     String literal text-paste strategy.
+		/// </summary>
+		public static IPasteStrategy StringLiteralStrategy = StringLiteralPasteStrategy.Instance;
+		/// <summary>
+		///     Verbatim string text-paste strategy.
+		/// </summary>
+		public static IPasteStrategy VerbatimStringStrategy = VerbatimStringPasteStrategy.Instance;
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IntroduceQueryExpressions.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IntroduceQueryExpressions.cs
new file mode 100644
index 0000000000..d80ddb82cd
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/IntroduceQueryExpressions.cs
@@ -0,0 +1,386 @@
+//
+// IntroduceQueryExpressions.cs
+//
+// Modified by Luís Reis <luiscubal@gmail.com> (Copyright (C) 2013)
+//
+// Copyright header of the original version follows:
+//
+// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+using System;
+using System.Diagnostics;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	static class NRefactoryExtensions
+	{
+		public static T Detach<T>(this T node) where T : AstNode
+		{
+			node.Remove();
+			return node;
+		}
+
+		public static T CopyAnnotationsFrom<T>(this T node, AstNode other) where T : AstNode
+		{
+			foreach (object annotation in other.Annotations) {
+				node.AddAnnotation(annotation);
+			}
+			return node;
+		}
+
+		public static Expression WithName(this Expression node, string patternGroupName)
+		{
+			return new NamedNode(patternGroupName, node);
+		}
+	}
+
+	/// <summary>
+	/// Decompiles query expressions.
+	/// Based on C# 4.0 spec, §7.16.2 Query expression translation
+	/// </summary>
+	public class IntroduceQueryExpressions
+	{
+		static readonly InvocationExpression castPattern = new InvocationExpression {
+			Target = new MemberReferenceExpression {
+				Target = new AnyNode("inExpr"),
+				MemberName = "Cast",
+				TypeArguments = { new AnyNode("targetType") }
+			}};
+
+		public Expression ConvertFluentToQuery(Expression node)
+		{
+			node = node.Clone();
+
+			var artificialParent = new ExpressionStatement();
+			artificialParent.Expression = node;
+
+			DecompileQueries(node);
+			// After all queries were decompiled, detect degenerate queries (queries not property terminated with 'select' or 'group')
+			// and fix them, either by adding a degenerate select, or by combining them with another query.
+			foreach (QueryExpression query in artificialParent.Descendants.OfType<QueryExpression>()) {
+				QueryFromClause fromClause = (QueryFromClause)query.Clauses.First();
+				if (IsDegenerateQuery(query)) {
+					string identifierName = fromClause.Identifier;
+
+					// introduce select for degenerate query
+					query.Clauses.Add(new QuerySelectClause { Expression = new IdentifierExpression(identifierName) });
+				}
+
+				if (fromClause.Type.IsNull) {
+					// See if the data source of this query is a degenerate query,
+					// and combine the queries if possible.
+					QueryExpression innerQuery = fromClause.Expression as QueryExpression;
+					while (IsDegenerateQuery(innerQuery)) {
+						QueryFromClause innerFromClause = (QueryFromClause)innerQuery.Clauses.First();
+						if (fromClause.Identifier != innerFromClause.Identifier && !innerFromClause.Identifier.StartsWith("<>"))
+							break;
+						// Replace the fromClause with all clauses from the inner query
+						fromClause.Remove();
+						foreach (var identifierChild in innerQuery.Descendants.OfType<Identifier>().Where(identifier => identifier.Name == innerFromClause.Identifier)) {
+							//When the identifier is "<>X", then replace it with the outer one
+							identifierChild.ReplaceWith(fromClause.IdentifierToken.Clone());
+						}
+						QueryClause insertionPos = null;
+						foreach (var clause in innerQuery.Clauses) {
+							query.Clauses.InsertAfter(insertionPos, insertionPos = clause.Detach());
+						}
+						fromClause = innerFromClause;
+						innerQuery = fromClause.Expression as QueryExpression;
+					}
+				}
+			}
+
+			return artificialParent.Expression.Clone();
+		}
+
+		bool IsDegenerateQuery(QueryExpression query)
+		{
+			if (query == null)
+				return false;
+			var lastClause = query.Clauses.LastOrDefault();
+			return !(lastClause is QuerySelectClause || lastClause is QueryGroupClause);
+		}
+
+		void DecompileQueries(AstNode node)
+		{
+			QueryExpression query = DecompileQuery(node as InvocationExpression);
+			if (query != null)
+				node.ReplaceWith(query);
+		}
+
+		Expression ExtractQuery(MemberReferenceExpression mre)
+		{
+			var inExpression = mre.Target.Clone();
+			var inContent = DecompileQuery(inExpression as InvocationExpression) ?? inExpression;
+			return inContent;
+		}
+
+		QueryExpression DecompileQuery(InvocationExpression invocation)
+		{
+			if (invocation == null)
+				return null;
+			MemberReferenceExpression mre = invocation.Target as MemberReferenceExpression;
+			if (mre == null)
+				return null;
+
+			switch (mre.MemberName) {
+				case "Select":
+					{
+						if (invocation.Arguments.Count != 1)
+							return null;
+						string parameterName;
+						Expression body;
+						if (MatchSimpleLambda(invocation.Arguments.Single(), out parameterName, out body)) {
+							QueryExpression query = new QueryExpression();
+							query.Clauses.Add(new QueryFromClause { Identifier = parameterName, Expression = ExtractQuery(mre) });
+							query.Clauses.Add(new QuerySelectClause { Expression = body.Detach() });
+							return query;
+						}
+						return null;
+					}
+				case "Cast":
+					{
+						if (invocation.Arguments.Count == 0 && mre.TypeArguments.Count == 1) {
+							var typeArgument = mre.TypeArguments.First();
+
+							QueryExpression query = new QueryExpression();
+							string varName = GenerateVariableName();
+							query.Clauses.Add(new QueryFromClause {
+								Identifier = varName,
+								Expression = ExtractQuery(mre),
+								Type = typeArgument.Detach()
+							});
+							return query;
+
+						}
+						return null;
+					}
+				case "GroupBy":
+					{
+						if (invocation.Arguments.Count == 2) {
+							string parameterName1, parameterName2;
+							Expression keySelector, elementSelector;
+							if (MatchSimpleLambda(invocation.Arguments.ElementAt(0), out parameterName1, out keySelector)
+								&& MatchSimpleLambda(invocation.Arguments.ElementAt(1), out parameterName2, out elementSelector)
+								&& parameterName1 == parameterName2) {
+								QueryExpression query = new QueryExpression();
+								query.Clauses.Add(new QueryFromClause { Identifier = parameterName1, Expression = ExtractQuery(mre) });
+								query.Clauses.Add(new QueryGroupClause { Projection = elementSelector.Detach(), Key = keySelector.Detach() });
+								return query;
+							}
+						} else if (invocation.Arguments.Count == 1) {
+							string parameterName;
+							Expression keySelector;
+							if (MatchSimpleLambda(invocation.Arguments.Single(), out parameterName, out keySelector)) {
+								QueryExpression query = new QueryExpression();
+								query.Clauses.Add(new QueryFromClause { Identifier = parameterName, Expression = ExtractQuery(mre) });
+								query.Clauses.Add(new QueryGroupClause {
+									Projection = new IdentifierExpression(parameterName),
+									Key = keySelector.Detach()
+								});
+								return query;
+							}
+						}
+						return null;
+					}
+				case "SelectMany":
+					{
+						if (invocation.Arguments.Count != 2)
+							return null;
+						string parameterName;
+						Expression collectionSelector;
+						if (!MatchSimpleLambda(invocation.Arguments.ElementAt(0), out parameterName, out collectionSelector))
+							return null;
+						LambdaExpression lambda = invocation.Arguments.ElementAt(1) as LambdaExpression;
+						if (lambda != null && lambda.Parameters.Count == 2 && lambda.Body is Expression) {
+							ParameterDeclaration p1 = lambda.Parameters.ElementAt(0);
+							ParameterDeclaration p2 = lambda.Parameters.ElementAt(1);
+							QueryExpression query = new QueryExpression();
+							query.Clauses.Add(new QueryFromClause { Identifier = p1.Name, Expression = ExtractQuery(mre) });
+							query.Clauses.Add(new QueryFromClause { Identifier = p2.Name, Expression = collectionSelector.Detach() });
+							query.Clauses.Add(new QuerySelectClause { Expression = ((Expression)lambda.Body).Detach() });
+							return query;
+						}
+						return null;
+					}
+				case "Where":
+					{
+						if (invocation.Arguments.Count != 1)
+							return null;
+						string parameterName;
+						Expression body;
+						if (MatchSimpleLambda(invocation.Arguments.Single(), out parameterName, out body)) {
+							QueryExpression query = new QueryExpression();
+							query.Clauses.Add(new QueryFromClause { Identifier = parameterName, Expression = ExtractQuery(mre) });
+							query.Clauses.Add(new QueryWhereClause { Condition = body.Detach() });
+							return query;
+						}
+						return null;
+					}
+				case "OrderBy":
+				case "OrderByDescending":
+				case "ThenBy":
+				case "ThenByDescending":
+					{
+						if (invocation.Arguments.Count != 1)
+							return null;
+						string parameterName;
+						Expression orderExpression;
+						if (MatchSimpleLambda(invocation.Arguments.Single(), out parameterName, out orderExpression)) {
+							if (ValidateThenByChain(invocation, parameterName)) {
+								QueryOrderClause orderClause = new QueryOrderClause();
+								InvocationExpression tmp = invocation;
+								while (mre.MemberName == "ThenBy" || mre.MemberName == "ThenByDescending") {
+									// insert new ordering at beginning
+									orderClause.Orderings.InsertAfter(
+										null, new QueryOrdering {
+										Expression = orderExpression.Detach(),
+										Direction = (mre.MemberName == "ThenBy" ? QueryOrderingDirection.None : QueryOrderingDirection.Descending)
+									});
+
+									tmp = (InvocationExpression)mre.Target;
+									mre = (MemberReferenceExpression)tmp.Target;
+									MatchSimpleLambda(tmp.Arguments.Single(), out parameterName, out orderExpression);
+								}
+								// insert new ordering at beginning
+								orderClause.Orderings.InsertAfter(
+									null, new QueryOrdering {
+									Expression = orderExpression.Detach(),
+									Direction = (mre.MemberName == "OrderBy" ? QueryOrderingDirection.None : QueryOrderingDirection.Descending)
+								});
+
+								QueryExpression query = new QueryExpression();
+								query.Clauses.Add(new QueryFromClause { Identifier = parameterName, Expression = ExtractQuery(mre) });
+								query.Clauses.Add(orderClause);
+								return query;
+							}
+						}
+						return null;
+					}
+				case "Join":
+				case "GroupJoin":
+					{
+						if (invocation.Arguments.Count != 4)
+							return null;
+						Expression source1 = mre.Target;
+						Expression source2 = invocation.Arguments.ElementAt(0);
+						string elementName1, elementName2;
+						Expression key1, key2;
+						if (!MatchSimpleLambda(invocation.Arguments.ElementAt(1), out elementName1, out key1))
+							return null;
+						if (!MatchSimpleLambda(invocation.Arguments.ElementAt(2), out elementName2, out key2))
+							return null;
+						LambdaExpression lambda = invocation.Arguments.ElementAt(3) as LambdaExpression;
+						if (lambda != null && lambda.Parameters.Count == 2 && lambda.Body is Expression) {
+							ParameterDeclaration p1 = lambda.Parameters.ElementAt(0);
+							ParameterDeclaration p2 = lambda.Parameters.ElementAt(1);
+							QueryExpression query = new QueryExpression();
+							query.Clauses.Add(new QueryFromClause { Identifier = elementName1, Expression = source1.Detach() });
+							QueryJoinClause joinClause = new QueryJoinClause();
+							
+							joinClause.JoinIdentifier = elementName2;    // join elementName2
+							joinClause.InExpression = source2.Detach();  // in source2
+
+							Match castMatch = castPattern.Match(source2);
+							if (castMatch.Success) {
+								Expression target = castMatch.Get<Expression>("inExpr").Single().Detach();
+								joinClause.Type = castMatch.Get<AstType>("targetType").Single().Detach();
+								joinClause.InExpression = target;
+							}
+							
+							joinClause.OnExpression = key1.Detach();     // on key1
+							joinClause.EqualsExpression = key2.Detach(); // equals key2
+							if (mre.MemberName == "GroupJoin") {
+								joinClause.IntoIdentifier = p2.Name; // into p2.Name
+							}
+							query.Clauses.Add(joinClause);
+							Expression resultExpr = ((Expression)lambda.Body).Detach();
+							if (p1.Name != elementName1) {
+								foreach (var identifier in resultExpr.Descendants.OfType<Identifier>().Where(id => id.Name == p1.Name))
+								{
+									identifier.Name = elementName1;
+								}
+							}
+							if (p2.Name != elementName2 && mre.MemberName != "GroupJoin") {
+								foreach (var identifier in resultExpr.Descendants.OfType<Identifier>().Where(id => id.Name == p2.Name))
+								{
+									identifier.Name = elementName2;
+								}
+							}
+							query.Clauses.Add(new QuerySelectClause { Expression = resultExpr });
+							return query;
+						}
+						return null;
+					}
+				default:
+					return null;
+			}
+		}
+
+		int id = 1;
+		string GenerateVariableName()
+		{
+			return "<>" + id++;
+		}
+
+		/// <summary>
+		/// Ensure that all ThenBy's are correct, and that the list of ThenBy's is terminated by an 'OrderBy' invocation.
+		/// </summary>
+		bool ValidateThenByChain(InvocationExpression invocation, string expectedParameterName)
+		{
+			if (invocation == null || invocation.Arguments.Count != 1)
+				return false;
+			MemberReferenceExpression mre = invocation.Target as MemberReferenceExpression;
+			if (mre == null)
+				return false;
+			string parameterName;
+			Expression body;
+			if (!MatchSimpleLambda(invocation.Arguments.Single(), out parameterName, out body))
+				return false;
+			if (parameterName != expectedParameterName)
+				return false;
+
+			if (mre.MemberName == "OrderBy" || mre.MemberName == "OrderByDescending")
+				return true;
+			else if (mre.MemberName == "ThenBy" || mre.MemberName == "ThenByDescending")
+				return ValidateThenByChain(mre.Target as InvocationExpression, expectedParameterName);
+			else
+				return false;
+		}
+
+		/// <summary>Matches simple lambdas of the form "a => b"</summary>
+		bool MatchSimpleLambda(Expression expr, out string parameterName, out Expression body)
+		{
+			LambdaExpression lambda = expr as LambdaExpression;
+			if (lambda != null && lambda.Parameters.Count == 1 && lambda.Body is Expression) {
+				ParameterDeclaration p = lambda.Parameters.Single();
+				if (p.ParameterModifier == ParameterModifier.None) {
+					parameterName = p.Name;
+					body = (Expression)lambda.Body;
+					return true;
+				}
+			}
+			parameterName = null;
+			body = null;
+			return false;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpAmbience.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpAmbience.cs
index 8d7522529b..7a94b2e404 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpAmbience.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpAmbience.cs
@@ -247,7 +247,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		{
 			TypeSystemAstBuilder astBuilder = CreateAstBuilder();
 			AstNode astNode = astBuilder.ConvertVariable(v);
-			return astNode.ToString().TrimEnd(';', '\r', '\n');
+			return astNode.ToString().TrimEnd(';', '\r', '\n', (char)8232);
 		}
 		
 		public string ConvertType(IType type)
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpOutputVisitor.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpOutputVisitor.cs
index a669d624dd..927082dc8e 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpOutputVisitor.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpOutputVisitor.cs
@@ -1259,7 +1259,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		public void VisitQueryExpression(QueryExpression queryExpression)
 		{
 			StartNode(queryExpression);
-			bool indent = !(queryExpression.Parent is QueryContinuationClause);
+			bool indent = queryExpression.Parent is QueryClause && !(queryExpression.Parent is QueryContinuationClause);
 			if (indent) {
 				formatter.Indent();
 				NewLine();
@@ -1459,10 +1459,11 @@ namespace ICSharpCode.NRefactory.CSharp
 		{
 			StartNode(namespaceDeclaration);
 			WriteKeyword(Roles.NamespaceKeyword);
-			WriteQualifiedIdentifier(namespaceDeclaration.Identifiers);
+			namespaceDeclaration.NamespaceName.AcceptVisitor (this);
 			OpenBrace(policy.NamespaceBraceStyle);
 			foreach (var member in namespaceDeclaration.Members) {
 				member.AcceptVisitor(this);
+				MaybeNewLinesAfterUsings(member);
 			}
 			CloseBrace(policy.NamespaceBraceStyle);
 			OptionalSemicolon();
@@ -1520,7 +1521,13 @@ namespace ICSharpCode.NRefactory.CSharp
 				OptionalComma();
 				NewLine();
 			} else {
+				bool first = true;
 				foreach (var member in typeDeclaration.Members) {
+					if (!first) {
+						for (int i = 0; i < policy.BlankLinesBetweenMembers; i++)
+							NewLine();
+					}
+					first = false;
 					member.AcceptVisitor(this);
 				}
 			}
@@ -1598,10 +1605,13 @@ namespace ICSharpCode.NRefactory.CSharp
 			foreach (var node in blockStatement.Statements) {
 				node.AcceptVisitor(this);
 			}
+			AstNode pos = positionStack.Pop();
+			WriteSpecials(pos, null);
+			containerStack.Pop();
 			CloseBrace(style);
 			if (!(blockStatement.Parent is Expression))
 				NewLine();
-			EndNode(blockStatement);
+			formatter.EndNode(blockStatement);
 		}
 		
 		public void VisitBreakStatement(BreakStatement breakStatement)
@@ -2316,12 +2326,25 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 			EndNode(variableInitializer);
 		}
+
+		void MaybeNewLinesAfterUsings(AstNode node)
+		{
+			var nextSibling = node.NextSibling;
+			while (nextSibling is WhitespaceNode || nextSibling is NewLineNode)
+				nextSibling = nextSibling.NextSibling;
+
+			if ((node is UsingDeclaration || node is UsingAliasDeclaration) && !(nextSibling is UsingDeclaration || nextSibling is UsingAliasDeclaration)) {
+				for (int i = 0; i < policy.BlankLinesAfterUsings; i++)
+					NewLine();
+			}
+		}
 		
 		public void VisitSyntaxTree(SyntaxTree syntaxTree)
 		{
 			// don't do node tracking as we visit all children directly
 			foreach (AstNode node in syntaxTree.Children) {
 				node.AcceptVisitor(this);
+				MaybeNewLinesAfterUsings(node);
 			}
 		}
 		
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs
index 488129c3f1..f29f7fac21 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // CSharpParser.cs
 //
 // Author:
@@ -27,7 +27,6 @@ using System;
 using System.Linq;
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
 using ICSharpCode.NRefactory.Editor;
 using Mono.CSharp;
 using ICSharpCode.NRefactory.TypeSystem;
@@ -37,12 +36,12 @@ namespace ICSharpCode.NRefactory.CSharp
 	public class CSharpParser
 	{
 		CompilerSettings compilerSettings;
-		
+
 		class ConversionVisitor : StructuralVisitor
 		{
-			SyntaxTree unit = new SyntaxTree ();
+			SyntaxTree unit = new SyntaxTree();
 			internal bool convertTypeSystemMode;
-			
+
 			public SyntaxTree Unit {
 				get {
 					return unit;
@@ -51,23 +50,23 @@ namespace ICSharpCode.NRefactory.CSharp
 					unit = value;
 				}
 			}
-			
+
 			public LocationsBag LocationsBag {
 				get;
 				private set;
 			}
-			
-			public ConversionVisitor (bool convertTypeSystemMode, LocationsBag locationsBag)
+
+			public ConversionVisitor(bool convertTypeSystemMode, LocationsBag locationsBag)
 			{
 				this.convertTypeSystemMode = convertTypeSystemMode;
 				this.LocationsBag = locationsBag;
 			}
-			
-			public static TextLocation Convert (Mono.CSharp.Location loc)
+
+			public static TextLocation Convert(Location loc)
 			{
-				return new TextLocation (loc.Row, loc.Column);
+				return new TextLocation(loc.Row, loc.Column);
 			}
-			
+
 			public override void Visit(ModuleContainer mc)
 			{
 				bool first = true;
@@ -81,13 +80,13 @@ namespace ICSharpCode.NRefactory.CSharp
 					var loc = LocationsBag.GetLocations(nspace);
 					
 					if (nspace.NS != null && !string.IsNullOrEmpty(nspace.NS.Name)) {
-						nDecl = new NamespaceDeclaration ();
+						nDecl = new NamespaceDeclaration();
 						if (loc != null) {
-							nDecl.AddChild(new CSharpTokenNode (Convert(loc [0]), Roles.NamespaceKeyword), Roles.NamespaceKeyword);
+							nDecl.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.NamespaceKeyword), Roles.NamespaceKeyword);
 						}
-						ConvertNamespaceName(nspace.RealMemberName, nDecl);
+						nDecl.AddChild(ConvertNamespaceName(nspace.RealMemberName), NamespaceDeclaration.NamespaceNameRole);
 						if (loc != null && loc.Count > 1) {
-							nDecl.AddChild(new CSharpTokenNode (Convert(loc [1]), Roles.LBrace), Roles.LBrace);
+							nDecl.AddChild(new CSharpTokenNode(Convert(loc [1]), Roles.LBrace), Roles.LBrace);
 						}
 						AddToNamespace(nDecl);
 						namespaceStack.Push(nDecl);
@@ -105,7 +104,7 @@ namespace ICSharpCode.NRefactory.CSharp
 							foreach (var attr in mc.OptAttributes.Sections) {
 								var section = ConvertAttributeSection(attr);
 								if (section !=	null)
-									unit.AddChild (section, SyntaxTree.MemberRole);
+									unit.AddChild(section, SyntaxTree.MemberRole);
 							}
 						}
 					}
@@ -116,172 +115,172 @@ namespace ICSharpCode.NRefactory.CSharp
 						}
 					}
 					if (nDecl != null) {
-						AddAttributeSection (nDecl, nspace.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
+						AddAttributeSection(nDecl, nspace.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
 						if (loc != null && loc.Count > 2)
-							nDecl.AddChild (new CSharpTokenNode (Convert (loc [2]), Roles.RBrace), Roles.RBrace);
+							nDecl.AddChild(new CSharpTokenNode(Convert(loc [2]), Roles.RBrace), Roles.RBrace);
 						if (loc != null && loc.Count > 3)
-							nDecl.AddChild (new CSharpTokenNode (Convert (loc [3]), Roles.Semicolon), Roles.Semicolon);
+							nDecl.AddChild(new CSharpTokenNode(Convert(loc [3]), Roles.Semicolon), Roles.Semicolon);
 						
-						namespaceStack.Pop ();
+						namespaceStack.Pop();
 					} else {
-						AddAttributeSection (unit, nspace.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
+						AddAttributeSection(unit, nspace.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
 					}
 				}
-				AddAttributeSection (unit, mc.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
+				AddAttributeSection(unit, mc.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
 			}
-			
+
 			#region Global
-			Stack<NamespaceDeclaration> namespaceStack = new Stack<NamespaceDeclaration> ();
-			
-			void AddTypeArguments (ATypeNameExpression texpr, AstType result)
+
+			readonly Stack<NamespaceDeclaration> namespaceStack = new Stack<NamespaceDeclaration>();
+
+			void AddTypeArguments(ATypeNameExpression texpr, AstType result)
 			{
 				if (texpr.TypeArguments == null || texpr.TypeArguments.Args == null)
 					return;
-				var loc = LocationsBag.GetLocations (texpr.TypeArguments);
+				var loc = LocationsBag.GetLocations(texpr.TypeArguments);
 				if (loc != null && loc.Count >= 2)
-					result.AddChild (new CSharpTokenNode (Convert (loc [loc.Count - 2]), Roles.LChevron), Roles.LChevron);
+					result.AddChild(new CSharpTokenNode(Convert(loc [loc.Count - 2]), Roles.LChevron), Roles.LChevron);
 				int i = 0;
 				foreach (var arg in texpr.TypeArguments.Args) {
-					result.AddChild (ConvertToType (arg), Roles.TypeArgument);
+					result.AddChild(ConvertToType(arg), Roles.TypeArgument);
 					if (loc != null && i < loc.Count - 2)
-						result.AddChild (new CSharpTokenNode (Convert (loc [i++]), Roles.Comma), Roles.Comma);
+						result.AddChild(new CSharpTokenNode(Convert(loc [i++]), Roles.Comma), Roles.Comma);
 				}
 				if (loc != null && loc.Count >= 2)
-					result.AddChild (new CSharpTokenNode (Convert (loc [loc.Count - 1]), Roles.RChevron), Roles.RChevron);
+					result.AddChild(new CSharpTokenNode(Convert(loc [loc.Count - 1]), Roles.RChevron), Roles.RChevron);
 			}
-			
-			AstType ConvertToType (TypeParameter spec)
+
+			static AstType ConvertToType(TypeParameter spec)
 			{
 				AstType result;
-				result = new SimpleType () { IdentifierToken = Identifier.Create (spec.Name, Convert (spec.Location)) };
+				result = new SimpleType { IdentifierToken = Identifier.Create(spec.Name, Convert(spec.Location)) };
 				return result;
 			}
-			
-			AstType ConvertToType (MemberName memberName)
+
+			AstType ConvertToType(MemberName memberName)
 			{
 				AstType result;
 				if (memberName.Left != null) {
-					result = new MemberType ();
-					result.AddChild (ConvertToType (memberName.Left), MemberType.TargetRole);
-					var loc = LocationsBag.GetLocations (memberName.Left);
+					result = new MemberType();
+					result.AddChild(ConvertToType(memberName.Left), MemberType.TargetRole);
+					var loc = LocationsBag.GetLocations(memberName);
 					if (loc != null)
-						result.AddChild (new CSharpTokenNode (Convert (loc [0]), Roles.Dot), Roles.Dot);
-					result.AddChild (Identifier.Create (memberName.Name, Convert (memberName.Location)), Roles.Identifier);
+						result.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Dot), Roles.Dot);
+					result.AddChild(Identifier.Create(memberName.Name, Convert(memberName.Location)), Roles.Identifier);
 				} else {
-					result = new SimpleType () { IdentifierToken = Identifier.Create (memberName.Name, Convert (memberName.Location)) };
+					result = new SimpleType { IdentifierToken = Identifier.Create(memberName.Name, Convert(memberName.Location)) };
 				}
 				if (memberName.TypeParameters != null) {
-					var chevronLocs = LocationsBag.GetLocations (memberName.TypeParameters);
+					var chevronLocs = LocationsBag.GetLocations(memberName.TypeParameters);
 					if (chevronLocs != null)
-						result.AddChild (new CSharpTokenNode (Convert (chevronLocs [chevronLocs.Count - 2]), Roles.LChevron), Roles.LChevron);
+						result.AddChild(new CSharpTokenNode(Convert(chevronLocs [chevronLocs.Count - 2]), Roles.LChevron), Roles.LChevron);
 					for (int i = 0; i < memberName.TypeParameters.Count; i++) {
 						var param = memberName.TypeParameters [i];
-						result.AddChild (new SimpleType (Identifier.Create (param.Name, Convert (param.Location))), Roles.TypeArgument);
+						result.AddChild(new SimpleType(Identifier.Create(param.Name, Convert(param.Location))), Roles.TypeArgument);
 						if (chevronLocs != null && i < chevronLocs.Count - 2)
-							result.AddChild (new CSharpTokenNode (Convert (chevronLocs [i]), Roles.Comma), Roles.Comma);
+							result.AddChild(new CSharpTokenNode(Convert(chevronLocs [i]), Roles.Comma), Roles.Comma);
 					}
 					if (chevronLocs != null)
-						result.AddChild (new CSharpTokenNode (Convert (chevronLocs [chevronLocs.Count - 1]), Roles.RChevron), Roles.RChevron);
+						result.AddChild(new CSharpTokenNode(Convert(chevronLocs [chevronLocs.Count - 1]), Roles.RChevron), Roles.RChevron);
 				}
 				return result;
 			}
-			
-			AstType ConvertToType (Mono.CSharp.Expression typeName)
+
+			AstType ConvertToType(Mono.CSharp.Expression typeName)
 			{
 				if (typeName == null) // may happen in typeof(Generic<,,,,>)
-					return new SimpleType ();
+					return new SimpleType();
 				
-				if (typeName is TypeExpression) {
-					var typeExpr = (Mono.CSharp.TypeExpression)typeName;
-					return new PrimitiveType (typeExpr.GetSignatureForError (), Convert (typeExpr.Location));
+				var typeExpr = typeName as TypeExpression;
+				if (typeExpr != null) {
+					return new PrimitiveType(typeExpr.GetSignatureForError(), Convert(typeExpr.Location));
 				}
 				
-				if (typeName is Mono.CSharp.QualifiedAliasMember) {
-					var qam = (Mono.CSharp.QualifiedAliasMember)typeName;
-					var loc = LocationsBag.GetLocations (typeName);
-					var memberType = new MemberType ();
-					memberType.Target = new SimpleType (qam.alias, Convert (qam.Location));
+				var qam = typeName as QualifiedAliasMember;
+				if (qam != null) {
+					var loc = LocationsBag.GetLocations(typeName);
+					var memberType = new MemberType();
+					memberType.Target = new SimpleType(qam.alias, Convert(qam.Location));
 					memberType.IsDoubleColon = true;
 
 					if (loc != null && loc.Count > 0)
-						memberType.AddChild (new CSharpTokenNode (Convert (loc [0]), Roles.DoubleColon), Roles.DoubleColon);
+						memberType.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.DoubleColon), Roles.DoubleColon);
 
-					memberType.MemberNameToken = Identifier.Create (qam.Name, loc != null ? Convert (loc[1]) : TextLocation.Empty);
+					memberType.MemberNameToken = Identifier.Create(qam.Name, loc != null ? Convert(loc [1]) : TextLocation.Empty);
 					return memberType;
 				}
 				
-				if (typeName is MemberAccess) {
-					MemberAccess ma = (MemberAccess)typeName;
-					
-					var memberType = new MemberType ();
-					memberType.AddChild (ConvertToType (ma.LeftExpression), MemberType.TargetRole);
-					var loc = LocationsBag.GetLocations (ma);
+				var ma = typeName as MemberAccess;
+				if (ma != null) {
+					var memberType = new MemberType();
+					memberType.AddChild(ConvertToType(ma.LeftExpression), MemberType.TargetRole);
+					var loc = LocationsBag.GetLocations(ma);
 					if (loc != null)
-						memberType.AddChild (new CSharpTokenNode (Convert (loc[0]), Roles.Dot), Roles.Dot);
+						memberType.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Dot), Roles.Dot);
 
-					memberType.MemberNameToken = Identifier.Create (ma.Name, Convert (ma.Location));
+					memberType.MemberNameToken = Identifier.Create(ma.Name, Convert(ma.Location));
 					
-					AddTypeArguments (ma, memberType);
+					AddTypeArguments(ma, memberType);
 					return memberType;
 				}
 				
-				if (typeName is SimpleName) {
-					var sn = (SimpleName)typeName;
-					var result = new SimpleType (sn.Name, Convert (sn.Location));
-					AddTypeArguments (sn, result);
+				var sn = typeName as SimpleName;
+				if (sn != null) {
+					var result = new SimpleType(sn.Name, Convert(sn.Location));
+					AddTypeArguments(sn, result);
 					return result;
 				}
 				
-				if (typeName is ComposedCast) {
-					var cc = (ComposedCast)typeName;
-					var baseType = ConvertToType (cc.Left);
-					var result = new ComposedType () { BaseType = baseType };
+				var cc = typeName as ComposedCast;
+				if (cc != null) {
+					var baseType = ConvertToType(cc.Left);
+					var result = new ComposedType { BaseType = baseType };
 					var ccSpec = cc.Spec;
 					while (ccSpec != null) {
 						if (ccSpec.IsNullable) {
-							result.AddChild (new CSharpTokenNode (Convert (ccSpec.Location), ComposedType.NullableRole), ComposedType.NullableRole);
+							result.AddChild(new CSharpTokenNode(Convert(ccSpec.Location), ComposedType.NullableRole), ComposedType.NullableRole);
 						} else if (ccSpec.IsPointer) {
-							result.AddChild (new CSharpTokenNode (Convert (ccSpec.Location), ComposedType.PointerRole), ComposedType.PointerRole);
+							result.AddChild(new CSharpTokenNode(Convert(ccSpec.Location), ComposedType.PointerRole), ComposedType.PointerRole);
 						} else {
-							var location = LocationsBag.GetLocations (ccSpec);
-							var spec = new ArraySpecifier () { Dimensions = ccSpec.Dimension };
-							spec.AddChild (new CSharpTokenNode (Convert (ccSpec.Location), Roles.LBracket), Roles.LBracket);
+							var location = LocationsBag.GetLocations(ccSpec);
+							var spec = new ArraySpecifier { Dimensions = ccSpec.Dimension };
+							spec.AddChild(new CSharpTokenNode(Convert(ccSpec.Location), Roles.LBracket), Roles.LBracket);
 							if (location != null)
-								spec.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.RBracket), Roles.RBracket);
+								spec.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.RBracket), Roles.RBracket);
 							
-							result.ArraySpecifiers.Add (spec);
+							result.ArraySpecifiers.Add(spec);
 						}
 						ccSpec = ccSpec.Next;
 					}
 					return result;
 				}
 				
-				if (typeName is SpecialContraintExpr) {
-					var sce = (SpecialContraintExpr)typeName;
+				var sce = typeName as SpecialContraintExpr;
+				if (sce != null) {
 					switch (sce.Constraint) {
 						case SpecialConstraint.Class:
-							return new PrimitiveType ("class", Convert (sce.Location));
-							case SpecialConstraint.Struct:
-							return new PrimitiveType ("struct", Convert (sce.Location));
-							case SpecialConstraint.Constructor:
-							return new PrimitiveType ("new", Convert (sce.Location));
+							return new PrimitiveType("class", Convert(sce.Location));
+						case SpecialConstraint.Struct:
+							return new PrimitiveType("struct", Convert(sce.Location));
+						case SpecialConstraint.Constructor:
+							return new PrimitiveType("new", Convert(sce.Location));
 					}
 				}
-				return new SimpleType ("unknown");
+				return new SimpleType("unknown");
 			}
-			
-			IEnumerable<Attribute> GetAttributes (IEnumerable<Mono.CSharp.Attribute> optAttributes)
+
+			IEnumerable<Attribute> GetAttributes(IEnumerable<Mono.CSharp.Attribute> optAttributes)
 			{
 				if (optAttributes == null)
 					yield break;
 				foreach (var attr in optAttributes) {
-					Attribute result = new Attribute ();
-					result.Type = ConvertToType (attr.TypeNameExpression);
-					var loc = LocationsBag.GetLocations (attr);
+					var result = new Attribute();
+					result.Type = ConvertToType(attr.TypeNameExpression);
+					var loc = LocationsBag.GetLocations(attr);
 					result.HasArgumentList = loc != null;
 					int pos = 0;
 					if (loc != null)
-						result.AddChild (new CSharpTokenNode (Convert (loc [pos++]), Roles.LPar), Roles.LPar);
+						result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.LPar), Roles.LPar);
 					
 					if (attr.PositionalArguments != null) {
 						foreach (var arg in attr.PositionalArguments) {
@@ -289,72 +288,73 @@ namespace ICSharpCode.NRefactory.CSharp
 								continue;
 							var na = arg as NamedArgument;
 							if (na != null) {
-								var newArg = new NamedArgumentExpression ();
-								newArg.AddChild (Identifier.Create (na.Name, Convert (na.Location)), Roles.Identifier);
+								var newArg = new NamedArgumentExpression();
+								newArg.AddChild(Identifier.Create(na.Name, Convert(na.Location)), Roles.Identifier);
 								
-								var argLoc = LocationsBag.GetLocations (na);
+								var argLoc = LocationsBag.GetLocations(na);
 								if (argLoc != null)
-									newArg.AddChild (new CSharpTokenNode (Convert (argLoc [0]), Roles.Colon), Roles.Colon);
+									newArg.AddChild(new CSharpTokenNode(Convert(argLoc [0]), Roles.Colon), Roles.Colon);
 								if (na.Expr != null)
-									newArg.AddChild ((Expression)na.Expr.Accept (this), Roles.Expression);
-								result.AddChild (newArg, Roles.Argument);
+									newArg.AddChild((Expression)na.Expr.Accept(this), Roles.Expression);
+								result.AddChild(newArg, Roles.Argument);
 							} else {
 								if (arg.Expr != null)
-									result.AddChild ((Expression)arg.Expr.Accept (this), Roles.Argument);
+									result.AddChild((Expression)arg.Expr.Accept(this), Roles.Argument);
 							}
 							if (loc != null && pos + 1 < loc.Count)
-								result.AddChild (new CSharpTokenNode (Convert (loc [pos++]), Roles.Comma), Roles.Comma);
+								result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.Comma), Roles.Comma);
 						}
 					}
 					if (attr.NamedArguments != null) {
-						foreach (NamedArgument na in attr.NamedArguments) {
-							var newArg = new NamedExpression ();
-							newArg.AddChild (Identifier.Create (na.Name, Convert (na.Location)), Roles.Identifier);
+						foreach (var arg in attr.NamedArguments) {
+							var na = (NamedArgument)arg;
+							var newArg = new NamedExpression();
+							newArg.AddChild(Identifier.Create(na.Name, Convert(na.Location)), Roles.Identifier);
 							
-							var argLoc = LocationsBag.GetLocations (na);
+							var argLoc = LocationsBag.GetLocations(na);
 							if (argLoc != null)
-								newArg.AddChild (new CSharpTokenNode (Convert (argLoc [0]), Roles.Assign), Roles.Assign);
+								newArg.AddChild(new CSharpTokenNode(Convert(argLoc [0]), Roles.Assign), Roles.Assign);
 							if (na.Expr != null)
-								newArg.AddChild ((Expression)na.Expr.Accept (this), Roles.Expression);
-							result.AddChild (newArg, Roles.Argument);
+								newArg.AddChild((Expression)na.Expr.Accept(this), Roles.Expression);
+							result.AddChild(newArg, Roles.Argument);
 							if (loc != null && pos + 1 < loc.Count)
-								result.AddChild (new CSharpTokenNode (Convert (loc [pos++]), Roles.Comma), Roles.Comma);
+								result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.Comma), Roles.Comma);
 						}
 					}
 					if (loc != null && pos < loc.Count)
-						result.AddChild (new CSharpTokenNode (Convert (loc [pos++]), Roles.RPar), Roles.RPar);
+						result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.RPar), Roles.RPar);
 					
 					yield return result;
 				}
 			}
-			
-			AttributeSection ConvertAttributeSection (IEnumerable<Mono.CSharp.Attribute> optAttributes)
+
+			AttributeSection ConvertAttributeSection(IEnumerable<Mono.CSharp.Attribute> optAttributes)
 			{
 				if (optAttributes == null)
 					return null;
-				AttributeSection result = new AttributeSection ();
-				var loc = LocationsBag.GetLocations (optAttributes);
+				var result = new AttributeSection();
+				var loc = LocationsBag.GetLocations(optAttributes);
 				int pos = 0;
 				if (loc != null)
-					result.AddChild (new CSharpTokenNode (Convert (loc [pos++]), Roles.LBracket), Roles.LBracket);
-				var first = optAttributes.FirstOrDefault ();
+					result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.LBracket), Roles.LBracket);
+				var first = optAttributes.FirstOrDefault();
 				string target = first != null ? first.ExplicitTarget : null;
 				
-				if (!string.IsNullOrEmpty (target)) {
+				if (!string.IsNullOrEmpty(target)) {
 					if (loc != null && pos < loc.Count - 1) {
-						result.AddChild (Identifier.Create (target, Convert (loc [pos++])), Roles.Identifier);
+						result.AddChild(Identifier.Create(target, Convert(loc [pos++])), Roles.Identifier);
 					} else {
-						result.AddChild (Identifier.Create (target), Roles.Identifier);
+						result.AddChild(Identifier.Create(target), Roles.Identifier);
 					}
 					if (loc != null && pos < loc.Count)
-						result.AddChild (new CSharpTokenNode (Convert (loc [pos++]), Roles.Colon), Roles.Colon);
+						result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.Colon), Roles.Colon);
 				}
 
 				int attributeCount = 0;
 				foreach (var attr in GetAttributes (optAttributes)) {
-					result.AddChild (attr, Roles.Attribute);
+					result.AddChild(attr, Roles.Attribute);
 					if (loc != null && pos + 1 < loc.Count)
-						result.AddChild (new CSharpTokenNode (Convert (loc [pos++]), Roles.Comma), Roles.Comma);
+						result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.Comma), Roles.Comma);
 
 					attributeCount++;
 				}
@@ -364,202 +364,191 @@ namespace ICSharpCode.NRefactory.CSharp
 				int locCount = 2 + attributeCount - 1;
 				// optional comma
 				if (loc != null && pos < loc.Count - 1 && loc.Count == locCount + 1)
-					result.AddChild (new CSharpTokenNode (Convert (loc [pos++]), Roles.Comma), Roles.Comma);
+					result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.Comma), Roles.Comma);
 				if (loc != null && pos < loc.Count)
-					result.AddChild (new CSharpTokenNode (Convert (loc [pos++]), Roles.RBracket), Roles.RBracket);
+					result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.RBracket), Roles.RBracket);
 				return result;
 			}
-			
-			public override void Visit(NamespaceContainer nspace)
+
+			public override void Visit(NamespaceContainer ns)
 			{
 				NamespaceDeclaration nDecl = null;
-				var loc = LocationsBag.GetLocations(nspace);
-				
-				if (nspace.NS != null && !string.IsNullOrEmpty(nspace.NS.Name)) {
-					nDecl = new NamespaceDeclaration ();
+				var loc = LocationsBag.GetLocations(ns);
+				// <invalid> is caused by the parser - see Bug 12383 - [AST] Non existing namespaces generated
+				if (ns.NS != null && !string.IsNullOrEmpty(ns.NS.Name) && !ns.NS.Name.EndsWith("<invalid>", StringComparison.Ordinal)) {
+					nDecl = new NamespaceDeclaration();
 					if (loc != null) {
-						nDecl.AddChild(new CSharpTokenNode (Convert(loc [0]), Roles.NamespaceKeyword), Roles.NamespaceKeyword);
+						nDecl.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.NamespaceKeyword), Roles.NamespaceKeyword);
 					}
-					ConvertNamespaceName(nspace.RealMemberName, nDecl);
+					nDecl.AddChild(ConvertNamespaceName(ns.RealMemberName), NamespaceDeclaration.NamespaceNameRole);
 					if (loc != null && loc.Count > 1) {
-						nDecl.AddChild(new CSharpTokenNode (Convert(loc [1]), Roles.LBrace), Roles.LBrace);
+						nDecl.AddChild(new CSharpTokenNode(Convert(loc [1]), Roles.LBrace), Roles.LBrace);
 					}
+
 					AddToNamespace(nDecl);
 					namespaceStack.Push(nDecl);
 				}
 				
-				if (nspace.Usings != null) {
-					foreach (var us in nspace.Usings) {
+				if (ns.Usings != null) {
+					foreach (var us in ns.Usings) {
 						us.Accept(this);
 					}
 				}
 				
-				if (nspace.Containers != null) {
-					foreach (var container in nspace.Containers) {
+				if (ns.Containers != null) {
+					foreach (var container in ns.Containers) {
 						container.Accept(this);
 					}
 				}
 				
 				if (nDecl != null) {
-					AddAttributeSection(nDecl, nspace.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
+					AddAttributeSection(nDecl, ns.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
 					if (loc != null && loc.Count > 2)
-						nDecl.AddChild (new CSharpTokenNode (Convert (loc [2]), Roles.RBrace), Roles.RBrace);
+						nDecl.AddChild(new CSharpTokenNode(Convert(loc [2]), Roles.RBrace), Roles.RBrace);
 					if (loc != null && loc.Count > 3)
-						nDecl.AddChild (new CSharpTokenNode (Convert (loc [3]), Roles.Semicolon), Roles.Semicolon);
+						nDecl.AddChild(new CSharpTokenNode(Convert(loc [3]), Roles.Semicolon), Roles.Semicolon);
 					
-					namespaceStack.Pop ();
+					namespaceStack.Pop();
 				}
 			}
-//			public override void Visit (UsingsBag.Namespace nspace)
-//			{
-//
-//
-//				VisitNamespaceUsings (nspace);
-//				VisitNamespaceBody (nspace);
-//
-//			}
-//
-			void ConvertNamespaceName (MemberName memberName, NamespaceDeclaration namespaceDecl)
-			{
-				AstNode insertPos = null;
-				while (memberName != null) {
-					Identifier newIdent = Identifier.Create (memberName.Name, Convert (memberName.Location));
-					// HACK for a parser 'bug' - sometimes it generates "<invalid>" identifiers in namespace names (on certain bugs in the input file)
-					if (newIdent.Name != "<invalid>") {
-						namespaceDecl.InsertChildBefore (insertPos, newIdent, Roles.Identifier);
-						insertPos = newIdent;
-						var loc = LocationsBag.GetLocations (memberName);
-						if (loc != null) {
-							var dotToken = new CSharpTokenNode (Convert (loc[0]), Roles.Dot);
-							namespaceDecl.InsertChildBefore (insertPos, dotToken, Roles.Dot);
-							insertPos = dotToken;
-						}
-					}
-					memberName = memberName.Left;
-				}
+			//			public override void Visit (UsingsBag.Namespace nspace)
+			//			{
+			//
+			//
+			//				VisitNamespaceUsings (nspace);
+			//				VisitNamespaceBody (nspace);
+			//
+			//			}
+			//
+			AstType ConvertNamespaceName(MemberName memberName)
+			{
+				// HACK for a parser 'bug' - sometimes it generates "<invalid>" identifiers in namespace names (on certain bugs in the input file)
+				if (memberName.Name == "<invalid>")
+					return AstType.Null;
+				return ConvertToType(memberName);
 			}
-			
-			public override void Visit (UsingNamespace un)
+
+			public override void Visit(UsingNamespace un)
 			{
-				var ud = new UsingDeclaration ();
-				var loc = LocationsBag.GetLocations (un);
-				ud.AddChild (new CSharpTokenNode (Convert (un.Location), UsingDeclaration.UsingKeywordRole), UsingDeclaration.UsingKeywordRole);
+				var ud = new UsingDeclaration();
+				var loc = LocationsBag.GetLocations(un);
+				ud.AddChild(new CSharpTokenNode(Convert(un.Location), UsingDeclaration.UsingKeywordRole), UsingDeclaration.UsingKeywordRole);
 				if (un.NamespaceExpression != null)
-					ud.AddChild (ConvertToType (un.NamespaceExpression), UsingDeclaration.ImportRole);
+					ud.AddChild(ConvertToType(un.NamespaceExpression), UsingDeclaration.ImportRole);
 				if (loc != null)
-					ud.AddChild (new CSharpTokenNode (Convert (loc [0]), Roles.Semicolon), Roles.Semicolon);
-				AddToNamespace (ud);
+					ud.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Semicolon), Roles.Semicolon);
+				AddToNamespace(ud);
 			}
 
-			public override void Visit (UsingAliasNamespace uan)
+			public override void Visit(UsingAliasNamespace uan)
 			{
-				var ud = new UsingAliasDeclaration ();
-				var loc = LocationsBag.GetLocations (uan);
+				var ud = new UsingAliasDeclaration();
+				var loc = LocationsBag.GetLocations(uan);
 				
-				ud.AddChild (new CSharpTokenNode (Convert (uan.Location), UsingAliasDeclaration.UsingKeywordRole), UsingAliasDeclaration.UsingKeywordRole);
-				ud.AddChild (Identifier.Create (uan.Alias.Value, Convert (uan.Alias.Location)), UsingAliasDeclaration.AliasRole);
+				ud.AddChild(new CSharpTokenNode(Convert(uan.Location), UsingAliasDeclaration.UsingKeywordRole), UsingAliasDeclaration.UsingKeywordRole);
+				ud.AddChild(Identifier.Create(uan.Alias.Value, Convert(uan.Alias.Location)), UsingAliasDeclaration.AliasRole);
 				if (loc != null)
-					ud.AddChild (new CSharpTokenNode (Convert (loc [0]), Roles.Assign), Roles.Assign);
+					ud.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Assign), Roles.Assign);
 				if (uan.NamespaceExpression != null)
-					ud.AddChild (ConvertToType (uan.NamespaceExpression), UsingAliasDeclaration.ImportRole);
+					ud.AddChild(ConvertToType(uan.NamespaceExpression), UsingAliasDeclaration.ImportRole);
 				if (loc != null && loc.Count > 1)
-					ud.AddChild (new CSharpTokenNode (Convert (loc [1]), Roles.Semicolon), Roles.Semicolon);
-				AddToNamespace (ud);
+					ud.AddChild(new CSharpTokenNode(Convert(loc [1]), Roles.Semicolon), Roles.Semicolon);
+				AddToNamespace(ud);
 			}
-			
-			public override void Visit (UsingExternAlias uea)
+
+			public override void Visit(UsingExternAlias uea)
 			{
-				var ud = new ExternAliasDeclaration ();
-				var loc = LocationsBag.GetLocations (uea);
-				ud.AddChild (new CSharpTokenNode (Convert (uea.Location), Roles.ExternKeyword), Roles.ExternKeyword);
+				var ud = new ExternAliasDeclaration();
+				var loc = LocationsBag.GetLocations(uea);
+				ud.AddChild(new CSharpTokenNode(Convert(uea.Location), Roles.ExternKeyword), Roles.ExternKeyword);
 				if (loc != null)
-					ud.AddChild (new CSharpTokenNode (Convert (loc [0]), Roles.AliasKeyword), Roles.AliasKeyword);
-				ud.AddChild (Identifier.Create (uea.Alias.Value, Convert (uea.Alias.Location)), Roles.Identifier);
+					ud.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.AliasKeyword), Roles.AliasKeyword);
+				ud.AddChild(Identifier.Create(uea.Alias.Value, Convert(uea.Alias.Location)), Roles.Identifier);
 				if (loc != null && loc.Count > 1)
-					ud.AddChild (new CSharpTokenNode (Convert (loc [1]), Roles.Semicolon), Roles.Semicolon);
-				AddToNamespace (ud);
+					ud.AddChild(new CSharpTokenNode(Convert(loc [1]), Roles.Semicolon), Roles.Semicolon);
+				AddToNamespace(ud);
 			}
 
-			AstType ConvertImport (MemberName memberName)
+			AstType ConvertImport(MemberName memberName)
 			{
 				if (memberName.Left != null) {
 					// left.name
-					var t = new MemberType ();
+					var t = new MemberType();
 //					t.IsDoubleColon = memberName.IsDoubleColon;
-					t.AddChild (ConvertImport (memberName.Left), MemberType.TargetRole);
-					var loc = LocationsBag.GetLocations (memberName);
+					t.AddChild(ConvertImport(memberName.Left), MemberType.TargetRole);
+					var loc = LocationsBag.GetLocations(memberName);
 					if (loc != null)
-						t.AddChild (new CSharpTokenNode (Convert (loc[0]), Roles.Dot), Roles.Dot);
+						t.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Dot), Roles.Dot);
 					
-					t.AddChild (Identifier.Create (memberName.Name, Convert (memberName.Location)), Roles.Identifier);
-					AddTypeArguments (t, memberName);
+					t.AddChild(Identifier.Create(memberName.Name, Convert(memberName.Location)), Roles.Identifier);
+					AddTypeArguments(t, memberName);
 					return t;
 				} else {
-					SimpleType t = new SimpleType ();
-					t.AddChild (Identifier.Create (memberName.Name, Convert (memberName.Location)), Roles.Identifier);
-					AddTypeArguments (t, memberName);
+					var t = new SimpleType();
+					t.AddChild(Identifier.Create(memberName.Name, Convert(memberName.Location)), Roles.Identifier);
+					AddTypeArguments(t, memberName);
 					return t;
 				}
 			}
-			
-			public override void Visit (MemberCore member)
+
+			public override void Visit(MemberCore member)
 			{
-				Console.WriteLine ("Unknown member:");
-				Console.WriteLine (member.GetType () + "-> Member {0}", member.GetSignatureForError ());
+				Console.WriteLine("Unknown member:");
+				Console.WriteLine(member.GetType() + "-> Member {0}", member.GetSignatureForError());
 			}
-			
-			Stack<TypeDeclaration> typeStack = new Stack<TypeDeclaration> ();
-			
+
+			readonly Stack<TypeDeclaration> typeStack = new Stack<TypeDeclaration>();
+
 			public override void Visit(Class c)
 			{
-				var newType = new TypeDeclaration ();
+				var newType = new TypeDeclaration();
 				newType.ClassType = ClassType.Class;
 				AddAttributeSection(newType, c);
 				var location = LocationsBag.GetMemberLocation(c);
 				AddModifiers(newType, location);
 				int curLoc = 0;
 				if (location != null && location.Count > 0)
-					newType.AddChild (new CSharpTokenNode (Convert (location [curLoc++]), Roles.ClassKeyword), Roles.ClassKeyword);
+					newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.ClassKeyword), Roles.ClassKeyword);
 				
-				newType.AddChild (Identifier.Create (c.MemberName.Name, Convert (c.MemberName.Location)), Roles.Identifier);
-				AddTypeParameters (newType, c.MemberName);
+				newType.AddChild(Identifier.Create(c.MemberName.Name, Convert(c.MemberName.Location)), Roles.Identifier);
+				AddTypeParameters(newType, c.MemberName);
 				
 				if (c.TypeBaseExpressions != null) {
 					if (location != null && curLoc < location.Count)
-						newType.AddChild (new CSharpTokenNode (Convert (location [curLoc++]), Roles.Colon), Roles.Colon);
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.Colon), Roles.Colon);
 					
-					var commaLocations = LocationsBag.GetLocations (c.TypeBaseExpressions);
+					var commaLocations = LocationsBag.GetLocations(c.TypeBaseExpressions);
 					int i = 0;
 					foreach (var baseTypes in c.TypeBaseExpressions) {
-						newType.AddChild (ConvertToType (baseTypes), Roles.BaseType);
+						newType.AddChild(ConvertToType(baseTypes), Roles.BaseType);
 						if (commaLocations != null && i < commaLocations.Count) {
-							newType.AddChild (new CSharpTokenNode (Convert (commaLocations [i]), Roles.Comma), Roles.Comma);
+							newType.AddChild(new CSharpTokenNode(Convert(commaLocations [i]), Roles.Comma), Roles.Comma);
 							i++;
 						}
 					}
 				}
 				
-				AddConstraints (newType, c.CurrentTypeParameters);
+				AddConstraints(newType, c.CurrentTypeParameters);
 				if (location != null && curLoc < location.Count)
-					newType.AddChild (new CSharpTokenNode (Convert (location [curLoc++]), Roles.LBrace), Roles.LBrace);
-				typeStack.Push (newType);
-				base.Visit (c);
-				AddAttributeSection (newType, c.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
+					newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.LBrace), Roles.LBrace);
+				typeStack.Push(newType);
+				base.Visit(c);
+				AddAttributeSection(newType, c.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
 
 				if (location != null && curLoc < location.Count) {
-					newType.AddChild (new CSharpTokenNode (Convert (location [curLoc++]), Roles.RBrace), Roles.RBrace);
+					newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.RBrace), Roles.RBrace);
 					
 					if (location != null && curLoc < location.Count)
-						newType.AddChild (new CSharpTokenNode (Convert (location [curLoc++]), Roles.Semicolon), Roles.Semicolon);
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.Semicolon), Roles.Semicolon);
 					
 				} else {
 					// parser error, set end node to max value.
-					newType.AddChild (new ErrorNode (), Roles.Error);
+					newType.AddChild(new ErrorNode(), Roles.Error);
 				}
-				typeStack.Pop ();
-				AddType (newType);
+				typeStack.Pop();
+				AddType(newType);
 			}
-			
+
 			public override void Visit(Struct s)
 			{
 				var newType = new TypeDeclaration();
@@ -569,42 +558,42 @@ namespace ICSharpCode.NRefactory.CSharp
 				AddModifiers(newType, location);
 				int curLoc = 0;
 				if (location != null && location.Count > 0)
-					newType.AddChild (new CSharpTokenNode (Convert (location [curLoc++]), Roles.StructKeyword), Roles.StructKeyword);
-				newType.AddChild (Identifier.Create (s.MemberName.Name, Convert (s.MemberName.Location)), Roles.Identifier);
-				AddTypeParameters (newType, s.MemberName);
+					newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.StructKeyword), Roles.StructKeyword);
+				newType.AddChild(Identifier.Create(s.MemberName.Name, Convert(s.MemberName.Location)), Roles.Identifier);
+				AddTypeParameters(newType, s.MemberName);
 				
 				if (s.TypeBaseExpressions != null) {
 					if (location != null && curLoc < location.Count)
-						newType.AddChild (new CSharpTokenNode (Convert (location [curLoc++]), Roles.Colon), Roles.Colon);
-					var commaLocations = LocationsBag.GetLocations (s.TypeBaseExpressions);
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.Colon), Roles.Colon);
+					var commaLocations = LocationsBag.GetLocations(s.TypeBaseExpressions);
 					int i = 0;
 					foreach (var baseTypes in s.TypeBaseExpressions) {
-						newType.AddChild (ConvertToType (baseTypes), Roles.BaseType);
+						newType.AddChild(ConvertToType(baseTypes), Roles.BaseType);
 						if (commaLocations != null && i < commaLocations.Count) {
-							newType.AddChild (new CSharpTokenNode (Convert (commaLocations [i]), Roles.Comma), Roles.Comma);
+							newType.AddChild(new CSharpTokenNode(Convert(commaLocations [i]), Roles.Comma), Roles.Comma);
 							i++;
 						}
 					}
 				}
 				
-				AddConstraints (newType, s.CurrentTypeParameters);
+				AddConstraints(newType, s.CurrentTypeParameters);
 				if (location != null && curLoc < location.Count)
-					newType.AddChild (new CSharpTokenNode (Convert (location [curLoc++]), Roles.LBrace), Roles.LBrace);
-				typeStack.Push (newType);
-				base.Visit (s);
+					newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.LBrace), Roles.LBrace);
+				typeStack.Push(newType);
+				base.Visit(s);
 				if (location != null && location.Count > 2) {
 					if (location != null && curLoc < location.Count)
-						newType.AddChild (new CSharpTokenNode (Convert (location [curLoc++]), Roles.RBrace), Roles.RBrace);
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.RBrace), Roles.RBrace);
 					if (location != null && curLoc < location.Count)
-						newType.AddChild (new CSharpTokenNode (Convert (location [curLoc++]), Roles.Semicolon), Roles.Semicolon);
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.Semicolon), Roles.Semicolon);
 				} else {
 					// parser error, set end node to max value.
-					newType.AddChild (new ErrorNode (), Roles.Error);
+					newType.AddChild(new ErrorNode(), Roles.Error);
 				}
-				typeStack.Pop ();
-				AddType (newType);
+				typeStack.Pop();
+				AddType(newType);
 			}
-			
+
 			public override void Visit(Interface i)
 			{
 				var newType = new TypeDeclaration();
@@ -614,88 +603,88 @@ namespace ICSharpCode.NRefactory.CSharp
 				AddModifiers(newType, location);
 				int curLoc = 0;
 				if (location != null && location.Count > 0)
-					newType.AddChild (new CSharpTokenNode (Convert (location [curLoc++]), Roles.InterfaceKeyword), Roles.InterfaceKeyword);
-				newType.AddChild (Identifier.Create (i.MemberName.Name, Convert (i.MemberName.Location)), Roles.Identifier);
-				AddTypeParameters (newType, i.MemberName);
+					newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.InterfaceKeyword), Roles.InterfaceKeyword);
+				newType.AddChild(Identifier.Create(i.MemberName.Name, Convert(i.MemberName.Location)), Roles.Identifier);
+				AddTypeParameters(newType, i.MemberName);
 				
 				if (i.TypeBaseExpressions != null) {
 					if (location != null && curLoc < location.Count)
-						newType.AddChild (new CSharpTokenNode (Convert (location [curLoc++]), Roles.Colon), Roles.Colon);
-					var commaLocations = LocationsBag.GetLocations (i.TypeBaseExpressions);
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.Colon), Roles.Colon);
+					var commaLocations = LocationsBag.GetLocations(i.TypeBaseExpressions);
 					int j = 0;
 					foreach (var baseTypes in i.TypeBaseExpressions) {
-						newType.AddChild (ConvertToType (baseTypes), Roles.BaseType);
+						newType.AddChild(ConvertToType(baseTypes), Roles.BaseType);
 						if (commaLocations != null && j < commaLocations.Count) {
-							newType.AddChild (new CSharpTokenNode (Convert (commaLocations [j]), Roles.Comma), Roles.Comma);
+							newType.AddChild(new CSharpTokenNode(Convert(commaLocations [j]), Roles.Comma), Roles.Comma);
 							j++;
 						}
 					}
 				}
 				
-				AddConstraints (newType, i.CurrentTypeParameters);
+				AddConstraints(newType, i.CurrentTypeParameters);
 				if (location != null && curLoc < location.Count)
-					newType.AddChild (new CSharpTokenNode (Convert (location [curLoc++]), Roles.LBrace), Roles.LBrace);
-				typeStack.Push (newType);
-				base.Visit (i);
+					newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.LBrace), Roles.LBrace);
+				typeStack.Push(newType);
+				base.Visit(i);
 				if (location != null && location.Count > 2) {
 					if (location != null && curLoc < location.Count)
-						newType.AddChild (new CSharpTokenNode (Convert (location [curLoc++]), Roles.RBrace), Roles.RBrace);
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.RBrace), Roles.RBrace);
 					if (location != null && curLoc < location.Count)
-						newType.AddChild (new CSharpTokenNode (Convert (location [curLoc++]), Roles.Semicolon), Roles.Semicolon);
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.Semicolon), Roles.Semicolon);
 				} else {
 					// parser error, set end node to max value.
-					newType.AddChild (new ErrorNode (), Roles.Error);
+					newType.AddChild(new ErrorNode(), Roles.Error);
 				}
-				typeStack.Pop ();
-				AddType (newType);
+				typeStack.Pop();
+				AddType(newType);
 			}
-			
+
 			public override void Visit(Mono.CSharp.Delegate d)
 			{
-				DelegateDeclaration newDelegate = new DelegateDeclaration ();
+				var newDelegate = new DelegateDeclaration();
 				var location = LocationsBag.GetMemberLocation(d);
 				AddAttributeSection(newDelegate, d);
 				AddModifiers(newDelegate, location);
 				if (location != null && location.Count > 0) {
-					newDelegate.AddChild(new CSharpTokenNode (Convert(location [0]), Roles.DelegateKeyword), Roles.DelegateKeyword);
+					newDelegate.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.DelegateKeyword), Roles.DelegateKeyword);
 				}
 				if (d.ReturnType != null)
-					newDelegate.AddChild (ConvertToType (d.ReturnType), Roles.Type);
-				newDelegate.AddChild (Identifier.Create (d.MemberName.Name, Convert (d.MemberName.Location)), Roles.Identifier);
-				AddTypeParameters (newDelegate, d.MemberName);
+					newDelegate.AddChild(ConvertToType(d.ReturnType), Roles.Type);
+				newDelegate.AddChild(Identifier.Create(d.MemberName.Name, Convert(d.MemberName.Location)), Roles.Identifier);
+				AddTypeParameters(newDelegate, d.MemberName);
 				
 				if (location != null && location.Count > 1)
-					newDelegate.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.LPar), Roles.LPar);
-				AddParameter (newDelegate, d.Parameters);
+					newDelegate.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.LPar), Roles.LPar);
+				AddParameter(newDelegate, d.Parameters);
 				
 				if (location != null && location.Count > 2) {
-					newDelegate.AddChild (new CSharpTokenNode (Convert (location [2]), Roles.RPar), Roles.RPar);
+					newDelegate.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.RPar), Roles.RPar);
 				}
-				AddConstraints (newDelegate, d.CurrentTypeParameters);
+				AddConstraints(newDelegate, d.CurrentTypeParameters);
 				if (location != null && location.Count > 3) {
-					newDelegate.AddChild (new CSharpTokenNode (Convert (location [3]), Roles.Semicolon), Roles.Semicolon);
+					newDelegate.AddChild(new CSharpTokenNode(Convert(location [3]), Roles.Semicolon), Roles.Semicolon);
 				}
-				AddType (newDelegate);
+				AddType(newDelegate);
 			}
-			
-			void AddType (EntityDeclaration child)
+
+			void AddType(EntityDeclaration child)
 			{
 				if (typeStack.Count > 0) {
-					typeStack.Peek ().AddChild (child, Roles.TypeMemberRole);
+					typeStack.Peek().AddChild(child, Roles.TypeMemberRole);
 				} else {
-					AddToNamespace (child);
+					AddToNamespace(child);
 				}
 			}
-			
-			void AddToNamespace (AstNode child)
+
+			void AddToNamespace(AstNode child)
 			{
 				if (namespaceStack.Count > 0) {
-					namespaceStack.Peek ().AddChild (child, NamespaceDeclaration.MemberRole);
+					namespaceStack.Peek().AddChild(child, NamespaceDeclaration.MemberRole);
 				} else {
-					unit.AddChild (child, SyntaxTree.MemberRole);
+					unit.AddChild(child, SyntaxTree.MemberRole);
 				}
 			}
-			
+
 			public override void Visit(Mono.CSharp.Enum e)
 			{
 				var newType = new TypeDeclaration();
@@ -720,7 +709,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				typeStack.Push(newType);
 				
 				foreach (var m in e.Members) {
-					EnumMember member = m as EnumMember;
+					var member = m as EnumMember;
 					if (member == null) {
 						Console.WriteLine("WARNING - ENUM MEMBER: " + m);
 						continue;
@@ -732,86 +721,83 @@ namespace ICSharpCode.NRefactory.CSharp
 				
 				if (location != null && location.Count > 2) {
 					if (location != null && curLoc < location.Count)
-						newType.AddChild (new CSharpTokenNode (Convert (location [curLoc++]), Roles.RBrace), Roles.RBrace);
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.RBrace), Roles.RBrace);
 					if (location != null && curLoc < location.Count)
-						newType.AddChild (new CSharpTokenNode (Convert (location [curLoc++]), Roles.Semicolon), Roles.Semicolon);
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.Semicolon), Roles.Semicolon);
 				} else {
 					// parser error, set end node to max value.
-					newType.AddChild (new ErrorNode (), Roles.Error);
+					newType.AddChild(new ErrorNode(), Roles.Error);
 				}
 
-				AddAttributeSection (newType, e.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
-				typeStack.Pop ();
-				AddType (newType);
+				AddAttributeSection(newType, e.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
+				typeStack.Pop();
+				AddType(newType);
 			}
-			
-			public override void Visit (EnumMember em)
+
+			public override void Visit(EnumMember em)
 			{
-				EnumMemberDeclaration newField = new EnumMemberDeclaration ();
-				AddAttributeSection (newField, em);
-				newField.AddChild (Identifier.Create (em.Name, Convert (em.Location)), Roles.Identifier);
+				var newField = new EnumMemberDeclaration();
+				AddAttributeSection(newField, em);
+				newField.AddChild(Identifier.Create(em.Name, Convert(em.Location)), Roles.Identifier);
 				if (em.Initializer != null) {
-					newField.AddChild (new CSharpTokenNode (Convert (em.Initializer.Location), Roles.Assign), Roles.Assign);
-					newField.AddChild ((Expression)em.Initializer.Accept (this), EnumMemberDeclaration.InitializerRole);
+					newField.AddChild(new CSharpTokenNode(Convert(em.Initializer.Location), Roles.Assign), Roles.Assign);
+					newField.AddChild((Expression)em.Initializer.Accept(this), EnumMemberDeclaration.InitializerRole);
 				}
 				//Console.WriteLine (newField.StartLocation +"-" + newField.EndLocation);
 				
-				typeStack.Peek ().AddChild (newField, Roles.TypeMemberRole);
+				typeStack.Peek().AddChild(newField, Roles.TypeMemberRole);
 			}
+
 			#endregion
-			
+
 			#region Type members
-			
-			
-			public override void Visit (FixedField f)
+
+			public override void Visit(FixedField f)
 			{
-				var location = LocationsBag.GetMemberLocation (f);
+				var location = LocationsBag.GetMemberLocation(f);
 				int locationIdx = 0;
 				
-				var newField = new FixedFieldDeclaration ();
-				AddAttributeSection (newField, f);
-				AddModifiers (newField, location);
+				var newField = new FixedFieldDeclaration();
+				AddAttributeSection(newField, f);
+				AddModifiers(newField, location);
 				if (location != null && location.Count > 0)
-					newField.AddChild (new CSharpTokenNode (Convert (location [locationIdx++]), FixedFieldDeclaration.FixedKeywordRole), FixedFieldDeclaration.FixedKeywordRole);
+					newField.AddChild(new CSharpTokenNode(Convert(location [locationIdx++]), FixedFieldDeclaration.FixedKeywordRole), FixedFieldDeclaration.FixedKeywordRole);
 
 				if (f.TypeExpression != null)
-					newField.AddChild (ConvertToType (f.TypeExpression), Roles.Type);
+					newField.AddChild(ConvertToType(f.TypeExpression), Roles.Type);
 				
-				var variable = new FixedVariableInitializer ();
-				variable.AddChild (Identifier.Create (f.MemberName.Name, Convert (f.MemberName.Location)), Roles.Identifier);
+				var variable = new FixedVariableInitializer();
+				variable.AddChild(Identifier.Create(f.MemberName.Name, Convert(f.MemberName.Location)), Roles.Identifier);
 				if (f.Initializer != null && !f.Initializer.IsNull) {
-					var bracketLocations = LocationsBag.GetLocations (f.Initializer);
-					if (bracketLocations != null && bracketLocations.Count > 1)
-						variable.AddChild (new CSharpTokenNode (Convert (bracketLocations [0]), Roles.LBracket), Roles.LBracket);
+					variable.AddChild(new CSharpTokenNode(Convert(f.Initializer.Location), Roles.LBracket), Roles.LBracket);
 					
-					variable.AddChild ((Expression)f.Initializer.Accept (this), Roles.Expression);
-					if (bracketLocations != null && bracketLocations.Count > 1)
-						variable.AddChild (new CSharpTokenNode (Convert (bracketLocations [0]), Roles.RBracket), Roles.RBracket);
+					variable.AddChild((Expression)f.Initializer.Accept(this), Roles.Expression);
+					var bracketLocations = LocationsBag.GetLocations(f.Initializer);
+					if (bracketLocations != null)
+						variable.AddChild(new CSharpTokenNode(Convert(bracketLocations [0]), Roles.RBracket), Roles.RBracket);
 				}
-				newField.AddChild (variable, FixedFieldDeclaration.VariableRole);
+				newField.AddChild(variable, FixedFieldDeclaration.VariableRole);
 				
 				if (f.Declarators != null) {
 					foreach (var decl in f.Declarators) {
-						var declLoc = LocationsBag.GetLocations (decl);
+						var declLoc = LocationsBag.GetLocations(decl);
 						if (declLoc != null)
-							newField.AddChild (new CSharpTokenNode (Convert (declLoc [0]), Roles.Comma), Roles.Comma);
+							newField.AddChild(new CSharpTokenNode(Convert(declLoc [0]), Roles.Comma), Roles.Comma);
 						
-						variable = new FixedVariableInitializer ();
-						variable.AddChild (Identifier.Create (decl.Name.Value, Convert (decl.Name.Location)), Roles.Identifier);
-						if (!decl.Initializer.IsNull) {
-							var bracketLocations = LocationsBag.GetLocations (f.Initializer);
-							if (bracketLocations != null && bracketLocations.Count > 1)
-								variable.AddChild (new CSharpTokenNode (Convert (bracketLocations [0]), Roles.LBracket), Roles.LBracket);
-							variable.AddChild ((Expression)decl.Initializer.Accept (this), Roles.Expression);
-							if (bracketLocations != null && bracketLocations.Count > 1)
-								variable.AddChild (new CSharpTokenNode (Convert (bracketLocations [0]), Roles.RBracket), Roles.RBracket);
-						}
-						newField.AddChild (variable, FixedFieldDeclaration.VariableRole);
+						variable = new FixedVariableInitializer();
+						variable.AddChild(Identifier.Create(decl.Name.Value, Convert(decl.Name.Location)), Roles.Identifier);
+						variable.AddChild(new CSharpTokenNode(Convert(decl.Initializer.Location), Roles.LBracket), Roles.LBracket);
+						variable.AddChild((Expression)decl.Initializer.Accept(this), Roles.Expression);
+						var bracketLocations = LocationsBag.GetLocations(decl.Initializer);
+						if (bracketLocations != null)
+							variable.AddChild(new CSharpTokenNode(Convert(bracketLocations [0]), Roles.RBracket), Roles.RBracket);
+
+						newField.AddChild(variable, FixedFieldDeclaration.VariableRole);
 					}
 				}
 				if (location != null && location.Count > locationIdx)
-					newField.AddChild (new CSharpTokenNode (Convert (location [locationIdx]), Roles.Semicolon), Roles.Semicolon);
-				typeStack.Peek ().AddChild (newField, Roles.TypeMemberRole);
+					newField.AddChild(new CSharpTokenNode(Convert(location [locationIdx]), Roles.Semicolon), Roles.Semicolon);
+				typeStack.Peek().AddChild(newField, Roles.TypeMemberRole);
 				
 			}
 
@@ -819,113 +805,113 @@ namespace ICSharpCode.NRefactory.CSharp
 			{
 				var location = LocationsBag.GetMemberLocation(f);
 				
-				FieldDeclaration newField = new FieldDeclaration ();
-				AddAttributeSection (newField, f);
-				AddModifiers (newField, location);
-				newField.AddChild (ConvertToType (f.TypeExpression), Roles.Type);
+				var newField = new FieldDeclaration();
+				AddAttributeSection(newField, f);
+				AddModifiers(newField, location);
+				newField.AddChild(ConvertToType(f.TypeExpression), Roles.Type);
 				
-				VariableInitializer variable = new VariableInitializer ();
-				variable.AddChild (Identifier.Create (f.MemberName.Name, Convert (f.MemberName.Location)), Roles.Identifier);
+				var variable = new VariableInitializer();
+				variable.AddChild(Identifier.Create(f.MemberName.Name, Convert(f.MemberName.Location)), Roles.Identifier);
 				int locationIdx = 0;
 				if (f.Initializer != null) {
 					if (location != null)
-						variable.AddChild (new CSharpTokenNode (Convert (location [locationIdx++]), Roles.Assign), Roles.Assign);
-					variable.AddChild ((Expression)f.Initializer.Accept (this), Roles.Expression);
+						variable.AddChild(new CSharpTokenNode(Convert(location [locationIdx++]), Roles.Assign), Roles.Assign);
+					variable.AddChild((Expression)f.Initializer.Accept(this), Roles.Expression);
 				}
-				newField.AddChild (variable, Roles.Variable);
+				newField.AddChild(variable, Roles.Variable);
 				if (f.Declarators != null) {
 					foreach (var decl in f.Declarators) {
-						var declLoc = LocationsBag.GetLocations (decl);
+						var declLoc = LocationsBag.GetLocations(decl);
 						if (declLoc != null)
-							newField.AddChild (new CSharpTokenNode (Convert (declLoc [0]), Roles.Comma), Roles.Comma);
+							newField.AddChild(new CSharpTokenNode(Convert(declLoc [0]), Roles.Comma), Roles.Comma);
 						
-						variable = new VariableInitializer ();
-						variable.AddChild (Identifier.Create (decl.Name.Value, Convert (decl.Name.Location)), Roles.Identifier);
+						variable = new VariableInitializer();
+						variable.AddChild(Identifier.Create(decl.Name.Value, Convert(decl.Name.Location)), Roles.Identifier);
 						if (decl.Initializer != null) {
 							if (declLoc != null)
-								variable.AddChild (new CSharpTokenNode (Convert (declLoc [1]), Roles.Assign), Roles.Assign);
-							variable.AddChild ((Expression)decl.Initializer.Accept (this), Roles.Expression);
+								variable.AddChild(new CSharpTokenNode(Convert(declLoc [1]), Roles.Assign), Roles.Assign);
+							variable.AddChild((Expression)decl.Initializer.Accept(this), Roles.Expression);
 						}
-						newField.AddChild (variable, Roles.Variable);
+						newField.AddChild(variable, Roles.Variable);
 					}
 				}
-				if (location != null &&location.Count > locationIdx)
-					newField.AddChild (new CSharpTokenNode (Convert (location [locationIdx++]), Roles.Semicolon), Roles.Semicolon);
+				if (location != null && location.Count > locationIdx)
+					newField.AddChild(new CSharpTokenNode(Convert(location [locationIdx++]), Roles.Semicolon), Roles.Semicolon);
 
-				typeStack.Peek ().AddChild (newField, Roles.TypeMemberRole);
+				typeStack.Peek().AddChild(newField, Roles.TypeMemberRole);
 			}
-			
-			public override void Visit (Const f)
+
+			public override void Visit(Const c)
 			{
-				var location = LocationsBag.GetMemberLocation (f);
+				var location = LocationsBag.GetMemberLocation(c);
 				
-				FieldDeclaration newField = new FieldDeclaration ();
-				AddAttributeSection (newField, f);
-				AddModifiers (newField, location);
+				var newField = new FieldDeclaration();
+				AddAttributeSection(newField, c);
+				AddModifiers(newField, location);
 				if (location != null)
-					newField.AddChild (new CSharpModifierToken (Convert (location [0]), Modifiers.Const), EntityDeclaration.ModifierRole);
-				newField.AddChild (ConvertToType (f.TypeExpression), Roles.Type);
+					newField.AddChild(new CSharpModifierToken(Convert(location [0]), Modifiers.Const), EntityDeclaration.ModifierRole);
+				newField.AddChild(ConvertToType(c.TypeExpression), Roles.Type);
 				
-				VariableInitializer variable = new VariableInitializer ();
-				variable.AddChild (Identifier.Create (f.MemberName.Name, Convert (f.MemberName.Location)), Roles.Identifier);
+				var variable = new VariableInitializer();
+				variable.AddChild(Identifier.Create(c.MemberName.Name, Convert(c.MemberName.Location)), Roles.Identifier);
 				
-				if (f.Initializer != null) {
-					variable.AddChild (new CSharpTokenNode (Convert (f.Initializer.Location), Roles.Assign), Roles.Assign);
-					variable.AddChild ((Expression)f.Initializer.Accept (this), Roles.Expression);
+				if (c.Initializer != null) {
+					variable.AddChild(new CSharpTokenNode(Convert(c.Initializer.Location), Roles.Assign), Roles.Assign);
+					variable.AddChild((Expression)c.Initializer.Accept(this), Roles.Expression);
 				}
-				newField.AddChild (variable, Roles.Variable);
-				if (f.Declarators != null) {
-					foreach (var decl in f.Declarators) {
-						var declLoc = LocationsBag.GetLocations (decl);
+				newField.AddChild(variable, Roles.Variable);
+				if (c.Declarators != null) {
+					foreach (var decl in c.Declarators) {
+						var declLoc = LocationsBag.GetLocations(decl);
 						if (declLoc != null)
-							newField.AddChild (new CSharpTokenNode (Convert (declLoc [0]), Roles.Comma), Roles.Comma);
+							newField.AddChild(new CSharpTokenNode(Convert(declLoc [0]), Roles.Comma), Roles.Comma);
 						
-						variable = new VariableInitializer ();
-						variable.AddChild (Identifier.Create (decl.Name.Value, Convert (decl.Name.Location)), Roles.Identifier);
+						variable = new VariableInitializer();
+						variable.AddChild(Identifier.Create(decl.Name.Value, Convert(decl.Name.Location)), Roles.Identifier);
 						if (decl.Initializer != null) {
-							variable.AddChild (new CSharpTokenNode (Convert (decl.Initializer.Location), Roles.Assign), Roles.Assign);
-							variable.AddChild ((Expression)decl.Initializer.Accept (this), Roles.Expression);
+							variable.AddChild(new CSharpTokenNode(Convert(decl.Initializer.Location), Roles.Assign), Roles.Assign);
+							variable.AddChild((Expression)decl.Initializer.Accept(this), Roles.Expression);
 						}
-						newField.AddChild (variable, Roles.Variable);
+						newField.AddChild(variable, Roles.Variable);
 					}
 				}
 				if (location != null)
-					newField.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.Semicolon), Roles.Semicolon);
+					newField.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Semicolon), Roles.Semicolon);
 				
-				typeStack.Peek ().AddChild (newField, Roles.TypeMemberRole);
+				typeStack.Peek().AddChild(newField, Roles.TypeMemberRole);
 
 				
 			}
-			
-			public override void Visit (Operator o)
+
+			public override void Visit(Operator o)
 			{
-				OperatorDeclaration newOperator = new OperatorDeclaration ();
+				var newOperator = new OperatorDeclaration();
 				newOperator.OperatorType = (OperatorType)o.OperatorType;
 				
-				var location = LocationsBag.GetMemberLocation (o);
-				AddAttributeSection (newOperator, o);
-				AddModifiers (newOperator, location);
+				var location = LocationsBag.GetMemberLocation(o);
+				AddAttributeSection(newOperator, o);
+				AddModifiers(newOperator, location);
 				
 				
 				if (o.OperatorType == Operator.OpType.Implicit) {
 					if (location != null && location.Count > 0) {
-						newOperator.AddChild (new CSharpTokenNode (Convert (location [0]), OperatorDeclaration.ImplicitRole), OperatorDeclaration.ImplicitRole);
+						newOperator.AddChild(new CSharpTokenNode(Convert(location [0]), OperatorDeclaration.ImplicitRole), OperatorDeclaration.ImplicitRole);
 						if (location.Count > 1)
-							newOperator.AddChild (new CSharpTokenNode (Convert (location [1]), OperatorDeclaration.OperatorKeywordRole), OperatorDeclaration.OperatorKeywordRole);
+							newOperator.AddChild(new CSharpTokenNode(Convert(location [1]), OperatorDeclaration.OperatorKeywordRole), OperatorDeclaration.OperatorKeywordRole);
 					}
-					newOperator.AddChild (ConvertToType (o.TypeExpression), Roles.Type);
+					newOperator.AddChild(ConvertToType(o.TypeExpression), Roles.Type);
 				} else if (o.OperatorType == Operator.OpType.Explicit) {
 					if (location != null && location.Count > 0) {
-						newOperator.AddChild (new CSharpTokenNode (Convert (location [0]), OperatorDeclaration.ExplicitRole), OperatorDeclaration.ExplicitRole);
+						newOperator.AddChild(new CSharpTokenNode(Convert(location [0]), OperatorDeclaration.ExplicitRole), OperatorDeclaration.ExplicitRole);
 						if (location.Count > 1)
-							newOperator.AddChild (new CSharpTokenNode (Convert (location [1]), OperatorDeclaration.OperatorKeywordRole), OperatorDeclaration.OperatorKeywordRole);
+							newOperator.AddChild(new CSharpTokenNode(Convert(location [1]), OperatorDeclaration.OperatorKeywordRole), OperatorDeclaration.OperatorKeywordRole);
 					}
-					newOperator.AddChild (ConvertToType (o.TypeExpression), Roles.Type);
+					newOperator.AddChild(ConvertToType(o.TypeExpression), Roles.Type);
 				} else {
-					newOperator.AddChild (ConvertToType (o.TypeExpression), Roles.Type);
+					newOperator.AddChild(ConvertToType(o.TypeExpression), Roles.Type);
 
 					if (location != null && location.Count > 0)
-						newOperator.AddChild (new CSharpTokenNode (Convert (location [0]), OperatorDeclaration.OperatorKeywordRole), OperatorDeclaration.OperatorKeywordRole);
+						newOperator.AddChild(new CSharpTokenNode(Convert(location [0]), OperatorDeclaration.OperatorKeywordRole), OperatorDeclaration.OperatorKeywordRole);
 					
 					if (location != null && location.Count > 1) {
 						var r = OperatorDeclaration.GetRole(newOperator.OperatorType);
@@ -933,28 +919,28 @@ namespace ICSharpCode.NRefactory.CSharp
 					}
 				}
 				if (location != null && location.Count > 2)
-					newOperator.AddChild (new CSharpTokenNode (Convert (location [2]), Roles.LPar), Roles.LPar);
-				AddParameter (newOperator, o.ParameterInfo);
+					newOperator.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.LPar), Roles.LPar);
+				AddParameter(newOperator, o.ParameterInfo);
 				if (location != null && location.Count > 3)
-					newOperator.AddChild (new CSharpTokenNode (Convert (location [3]), Roles.RPar), Roles.RPar);
+					newOperator.AddChild(new CSharpTokenNode(Convert(location [3]), Roles.RPar), Roles.RPar);
 				
 				if (o.Block != null) {
-					newOperator.AddChild ((BlockStatement)o.Block.Accept (this), Roles.Body);
+					newOperator.AddChild((BlockStatement)o.Block.Accept(this), Roles.Body);
 				} else {
 					if (location != null && location.Count >= 5)
-						newOperator.AddChild (new CSharpTokenNode (Convert (location [4]), Roles.Semicolon), Roles.Semicolon);
+						newOperator.AddChild(new CSharpTokenNode(Convert(location [4]), Roles.Semicolon), Roles.Semicolon);
 				}
-				typeStack.Peek ().AddChild (newOperator, Roles.TypeMemberRole);
+				typeStack.Peek().AddChild(newOperator, Roles.TypeMemberRole);
 			}
-			
-			public void AddAttributeSection (AstNode parent, Attributable a)
+
+			public void AddAttributeSection(AstNode parent, Attributable a)
 			{
 				if (a == null || a.OptAttributes == null)
 					return;
-				AddAttributeSection (parent, a.OptAttributes);
+				AddAttributeSection(parent, a.OptAttributes);
 			}
-			
-			public void AddAttributeSection (AstNode parent, Attributes attrs, Role<AttributeSection> role)
+
+			public void AddAttributeSection(AstNode parent, Attributes attrs, Role<AttributeSection> role)
 			{
 				if (attrs == null)
 					return;
@@ -962,137 +948,137 @@ namespace ICSharpCode.NRefactory.CSharp
 					var section = ConvertAttributeSection(attr);
 					if (section == null)
 						continue;
-					parent.AddChild (section, role);
+					parent.AddChild(section, role);
 				}
 			}
 
-			public void AddAttributeSection (AstNode parent, Attributes attrs)
+			public void AddAttributeSection(AstNode parent, Attributes attrs)
 			{
-				AddAttributeSection (parent, attrs, EntityDeclaration.AttributeRole);
+				AddAttributeSection(parent, attrs, EntityDeclaration.AttributeRole);
 			}
-			
-			public override void Visit (Indexer indexer)
+
+			public override void Visit(Indexer i)
 			{
-				IndexerDeclaration newIndexer = new IndexerDeclaration ();
-				AddAttributeSection (newIndexer, indexer);
-				var location = LocationsBag.GetMemberLocation (indexer);
-				AddModifiers (newIndexer, location);
-				newIndexer.AddChild (ConvertToType (indexer.TypeExpression), Roles.Type);
-				AddExplicitInterface (newIndexer, indexer.MemberName);
-				var name = indexer.MemberName;
-				newIndexer.AddChild (new CSharpTokenNode(Convert (name.Location), IndexerDeclaration.ThisKeywordRole), IndexerDeclaration.ThisKeywordRole);
+				var newIndexer = new IndexerDeclaration();
+				AddAttributeSection(newIndexer, i);
+				var location = LocationsBag.GetMemberLocation(i);
+				AddModifiers(newIndexer, location);
+				newIndexer.AddChild(ConvertToType(i.TypeExpression), Roles.Type);
+				AddExplicitInterface(newIndexer, i.MemberName);
+				var name = i.MemberName;
+				newIndexer.AddChild(new CSharpTokenNode(Convert(name.Location), IndexerDeclaration.ThisKeywordRole), IndexerDeclaration.ThisKeywordRole);
 				
 				if (location != null && location.Count > 0)
-					newIndexer.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LBracket), Roles.LBracket);
-				AddParameter (newIndexer, indexer.ParameterInfo);
+					newIndexer.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LBracket), Roles.LBracket);
+				AddParameter(newIndexer, i.ParameterInfo);
 				if (location != null && location.Count > 1)
-					newIndexer.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RBracket), Roles.RBracket);
+					newIndexer.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RBracket), Roles.RBracket);
 				
 				if (location != null && location.Count > 2)
-					newIndexer.AddChild (new CSharpTokenNode (Convert (location [2]), Roles.LBrace), Roles.LBrace);
-				if (indexer.Get != null) {
-					Accessor getAccessor = new Accessor ();
-					var getLocation = LocationsBag.GetMemberLocation (indexer.Get);
-					AddAttributeSection (getAccessor, indexer.Get);
-					AddModifiers (getAccessor, getLocation);
+					newIndexer.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.LBrace), Roles.LBrace);
+				if (i.Get != null) {
+					var getAccessor = new Accessor();
+					var getLocation = LocationsBag.GetMemberLocation(i.Get);
+					AddAttributeSection(getAccessor, i.Get);
+					AddModifiers(getAccessor, getLocation);
 					if (getLocation != null)
-						getAccessor.AddChild (new CSharpTokenNode (Convert (indexer.Get.Location), PropertyDeclaration.GetKeywordRole), PropertyDeclaration.GetKeywordRole);
-					if (indexer.Get.Block != null) {
-						getAccessor.AddChild ((BlockStatement)indexer.Get.Block.Accept (this), Roles.Body);
+						getAccessor.AddChild(new CSharpTokenNode(Convert(i.Get.Location), PropertyDeclaration.GetKeywordRole), PropertyDeclaration.GetKeywordRole);
+					if (i.Get.Block != null) {
+						getAccessor.AddChild((BlockStatement)i.Get.Block.Accept(this), Roles.Body);
 					} else {
 						if (getLocation != null && getLocation.Count > 0)
-							newIndexer.AddChild (new CSharpTokenNode (Convert (getLocation [0]), Roles.Semicolon), Roles.Semicolon);
+							newIndexer.AddChild(new CSharpTokenNode(Convert(getLocation [0]), Roles.Semicolon), Roles.Semicolon);
 					}
-					newIndexer.AddChild (getAccessor, PropertyDeclaration.GetterRole);
+					newIndexer.AddChild(getAccessor, PropertyDeclaration.GetterRole);
 				}
 				
-				if (indexer.Set != null) {
-					Accessor setAccessor = new Accessor ();
-					var setLocation = LocationsBag.GetMemberLocation (indexer.Set);
-					AddAttributeSection (setAccessor, indexer.Set);
-					AddModifiers (setAccessor, setLocation);
+				if (i.Set != null) {
+					var setAccessor = new Accessor();
+					var setLocation = LocationsBag.GetMemberLocation(i.Set);
+					AddAttributeSection(setAccessor, i.Set);
+					AddModifiers(setAccessor, setLocation);
 					if (setLocation != null)
-						setAccessor.AddChild (new CSharpTokenNode (Convert (indexer.Set.Location), PropertyDeclaration.SetKeywordRole), PropertyDeclaration.SetKeywordRole);
+						setAccessor.AddChild(new CSharpTokenNode(Convert(i.Set.Location), PropertyDeclaration.SetKeywordRole), PropertyDeclaration.SetKeywordRole);
 					
-					if (indexer.Set.Block != null) {
-						setAccessor.AddChild ((BlockStatement)indexer.Set.Block.Accept (this), Roles.Body);
+					if (i.Set.Block != null) {
+						setAccessor.AddChild((BlockStatement)i.Set.Block.Accept(this), Roles.Body);
 					} else {
 						if (setLocation != null && setLocation.Count > 0)
-							newIndexer.AddChild (new CSharpTokenNode (Convert (setLocation [0]), Roles.Semicolon), Roles.Semicolon);
+							newIndexer.AddChild(new CSharpTokenNode(Convert(setLocation [0]), Roles.Semicolon), Roles.Semicolon);
 					}
-					newIndexer.AddChild (setAccessor, PropertyDeclaration.SetterRole);
+					newIndexer.AddChild(setAccessor, PropertyDeclaration.SetterRole);
 				}
 				
 				if (location != null) {
 					if (location.Count > 3)
-						newIndexer.AddChild (new CSharpTokenNode (Convert (location [3]), Roles.RBrace), Roles.RBrace);
+						newIndexer.AddChild(new CSharpTokenNode(Convert(location [3]), Roles.RBrace), Roles.RBrace);
 				} else {
 					// parser error, set end node to max value.
-					newIndexer.AddChild (new ErrorNode (), Roles.Error);
+					newIndexer.AddChild(new ErrorNode(), Roles.Error);
 				}
-				typeStack.Peek ().AddChild (newIndexer, Roles.TypeMemberRole);
+				typeStack.Peek().AddChild(newIndexer, Roles.TypeMemberRole);
 			}
-			
-			public override void Visit (Method m)
+
+			public override void Visit(Method m)
 			{
-				MethodDeclaration newMethod = new MethodDeclaration ();
-				AddAttributeSection (newMethod, m);
-				var location = LocationsBag.GetMemberLocation (m);
-				AddModifiers (newMethod, location);
-				newMethod.AddChild (ConvertToType (m.TypeExpression), Roles.Type);
-				AddExplicitInterface (newMethod, m.MethodName);
-				newMethod.AddChild (Identifier.Create (m.MethodName.Name, Convert (m.Location)), Roles.Identifier);
+				var newMethod = new MethodDeclaration();
+				AddAttributeSection(newMethod, m);
+				var location = LocationsBag.GetMemberLocation(m);
+				AddModifiers(newMethod, location);
+				newMethod.AddChild(ConvertToType(m.TypeExpression), Roles.Type);
+				AddExplicitInterface(newMethod, m.MethodName);
+				newMethod.AddChild(Identifier.Create(m.MethodName.Name, Convert(m.Location)), Roles.Identifier);
 				
-				AddTypeParameters (newMethod, m.MemberName);
+				AddTypeParameters(newMethod, m.MemberName);
 				
 				if (location != null && location.Count > 0)
-					newMethod.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
-				AddParameter (newMethod, m.ParameterInfo);
+					newMethod.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				AddParameter(newMethod, m.ParameterInfo);
 				
 				if (location != null && location.Count > 1)
-					newMethod.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					newMethod.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				
-				AddConstraints (newMethod, m.CurrentTypeParameters);
+				AddConstraints(newMethod, m.CurrentTypeParameters);
 				
 				if (m.Block != null) {
-					var bodyBlock = (BlockStatement)m.Block.Accept (this);
+					var bodyBlock = (BlockStatement)m.Block.Accept(this);
 //					if (m.Block is ToplevelBlock) {
 //						newMethod.AddChild (bodyBlock.FirstChild.NextSibling, Roles.Body);
 //					} else {
-					newMethod.AddChild (bodyBlock, Roles.Body);
+					newMethod.AddChild(bodyBlock, Roles.Body);
 //					}
 				} else if (location != null) {
 					if (location.Count < 3) {
 						// parser error, set end node to max value.
-						newMethod.AddChild (new ErrorNode (), Roles.Error);
+						newMethod.AddChild(new ErrorNode(), Roles.Error);
 					} else {
-						newMethod.AddChild (new CSharpTokenNode (Convert (location [2]), Roles.Semicolon), Roles.Semicolon);
+						newMethod.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.Semicolon), Roles.Semicolon);
 					}
 				}
-				typeStack.Peek ().AddChild (newMethod, Roles.TypeMemberRole);
+				typeStack.Peek().AddChild(newMethod, Roles.TypeMemberRole);
 			}
-			
-			static Dictionary<Mono.CSharp.Modifiers, ICSharpCode.NRefactory.CSharp.Modifiers> modifierTable = new Dictionary<Mono.CSharp.Modifiers, ICSharpCode.NRefactory.CSharp.Modifiers> ();
-			static string[] keywordTable;
-			
-			static ConversionVisitor ()
-			{
-				modifierTable [Mono.CSharp.Modifiers.NEW] = ICSharpCode.NRefactory.CSharp.Modifiers.New;
-				modifierTable [Mono.CSharp.Modifiers.PUBLIC] = ICSharpCode.NRefactory.CSharp.Modifiers.Public;
-				modifierTable [Mono.CSharp.Modifiers.PROTECTED] = ICSharpCode.NRefactory.CSharp.Modifiers.Protected;
-				modifierTable [Mono.CSharp.Modifiers.PRIVATE] = ICSharpCode.NRefactory.CSharp.Modifiers.Private;
-				modifierTable [Mono.CSharp.Modifiers.INTERNAL] = ICSharpCode.NRefactory.CSharp.Modifiers.Internal;
-				modifierTable [Mono.CSharp.Modifiers.ABSTRACT] = ICSharpCode.NRefactory.CSharp.Modifiers.Abstract;
-				modifierTable [Mono.CSharp.Modifiers.VIRTUAL] = ICSharpCode.NRefactory.CSharp.Modifiers.Virtual;
-				modifierTable [Mono.CSharp.Modifiers.SEALED] = ICSharpCode.NRefactory.CSharp.Modifiers.Sealed;
-				modifierTable [Mono.CSharp.Modifiers.STATIC] = ICSharpCode.NRefactory.CSharp.Modifiers.Static;
-				modifierTable [Mono.CSharp.Modifiers.OVERRIDE] = ICSharpCode.NRefactory.CSharp.Modifiers.Override;
-				modifierTable [Mono.CSharp.Modifiers.READONLY] = ICSharpCode.NRefactory.CSharp.Modifiers.Readonly;
-				modifierTable [Mono.CSharp.Modifiers.PARTIAL] = ICSharpCode.NRefactory.CSharp.Modifiers.Partial;
-				modifierTable [Mono.CSharp.Modifiers.EXTERN] = ICSharpCode.NRefactory.CSharp.Modifiers.Extern;
-				modifierTable [Mono.CSharp.Modifiers.VOLATILE] = ICSharpCode.NRefactory.CSharp.Modifiers.Volatile;
-				modifierTable [Mono.CSharp.Modifiers.UNSAFE] = ICSharpCode.NRefactory.CSharp.Modifiers.Unsafe;
-				modifierTable [Mono.CSharp.Modifiers.ASYNC] = ICSharpCode.NRefactory.CSharp.Modifiers.Async;
+
+			static readonly Dictionary<Mono.CSharp.Modifiers, Modifiers> modifierTable = new Dictionary<Mono.CSharp.Modifiers, Modifiers>();
+			static readonly string[] keywordTable;
+
+			static ConversionVisitor()
+			{
+				modifierTable [Mono.CSharp.Modifiers.NEW] = Modifiers.New;
+				modifierTable [Mono.CSharp.Modifiers.PUBLIC] = Modifiers.Public;
+				modifierTable [Mono.CSharp.Modifiers.PROTECTED] = Modifiers.Protected;
+				modifierTable [Mono.CSharp.Modifiers.PRIVATE] = Modifiers.Private;
+				modifierTable [Mono.CSharp.Modifiers.INTERNAL] = Modifiers.Internal;
+				modifierTable [Mono.CSharp.Modifiers.ABSTRACT] = Modifiers.Abstract;
+				modifierTable [Mono.CSharp.Modifiers.VIRTUAL] = Modifiers.Virtual;
+				modifierTable [Mono.CSharp.Modifiers.SEALED] = Modifiers.Sealed;
+				modifierTable [Mono.CSharp.Modifiers.STATIC] = Modifiers.Static;
+				modifierTable [Mono.CSharp.Modifiers.OVERRIDE] = Modifiers.Override;
+				modifierTable [Mono.CSharp.Modifiers.READONLY] = Modifiers.Readonly;
+				modifierTable [Mono.CSharp.Modifiers.PARTIAL] = Modifiers.Partial;
+				modifierTable [Mono.CSharp.Modifiers.EXTERN] = Modifiers.Extern;
+				modifierTable [Mono.CSharp.Modifiers.VOLATILE] = Modifiers.Volatile;
+				modifierTable [Mono.CSharp.Modifiers.UNSAFE] = Modifiers.Unsafe;
+				modifierTable [Mono.CSharp.Modifiers.ASYNC] = Modifiers.Async;
 				
 				keywordTable = new string[255];
 				for (int i = 0; i< keywordTable.Length; i++)
@@ -1115,673 +1101,674 @@ namespace ICSharpCode.NRefactory.CSharp
 				keywordTable [(int)BuiltinTypeSpec.Type.Char] = "char";
 				keywordTable [(int)BuiltinTypeSpec.Type.Bool] = "bool";
 			}
-			
-			void AddModifiers (EntityDeclaration parent, LocationsBag.MemberLocations location)
+
+			static void AddModifiers(EntityDeclaration parent, LocationsBag.MemberLocations location)
 			{
 				if (location == null || location.Modifiers == null)
 					return;
 				foreach (var modifier in location.Modifiers) {
-					ICSharpCode.NRefactory.CSharp.Modifiers mod;
-					if (!modifierTable.TryGetValue (modifier.Item1, out mod)) {
-						Console.WriteLine ("modifier " + modifier.Item1 + " can't be converted,");
+					Modifiers mod;
+					if (!modifierTable.TryGetValue(modifier.Item1, out mod)) {
+						Console.WriteLine("modifier " + modifier.Item1 + " can't be converted,");
 					}
 					
-					parent.AddChild (new CSharpModifierToken (Convert (modifier.Item2), mod), EntityDeclaration.ModifierRole);
+					parent.AddChild(new CSharpModifierToken(Convert(modifier.Item2), mod), EntityDeclaration.ModifierRole);
 				}
 			}
-			
-			public override void Visit (Property p)
+
+			public override void Visit(Property p)
 			{
-				PropertyDeclaration newProperty = new PropertyDeclaration ();
-				AddAttributeSection (newProperty, p);
-				var location = LocationsBag.GetMemberLocation (p);
-				AddModifiers (newProperty, location);
-				newProperty.AddChild (ConvertToType (p.TypeExpression), Roles.Type);
-				AddExplicitInterface (newProperty, p.MemberName);
-				newProperty.AddChild (Identifier.Create (p.MemberName.Name, Convert (p.Location)), Roles.Identifier);
+				var newProperty = new PropertyDeclaration();
+				AddAttributeSection(newProperty, p);
+				var location = LocationsBag.GetMemberLocation(p);
+				AddModifiers(newProperty, location);
+				newProperty.AddChild(ConvertToType(p.TypeExpression), Roles.Type);
+				AddExplicitInterface(newProperty, p.MemberName);
+				newProperty.AddChild(Identifier.Create(p.MemberName.Name, Convert(p.Location)), Roles.Identifier);
 				
 				if (location != null && location.Count > 0)
-					newProperty.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LBrace), Roles.LBrace);
+					newProperty.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LBrace), Roles.LBrace);
 				
 				Accessor getAccessor = null;
 				if (p.Get != null) {
-					getAccessor = new Accessor ();
-					AddAttributeSection (getAccessor, p.Get);
-					var getLocation = LocationsBag.GetMemberLocation (p.Get);
-					AddModifiers (getAccessor, getLocation);
-					getAccessor.AddChild (new CSharpTokenNode (Convert (p.Get.Location), PropertyDeclaration.GetKeywordRole), PropertyDeclaration.GetKeywordRole);
+					getAccessor = new Accessor();
+					AddAttributeSection(getAccessor, p.Get);
+					var getLocation = LocationsBag.GetMemberLocation(p.Get);
+					AddModifiers(getAccessor, getLocation);
+					getAccessor.AddChild(new CSharpTokenNode(Convert(p.Get.Location), PropertyDeclaration.GetKeywordRole), PropertyDeclaration.GetKeywordRole);
 					
 					if (p.Get.Block != null) {
-						getAccessor.AddChild ((BlockStatement)p.Get.Block.Accept (this), Roles.Body);
+						getAccessor.AddChild((BlockStatement)p.Get.Block.Accept(this), Roles.Body);
 					} else {
 						if (getLocation != null && getLocation.Count > 0)
-							getAccessor.AddChild (new CSharpTokenNode (Convert (getLocation [0]), Roles.Semicolon), Roles.Semicolon);
+							getAccessor.AddChild(new CSharpTokenNode(Convert(getLocation [0]), Roles.Semicolon), Roles.Semicolon);
 					}
 				}
 				
 				Accessor setAccessor = null;
 				if (p.Set != null) {
-					setAccessor = new Accessor ();
-					AddAttributeSection (setAccessor, p.Set);
-					var setLocation = LocationsBag.GetMemberLocation (p.Set);
-					AddModifiers (setAccessor, setLocation);
-					setAccessor.AddChild (new CSharpTokenNode (Convert (p.Set.Location), PropertyDeclaration.SetKeywordRole), PropertyDeclaration.SetKeywordRole);
+					setAccessor = new Accessor();
+					AddAttributeSection(setAccessor, p.Set);
+					var setLocation = LocationsBag.GetMemberLocation(p.Set);
+					AddModifiers(setAccessor, setLocation);
+					setAccessor.AddChild(new CSharpTokenNode(Convert(p.Set.Location), PropertyDeclaration.SetKeywordRole), PropertyDeclaration.SetKeywordRole);
 					
 					if (p.Set.Block != null) {
-						setAccessor.AddChild ((BlockStatement)p.Set.Block.Accept (this), Roles.Body);
+						setAccessor.AddChild((BlockStatement)p.Set.Block.Accept(this), Roles.Body);
 					} else {
 						if (setLocation != null && setLocation.Count > 0)
-							setAccessor.AddChild (new CSharpTokenNode (Convert (setLocation [0]), Roles.Semicolon), Roles.Semicolon);
+							setAccessor.AddChild(new CSharpTokenNode(Convert(setLocation [0]), Roles.Semicolon), Roles.Semicolon);
 					}
 				}
 				if (getAccessor != null && setAccessor != null) {
 					if (getAccessor.StartLocation < setAccessor.StartLocation) {
-						newProperty.AddChild (getAccessor, PropertyDeclaration.GetterRole);
-						newProperty.AddChild (setAccessor, PropertyDeclaration.SetterRole);
+						newProperty.AddChild(getAccessor, PropertyDeclaration.GetterRole);
+						newProperty.AddChild(setAccessor, PropertyDeclaration.SetterRole);
 					} else {
-						newProperty.AddChild (setAccessor, PropertyDeclaration.SetterRole);
-						newProperty.AddChild (getAccessor, PropertyDeclaration.GetterRole);
+						newProperty.AddChild(setAccessor, PropertyDeclaration.SetterRole);
+						newProperty.AddChild(getAccessor, PropertyDeclaration.GetterRole);
 					}
 				} else {
 					if (getAccessor != null)
-						newProperty.AddChild (getAccessor, PropertyDeclaration.GetterRole);
+						newProperty.AddChild(getAccessor, PropertyDeclaration.GetterRole);
 					if (setAccessor != null)
-						newProperty.AddChild (setAccessor, PropertyDeclaration.SetterRole);
+						newProperty.AddChild(setAccessor, PropertyDeclaration.SetterRole);
 				}
 				
 				if (location != null && location.Count > 1) {
-					newProperty.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RBrace), Roles.RBrace);
+					newProperty.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RBrace), Roles.RBrace);
 				} else {
 					// parser error, set end node to max value.
-					newProperty.AddChild (new ErrorNode (), Roles.Error);
+					newProperty.AddChild(new ErrorNode(), Roles.Error);
 				}
 				
-				typeStack.Peek ().AddChild (newProperty, Roles.TypeMemberRole);
+				typeStack.Peek().AddChild(newProperty, Roles.TypeMemberRole);
 			}
-			
-			public override void Visit (Constructor c)
+
+			public override void Visit(Constructor c)
 			{
-				ConstructorDeclaration newConstructor = new ConstructorDeclaration ();
-				AddAttributeSection (newConstructor, c);
-				var location = LocationsBag.GetMemberLocation (c);
-				AddModifiers (newConstructor, location);
-				newConstructor.AddChild (Identifier.Create (c.MemberName.Name, Convert (c.MemberName.Location)), Roles.Identifier);
+				var newConstructor = new ConstructorDeclaration();
+				AddAttributeSection(newConstructor, c);
+				var location = LocationsBag.GetMemberLocation(c);
+				AddModifiers(newConstructor, location);
+				newConstructor.AddChild(Identifier.Create(c.MemberName.Name, Convert(c.MemberName.Location)), Roles.Identifier);
 				if (location != null && location.Count > 0)
-					newConstructor.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					newConstructor.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				
-				AddParameter (newConstructor, c.ParameterInfo);
+				AddParameter(newConstructor, c.ParameterInfo);
 				if (location != null && location.Count > 1)
-					newConstructor.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					newConstructor.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				
 				if (c.Initializer != null) {
-					var initializer = new ConstructorInitializer ();
+					var initializer = new ConstructorInitializer();
 					initializer.ConstructorInitializerType = c.Initializer is ConstructorBaseInitializer ? ConstructorInitializerType.Base : ConstructorInitializerType.This;
-					var initializerLocation = LocationsBag.GetLocations (c.Initializer);
+					var initializerLocation = LocationsBag.GetLocations(c.Initializer);
 					
 					if (initializerLocation != null)
-						newConstructor.AddChild (new CSharpTokenNode (Convert (initializerLocation [0]), Roles.Colon), Roles.Colon);
+						newConstructor.AddChild(new CSharpTokenNode(Convert(initializerLocation [0]), Roles.Colon), Roles.Colon);
 					
 					if (initializerLocation != null && initializerLocation.Count > 1) {
 						// this and base has the same length
 						var r = initializer.ConstructorInitializerType == ConstructorInitializerType.This ? ConstructorInitializer.ThisKeywordRole : ConstructorInitializer.BaseKeywordRole;
-						initializer.AddChild (new CSharpTokenNode (Convert (c.Initializer.Location), r), r);
-						initializer.AddChild (new CSharpTokenNode (Convert (initializerLocation [1]), Roles.LPar), Roles.LPar);
-						AddArguments (initializer, LocationsBag.GetLocations (c.Initializer.Arguments), c.Initializer.Arguments);
-						initializer.AddChild (new CSharpTokenNode (Convert (initializerLocation [2]), Roles.RPar), Roles.RPar);
-						newConstructor.AddChild (initializer, ConstructorDeclaration.InitializerRole);
+						initializer.AddChild(new CSharpTokenNode(Convert(c.Initializer.Location), r), r);
+						initializer.AddChild(new CSharpTokenNode(Convert(initializerLocation [1]), Roles.LPar), Roles.LPar);
+						AddArguments(initializer, c.Initializer.Arguments);
+						initializer.AddChild(new CSharpTokenNode(Convert(initializerLocation [2]), Roles.RPar), Roles.RPar);
+						newConstructor.AddChild(initializer, ConstructorDeclaration.InitializerRole);
 					}
 				}
 				
 				if (c.Block != null)
-					newConstructor.AddChild ((BlockStatement)c.Block.Accept (this), Roles.Body);
-				typeStack.Peek ().AddChild (newConstructor, Roles.TypeMemberRole);
+					newConstructor.AddChild((BlockStatement)c.Block.Accept(this), Roles.Body);
+				typeStack.Peek().AddChild(newConstructor, Roles.TypeMemberRole);
 			}
-			
-			public override void Visit (Destructor d)
+
+			public override void Visit(Destructor d)
 			{
-				DestructorDeclaration newDestructor = new DestructorDeclaration ();
-				AddAttributeSection (newDestructor, d);
-				var location = LocationsBag.GetMemberLocation (d);
-				AddModifiers (newDestructor, location);
+				var newDestructor = new DestructorDeclaration();
+				AddAttributeSection(newDestructor, d);
+				var location = LocationsBag.GetMemberLocation(d);
+				AddModifiers(newDestructor, location);
 				if (location != null && location.Count > 0)
-					newDestructor.AddChild (new CSharpTokenNode (Convert (location [0]), DestructorDeclaration.TildeRole), DestructorDeclaration.TildeRole);
-				newDestructor.AddChild (Identifier.Create (d.Identifier, Convert (d.MemberName.Location)), Roles.Identifier);
+					newDestructor.AddChild(new CSharpTokenNode(Convert(location [0]), DestructorDeclaration.TildeRole), DestructorDeclaration.TildeRole);
+				newDestructor.AddChild(Identifier.Create(d.Identifier, Convert(d.MemberName.Location)), Roles.Identifier);
 				
 				if (location != null && location.Count > 1) {
-					newDestructor.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.LPar), Roles.LPar);
+					newDestructor.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.LPar), Roles.LPar);
 					
 					if (location.Count > 2)
-						newDestructor.AddChild (new CSharpTokenNode (Convert (location [2]), Roles.RPar), Roles.RPar);
+						newDestructor.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.RPar), Roles.RPar);
 				}
 				
 				if (d.Block != null)
-					newDestructor.AddChild ((BlockStatement)d.Block.Accept (this), Roles.Body);
+					newDestructor.AddChild((BlockStatement)d.Block.Accept(this), Roles.Body);
 				
-				typeStack.Peek ().AddChild (newDestructor, Roles.TypeMemberRole);
+				typeStack.Peek().AddChild(newDestructor, Roles.TypeMemberRole);
 			}
-			
-			public override void Visit (EventField e)
+
+			public override void Visit(EventField e)
 			{
-				EventDeclaration newEvent = new EventDeclaration ();
-				AddAttributeSection (newEvent, e);
-				var location = LocationsBag.GetMemberLocation (e);
+				var newEvent = new EventDeclaration();
+				AddAttributeSection(newEvent, e);
+				var location = LocationsBag.GetMemberLocation(e);
 				int l = 0;
-				AddModifiers (newEvent, location);
+				AddModifiers(newEvent, location);
 				
 				if (location != null && location.Count > 0)
-					newEvent.AddChild (new CSharpTokenNode (Convert (location [l++]), EventDeclaration.EventKeywordRole), EventDeclaration.EventKeywordRole);
-				newEvent.AddChild (ConvertToType (e.TypeExpression), Roles.Type);
+					newEvent.AddChild(new CSharpTokenNode(Convert(location [l++]), EventDeclaration.EventKeywordRole), EventDeclaration.EventKeywordRole);
+				newEvent.AddChild(ConvertToType(e.TypeExpression), Roles.Type);
 				
-				VariableInitializer variable = new VariableInitializer ();
-				variable.AddChild (Identifier.Create (e.MemberName.Name, Convert (e.MemberName.Location)), Roles.Identifier);
+				var variable = new VariableInitializer();
+				variable.AddChild(Identifier.Create(e.MemberName.Name, Convert(e.MemberName.Location)), Roles.Identifier);
 				
 				if (e.Initializer != null) {
 					if (location != null && location.Count > l)
-						variable.AddChild (new CSharpTokenNode (Convert (location [l++]), Roles.Assign), Roles.Assign);
-					variable.AddChild ((Expression)e.Initializer.Accept (this), Roles.Expression);
+						variable.AddChild(new CSharpTokenNode(Convert(location [l++]), Roles.Assign), Roles.Assign);
+					variable.AddChild((Expression)e.Initializer.Accept(this), Roles.Expression);
 				}
-				newEvent.AddChild (variable, Roles.Variable);
+				newEvent.AddChild(variable, Roles.Variable);
 				if (e.Declarators != null) {
 					foreach (var decl in e.Declarators) {
-						var declLoc = LocationsBag.GetLocations (decl);
+						var declLoc = LocationsBag.GetLocations(decl);
 						if (declLoc != null)
-							newEvent.AddChild (new CSharpTokenNode (Convert (declLoc [0]), Roles.Comma), Roles.Comma);
+							newEvent.AddChild(new CSharpTokenNode(Convert(declLoc [0]), Roles.Comma), Roles.Comma);
 						
-						variable = new VariableInitializer ();
-						variable.AddChild (Identifier.Create (decl.Name.Value, Convert (decl.Name.Location)), Roles.Identifier);
+						variable = new VariableInitializer();
+						variable.AddChild(Identifier.Create(decl.Name.Value, Convert(decl.Name.Location)), Roles.Identifier);
 
 						if (decl.Initializer != null) {
 							if (declLoc != null)
-								variable.AddChild (new CSharpTokenNode (Convert (declLoc [1]), Roles.Assign), Roles.Assign);
-							variable.AddChild ((Expression)decl.Initializer.Accept (this), Roles.Expression);
+								variable.AddChild(new CSharpTokenNode(Convert(declLoc [1]), Roles.Assign), Roles.Assign);
+							variable.AddChild((Expression)decl.Initializer.Accept(this), Roles.Expression);
 						}
-						newEvent.AddChild (variable, Roles.Variable);
+						newEvent.AddChild(variable, Roles.Variable);
 					}
 				}
 				
 				if (location != null && location.Count > l)
-					newEvent.AddChild (new CSharpTokenNode (Convert (location [l++]), Roles.Semicolon), Roles.Semicolon);
+					newEvent.AddChild(new CSharpTokenNode(Convert(location [l++]), Roles.Semicolon), Roles.Semicolon);
 				
-				typeStack.Peek ().AddChild (newEvent, Roles.TypeMemberRole);
+				typeStack.Peek().AddChild(newEvent, Roles.TypeMemberRole);
 			}
 
-			void AddExplicitInterface (AstNode parent, MemberName memberName)
+			void AddExplicitInterface(AstNode parent, MemberName memberName)
 			{
 				if (memberName == null || memberName.ExplicitInterface == null)
 					return;
 				
-				parent.AddChild (ConvertToType (memberName.ExplicitInterface), EntityDeclaration.PrivateImplementationTypeRole);
-				var privateImplTypeLoc = LocationsBag.GetLocations (memberName.ExplicitInterface);
+				parent.AddChild(ConvertToType(memberName.ExplicitInterface), EntityDeclaration.PrivateImplementationTypeRole);
+				var privateImplTypeLoc = LocationsBag.GetLocations(memberName.ExplicitInterface);
 				if (privateImplTypeLoc != null)
-					parent.AddChild (new CSharpTokenNode (Convert (privateImplTypeLoc [0]), Roles.Dot), Roles.Dot);
+					parent.AddChild(new CSharpTokenNode(Convert(privateImplTypeLoc [0]), Roles.Dot), Roles.Dot);
 			}
-			
-			public override void Visit (EventProperty ep)
+
+			public override void Visit(EventProperty ep)
 			{
-				CustomEventDeclaration newEvent = new CustomEventDeclaration ();
-				AddAttributeSection (newEvent, ep);
-				var location = LocationsBag.GetMemberLocation (ep);
-				AddModifiers (newEvent, location);
+				var newEvent = new CustomEventDeclaration();
+				AddAttributeSection(newEvent, ep);
+				var location = LocationsBag.GetMemberLocation(ep);
+				AddModifiers(newEvent, location);
 				
 				if (location != null && location.Count > 0)
-					newEvent.AddChild (new CSharpTokenNode (Convert (location [0]), CustomEventDeclaration.EventKeywordRole), CustomEventDeclaration.EventKeywordRole);
-				newEvent.AddChild (ConvertToType (ep.TypeExpression), Roles.Type);
+					newEvent.AddChild(new CSharpTokenNode(Convert(location [0]), CustomEventDeclaration.EventKeywordRole), CustomEventDeclaration.EventKeywordRole);
+				newEvent.AddChild(ConvertToType(ep.TypeExpression), Roles.Type);
 				
-				AddExplicitInterface (newEvent, ep.MemberName);
+				AddExplicitInterface(newEvent, ep.MemberName);
 				
-				newEvent.AddChild (Identifier.Create (ep.MemberName.Name, Convert (ep.Location)), Roles.Identifier);
+				newEvent.AddChild(Identifier.Create(ep.MemberName.Name, Convert(ep.Location)), Roles.Identifier);
 
 				if (location != null && location.Count >= 2)
-					newEvent.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.LBrace), Roles.LBrace);
+					newEvent.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.LBrace), Roles.LBrace);
 				
 				if (ep.Add != null) {
-					Accessor addAccessor = new Accessor ();
-					AddAttributeSection (addAccessor, ep.Add);
-					var addLocation = LocationsBag.GetMemberLocation (ep.Add);
-					AddModifiers (addAccessor, addLocation);
-					addAccessor.AddChild (new CSharpTokenNode (Convert (ep.Add.Location), CustomEventDeclaration.AddKeywordRole), CustomEventDeclaration.AddKeywordRole);
+					var addAccessor = new Accessor();
+					AddAttributeSection(addAccessor, ep.Add);
+					var addLocation = LocationsBag.GetMemberLocation(ep.Add);
+					AddModifiers(addAccessor, addLocation);
+					addAccessor.AddChild(new CSharpTokenNode(Convert(ep.Add.Location), CustomEventDeclaration.AddKeywordRole), CustomEventDeclaration.AddKeywordRole);
 					if (ep.Add.Block != null)
-						addAccessor.AddChild ((BlockStatement)ep.Add.Block.Accept (this), Roles.Body);
-					newEvent.AddChild (addAccessor, CustomEventDeclaration.AddAccessorRole);
+						addAccessor.AddChild((BlockStatement)ep.Add.Block.Accept(this), Roles.Body);
+					newEvent.AddChild(addAccessor, CustomEventDeclaration.AddAccessorRole);
 				}
 				
 				if (ep.Remove != null) {
-					Accessor removeAccessor = new Accessor ();
-					AddAttributeSection (removeAccessor, ep.Remove);
-					var removeLocation = LocationsBag.GetMemberLocation (ep.Remove);
-					AddModifiers (removeAccessor, removeLocation);
-					removeAccessor.AddChild (new CSharpTokenNode (Convert (ep.Remove.Location), CustomEventDeclaration.RemoveKeywordRole), CustomEventDeclaration.RemoveKeywordRole);
+					var removeAccessor = new Accessor();
+					AddAttributeSection(removeAccessor, ep.Remove);
+					var removeLocation = LocationsBag.GetMemberLocation(ep.Remove);
+					AddModifiers(removeAccessor, removeLocation);
+					removeAccessor.AddChild(new CSharpTokenNode(Convert(ep.Remove.Location), CustomEventDeclaration.RemoveKeywordRole), CustomEventDeclaration.RemoveKeywordRole);
 					
 					if (ep.Remove.Block != null)
-						removeAccessor.AddChild ((BlockStatement)ep.Remove.Block.Accept (this), Roles.Body);
-					newEvent.AddChild (removeAccessor, CustomEventDeclaration.RemoveAccessorRole);
+						removeAccessor.AddChild((BlockStatement)ep.Remove.Block.Accept(this), Roles.Body);
+					newEvent.AddChild(removeAccessor, CustomEventDeclaration.RemoveAccessorRole);
 				}
 				if (location != null && location.Count >= 3) {
-					newEvent.AddChild (new CSharpTokenNode (Convert (location [2]), Roles.RBrace), Roles.RBrace);
+					newEvent.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.RBrace), Roles.RBrace);
 				} else {
 					// parser error, set end node to max value.
-					newEvent.AddChild (new ErrorNode (), Roles.Error);
+					newEvent.AddChild(new ErrorNode(), Roles.Error);
 				}
 				
-				typeStack.Peek ().AddChild (newEvent, Roles.TypeMemberRole);
+				typeStack.Peek().AddChild(newEvent, Roles.TypeMemberRole);
 			}
-			
+
 			#endregion
-			
+
 			#region Statements
-			public override object Visit (Mono.CSharp.Statement stmt)
+
+			public override object Visit(Mono.CSharp.Statement stmt)
 			{
-				Console.WriteLine ("unknown statement:" + stmt);
+				Console.WriteLine("unknown statement:" + stmt);
 				return null;
 			}
-			
-			public override object Visit (BlockVariable blockVariableDeclaration)
+
+			public override object Visit(BlockVariable blockVariableDeclaration)
 			{
-				var result = new VariableDeclarationStatement ();
-				result.AddChild (ConvertToType (blockVariableDeclaration.TypeExpression), Roles.Type);
+				var result = new VariableDeclarationStatement();
+				result.AddChild(ConvertToType(blockVariableDeclaration.TypeExpression), Roles.Type);
 				
-				var varInit = new VariableInitializer ();
-				var location = LocationsBag.GetLocations (blockVariableDeclaration);
-				varInit.AddChild (Identifier.Create (blockVariableDeclaration.Variable.Name, Convert (blockVariableDeclaration.Variable.Location)), Roles.Identifier);
+				var varInit = new VariableInitializer();
+				var location = LocationsBag.GetLocations(blockVariableDeclaration);
+				varInit.AddChild(Identifier.Create(blockVariableDeclaration.Variable.Name, Convert(blockVariableDeclaration.Variable.Location)), Roles.Identifier);
 				if (blockVariableDeclaration.Initializer != null) {
 					if (location != null && location.Count > 0)
-						varInit.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.Assign), Roles.Assign);
-					varInit.AddChild ((Expression)blockVariableDeclaration.Initializer.Accept (this), Roles.Expression);
+						varInit.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Assign), Roles.Assign);
+					varInit.AddChild((Expression)blockVariableDeclaration.Initializer.Accept(this), Roles.Expression);
 				}
 				
-				result.AddChild (varInit, Roles.Variable);
+				result.AddChild(varInit, Roles.Variable);
 				
 				if (blockVariableDeclaration.Declarators != null) {
 					foreach (var decl in blockVariableDeclaration.Declarators) {
-						var loc = LocationsBag.GetLocations (decl);
-						var init = new VariableInitializer ();
+						var loc = LocationsBag.GetLocations(decl);
+						var init = new VariableInitializer();
 						if (loc != null && loc.Count > 0)
-							result.AddChild (new CSharpTokenNode (Convert (loc [0]), Roles.Comma), Roles.Comma);
-						init.AddChild (Identifier.Create (decl.Variable.Name, Convert (decl.Variable.Location)), Roles.Identifier);
+							result.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Comma), Roles.Comma);
+						init.AddChild(Identifier.Create(decl.Variable.Name, Convert(decl.Variable.Location)), Roles.Identifier);
 						if (decl.Initializer != null) {
 							if (loc != null && loc.Count > 1)
-								init.AddChild (new CSharpTokenNode (Convert (loc [1]), Roles.Assign), Roles.Assign);
-							init.AddChild ((Expression)decl.Initializer.Accept (this), Roles.Expression);
-						} else {
+								init.AddChild(new CSharpTokenNode(Convert(loc [1]), Roles.Assign), Roles.Assign);
+							init.AddChild((Expression)decl.Initializer.Accept(this), Roles.Expression);
 						}
-						result.AddChild (init, Roles.Variable);
+						result.AddChild(init, Roles.Variable);
 					}
 				}
 				if (location != null && (blockVariableDeclaration.Initializer == null || location.Count > 1))
-					result.AddChild (new CSharpTokenNode (Convert (location [location.Count - 1]), Roles.Semicolon), Roles.Semicolon);
+					result.AddChild(new CSharpTokenNode(Convert(location [location.Count - 1]), Roles.Semicolon), Roles.Semicolon);
 				return result;
 			}
-			
-			public override object Visit (BlockConstant blockVariableDeclaration)
+
+			public override object Visit(BlockConstant blockConstantDeclaration)
 			{
-				var result = new VariableDeclarationStatement ();
+				var result = new VariableDeclarationStatement();
 				
-				var location = LocationsBag.GetLocations (blockVariableDeclaration);
+				var location = LocationsBag.GetLocations(blockConstantDeclaration);
 				if (location != null && location.Count > 0)
-					result.AddChild (new CSharpModifierToken (Convert (location [0]), ICSharpCode.NRefactory.CSharp.Modifiers.Const), VariableDeclarationStatement.ModifierRole);
+					result.AddChild(new CSharpModifierToken(Convert(location [0]), Modifiers.Const), VariableDeclarationStatement.ModifierRole);
 				
-				result.AddChild (ConvertToType (blockVariableDeclaration.TypeExpression), Roles.Type);
+				result.AddChild(ConvertToType(blockConstantDeclaration.TypeExpression), Roles.Type);
 				
-				var varInit = new VariableInitializer ();
-				varInit.AddChild (Identifier.Create (blockVariableDeclaration.Variable.Name, Convert (blockVariableDeclaration.Variable.Location)), Roles.Identifier);
-				if (blockVariableDeclaration.Initializer != null) {
+				var varInit = new VariableInitializer();
+				varInit.AddChild(Identifier.Create(blockConstantDeclaration.Variable.Name, Convert(blockConstantDeclaration.Variable.Location)), Roles.Identifier);
+				if (blockConstantDeclaration.Initializer != null) {
 					if (location != null && location.Count > 1)
-						varInit.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.Assign), Roles.Assign);
-					varInit.AddChild ((Expression)blockVariableDeclaration.Initializer.Accept (this), Roles.Expression);
+						varInit.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Assign), Roles.Assign);
+					varInit.AddChild((Expression)blockConstantDeclaration.Initializer.Accept(this), Roles.Expression);
 				}
 				
-				result.AddChild (varInit, Roles.Variable);
+				result.AddChild(varInit, Roles.Variable);
 				
-				if (blockVariableDeclaration.Declarators != null) {
-					foreach (var decl in blockVariableDeclaration.Declarators) {
-						var loc = LocationsBag.GetLocations (decl);
-						var init = new VariableInitializer ();
-						init.AddChild (Identifier.Create (decl.Variable.Name, Convert (decl.Variable.Location)), Roles.Identifier);
+				if (blockConstantDeclaration.Declarators != null) {
+					foreach (var decl in blockConstantDeclaration.Declarators) {
+						var loc = LocationsBag.GetLocations(decl);
+						var init = new VariableInitializer();
+						init.AddChild(Identifier.Create(decl.Variable.Name, Convert(decl.Variable.Location)), Roles.Identifier);
 						if (decl.Initializer != null) {
 							if (loc != null)
-								init.AddChild (new CSharpTokenNode (Convert (loc [0]), Roles.Assign), Roles.Assign);
-							init.AddChild ((Expression)decl.Initializer.Accept (this), Roles.Expression);
+								init.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Assign), Roles.Assign);
+							init.AddChild((Expression)decl.Initializer.Accept(this), Roles.Expression);
 							if (loc != null && loc.Count > 1)
-								result.AddChild (new CSharpTokenNode (Convert (loc [1]), Roles.Comma), Roles.Comma);
+								result.AddChild(new CSharpTokenNode(Convert(loc [1]), Roles.Comma), Roles.Comma);
 						} else {
 							if (loc != null && loc.Count > 0)
-								result.AddChild (new CSharpTokenNode (Convert (loc [0]), Roles.Comma), Roles.Comma);
+								result.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Comma), Roles.Comma);
 						}
-						result.AddChild (init, Roles.Variable);
+						result.AddChild(init, Roles.Variable);
 					}
 				}
 				if (location != null) {
-					result.AddChild (new CSharpTokenNode (Convert (location [location.Count - 1]), Roles.Semicolon), Roles.Semicolon);
+					result.AddChild(new CSharpTokenNode(Convert(location [location.Count - 1]), Roles.Semicolon), Roles.Semicolon);
 				} else {
 					// parser error, set end node to max value.
-					result.AddChild (new ErrorNode (), Roles.Error);
+					result.AddChild(new ErrorNode(), Roles.Error);
 				}
 				return result;
 			}
-			
-			public override object Visit (Mono.CSharp.EmptyStatement emptyStatement)
+
+			public override object Visit(Mono.CSharp.EmptyStatement emptyStatement)
 			{
-				var result = new EmptyStatement ();
-				result.Location = Convert (emptyStatement.loc);
+				var result = new EmptyStatement();
+				result.Location = Convert(emptyStatement.loc);
 				return result;
 			}
-			
-			public override object Visit (Mono.CSharp.ErrorExpression emptyExpression)
+
+			public override object Visit(Mono.CSharp.ErrorExpression errorExpression)
 			{
-				return new ICSharpCode.NRefactory.CSharp.ErrorExpression (Convert (emptyExpression.Location));
+				return new ErrorExpression(Convert(errorExpression.Location));
 			}
-			
-			public override object Visit (EmptyExpressionStatement emptyExpressionStatement)
+
+			public override object Visit(EmptyExpressionStatement emptyExpressionStatement)
 			{
 				// Should never happen.
 				throw new NotSupportedException();
 			}
-			
-			public override object Visit (If ifStatement)
+
+			public override object Visit(If ifStatement)
 			{
-				var result = new IfElseStatement ();
+				var result = new IfElseStatement();
 				
-				var location = LocationsBag.GetLocations (ifStatement);
+				var location = LocationsBag.GetLocations(ifStatement);
 				
-				result.AddChild (new CSharpTokenNode (Convert (ifStatement.loc), IfElseStatement.IfKeywordRole), IfElseStatement.IfKeywordRole);
+				result.AddChild(new CSharpTokenNode(Convert(ifStatement.loc), IfElseStatement.IfKeywordRole), IfElseStatement.IfKeywordRole);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				if (ifStatement.Expr != null)
-					result.AddChild ((Expression)ifStatement.Expr.Accept (this), Roles.Condition);
+					result.AddChild((Expression)ifStatement.Expr.Accept(this), Roles.Condition);
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				
 				if (ifStatement.TrueStatement != null)
-					result.AddChild ((Statement)ifStatement.TrueStatement.Accept (this), IfElseStatement.TrueRole);
+					result.AddChild((Statement)ifStatement.TrueStatement.Accept(this), IfElseStatement.TrueRole);
 				
 				if (ifStatement.FalseStatement != null) {
 					if (location != null && location.Count > 2)
-						result.AddChild (new CSharpTokenNode (Convert (location [2]), IfElseStatement.ElseKeywordRole), IfElseStatement.ElseKeywordRole);
-					result.AddChild ((Statement)ifStatement.FalseStatement.Accept (this), IfElseStatement.FalseRole);
+						result.AddChild(new CSharpTokenNode(Convert(location [2]), IfElseStatement.ElseKeywordRole), IfElseStatement.ElseKeywordRole);
+					result.AddChild((Statement)ifStatement.FalseStatement.Accept(this), IfElseStatement.FalseRole);
 				}
 				
 				return result;
 			}
-			
-			public override object Visit (Do doStatement)
+
+			public override object Visit(Do doStatement)
 			{
-				var result = new DoWhileStatement ();
-				var location = LocationsBag.GetLocations (doStatement);
-				result.AddChild (new CSharpTokenNode (Convert (doStatement.loc), DoWhileStatement.DoKeywordRole), DoWhileStatement.DoKeywordRole);
+				var result = new DoWhileStatement();
+				var location = LocationsBag.GetLocations(doStatement);
+				result.AddChild(new CSharpTokenNode(Convert(doStatement.loc), DoWhileStatement.DoKeywordRole), DoWhileStatement.DoKeywordRole);
 				if (doStatement.EmbeddedStatement != null)
-					result.AddChild ((Statement)doStatement.EmbeddedStatement.Accept (this), Roles.EmbeddedStatement);
+					result.AddChild((Statement)doStatement.EmbeddedStatement.Accept(this), Roles.EmbeddedStatement);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), DoWhileStatement.WhileKeywordRole), DoWhileStatement.WhileKeywordRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), DoWhileStatement.WhileKeywordRole), DoWhileStatement.WhileKeywordRole);
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.LPar), Roles.LPar);
 				if (doStatement.expr != null)
-					result.AddChild ((Expression)doStatement.expr.Accept (this), Roles.Condition);
+					result.AddChild((Expression)doStatement.expr.Accept(this), Roles.Condition);
 				if (location != null && location.Count > 2) {
-					result.AddChild (new CSharpTokenNode (Convert (location [2]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.RPar), Roles.RPar);
 					if (location.Count > 3)
-						result.AddChild (new CSharpTokenNode (Convert (location [3]), Roles.Semicolon), Roles.Semicolon);
+						result.AddChild(new CSharpTokenNode(Convert(location [3]), Roles.Semicolon), Roles.Semicolon);
 				}
 				
 				return result;
 			}
-			
-			public override object Visit (While whileStatement)
+
+			public override object Visit(While whileStatement)
 			{
-				var result = new WhileStatement ();
-				var location = LocationsBag.GetLocations (whileStatement);
-				result.AddChild (new CSharpTokenNode (Convert (whileStatement.loc), WhileStatement.WhileKeywordRole), WhileStatement.WhileKeywordRole);
+				var result = new WhileStatement();
+				var location = LocationsBag.GetLocations(whileStatement);
+				result.AddChild(new CSharpTokenNode(Convert(whileStatement.loc), WhileStatement.WhileKeywordRole), WhileStatement.WhileKeywordRole);
 				
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				if (whileStatement.expr != null)
-					result.AddChild ((Expression)whileStatement.expr.Accept (this), Roles.Condition);
+					result.AddChild((Expression)whileStatement.expr.Accept(this), Roles.Condition);
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				if (whileStatement.Statement != null)
-					result.AddChild ((Statement)whileStatement.Statement.Accept (this), Roles.EmbeddedStatement);
+					result.AddChild((Statement)whileStatement.Statement.Accept(this), Roles.EmbeddedStatement);
 				return result;
 			}
-			
-			void AddStatementOrList (ForStatement forStatement, Mono.CSharp.Statement init, Role<Statement> role)
+
+			void AddStatementOrList(ForStatement forStatement, Mono.CSharp.Statement init, Role<Statement> role)
 			{
 				if (init == null)
 					return;
-				if (init is StatementList) {
-					foreach (var stmt in ((StatementList)init).Statements) {
-						forStatement.AddChild ((Statement)stmt.Accept (this), role);
+				var stmtList = init as StatementList;
+				if (stmtList != null) {
+					foreach (var stmt in stmtList.Statements) {
+						forStatement.AddChild((Statement)stmt.Accept(this), role);
 					}
 				} else if (init is Mono.CSharp.EmptyStatement) {
 					
 				} else {
-					forStatement.AddChild ((Statement)init.Accept (this), role);
+					forStatement.AddChild((Statement)init.Accept(this), role);
 				}
 			}
 
-			public override object Visit (For forStatement)
+			public override object Visit(For forStatement)
 			{
-				var result = new ForStatement ();
+				var result = new ForStatement();
 				
-				var location = LocationsBag.GetLocations (forStatement);
+				var location = LocationsBag.GetLocations(forStatement);
 				
-				result.AddChild (new CSharpTokenNode (Convert (forStatement.loc), ForStatement.ForKeywordRole), ForStatement.ForKeywordRole);
+				result.AddChild(new CSharpTokenNode(Convert(forStatement.loc), ForStatement.ForKeywordRole), ForStatement.ForKeywordRole);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				
-				AddStatementOrList (result, forStatement.Initializer, ForStatement.InitializerRole);
+				AddStatementOrList(result, forStatement.Initializer, ForStatement.InitializerRole);
 				
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.Semicolon), Roles.Semicolon);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Semicolon), Roles.Semicolon);
 				if (forStatement.Condition != null)
-					result.AddChild ((Expression)forStatement.Condition.Accept (this), Roles.Condition);
+					result.AddChild((Expression)forStatement.Condition.Accept(this), Roles.Condition);
 				if (location != null && location.Count >= 3)
-					result.AddChild (new CSharpTokenNode (Convert (location [2]), Roles.Semicolon), Roles.Semicolon);
+					result.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.Semicolon), Roles.Semicolon);
 				
-				AddStatementOrList (result, forStatement.Iterator, ForStatement.IteratorRole);
+				AddStatementOrList(result, forStatement.Iterator, ForStatement.IteratorRole);
 				
 				if (location != null && location.Count >= 4)
-					result.AddChild (new CSharpTokenNode (Convert (location [3]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [3]), Roles.RPar), Roles.RPar);
 				
 				if (forStatement.Statement != null)
-					result.AddChild ((Statement)forStatement.Statement.Accept (this), Roles.EmbeddedStatement);
+					result.AddChild((Statement)forStatement.Statement.Accept(this), Roles.EmbeddedStatement);
 				
 				return result;
 			}
-			
-			public override object Visit (StatementExpression statementExpression)
+
+			public override object Visit(StatementExpression statementExpression)
 			{
-				var result = new ExpressionStatement ();
-				var expr = statementExpression.Expr.Accept (this) as Expression;
+				var result = new ExpressionStatement();
+				var expr = statementExpression.Expr.Accept(this) as Expression;
 				if (expr != null)
-					result.AddChild ((Expression)expr, Roles.Expression);
-				var location = LocationsBag.GetLocations (statementExpression);
+					result.AddChild(expr, Roles.Expression);
+				var location = LocationsBag.GetLocations(statementExpression);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.Semicolon), Roles.Semicolon);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Semicolon), Roles.Semicolon);
 				return result;
 			}
-			
-			public override object Visit (StatementErrorExpression statementErrorExpression)
+
+			public override object Visit(StatementErrorExpression errorStatement)
 			{
-				var result = new ExpressionStatement ();
-				var expr = statementErrorExpression.Expr.Accept (this) as Expression;
+				var result = new ExpressionStatement();
+				var expr = errorStatement.Expr.Accept(this) as Expression;
 				if (expr != null)
-					result.AddChild ((Expression)expr, Roles.Expression);
-				var location = LocationsBag.GetLocations (statementErrorExpression);
+					result.AddChild(expr, Roles.Expression);
+				var location = LocationsBag.GetLocations(errorStatement);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.Semicolon), Roles.Semicolon);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Semicolon), Roles.Semicolon);
 				return result;
 			}
-			
-			public override object Visit (InvalidStatementExpression statementExpression)
+
+			public override object Visit(InvalidStatementExpression invalidStatementExpression)
 			{
-				var result = new ExpressionStatement ();
-				if (statementExpression.Expression == null)
+				var result = new ExpressionStatement();
+				if (invalidStatementExpression.Expression == null)
 					return result;
-				var expr = statementExpression.Expression.Accept (this) as Expression;
+				var expr = invalidStatementExpression.Expression.Accept(this) as Expression;
 				if (expr != null)
-					result.AddChild (expr, Roles.Expression);
-				var location = LocationsBag.GetLocations (statementExpression);
+					result.AddChild(expr, Roles.Expression);
+				var location = LocationsBag.GetLocations(invalidStatementExpression);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.Semicolon), Roles.Semicolon);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Semicolon), Roles.Semicolon);
 				return result;
 			}
-			
-			public override object Visit (Return returnStatement)
+
+			public override object Visit(Return returnStatement)
 			{
-				var result = new ReturnStatement ();
+				var result = new ReturnStatement();
 				
-				result.AddChild (new CSharpTokenNode (Convert (returnStatement.loc), ReturnStatement.ReturnKeywordRole), ReturnStatement.ReturnKeywordRole);
+				result.AddChild(new CSharpTokenNode(Convert(returnStatement.loc), ReturnStatement.ReturnKeywordRole), ReturnStatement.ReturnKeywordRole);
 				if (returnStatement.Expr != null)
-					result.AddChild ((Expression)returnStatement.Expr.Accept (this), Roles.Expression);
+					result.AddChild((Expression)returnStatement.Expr.Accept(this), Roles.Expression);
 				
-				var location = LocationsBag.GetLocations (returnStatement);
+				var location = LocationsBag.GetLocations(returnStatement);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.Semicolon), Roles.Semicolon);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Semicolon), Roles.Semicolon);
 				
 				return result;
 			}
-			
-			public override object Visit (Goto gotoStatement)
+
+			public override object Visit(Goto gotoStatement)
 			{
-				var result = new GotoStatement ();
-				var location = LocationsBag.GetLocations (gotoStatement);
-				result.AddChild (new CSharpTokenNode (Convert (gotoStatement.loc), GotoStatement.GotoKeywordRole), GotoStatement.GotoKeywordRole);
-				var loc = location != null ? Convert (location [0]) : TextLocation.Empty;
-				result.AddChild (Identifier.Create (gotoStatement.Target, loc), Roles.Identifier);
+				var result = new GotoStatement();
+				var location = LocationsBag.GetLocations(gotoStatement);
+				result.AddChild(new CSharpTokenNode(Convert(gotoStatement.loc), GotoStatement.GotoKeywordRole), GotoStatement.GotoKeywordRole);
+				var loc = location != null ? Convert(location [0]) : TextLocation.Empty;
+				result.AddChild(Identifier.Create(gotoStatement.Target, loc), Roles.Identifier);
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.Semicolon), Roles.Semicolon);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Semicolon), Roles.Semicolon);
 				
 				return result;
 			}
-			
-			public override object Visit (LabeledStatement labeledStatement)
+
+			public override object Visit(LabeledStatement labeledStatement)
 			{
-				var result = new LabelStatement ();
-				result.AddChild (Identifier.Create (labeledStatement.Name, Convert (labeledStatement.loc)), Roles.Identifier);
-				var location = LocationsBag.GetLocations (labeledStatement);
+				var result = new LabelStatement();
+				result.AddChild(Identifier.Create(labeledStatement.Name, Convert(labeledStatement.loc)), Roles.Identifier);
+				var location = LocationsBag.GetLocations(labeledStatement);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.Colon), Roles.Colon);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Colon), Roles.Colon);
 				return result;
 			}
-			
-			public override object Visit (GotoDefault gotoDefault)
+
+			public override object Visit(GotoDefault gotoDefault)
 			{
-				var result = new GotoDefaultStatement ();
-				result.AddChild (new CSharpTokenNode (Convert (gotoDefault.loc), GotoDefaultStatement.GotoKeywordRole), GotoDefaultStatement.GotoKeywordRole);
-				var location = LocationsBag.GetLocations (gotoDefault);
+				var result = new GotoDefaultStatement();
+				result.AddChild(new CSharpTokenNode(Convert(gotoDefault.loc), GotoDefaultStatement.GotoKeywordRole), GotoDefaultStatement.GotoKeywordRole);
+				var location = LocationsBag.GetLocations(gotoDefault);
 				if (location != null) {
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), GotoDefaultStatement.DefaultKeywordRole), GotoDefaultStatement.DefaultKeywordRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), GotoDefaultStatement.DefaultKeywordRole), GotoDefaultStatement.DefaultKeywordRole);
 					if (location.Count > 1)
-						result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.Semicolon), Roles.Semicolon);
+						result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Semicolon), Roles.Semicolon);
 				}
 				
 				return result;
 			}
-			
-			public override object Visit (GotoCase gotoCase)
+
+			public override object Visit(GotoCase gotoCase)
 			{
-				var result = new GotoCaseStatement ();
-				result.AddChild (new CSharpTokenNode (Convert (gotoCase.loc), GotoCaseStatement.GotoKeywordRole), GotoCaseStatement.GotoKeywordRole);
+				var result = new GotoCaseStatement();
+				result.AddChild(new CSharpTokenNode(Convert(gotoCase.loc), GotoCaseStatement.GotoKeywordRole), GotoCaseStatement.GotoKeywordRole);
 				
-				var location = LocationsBag.GetLocations (gotoCase);
+				var location = LocationsBag.GetLocations(gotoCase);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), GotoCaseStatement.CaseKeywordRole), GotoCaseStatement.CaseKeywordRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), GotoCaseStatement.CaseKeywordRole), GotoCaseStatement.CaseKeywordRole);
 				if (gotoCase.Expr != null)
-					result.AddChild ((Expression)gotoCase.Expr.Accept (this), Roles.Expression);
+					result.AddChild((Expression)gotoCase.Expr.Accept(this), Roles.Expression);
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.Semicolon), Roles.Semicolon);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Semicolon), Roles.Semicolon);
 				return result;
 			}
-			
-			public override object Visit (Throw throwStatement)
+
+			public override object Visit(Throw throwStatement)
 			{
-				var result = new ThrowStatement ();
-				var location = LocationsBag.GetLocations (throwStatement);
+				var result = new ThrowStatement();
+				var location = LocationsBag.GetLocations(throwStatement);
 				
-				result.AddChild (new CSharpTokenNode (Convert (throwStatement.loc), ThrowStatement.ThrowKeywordRole), ThrowStatement.ThrowKeywordRole);
+				result.AddChild(new CSharpTokenNode(Convert(throwStatement.loc), ThrowStatement.ThrowKeywordRole), ThrowStatement.ThrowKeywordRole);
 				if (throwStatement.Expr != null)
-					result.AddChild ((Expression)throwStatement.Expr.Accept (this), Roles.Expression);
+					result.AddChild((Expression)throwStatement.Expr.Accept(this), Roles.Expression);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.Semicolon), Roles.Semicolon);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Semicolon), Roles.Semicolon);
 				return result;
 			}
-			
-			public override object Visit (Break breakStatement)
+
+			public override object Visit(Break breakStatement)
 			{
-				var result = new BreakStatement ();
-				var location = LocationsBag.GetLocations (breakStatement);
+				var result = new BreakStatement();
+				var location = LocationsBag.GetLocations(breakStatement);
 				
-				result.AddChild (new CSharpTokenNode (Convert (breakStatement.loc), BreakStatement.BreakKeywordRole), BreakStatement.BreakKeywordRole);
+				result.AddChild(new CSharpTokenNode(Convert(breakStatement.loc), BreakStatement.BreakKeywordRole), BreakStatement.BreakKeywordRole);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.Semicolon), Roles.Semicolon);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Semicolon), Roles.Semicolon);
 				return result;
 			}
-			
-			public override object Visit (Continue continueStatement)
+
+			public override object Visit(Continue continueStatement)
 			{
-				var result = new ContinueStatement ();
-				var location = LocationsBag.GetLocations (continueStatement);
-				result.AddChild (new CSharpTokenNode (Convert (continueStatement.loc), ContinueStatement.ContinueKeywordRole), ContinueStatement.ContinueKeywordRole);
+				var result = new ContinueStatement();
+				var location = LocationsBag.GetLocations(continueStatement);
+				result.AddChild(new CSharpTokenNode(Convert(continueStatement.loc), ContinueStatement.ContinueKeywordRole), ContinueStatement.ContinueKeywordRole);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.Semicolon), Roles.Semicolon);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Semicolon), Roles.Semicolon);
 				return result;
 			}
-			
-			public static bool IsLower (Location left, Location right)
+
+			public static bool IsLower(Location left, Location right)
 			{
 				return left.Row < right.Row || left.Row == right.Row && left.Column < right.Column;
 			}
-			
-			public UsingStatement CreateUsingStatement (Block blockStatement)
+
+			public UsingStatement CreateUsingStatement(Block blockStatement)
 			{
-				var usingResult = new UsingStatement ();
+				var usingResult = new UsingStatement();
 				Mono.CSharp.Statement cur = blockStatement.Statements [0];
-				if (cur is Using) {
-					Using u = (Using)cur;
-					usingResult.AddChild (new CSharpTokenNode (Convert (u.loc), UsingStatement.UsingKeywordRole), UsingStatement.UsingKeywordRole);
-					usingResult.AddChild (new CSharpTokenNode (Convert (blockStatement.StartLocation), Roles.LPar), Roles.LPar);
+				var u = cur as Using;
+				if (u != null) {
+					usingResult.AddChild(new CSharpTokenNode(Convert(u.loc), UsingStatement.UsingKeywordRole), UsingStatement.UsingKeywordRole);
+					usingResult.AddChild(new CSharpTokenNode(Convert(blockStatement.StartLocation), Roles.LPar), Roles.LPar);
 					if (u.Variables != null) {
-						var initializer = new VariableInitializer () {
-							NameToken = Identifier.Create (u.Variables.Variable.Name, Convert (u.Variables.Variable.Location)),
+						var initializer = new VariableInitializer {
+							NameToken = Identifier.Create(u.Variables.Variable.Name, Convert(u.Variables.Variable.Location)),
 						};
 						
-						var loc = LocationsBag.GetLocations (u.Variables);
+						var loc = LocationsBag.GetLocations(u.Variables);
 						if (loc != null)
-							initializer.AddChild (new CSharpTokenNode (Convert (loc [0]), Roles.Assign), Roles.Assign);
+							initializer.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Assign), Roles.Assign);
 						if (u.Variables.Initializer != null)
-							initializer.Initializer = u.Variables.Initializer.Accept (this) as Expression;
+							initializer.Initializer = u.Variables.Initializer.Accept(this) as Expression;
 						
 						
-						var varDec = new VariableDeclarationStatement () {
-							Type = ConvertToType (u.Variables.TypeExpression),
+						var varDec = new VariableDeclarationStatement {
+							Type = ConvertToType(u.Variables.TypeExpression),
 							Variables = { initializer }
 						};
 						
 						if (u.Variables.Declarators != null) {
 							foreach (var decl in u.Variables.Declarators) {
-								var declLoc = LocationsBag.GetLocations (decl);
-								var init = new VariableInitializer ();
+								var declLoc = LocationsBag.GetLocations(decl);
+								var init = new VariableInitializer();
 								if (declLoc != null && declLoc.Count > 0)
-									varDec.AddChild (new CSharpTokenNode (Convert (declLoc [0]), Roles.Comma), Roles.Comma);
-								init.AddChild (Identifier.Create (decl.Variable.Name, Convert (decl.Variable.Location)), Roles.Identifier);
+									varDec.AddChild(new CSharpTokenNode(Convert(declLoc [0]), Roles.Comma), Roles.Comma);
+								init.AddChild(Identifier.Create(decl.Variable.Name, Convert(decl.Variable.Location)), Roles.Identifier);
 								if (decl.Initializer != null) {
 									if (declLoc != null && declLoc.Count > 1)
-										init.AddChild (new CSharpTokenNode (Convert (declLoc [1]), Roles.Assign), Roles.Assign);
-									init.AddChild ((Expression)decl.Initializer.Accept (this), Roles.Expression);
+										init.AddChild(new CSharpTokenNode(Convert(declLoc [1]), Roles.Assign), Roles.Assign);
+									init.AddChild((Expression)decl.Initializer.Accept(this), Roles.Expression);
 								}
-								varDec.AddChild (init, Roles.Variable);
+								varDec.AddChild(init, Roles.Variable);
 							}
 						}
-						usingResult.AddChild (varDec, UsingStatement.ResourceAcquisitionRole);
+						usingResult.AddChild(varDec, UsingStatement.ResourceAcquisitionRole);
 					}
 					cur = u.Statement;
-					usingResult.AddChild (new CSharpTokenNode (Convert (blockStatement.EndLocation), Roles.RPar), Roles.RPar);
+					usingResult.AddChild(new CSharpTokenNode(Convert(blockStatement.EndLocation), Roles.RPar), Roles.RPar);
 					if (cur != null)
-						usingResult.AddChild ((Statement)cur.Accept (this), Roles.EmbeddedStatement);
+						usingResult.AddChild((Statement)cur.Accept(this), Roles.EmbeddedStatement);
 				}
 				return usingResult;
 			}
-			
-			void AddBlockChildren (BlockStatement result, Block blockStatement, ref int curLocal)
+
+			void AddBlockChildren(BlockStatement result, Block blockStatement, ref int curLocal)
 			{
 				if (convertTypeSystemMode) {
 					return;
@@ -1794,43 +1781,43 @@ namespace ICSharpCode.NRefactory.CSharp
 						curLocal++;
 					}*/
 					if (stmt is Block && !(stmt is ToplevelBlock || stmt is ExplicitBlock)) {
-						AddBlockChildren (result, (Block)stmt, ref curLocal);
+						AddBlockChildren(result, (Block)stmt, ref curLocal);
 					} else {
-						result.AddChild ((Statement)stmt.Accept (this), BlockStatement.StatementRole);
+						result.AddChild((Statement)stmt.Accept(this), BlockStatement.StatementRole);
 					}
 				}
 			}
-			
-			public override object Visit (Block blockStatement)
+
+			public override object Visit(Block blockStatement)
 			{
-				if (blockStatement.IsCompilerGenerated && blockStatement.Statements.Any ()) {
-					if (blockStatement.Statements.First () is Using)
-						return CreateUsingStatement (blockStatement);
-					return blockStatement.Statements.Last ().Accept (this);
+				if (blockStatement.IsCompilerGenerated && blockStatement.Statements.Any()) {
+					if (blockStatement.Statements.First() is Using)
+						return CreateUsingStatement(blockStatement);
+					return blockStatement.Statements.Last().Accept(this);
 				}
-				var result = new BlockStatement ();
-				result.AddChild (new CSharpTokenNode (Convert (blockStatement.StartLocation), Roles.LBrace), Roles.LBrace);
+				var result = new BlockStatement();
+				result.AddChild(new CSharpTokenNode(Convert(blockStatement.StartLocation), Roles.LBrace), Roles.LBrace);
 				int curLocal = 0;
-				AddBlockChildren (result, blockStatement, ref curLocal);
+				AddBlockChildren(result, blockStatement, ref curLocal);
 				
-				result.AddChild (new CSharpTokenNode (Convert (blockStatement.EndLocation), Roles.RBrace), Roles.RBrace);
+				result.AddChild(new CSharpTokenNode(Convert(blockStatement.EndLocation), Roles.RBrace), Roles.RBrace);
 				return result;
 			}
 
-			public override object Visit (Switch switchStatement)
+			public override object Visit(Switch switchStatement)
 			{
-				var result = new SwitchStatement ();
+				var result = new SwitchStatement();
 				
-				var location = LocationsBag.GetLocations (switchStatement);
-				result.AddChild (new CSharpTokenNode (Convert (switchStatement.loc), SwitchStatement.SwitchKeywordRole), SwitchStatement.SwitchKeywordRole);
+				var location = LocationsBag.GetLocations(switchStatement);
+				result.AddChild(new CSharpTokenNode(Convert(switchStatement.loc), SwitchStatement.SwitchKeywordRole), SwitchStatement.SwitchKeywordRole);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				if (switchStatement.Expr != null)
-					result.AddChild ((Expression)switchStatement.Expr.Accept (this), Roles.Expression);
+					result.AddChild((Expression)switchStatement.Expr.Accept(this), Roles.Expression);
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				if (location != null && location.Count > 2)
-					result.AddChild (new CSharpTokenNode (Convert (location [2]), Roles.LBrace), Roles.LBrace);
+					result.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.LBrace), Roles.LBrace);
 				SwitchSection newSection = null;
 				bool lastWasCase = false, added = true;
 				if (switchStatement.Block != null) {
@@ -1842,11 +1829,11 @@ namespace ICSharpCode.NRefactory.CSharp
 								newSection = new SwitchSection();
 								added = false;
 							}
-							newSection.AddChild (caseLabel, SwitchSection.CaseLabelRole);
+							newSection.AddChild(caseLabel, SwitchSection.CaseLabelRole);
 							lastWasCase = true;
 						} else {
 							if (lastWasCase) {
-								result.AddChild (newSection, SwitchStatement.SwitchSectionRole);
+								result.AddChild(newSection, SwitchStatement.SwitchSectionRole);
 								lastWasCase = false;
 								added = true;
 							}
@@ -1855,13 +1842,13 @@ namespace ICSharpCode.NRefactory.CSharp
 					}
 				}
 				if (!added)
-					result.AddChild (newSection, SwitchStatement.SwitchSectionRole);
+					result.AddChild(newSection, SwitchStatement.SwitchSectionRole);
 
 				if (location != null && location.Count > 3) {
-					result.AddChild (new CSharpTokenNode (Convert (location [3]), Roles.RBrace), Roles.RBrace);
+					result.AddChild(new CSharpTokenNode(Convert(location [3]), Roles.RBrace), Roles.RBrace);
 				} else {
 					// parser error, set end node to max value.
-					result.AddChild (new ErrorNode (), Roles.Error);
+					result.AddChild(new ErrorNode(), Roles.Error);
 				}
 				
 				return result;
@@ -1869,170 +1856,168 @@ namespace ICSharpCode.NRefactory.CSharp
 
 			public override object Visit(SwitchLabel switchLabel)
 			{
-				var newLabel = new CaseLabel ();
+				var newLabel = new CaseLabel();
 				if (!switchLabel.IsDefault) {
-					newLabel.AddChild (new CSharpTokenNode (Convert (switchLabel.Location), CaseLabel.CaseKeywordRole), CaseLabel.CaseKeywordRole);
+					newLabel.AddChild(new CSharpTokenNode(Convert(switchLabel.Location), CaseLabel.CaseKeywordRole), CaseLabel.CaseKeywordRole);
 					if (switchLabel.Label != null)
-						newLabel.AddChild ((Expression)switchLabel.Label.Accept (this), Roles.Expression);
-					var colonLocation = LocationsBag.GetLocations (switchLabel);
+						newLabel.AddChild((Expression)switchLabel.Label.Accept(this), Roles.Expression);
+					var colonLocation = LocationsBag.GetLocations(switchLabel);
 					if (colonLocation != null)
-						newLabel.AddChild (new CSharpTokenNode (Convert (colonLocation [0]), Roles.Colon), Roles.Colon);
+						newLabel.AddChild(new CSharpTokenNode(Convert(colonLocation [0]), Roles.Colon), Roles.Colon);
 				} else {
-					newLabel.AddChild (new CSharpTokenNode (Convert (switchLabel.Location), CaseLabel.DefaultKeywordRole), CaseLabel.DefaultKeywordRole);
-					newLabel.AddChild (new CSharpTokenNode (new TextLocation (switchLabel.Location.Row, switchLabel.Location.Column + "default".Length), Roles.Colon), Roles.Colon);
+					newLabel.AddChild(new CSharpTokenNode(Convert(switchLabel.Location), CaseLabel.DefaultKeywordRole), CaseLabel.DefaultKeywordRole);
+					newLabel.AddChild(new CSharpTokenNode(new TextLocation(switchLabel.Location.Row, switchLabel.Location.Column + "default".Length), Roles.Colon), Roles.Colon);
 				}
 				return newLabel;
 			}
 
-
-			public override object Visit (Lock lockStatement)
+			public override object Visit(Lock lockStatement)
 			{
-				var result = new LockStatement ();
-				var location = LocationsBag.GetLocations (lockStatement);
-				result.AddChild (new CSharpTokenNode (Convert (lockStatement.loc), LockStatement.LockKeywordRole), LockStatement.LockKeywordRole);
+				var result = new LockStatement();
+				var location = LocationsBag.GetLocations(lockStatement);
+				result.AddChild(new CSharpTokenNode(Convert(lockStatement.loc), LockStatement.LockKeywordRole), LockStatement.LockKeywordRole);
 				
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				if (lockStatement.Expr != null)
-					result.AddChild ((Expression)lockStatement.Expr.Accept (this), Roles.Expression);
+					result.AddChild((Expression)lockStatement.Expr.Accept(this), Roles.Expression);
 				
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				if (lockStatement.Statement != null)
-					result.AddChild ((Statement)lockStatement.Statement.Accept (this), Roles.EmbeddedStatement);
+					result.AddChild((Statement)lockStatement.Statement.Accept(this), Roles.EmbeddedStatement);
 				
 				return result;
 			}
-			
-			public override object Visit (Unchecked uncheckedStatement)
+
+			public override object Visit(Unchecked uncheckedStatement)
 			{
-				var result = new UncheckedStatement ();
-				result.AddChild (new CSharpTokenNode (Convert (uncheckedStatement.loc), UncheckedStatement.UncheckedKeywordRole), UncheckedStatement.UncheckedKeywordRole);
+				var result = new UncheckedStatement();
+				result.AddChild(new CSharpTokenNode(Convert(uncheckedStatement.loc), UncheckedStatement.UncheckedKeywordRole), UncheckedStatement.UncheckedKeywordRole);
 				if (uncheckedStatement.Block != null)
-					result.AddChild ((BlockStatement)uncheckedStatement.Block.Accept (this), Roles.Body);
+					result.AddChild((BlockStatement)uncheckedStatement.Block.Accept(this), Roles.Body);
 				return result;
 			}
-			
-			public override object Visit (Checked checkedStatement)
+
+			public override object Visit(Checked checkedStatement)
 			{
-				var result = new CheckedStatement ();
-				result.AddChild (new CSharpTokenNode (Convert (checkedStatement.loc), CheckedStatement.CheckedKeywordRole), CheckedStatement.CheckedKeywordRole);
+				var result = new CheckedStatement();
+				result.AddChild(new CSharpTokenNode(Convert(checkedStatement.loc), CheckedStatement.CheckedKeywordRole), CheckedStatement.CheckedKeywordRole);
 				if (checkedStatement.Block != null)
-					result.AddChild ((BlockStatement)checkedStatement.Block.Accept (this), Roles.Body);
+					result.AddChild((BlockStatement)checkedStatement.Block.Accept(this), Roles.Body);
 				return result;
 			}
-			
-			public override object Visit (Unsafe unsafeStatement)
+
+			public override object Visit(Unsafe unsafeStatement)
 			{
-				var result = new UnsafeStatement ();
-				result.AddChild (new CSharpTokenNode (Convert (unsafeStatement.loc), UnsafeStatement.UnsafeKeywordRole), UnsafeStatement.UnsafeKeywordRole);
+				var result = new UnsafeStatement();
+				result.AddChild(new CSharpTokenNode(Convert(unsafeStatement.loc), UnsafeStatement.UnsafeKeywordRole), UnsafeStatement.UnsafeKeywordRole);
 				if (unsafeStatement.Block != null)
-					result.AddChild ((BlockStatement)unsafeStatement.Block.Accept (this), Roles.Body);
+					result.AddChild((BlockStatement)unsafeStatement.Block.Accept(this), Roles.Body);
 				return result;
 			}
-			
-			public override object Visit (Fixed fixedStatement)
+
+			public override object Visit(Fixed fixedStatement)
 			{
-				var result = new FixedStatement ();
-				var location = LocationsBag.GetLocations (fixedStatement);
+				var result = new FixedStatement();
+				var location = LocationsBag.GetLocations(fixedStatement);
 				
-				result.AddChild (new CSharpTokenNode (Convert (fixedStatement.loc), FixedStatement.FixedKeywordRole), FixedStatement.FixedKeywordRole);
+				result.AddChild(new CSharpTokenNode(Convert(fixedStatement.loc), FixedStatement.FixedKeywordRole), FixedStatement.FixedKeywordRole);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				
 				if (fixedStatement.Variables != null) {
 					var blockVariableDeclaration = fixedStatement.Variables;
-					result.AddChild (ConvertToType (blockVariableDeclaration.TypeExpression), Roles.Type);
-					var varInit = new VariableInitializer ();
-					var initLocation = LocationsBag.GetLocations (blockVariableDeclaration);
-					varInit.AddChild (Identifier.Create (blockVariableDeclaration.Variable.Name, Convert (blockVariableDeclaration.Variable.Location)), Roles.Identifier);
+					result.AddChild(ConvertToType(blockVariableDeclaration.TypeExpression), Roles.Type);
+					var varInit = new VariableInitializer();
+					var initLocation = LocationsBag.GetLocations(blockVariableDeclaration);
+					varInit.AddChild(Identifier.Create(blockVariableDeclaration.Variable.Name, Convert(blockVariableDeclaration.Variable.Location)), Roles.Identifier);
 					if (blockVariableDeclaration.Initializer != null) {
 						if (initLocation != null)
-							varInit.AddChild (new CSharpTokenNode (Convert (initLocation [0]), Roles.Assign), Roles.Assign);
-						varInit.AddChild ((Expression)blockVariableDeclaration.Initializer.Accept (this), Roles.Expression);
+							varInit.AddChild(new CSharpTokenNode(Convert(initLocation [0]), Roles.Assign), Roles.Assign);
+						varInit.AddChild((Expression)blockVariableDeclaration.Initializer.Accept(this), Roles.Expression);
 					}
 					
-					result.AddChild (varInit, Roles.Variable);
+					result.AddChild(varInit, Roles.Variable);
 					
 					if (blockVariableDeclaration.Declarators != null) {
 						foreach (var decl in blockVariableDeclaration.Declarators) {
-							var loc = LocationsBag.GetLocations (decl);
-							var init = new VariableInitializer ();
+							var loc = LocationsBag.GetLocations(decl);
+							var init = new VariableInitializer();
 							if (loc != null && loc.Count > 0)
-								result.AddChild (new CSharpTokenNode (Convert (loc [0]), Roles.Comma), Roles.Comma);
-							init.AddChild (Identifier.Create (decl.Variable.Name, Convert (decl.Variable.Location)), Roles.Identifier);
+								result.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Comma), Roles.Comma);
+							init.AddChild(Identifier.Create(decl.Variable.Name, Convert(decl.Variable.Location)), Roles.Identifier);
 							if (decl.Initializer != null) {
 								if (loc != null && loc.Count > 1)
-									init.AddChild (new CSharpTokenNode (Convert (loc [1]), Roles.Assign), Roles.Assign);
-								init.AddChild ((Expression)decl.Initializer.Accept (this), Roles.Expression);
-							} else {
+									init.AddChild(new CSharpTokenNode(Convert(loc [1]), Roles.Assign), Roles.Assign);
+								init.AddChild((Expression)decl.Initializer.Accept(this), Roles.Expression);
 							}
-							result.AddChild (init, Roles.Variable);
+							result.AddChild(init, Roles.Variable);
 						}
 					}
 				}
 				
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				if (fixedStatement.Statement != null)
-					result.AddChild ((Statement)fixedStatement.Statement.Accept (this), Roles.EmbeddedStatement);
+					result.AddChild((Statement)fixedStatement.Statement.Accept(this), Roles.EmbeddedStatement);
 				return result;
 			}
-			
-			public override object Visit (TryFinally tryFinallyStatement)
+
+			public override object Visit(TryFinally tryFinallyStatement)
 			{
 				TryCatchStatement result;
-				var location = LocationsBag.GetLocations (tryFinallyStatement);
+				var location = LocationsBag.GetLocations(tryFinallyStatement);
 				
 				if (tryFinallyStatement.Stmt is TryCatch) {
-					result = (TryCatchStatement)tryFinallyStatement.Stmt.Accept (this);
+					result = (TryCatchStatement)tryFinallyStatement.Stmt.Accept(this);
 				} else {
-					result = new TryCatchStatement ();
-					result.AddChild (new CSharpTokenNode (Convert (tryFinallyStatement.loc), TryCatchStatement.TryKeywordRole), TryCatchStatement.TryKeywordRole);
+					result = new TryCatchStatement();
+					result.AddChild(new CSharpTokenNode(Convert(tryFinallyStatement.loc), TryCatchStatement.TryKeywordRole), TryCatchStatement.TryKeywordRole);
 					if (tryFinallyStatement.Stmt != null)
-						result.AddChild ((BlockStatement)tryFinallyStatement.Stmt.Accept (this), TryCatchStatement.TryBlockRole);
+						result.AddChild((BlockStatement)tryFinallyStatement.Stmt.Accept(this), TryCatchStatement.TryBlockRole);
 				}
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), TryCatchStatement.FinallyKeywordRole), TryCatchStatement.FinallyKeywordRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), TryCatchStatement.FinallyKeywordRole), TryCatchStatement.FinallyKeywordRole);
 				if (tryFinallyStatement.Fini != null)
-					result.AddChild ((BlockStatement)tryFinallyStatement.Fini.Accept (this), TryCatchStatement.FinallyBlockRole);
+					result.AddChild((BlockStatement)tryFinallyStatement.Fini.Accept(this), TryCatchStatement.FinallyBlockRole);
 				
 				return result;
 			}
-			
-			CatchClause ConvertCatch (Catch ctch)
+
+			CatchClause ConvertCatch(Catch ctch)
 			{
-				CatchClause result = new CatchClause ();
-				var location = LocationsBag.GetLocations (ctch);
-				result.AddChild (new CSharpTokenNode (Convert (ctch.loc), CatchClause.CatchKeywordRole), CatchClause.CatchKeywordRole);
+				var result = new CatchClause();
+				var location = LocationsBag.GetLocations(ctch);
+				result.AddChild(new CSharpTokenNode(Convert(ctch.loc), CatchClause.CatchKeywordRole), CatchClause.CatchKeywordRole);
 				if (ctch.TypeExpression != null) {
 					if (location != null)
-						result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+						result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 					
 					if (ctch.TypeExpression != null)
-						result.AddChild (ConvertToType (ctch.TypeExpression), Roles.Type);
-					if (ctch.Variable != null && !string.IsNullOrEmpty (ctch.Variable.Name))
-						result.AddChild (Identifier.Create (ctch.Variable.Name, Convert (ctch.Variable.Location)), Roles.Identifier);
+						result.AddChild(ConvertToType(ctch.TypeExpression), Roles.Type);
+					if (ctch.Variable != null && !string.IsNullOrEmpty(ctch.Variable.Name))
+						result.AddChild(Identifier.Create(ctch.Variable.Name, Convert(ctch.Variable.Location)), Roles.Identifier);
 					
 					if (location != null && location.Count > 1)
-						result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+						result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				}
 
 				if (ctch.Block != null)
-					result.AddChild ((BlockStatement)ctch.Block.Accept (this), Roles.Body);
+					result.AddChild((BlockStatement)ctch.Block.Accept(this), Roles.Body);
 				
 				return result;
 			}
-			
-			public override object Visit (TryCatch tryCatchStatement)
+
+			public override object Visit(TryCatch tryCatchStatement)
 			{
-				var result = new TryCatchStatement ();
-				result.AddChild (new CSharpTokenNode (Convert (tryCatchStatement.loc), TryCatchStatement.TryKeywordRole), TryCatchStatement.TryKeywordRole);
+				var result = new TryCatchStatement();
+				result.AddChild(new CSharpTokenNode(Convert(tryCatchStatement.loc), TryCatchStatement.TryKeywordRole), TryCatchStatement.TryKeywordRole);
 				if (tryCatchStatement.Block != null)
-					result.AddChild ((BlockStatement)tryCatchStatement.Block.Accept (this), TryCatchStatement.TryBlockRole);
+					result.AddChild((BlockStatement)tryCatchStatement.Block.Accept(this), TryCatchStatement.TryBlockRole);
 				if (tryCatchStatement.Clauses != null) {
 					foreach (var ctch in tryCatchStatement.Clauses) {
-						result.AddChild (ConvertCatch (ctch), TryCatchStatement.CatchClauseRole);
+						result.AddChild(ConvertCatch(ctch), TryCatchStatement.CatchClauseRole);
 					}
 				}
 //				if (tryCatchStatement.General != null)
@@ -2040,196 +2025,195 @@ namespace ICSharpCode.NRefactory.CSharp
 				
 				return result;
 			}
-			
-			public override object Visit (Using usingStatement)
+
+			public override object Visit(Using usingStatement)
 			{
-				var result = new UsingStatement ();
-				var location = LocationsBag.GetLocations (usingStatement);
+				var result = new UsingStatement();
+				var location = LocationsBag.GetLocations(usingStatement);
 				
-				result.AddChild (new CSharpTokenNode (Convert (usingStatement.loc), UsingStatement.UsingKeywordRole), UsingStatement.UsingKeywordRole);
+				result.AddChild(new CSharpTokenNode(Convert(usingStatement.loc), UsingStatement.UsingKeywordRole), UsingStatement.UsingKeywordRole);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				if (usingStatement.Expr != null)
-					result.AddChild ((AstNode)usingStatement.Expr.Accept (this), UsingStatement.ResourceAcquisitionRole);
+					result.AddChild((AstNode)usingStatement.Expr.Accept(this), UsingStatement.ResourceAcquisitionRole);
 				
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				
 				if (usingStatement.Statement != null)
-					result.AddChild ((Statement)usingStatement.Statement.Accept (this), Roles.EmbeddedStatement);
+					result.AddChild((Statement)usingStatement.Statement.Accept(this), Roles.EmbeddedStatement);
 				return result;
 			}
-			
-			public override object Visit (Foreach foreachStatement)
+
+			public override object Visit(Foreach foreachStatement)
 			{
-				var result = new ForeachStatement ();
+				var result = new ForeachStatement();
 				
-				var location = LocationsBag.GetLocations (foreachStatement);
+				var location = LocationsBag.GetLocations(foreachStatement);
 				
-				result.AddChild (new CSharpTokenNode (Convert (foreachStatement.loc), ForeachStatement.ForeachKeywordRole), ForeachStatement.ForeachKeywordRole);
+				result.AddChild(new CSharpTokenNode(Convert(foreachStatement.loc), ForeachStatement.ForeachKeywordRole), ForeachStatement.ForeachKeywordRole);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				
 				if (foreachStatement.TypeExpression != null)
-					result.AddChild (ConvertToType (foreachStatement.TypeExpression), Roles.Type);
+					result.AddChild(ConvertToType(foreachStatement.TypeExpression), Roles.Type);
 				
 				if (foreachStatement.Variable != null)
-					result.AddChild (Identifier.Create (foreachStatement.Variable.Name, Convert (foreachStatement.Variable.Location)), Roles.Identifier);
+					result.AddChild(Identifier.Create(foreachStatement.Variable.Name, Convert(foreachStatement.Variable.Location)), Roles.Identifier);
 				
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), ForeachStatement.InKeywordRole), ForeachStatement.InKeywordRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), ForeachStatement.InKeywordRole), ForeachStatement.InKeywordRole);
 				
 				if (foreachStatement.Expr != null)
-					result.AddChild ((Expression)foreachStatement.Expr.Accept (this), Roles.Expression);
+					result.AddChild((Expression)foreachStatement.Expr.Accept(this), Roles.Expression);
 				
 				if (location != null && location.Count > 2)
-					result.AddChild (new CSharpTokenNode (Convert (location [2]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.RPar), Roles.RPar);
 				
 				if (foreachStatement.Statement != null)
-					result.AddChild ((Statement)foreachStatement.Statement.Accept (this), Roles.EmbeddedStatement);
+					result.AddChild((Statement)foreachStatement.Statement.Accept(this), Roles.EmbeddedStatement);
 				
 				return result;
 			}
-			
-			public override object Visit (Yield yieldStatement)
+
+			public override object Visit(Yield yieldStatement)
 			{
-				var result = new YieldReturnStatement ();
-				var location = LocationsBag.GetLocations (yieldStatement);
+				var result = new YieldReturnStatement();
+				var location = LocationsBag.GetLocations(yieldStatement);
 				
-				result.AddChild (new CSharpTokenNode (Convert (yieldStatement.loc), YieldReturnStatement.YieldKeywordRole), YieldReturnStatement.YieldKeywordRole);
+				result.AddChild(new CSharpTokenNode(Convert(yieldStatement.loc), YieldReturnStatement.YieldKeywordRole), YieldReturnStatement.YieldKeywordRole);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), YieldReturnStatement.ReturnKeywordRole), YieldReturnStatement.ReturnKeywordRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), YieldReturnStatement.ReturnKeywordRole), YieldReturnStatement.ReturnKeywordRole);
 				if (yieldStatement.Expr != null)
-					result.AddChild ((Expression)yieldStatement.Expr.Accept (this), Roles.Expression);
+					result.AddChild((Expression)yieldStatement.Expr.Accept(this), Roles.Expression);
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.Semicolon), Roles.Semicolon);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Semicolon), Roles.Semicolon);
 				
 				return result;
 			}
-			
-			public override object Visit (YieldBreak yieldBreakStatement)
+
+			public override object Visit(YieldBreak yieldBreakStatement)
 			{
-				var result = new YieldBreakStatement ();
-				var location = LocationsBag.GetLocations (yieldBreakStatement);
-				result.AddChild (new CSharpTokenNode (Convert (yieldBreakStatement.loc), YieldBreakStatement.YieldKeywordRole), YieldBreakStatement.YieldKeywordRole);
+				var result = new YieldBreakStatement();
+				var location = LocationsBag.GetLocations(yieldBreakStatement);
+				result.AddChild(new CSharpTokenNode(Convert(yieldBreakStatement.loc), YieldBreakStatement.YieldKeywordRole), YieldBreakStatement.YieldKeywordRole);
 				if (location != null) {
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), YieldBreakStatement.BreakKeywordRole), YieldBreakStatement.BreakKeywordRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), YieldBreakStatement.BreakKeywordRole), YieldBreakStatement.BreakKeywordRole);
 					if (location.Count > 1)
-						result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.Semicolon), Roles.Semicolon);
+						result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Semicolon), Roles.Semicolon);
 				}
 				return result;
 			}
+
 			#endregion
-			
+
 			#region Expression
-			public override object Visit (Mono.CSharp.Expression expression)
+
+			public override object Visit(Mono.CSharp.Expression expression)
 			{
-				Console.WriteLine ("Visit unknown expression:" + expression);
-				System.Console.WriteLine (Environment.StackTrace);
+				Console.WriteLine("Visit unknown expression:" + expression);
+				Console.WriteLine(Environment.StackTrace);
 				return null;
 			}
-			
-			public override object Visit (Mono.CSharp.DefaultParameterValueExpression defaultParameterValueExpression)
+
+			public override object Visit(DefaultParameterValueExpression defaultParameterValueExpression)
 			{
-				return defaultParameterValueExpression.Child.Accept (this);
+				return defaultParameterValueExpression.Child.Accept(this);
 			}
 
-			public override object Visit (TypeExpression typeExpression)
+			public override object Visit(TypeExpression typeExpression)
 			{
-				return new TypeReferenceExpression (new PrimitiveType (keywordTable [(int)typeExpression.Type.BuiltinType], Convert (typeExpression.Location)));
+				return new TypeReferenceExpression(new PrimitiveType(keywordTable [(int)typeExpression.Type.BuiltinType], Convert(typeExpression.Location)));
 			}
 
-			public override object Visit (LocalVariableReference localVariableReference)
+			public override object Visit(LocalVariableReference localVariableReference)
 			{
-				return Identifier.Create (localVariableReference.Name, Convert (localVariableReference.Location));
+				return Identifier.Create(localVariableReference.Name, Convert(localVariableReference.Location));
 			}
 
-			public override object Visit (MemberAccess memberAccess)
+			public override object Visit(MemberAccess memberAccess)
 			{
 				Expression result;
-				if (memberAccess.LeftExpression is Indirection) {
-					var ind = memberAccess.LeftExpression as Indirection;
-					result = new PointerReferenceExpression ();
-					result.AddChild ((Expression)ind.Expr.Accept (this), Roles.TargetExpression);
-					result.AddChild (new CSharpTokenNode (Convert (ind.Location), PointerReferenceExpression.ArrowRole), PointerReferenceExpression.ArrowRole);
+				var ind = memberAccess.LeftExpression as Indirection;
+				if (ind != null) {
+					result = new PointerReferenceExpression();
+					result.AddChild((Expression)ind.Expr.Accept(this), Roles.TargetExpression);
+					result.AddChild(new CSharpTokenNode(Convert(ind.Location), PointerReferenceExpression.ArrowRole), PointerReferenceExpression.ArrowRole);
 				} else {
-					result = new MemberReferenceExpression ();
+					result = new MemberReferenceExpression();
 					if (memberAccess.LeftExpression != null) {
-						var leftExpr = memberAccess.LeftExpression.Accept (this);
-						result.AddChild ((Expression)leftExpr, Roles.TargetExpression);
+						var leftExpr = memberAccess.LeftExpression.Accept(this);
+						result.AddChild((Expression)leftExpr, Roles.TargetExpression);
 					}
-					var loc = LocationsBag.GetLocations (memberAccess);
+					var loc = LocationsBag.GetLocations(memberAccess);
 
 					if (loc != null) {
-						result.AddChild (new CSharpTokenNode (Convert (loc[0]), Roles.Dot), Roles.Dot);
+						result.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Dot), Roles.Dot);
 					}
 				}
 				
-				result.AddChild (Identifier.Create (memberAccess.Name, Convert (memberAccess.Location)), Roles.Identifier);
+				result.AddChild(Identifier.Create(memberAccess.Name, Convert(memberAccess.Location)), Roles.Identifier);
 				
-				AddTypeArguments (result, memberAccess);
+				AddTypeArguments(result, memberAccess);
 				return result;
 			}
-			
-			public override object Visit (QualifiedAliasMember qualifiedAliasMember)
+
+			public override object Visit(QualifiedAliasMember qualifiedAliasMember)
 			{
-				var result = new MemberType ();
-				result.Target = new SimpleType (qualifiedAliasMember.alias, Convert (qualifiedAliasMember.Location));
+				var result = new MemberType();
+				result.Target = new SimpleType(qualifiedAliasMember.alias, Convert(qualifiedAliasMember.Location));
 				result.IsDoubleColon = true;
-				var location = LocationsBag.GetLocations (qualifiedAliasMember);
+				var location = LocationsBag.GetLocations(qualifiedAliasMember);
 				if (location != null && location.Count > 0)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.DoubleColon), Roles.DoubleColon);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.DoubleColon), Roles.DoubleColon);
 
-				result.AddChild (Identifier.Create (qualifiedAliasMember.Name, location != null && location.Count > 1 ? Convert (location [1]) : TextLocation.Empty), Roles.Identifier);
-				return  new TypeReferenceExpression () { Type = result };
+				result.AddChild(Identifier.Create(qualifiedAliasMember.Name, location != null && location.Count > 1 ? Convert(location [1]) : TextLocation.Empty), Roles.Identifier);
+				return  new TypeReferenceExpression { Type = result };
 			}
-			
-			public override object Visit (Constant constant)
+
+			public override object Visit(Constant constant)
 			{
-				if (constant.GetValue () == null)
-					return new NullReferenceExpression (Convert (constant.Location));
+				if (constant.GetValue() == null)
+					return new NullReferenceExpression(Convert(constant.Location));
 				string literalValue;
-				if (constant is ILiteralConstant) {
-					literalValue = new string (((ILiteralConstant)constant).ParsedValue);
-				} else {
-					literalValue = constant.GetValueAsLiteral ();
-				}
-				object val = constant.GetValue ();
+				var literalConstant = constant as ILiteralConstant;
+				literalValue = literalConstant != null ? new string(literalConstant.ParsedValue) : constant.GetValueAsLiteral();
+				object val = constant.GetValue();
 				if (val is bool)
 					literalValue = (bool)val ? "true" : "false";
-				var result = new PrimitiveExpression (val, Convert (constant.Location), literalValue);
+				var result = new PrimitiveExpression(val, Convert(constant.Location), literalValue);
 				return result;
 			}
 
-			public override object Visit (SimpleName simpleName)
+			public override object Visit(SimpleName simpleName)
 			{
-				var result = new IdentifierExpression ();
-				result.AddChild (Identifier.Create (simpleName.Name, Convert (simpleName.Location)), Roles.Identifier);
-				AddTypeArguments (result, simpleName);
+				var result = new IdentifierExpression();
+				result.AddChild(Identifier.Create(simpleName.Name, Convert(simpleName.Location)), Roles.Identifier);
+				AddTypeArguments(result, simpleName);
 				return result;
 			}
-			
-			public override object Visit (BooleanExpression booleanExpression)
+
+			public override object Visit(BooleanExpression booleanExpression)
 			{
-				return booleanExpression.Expr.Accept (this);
+				return booleanExpression.Expr.Accept(this);
 			}
-			
-			public override object Visit (Mono.CSharp.ParenthesizedExpression parenthesizedExpression)
+
+			public override object Visit(Mono.CSharp.ParenthesizedExpression parenthesizedExpression)
 			{
-				var result = new ParenthesizedExpression ();
-				var location = LocationsBag.GetLocations (parenthesizedExpression);
+				var result = new ParenthesizedExpression();
+				var location = LocationsBag.GetLocations(parenthesizedExpression);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				if (parenthesizedExpression.Expr != null)
-					result.AddChild ((Expression)parenthesizedExpression.Expr.Accept (this), Roles.Expression);
+					result.AddChild((Expression)parenthesizedExpression.Expr.Accept(this), Roles.Expression);
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				return result;
 			}
-			
-			public override object Visit (Unary unaryExpression)
+
+			public override object Visit(Unary unaryExpression)
 			{
-				var result = new UnaryOperatorExpression ();
+				var result = new UnaryOperatorExpression();
 				switch (unaryExpression.Oper) {
 					case Unary.Operator.UnaryPlus:
 						result.Operator = UnaryOperatorType.Plus;
@@ -2247,132 +2231,132 @@ namespace ICSharpCode.NRefactory.CSharp
 						result.Operator = UnaryOperatorType.AddressOf;
 						break;
 				}
-				var r = UnaryOperatorExpression.GetOperatorRole (result.Operator);
-				result.AddChild (new CSharpTokenNode (Convert (unaryExpression.Location), r), r);
+				var r = UnaryOperatorExpression.GetOperatorRole(result.Operator);
+				result.AddChild(new CSharpTokenNode(Convert(unaryExpression.Location), r), r);
 				if (unaryExpression.Expr != null)
-					result.AddChild ((Expression)unaryExpression.Expr.Accept (this), Roles.Expression);
+					result.AddChild((Expression)unaryExpression.Expr.Accept(this), Roles.Expression);
 				return result;
 			}
-			
-			public override object Visit (UnaryMutator unaryMutatorExpression)
+
+			public override object Visit(UnaryMutator unaryMutatorExpression)
 			{
-				var result = new UnaryOperatorExpression ();
+				var result = new UnaryOperatorExpression();
 				if (unaryMutatorExpression.Expr == null)
 					return result;
-				var expression = (Expression)unaryMutatorExpression.Expr.Accept (this);
+				var expression = (Expression)unaryMutatorExpression.Expr.Accept(this);
 				switch (unaryMutatorExpression.UnaryMutatorMode) {
 					case UnaryMutator.Mode.PostDecrement:
 						result.Operator = UnaryOperatorType.PostDecrement;
-						result.AddChild (expression, Roles.Expression);
-						result.AddChild (new CSharpTokenNode (Convert (unaryMutatorExpression.Location), UnaryOperatorExpression.DecrementRole), UnaryOperatorExpression.DecrementRole);
+						result.AddChild(expression, Roles.Expression);
+						result.AddChild(new CSharpTokenNode(Convert(unaryMutatorExpression.Location), UnaryOperatorExpression.DecrementRole), UnaryOperatorExpression.DecrementRole);
 						break;
 					case UnaryMutator.Mode.PostIncrement:
 						result.Operator = UnaryOperatorType.PostIncrement;
-						result.AddChild (expression, Roles.Expression);
-						result.AddChild (new CSharpTokenNode (Convert (unaryMutatorExpression.Location), UnaryOperatorExpression.IncrementRole), UnaryOperatorExpression.IncrementRole);
+						result.AddChild(expression, Roles.Expression);
+						result.AddChild(new CSharpTokenNode(Convert(unaryMutatorExpression.Location), UnaryOperatorExpression.IncrementRole), UnaryOperatorExpression.IncrementRole);
 						break;
 						
 					case UnaryMutator.Mode.PreIncrement:
 						result.Operator = UnaryOperatorType.Increment;
-						result.AddChild (new CSharpTokenNode (Convert (unaryMutatorExpression.Location), UnaryOperatorExpression.IncrementRole), UnaryOperatorExpression.IncrementRole);
-						result.AddChild (expression, Roles.Expression);
+						result.AddChild(new CSharpTokenNode(Convert(unaryMutatorExpression.Location), UnaryOperatorExpression.IncrementRole), UnaryOperatorExpression.IncrementRole);
+						result.AddChild(expression, Roles.Expression);
 						break;
 					case UnaryMutator.Mode.PreDecrement:
 						result.Operator = UnaryOperatorType.Decrement;
-						result.AddChild (new CSharpTokenNode (Convert (unaryMutatorExpression.Location), UnaryOperatorExpression.DecrementRole), UnaryOperatorExpression.DecrementRole);
-						result.AddChild (expression, Roles.Expression);
+						result.AddChild(new CSharpTokenNode(Convert(unaryMutatorExpression.Location), UnaryOperatorExpression.DecrementRole), UnaryOperatorExpression.DecrementRole);
+						result.AddChild(expression, Roles.Expression);
 						break;
 				}
 				
 				return result;
 			}
-			
-			public override object Visit (Indirection indirectionExpression)
+
+			public override object Visit(Indirection indirectionExpression)
 			{
-				var result = new UnaryOperatorExpression ();
+				var result = new UnaryOperatorExpression();
 				result.Operator = UnaryOperatorType.Dereference;
-				result.AddChild (new CSharpTokenNode (Convert (indirectionExpression.Location), UnaryOperatorExpression.DereferenceRole), UnaryOperatorExpression.DereferenceRole);
+				result.AddChild(new CSharpTokenNode(Convert(indirectionExpression.Location), UnaryOperatorExpression.DereferenceRole), UnaryOperatorExpression.DereferenceRole);
 				if (indirectionExpression.Expr != null)
-					result.AddChild ((Expression)indirectionExpression.Expr.Accept (this), Roles.Expression);
+					result.AddChild((Expression)indirectionExpression.Expr.Accept(this), Roles.Expression);
 				return result;
 			}
-			
-			public override object Visit (Is isExpression)
+
+			public override object Visit(Is isExpression)
 			{
-				var result = new IsExpression ();
+				var result = new IsExpression();
 				if (isExpression.Expr != null)
-					result.AddChild ((Expression)isExpression.Expr.Accept (this), Roles.Expression);
-				result.AddChild (new CSharpTokenNode (Convert (isExpression.Location), IsExpression.IsKeywordRole), IsExpression.IsKeywordRole);
+					result.AddChild((Expression)isExpression.Expr.Accept(this), Roles.Expression);
+				result.AddChild(new CSharpTokenNode(Convert(isExpression.Location), IsExpression.IsKeywordRole), IsExpression.IsKeywordRole);
 				
 				if (isExpression.ProbeType != null)
-					result.AddChild (ConvertToType (isExpression.ProbeType), Roles.Type);
+					result.AddChild(ConvertToType(isExpression.ProbeType), Roles.Type);
 				return result;
 			}
-			
-			public override object Visit (As asExpression)
+
+			public override object Visit(As asExpression)
 			{
-				var result = new AsExpression ();
+				var result = new AsExpression();
 				if (asExpression.Expr != null)
-					result.AddChild ((Expression)asExpression.Expr.Accept (this), Roles.Expression);
-				result.AddChild (new CSharpTokenNode (Convert (asExpression.Location), AsExpression.AsKeywordRole), AsExpression.AsKeywordRole);
+					result.AddChild((Expression)asExpression.Expr.Accept(this), Roles.Expression);
+				result.AddChild(new CSharpTokenNode(Convert(asExpression.Location), AsExpression.AsKeywordRole), AsExpression.AsKeywordRole);
 				if (asExpression.ProbeType != null)
-					result.AddChild (ConvertToType (asExpression.ProbeType), Roles.Type);
+					result.AddChild(ConvertToType(asExpression.ProbeType), Roles.Type);
 				return result;
 			}
-			
-			public override object Visit (Cast castExpression)
+
+			public override object Visit(Cast castExpression)
 			{
-				var result = new CastExpression ();
-				var location = LocationsBag.GetLocations (castExpression);
+				var result = new CastExpression();
+				var location = LocationsBag.GetLocations(castExpression);
 				
-				result.AddChild (new CSharpTokenNode (Convert (castExpression.Location), Roles.LPar), Roles.LPar);
+				result.AddChild(new CSharpTokenNode(Convert(castExpression.Location), Roles.LPar), Roles.LPar);
 				if (castExpression.TargetType != null)
-					result.AddChild (ConvertToType (castExpression.TargetType), Roles.Type);
+					result.AddChild(ConvertToType(castExpression.TargetType), Roles.Type);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.RPar), Roles.RPar);
 				if (castExpression.Expr != null)
-					result.AddChild ((Expression)castExpression.Expr.Accept (this), Roles.Expression);
+					result.AddChild((Expression)castExpression.Expr.Accept(this), Roles.Expression);
 				return result;
 			}
-			
-			public override object Visit (ComposedCast composedCast)
+
+			public override object Visit(ComposedCast composedCast)
 			{
-				var result = new ComposedType ();
-				result.AddChild (ConvertToType (composedCast.Left), Roles.Type);
+				var result = new ComposedType();
+				result.AddChild(ConvertToType(composedCast.Left), Roles.Type);
 				
 				var spec = composedCast.Spec;
 				while (spec != null) {
 					if (spec.IsNullable) {
-						result.AddChild (new CSharpTokenNode (Convert (spec.Location), ComposedType.NullableRole), ComposedType.NullableRole);
+						result.AddChild(new CSharpTokenNode(Convert(spec.Location), ComposedType.NullableRole), ComposedType.NullableRole);
 					} else if (spec.IsPointer) {
-						result.AddChild (new CSharpTokenNode (Convert (spec.Location), ComposedType.PointerRole), ComposedType.PointerRole);
+						result.AddChild(new CSharpTokenNode(Convert(spec.Location), ComposedType.PointerRole), ComposedType.PointerRole);
 					} else {
-						var aSpec = new ArraySpecifier ();
-						aSpec.AddChild (new CSharpTokenNode (Convert (spec.Location), Roles.LBracket), Roles.LBracket);
-						var location = LocationsBag.GetLocations (spec);
+						var aSpec = new ArraySpecifier();
+						aSpec.AddChild(new CSharpTokenNode(Convert(spec.Location), Roles.LBracket), Roles.LBracket);
+						var location = LocationsBag.GetLocations(spec);
 						if (location != null)
-							aSpec.AddChild (new CSharpTokenNode (Convert (spec.Location), Roles.RBracket), Roles.RBracket);
-						result.AddChild (aSpec, ComposedType.ArraySpecifierRole);
+							aSpec.AddChild(new CSharpTokenNode(Convert(spec.Location), Roles.RBracket), Roles.RBracket);
+						result.AddChild(aSpec, ComposedType.ArraySpecifierRole);
 					}
 					spec = spec.Next;
 				}
 				
 				return result;
 			}
-			
-			public override object Visit (Mono.CSharp.DefaultValueExpression defaultValueExpression)
+
+			public override object Visit(Mono.CSharp.DefaultValueExpression defaultValueExpression)
 			{
-				var result = new DefaultValueExpression ();
-				result.AddChild (new CSharpTokenNode (Convert (defaultValueExpression.Location), DefaultValueExpression.DefaultKeywordRole), DefaultValueExpression.DefaultKeywordRole);
-				var location = LocationsBag.GetLocations (defaultValueExpression);
+				var result = new DefaultValueExpression();
+				result.AddChild(new CSharpTokenNode(Convert(defaultValueExpression.Location), DefaultValueExpression.DefaultKeywordRole), DefaultValueExpression.DefaultKeywordRole);
+				var location = LocationsBag.GetLocations(defaultValueExpression);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
-				result.AddChild (ConvertToType (defaultValueExpression.Expr), Roles.Type);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				result.AddChild(ConvertToType(defaultValueExpression.Expr), Roles.Type);
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				return result;
 			}
-			
+
 			public override object Visit(Binary binaryExpression)
 			{
 				var result = new BinaryOperatorExpression();
@@ -2437,128 +2421,128 @@ namespace ICSharpCode.NRefactory.CSharp
 					result.AddChild((Expression)binaryExpression.Left.Accept(this), BinaryOperatorExpression.LeftRole);
 				var location = LocationsBag.GetLocations(binaryExpression);
 				if (location != null) {
-					var r = BinaryOperatorExpression.GetOperatorRole (result.Operator);
+					var r = BinaryOperatorExpression.GetOperatorRole(result.Operator);
 					result.AddChild(new CSharpTokenNode(Convert(location [0]), r), r);
 				}
 				if (binaryExpression.Right != null)
-					result.AddChild ((Expression)binaryExpression.Right.Accept (this), BinaryOperatorExpression.RightRole);
+					result.AddChild((Expression)binaryExpression.Right.Accept(this), BinaryOperatorExpression.RightRole);
 				return result;
 			}
-			
-			public override object Visit (Mono.CSharp.Nullable.NullCoalescingOperator nullCoalescingOperator)
+
+			public override object Visit(Mono.CSharp.Nullable.NullCoalescingOperator nullCoalescingOperator)
 			{
-				var result = new BinaryOperatorExpression ();
+				var result = new BinaryOperatorExpression();
 				result.Operator = BinaryOperatorType.NullCoalescing;
 				if (nullCoalescingOperator.LeftExpression != null)
-					result.AddChild ((Expression)nullCoalescingOperator.LeftExpression.Accept (this), BinaryOperatorExpression.LeftRole);
-				var location = LocationsBag.GetLocations (nullCoalescingOperator);
+					result.AddChild((Expression)nullCoalescingOperator.LeftExpression.Accept(this), BinaryOperatorExpression.LeftRole);
+				var location = LocationsBag.GetLocations(nullCoalescingOperator);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location[0]), BinaryOperatorExpression.NullCoalescingRole), BinaryOperatorExpression.NullCoalescingRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), BinaryOperatorExpression.NullCoalescingRole), BinaryOperatorExpression.NullCoalescingRole);
 				if (nullCoalescingOperator.RightExpression != null)
-					result.AddChild ((Expression)nullCoalescingOperator.RightExpression.Accept (this), BinaryOperatorExpression.RightRole);
+					result.AddChild((Expression)nullCoalescingOperator.RightExpression.Accept(this), BinaryOperatorExpression.RightRole);
 				return result;
 			}
-			
-			public override object Visit (Conditional conditionalExpression)
+
+			public override object Visit(Conditional conditionalExpression)
 			{
-				var result = new ConditionalExpression ();
+				var result = new ConditionalExpression();
 				
 				if (conditionalExpression.Expr != null)
-					result.AddChild ((Expression)conditionalExpression.Expr.Accept (this), Roles.Condition);
-				var location = LocationsBag.GetLocations (conditionalExpression);
+					result.AddChild((Expression)conditionalExpression.Expr.Accept(this), Roles.Condition);
+				var location = LocationsBag.GetLocations(conditionalExpression);
 				
-				result.AddChild (new CSharpTokenNode (Convert (conditionalExpression.Location), ConditionalExpression.QuestionMarkRole), ConditionalExpression.QuestionMarkRole);
+				result.AddChild(new CSharpTokenNode(Convert(conditionalExpression.Location), ConditionalExpression.QuestionMarkRole), ConditionalExpression.QuestionMarkRole);
 				if (conditionalExpression.TrueExpr != null)
-					result.AddChild ((Expression)conditionalExpression.TrueExpr.Accept (this), ConditionalExpression.TrueRole);
+					result.AddChild((Expression)conditionalExpression.TrueExpr.Accept(this), ConditionalExpression.TrueRole);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), ConditionalExpression.ColonRole), ConditionalExpression.ColonRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), ConditionalExpression.ColonRole), ConditionalExpression.ColonRole);
 				if (conditionalExpression.FalseExpr != null)
-					result.AddChild ((Expression)conditionalExpression.FalseExpr.Accept (this), ConditionalExpression.FalseRole);
+					result.AddChild((Expression)conditionalExpression.FalseExpr.Accept(this), ConditionalExpression.FalseRole);
 				return result;
 			}
-			
-			void AddParameter (AstNode parent, Mono.CSharp.AParametersCollection parameters)
+
+			void AddParameter(AstNode parent, AParametersCollection parameters)
 			{
 				if (parameters == null)
 					return;
-				var paramLocation = LocationsBag.GetLocations (parameters);
+				var paramLocation = LocationsBag.GetLocations(parameters);
 				
 				for (int i = 0; i < parameters.Count; i++) {
 					var p = (Parameter)parameters.FixedParameters [i];
 					if (p == null)
 						continue;
-					var location = LocationsBag.GetLocations (p);
-					ParameterDeclaration parameterDeclarationExpression = new ParameterDeclaration ();
-					AddAttributeSection (parameterDeclarationExpression, p);
+					var location = LocationsBag.GetLocations(p);
+					var parameterDeclarationExpression = new ParameterDeclaration();
+					AddAttributeSection(parameterDeclarationExpression, p);
 					switch (p.ModFlags) {
 						case Parameter.Modifier.OUT:
 							parameterDeclarationExpression.ParameterModifier = ParameterModifier.Out;
 							if (location != null)
-								parameterDeclarationExpression.AddChild (new CSharpTokenNode (Convert (location [0]), ParameterDeclaration.OutModifierRole), ParameterDeclaration.OutModifierRole);
+								parameterDeclarationExpression.AddChild(new CSharpTokenNode(Convert(location [0]), ParameterDeclaration.OutModifierRole), ParameterDeclaration.OutModifierRole);
 							break;
 						case Parameter.Modifier.REF:
 							parameterDeclarationExpression.ParameterModifier = ParameterModifier.Ref;
 							if (location != null)
-								parameterDeclarationExpression.AddChild (new CSharpTokenNode (Convert (location [0]), ParameterDeclaration.RefModifierRole), ParameterDeclaration.RefModifierRole);
+								parameterDeclarationExpression.AddChild(new CSharpTokenNode(Convert(location [0]), ParameterDeclaration.RefModifierRole), ParameterDeclaration.RefModifierRole);
 							break;
 						case Parameter.Modifier.PARAMS:
 							parameterDeclarationExpression.ParameterModifier = ParameterModifier.Params;
 							if (location != null)
-								parameterDeclarationExpression.AddChild (new CSharpTokenNode (Convert (location [0]), ParameterDeclaration.ParamsModifierRole), ParameterDeclaration.ParamsModifierRole);
+								parameterDeclarationExpression.AddChild(new CSharpTokenNode(Convert(location [0]), ParameterDeclaration.ParamsModifierRole), ParameterDeclaration.ParamsModifierRole);
 							break;
 						default:
 							if (p.HasExtensionMethodModifier) {
 								parameterDeclarationExpression.ParameterModifier = ParameterModifier.This;
 								if (location != null) {
-									parameterDeclarationExpression.AddChild (new CSharpTokenNode (Convert (location [0]), ParameterDeclaration.ThisModifierRole), ParameterDeclaration.ThisModifierRole);
+									parameterDeclarationExpression.AddChild(new CSharpTokenNode(Convert(location [0]), ParameterDeclaration.ThisModifierRole), ParameterDeclaration.ThisModifierRole);
 								}
 							}
 							break;
 					}
 					if (p.TypeExpression != null) // lambdas may have no types (a, b) => ...
-						parameterDeclarationExpression.AddChild (ConvertToType (p.TypeExpression), Roles.Type);
+						parameterDeclarationExpression.AddChild(ConvertToType(p.TypeExpression), Roles.Type);
 					if (p.Name != null)
-						parameterDeclarationExpression.AddChild (Identifier.Create (p.Name, Convert (p.Location)), Roles.Identifier);
+						parameterDeclarationExpression.AddChild(Identifier.Create(p.Name, Convert(p.Location)), Roles.Identifier);
 					if (p.HasDefaultValue) {
 						if (location != null && location.Count > 1)
-							parameterDeclarationExpression.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.Assign), Roles.Assign);
-						parameterDeclarationExpression.AddChild ((Expression)p.DefaultValue.Accept (this), Roles.Expression);
+							parameterDeclarationExpression.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Assign), Roles.Assign);
+						parameterDeclarationExpression.AddChild((Expression)p.DefaultValue.Accept(this), Roles.Expression);
 					}
-					parent.AddChild (parameterDeclarationExpression, Roles.Parameter);
+					parent.AddChild(parameterDeclarationExpression, Roles.Parameter);
 					if (paramLocation != null && i < paramLocation.Count) {
-						parent.AddChild (new CSharpTokenNode (Convert (paramLocation [i]), Roles.Comma), Roles.Comma);
+						parent.AddChild(new CSharpTokenNode(Convert(paramLocation [i]), Roles.Comma), Roles.Comma);
 					}
 				}
 			}
-			
-			void AddTypeParameters (AstNode parent, MemberName memberName)
+
+			void AddTypeParameters(AstNode parent, MemberName memberName)
 			{
 				if (memberName == null || memberName.TypeParameters == null)
 					return;
-				var chevronLocs = LocationsBag.GetLocations (memberName.TypeParameters);
+				var chevronLocs = LocationsBag.GetLocations(memberName.TypeParameters);
 				if (chevronLocs != null)
-					parent.AddChild (new CSharpTokenNode (Convert (chevronLocs [chevronLocs.Count - 2]), Roles.LChevron), Roles.LChevron);
+					parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [chevronLocs.Count - 2]), Roles.LChevron), Roles.LChevron);
 				for (int i = 0; i < memberName.TypeParameters.Count; i++) {
 					if (chevronLocs != null && i > 0 && i - 1 < chevronLocs.Count)
-						parent.AddChild (new CSharpTokenNode (Convert (chevronLocs [i - 1]), Roles.Comma), Roles.Comma);
+						parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [i - 1]), Roles.Comma), Roles.Comma);
 					var arg = memberName.TypeParameters [i];
 					if (arg == null)
 						continue;
-					TypeParameterDeclaration tp = new TypeParameterDeclaration ();
+					var tp = new TypeParameterDeclaration();
 					
 					List<Location> varianceLocation;
 					switch (arg.Variance) {
 						case Variance.Contravariant:
 							tp.Variance = VarianceModifier.Contravariant;
-							varianceLocation = LocationsBag.GetLocations (arg);
+							varianceLocation = LocationsBag.GetLocations(arg);
 							if (varianceLocation != null)
-								tp.AddChild (new CSharpTokenNode (Convert (varianceLocation [0]), TypeParameterDeclaration.InVarianceKeywordRole), TypeParameterDeclaration.InVarianceKeywordRole);
+								tp.AddChild(new CSharpTokenNode(Convert(varianceLocation [0]), TypeParameterDeclaration.InVarianceKeywordRole), TypeParameterDeclaration.InVarianceKeywordRole);
 							break;
 						case Variance.Covariant:
 							tp.Variance = VarianceModifier.Covariant;
-							varianceLocation = LocationsBag.GetLocations (arg);
+							varianceLocation = LocationsBag.GetLocations(arg);
 							if (varianceLocation != null)
-								tp.AddChild (new CSharpTokenNode (Convert (varianceLocation [0]), TypeParameterDeclaration.OutVarianceKeywordRole), TypeParameterDeclaration.OutVarianceKeywordRole);
+								tp.AddChild(new CSharpTokenNode(Convert(varianceLocation [0]), TypeParameterDeclaration.OutVarianceKeywordRole), TypeParameterDeclaration.OutVarianceKeywordRole);
 							break;
 						default:
 							tp.Variance = VarianceModifier.Invariant;
@@ -2566,7 +2550,7 @@ namespace ICSharpCode.NRefactory.CSharp
 							
 					}
 					
-					AddAttributeSection (tp, arg.OptAttributes);
+					AddAttributeSection(tp, arg.OptAttributes);
 
 					switch (arg.Variance) {
 						case Variance.Covariant:
@@ -2576,55 +2560,55 @@ namespace ICSharpCode.NRefactory.CSharp
 							tp.Variance = VarianceModifier.Contravariant;
 							break;
 					}
-					tp.AddChild (Identifier.Create (arg.Name, Convert (arg.Location)), Roles.Identifier);
-					parent.AddChild (tp, Roles.TypeParameter);
+					tp.AddChild(Identifier.Create(arg.Name, Convert(arg.Location)), Roles.Identifier);
+					parent.AddChild(tp, Roles.TypeParameter);
 				}
 				if (chevronLocs != null)
-					parent.AddChild (new CSharpTokenNode (Convert (chevronLocs [chevronLocs.Count - 1]), Roles.RChevron), Roles.RChevron);
+					parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [chevronLocs.Count - 1]), Roles.RChevron), Roles.RChevron);
 			}
-			
-			void AddTypeArguments (AstNode parent, MemberName memberName)
+
+			void AddTypeArguments(AstNode parent, MemberName memberName)
 			{
 				if (memberName == null || memberName.TypeParameters == null)
 					return;
-				var chevronLocs = LocationsBag.GetLocations (memberName.TypeParameters);
+				var chevronLocs = LocationsBag.GetLocations(memberName.TypeParameters);
 				if (chevronLocs != null)
-					parent.AddChild (new CSharpTokenNode (Convert (chevronLocs [chevronLocs.Count - 2]), Roles.LChevron), Roles.LChevron);
+					parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [chevronLocs.Count - 2]), Roles.LChevron), Roles.LChevron);
 				
 				for (int i = 0; i < memberName.TypeParameters.Count; i++) {
 					var arg = memberName.TypeParameters [i];
 					if (arg == null)
 						continue;
-					parent.AddChild (ConvertToType (arg), Roles.TypeArgument);
+					parent.AddChild(ConvertToType(arg), Roles.TypeArgument);
 					if (chevronLocs != null && i < chevronLocs.Count - 2)
-						parent.AddChild (new CSharpTokenNode (Convert (chevronLocs [i]), Roles.Comma), Roles.Comma);
+						parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [i]), Roles.Comma), Roles.Comma);
 				}
 				
 				if (chevronLocs != null)
-					parent.AddChild (new CSharpTokenNode (Convert (chevronLocs [chevronLocs.Count - 1]), Roles.RChevron), Roles.RChevron);
+					parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [chevronLocs.Count - 1]), Roles.RChevron), Roles.RChevron);
 			}
-			
-			void AddTypeArguments (AstNode parent, ATypeNameExpression memberName)
+
+			void AddTypeArguments(AstNode parent, ATypeNameExpression memberName)
 			{
 				if (memberName == null || !memberName.HasTypeArguments)
 					return;
-				var chevronLocs = LocationsBag.GetLocations (memberName.TypeArguments);
+				var chevronLocs = LocationsBag.GetLocations(memberName.TypeArguments);
 				if (chevronLocs != null)
-					parent.AddChild (new CSharpTokenNode (Convert (chevronLocs [chevronLocs.Count - 2]), Roles.LChevron), Roles.LChevron);
+					parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [chevronLocs.Count - 2]), Roles.LChevron), Roles.LChevron);
 				
 				for (int i = 0; i < memberName.TypeArguments.Count; i++) {
 					var arg = memberName.TypeArguments.Args [i];
 					if (arg == null)
 						continue;
-					parent.AddChild (ConvertToType (arg), Roles.TypeArgument);
+					parent.AddChild(ConvertToType(arg), Roles.TypeArgument);
 					if (chevronLocs != null && i < chevronLocs.Count - 2)
-						parent.AddChild (new CSharpTokenNode (Convert (chevronLocs [i]), Roles.Comma), Roles.Comma);
+						parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [i]), Roles.Comma), Roles.Comma);
 				}
 				
 				if (chevronLocs != null)
-					parent.AddChild (new CSharpTokenNode (Convert (chevronLocs [chevronLocs.Count - 1]), Roles.RChevron), Roles.RChevron);
+					parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [chevronLocs.Count - 1]), Roles.RChevron), Roles.RChevron);
 			}
-			
+
 			void AddConstraints(AstNode parent, TypeParameters d)
 			{
 				if (d == null)
@@ -2636,36 +2620,36 @@ namespace ICSharpCode.NRefactory.CSharp
 					var c = typeParameter.Constraints;
 					if (c == null)
 						continue;
-					var location = LocationsBag.GetLocations (c);
-					var constraint = new Constraint ();
-					constraint.AddChild (new CSharpTokenNode (Convert (c.Location), Roles.WhereKeyword), Roles.WhereKeyword);
-					constraint.AddChild (new SimpleType (Identifier.Create (c.TypeParameter.Value, Convert (c.TypeParameter.Location))), Roles.ConstraintTypeParameter);
+					var location = LocationsBag.GetLocations(c);
+					var constraint = new Constraint();
+					constraint.AddChild(new CSharpTokenNode(Convert(c.Location), Roles.WhereKeyword), Roles.WhereKeyword);
+					constraint.AddChild(new SimpleType(Identifier.Create(c.TypeParameter.Value, Convert(c.TypeParameter.Location))), Roles.ConstraintTypeParameter);
 					if (location != null)
-						constraint.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.Colon), Roles.Colon);
-					var commaLocs = LocationsBag.GetLocations (c.ConstraintExpressions);
+						constraint.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Colon), Roles.Colon);
+					var commaLocs = LocationsBag.GetLocations(c.ConstraintExpressions);
 					int curComma = 0;
 					if (c.ConstraintExpressions != null) {
 						foreach (var expr in c.ConstraintExpressions) {
-							constraint.AddChild (ConvertToType (expr), Roles.BaseType);
-							if (expr is SpecialContraintExpr) {
-								var sce = (SpecialContraintExpr)expr;
+							constraint.AddChild(ConvertToType(expr), Roles.BaseType);
+							var sce = expr as SpecialContraintExpr;
+							if (sce != null) {
 								switch (sce.Constraint) {
 									case SpecialConstraint.Class:
 										break;
 									case SpecialConstraint.Struct:
 										break;
 									case SpecialConstraint.Constructor:
-										var bl = LocationsBag.GetLocations (expr);
+										var bl = LocationsBag.GetLocations(expr);
 										if (bl != null) {
-											constraint.AddChild (new CSharpTokenNode (Convert (bl[0]), Roles.LPar), Roles.LPar);
-											constraint.AddChild (new CSharpTokenNode (Convert (bl[1]), Roles.RPar), Roles.RPar);
+											constraint.AddChild(new CSharpTokenNode(Convert(bl [0]), Roles.LPar), Roles.LPar);
+											constraint.AddChild(new CSharpTokenNode(Convert(bl [1]), Roles.RPar), Roles.RPar);
 										}
 										break;
 								}
 							}
 
 							if (commaLocs != null && curComma < commaLocs.Count)
-								constraint.AddChild (new CSharpTokenNode (Convert (commaLocs [curComma++]), Roles.Comma), Roles.Comma);
+								constraint.AddChild(new CSharpTokenNode(Convert(commaLocs [curComma++]), Roles.Comma), Roles.Comma);
 						}
 					}
 					
@@ -2673,129 +2657,129 @@ namespace ICSharpCode.NRefactory.CSharp
 					AstNode prevSibling = parent.LastChild;
 					while (prevSibling.StartLocation > constraint.StartLocation && prevSibling.PrevSibling != null)
 						prevSibling = prevSibling.PrevSibling;
-					parent.InsertChildAfter (prevSibling, constraint, Roles.Constraint);
+					parent.InsertChildAfter(prevSibling, constraint, Roles.Constraint);
 				}
 			}
-			
-			Expression ConvertArgument (Argument arg)
+
+			Expression ConvertArgument(Argument arg)
 			{
-				if (arg is NamedArgument) {
-					var na = (NamedArgument)arg;
-					NamedArgumentExpression newArg = new NamedArgumentExpression ();
-					newArg.AddChild (Identifier.Create (na.Name, Convert (na.Location)), Roles.Identifier);
+				var na = arg as NamedArgument;
+				if (na != null) {
+					var newArg = new NamedArgumentExpression();
+					newArg.AddChild(Identifier.Create(na.Name, Convert(na.Location)), Roles.Identifier);
 					
-					var loc = LocationsBag.GetLocations (na);
+					var loc = LocationsBag.GetLocations(na);
 					if (loc != null)
-						newArg.AddChild (new CSharpTokenNode (Convert (loc [0]), Roles.Colon), Roles.Colon);
+						newArg.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Colon), Roles.Colon);
 					
 					if (arg.ArgType == Argument.AType.Out || arg.ArgType == Argument.AType.Ref) {
-						DirectionExpression direction = new DirectionExpression ();
+						var direction = new DirectionExpression();
 						direction.FieldDirection = arg.ArgType == Argument.AType.Out ? FieldDirection.Out : FieldDirection.Ref;
-						var argLocation = LocationsBag.GetLocations (arg);
+						var argLocation = LocationsBag.GetLocations(arg);
 						if (argLocation != null) {
 							var r = arg.ArgType == Argument.AType.Out ? DirectionExpression.OutKeywordRole : DirectionExpression.RefKeywordRole;
-							direction.AddChild (new CSharpTokenNode (Convert (argLocation [0]), r), r);
+							direction.AddChild(new CSharpTokenNode(Convert(argLocation [0]), r), r);
 						}
-						direction.AddChild ((Expression)arg.Expr.Accept (this), Roles.Expression);
-						newArg.AddChild (direction, Roles.Expression);
+						direction.AddChild((Expression)arg.Expr.Accept(this), Roles.Expression);
+						newArg.AddChild(direction, Roles.Expression);
 					} else {
-						newArg.AddChild (na.Expr != null ? (Expression)na.Expr.Accept (this) : new ErrorExpression ("Named argument expression parse error"), Roles.Expression);
+						newArg.AddChild(na.Expr != null ? (Expression)na.Expr.Accept(this) : new ErrorExpression("Named argument expression parse error"), Roles.Expression);
 					}
 					return newArg;
 				}
 				
 				if (arg.ArgType == Argument.AType.Out || arg.ArgType == Argument.AType.Ref) {
-					DirectionExpression direction = new DirectionExpression ();
+					var direction = new DirectionExpression();
 					direction.FieldDirection = arg.ArgType == Argument.AType.Out ? FieldDirection.Out : FieldDirection.Ref;
-					var argLocation = LocationsBag.GetLocations (arg);
+					var argLocation = LocationsBag.GetLocations(arg);
 					if (argLocation != null) {
 						var r = arg.ArgType == Argument.AType.Out ? DirectionExpression.OutKeywordRole : DirectionExpression.RefKeywordRole;
-						direction.AddChild (new CSharpTokenNode (Convert (argLocation [0]), r), r);
+						direction.AddChild(new CSharpTokenNode(Convert(argLocation [0]), r), r);
 					}
-					direction.AddChild ((Expression)arg.Expr.Accept (this), Roles.Expression);
+					direction.AddChild((Expression)arg.Expr.Accept(this), Roles.Expression);
 					return direction;
 				}
 				
-				return (Expression)arg.Expr.Accept (this);
+				return (Expression)arg.Expr.Accept(this);
 			}
-			
-			void AddArguments (AstNode parent, object location, Mono.CSharp.Arguments args)
+
+			void AddArguments(AstNode parent, Arguments args)
 			{
 				if (args == null)
 					return;
 				
-				var commaLocations = LocationsBag.GetLocations (args);
+				var commaLocations = LocationsBag.GetLocations(args);
 				for (int i = 0; i < args.Count; i++) {
-					parent.AddChild (ConvertArgument (args [i]), Roles.Argument);
+					parent.AddChild(ConvertArgument(args [i]), Roles.Argument);
 					if (commaLocations != null && i < commaLocations.Count) {
-						parent.AddChild (new CSharpTokenNode (Convert (commaLocations [i]), Roles.Comma), Roles.Comma);
+						parent.AddChild(new CSharpTokenNode(Convert(commaLocations [i]), Roles.Comma), Roles.Comma);
 					}
 				}
 				if (commaLocations != null && commaLocations.Count > args.Count)
-					parent.AddChild (new CSharpTokenNode (Convert (commaLocations [args.Count]), Roles.Comma), Roles.Comma);
+					parent.AddChild(new CSharpTokenNode(Convert(commaLocations [args.Count]), Roles.Comma), Roles.Comma);
 			}
-			
-			public override object Visit (Invocation invocationExpression)
+
+			public override object Visit(Invocation invocationExpression)
 			{
-				var result = new InvocationExpression ();
-				var location = LocationsBag.GetLocations (invocationExpression);
+				var result = new InvocationExpression();
+				var location = LocationsBag.GetLocations(invocationExpression);
 				if (invocationExpression.Exp != null)
-					result.AddChild ((Expression)invocationExpression.Exp.Accept (this), Roles.TargetExpression);
+					result.AddChild((Expression)invocationExpression.Exp.Accept(this), Roles.TargetExpression);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
-				AddArguments (result, location, invocationExpression.Arguments);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				AddArguments(result, invocationExpression.Arguments);
 				
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				return result;
 			}
-			
-			public override object Visit (New newExpression)
+
+			public override object Visit(New newExpression)
 			{
-				var result = new ObjectCreateExpression ();
-				var location = LocationsBag.GetLocations (newExpression);
-				result.AddChild (new CSharpTokenNode (Convert (newExpression.Location), ObjectCreateExpression.NewKeywordRole), ObjectCreateExpression.NewKeywordRole);
+				var result = new ObjectCreateExpression();
+				var location = LocationsBag.GetLocations(newExpression);
+				result.AddChild(new CSharpTokenNode(Convert(newExpression.Location), ObjectCreateExpression.NewKeywordRole), ObjectCreateExpression.NewKeywordRole);
 				
 				if (newExpression.TypeRequested != null)
-					result.AddChild (ConvertToType (newExpression.TypeRequested), Roles.Type);
+					result.AddChild(ConvertToType(newExpression.TypeRequested), Roles.Type);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
-				AddArguments (result, location, newExpression.Arguments);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				AddArguments(result, newExpression.Arguments);
 				
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				
 				return result;
 			}
-			
-			public override object Visit (NewAnonymousType newAnonymousType)
+
+			public override object Visit(NewAnonymousType newAnonymousType)
 			{
-				var result = new AnonymousTypeCreateExpression ();
-				var location = LocationsBag.GetLocations (newAnonymousType);
-				result.AddChild (new CSharpTokenNode (Convert (newAnonymousType.Location), ObjectCreateExpression.NewKeywordRole), ObjectCreateExpression.NewKeywordRole);
+				var result = new AnonymousTypeCreateExpression();
+				var location = LocationsBag.GetLocations(newAnonymousType);
+				result.AddChild(new CSharpTokenNode(Convert(newAnonymousType.Location), ObjectCreateExpression.NewKeywordRole), ObjectCreateExpression.NewKeywordRole);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LBrace), Roles.LBrace);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LBrace), Roles.LBrace);
 				if (newAnonymousType.Parameters != null) {
 					foreach (var par in newAnonymousType.Parameters) {
 						if (par == null)
 							continue;
-						var parLocation = LocationsBag.GetLocations (par);
+						var parLocation = LocationsBag.GetLocations(par);
 						
 						if (parLocation == null) {
 							if (par.Expr != null)
-								result.AddChild ((Expression)par.Expr.Accept (this), Roles.Expression);
+								result.AddChild((Expression)par.Expr.Accept(this), Roles.Expression);
 						} else {
-							var namedExpression = new NamedExpression ();
-							namedExpression.AddChild (Identifier.Create (par.Name, Convert (par.Location)), Roles.Identifier);
-							namedExpression.AddChild (new CSharpTokenNode (Convert (parLocation [0]), Roles.Assign), Roles.Assign);
+							var namedExpression = new NamedExpression();
+							namedExpression.AddChild(Identifier.Create(par.Name, Convert(par.Location)), Roles.Identifier);
+							namedExpression.AddChild(new CSharpTokenNode(Convert(parLocation [0]), Roles.Assign), Roles.Assign);
 							if (par.Expr != null)
-								namedExpression.AddChild ((Expression)par.Expr.Accept (this), Roles.Expression);
-							result.AddChild (namedExpression, Roles.Expression);
+								namedExpression.AddChild((Expression)par.Expr.Accept(this), Roles.Expression);
+							result.AddChild(namedExpression, Roles.Expression);
 						}
 					}
 				}
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RBrace), Roles.RBrace);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RBrace), Roles.RBrace);
 				return result;
 			}
 
@@ -2825,14 +2809,14 @@ namespace ICSharpCode.NRefactory.CSharp
 							parent = new ArrayInitializerExpression();
 							parent.AddChild(new CSharpTokenNode(Convert(collectionInit.Location), Roles.LBrace), Roles.LBrace);
 						} else {
-							parent = ArrayInitializerExpression.CreateSingleElementInitializer ();
+							parent = ArrayInitializerExpression.CreateSingleElementInitializer();
 						}
 						for (int i = 0; i < collectionInit.Arguments.Count; i++) {
 							var arg = collectionInit.Arguments [i] as CollectionElementInitializer.ElementInitializerArgument;
 							if (arg == null)
 								continue;
 							parent.AddChild(
-								(ICSharpCode.NRefactory.CSharp.Expression)arg.Expr.Accept(this),
+								(Expression)arg.Expr.Accept(this),
 								Roles.Expression
 							);
 						}
@@ -2855,11 +2839,12 @@ namespace ICSharpCode.NRefactory.CSharp
 							if (assignLoc != null)
 								nexpr.AddChild(new CSharpTokenNode(Convert(assignLoc [0]), Roles.Assign), Roles.Assign);
 							if (eleInit.Source != null) {
-								if (eleInit.Source is CollectionOrObjectInitializers) {
+								var colInit = eleInit.Source as CollectionOrObjectInitializers;
+								if (colInit != null) {
 									var arrInit = new ArrayInitializerExpression();
 									AddConvertCollectionOrObjectInitializers(
 										arrInit,
-										eleInit.Source as CollectionOrObjectInitializers
+										colInit
 									);
 									nexpr.AddChild(arrInit, Roles.Expression);
 								} else {
@@ -2881,37 +2866,36 @@ namespace ICSharpCode.NRefactory.CSharp
 				}
 			}
 
-			
-			public override object Visit (NewInitialize newInitializeExpression)
+			public override object Visit(NewInitialize newInitializeExpression)
 			{
-				var result = new ObjectCreateExpression ();
-				result.AddChild (new CSharpTokenNode (Convert (newInitializeExpression.Location), ObjectCreateExpression.NewKeywordRole), ObjectCreateExpression.NewKeywordRole);
+				var result = new ObjectCreateExpression();
+				result.AddChild(new CSharpTokenNode(Convert(newInitializeExpression.Location), ObjectCreateExpression.NewKeywordRole), ObjectCreateExpression.NewKeywordRole);
 				
 				if (newInitializeExpression.TypeRequested != null)
-					result.AddChild (ConvertToType (newInitializeExpression.TypeRequested), Roles.Type);
+					result.AddChild(ConvertToType(newInitializeExpression.TypeRequested), Roles.Type);
 				
-				var location = LocationsBag.GetLocations (newInitializeExpression);
+				var location = LocationsBag.GetLocations(newInitializeExpression);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
-				AddArguments (result, location, newInitializeExpression.Arguments);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				AddArguments(result, newInitializeExpression.Arguments);
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				
-				var init = ConvertCollectionOrObjectInitializers (newInitializeExpression.Initializers);
+				var init = ConvertCollectionOrObjectInitializers(newInitializeExpression.Initializers);
 				if (init != null)
-					result.AddChild (init, ObjectCreateExpression.InitializerRole);
+					result.AddChild(init, ObjectCreateExpression.InitializerRole);
 				
 				return result;
 			}
-			
-			public override object Visit (ArrayCreation arrayCreationExpression)
+
+			public override object Visit(ArrayCreation arrayCreationExpression)
 			{
-				var result = new ArrayCreateExpression ();
+				var result = new ArrayCreateExpression();
 				
-				var location = LocationsBag.GetLocations (arrayCreationExpression);
-				result.AddChild (new CSharpTokenNode (Convert (arrayCreationExpression.Location), ArrayCreateExpression.NewKeywordRole), ArrayCreateExpression.NewKeywordRole);
+				var location = LocationsBag.GetLocations(arrayCreationExpression);
+				result.AddChild(new CSharpTokenNode(Convert(arrayCreationExpression.Location), ArrayCreateExpression.NewKeywordRole), ArrayCreateExpression.NewKeywordRole);
 				if (arrayCreationExpression.TypeExpression != null)
-					result.AddChild (ConvertToType (arrayCreationExpression.TypeExpression), Roles.Type);
+					result.AddChild(ConvertToType(arrayCreationExpression.TypeExpression), Roles.Type);
 				
 				var next = arrayCreationExpression.Rank;
 				if (arrayCreationExpression.Arguments != null) {
@@ -2919,249 +2903,253 @@ namespace ICSharpCode.NRefactory.CSharp
 					next = next.Next;
 					
 					if (location != null)
-						result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LBracket), Roles.LBracket);
+						result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LBracket), Roles.LBracket);
 					
-					var commaLocations = LocationsBag.GetLocations (arrayCreationExpression.Arguments);
+					var commaLocations = LocationsBag.GetLocations(arrayCreationExpression.Arguments);
 					for (int i = 0; i < arrayCreationExpression.Arguments.Count; i++) {
-						result.AddChild ((Expression)arrayCreationExpression.Arguments [i].Accept (this), Roles.Argument);
+						var arg = arrayCreationExpression.Arguments [i];
+						if (arg != null)
+							result.AddChild((Expression)arg.Accept(this), Roles.Argument);
 						if (commaLocations != null && i < commaLocations.Count)
-							result.AddChild (new CSharpTokenNode (Convert (commaLocations [i]), Roles.Comma), Roles.Comma);
+							result.AddChild(new CSharpTokenNode(Convert(commaLocations [i]), Roles.Comma), Roles.Comma);
 					}
 					if (location != null && location.Count > 1)
-						result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RBracket), Roles.RBracket);
+						result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RBracket), Roles.RBracket);
 					
 				}
 				
 				while (next != null) {
-					ArraySpecifier spec = new ArraySpecifier (next.Dimension);
-					var loc = LocationsBag.GetLocations (next);
-					spec.AddChild (new CSharpTokenNode (Convert (next.Location), Roles.LBracket), Roles.LBracket);
-					result.AddChild (spec, ArrayCreateExpression.AdditionalArraySpecifierRole);
+					var spec = new ArraySpecifier(next.Dimension);
+					var loc = LocationsBag.GetLocations(next);
+					spec.AddChild(new CSharpTokenNode(Convert(next.Location), Roles.LBracket), Roles.LBracket);
+					result.AddChild(spec, ArrayCreateExpression.AdditionalArraySpecifierRole);
 					if (loc != null)
-						result.AddChild (new CSharpTokenNode (Convert (loc [0]), Roles.RBracket), Roles.RBracket);
+						result.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.RBracket), Roles.RBracket);
 					next = next.Next;
 				}
 				
 				if (arrayCreationExpression.Initializers != null) {
-					var initLocation = LocationsBag.GetLocations (arrayCreationExpression.Initializers);
-					ArrayInitializerExpression initializer = new ArrayInitializerExpression ();
+					var initLocation = LocationsBag.GetLocations(arrayCreationExpression.Initializers);
+					var initializer = new ArrayInitializerExpression();
 					
-					initializer.AddChild (new CSharpTokenNode (Convert (arrayCreationExpression.Initializers.Location), Roles.LBrace), Roles.LBrace);
-					var commaLocations = LocationsBag.GetLocations (arrayCreationExpression.Initializers.Elements);
+					initializer.AddChild(new CSharpTokenNode(Convert(arrayCreationExpression.Initializers.Location), Roles.LBrace), Roles.LBrace);
+					var commaLocations = LocationsBag.GetLocations(arrayCreationExpression.Initializers.Elements);
 					for (int i = 0; i < arrayCreationExpression.Initializers.Count; i++) {
 						var init = arrayCreationExpression.Initializers [i];
 						if (init == null)
 							continue;
-						initializer.AddChild ((Expression)init.Accept (this), Roles.Expression);
+						initializer.AddChild((Expression)init.Accept(this), Roles.Expression);
 						if (commaLocations != null && i < commaLocations.Count) {
-							initializer.AddChild (new CSharpTokenNode (Convert (commaLocations [i]), Roles.Comma), Roles.Comma);
+							initializer.AddChild(new CSharpTokenNode(Convert(commaLocations [i]), Roles.Comma), Roles.Comma);
 						}
 					}
 					if (initLocation != null) {
 						if (initLocation.Count == 2) // optional comma
-							initializer.AddChild (new CSharpTokenNode(Convert(initLocation [0]), Roles.Comma), Roles.Comma);
-						initializer.AddChild (new CSharpTokenNode (Convert (initLocation [initLocation.Count - 1]), Roles.RBrace), Roles.RBrace);
+							initializer.AddChild(new CSharpTokenNode(Convert(initLocation [0]), Roles.Comma), Roles.Comma);
+						initializer.AddChild(new CSharpTokenNode(Convert(initLocation [initLocation.Count - 1]), Roles.RBrace), Roles.RBrace);
 					}
-					result.AddChild (initializer, ArrayCreateExpression.InitializerRole);
+					result.AddChild(initializer, ArrayCreateExpression.InitializerRole);
 				}
 				
 				return result;
 			}
-			
-			public override object Visit (This thisExpression)
+
+			public override object Visit(This thisExpression)
 			{
-				var result = new ThisReferenceExpression ();
-				result.Location = Convert (thisExpression.Location);
+				var result = new ThisReferenceExpression();
+				result.Location = Convert(thisExpression.Location);
 				return result;
 			}
-			
-			public override object Visit (ArglistAccess argListAccessExpression)
+
+			public override object Visit(ArglistAccess argListAccessExpression)
 			{
-				var result = new UndocumentedExpression () {
+				var result = new UndocumentedExpression {
 					UndocumentedExpressionType = UndocumentedExpressionType.ArgListAccess
 				};
-				result.AddChild (new CSharpTokenNode (Convert (argListAccessExpression.Location), UndocumentedExpression.ArglistKeywordRole), UndocumentedExpression.ArglistKeywordRole);
+				result.AddChild(new CSharpTokenNode(Convert(argListAccessExpression.Location), UndocumentedExpression.ArglistKeywordRole), UndocumentedExpression.ArglistKeywordRole);
 				return result;
 			}
-			
+
 			#region Undocumented expressions
-			public override object Visit (Arglist argListExpression)
+
+			public override object Visit(Arglist argListExpression)
 			{
-				var result = new UndocumentedExpression () { UndocumentedExpressionType = UndocumentedExpressionType.ArgList };
-				result.AddChild (new CSharpTokenNode (Convert (argListExpression.Location), UndocumentedExpression.ArglistKeywordRole), UndocumentedExpression.ArglistKeywordRole);
-				var location = LocationsBag.GetLocations (argListExpression);
+				var result = new UndocumentedExpression { UndocumentedExpressionType = UndocumentedExpressionType.ArgList };
+				result.AddChild(new CSharpTokenNode(Convert(argListExpression.Location), UndocumentedExpression.ArglistKeywordRole), UndocumentedExpression.ArglistKeywordRole);
+				var location = LocationsBag.GetLocations(argListExpression);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				
-				AddArguments (result, location, argListExpression.Arguments);
+				AddArguments(result, argListExpression.Arguments);
 				
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				return result;
 			}
-			
-			public override object Visit (MakeRefExpr makeRefExpr)
+
+			public override object Visit(MakeRefExpr makeRefExpr)
 			{
-				var result = new UndocumentedExpression () { UndocumentedExpressionType = UndocumentedExpressionType.MakeRef };
-				result.AddChild (new CSharpTokenNode (Convert (makeRefExpr.Location), UndocumentedExpression.MakerefKeywordRole), UndocumentedExpression.MakerefKeywordRole);
-				var location = LocationsBag.GetLocations (makeRefExpr);
+				var result = new UndocumentedExpression { UndocumentedExpressionType = UndocumentedExpressionType.MakeRef };
+				result.AddChild(new CSharpTokenNode(Convert(makeRefExpr.Location), UndocumentedExpression.MakerefKeywordRole), UndocumentedExpression.MakerefKeywordRole);
+				var location = LocationsBag.GetLocations(makeRefExpr);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				if (makeRefExpr.Expr != null)
-					result.AddChild ((Expression)makeRefExpr.Expr.Accept (this), Roles.Argument);
+					result.AddChild((Expression)makeRefExpr.Expr.Accept(this), Roles.Argument);
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				return result;
 			}
-			
-			public override object Visit (RefTypeExpr refTypeExpr)
+
+			public override object Visit(RefTypeExpr refTypeExpr)
 			{
-				var result = new UndocumentedExpression () { UndocumentedExpressionType = UndocumentedExpressionType.RefType };
-				result.AddChild (new CSharpTokenNode (Convert (refTypeExpr.Location), UndocumentedExpression.ReftypeKeywordRole), UndocumentedExpression.ReftypeKeywordRole);
-				var location = LocationsBag.GetLocations (refTypeExpr);
+				var result = new UndocumentedExpression { UndocumentedExpressionType = UndocumentedExpressionType.RefType };
+				result.AddChild(new CSharpTokenNode(Convert(refTypeExpr.Location), UndocumentedExpression.ReftypeKeywordRole), UndocumentedExpression.ReftypeKeywordRole);
+				var location = LocationsBag.GetLocations(refTypeExpr);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				
 				if (refTypeExpr.Expr != null)
-					result.AddChild ((Expression)refTypeExpr.Expr.Accept (this), Roles.Argument);
+					result.AddChild((Expression)refTypeExpr.Expr.Accept(this), Roles.Argument);
 				
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				return result;
 			}
-			
-			public override object Visit (RefValueExpr refValueExpr)
+
+			public override object Visit(RefValueExpr refValueExpr)
 			{
-				var result = new UndocumentedExpression () { UndocumentedExpressionType = UndocumentedExpressionType.RefValue };
-				result.AddChild (new CSharpTokenNode (Convert (refValueExpr.Location), UndocumentedExpression.RefvalueKeywordRole), UndocumentedExpression.RefvalueKeywordRole);
-				var location = LocationsBag.GetLocations (refValueExpr);
+				var result = new UndocumentedExpression { UndocumentedExpressionType = UndocumentedExpressionType.RefValue };
+				result.AddChild(new CSharpTokenNode(Convert(refValueExpr.Location), UndocumentedExpression.RefvalueKeywordRole), UndocumentedExpression.RefvalueKeywordRole);
+				var location = LocationsBag.GetLocations(refValueExpr);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				
 				
 				if (refValueExpr.Expr != null)
-					result.AddChild ((Expression)refValueExpr.Expr.Accept (this), Roles.Argument);
+					result.AddChild((Expression)refValueExpr.Expr.Accept(this), Roles.Argument);
 
 				if (refValueExpr.FullNamedExpression != null)
-					result.AddChild ((Expression)refValueExpr.FullNamedExpression.Accept (this), Roles.Argument);
+					result.AddChild((Expression)refValueExpr.FullNamedExpression.Accept(this), Roles.Argument);
 				
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				return result;
 			}
+
 			#endregion
-			
-			public override object Visit (TypeOf typeOfExpression)
+
+			public override object Visit(TypeOf typeOfExpression)
 			{
-				var result = new TypeOfExpression ();
-				var location = LocationsBag.GetLocations (typeOfExpression);
-				result.AddChild (new CSharpTokenNode (Convert (typeOfExpression.Location), TypeOfExpression.TypeofKeywordRole), TypeOfExpression.TypeofKeywordRole);
+				var result = new TypeOfExpression();
+				var location = LocationsBag.GetLocations(typeOfExpression);
+				result.AddChild(new CSharpTokenNode(Convert(typeOfExpression.Location), TypeOfExpression.TypeofKeywordRole), TypeOfExpression.TypeofKeywordRole);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				if (typeOfExpression.TypeExpression != null)
-					result.AddChild (ConvertToType (typeOfExpression.TypeExpression), Roles.Type);
+					result.AddChild(ConvertToType(typeOfExpression.TypeExpression), Roles.Type);
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				return result;
 			}
-			
-			public override object Visit (SizeOf sizeOfExpression)
+
+			public override object Visit(SizeOf sizeOfExpression)
 			{
-				var result = new SizeOfExpression ();
-				var location = LocationsBag.GetLocations (sizeOfExpression);
-				result.AddChild (new CSharpTokenNode (Convert (sizeOfExpression.Location), SizeOfExpression.SizeofKeywordRole), SizeOfExpression.SizeofKeywordRole);
+				var result = new SizeOfExpression();
+				var location = LocationsBag.GetLocations(sizeOfExpression);
+				result.AddChild(new CSharpTokenNode(Convert(sizeOfExpression.Location), SizeOfExpression.SizeofKeywordRole), SizeOfExpression.SizeofKeywordRole);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				if (sizeOfExpression.TypeExpression != null)
-					result.AddChild (ConvertToType (sizeOfExpression.TypeExpression), Roles.Type);
+					result.AddChild(ConvertToType(sizeOfExpression.TypeExpression), Roles.Type);
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				return result;
 			}
-			
-			public override object Visit (CheckedExpr checkedExpression)
+
+			public override object Visit(CheckedExpr checkedExpression)
 			{
-				var result = new CheckedExpression ();
-				var location = LocationsBag.GetLocations (checkedExpression);
-				result.AddChild (new CSharpTokenNode (Convert (checkedExpression.Location), CheckedExpression.CheckedKeywordRole), CheckedExpression.CheckedKeywordRole);
+				var result = new CheckedExpression();
+				var location = LocationsBag.GetLocations(checkedExpression);
+				result.AddChild(new CSharpTokenNode(Convert(checkedExpression.Location), CheckedExpression.CheckedKeywordRole), CheckedExpression.CheckedKeywordRole);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				if (checkedExpression.Expr != null)
-					result.AddChild ((Expression)checkedExpression.Expr.Accept (this), Roles.Expression);
+					result.AddChild((Expression)checkedExpression.Expr.Accept(this), Roles.Expression);
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				return result;
 			}
-			
-			public override object Visit (UnCheckedExpr uncheckedExpression)
+
+			public override object Visit(UnCheckedExpr uncheckedExpression)
 			{
-				var result = new UncheckedExpression ();
-				var location = LocationsBag.GetLocations (uncheckedExpression);
-				result.AddChild (new CSharpTokenNode (Convert (uncheckedExpression.Location), UncheckedExpression.UncheckedKeywordRole), UncheckedExpression.UncheckedKeywordRole);
+				var result = new UncheckedExpression();
+				var location = LocationsBag.GetLocations(uncheckedExpression);
+				result.AddChild(new CSharpTokenNode(Convert(uncheckedExpression.Location), UncheckedExpression.UncheckedKeywordRole), UncheckedExpression.UncheckedKeywordRole);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
 				if (uncheckedExpression.Expr != null)
-					result.AddChild ((Expression)uncheckedExpression.Expr.Accept (this), Roles.Expression);
+					result.AddChild((Expression)uncheckedExpression.Expr.Accept(this), Roles.Expression);
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.RPar), Roles.RPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
 				return result;
 			}
-			
-			public override object Visit (ElementAccess elementAccessExpression)
+
+			public override object Visit(ElementAccess elementAccessExpression)
 			{
-				IndexerExpression result = new IndexerExpression ();
-				var location = LocationsBag.GetLocations (elementAccessExpression);
+				var result = new IndexerExpression();
+				var location = LocationsBag.GetLocations(elementAccessExpression);
 				
 				if (elementAccessExpression.Expr != null)
-					result.AddChild ((Expression)elementAccessExpression.Expr.Accept (this), Roles.TargetExpression);
-				result.AddChild (new CSharpTokenNode (Convert (elementAccessExpression.Location), Roles.LBracket), Roles.LBracket);
-				AddArguments (result, location, elementAccessExpression.Arguments);
+					result.AddChild((Expression)elementAccessExpression.Expr.Accept(this), Roles.TargetExpression);
+				result.AddChild(new CSharpTokenNode(Convert(elementAccessExpression.Location), Roles.LBracket), Roles.LBracket);
+				AddArguments(result, elementAccessExpression.Arguments);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.RBracket), Roles.RBracket);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.RBracket), Roles.RBracket);
 				return result;
 			}
-			
-			public override object Visit (BaseThis baseAccessExpression)
+
+			public override object Visit(BaseThis baseAccessExpression)
 			{
-				var result = new BaseReferenceExpression ();
-				result.Location = Convert (baseAccessExpression.Location);
+				var result = new BaseReferenceExpression();
+				result.Location = Convert(baseAccessExpression.Location);
 				return result;
 			}
-			
-			public override object Visit (StackAlloc stackAllocExpression)
+
+			public override object Visit(StackAlloc stackAllocExpression)
 			{
-				var result = new StackAllocExpression ();
+				var result = new StackAllocExpression();
 				
-				var location = LocationsBag.GetLocations (stackAllocExpression);
+				var location = LocationsBag.GetLocations(stackAllocExpression);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), StackAllocExpression.StackallocKeywordRole), StackAllocExpression.StackallocKeywordRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), StackAllocExpression.StackallocKeywordRole), StackAllocExpression.StackallocKeywordRole);
 				if (stackAllocExpression.TypeExpression != null)
-					result.AddChild (ConvertToType (stackAllocExpression.TypeExpression), Roles.Type);
+					result.AddChild(ConvertToType(stackAllocExpression.TypeExpression), Roles.Type);
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), Roles.LBracket), Roles.LBracket);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.LBracket), Roles.LBracket);
 				if (stackAllocExpression.CountExpression != null)
-					result.AddChild ((Expression)stackAllocExpression.CountExpression.Accept (this), Roles.Expression);
+					result.AddChild((Expression)stackAllocExpression.CountExpression.Accept(this), Roles.Expression);
 				if (location != null && location.Count > 2)
-					result.AddChild (new CSharpTokenNode (Convert (location [2]), Roles.RBracket), Roles.RBracket);
+					result.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.RBracket), Roles.RBracket);
 				return result;
 			}
-			
-			public override object Visit (SimpleAssign simpleAssign)
+
+			public override object Visit(SimpleAssign simpleAssign)
 			{
-				var result = new AssignmentExpression ();
+				var result = new AssignmentExpression();
 				
 				result.Operator = AssignmentOperatorType.Assign;
 				if (simpleAssign.Target != null)
-					result.AddChild ((Expression)simpleAssign.Target.Accept (this), AssignmentExpression.LeftRole);
-				var location = LocationsBag.GetLocations (simpleAssign);
+					result.AddChild((Expression)simpleAssign.Target.Accept(this), AssignmentExpression.LeftRole);
+				var location = LocationsBag.GetLocations(simpleAssign);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location[0]), AssignmentExpression.AssignRole), AssignmentExpression.AssignRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), AssignmentExpression.AssignRole), AssignmentExpression.AssignRole);
 				if (simpleAssign.Source != null) {
-					result.AddChild ((Expression)simpleAssign.Source.Accept (this), AssignmentExpression.RightRole);
+					result.AddChild((Expression)simpleAssign.Source.Accept(this), AssignmentExpression.RightRole);
 				}
 				return result;
 			}
-			
+
 			public override object Visit(CompoundAssign compoundAssign)
 			{
 				var result = new AssignmentExpression();
@@ -3202,371 +3190,383 @@ namespace ICSharpCode.NRefactory.CSharp
 					result.AddChild((Expression)compoundAssign.Target.Accept(this), AssignmentExpression.LeftRole);
 				var location = LocationsBag.GetLocations(compoundAssign);
 				if (location != null) {
-					var r = AssignmentExpression.GetOperatorRole (result.Operator);
+					var r = AssignmentExpression.GetOperatorRole(result.Operator);
 					result.AddChild(new CSharpTokenNode(Convert(location [0]), r), r);
 				}
 				if (compoundAssign.Source != null)
-					result.AddChild ((Expression)compoundAssign.Source.Accept (this), AssignmentExpression.RightRole);
+					result.AddChild((Expression)compoundAssign.Source.Accept(this), AssignmentExpression.RightRole);
 				return result;
 			}
-			
-			public override object Visit (Mono.CSharp.AnonymousMethodExpression anonymousMethodExpression)
+
+			public override object Visit(Mono.CSharp.AnonymousMethodExpression anonymousMethodExpression)
 			{
-				var result = new AnonymousMethodExpression ();
-				var location = LocationsBag.GetLocations (anonymousMethodExpression);
+				var result = new AnonymousMethodExpression();
+				var location = LocationsBag.GetLocations(anonymousMethodExpression);
 				int l = 0;
 				if (anonymousMethodExpression.IsAsync) {
 					result.IsAsync = true;
-					result.AddChild (new CSharpTokenNode (Convert (location [l++]), AnonymousMethodExpression.AsyncModifierRole), AnonymousMethodExpression.AsyncModifierRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [l++]), AnonymousMethodExpression.AsyncModifierRole), AnonymousMethodExpression.AsyncModifierRole);
 				}
 				if (location != null) {
-					result.AddChild (new CSharpTokenNode (Convert (location [l++]), AnonymousMethodExpression.DelegateKeywordRole), AnonymousMethodExpression.DelegateKeywordRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [l++]), AnonymousMethodExpression.DelegateKeywordRole), AnonymousMethodExpression.DelegateKeywordRole);
 					
 					if (location.Count > l) {
 						result.HasParameterList = true;
-						result.AddChild (new CSharpTokenNode (Convert (location [l++]), Roles.LPar), Roles.LPar);
-						AddParameter (result, anonymousMethodExpression.Parameters);
-						result.AddChild (new CSharpTokenNode (Convert (location [l++]), Roles.RPar), Roles.RPar);
+						result.AddChild(new CSharpTokenNode(Convert(location [l++]), Roles.LPar), Roles.LPar);
+						AddParameter(result, anonymousMethodExpression.Parameters);
+						result.AddChild(new CSharpTokenNode(Convert(location [l++]), Roles.RPar), Roles.RPar);
 					}
 				}
 				if (anonymousMethodExpression.Block != null)
-					result.AddChild ((BlockStatement)anonymousMethodExpression.Block.Accept (this), Roles.Body);
+					result.AddChild((BlockStatement)anonymousMethodExpression.Block.Accept(this), Roles.Body);
 				return result;
 			}
 
-			public override object Visit (Mono.CSharp.LambdaExpression lambdaExpression)
+			public override object Visit(Mono.CSharp.LambdaExpression lambdaExpression)
 			{
-				var result = new LambdaExpression ();
-				var location = LocationsBag.GetLocations (lambdaExpression);
+				var result = new LambdaExpression();
+				var location = LocationsBag.GetLocations(lambdaExpression);
 				int l = 0;
 				if (lambdaExpression.IsAsync) {
 					result.IsAsync = true;
-					result.AddChild (new CSharpTokenNode (Convert (location [l++]), LambdaExpression.AsyncModifierRole), LambdaExpression.AsyncModifierRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [l++]), LambdaExpression.AsyncModifierRole), LambdaExpression.AsyncModifierRole);
 				}
 				if (location == null || location.Count == l + 1) {
 					if (lambdaExpression.Block != null)
-						AddParameter (result, lambdaExpression.Parameters);
+						AddParameter(result, lambdaExpression.Parameters);
 					if (location != null)
-						result.AddChild (new CSharpTokenNode (Convert (location [l++]), LambdaExpression.ArrowRole), LambdaExpression.ArrowRole);
+						result.AddChild(new CSharpTokenNode(Convert(location [l++]), LambdaExpression.ArrowRole), LambdaExpression.ArrowRole);
 				} else {
-					result.AddChild (new CSharpTokenNode (Convert (location [l++]), Roles.LPar), Roles.LPar);
+					result.AddChild(new CSharpTokenNode(Convert(location [l++]), Roles.LPar), Roles.LPar);
 					if (lambdaExpression.Block != null)
-						AddParameter (result, lambdaExpression.Parameters);
+						AddParameter(result, lambdaExpression.Parameters);
 					if (location != null) {
-						result.AddChild (new CSharpTokenNode (Convert (location [l++]), Roles.RPar), Roles.RPar);
-						result.AddChild (new CSharpTokenNode (Convert (location [l++]), LambdaExpression.ArrowRole), LambdaExpression.ArrowRole);
+						result.AddChild(new CSharpTokenNode(Convert(location [l++]), Roles.RPar), Roles.RPar);
+						result.AddChild(new CSharpTokenNode(Convert(location [l++]), LambdaExpression.ArrowRole), LambdaExpression.ArrowRole);
 					}
 				}
 				if (lambdaExpression.Block != null) {
 					if (lambdaExpression.Block.IsCompilerGenerated) {
-						ContextualReturn generatedReturn = (ContextualReturn)lambdaExpression.Block.Statements [0];
-						result.AddChild ((AstNode)generatedReturn.Expr.Accept (this), LambdaExpression.BodyRole);
+						var generatedReturn = (ContextualReturn)lambdaExpression.Block.Statements [0];
+						result.AddChild((AstNode)generatedReturn.Expr.Accept(this), LambdaExpression.BodyRole);
 					} else {
-						result.AddChild ((AstNode)lambdaExpression.Block.Accept (this), LambdaExpression.BodyRole);
+						result.AddChild((AstNode)lambdaExpression.Block.Accept(this), LambdaExpression.BodyRole);
 					}
 				}
 				return result;
 			}
-			
-			public override object Visit (ConstInitializer constInitializer)
+
+			public override object Visit(ConstInitializer constInitializer)
 			{
-				return constInitializer.Expr.Accept (this);
+				return constInitializer.Expr.Accept(this);
 			}
-			
-			public override object Visit (ArrayInitializer arrayInitializer)
+
+			public override object Visit(ArrayInitializer arrayInitializer)
 			{
-				var result = new ArrayInitializerExpression ();
-				var location = LocationsBag.GetLocations (arrayInitializer);
-				result.AddChild (new CSharpTokenNode (Convert (arrayInitializer.Location), Roles.LBrace), Roles.LBrace);
-				var commaLocations = LocationsBag.GetLocations (arrayInitializer.Elements);
+				var result = new ArrayInitializerExpression();
+				var location = LocationsBag.GetLocations(arrayInitializer);
+				result.AddChild(new CSharpTokenNode(Convert(arrayInitializer.Location), Roles.LBrace), Roles.LBrace);
+				var commaLocations = LocationsBag.GetLocations(arrayInitializer.Elements);
 				for (int i = 0; i < arrayInitializer.Count; i++) {
 					var init = arrayInitializer [i];
 					if (init == null)
 						continue;
-					result.AddChild ((Expression)init.Accept (this), Roles.Expression);
+					result.AddChild((Expression)init.Accept(this), Roles.Expression);
 					if (commaLocations != null && i < commaLocations.Count)
-						result.AddChild (new CSharpTokenNode (Convert (commaLocations [i]), Roles.Comma), Roles.Comma);
+						result.AddChild(new CSharpTokenNode(Convert(commaLocations [i]), Roles.Comma), Roles.Comma);
 				}
 				
 				if (location != null) {
 					if (location.Count == 2) // optional comma
-						result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.Comma), Roles.Comma);
-					result.AddChild (new CSharpTokenNode (Convert (location [location.Count - 1]), Roles.RBrace), Roles.RBrace);
+						result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Comma), Roles.Comma);
+					result.AddChild(new CSharpTokenNode(Convert(location [location.Count - 1]), Roles.RBrace), Roles.RBrace);
 				}
 				return result;
 			}
-			
+
 			#endregion
-			
+
 			#region LINQ expressions
+
 			QueryOrderClause currentQueryOrderClause;
 
-			public override object Visit (Mono.CSharp.Linq.QueryExpression queryExpression)
+			public override object Visit(Mono.CSharp.Linq.QueryExpression queryExpression)
 			{
 				var oldQueryOrderClause = currentQueryOrderClause;
 				try {
 					currentQueryOrderClause = null;
-					var result = new QueryExpression ();
+					var result = new QueryExpression();
 					
 					var currentClause = queryExpression.next;
 					
 					while (currentClause != null) {
-						QueryClause clause = (QueryClause)currentClause.Accept (this);
+						var clause = (QueryClause)currentClause.Accept(this);
 						if (clause is QueryContinuationClause) {
 							// insert preceding query at beginning of QueryContinuationClause
-							clause.InsertChildAfter (null, result, QueryContinuationClause.PrecedingQueryRole);
+							clause.InsertChildAfter(null, result, QueryContinuationClause.PrecedingQueryRole);
 							// create a new QueryExpression for the remaining query
-							result = new QueryExpression ();
+							result = new QueryExpression();
 						}
 						if (clause != null) {
-							result.AddChild (clause, QueryExpression.ClauseRole);
+							result.AddChild(clause, QueryExpression.ClauseRole);
 						}
 						currentClause = currentClause.next;
 					}
 					
 					return result;
-				}
-				finally {
+				} finally {
 					currentQueryOrderClause = oldQueryOrderClause;
 				}
 			}
-			
-			public override object Visit (Mono.CSharp.Linq.QueryStartClause queryStart)
+
+			public override object Visit(Mono.CSharp.Linq.QueryStartClause queryExpression)
 			{
-				if (queryStart.Expr == null) {
-					var intoClause = new QueryContinuationClause ();
-					intoClause.AddChild (new CSharpTokenNode (Convert (queryStart.Location), QueryContinuationClause.IntoKeywordRole), QueryContinuationClause.IntoKeywordRole);
-					intoClause.AddChild (Identifier.Create (queryStart.IntoVariable.Name, Convert (queryStart.IntoVariable.Location)), Roles.Identifier);
+				if (queryExpression.Expr == null) {
+					var intoClause = new QueryContinuationClause();
+					intoClause.AddChild(new CSharpTokenNode(Convert(queryExpression.Location), QueryContinuationClause.IntoKeywordRole), QueryContinuationClause.IntoKeywordRole);
+					intoClause.AddChild(Identifier.Create(queryExpression.IntoVariable.Name, Convert(queryExpression.IntoVariable.Location)), Roles.Identifier);
 					return intoClause;
 				}
 				
-				var fromClause = new QueryFromClause ();
+				var fromClause = new QueryFromClause();
 
-				fromClause.AddChild (new CSharpTokenNode (Convert (queryStart.Location), QueryFromClause.FromKeywordRole), QueryFromClause.FromKeywordRole);
+				fromClause.AddChild(new CSharpTokenNode(Convert(queryExpression.Location), QueryFromClause.FromKeywordRole), QueryFromClause.FromKeywordRole);
 				
-				if (queryStart.IdentifierType != null)
-					fromClause.AddChild (ConvertToType (queryStart.IdentifierType), Roles.Type);
+				if (queryExpression.IdentifierType != null)
+					fromClause.AddChild(ConvertToType(queryExpression.IdentifierType), Roles.Type);
 				
-				fromClause.AddChild (Identifier.Create (queryStart.IntoVariable.Name, Convert (queryStart.IntoVariable.Location)), Roles.Identifier);
+				fromClause.AddChild(Identifier.Create(queryExpression.IntoVariable.Name, Convert(queryExpression.IntoVariable.Location)), Roles.Identifier);
 				
-				var location = LocationsBag.GetLocations (queryStart);
+				var location = LocationsBag.GetLocations(queryExpression);
 				if (location != null)
-					fromClause.AddChild (new CSharpTokenNode (Convert (location [0]), QueryFromClause.InKeywordRole), QueryFromClause.InKeywordRole);
+					fromClause.AddChild(new CSharpTokenNode(Convert(location [0]), QueryFromClause.InKeywordRole), QueryFromClause.InKeywordRole);
 
-				if (queryStart.Expr != null)
-					fromClause.AddChild ((Expression)queryStart.Expr.Accept (this), Roles.Expression);
+				if (queryExpression.Expr != null)
+					fromClause.AddChild((Expression)queryExpression.Expr.Accept(this), Roles.Expression);
 				return fromClause;
 			}
-			
-			public override object Visit (Mono.CSharp.Linq.SelectMany queryStart)
+
+			public override object Visit(Mono.CSharp.Linq.SelectMany selectMany)
 			{
-				var fromClause = new QueryFromClause ();
+				var fromClause = new QueryFromClause();
 
-				fromClause.AddChild (new CSharpTokenNode (Convert (queryStart.Location), QueryFromClause.FromKeywordRole), QueryFromClause.FromKeywordRole);
+				fromClause.AddChild(new CSharpTokenNode(Convert(selectMany.Location), QueryFromClause.FromKeywordRole), QueryFromClause.FromKeywordRole);
 				
-				if (queryStart.IdentifierType != null)
-					fromClause.AddChild (ConvertToType (queryStart.IdentifierType), Roles.Type);
+				if (selectMany.IdentifierType != null)
+					fromClause.AddChild(ConvertToType(selectMany.IdentifierType), Roles.Type);
 				
-				fromClause.AddChild (Identifier.Create (queryStart.IntoVariable.Name, Convert (queryStart.IntoVariable.Location)), Roles.Identifier);
+				fromClause.AddChild(Identifier.Create(selectMany.IntoVariable.Name, Convert(selectMany.IntoVariable.Location)), Roles.Identifier);
 				
-				var location = LocationsBag.GetLocations (queryStart);
+				var location = LocationsBag.GetLocations(selectMany);
 				if (location != null)
-					fromClause.AddChild (new CSharpTokenNode (Convert (location [0]), QueryFromClause.InKeywordRole), QueryFromClause.InKeywordRole);
+					fromClause.AddChild(new CSharpTokenNode(Convert(location [0]), QueryFromClause.InKeywordRole), QueryFromClause.InKeywordRole);
 
-				if (queryStart.Expr != null)
-					fromClause.AddChild ((Expression)queryStart.Expr.Accept (this), Roles.Expression);
+				if (selectMany.Expr != null)
+					fromClause.AddChild((Expression)selectMany.Expr.Accept(this), Roles.Expression);
 				return fromClause;
 			}
-			
-			public override object Visit (Mono.CSharp.Linq.Select sel)
+
+			public override object Visit(Mono.CSharp.Linq.Select select)
 			{
-				var result = new QuerySelectClause ();
-				result.AddChild (new CSharpTokenNode (Convert (sel.Location), QuerySelectClause.SelectKeywordRole), QuerySelectClause.SelectKeywordRole);
-				if (sel.Expr != null)
-					result.AddChild ((Expression)sel.Expr.Accept (this), Roles.Expression);
+				var result = new QuerySelectClause();
+				result.AddChild(new CSharpTokenNode(Convert(select.Location), QuerySelectClause.SelectKeywordRole), QuerySelectClause.SelectKeywordRole);
+				if (select.Expr != null)
+					result.AddChild((Expression)select.Expr.Accept(this), Roles.Expression);
 				return result;
 			}
-			
-			public override object Visit (Mono.CSharp.Linq.GroupBy groupBy)
+
+			public override object Visit(Mono.CSharp.Linq.GroupBy groupBy)
 			{
-				var result = new QueryGroupClause ();
-				var location = LocationsBag.GetLocations (groupBy);
-				result.AddChild (new CSharpTokenNode (Convert (groupBy.Location), QueryGroupClause.GroupKeywordRole), QueryGroupClause.GroupKeywordRole);
+				var result = new QueryGroupClause();
+				var location = LocationsBag.GetLocations(groupBy);
+				result.AddChild(new CSharpTokenNode(Convert(groupBy.Location), QueryGroupClause.GroupKeywordRole), QueryGroupClause.GroupKeywordRole);
 				if (groupBy.ElementSelector != null)
-					result.AddChild ((Expression)groupBy.ElementSelector.Accept (this), QueryGroupClause.ProjectionRole);
-				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), QueryGroupClause.ByKeywordRole), QueryGroupClause.ByKeywordRole);
+					result.AddChild((Expression)groupBy.ElementSelector.Accept(this), QueryGroupClause.ProjectionRole);
+				if (location != null) {
+					var byLoc = Convert(location[0]);
+					if (byLoc.Line > 1 || byLoc.Column > 1)
+						result.AddChild(new CSharpTokenNode(byLoc, QueryGroupClause.ByKeywordRole), QueryGroupClause.ByKeywordRole);
+				}
 				if (groupBy.Expr != null)
-					result.AddChild ((Expression)groupBy.Expr.Accept (this), QueryGroupClause.KeyRole);
+					result.AddChild((Expression)groupBy.Expr.Accept(this), QueryGroupClause.KeyRole);
 				return result;
 			}
-			
-			public override object Visit (Mono.CSharp.Linq.Let l)
+
+			public override object Visit(Mono.CSharp.Linq.Let let)
 			{
-				var result = new QueryLetClause ();
-				var location = LocationsBag.GetLocations (l);
+				var result = new QueryLetClause();
+				var location = LocationsBag.GetLocations(let);
 				
-				result.AddChild (new CSharpTokenNode (Convert (l.Location), QueryLetClause.LetKeywordRole), QueryLetClause.LetKeywordRole);
-				result.AddChild (Identifier.Create (l.IntoVariable.Name, Convert (l.IntoVariable.Location)), Roles.Identifier);
+				result.AddChild(new CSharpTokenNode(Convert(let.Location), QueryLetClause.LetKeywordRole), QueryLetClause.LetKeywordRole);
+				result.AddChild(Identifier.Create(let.IntoVariable.Name, Convert(let.IntoVariable.Location)), Roles.Identifier);
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), Roles.Assign), Roles.Assign);
-				if (l.Expr != null)
-					result.AddChild ((Expression)l.Expr.Accept (this), Roles.Expression);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Assign), Roles.Assign);
+				if (let.Expr != null)
+					result.AddChild((Expression)let.Expr.Accept(this), Roles.Expression);
 				return result;
 			}
-			
-			public override object Visit (Mono.CSharp.Linq.Where w)
+
+			public override object Visit(Mono.CSharp.Linq.Where where)
 			{
-				var result = new QueryWhereClause ();
-				result.AddChild (new CSharpTokenNode (Convert (w.Location), QueryWhereClause.WhereKeywordRole), QueryWhereClause.WhereKeywordRole);
-				if (w.Expr != null)
-					result.AddChild ((Expression)w.Expr.Accept (this), Roles.Condition);
+				var result = new QueryWhereClause();
+				result.AddChild(new CSharpTokenNode(Convert(where.Location), QueryWhereClause.WhereKeywordRole), QueryWhereClause.WhereKeywordRole);
+				if (where.Expr != null)
+					result.AddChild((Expression)where.Expr.Accept(this), Roles.Condition);
 				return result;
 			}
-			
-			public override object Visit (Mono.CSharp.Linq.Join join)
+
+			public override object Visit(Mono.CSharp.Linq.Join join)
 			{
-				var result = new QueryJoinClause ();
-				var location = LocationsBag.GetLocations (join);
-				result.AddChild (new CSharpTokenNode (Convert (join.Location), QueryJoinClause.JoinKeywordRole), QueryJoinClause.JoinKeywordRole);
-				result.AddChild (Identifier.Create (join.JoinVariable.Name, Convert (join.JoinVariable.Location)), QueryJoinClause.JoinIdentifierRole);
-				
+				var result = new QueryJoinClause();
+				var location = LocationsBag.GetLocations(join);
+				result.AddChild(new CSharpTokenNode(Convert(join.Location), QueryJoinClause.JoinKeywordRole), QueryJoinClause.JoinKeywordRole);
+
+				if (join.IdentifierType != null)
+					result.AddChild(ConvertToType(join.IdentifierType), QueryJoinClause.TypeRole);
+
+				result.AddChild(Identifier.Create(join.JoinVariable.Name, Convert(join.JoinVariable.Location)), QueryJoinClause.JoinIdentifierRole);
+
+				if (join.IdentifierType != null)
+					result.AddChild(ConvertToType(join.IdentifierType), QueryJoinClause.TypeRole);
+
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), QueryJoinClause.InKeywordRole), QueryJoinClause.InKeywordRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), QueryJoinClause.InKeywordRole), QueryJoinClause.InKeywordRole);
 
 				if (join.Expr != null)
-					result.AddChild ((Expression)join.Expr.Accept (this), QueryJoinClause.InExpressionRole);
+					result.AddChild((Expression)join.Expr.Accept(this), QueryJoinClause.InExpressionRole);
 				
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), QueryJoinClause.OnKeywordRole), QueryJoinClause.OnKeywordRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), QueryJoinClause.OnKeywordRole), QueryJoinClause.OnKeywordRole);
 				
-				var outer = join.OuterSelector.Statements.FirstOrDefault () as ContextualReturn;
+				var outer = join.OuterSelector.Statements.FirstOrDefault() as ContextualReturn;
 				if (outer != null)
-					result.AddChild ((Expression)outer.Expr.Accept (this), QueryJoinClause.OnExpressionRole);
+					result.AddChild((Expression)outer.Expr.Accept(this), QueryJoinClause.OnExpressionRole);
 				
 				if (location != null && location.Count > 2)
-					result.AddChild (new CSharpTokenNode (Convert (location [2]), QueryJoinClause.EqualsKeywordRole), QueryJoinClause.EqualsKeywordRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [2]), QueryJoinClause.EqualsKeywordRole), QueryJoinClause.EqualsKeywordRole);
 				
-				var inner = join.InnerSelector.Statements.FirstOrDefault () as ContextualReturn;
+				var inner = join.InnerSelector.Statements.FirstOrDefault() as ContextualReturn;
 				if (inner != null)
-					result.AddChild ((Expression)inner.Expr.Accept (this), QueryJoinClause.EqualsExpressionRole);
+					result.AddChild((Expression)inner.Expr.Accept(this), QueryJoinClause.EqualsExpressionRole);
 				
 				return result;
 			}
-			
-			public override object Visit (Mono.CSharp.Linq.GroupJoin join)
+
+			public override object Visit(Mono.CSharp.Linq.GroupJoin groupJoin)
 			{
-				var result = new QueryJoinClause ();
-				var location = LocationsBag.GetLocations (join);
-				result.AddChild (new CSharpTokenNode (Convert (join.Location), QueryJoinClause.JoinKeywordRole), QueryJoinClause.JoinKeywordRole);
+				var result = new QueryJoinClause();
+				var location = LocationsBag.GetLocations(groupJoin);
+				result.AddChild(new CSharpTokenNode(Convert(groupJoin.Location), QueryJoinClause.JoinKeywordRole), QueryJoinClause.JoinKeywordRole);
 				
 				// mcs seems to have swapped IntoVariable with JoinVariable, so we'll swap it back here
-				result.AddChild (Identifier.Create (join.IntoVariable.Name, Convert (join.IntoVariable.Location)), QueryJoinClause.JoinIdentifierRole);
+				result.AddChild(Identifier.Create(groupJoin.IntoVariable.Name, Convert(groupJoin.IntoVariable.Location)), QueryJoinClause.JoinIdentifierRole);
 				
 				if (location != null)
-					result.AddChild (new CSharpTokenNode (Convert (location [0]), QueryJoinClause.InKeywordRole), QueryJoinClause.InKeywordRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), QueryJoinClause.InKeywordRole), QueryJoinClause.InKeywordRole);
 
-				if (join.Expr != null)
-					result.AddChild ((Expression)join.Expr.Accept (this), QueryJoinClause.InExpressionRole);
+				if (groupJoin.Expr != null)
+					result.AddChild((Expression)groupJoin.Expr.Accept(this), QueryJoinClause.InExpressionRole);
 
 				if (location != null && location.Count > 1)
-					result.AddChild (new CSharpTokenNode (Convert (location [1]), QueryJoinClause.OnKeywordRole), QueryJoinClause.OnKeywordRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), QueryJoinClause.OnKeywordRole), QueryJoinClause.OnKeywordRole);
 
-				var outer = join.OuterSelector.Statements.FirstOrDefault () as ContextualReturn;
+				var outer = groupJoin.OuterSelector.Statements.FirstOrDefault() as ContextualReturn;
 				if (outer != null)
-					result.AddChild ((Expression)outer.Expr.Accept (this), QueryJoinClause.OnExpressionRole);
+					result.AddChild((Expression)outer.Expr.Accept(this), QueryJoinClause.OnExpressionRole);
 				
 
 				if (location != null && location.Count > 2)
-					result.AddChild (new CSharpTokenNode (Convert (location [2]), QueryJoinClause.EqualsKeywordRole), QueryJoinClause.EqualsKeywordRole);
-				var inner = join.InnerSelector.Statements.FirstOrDefault () as ContextualReturn;
+					result.AddChild(new CSharpTokenNode(Convert(location [2]), QueryJoinClause.EqualsKeywordRole), QueryJoinClause.EqualsKeywordRole);
+				var inner = groupJoin.InnerSelector.Statements.FirstOrDefault() as ContextualReturn;
 				if (inner != null)
-					result.AddChild ((Expression)inner.Expr.Accept (this), QueryJoinClause.EqualsExpressionRole);
+					result.AddChild((Expression)inner.Expr.Accept(this), QueryJoinClause.EqualsExpressionRole);
 				
 				if (location != null && location.Count > 3)
-					result.AddChild (new CSharpTokenNode (Convert (location [3]), QueryJoinClause.IntoKeywordRole), QueryJoinClause.IntoKeywordRole);
+					result.AddChild(new CSharpTokenNode(Convert(location [3]), QueryJoinClause.IntoKeywordRole), QueryJoinClause.IntoKeywordRole);
 				
-				result.AddChild (Identifier.Create (join.JoinVariable.Name, Convert (join.JoinVariable.Location)), QueryJoinClause.IntoIdentifierRole);
+				result.AddChild(Identifier.Create(groupJoin.JoinVariable.Name, Convert(groupJoin.JoinVariable.Location)), QueryJoinClause.IntoIdentifierRole);
 				return result;
 			}
-			
-			public override object Visit (Mono.CSharp.Linq.OrderByAscending orderByAscending)
+
+			public override object Visit(Mono.CSharp.Linq.OrderByAscending orderByAscending)
 			{
 				currentQueryOrderClause = new QueryOrderClause();
-				var location2 = LocationsBag.GetLocations (orderByAscending.block);
+				var location2 = LocationsBag.GetLocations(orderByAscending.block);
 				if (location2 != null)
-					currentQueryOrderClause.AddChild (new CSharpTokenNode (Convert (location2 [0]), QueryOrderClause.OrderbyKeywordRole), QueryOrderClause.OrderbyKeywordRole);
-				var ordering = new QueryOrdering ();
+					currentQueryOrderClause.AddChild(new CSharpTokenNode(Convert(location2 [0]), QueryOrderClause.OrderbyKeywordRole), QueryOrderClause.OrderbyKeywordRole);
+				var ordering = new QueryOrdering();
 				if (orderByAscending.Expr != null)
-					ordering.AddChild ((Expression)orderByAscending.Expr.Accept (this), Roles.Expression);
-				var location = LocationsBag.GetLocations (orderByAscending);
+					ordering.AddChild((Expression)orderByAscending.Expr.Accept(this), Roles.Expression);
+				var location = LocationsBag.GetLocations(orderByAscending);
 				if (location != null) {
 					ordering.Direction = QueryOrderingDirection.Ascending;
-					ordering.AddChild (new CSharpTokenNode (Convert (location [0]), QueryOrdering.AscendingKeywordRole), QueryOrdering.AscendingKeywordRole);
+					ordering.AddChild(new CSharpTokenNode(Convert(location [0]), QueryOrdering.AscendingKeywordRole), QueryOrdering.AscendingKeywordRole);
 				}
-				currentQueryOrderClause.AddChild (ordering, QueryOrderClause.OrderingRole);
+				currentQueryOrderClause.AddChild(ordering, QueryOrderClause.OrderingRole);
 				return currentQueryOrderClause;
 			}
-			
-			public override object Visit (Mono.CSharp.Linq.OrderByDescending orderByDescending)
+
+			public override object Visit(Mono.CSharp.Linq.OrderByDescending orderByDescending)
 			{
-				currentQueryOrderClause = new QueryOrderClause ();
+				currentQueryOrderClause = new QueryOrderClause();
 				
-				var ordering = new QueryOrdering ();
+				var ordering = new QueryOrdering();
 				if (orderByDescending.Expr != null)
-					ordering.AddChild ((Expression)orderByDescending.Expr.Accept (this), Roles.Expression);
-				var location = LocationsBag.GetLocations (orderByDescending);
+					ordering.AddChild((Expression)orderByDescending.Expr.Accept(this), Roles.Expression);
+				var location = LocationsBag.GetLocations(orderByDescending);
 				if (location != null) {
 					ordering.Direction = QueryOrderingDirection.Descending;
-					ordering.AddChild (new CSharpTokenNode (Convert (location [0]), QueryOrdering.DescendingKeywordRole), QueryOrdering.DescendingKeywordRole);
+					ordering.AddChild(new CSharpTokenNode(Convert(location [0]), QueryOrdering.DescendingKeywordRole), QueryOrdering.DescendingKeywordRole);
 				}
-				currentQueryOrderClause.AddChild (ordering, QueryOrderClause.OrderingRole);
+				currentQueryOrderClause.AddChild(ordering, QueryOrderClause.OrderingRole);
 				return currentQueryOrderClause;
 			}
-			
-			public override object Visit (Mono.CSharp.Linq.ThenByAscending thenByAscending)
+
+			public override object Visit(Mono.CSharp.Linq.ThenByAscending thenByAscending)
 			{
-				var ordering = new QueryOrdering ();
+				var ordering = new QueryOrdering();
 				if (thenByAscending.Expr != null)
-					ordering.AddChild ((Expression)thenByAscending.Expr.Accept (this), Roles.Expression);
-				var location = LocationsBag.GetLocations (thenByAscending);
+					ordering.AddChild((Expression)thenByAscending.Expr.Accept(this), Roles.Expression);
+				var location = LocationsBag.GetLocations(thenByAscending);
 				if (location != null) {
 					ordering.Direction = QueryOrderingDirection.Ascending;
-					ordering.AddChild (new CSharpTokenNode (Convert (location [0]), QueryOrdering.AscendingKeywordRole), QueryOrdering.AscendingKeywordRole);
+					ordering.AddChild(new CSharpTokenNode(Convert(location [0]), QueryOrdering.AscendingKeywordRole), QueryOrdering.AscendingKeywordRole);
 				}
-				currentQueryOrderClause.AddChild (ordering, QueryOrderClause.OrderingRole);
+				currentQueryOrderClause.AddChild(ordering, QueryOrderClause.OrderingRole);
 				return null;
 			}
-			
-			public override object Visit (Mono.CSharp.Linq.ThenByDescending thenByDescending)
+
+			public override object Visit(Mono.CSharp.Linq.ThenByDescending thenByDescending)
 			{
-				var ordering = new QueryOrdering ();
+				var ordering = new QueryOrdering();
 				if (thenByDescending.Expr != null)
-					ordering.AddChild ((Expression)thenByDescending.Expr.Accept (this), Roles.Expression);
-				var location = LocationsBag.GetLocations (thenByDescending);
+					ordering.AddChild((Expression)thenByDescending.Expr.Accept(this), Roles.Expression);
+				var location = LocationsBag.GetLocations(thenByDescending);
 				if (location != null) {
 					ordering.Direction = QueryOrderingDirection.Descending;
-					ordering.AddChild (new CSharpTokenNode (Convert (location [0]), QueryOrdering.DescendingKeywordRole), QueryOrdering.DescendingKeywordRole);
+					ordering.AddChild(new CSharpTokenNode(Convert(location [0]), QueryOrdering.DescendingKeywordRole), QueryOrdering.DescendingKeywordRole);
 				}
-				currentQueryOrderClause.AddChild (ordering, QueryOrderClause.OrderingRole);
+				currentQueryOrderClause.AddChild(ordering, QueryOrderClause.OrderingRole);
 				return null;
 			}
-			
-			public override object Visit (Await awaitExpr)
+
+			public override object Visit(Await awaitExpr)
 			{
-				var result = new UnaryOperatorExpression ();
+				var result = new UnaryOperatorExpression();
 				result.Operator = UnaryOperatorType.Await;
-				result.AddChild (new CSharpTokenNode (Convert (awaitExpr.Location), UnaryOperatorExpression.AwaitRole), UnaryOperatorExpression.AwaitRole);
+				result.AddChild(new CSharpTokenNode(Convert(awaitExpr.Location), UnaryOperatorExpression.AwaitRole), UnaryOperatorExpression.AwaitRole);
 				if (awaitExpr.Expression != null)
-					result.AddChild ((Expression)awaitExpr.Expression.Accept (this), Roles.Expression);
+					result.AddChild((Expression)awaitExpr.Expression.Accept(this), Roles.Expression);
 				return result;
 			}
+
 			#endregion
-			
+
 			#region XmlDoc
+
 			public DocumentationReference ConvertXmlDoc(DocumentationBuilder doc)
 			{
-				DocumentationReference result = new DocumentationReference();
+				var result = new DocumentationReference();
 				if (doc.ParsedName != null) {
 					if (doc.ParsedName.Name == "<this>") {
 						result.SymbolKind = SymbolKind.Indexer;
@@ -3580,7 +3580,7 @@ namespace ICSharpCode.NRefactory.CSharp
 					}
 					if (doc.ParsedName.TypeParameters != null) {
 						for (int i = 0; i < doc.ParsedName.TypeParameters.Count; i++) {
-							result.TypeArguments.Add(ConvertToType(doc.ParsedName.TypeParameters[i]));
+							result.TypeArguments.Add(ConvertToType(doc.ParsedName.TypeParameters [i]));
 						}
 					}
 				} else if (doc.ParsedBuiltinType != null) {
@@ -3608,10 +3608,10 @@ namespace ICSharpCode.NRefactory.CSharp
 				}
 				return result;
 			}
-			
+
 			ParameterDeclaration ConvertXmlDocParameter(DocumentationParameter p)
 			{
-				ParameterDeclaration result = new ParameterDeclaration();
+				var result = new ParameterDeclaration();
 				switch (p.Modifier) {
 					case Parameter.Modifier.OUT:
 						result.ParameterModifier = ParameterModifier.Out;
@@ -3628,42 +3628,39 @@ namespace ICSharpCode.NRefactory.CSharp
 				}
 				return result;
 			}
+
 			#endregion
+
 		}
 
-		public CSharpParser ()
+		public CSharpParser()
 		{
 			compilerSettings = new CompilerSettings();
 		}
-		
-		public CSharpParser (CompilerSettings args)
+
+		public CSharpParser(CompilerSettings args)
 		{
 			compilerSettings = args ?? new CompilerSettings();
 		}
-		
-		void InsertComments (CompilerCompilationUnit top, ConversionVisitor conversionVisitor)
+
+		void InsertComments(CompilerCompilationUnit top, ConversionVisitor conversionVisitor)
 		{
 			AstNode insertionPoint = conversionVisitor.Unit.FirstChild;
-			for (int i = 0; i < top.SpecialsBag.Specials.Count; i++) {
-				var special = top.SpecialsBag.Specials [i];
+			foreach (var special in top.SpecialsBag.Specials) {
 				AstNode newLeaf = null;
 				Role role = null;
 				bool isDocumentationComment = false;
 				var comment = special as SpecialsBag.Comment;
 				if (comment != null) {
 					// HACK: multiline documentation comment detection; better move this logic into the mcs tokenizer
-					bool isMultilineDocumentationComment = (
-						comment.CommentType == SpecialsBag.CommentType.Multi
-						&& comment.Content.StartsWith("*", StringComparison.Ordinal)
-						&& !comment.Content.StartsWith("**", StringComparison.Ordinal)
-					);
+					bool isMultilineDocumentationComment = (comment.CommentType == SpecialsBag.CommentType.Multi && comment.Content.StartsWith("*", StringComparison.Ordinal) && !comment.Content.StartsWith("**", StringComparison.Ordinal));
 					isDocumentationComment = comment.CommentType == SpecialsBag.CommentType.Documentation || isMultilineDocumentationComment;
 					if (conversionVisitor.convertTypeSystemMode && !isDocumentationComment)
 						continue;
 					var type = isMultilineDocumentationComment ? CommentType.MultiLineDocumentation : (CommentType)comment.CommentType;
-					var start = new TextLocation (comment.Line, comment.Col);
-					var end = new TextLocation (comment.EndLine, comment.EndCol);
-					newLeaf = new Comment (type, start, end) {
+					var start = new TextLocation(comment.Line, comment.Col);
+					var end = new TextLocation(comment.EndLine, comment.EndCol);
+					newLeaf = new Comment(type, start, end) {
 						StartsLine = comment.StartsLine,
 						Content = isMultilineDocumentationComment ? comment.Content.Substring(1) : comment.Content
 					};
@@ -3671,34 +3668,37 @@ namespace ICSharpCode.NRefactory.CSharp
 				} else if (!GenerateTypeSystemMode) {
 					var pragmaDirective = special as SpecialsBag.PragmaPreProcessorDirective;
 					if (pragmaDirective != null) {
-						var pragma = new PragmaWarningPreprocssorDirective(new TextLocation(pragmaDirective.Line, pragmaDirective.Col), new TextLocation(pragmaDirective.EndLine, pragmaDirective.EndCol));
-						pragma.Disable = pragmaDirective.Disalbe;
-						pragma.AddWarnings(pragmaDirective.Codes);
+						var pragma = new PragmaWarningPreprocessorDirective(new TextLocation(pragmaDirective.Line, pragmaDirective.Col), new TextLocation(pragmaDirective.EndLine, pragmaDirective.EndCol));
+						pragma.AddChild(new CSharpTokenNode(new TextLocation(pragmaDirective.Line, pragmaDirective.Col), PragmaWarningPreprocessorDirective.PragmaKeywordRole), PragmaWarningPreprocessorDirective.PragmaKeywordRole);
+						pragma.AddChild(new CSharpTokenNode(new TextLocation(pragmaDirective.Line, pragmaDirective.WarningColumn), PragmaWarningPreprocessorDirective.WarningKeywordRole), PragmaWarningPreprocessorDirective.WarningKeywordRole);
+						var pragmaRole = pragmaDirective.Disalbe ? PragmaWarningPreprocessorDirective.DisableKeywordRole : PragmaWarningPreprocessorDirective.RestoreKeywordRole;
+						pragma.AddChild(new CSharpTokenNode(new TextLocation(pragmaDirective.Line, pragmaDirective.DisableRestoreColumn), pragmaRole), pragmaRole);
+						foreach (var code in pragmaDirective.Codes) {
+							pragma.AddChild((PrimitiveExpression)conversionVisitor.Visit(code), PragmaWarningPreprocessorDirective.WarningRole);
+						}
 						newLeaf = pragma;
 						role = Roles.PreProcessorDirective;
 						goto end;
 					}
-
 					var lineDirective = special as SpecialsBag.LineProcessorDirective;
 					if (lineDirective != null) {
-						var pragma = new LinePreprocssorDirective(new TextLocation(lineDirective.Line, lineDirective.Col), new TextLocation(lineDirective.EndLine, lineDirective.EndCol));
+						var pragma = new LinePreprocessorDirective(new TextLocation(lineDirective.Line, lineDirective.Col), new TextLocation(lineDirective.EndLine, lineDirective.EndCol));
 						pragma.LineNumber = lineDirective.LineNumber;
 						pragma.FileName = lineDirective.FileName;
 						newLeaf = pragma;
 						role = Roles.PreProcessorDirective;
 						goto end;
 					}
-
 					var directive = special as SpecialsBag.PreProcessorDirective;
 					if (directive != null) {
-						newLeaf = new PreProcessorDirective ((ICSharpCode.NRefactory.CSharp.PreProcessorDirectiveType)((int)directive.Cmd & 0xF), new TextLocation (directive.Line, directive.Col), new TextLocation (directive.EndLine, directive.EndCol)) {
+						newLeaf = new PreProcessorDirective((PreProcessorDirectiveType)((int)directive.Cmd & 0xF), new TextLocation(directive.Line, directive.Col), new TextLocation(directive.EndLine, directive.EndCol)) {
 							Argument = directive.Arg,
 							Take = directive.Take
 						};
 						role = Roles.PreProcessorDirective;
 					}
 					end:
-						;
+					;
 				}
 				if (newLeaf != null) {
 					InsertComment(ref insertionPoint, newLeaf, role, isDocumentationComment, conversionVisitor.Unit);
@@ -3709,21 +3709,17 @@ namespace ICSharpCode.NRefactory.CSharp
 				// because they are not correctly ordered in the specials bag
 				insertionPoint = conversionVisitor.Unit.FirstChild;
 				for (int i = 0; i < top.SpecialsBag.Specials.Count; i++) {
-					var newLine = top.SpecialsBag.Specials[i] as SpecialsBag.NewLineToken;
+					var newLine = top.SpecialsBag.Specials [i] as SpecialsBag.NewLineToken;
 					if (newLine != null) {
-						AstNode newLeaf;
-						if (newLine.NewLine == SpecialsBag.NewLine.Unix) {
-							newLeaf = new UnixNewLine (new TextLocation (newLine.Line, newLine.Col + 1));
-						} else {
-							newLeaf = new WindowsNewLine (new TextLocation (newLine.Line, newLine.Col + 1));
-						}
+						var newLeaf = new NewLineNode(new TextLocation(newLine.Line, newLine.Col + 1));
+						newLeaf.NewLineType = newLine.NewLine == SpecialsBag.NewLine.Unix ? UnicodeNewline.LF : UnicodeNewline.CRLF;
 						InsertComment(ref insertionPoint, newLeaf, Roles.NewLine, false, conversionVisitor.Unit);
 					}
 				}
 			}
 		}
-		
-		void InsertComment(ref AstNode insertionPoint, AstNode newNode, Role role, bool isDocumentationComment, AstNode rootNode)
+
+		static void InsertComment(ref AstNode insertionPoint, AstNode newNode, Role role, bool isDocumentationComment, AstNode rootNode)
 		{
 			TextLocation insertAt = newNode.StartLocation;
 			// Advance insertionPoint to the first node that has a start location >= insertAt
@@ -3746,60 +3742,62 @@ namespace ICSharpCode.NRefactory.CSharp
 				insertionPoint.Parent.InsertChildBeforeUnsafe(insertionPoint, newNode, role);
 			}
 		}
-		
+
 		public class ErrorReportPrinter : ReportPrinter
 		{
 			readonly string fileName;
-			public readonly List<Error> Errors = new List<Error> ();
-			
-			public ErrorReportPrinter (string fileName)
+			public readonly List<Error> Errors = new List<Error>();
+
+			public ErrorReportPrinter(string fileName)
 			{
 				this.fileName = fileName;
 			}
-			
-			public override void Print (AbstractMessage msg, bool showFullPath)
+
+			public override void Print(AbstractMessage msg, bool showFullPath)
 			{
-				base.Print (msg, showFullPath);
-				var newError = new Error (msg.IsWarning ? ErrorType.Warning : ErrorType.Error, msg.Text, new DomRegion (fileName, msg.Location.Row, msg.Location.Column));
-				Errors.Add (newError);
+				base.Print(msg, showFullPath);
+				var newError = new Error(msg.IsWarning ? ErrorType.Warning : ErrorType.Error, msg.Text, new DomRegion(fileName, msg.Location.Row, msg.Location.Column));
+				Errors.Add(newError);
 			}
 		}
-		ErrorReportPrinter errorReportPrinter = new ErrorReportPrinter (null);
-		
+
+		ErrorReportPrinter errorReportPrinter = new ErrorReportPrinter(null);
+
 		[Obsolete("Use the Errors/Warnings/ErrorsAndWarnings properties instead")]
 		public ErrorReportPrinter ErrorPrinter {
 			get {
 				return errorReportPrinter;
 			}
 		}
+
 		public bool HasErrors {
 			get {
 				return errorReportPrinter.ErrorsCount > 0;
 			}
 		}
-		
+
 		public bool HasWarnings {
 			get {
 				return errorReportPrinter.WarningsCount > 0;
 			}
 		}
-		
+
 		public IEnumerable<Error> Errors {
 			get {
 				return errorReportPrinter.Errors.Where(e => e.ErrorType == ErrorType.Error);
 			}
 		}
-		
+
 		public IEnumerable<Error> Warnings {
 			get {
 				return errorReportPrinter.Errors.Where(e => e.ErrorType == ErrorType.Warning);
 			}
 		}
-		
+
 		public IEnumerable<Error> ErrorsAndWarnings {
 			get { return errorReportPrinter.Errors; }
 		}
-		
+
 		/// <summary>
 		/// Parses a C# code file.
 		/// </summary>
@@ -3807,11 +3805,11 @@ namespace ICSharpCode.NRefactory.CSharp
 		/// <param name="fileName">The file name. Used to identify the file (e.g. when building a type system).
 		/// This can be an arbitrary identifier, NRefactory never tries to access the file on disk.</param>
 		/// <returns>Returns the syntax tree.</returns>
-		public SyntaxTree Parse (string program, string fileName = "")
+		public SyntaxTree Parse(string program, string fileName = "")
 		{
-			return Parse (new StringTextSource (program), fileName);
+			return Parse(new StringTextSource(program), fileName);
 		}
-		
+
 		/// <summary>
 		/// Parses a C# code file.
 		/// </summary>
@@ -3819,9 +3817,9 @@ namespace ICSharpCode.NRefactory.CSharp
 		/// <param name="fileName">The file name. Used to identify the file (e.g. when building a type system).
 		/// This can be an arbitrary identifier, NRefactory never tries to access the file on disk.</param>
 		/// <returns>Returns the syntax tree.</returns>
-		public SyntaxTree Parse (TextReader reader, string fileName = "")
+		public SyntaxTree Parse(TextReader reader, string fileName = "")
 		{
-			return Parse(new StringTextSource (reader.ReadToEnd ()), fileName);
+			return Parse(new StringTextSource(reader.ReadToEnd()), fileName);
 		}
 
 		/// <summary>
@@ -3832,32 +3830,32 @@ namespace ICSharpCode.NRefactory.CSharp
 			if (top == null) {
 				return null;
 			}
-			CSharpParser.ConversionVisitor conversionVisitor = new ConversionVisitor (GenerateTypeSystemMode, top.LocationsBag);
+			CSharpParser.ConversionVisitor conversionVisitor = new ConversionVisitor(GenerateTypeSystemMode, top.LocationsBag);
 			top.ModuleCompiled.Accept(conversionVisitor);
 			InsertComments(top, conversionVisitor);
 			if (CompilationUnitCallback != null) {
 				CompilationUnitCallback(top);
 			}
-			if (top.LastYYValue is Mono.CSharp.Expression) {
-				conversionVisitor.Unit.TopExpression = ((Mono.CSharp.Expression)top.LastYYValue).Accept(conversionVisitor) as AstNode;
-			}
+			var expr = top.LastYYValue as Mono.CSharp.Expression;
+			if (expr != null)
+				conversionVisitor.Unit.TopExpression = expr.Accept(conversionVisitor) as AstNode;
 
 			conversionVisitor.Unit.FileName = fileName;
-			List<string> conditionals = new List<string>();
+			var conditionals = new List<string>();
 			foreach (var settings in compilerSettings.ConditionalSymbols) {
 				if (top.Conditionals.ContainsKey(settings) && !top.Conditionals [settings])
 					continue;
 				conditionals.Add(settings);
 			}
 			foreach (var kv in top.Conditionals) {
-				if (!kv.Value || compilerSettings.ConditionalSymbols.Contains (kv.Key))
+				if (!kv.Value || compilerSettings.ConditionalSymbols.Contains(kv.Key))
 					continue;
 				conditionals.Add(kv.Key);
 			}
 			conversionVisitor.Unit.ConditionalSymbols = conditionals;
 			return conversionVisitor.Unit;
 		}
-		
+
 		public CompilerSettings CompilerSettings {
 			get { return compilerSettings; }
 			set {
@@ -3866,7 +3864,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				compilerSettings = value;
 			}
 		}
-		
+
 		/// <summary>
 		/// Callback that gets called with the Mono.CSharp syntax tree whenever some code is parsed.
 		/// </summary>
@@ -3874,7 +3872,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			get;
 			set;
 		}
-		
+
 		/// <summary>
 		/// Specifies whether to run the parser in a special mode for generating the type system.
 		/// If this property is true, the syntax tree will only contain nodes relevant for the
@@ -3885,9 +3883,9 @@ namespace ICSharpCode.NRefactory.CSharp
 			get;
 			set;
 		}
-		
+
 		TextLocation initialLocation = new TextLocation(1, 1);
-		
+
 		/// <summary>
 		/// Specifies the text location where parsing starts.
 		/// This property can be used when parsing a part of a file to make the locations of the AstNodes
@@ -3898,9 +3896,9 @@ namespace ICSharpCode.NRefactory.CSharp
 			get { return initialLocation; }
 			set { initialLocation = value; }
 		}
-		
-		internal static object parseLock = new object ();
-		
+
+		internal static object parseLock = new object();
+
 		/// <summary>
 		/// Parses a C# code file.
 		/// </summary>
@@ -3908,62 +3906,61 @@ namespace ICSharpCode.NRefactory.CSharp
 		/// <param name="fileName">The file name. Used to identify the file (e.g. when building a type system).
 		/// This can be an arbitrary identifier, NRefactory never tries to access the file on disk.</param>
 		/// <returns>Returns the syntax tree.</returns>
-		public SyntaxTree Parse (Stream stream, string fileName = "")
+		public SyntaxTree Parse(Stream stream, string fileName = "")
 		{
-			return Parse (new StreamReader (stream), fileName);
+			return Parse(new StreamReader(stream), fileName);
 		}
-		
+
 		/// <summary>
 		/// Parses a C# code file.
 		/// </summary>
 		/// <param name="program">The source code to parse.</param>
 		/// <param name="fileName">The file name. Used to identify the file (e.g. when building a type system).
 		/// This can be an arbitrary identifier, NRefactory never tries to access the file on disk.</param>
-		///  </param>
 		/// <returns>Returns the syntax tree.</returns>
 		public SyntaxTree Parse(ITextSource program, string fileName = "")
 		{
 			return Parse(program, fileName, initialLocation.Line, initialLocation.Column);
 		}
-		
+
 		SyntaxTree Parse(ITextSource program, string fileName, int initialLine, int initialColumn)
 		{
 			lock (parseLock) {
-				errorReportPrinter = new ErrorReportPrinter ("");
-				var ctx = new CompilerContext (compilerSettings.ToMono(), errorReportPrinter);
+				errorReportPrinter = new ErrorReportPrinter("");
+				var ctx = new CompilerContext(compilerSettings.ToMono(), errorReportPrinter);
 				ctx.Settings.TabSize = 1;
-				var reader = new SeekableStreamReader (program);
-				var file = new SourceFile (fileName, fileName, 0);
-				Location.Initialize (new List<SourceFile> (new [] { file }));
-				var module = new ModuleContainer (ctx);
-				var session = new ParserSession ();
-				session.LocationsBag = new LocationsBag ();
-				var report = new Report (ctx, errorReportPrinter);
-				var parser = Driver.Parse (reader, file, module, session, report, initialLine - 1, initialColumn - 1);
-				var top = new CompilerCompilationUnit () {
+				var reader = new SeekableStreamReader(program);
+				var file = new SourceFile(fileName, fileName, 0);
+				Location.Initialize(new List<SourceFile>(new [] { file }));
+				var module = new ModuleContainer(ctx);
+				var session = new ParserSession();
+				session.LocationsBag = new LocationsBag();
+				var report = new Report(ctx, errorReportPrinter);
+				var parser = Driver.Parse(reader, file, module, session, report, initialLine - 1, initialColumn - 1);
+				var top = new CompilerCompilationUnit {
 					ModuleCompiled = module,
 					LocationsBag = session.LocationsBag,
 					SpecialsBag = parser.Lexer.sbag,
 					Conditionals = parser.Lexer.SourceFile.Conditionals
 				};
-				var unit = Parse (top, fileName);
-				unit.Errors.AddRange (errorReportPrinter.Errors);
-				CompilerCallableEntryPoint.Reset ();
+				var unit = Parse(top, fileName);
+				unit.Errors.AddRange(errorReportPrinter.Errors);
+				CompilerCallableEntryPoint.Reset();
 				return unit;
 			}
 		}
 
-		public IEnumerable<EntityDeclaration> ParseTypeMembers (string code)
+		public IEnumerable<EntityDeclaration> ParseTypeMembers(string code)
 		{
 			return ParseTypeMembers(code, initialLocation.Line, initialLocation.Column);
 		}
-		
-		IEnumerable<EntityDeclaration> ParseTypeMembers (string code, int initialLine, int initialColumn)
+
+		IEnumerable<EntityDeclaration> ParseTypeMembers(string code, int initialLine, int initialColumn)
 		{
 			const string prefix = "unsafe partial class MyClass { ";
-			var syntaxTree = Parse (new StringTextSource (prefix + code + "}"), "parsed.cs", initialLine, initialColumn - prefix.Length);
+			var syntaxTree = Parse(new StringTextSource(prefix + code + "}"), "parsed.cs", initialLine, initialColumn - prefix.Length);
 			if (syntaxTree == null)
-				return Enumerable.Empty<EntityDeclaration> ();
+				return Enumerable.Empty<EntityDeclaration>();
 			var td = syntaxTree.FirstChild as TypeDeclaration;
 			if (td != null) {
 				var members = td.Members.ToArray();
@@ -3972,20 +3969,20 @@ namespace ICSharpCode.NRefactory.CSharp
 					m.Remove();
 				return members;
 			}
-			return Enumerable.Empty<EntityDeclaration> ();
+			return Enumerable.Empty<EntityDeclaration>();
 		}
-		
-		public IEnumerable<Statement> ParseStatements (string code)
+
+		public IEnumerable<Statement> ParseStatements(string code)
 		{
 			return ParseStatements(code, initialLocation.Line, initialLocation.Column);
 		}
-		
-		IEnumerable<Statement> ParseStatements (string code, int initialLine, int initialColumn)
+
+		IEnumerable<Statement> ParseStatements(string code, int initialLine, int initialColumn)
 		{
 			// the dummy method is async so that 'await' expressions are parsed as expected
 			const string prefix = "async void M() { ";
-			var members = ParseTypeMembers (prefix + code + "}", initialLine, initialColumn - prefix.Length);
-			var method = members.FirstOrDefault () as MethodDeclaration;
+			var members = ParseTypeMembers(prefix + code + "}", initialLine, initialColumn - prefix.Length);
+			var method = members.FirstOrDefault() as MethodDeclaration;
 			if (method != null && method.Body != null) {
 				var statements = method.Body.Statements.ToArray();
 				// detach statements from parent
@@ -3993,13 +3990,13 @@ namespace ICSharpCode.NRefactory.CSharp
 					st.Remove();
 				return statements;
 			}
-			return Enumerable.Empty<Statement> ();
+			return Enumerable.Empty<Statement>();
 		}
-		
-		public AstType ParseTypeReference (string code)
+
+		public AstType ParseTypeReference(string code)
 		{
-			var members = ParseTypeMembers (code + " a;");
-			var field = members.FirstOrDefault () as FieldDeclaration;
+			var members = ParseTypeMembers(code + " a;");
+			var field = members.FirstOrDefault() as FieldDeclaration;
 			if (field != null) {
 				AstType type = field.ReturnType;
 				type.Remove();
@@ -4007,14 +4004,14 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 			return AstType.Null;
 		}
-		
-		public Expression ParseExpression (string code)
+
+		public Expression ParseExpression(string code)
 		{
 			const string prefix = "tmp = ";
-			var statements = ParseStatements (prefix + code + ";", initialLocation.Line, initialLocation.Column - prefix.Length);
-			var es = statements.FirstOrDefault () as ExpressionStatement;
+			var statements = ParseStatements(prefix + code + ";", initialLocation.Line, initialLocation.Column - prefix.Length);
+			var es = statements.FirstOrDefault() as ExpressionStatement;
 			if (es != null) {
-				AssignmentExpression ae = es.Expression as AssignmentExpression;
+				var ae = es.Expression as AssignmentExpression;
 				if (ae != null) {
 					Expression expr = ae.Right;
 					expr.Remove();
@@ -4023,7 +4020,6 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 			return Expression.Null;
 		}
-		
 		/*
 		/// <summary>
 		/// Parses a file snippet; guessing what the code snippet represents (whole file, type members, block, type reference, expression).
@@ -4034,42 +4030,41 @@ namespace ICSharpCode.NRefactory.CSharp
 			throw new NotImplementedException ();
 		}
 		 */
-		
-		public DocumentationReference ParseDocumentationReference (string cref)
+		public DocumentationReference ParseDocumentationReference(string cref)
 		{
 			// see Mono.CSharp.DocumentationBuilder.HandleXrefCommon
 			if (cref == null)
-				throw new ArgumentNullException ("cref");
+				throw new ArgumentNullException("cref");
 			
 			// Additional symbols for < and > are allowed for easier XML typing
-			cref = cref.Replace ('{', '<').Replace ('}', '>');
+			cref = cref.Replace('{', '<').Replace('}', '>');
 			
 			lock (parseLock) {
 				errorReportPrinter = new ErrorReportPrinter("");
 				var ctx = new CompilerContext(compilerSettings.ToMono(), errorReportPrinter);
 				ctx.Settings.TabSize = 1;
-				var reader = new SeekableStreamReader(new StringTextSource (cref));
+				var reader = new SeekableStreamReader(new StringTextSource(cref));
 				var file = new SourceFile("", "", 0);
-				Location.Initialize(new List<SourceFile> (new [] { file }));
+				Location.Initialize(new List<SourceFile>(new [] { file }));
 				var module = new ModuleContainer(ctx);
 				module.DocumentationBuilder = new DocumentationBuilder(module);
-				var source_file = new CompilationSourceFile (module);
-				var report = new Report (ctx, errorReportPrinter);
-				ParserSession session = new ParserSession ();
-				session.LocationsBag = new LocationsBag ();
-				var parser = new Mono.CSharp.CSharpParser (reader, source_file, report, session);
+				var source_file = new CompilationSourceFile(module);
+				var report = new Report(ctx, errorReportPrinter);
+				var session = new ParserSession();
+				session.LocationsBag = new LocationsBag();
+				var parser = new Mono.CSharp.CSharpParser(reader, source_file, report, session);
 				parser.Lexer.Line += initialLocation.Line - 1;
 				parser.Lexer.Column += initialLocation.Column - 1;
 				parser.Lexer.putback_char = Tokenizer.DocumentationXref;
 				parser.Lexer.parsing_generic_declaration_doc = true;
-				parser.parse ();
+				parser.parse();
 				if (report.Errors > 0) {
 //					Report.Warning (1584, 1, mc.Location, "XML comment on `{0}' has syntactically incorrect cref attribute `{1}'",
 //					                mc.GetSignatureForError (), cref);
 				}
 				
-				ConversionVisitor conversionVisitor = new ConversionVisitor (false, session.LocationsBag);
-				DocumentationReference docRef = conversionVisitor.ConvertXmlDoc(module.DocumentationBuilder);
+				var conversionVisitor = new ConversionVisitor(false, session.LocationsBag);
+				var docRef = conversionVisitor.ConvertXmlDoc(module.DocumentationBuilder);
 				CompilerCallableEntryPoint.Reset();
 				return docRef;
 			}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/anonymous.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/anonymous.cs
index 7893986fcf..f6c39d904d 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/anonymous.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/anonymous.cs
@@ -316,8 +316,11 @@ namespace Mono.CSharp {
 
 			var hoisted = localVariable.HoistedVariant;
 			if (hoisted != null && hoisted.Storey != this && hoisted.Storey is StateMachine) {
-				// TODO: It's too late the field is defined in HoistedLocalVariable ctor
+				//
+				// Variable is already hoisted but we need it in storey which can be shared
+				//
 				hoisted.Storey.hoisted_locals.Remove (hoisted);
+				hoisted.Storey.Members.Remove (hoisted.Field);
 				hoisted = null;
 			}
 
@@ -729,6 +732,12 @@ namespace Mono.CSharp {
 			this.field = field;
 		}
 
+		public Field Field {
+			get {
+				return field;
+			}
+		}
+
 		public AnonymousMethodStorey Storey {
 			get {
 				return storey;
@@ -849,12 +858,6 @@ namespace Mono.CSharp {
 
 		#region Properties
 
-		public Field Field {
-			get {
-				return field;
-			}
-		}
-
 		public bool IsAssigned { get; set; }
 
 		public ParameterReference Parameter {
@@ -894,12 +897,6 @@ namespace Mono.CSharp {
 			: base (storey, field)
 		{
 		}
-
-		public Field Field {
-			get {
-				return field;
-			}
-		}
 	}
 
 	//
@@ -1050,10 +1047,10 @@ namespace Mono.CSharp {
 						return false;
 					
 					if (p_mod == Parameter.Modifier.NONE)
-						ec.Report.Error (1677, loc, "Parameter `{0}' should not be declared with the `{1}' keyword",
-							      (i + 1).ToString (), Parameter.GetModifierSignature (Parameters.FixedParameters [i].ModFlags));
+						ec.Report.Error (1677, Parameters[i].Location, "Parameter `{0}' should not be declared with the `{1}' keyword",
+							      (i + 1).ToString (), Parameter.GetModifierSignature (Parameters [i].ModFlags));
 					else
-						ec.Report.Error (1676, loc, "Parameter `{0}' must be declared with the `{1}' keyword",
+						ec.Report.Error (1676, Parameters[i].Location, "Parameter `{0}' must be declared with the `{1}' keyword",
 							      (i+1).ToString (), Parameter.GetModifierSignature (p_mod));
 					error = true;
 				}
@@ -1063,18 +1060,17 @@ namespace Mono.CSharp {
 
 				TypeSpec type = invoke_pd.Types [i];
 				
-				// We assume that generic parameters are always inflated
-				if (TypeManager.IsGenericParameter (type))
-					continue;
-				
-				if (TypeManager.HasElementType (type) && TypeManager.IsGenericParameter (TypeManager.GetElementType (type)))
+				//
+				// Assumes that generic mvar parameters are always inflated
+				//
+				if (ImplicitDelegateCreation.ContainsMethodTypeParameter (type))
 					continue;
 				
 				if (!TypeSpecComparer.IsEqual (invoke_pd.Types [i], Parameters.Types [i])) {
 					if (ignore_errors)
 						return false;
 					
-					ec.Report.Error (1678, loc, "Parameter `{0}' is declared as type `{1}' but should be `{2}'",
+					ec.Report.Error (1678, Parameters [i].Location, "Parameter `{0}' is declared as type `{1}' but should be `{2}'",
 						      (i+1).ToString (),
 						      Parameters.Types [i].GetSignatureForError (),
 						      invoke_pd.Types [i].GetSignatureForError ());
@@ -1667,18 +1663,25 @@ namespace Mono.CSharp {
 					if (src_block.HasCapturedThis) {
 						//
 						// Remove hoisted 'this' request when simple instance method is
-						// enough (no hoisted variables only 'this')
+						// enough. No hoisted variables only 'this' and don't need to
+						// propagate this to value type state machine.
 						//
-						if (src_block.ParametersBlock.StateMachine == null)
+						StateMachine sm_parent = null;
+						var pb = src_block.ParametersBlock;
+						do {
+							sm_parent = pb.StateMachine;
+							pb = pb.Parent == null ? null : pb.Parent.ParametersBlock;
+						} while (sm_parent == null && pb != null);
+
+						if (sm_parent == null) {
 							top_block.RemoveThisReferenceFromChildrenBlock (src_block);
-
-						//
-						// Special case where parent class is used to emit instance method
-						// because currect storey is of value type (async host). We cannot
-						// use ldftn on non-boxed instances either to share mutated state
-						//
-						if (sm != null && sm.Kind == MemberKind.Struct) {
-							parent = sm.Parent.PartialContainer;
+						} else if (sm_parent.Kind == MemberKind.Struct) {
+							//
+							// Special case where parent class is used to emit instance method
+							// because currect storey is of value type (async host). We cannot
+							// use ldftn on non-boxed instances either to share mutated state
+							//
+							parent = sm_parent.Parent.PartialContainer;
 						}
 					}
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/assembly.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/assembly.cs
index 3a7cb71aaa..b2e4e9a201 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/assembly.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/assembly.cs
@@ -1179,15 +1179,27 @@ namespace Mono.CSharp
 				if (loaded.Contains (key))
 					continue;
 
-				// A corlib assembly is the first assembly which contains System.Object
-				if (corlib_assembly == null && HasObjectType (a)) {
-					corlib_assembly = a;
-					continue;
-				}
-
 				loaded.Add (key);
 			}
 
+			if (corlib_assembly == null) {
+				//
+				// Requires second pass because HasObjectType can trigger assembly load event
+				//
+				for (int i = 0; i < loaded.Count; ++i) {
+					var assembly = loaded [i];
+
+					//
+					// corlib assembly is the first referenced assembly which contains System.Object
+					//
+					if (HasObjectType (assembly.Item2)) {
+						corlib_assembly = assembly.Item2;
+						loaded.RemoveAt (i);
+						break;
+					}
+				}
+			}
+
 			foreach (var entry in module.Compiler.Settings.AssemblyReferencesAliases) {
 				a = LoadAssemblyFile (entry.Item2, false);
 				if (a == null)
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/assign.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/assign.cs
index 0f3f905928..10dc90c21d 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/assign.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/assign.cs
@@ -815,8 +815,17 @@ namespace Mono.CSharp {
 			// Otherwise, if the selected operator is a predefined operator
 			//
 			Binary b = source as Binary;
-			if (b == null && source is ReducedExpression)
-				b = ((ReducedExpression) source).OriginalExpression as Binary;
+			if (b == null) {
+				if (source is ReducedExpression)
+					b = ((ReducedExpression) source).OriginalExpression as Binary;
+				else if (source is Nullable.LiftedBinaryOperator) {
+					var po = ((Nullable.LiftedBinaryOperator) source);
+					if (po.UserOperator == null)
+						b = po.Binary;
+				} else if (source is TypeCast) {
+					b = ((TypeCast) source).Child as Binary;
+				}
+			}
 
 			if (b != null) {
 				//
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/async.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/async.cs
index a875fe74fc..17f20f3eda 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/async.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/async.cs
@@ -201,7 +201,9 @@ namespace Mono.CSharp
 
 		protected override void DoEmit (EmitContext ec)
 		{
-			GetResultExpression (ec).Emit (ec);
+			using (ec.With (BuilderContext.Options.OmitDebugInfo, true)) {
+				GetResultExpression (ec).Emit (ec);
+			}
 		}
 
 		public Expression GetResultExpression (EmitContext ec)
@@ -230,34 +232,34 @@ namespace Mono.CSharp
 			var fe_awaiter = new FieldExpr (awaiter, loc);
 			fe_awaiter.InstanceExpression = new CompilerGeneratedThis (ec.CurrentType, loc);
 
-			//
-			// awaiter = expr.GetAwaiter ();
-			//
+				Label skip_continuation = ec.DefineLabel ();
+
 			using (ec.With (BuilderContext.Options.OmitDebugInfo, true)) {
+				//
+				// awaiter = expr.GetAwaiter ();
+				//
 				fe_awaiter.EmitAssign (ec, expr, false, false);
-			}
 
-			Label skip_continuation = ec.DefineLabel ();
+				Expression completed_expr;
+				if (IsDynamic) {
+					var rc = new ResolveContext (ec.MemberContext);
 
-			Expression completed_expr;
-			if (IsDynamic) {
-				var rc = new ResolveContext (ec.MemberContext);
+					Arguments dargs = new Arguments (1);
+					dargs.Add (new Argument (fe_awaiter));
+					completed_expr = new DynamicMemberBinder ("IsCompleted", dargs, loc).Resolve (rc);
 
-				Arguments dargs = new Arguments (1);
-				dargs.Add (new Argument (fe_awaiter));
-				completed_expr = new DynamicMemberBinder ("IsCompleted", dargs, loc).Resolve (rc);
+					dargs = new Arguments (1);
+					dargs.Add (new Argument (completed_expr));
+					completed_expr = new DynamicConversion (ec.Module.Compiler.BuiltinTypes.Bool, 0, dargs, loc).Resolve (rc);
+				} else {
+					var pe = PropertyExpr.CreatePredefined (awaiter_definition.IsCompleted, loc);
+					pe.InstanceExpression = fe_awaiter;
+					completed_expr = pe;
+				}
 
-				dargs = new Arguments (1);
-				dargs.Add (new Argument (completed_expr));
-				completed_expr = new DynamicConversion (ec.Module.Compiler.BuiltinTypes.Bool, 0, dargs, loc).Resolve (rc);
-			} else {
-				var pe = PropertyExpr.CreatePredefined (awaiter_definition.IsCompleted, loc);
-				pe.InstanceExpression = fe_awaiter;
-				completed_expr = pe;
+				completed_expr.EmitBranchable (ec, skip_continuation, true);
 			}
 
-			completed_expr.EmitBranchable (ec, skip_continuation, true);
-
 			base.DoEmit (ec);
 
 			//
@@ -747,7 +749,9 @@ namespace Mono.CSharp
 			var args = new Arguments (2);
 			args.Add (new Argument (awaiter, Argument.AType.Ref));
 			args.Add (new Argument (new CompilerGeneratedThis (CurrentType, Location), Argument.AType.Ref));
-			mg.EmitCall (ec, args);
+			using (ec.With (BuilderContext.Options.OmitDebugInfo, true)) {
+				mg.EmitCall (ec, args);
+			}
 		}
 
 		public void EmitInitializer (EmitContext ec)
@@ -823,7 +827,9 @@ namespace Mono.CSharp
 			Arguments args = new Arguments (1);
 			args.Add (new Argument (exceptionVariable));
 
-			mg.EmitCall (ec, args);
+			using (ec.With (BuilderContext.Options.OmitDebugInfo, true)) {
+				mg.EmitCall (ec, args);
+			}
 		}
 
 		public void EmitSetResult (EmitContext ec)
@@ -845,7 +851,9 @@ namespace Mono.CSharp
 				args.Add (new Argument (new LocalVariableReference (hoisted_return, Location)));
 			}
 
-			mg.EmitCall (ec, args);
+			using (ec.With (BuilderContext.Options.OmitDebugInfo, true)) {
+				mg.EmitCall (ec, args);
+			}
 		}
 
 		protected override TypeSpec[] ResolveBaseTypes (out FullNamedExpression base_class)
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/attribute.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/attribute.cs
index f105742ada..ee7ab6022a 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/attribute.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/attribute.cs
@@ -384,6 +384,19 @@ namespace Mono.CSharp {
 			return HasSecurityAttribute && IsSecurityActionValid ();
 		}
 
+		static bool IsValidMethodImplOption (int value)
+		{
+			//
+			// Allow to use AggressiveInlining on any runtime/corlib
+			//
+			MethodImplOptions all = (MethodImplOptions) 256;
+			foreach (MethodImplOptions v in System.Enum.GetValues (typeof (MethodImplOptions))) {
+				all |= v;
+			}
+
+			return ((MethodImplOptions) value | all) == all;
+		}
+
 		static bool IsValidArgumentType (TypeSpec t)
 		{
 			if (t.IsArray) {
@@ -1030,10 +1043,14 @@ namespace Mono.CSharp {
 									if (string.IsNullOrEmpty (value))
 										Error_AttributeEmitError ("DllName cannot be empty or null");
 								}
-							} else if (Type == predefined.MethodImpl && pt.BuiltinType == BuiltinTypeSpec.Type.Short &&
-								!System.Enum.IsDefined (typeof (MethodImplOptions), ((Constant) arg_expr).GetValue ().ToString ())) {
-								Error_AttributeEmitError ("Incorrect argument value.");
-								return;
+							} else if (Type == predefined.MethodImpl) {
+								if (pos_args.Count == 1) {
+									var value = (int) ((Constant) arg_expr).GetValueAsLong ();
+
+									if (!IsValidMethodImplOption (value)) {
+										Error_AttributeEmitError ("Incorrect argument value");
+									}
+								}
 							}
 						}
 
@@ -2007,7 +2024,7 @@ namespace Mono.CSharp {
 			if (ac != null) {
 				element = GetTransformationFlags (ac.Element);
 				if (element == null)
-					return null;
+					return new bool[] { false, false };
 
 				bool[] res = new bool[element.Length + 1];
 				res[0] = false;
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cfold.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cfold.cs
index 2e453ab724..3612166528 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cfold.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cfold.cs
@@ -183,11 +183,11 @@ namespace Mono.CSharp {
 			switch (oper){
 			case Binary.Operator.BitwiseOr:
 				//
-				// bool? operator &(bool? x, bool? y);
+				// bool? operator |(bool? x, bool? y);
 				//
 				if ((lt.BuiltinType == BuiltinTypeSpec.Type.Bool && right is NullLiteral) ||
 					(rt.BuiltinType == BuiltinTypeSpec.Type.Bool && left is NullLiteral)) {
-					var b = new Nullable.LiftedBinaryOperator (oper, left, right).Resolve (ec);
+					var b = new Binary (oper, left, right).ResolveOperator (ec);
 
 					// false | null => null
 					// null | false => null
@@ -231,7 +231,7 @@ namespace Mono.CSharp {
 				//
 				if ((lt.BuiltinType == BuiltinTypeSpec.Type.Bool && right is NullLiteral) ||
 					(rt.BuiltinType == BuiltinTypeSpec.Type.Bool && left is NullLiteral)) {
-					var b = new Nullable.LiftedBinaryOperator (oper, left, right).Resolve (ec);
+					var b = new Binary (oper, left, right).ResolveOperator (ec);
 
 					// false & null => false
 					// null & false => false
@@ -495,7 +495,7 @@ namespace Mono.CSharp {
 				if (left is NullLiteral && right is NullLiteral) {
 					var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
 					lifted_int.ResolveAsType (ec);
-					return (Constant) new Nullable.LiftedBinaryOperator (oper, lifted_int, right).Resolve (ec);
+					return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
 				}
 
 				if (!DoBinaryNumericPromotions (ec, ref left, ref right))
@@ -592,7 +592,7 @@ namespace Mono.CSharp {
 				if (left is NullLiteral && right is NullLiteral) {
 					var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
 					lifted_int.ResolveAsType (ec);
-					return (Constant) new Nullable.LiftedBinaryOperator (oper, lifted_int, right).Resolve (ec);
+					return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
 				}
 
 				if (!DoBinaryNumericPromotions (ec, ref left, ref right))
@@ -688,7 +688,7 @@ namespace Mono.CSharp {
 				if (left is NullLiteral && right is NullLiteral) {
 					var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
 					lifted_int.ResolveAsType (ec);
-					return (Constant) new Nullable.LiftedBinaryOperator (oper, lifted_int, right).Resolve (ec);
+					return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
 				}
 
 				if (!DoBinaryNumericPromotions (ec, ref left, ref right))
@@ -788,7 +788,7 @@ namespace Mono.CSharp {
 				if (left is NullLiteral && right is NullLiteral) {
 					var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
 					lifted_int.ResolveAsType (ec);
-					return (Constant) new Nullable.LiftedBinaryOperator (oper, lifted_int, right).Resolve (ec);
+					return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
 				}
 
 				if (!DoBinaryNumericPromotions (ec, ref left, ref right))
@@ -878,7 +878,7 @@ namespace Mono.CSharp {
 				if (left is NullLiteral && right is NullLiteral) {
 					var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
 					lifted_int.ResolveAsType (ec);
-					return (Constant) new Nullable.LiftedBinaryOperator (oper, lifted_int, right).Resolve (ec);
+					return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
 				}
 
 				IntConstant ic = right.ConvertImplicitly (ec.BuiltinTypes.Int) as IntConstant;
@@ -899,7 +899,7 @@ namespace Mono.CSharp {
 
 				// null << value => null
 				if (left is NullLiteral)
-					return (Constant) new Nullable.LiftedBinaryOperator (oper, left, right).Resolve (ec);
+					return (Constant) new Binary (oper, left, right).ResolveOperator (ec);
 
 				left = left.ConvertImplicitly (ec.BuiltinTypes.Int);
 				if (left.Type.BuiltinType == BuiltinTypeSpec.Type.Int)
@@ -915,7 +915,7 @@ namespace Mono.CSharp {
 				if (left is NullLiteral && right is NullLiteral) {
 					var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
 					lifted_int.ResolveAsType (ec);
-					return (Constant) new Nullable.LiftedBinaryOperator (oper, lifted_int, right).Resolve (ec);
+					return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
 				}
 
 				IntConstant sic = right.ConvertImplicitly (ec.BuiltinTypes.Int) as IntConstant;
@@ -935,7 +935,7 @@ namespace Mono.CSharp {
 
 				// null >> value => null
 				if (left is NullLiteral)
-					return (Constant) new Nullable.LiftedBinaryOperator (oper, left, right).Resolve (ec);
+					return (Constant) new Binary (oper, left, right).ResolveOperator (ec);
 
 				left = left.ConvertImplicitly (ec.BuiltinTypes.Int);
 				if (left.Type.BuiltinType == BuiltinTypeSpec.Type.Int)
@@ -1037,11 +1037,7 @@ namespace Mono.CSharp {
 					if (left is NullLiteral) {
 						var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
 						lifted_int.ResolveAsType (ec);
-						return (Constant) new Nullable.LiftedBinaryOperator (oper, lifted_int, right).Resolve (ec);
-					}
-
-					if (left is Nullable.LiftedNull) {
-						return (Constant) new Nullable.LiftedBinaryOperator (oper, left, right).Resolve (ec);
+						return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
 					}
 				}
 
@@ -1077,11 +1073,7 @@ namespace Mono.CSharp {
 					if (left is NullLiteral) {
 						var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
 						lifted_int.ResolveAsType (ec);
-						return (Constant) new Nullable.LiftedBinaryOperator (oper, lifted_int, right).Resolve (ec);
-					}
-
-					if (left is Nullable.LiftedNull) {
-						return (Constant) new Nullable.LiftedBinaryOperator (oper, left, right).Resolve (ec);
+						return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
 					}
 				}
 
@@ -1117,11 +1109,7 @@ namespace Mono.CSharp {
 					if (left is NullLiteral) {
 						var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
 						lifted_int.ResolveAsType (ec);
-						return (Constant) new Nullable.LiftedBinaryOperator (oper, lifted_int, right).Resolve (ec);
-					}
-
-					if (left is Nullable.LiftedNull) {
-						return (Constant) new Nullable.LiftedBinaryOperator (oper, left, right).Resolve (ec);
+						return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
 					}
 				}
 
@@ -1157,11 +1145,7 @@ namespace Mono.CSharp {
 					if (left is NullLiteral) {
 						var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
 						lifted_int.ResolveAsType (ec);
-						return (Constant) new Nullable.LiftedBinaryOperator (oper, lifted_int, right).Resolve (ec);
-					}
-
-					if (left is Nullable.LiftedNull) {
-						return (Constant) new Nullable.LiftedBinaryOperator (oper, left, right).Resolve (ec);
+						return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
 					}
 				}
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/class.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/class.cs
index 048127505f..204f9ae551 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/class.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/class.cs
@@ -98,9 +98,9 @@ namespace Mono.CSharp
 			get; set;
 		}
 
-		public virtual void AddCompilerGeneratedClass (CompilerGeneratedContainer c)
+		public void AddCompilerGeneratedClass (CompilerGeneratedContainer c)
 		{
-			containers.Add (c);
+			AddTypeContainerMember (c);
 		}
 
 		public virtual void AddPartial (TypeDefinition next_part)
@@ -187,15 +187,12 @@ namespace Mono.CSharp
 
 			next_part.PartialContainer = existing;
 
-			if (containers == null)
-				containers = new List<TypeContainer> ();
-
-			containers.Add (next_part);
+			AddTypeContainerMember (next_part);
 		}
 
 		public virtual void AddTypeContainer (TypeContainer tc)
 		{
-			containers.Add (tc);
+			AddTypeContainerMember (tc);
 
 			var tparams = tc.MemberName.TypeParameters;
 			if (tparams != null && tc.PartialContainer != null) {
@@ -210,6 +207,11 @@ namespace Mono.CSharp
 			}
 		}
 
+		protected virtual void AddTypeContainerMember (TypeContainer tc)
+		{
+			containers.Add (tc);
+		}
+
 		public virtual void CloseContainer ()
 		{
 			if (containers != null) {
@@ -356,7 +358,6 @@ namespace Mono.CSharp
 
 		public string GetSignatureForMetadata ()
 		{
-#if STATIC
 			if (Parent is TypeDefinition) {
 				return Parent.GetSignatureForMetadata () + "+" + TypeNameParser.Escape (MemberName.Basename);
 			}
@@ -364,9 +365,6 @@ namespace Mono.CSharp
 			var sb = new StringBuilder ();
 			CreateMetadataName (sb);
 			return sb.ToString ();
-#else
-			throw new NotImplementedException ();
-#endif
 		}
 
 		public virtual void RemoveContainer (TypeContainer cont)
@@ -776,21 +774,17 @@ namespace Mono.CSharp
 		{
 			AddNameToContainer (tc, tc.Basename);
 
-			if (containers == null)
-				containers = new List<TypeContainer> ();
-
-			members.Add (tc);
 			base.AddTypeContainer (tc);
 		}
 
-		public override void AddCompilerGeneratedClass (CompilerGeneratedContainer c)
+		protected override void AddTypeContainerMember (TypeContainer tc)
 		{
-			members.Add (c);
+			members.Add (tc);
 
 			if (containers == null)
 				containers = new List<TypeContainer> ();
 
-			base.AddCompilerGeneratedClass (c);
+			base.AddTypeContainerMember (tc);
 		}
 
 		//
@@ -1201,7 +1195,7 @@ namespace Mono.CSharp
 				}
 
 				bool pair_found = false;
-				for (int ii = i + 1; ii < members.Count; ++ii) {
+				for (int ii = 0; ii < members.Count; ++ii) {
 					var o_b = members[ii] as Operator;
 					if (o_b == null || o_b.OperatorType != matching_type)
 						continue;
@@ -1544,19 +1538,31 @@ namespace Mono.CSharp
 			}
 
 			if (set_base_type) {
-				if (base_type != null) {
-					spec.BaseType = base_type;
-
-					// Set base type after type creation
-					TypeBuilder.SetParent (base_type.GetMetaInfo ());
-				} else {
-					TypeBuilder.SetParent (null);
-				}
+				SetBaseType ();
 			}
 
 			return true;
 		}
 
+		void SetBaseType ()
+		{
+			if (base_type == null) {
+				TypeBuilder.SetParent (null);
+				return;
+			}
+
+			if (spec.BaseType == base_type)
+				return;
+
+			spec.BaseType = base_type;
+
+			if (IsPartialPart)
+				spec.UpdateInflatedInstancesBaseType ();
+
+			// Set base type after type creation
+			TypeBuilder.SetParent (base_type.GetMetaInfo ());
+		}
+
 		public override void ExpandBaseInterfaces ()
 		{
 			if (!IsPartialPart)
@@ -2108,8 +2114,13 @@ namespace Mono.CSharp
 
 			base.Emit ();
 
-			for (int i = 0; i < members.Count; i++)
-				members[i].Emit ();
+			for (int i = 0; i < members.Count; i++) {
+				var m = members[i];
+				if ((m.caching_flags & Flags.CloseTypeCreated) != 0)
+					continue;
+
+				m.Emit ();
+			}
 
 			EmitIndexerName ();
 			CheckAttributeClsCompliance ();
@@ -3357,7 +3368,11 @@ namespace Mono.CSharp
 					Parent.PartialContainer.VerifyImplements (this);
 				}
 
-				ModifiersExtensions.Check (Modifiers.AllowedExplicitImplFlags, explicit_mod_flags, 0, Location, Report);
+				Modifiers allowed_explicit = Modifiers.AllowedExplicitImplFlags;
+				if (this is Method)
+					allowed_explicit |= Modifiers.ASYNC;
+
+				ModifiersExtensions.Check (allowed_explicit, explicit_mod_flags, 0, Location, Report);
 			}
 
 			return base.Define ();
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/codegen.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/codegen.cs
index 9bb7066758..f190cc941c 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/codegen.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/codegen.cs
@@ -248,6 +248,21 @@ namespace Mono.CSharp
 			return true;
 		}
 
+		public void MarkCallEntry (Location loc)
+		{
+			if (!EmitAccurateDebugInfo)
+				return;
+
+			//
+			// TODO: This should emit different kind of sequence point to make
+			// step-over work for statement over multiple lines
+			//
+			// Debugging experience for Foo (A () + B ()) where A and B are
+			// on separate lines is not great
+			//
+			Mark (loc);
+		}
+
 		public void DefineLocalVariable (string name, LocalBuilder builder)
 		{
 			if ((flags & Options.OmitDebugInfo) != 0)
@@ -258,6 +273,9 @@ namespace Mono.CSharp
 
 		public void BeginCatchBlock (TypeSpec type)
 		{
+			if (IsAnonymousStoreyMutateRequired)
+				type = CurrentAnonymousMethod.Storey.Mutator.Mutate (type);
+
 			ig.BeginCatchBlock (type.GetMetaInfo ());
 		}
 
@@ -1011,11 +1029,7 @@ namespace Mono.CSharp
 				// Emit explicit sequence point for expressions like Foo.Bar () to help debugger to
 				// break at right place when LHS expression can be stepped-into
 				//
-				// TODO: The list is probably not comprehensive, need to do more testing
-				//
-				if (InstanceExpression is PropertyExpr || InstanceExpression is Invocation || InstanceExpression is IndexerExpr ||
-					InstanceExpression is New || InstanceExpression is DelegateInvocation)
-					ec.Mark (loc.Value);
+				ec.MarkCallEntry (loc.Value);
 			}
 
 			//
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/complete.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/complete.cs
index a1bb8ec00f..6eb42cddad 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/complete.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/complete.cs
@@ -109,28 +109,56 @@ namespace Mono.CSharp {
 			this.targs = targs;
 		}
 		
-		protected override Expression DoResolve (ResolveContext ec)
+		protected override Expression DoResolve (ResolveContext rc)
 		{
-			Expression expr_resolved = expr.Resolve (ec,
-				ResolveFlags.VariableOrValue | ResolveFlags.Type);
+			var sn = expr as SimpleName;
+			const ResolveFlags flags = ResolveFlags.VariableOrValue | ResolveFlags.Type;
+
+			//
+			// Resolve the expression with flow analysis turned off, we'll do the definite
+			// assignment checks later.  This is because we don't know yet what the expression
+			// will resolve to - it may resolve to a FieldExpr and in this case we must do the
+			// definite assignment check on the actual field and not on the whole struct.
+			//
+			using (rc.Set (ResolveContext.Options.OmitStructFlowAnalysis)) {
+				if (sn != null) {
+					expr = sn.LookupNameExpression (rc, MemberLookupRestrictions.ReadAccess | MemberLookupRestrictions.ExactArity);
+
+					//
+					// Resolve expression which does have type set as we need expression type
+					// with disable flow analysis as we don't know whether left side expression
+					// is used as variable or type
+					//
+					if (expr is VariableReference || expr is ConstantExpr || expr is Linq.TransparentMemberAccess) {
+						using (rc.With (ResolveContext.Options.DoFlowAnalysis, false)) {
+							expr = expr.Resolve (rc);
+						}
+					} else if (expr is TypeParameterExpr) {
+						expr.Error_UnexpectedKind (rc, flags, sn.Location);
+						expr = null;
+					}
+				} else {
+					expr = expr.Resolve (rc, flags);
+				}
+			}
 
-			if (expr_resolved == null)
+			if (expr == null)
 				return null;
 
-			TypeSpec expr_type = expr_resolved.Type;
+			TypeSpec expr_type = expr.Type;
 			if (expr_type.IsPointer || expr_type.Kind == MemberKind.Void || expr_type == InternalType.NullLiteral || expr_type == InternalType.AnonymousMethod) {
-				expr_resolved.Error_OperatorCannotBeApplied (ec, loc, ".", expr_type);
+				expr.Error_OperatorCannotBeApplied (rc, loc, ".", expr_type);
 				return null;
 			}
 
 			if (targs != null) {
-				if (!targs.Resolve (ec))
+				if (!targs.Resolve (rc))
 					return null;
 			}
 
 			var results = new List<string> ();
-			if (expr_resolved is Namespace){
-				Namespace nexpr = expr_resolved as Namespace;
+			if (expr is Namespace) {
+				Namespace nexpr = expr as Namespace;
 				string namespaced_partial;
 
 				if (partial_name == null)
@@ -138,11 +166,11 @@ namespace Mono.CSharp {
 				else
 					namespaced_partial = nexpr.Name + "." + partial_name;
 
-				ec.CurrentMemberDefinition.GetCompletionStartingWith (namespaced_partial, results);
+				rc.CurrentMemberDefinition.GetCompletionStartingWith (namespaced_partial, results);
 				if (partial_name != null)
 					results = results.Select (l => l.Substring (partial_name.Length)).ToList ();
 			} else {
-				var r = MemberCache.GetCompletitionMembers (ec, expr_type, partial_name).Select (l => l.Name);
+				var r = MemberCache.GetCompletitionMembers (rc, expr_type, partial_name).Select (l => l.Name);
 				AppendResults (results, partial_name, r);
 			}
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/constant.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/constant.cs
index ff114f5203..7280c68b60 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/constant.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/constant.cs
@@ -3,11 +3,11 @@
 //
 // Author:
 //   Miguel de Icaza (miguel@ximian.com)
-//   Marek Safar (marek.safar@seznam.cz)
+//   Marek Safar (marek.safar@gmail.com)
 //
 // Copyright 2001-2003 Ximian, Inc.
 // Copyright 2003-2008 Novell, Inc.
-// Copyright 2011 Xamarin Inc
+// Copyright 2011-2013 Xamarin Inc
 //
 
 using System;
@@ -89,7 +89,7 @@ namespace Mono.CSharp {
 			if (this.type == type)
 				return this;
 
-			if (Convert.ImplicitNumericConversion (this, type) == null) 
+			if (!Convert.ImplicitNumericConversionExists (this.type, type)) 
 				return null;
 
 			bool fail;			
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/convert.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/convert.cs
index 3c5ebeae4b..bfbfe03749 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/convert.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/convert.cs
@@ -479,7 +479,7 @@ namespace Mono.CSharp {
 			}
 			
 			if (expr_type != expr.Type)
-				return new Nullable.Lifted (conv, unwrap, target_type).Resolve (ec);
+				return new Nullable.LiftedConversion (conv, unwrap, target_type).Resolve (ec);
 
 			return Nullable.Wrap.Create (conv, target_type);
 		}
@@ -1097,14 +1097,16 @@ namespace Mono.CSharp {
 			TypeSpec source_type = source.Type;
 			TypeSpec target_type = target;
 			Expression source_type_expr;
+			bool nullable_source = false;
 
 			if (source_type.IsNullableType) {
 				// No unwrapping conversion S? -> T for non-reference types
 				if (implicitOnly && !TypeSpec.IsReferenceType (target_type) && !target_type.IsNullableType) {
 					source_type_expr = source;
 				} else {
-					source_type_expr = Nullable.Unwrap.Create (source);
+					source_type_expr = Nullable.Unwrap.CreateUnwrapped (source);
 					source_type = source_type_expr.Type;
+					nullable_source = true;
 				}
 			} else {
 				source_type_expr = source;
@@ -1231,26 +1233,48 @@ namespace Mono.CSharp {
 			//
 			if (t_x != target_type) {
 				//
-				// User operator is of T?, no need to lift it
+				// User operator is of T?
 				//
-				if (t_x == target && t_x.IsNullableType)
-					return source;
+				if (t_x.IsNullableType && target.IsNullableType) {
+					//
+					// User operator return type does not match target type we need
+					// yet another conversion. This should happen for promoted numeric
+					// types only
+					//
+					if (t_x != target) {
+						var unwrap = Nullable.Unwrap.CreateUnwrapped (source);
 
-				source = implicitOnly ?
-					ImplicitConversionStandard (ec, source, target_type, loc) :
-					ExplicitConversionStandard (ec, source, target_type, loc);
+						source = implicitOnly ?
+							ImplicitConversionStandard (ec, unwrap, target_type, loc) :
+							ExplicitConversionStandard (ec, unwrap, target_type, loc);
 
-				if (source == null)
-					return null;
+						if (source == null)
+							return null;
+
+						source = new Nullable.LiftedConversion (source, unwrap, target).Resolve (ec);
+					}
+				} else {
+					source = implicitOnly ?
+						ImplicitConversionStandard (ec, source, target_type, loc) :
+						ExplicitConversionStandard (ec, source, target_type, loc);
+
+					if (source == null)
+						return null;
+				}
 			}
 
+
 			//
-			// Source expression is of nullable type, lift the result in the case it's null and
-			// not nullable/lifted user operator is used
+			// Source expression is of nullable type and underlying conversion returns
+			// only non-nullable type we need to lift it manually
 			//
-			if (source_type_expr is Nullable.Unwrap && !s_x.IsNullableType && (TypeSpec.IsReferenceType (target) || target_type != target))
-				source = new Nullable.Lifted (source, source_type_expr, target).Resolve (ec);
-			else if (target_type != target)
+			if (nullable_source && !s_x.IsNullableType)
+				return new Nullable.LiftedConversion (source, source_type_expr, target).Resolve (ec);
+
+			//
+			// Target is of nullable type but source type is not, wrap the result expression
+			//
+			if (target.IsNullableType && !t_x.IsNullableType)
 				source = Nullable.Wrap.Create (source, target);
 
 			return source;
@@ -1414,6 +1438,9 @@ namespace Mono.CSharp {
 				Expression am = ame.Compatible (ec, target_type);
 				if (am != null)
 					return am.Resolve (ec);
+
+				// Avoid CS1503 after CS1661
+				return ErrorExpression.Instance;
 			}
 
 			if (expr_type == InternalType.Arglist && target_type == ec.Module.PredefinedTypes.ArgIterator.TypeSpec)
@@ -2165,7 +2192,7 @@ namespace Mono.CSharp {
 					if (e == null)
 						return null;
 
-					return new Nullable.Lifted (e, unwrap, target_type).Resolve (ec);
+					return new Nullable.LiftedConversion (e, unwrap, target_type).Resolve (ec);
 				}
 				if (expr_type.BuiltinType == BuiltinTypeSpec.Type.Object) {
 					return new UnboxCast (expr, target_type);
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs
index 84238148de..8877b1b7b5 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs
@@ -118,6 +118,8 @@ namespace Mono.CSharp
 		// Keeps track of global data changes to undo on parser error
 		//
 		public Undo undo;
+
+		bool? interactive_async;
 		
 		Stack<Linq.QueryBlock> linq_clause_blocks;
 
@@ -147,7 +149,6 @@ namespace Mono.CSharp
 		Stack<Location> opt_intoStack = new Stack<Location> ();
 
 		bool HadAttributeParens;
-		List<Location> attributeCommas = new List<Location> ();
 		List<Location> attributeArgumentCommas = new List<Location> ();
 		List<Location> parameterListCommas = new List<Location> ();
 		Stack<Location> location_stack;
@@ -1098,6 +1099,7 @@ namespace Mono.CSharp
 //t    "return_statement : RETURN expression error",
 //t    "return_statement : RETURN error",
 //t    "throw_statement : THROW opt_expression SEMICOLON",
+//t    "throw_statement : THROW expression error",
 //t    "throw_statement : THROW error",
 //t    "yield_statement : identifier_inside_body RETURN opt_expression SEMICOLON",
 //t    "yield_statement : identifier_inside_body RETURN expression error",
@@ -1471,20 +1473,20 @@ namespace Mono.CSharp
         yyVal = yyV > yyTop ? null : yyVals[yyV]; // yyVal = yyDefault(yyV > yyTop ? null : yyVals[yyV]);
         switch (yyN) {
 case 1:
-#line 386 "cs-parser.jay"
+#line 387 "cs-parser.jay"
   {
 		Lexer.check_incorrect_doc_comment ();
 	  }
   break;
 case 2:
-#line 387 "cs-parser.jay"
+#line 388 "cs-parser.jay"
   { Lexer.CompleteOnEOF = false; }
   break;
 case 6:
   case_6();
   break;
 case 7:
-#line 406 "cs-parser.jay"
+#line 407 "cs-parser.jay"
   {
 		module.AddAttributes ((Attributes) yyVals[0+yyTop], current_namespace);
 	  }
@@ -1496,7 +1498,7 @@ case 13:
   case_13();
   break;
 case 14:
-#line 451 "cs-parser.jay"
+#line 452 "cs-parser.jay"
   {
 		Error_SyntaxError (yyToken);
 	  }
@@ -1541,7 +1543,7 @@ case 43:
   case_43();
   break;
 case 44:
-#line 635 "cs-parser.jay"
+#line 636 "cs-parser.jay"
   {
 		current_namespace.DeclarationFound = true;
 	  }
@@ -1580,15 +1582,15 @@ case 62:
   case_62();
   break;
 case 63:
-#line 770 "cs-parser.jay"
-  { yyVal = "event"; savedCloseLocation = GetLocation (yyVals[0+yyTop]); }
+#line 761 "cs-parser.jay"
+  { yyVal = "event"; PushLocation (GetLocation (yyVals[0+yyTop])); }
   break;
 case 64:
-#line 771 "cs-parser.jay"
-  { yyVal = "return"; savedCloseLocation = GetLocation (yyVals[0+yyTop]); }
+#line 762 "cs-parser.jay"
+  { yyVal = "return"; PushLocation (GetLocation (yyVals[0+yyTop])); }
   break;
 case 65:
-#line 778 "cs-parser.jay"
+#line 769 "cs-parser.jay"
   {
 		yyVal = new List<Attribute> (4) { (Attribute) yyVals[0+yyTop] };
 	  }
@@ -1597,7 +1599,7 @@ case 66:
   case_66();
   break;
 case 67:
-#line 795 "cs-parser.jay"
+#line 786 "cs-parser.jay"
   {
 		++lexer.parsing_block;
 	  }
@@ -1606,14 +1608,14 @@ case 68:
   case_68();
   break;
 case 70:
-#line 823 "cs-parser.jay"
+#line 814 "cs-parser.jay"
   { yyVal = null; HadAttributeParens = false;  }
   break;
 case 71:
   case_71();
   break;
 case 72:
-#line 835 "cs-parser.jay"
+#line 826 "cs-parser.jay"
   { yyVal = null; }
   break;
 case 73:
@@ -1629,7 +1631,7 @@ case 76:
   case_76();
   break;
 case 77:
-#line 879 "cs-parser.jay"
+#line 870 "cs-parser.jay"
   {
 	  	yyVal = new Argument ((Expression) yyVals[0+yyTop]);
 	  }
@@ -1638,7 +1640,7 @@ case 79:
   case_79();
   break;
 case 80:
-#line 892 "cs-parser.jay"
+#line 883 "cs-parser.jay"
   {
 		++lexer.parsing_block;
 	  }
@@ -1650,29 +1652,29 @@ case 82:
   case_82();
   break;
 case 83:
-#line 918 "cs-parser.jay"
+#line 909 "cs-parser.jay"
   { yyVal = null; }
   break;
 case 84:
-#line 922 "cs-parser.jay"
+#line 913 "cs-parser.jay"
   { 
 		yyVal = Argument.AType.Ref;
 	  }
   break;
 case 85:
-#line 926 "cs-parser.jay"
+#line 917 "cs-parser.jay"
   { 
 		yyVal = Argument.AType.Out;
 	  }
   break;
 case 88:
-#line 938 "cs-parser.jay"
+#line 929 "cs-parser.jay"
   {
 		lexer.parsing_modifiers = true;
 	  }
   break;
 case 89:
-#line 942 "cs-parser.jay"
+#line 933 "cs-parser.jay"
   {
 		lexer.parsing_modifiers = true;
 	  }
@@ -1681,7 +1683,7 @@ case 102:
   case_102();
   break;
 case 103:
-#line 973 "cs-parser.jay"
+#line 964 "cs-parser.jay"
   {
 	  }
   break;
@@ -1701,7 +1703,7 @@ case 108:
   case_108();
   break;
 case 109:
-#line 1017 "cs-parser.jay"
+#line 1008 "cs-parser.jay"
   {
 		Error_SyntaxError (yyToken);
 	  }
@@ -1716,13 +1718,13 @@ case 112:
   case_112();
   break;
 case 115:
-#line 1066 "cs-parser.jay"
+#line 1057 "cs-parser.jay"
   {
 		current_field.AddDeclarator ((FieldDeclarator) yyVals[0+yyTop]);
 	  }
   break;
 case 116:
-#line 1070 "cs-parser.jay"
+#line 1061 "cs-parser.jay"
   {
 		current_field.AddDeclarator ((FieldDeclarator) yyVals[0+yyTop]);
 	  }
@@ -1731,7 +1733,7 @@ case 117:
   case_117();
   break;
 case 118:
-#line 1086 "cs-parser.jay"
+#line 1077 "cs-parser.jay"
   {
 		++lexer.parsing_block;
 	  }
@@ -1755,7 +1757,7 @@ case 126:
   case_126();
   break;
 case 127:
-#line 1165 "cs-parser.jay"
+#line 1156 "cs-parser.jay"
   {
 		report.Error (1641, GetLocation (yyVals[-1+yyTop]), "A fixed size buffer field must have the array size specifier after the field name");
 	  }
@@ -1767,13 +1769,13 @@ case 130:
   case_130();
   break;
 case 133:
-#line 1195 "cs-parser.jay"
+#line 1186 "cs-parser.jay"
   {
 		current_field.AddDeclarator ((FieldDeclarator) yyVals[0+yyTop]);
 	  }
   break;
 case 134:
-#line 1199 "cs-parser.jay"
+#line 1190 "cs-parser.jay"
   {
 		current_field.AddDeclarator ((FieldDeclarator) yyVals[0+yyTop]);
 	  }
@@ -1782,7 +1784,7 @@ case 135:
   case_135();
   break;
 case 136:
-#line 1212 "cs-parser.jay"
+#line 1203 "cs-parser.jay"
   {
 		++lexer.parsing_block;
 	  }
@@ -1791,13 +1793,13 @@ case 137:
   case_137();
   break;
 case 140:
-#line 1231 "cs-parser.jay"
+#line 1222 "cs-parser.jay"
   {
 		current_field.AddDeclarator ((FieldDeclarator) yyVals[0+yyTop]);
 	  }
   break;
 case 141:
-#line 1235 "cs-parser.jay"
+#line 1226 "cs-parser.jay"
   {
 		current_field.AddDeclarator ((FieldDeclarator) yyVals[0+yyTop]);
 	  }
@@ -1806,7 +1808,7 @@ case 142:
   case_142();
   break;
 case 143:
-#line 1251 "cs-parser.jay"
+#line 1242 "cs-parser.jay"
   {
 		++lexer.parsing_block;
 	  }
@@ -1827,7 +1829,7 @@ case 150:
   case_150();
   break;
 case 151:
-#line 1319 "cs-parser.jay"
+#line 1310 "cs-parser.jay"
   {
 		valid_param_mod = ParameterModifierType.All;
 	  }
@@ -1839,7 +1841,7 @@ case 153:
   case_153();
   break;
 case 154:
-#line 1358 "cs-parser.jay"
+#line 1349 "cs-parser.jay"
   {
 		lexer.parsing_generic_declaration = true;
 	  }
@@ -1848,7 +1850,7 @@ case 155:
   case_155();
   break;
 case 156:
-#line 1368 "cs-parser.jay"
+#line 1359 "cs-parser.jay"
   {
 		lexer.ConstraintsParsing = true;
 	  }
@@ -1863,11 +1865,11 @@ case 159:
   case_159();
   break;
 case 161:
-#line 1441 "cs-parser.jay"
+#line 1432 "cs-parser.jay"
   { savedLocation = GetLocation (yyVals[0+yyTop]); yyVal = null; }
   break;
 case 162:
-#line 1445 "cs-parser.jay"
+#line 1436 "cs-parser.jay"
   { yyVal = ParametersCompiled.EmptyReadOnlyParameters; }
   break;
 case 164:
@@ -1892,13 +1894,13 @@ case 170:
   case_170();
   break;
 case 171:
-#line 1517 "cs-parser.jay"
+#line 1508 "cs-parser.jay"
   {
 		yyVal = new ParametersCompiled (new Parameter[] { (Parameter) yyVals[0+yyTop] } );
 	  }
   break;
 case 172:
-#line 1521 "cs-parser.jay"
+#line 1512 "cs-parser.jay"
   {
 		yyVal = new ParametersCompiled (new Parameter [] { new ArglistParameter (GetLocation (yyVals[0+yyTop])) }, true);
 	  }
@@ -1925,7 +1927,7 @@ case 179:
   case_179();
   break;
 case 180:
-#line 1602 "cs-parser.jay"
+#line 1593 "cs-parser.jay"
   {
 	  	++lexer.parsing_block;
 	  }
@@ -1934,11 +1936,11 @@ case 181:
   case_181();
   break;
 case 182:
-#line 1643 "cs-parser.jay"
+#line 1634 "cs-parser.jay"
   { yyVal = Parameter.Modifier.NONE; }
   break;
 case 184:
-#line 1651 "cs-parser.jay"
+#line 1642 "cs-parser.jay"
   {
 		yyVal = yyVals[0+yyTop];
 	  }
@@ -1971,7 +1973,7 @@ case 193:
   case_193();
   break;
 case 194:
-#line 1745 "cs-parser.jay"
+#line 1736 "cs-parser.jay"
   {
 		Error_DuplicateParameterModifier (GetLocation (yyVals[-1+yyTop]), Parameter.Modifier.PARAMS);
 	  }
@@ -1992,7 +1994,7 @@ case 199:
   case_199();
   break;
 case 200:
-#line 1799 "cs-parser.jay"
+#line 1790 "cs-parser.jay"
   {
 	  	valid_param_mod = ParameterModifierType.Params | ParameterModifierType.DefaultValue;
 	  }
@@ -2001,7 +2003,7 @@ case 201:
   case_201();
   break;
 case 202:
-#line 1828 "cs-parser.jay"
+#line 1819 "cs-parser.jay"
   {
 		lexer.PropertyParsing = false;
 	  }
@@ -2031,7 +2033,7 @@ case 215:
   case_215();
   break;
 case 216:
-#line 1976 "cs-parser.jay"
+#line 1967 "cs-parser.jay"
   {
 	  }
   break;
@@ -2048,55 +2050,55 @@ case 220:
   case_220();
   break;
 case 221:
-#line 2016 "cs-parser.jay"
+#line 2007 "cs-parser.jay"
   {
 		Error_SyntaxError (yyToken);	  
 	  }
   break;
 case 224:
-#line 2028 "cs-parser.jay"
+#line 2019 "cs-parser.jay"
   {
 		lexer.parsing_modifiers = true;
 	  }
   break;
 case 225:
-#line 2032 "cs-parser.jay"
+#line 2023 "cs-parser.jay"
   {
 		lexer.parsing_modifiers = true;
 	  }
   break;
 case 226:
-#line 2039 "cs-parser.jay"
+#line 2030 "cs-parser.jay"
   {
 		report.Error (525, GetLocation (yyVals[0+yyTop]), "Interfaces cannot contain fields or constants");
 	  }
   break;
 case 227:
-#line 2043 "cs-parser.jay"
+#line 2034 "cs-parser.jay"
   {
 		report.Error (525, GetLocation (yyVals[0+yyTop]), "Interfaces cannot contain fields or constants");
 	  }
   break;
 case 232:
-#line 2051 "cs-parser.jay"
+#line 2042 "cs-parser.jay"
   {
 	  	report.Error (567, GetLocation (yyVals[0+yyTop]), "Interfaces cannot contain operators");
 	  }
   break;
 case 233:
-#line 2055 "cs-parser.jay"
+#line 2046 "cs-parser.jay"
   {
 	  	report.Error (526, GetLocation (yyVals[0+yyTop]), "Interfaces cannot contain contructors");
 	  }
   break;
 case 234:
-#line 2059 "cs-parser.jay"
+#line 2050 "cs-parser.jay"
   {
 	  	report.Error (524, GetLocation (yyVals[0+yyTop]), "Interfaces cannot declare classes, structs, interfaces, delegates, or enumerations");
 	  }
   break;
 case 235:
-#line 2065 "cs-parser.jay"
+#line 2056 "cs-parser.jay"
   {
 	  }
   break;
@@ -2104,14 +2106,14 @@ case 236:
   case_236();
   break;
 case 238:
-#line 2098 "cs-parser.jay"
+#line 2089 "cs-parser.jay"
   { savedLocation = GetLocation (yyVals[0+yyTop]); yyVal = null; }
   break;
 case 240:
   case_240();
   break;
 case 241:
-#line 2114 "cs-parser.jay"
+#line 2105 "cs-parser.jay"
   {
 		valid_param_mod = ParameterModifierType.DefaultValue;
 	  }
@@ -2120,95 +2122,95 @@ case 242:
   case_242();
   break;
 case 244:
-#line 2160 "cs-parser.jay"
+#line 2151 "cs-parser.jay"
   { yyVal = Operator.OpType.LogicalNot; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 245:
-#line 2161 "cs-parser.jay"
+#line 2152 "cs-parser.jay"
   { yyVal = Operator.OpType.OnesComplement; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 246:
-#line 2162 "cs-parser.jay"
+#line 2153 "cs-parser.jay"
   { yyVal = Operator.OpType.Increment; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 247:
-#line 2163 "cs-parser.jay"
+#line 2154 "cs-parser.jay"
   { yyVal = Operator.OpType.Decrement; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 248:
-#line 2164 "cs-parser.jay"
+#line 2155 "cs-parser.jay"
   { yyVal = Operator.OpType.True; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 249:
-#line 2165 "cs-parser.jay"
+#line 2156 "cs-parser.jay"
   { yyVal = Operator.OpType.False; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 250:
-#line 2167 "cs-parser.jay"
+#line 2158 "cs-parser.jay"
   { yyVal = Operator.OpType.Addition; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 251:
-#line 2168 "cs-parser.jay"
+#line 2159 "cs-parser.jay"
   { yyVal = Operator.OpType.Subtraction; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 252:
-#line 2170 "cs-parser.jay"
+#line 2161 "cs-parser.jay"
   { yyVal = Operator.OpType.Multiply; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 253:
-#line 2171 "cs-parser.jay"
+#line 2162 "cs-parser.jay"
   {  yyVal = Operator.OpType.Division; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 254:
-#line 2172 "cs-parser.jay"
+#line 2163 "cs-parser.jay"
   { yyVal = Operator.OpType.Modulus; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 255:
-#line 2173 "cs-parser.jay"
+#line 2164 "cs-parser.jay"
   { yyVal = Operator.OpType.BitwiseAnd; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 256:
-#line 2174 "cs-parser.jay"
+#line 2165 "cs-parser.jay"
   { yyVal = Operator.OpType.BitwiseOr; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 257:
-#line 2175 "cs-parser.jay"
+#line 2166 "cs-parser.jay"
   { yyVal = Operator.OpType.ExclusiveOr; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 258:
-#line 2176 "cs-parser.jay"
+#line 2167 "cs-parser.jay"
   { yyVal = Operator.OpType.LeftShift; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 259:
-#line 2177 "cs-parser.jay"
+#line 2168 "cs-parser.jay"
   { yyVal = Operator.OpType.RightShift; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 260:
-#line 2178 "cs-parser.jay"
+#line 2169 "cs-parser.jay"
   { yyVal = Operator.OpType.Equality; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 261:
-#line 2179 "cs-parser.jay"
+#line 2170 "cs-parser.jay"
   { yyVal = Operator.OpType.Inequality; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 262:
-#line 2180 "cs-parser.jay"
+#line 2171 "cs-parser.jay"
   { yyVal = Operator.OpType.GreaterThan; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 263:
-#line 2181 "cs-parser.jay"
+#line 2172 "cs-parser.jay"
   { yyVal = Operator.OpType.LessThan; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 264:
-#line 2182 "cs-parser.jay"
+#line 2173 "cs-parser.jay"
   { yyVal = Operator.OpType.GreaterThanOrEqual; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 265:
-#line 2183 "cs-parser.jay"
+#line 2174 "cs-parser.jay"
   { yyVal = Operator.OpType.LessThanOrEqual; savedOperatorLocation = GetLocation (yyVals[0+yyTop]); }
   break;
 case 266:
-#line 2190 "cs-parser.jay"
+#line 2181 "cs-parser.jay"
   {
 		valid_param_mod = ParameterModifierType.DefaultValue;
 	  }
@@ -2217,7 +2219,7 @@ case 267:
   case_267();
   break;
 case 268:
-#line 2213 "cs-parser.jay"
+#line 2204 "cs-parser.jay"
   {
 		valid_param_mod = ParameterModifierType.DefaultValue;
 	  }
@@ -2244,11 +2246,11 @@ case 275:
   case_275();
   break;
 case 277:
-#line 2323 "cs-parser.jay"
+#line 2314 "cs-parser.jay"
   { current_block = null; yyVal = null; }
   break;
 case 280:
-#line 2335 "cs-parser.jay"
+#line 2326 "cs-parser.jay"
   {
 		++lexer.parsing_block;
 	  }
@@ -2257,7 +2259,7 @@ case 281:
   case_281();
   break;
 case 282:
-#line 2345 "cs-parser.jay"
+#line 2336 "cs-parser.jay"
   {
 		++lexer.parsing_block;
 	  }
@@ -2296,7 +2298,7 @@ case 293:
   case_293();
   break;
 case 295:
-#line 2472 "cs-parser.jay"
+#line 2463 "cs-parser.jay"
   {
 	  	++lexer.parsing_block;
 	  }
@@ -2305,13 +2307,13 @@ case 296:
   case_296();
   break;
 case 299:
-#line 2490 "cs-parser.jay"
+#line 2481 "cs-parser.jay"
   {
 		current_event_field.AddDeclarator ((FieldDeclarator) yyVals[0+yyTop]);
 	  }
   break;
 case 300:
-#line 2494 "cs-parser.jay"
+#line 2485 "cs-parser.jay"
   {
 		current_event_field.AddDeclarator ((FieldDeclarator) yyVals[0+yyTop]);
 	  }
@@ -2320,7 +2322,7 @@ case 301:
   case_301();
   break;
 case 302:
-#line 2507 "cs-parser.jay"
+#line 2498 "cs-parser.jay"
   {
 		++lexer.parsing_block;
 	  }
@@ -2332,7 +2334,7 @@ case 304:
   case_304();
   break;
 case 305:
-#line 2532 "cs-parser.jay"
+#line 2523 "cs-parser.jay"
   {
 		yyVal = yyVals[0+yyTop];
 	  }
@@ -2386,7 +2388,7 @@ case 325:
   case_325();
   break;
 case 328:
-#line 2718 "cs-parser.jay"
+#line 2709 "cs-parser.jay"
   {
 		lbag.AppendToMember (current_container, GetLocation (yyVals[0+yyTop]));
 	  }
@@ -2407,7 +2409,7 @@ case 334:
   case_334();
   break;
 case 336:
-#line 2792 "cs-parser.jay"
+#line 2783 "cs-parser.jay"
   {
 		valid_param_mod = ParameterModifierType.Ref | ParameterModifierType.Out | ParameterModifierType.Params | ParameterModifierType.DefaultValue;
 	  }
@@ -2416,7 +2418,7 @@ case 337:
   case_337();
   break;
 case 338:
-#line 2811 "cs-parser.jay"
+#line 2802 "cs-parser.jay"
   {
 		lexer.ConstraintsParsing = false;
 	  }
@@ -2449,7 +2451,7 @@ case 351:
   case_351();
   break;
 case 352:
-#line 2917 "cs-parser.jay"
+#line 2908 "cs-parser.jay"
   {
 		lexer.parsing_generic_declaration = true;
 	  }
@@ -2494,13 +2496,13 @@ case 367:
   case_367();
   break;
 case 369:
-#line 3042 "cs-parser.jay"
+#line 3033 "cs-parser.jay"
   {
 		yyVal = new TypeExpression (compiler.BuiltinTypes.Void, GetLocation (yyVals[0+yyTop]));
 	  }
   break;
 case 370:
-#line 3049 "cs-parser.jay"
+#line 3040 "cs-parser.jay"
   {
 		lexer.parsing_generic_declaration = true;
 	  }
@@ -2515,7 +2517,7 @@ case 376:
   case_376();
   break;
 case 378:
-#line 3087 "cs-parser.jay"
+#line 3078 "cs-parser.jay"
   {
 		yyVal = new ComposedCast ((FullNamedExpression) yyVals[-1+yyTop], (ComposedTypeSpecifier) yyVals[0+yyTop]);
 	  }
@@ -2524,7 +2526,7 @@ case 379:
   case_379();
   break;
 case 380:
-#line 3106 "cs-parser.jay"
+#line 3097 "cs-parser.jay"
   {
 		yyVal = new ComposedCast ((ATypeNameExpression) yyVals[-1+yyTop], (ComposedTypeSpecifier) yyVals[0+yyTop]);
 	  }
@@ -2533,13 +2535,13 @@ case 381:
   case_381();
   break;
 case 382:
-#line 3115 "cs-parser.jay"
+#line 3106 "cs-parser.jay"
   {
 		yyVal = new ComposedCast ((FullNamedExpression) yyVals[-1+yyTop], (ComposedTypeSpecifier) yyVals[0+yyTop]);
 	  }
   break;
 case 383:
-#line 3119 "cs-parser.jay"
+#line 3110 "cs-parser.jay"
   {
 		yyVal = new ComposedCast (new TypeExpression (compiler.BuiltinTypes.Void, GetLocation (yyVals[-1+yyTop])), (ComposedTypeSpecifier) yyVals[0+yyTop]);
 	  }
@@ -2554,63 +2556,63 @@ case 386:
   case_386();
   break;
 case 387:
-#line 3153 "cs-parser.jay"
+#line 3144 "cs-parser.jay"
   { yyVal = new TypeExpression (compiler.BuiltinTypes.Object, GetLocation (yyVals[0+yyTop])); }
   break;
 case 388:
-#line 3154 "cs-parser.jay"
+#line 3145 "cs-parser.jay"
   { yyVal = new TypeExpression (compiler.BuiltinTypes.String, GetLocation (yyVals[0+yyTop])); }
   break;
 case 389:
-#line 3155 "cs-parser.jay"
+#line 3146 "cs-parser.jay"
   { yyVal = new TypeExpression (compiler.BuiltinTypes.Bool, GetLocation (yyVals[0+yyTop])); }
   break;
 case 390:
-#line 3156 "cs-parser.jay"
+#line 3147 "cs-parser.jay"
   { yyVal = new TypeExpression (compiler.BuiltinTypes.Decimal, GetLocation (yyVals[0+yyTop])); }
   break;
 case 391:
-#line 3157 "cs-parser.jay"
+#line 3148 "cs-parser.jay"
   { yyVal = new TypeExpression (compiler.BuiltinTypes.Float, GetLocation (yyVals[0+yyTop])); }
   break;
 case 392:
-#line 3158 "cs-parser.jay"
+#line 3149 "cs-parser.jay"
   { yyVal = new TypeExpression (compiler.BuiltinTypes.Double, GetLocation (yyVals[0+yyTop])); }
   break;
 case 394:
-#line 3163 "cs-parser.jay"
+#line 3154 "cs-parser.jay"
   { yyVal = new TypeExpression (compiler.BuiltinTypes.SByte, GetLocation (yyVals[0+yyTop])); }
   break;
 case 395:
-#line 3164 "cs-parser.jay"
+#line 3155 "cs-parser.jay"
   { yyVal = new TypeExpression (compiler.BuiltinTypes.Byte, GetLocation (yyVals[0+yyTop])); }
   break;
 case 396:
-#line 3165 "cs-parser.jay"
+#line 3156 "cs-parser.jay"
   { yyVal = new TypeExpression (compiler.BuiltinTypes.Short, GetLocation (yyVals[0+yyTop])); }
   break;
 case 397:
-#line 3166 "cs-parser.jay"
+#line 3157 "cs-parser.jay"
   { yyVal = new TypeExpression (compiler.BuiltinTypes.UShort, GetLocation (yyVals[0+yyTop])); }
   break;
 case 398:
-#line 3167 "cs-parser.jay"
+#line 3158 "cs-parser.jay"
   { yyVal = new TypeExpression (compiler.BuiltinTypes.Int, GetLocation (yyVals[0+yyTop])); }
   break;
 case 399:
-#line 3168 "cs-parser.jay"
+#line 3159 "cs-parser.jay"
   { yyVal = new TypeExpression (compiler.BuiltinTypes.UInt, GetLocation (yyVals[0+yyTop])); }
   break;
 case 400:
-#line 3169 "cs-parser.jay"
+#line 3160 "cs-parser.jay"
   { yyVal = new TypeExpression (compiler.BuiltinTypes.Long, GetLocation (yyVals[0+yyTop])); }
   break;
 case 401:
-#line 3170 "cs-parser.jay"
+#line 3161 "cs-parser.jay"
   { yyVal = new TypeExpression (compiler.BuiltinTypes.ULong, GetLocation (yyVals[0+yyTop])); }
   break;
 case 402:
-#line 3171 "cs-parser.jay"
+#line 3162 "cs-parser.jay"
   { yyVal = new TypeExpression (compiler.BuiltinTypes.Char, GetLocation (yyVals[0+yyTop])); }
   break;
 case 423:
@@ -2620,22 +2622,22 @@ case 424:
   case_424();
   break;
 case 428:
-#line 3218 "cs-parser.jay"
+#line 3209 "cs-parser.jay"
   { yyVal = new NullLiteral (GetLocation (yyVals[0+yyTop])); }
   break;
 case 429:
-#line 3222 "cs-parser.jay"
+#line 3213 "cs-parser.jay"
   { yyVal = new BoolLiteral (compiler.BuiltinTypes, true, GetLocation (yyVals[0+yyTop])); }
   break;
 case 430:
-#line 3223 "cs-parser.jay"
+#line 3214 "cs-parser.jay"
   { yyVal = new BoolLiteral (compiler.BuiltinTypes, false, GetLocation (yyVals[0+yyTop])); }
   break;
 case 435:
   case_435();
   break;
 case 436:
-#line 3256 "cs-parser.jay"
+#line 3247 "cs-parser.jay"
   {
 		yyVal = new ParenthesizedExpression ((Expression) yyVals[-1+yyTop], GetLocation (yyVals[-2+yyTop]));
 	  }
@@ -2653,7 +2655,7 @@ case 440:
   case_440();
   break;
 case 441:
-#line 3288 "cs-parser.jay"
+#line 3279 "cs-parser.jay"
   {
 		yyVal = new CompletionMemberAccess ((Expression) yyVals[-2+yyTop], null,GetLocation (yyVals[0+yyTop]));
 	  }
@@ -2662,7 +2664,7 @@ case 442:
   case_442();
   break;
 case 443:
-#line 3296 "cs-parser.jay"
+#line 3287 "cs-parser.jay"
   {
 		yyVal = new CompletionMemberAccess ((Expression) yyVals[-2+yyTop], null, lexer.Location);
 	  }
@@ -2680,7 +2682,7 @@ case 447:
   case_447();
   break;
 case 448:
-#line 3326 "cs-parser.jay"
+#line 3317 "cs-parser.jay"
   { yyVal = null; }
   break;
 case 450:
@@ -2690,11 +2692,11 @@ case 451:
   case_451();
   break;
 case 452:
-#line 3348 "cs-parser.jay"
+#line 3339 "cs-parser.jay"
   { yyVal = null; }
   break;
 case 453:
-#line 3352 "cs-parser.jay"
+#line 3343 "cs-parser.jay"
   {
 		yyVal = yyVals[0+yyTop];
 	}
@@ -2715,7 +2717,7 @@ case 458:
   case_458();
   break;
 case 459:
-#line 3391 "cs-parser.jay"
+#line 3382 "cs-parser.jay"
   {
 		yyVal = new CompletionElementInitializer (null, GetLocation (yyVals[0+yyTop]));
 	  }
@@ -2730,7 +2732,7 @@ case 462:
   case_462();
   break;
 case 465:
-#line 3422 "cs-parser.jay"
+#line 3413 "cs-parser.jay"
   { yyVal = null; }
   break;
 case 467:
@@ -2749,7 +2751,7 @@ case 471:
   case_471();
   break;
 case 472:
-#line 3476 "cs-parser.jay"
+#line 3467 "cs-parser.jay"
   {
 		yyVal = new Argument ((Expression) yyVals[0+yyTop]);
 	  }
@@ -2788,13 +2790,13 @@ case 487:
   case_487();
   break;
 case 488:
-#line 3569 "cs-parser.jay"
+#line 3560 "cs-parser.jay"
   {
 	  	yyVal = new Argument ((Expression) yyVals[0+yyTop]);
 	  }
   break;
 case 490:
-#line 3577 "cs-parser.jay"
+#line 3568 "cs-parser.jay"
   {
 		yyVal = new This (GetLocation (yyVals[0+yyTop]));
 	  }
@@ -2806,13 +2808,13 @@ case 492:
   case_492();
   break;
 case 493:
-#line 3597 "cs-parser.jay"
+#line 3588 "cs-parser.jay"
   {
 		yyVal = new UnaryMutator (UnaryMutator.Mode.PostIncrement, (Expression) yyVals[-1+yyTop], GetLocation (yyVals[0+yyTop]));
 	  }
   break;
 case 494:
-#line 3604 "cs-parser.jay"
+#line 3595 "cs-parser.jay"
   {
 		yyVal = new UnaryMutator (UnaryMutator.Mode.PostDecrement, (Expression) yyVals[-1+yyTop], GetLocation (yyVals[0+yyTop]));
 	  }
@@ -2839,7 +2841,7 @@ case 501:
   case_501();
   break;
 case 502:
-#line 3671 "cs-parser.jay"
+#line 3662 "cs-parser.jay"
   {
 		++lexer.parsing_type;
 	  }
@@ -2851,7 +2853,7 @@ case 504:
   case_504();
   break;
 case 507:
-#line 3698 "cs-parser.jay"
+#line 3689 "cs-parser.jay"
   { yyVal = null; }
   break;
 case 509:
@@ -2882,25 +2884,25 @@ case 520:
   case_520();
   break;
 case 521:
-#line 3776 "cs-parser.jay"
+#line 3767 "cs-parser.jay"
   {
 		yyVal = 2;
 	  }
   break;
 case 522:
-#line 3780 "cs-parser.jay"
+#line 3771 "cs-parser.jay"
   {
 		yyVal = ((int) yyVals[-1+yyTop]) + 1;
 	  }
   break;
 case 523:
-#line 3787 "cs-parser.jay"
+#line 3778 "cs-parser.jay"
   {
 		yyVal = null;
 	  }
   break;
 case 524:
-#line 3791 "cs-parser.jay"
+#line 3782 "cs-parser.jay"
   {
 		yyVal = yyVals[0+yyTop];
 	  }
@@ -2918,7 +2920,7 @@ case 528:
   case_528();
   break;
 case 529:
-#line 3835 "cs-parser.jay"
+#line 3826 "cs-parser.jay"
   {
 	  	lexer.TypeOfParsing = true;
 	  }
@@ -2972,7 +2974,7 @@ case 547:
   case_547();
   break;
 case 548:
-#line 3978 "cs-parser.jay"
+#line 3969 "cs-parser.jay"
   {
 		start_anonymous (false, (ParametersCompiled) yyVals[0+yyTop], false, GetLocation (yyVals[-1+yyTop]));
 	  }
@@ -2981,7 +2983,7 @@ case 549:
   case_549();
   break;
 case 550:
-#line 3991 "cs-parser.jay"
+#line 3982 "cs-parser.jay"
   {
 		start_anonymous (false, (ParametersCompiled) yyVals[0+yyTop], true, GetLocation (yyVals[-2+yyTop]));
 	  }
@@ -2990,13 +2992,13 @@ case 551:
   case_551();
   break;
 case 552:
-#line 4008 "cs-parser.jay"
+#line 3999 "cs-parser.jay"
   {
 		yyVal = ParametersCompiled.Undefined;
 	  }
   break;
 case 554:
-#line 4016 "cs-parser.jay"
+#line 4007 "cs-parser.jay"
   {
 	  	valid_param_mod = ParameterModifierType.Ref | ParameterModifierType.Out;
 	  }
@@ -3008,13 +3010,13 @@ case 556:
   case_556();
   break;
 case 558:
-#line 4042 "cs-parser.jay"
+#line 4033 "cs-parser.jay"
   {
 		yyVal = new Unary (Unary.Operator.LogicalNot, (Expression) yyVals[0+yyTop], GetLocation (yyVals[-1+yyTop]));
 	  }
   break;
 case 559:
-#line 4046 "cs-parser.jay"
+#line 4037 "cs-parser.jay"
   {
 		yyVal = new Unary (Unary.Operator.OnesComplement, (Expression) yyVals[0+yyTop], GetLocation (yyVals[-1+yyTop]));
 	  }
@@ -3038,37 +3040,37 @@ case 565:
   case_565();
   break;
 case 567:
-#line 4107 "cs-parser.jay"
+#line 4101 "cs-parser.jay"
   { 
 	  	yyVal = new Unary (Unary.Operator.UnaryPlus, (Expression) yyVals[0+yyTop], GetLocation (yyVals[-1+yyTop]));
 	  }
   break;
 case 568:
-#line 4111 "cs-parser.jay"
+#line 4105 "cs-parser.jay"
   { 
 		yyVal = new Unary (Unary.Operator.UnaryNegation, (Expression) yyVals[0+yyTop], GetLocation (yyVals[-1+yyTop]));
 	  }
   break;
 case 569:
-#line 4115 "cs-parser.jay"
+#line 4109 "cs-parser.jay"
   {
 		yyVal = new UnaryMutator (UnaryMutator.Mode.PreIncrement, (Expression) yyVals[0+yyTop], GetLocation (yyVals[-1+yyTop]));
 	  }
   break;
 case 570:
-#line 4119 "cs-parser.jay"
+#line 4113 "cs-parser.jay"
   {
 		yyVal = new UnaryMutator (UnaryMutator.Mode.PreDecrement, (Expression) yyVals[0+yyTop], GetLocation (yyVals[-1+yyTop]));
 	  }
   break;
 case 571:
-#line 4123 "cs-parser.jay"
+#line 4117 "cs-parser.jay"
   {
 		yyVal = new Indirection ((Expression) yyVals[0+yyTop], GetLocation (yyVals[-1+yyTop]));
 	  }
   break;
 case 572:
-#line 4127 "cs-parser.jay"
+#line 4121 "cs-parser.jay"
   {
 		yyVal = new Unary (Unary.Operator.AddressOf, (Expression) yyVals[0+yyTop], GetLocation (yyVals[-1+yyTop]));
 	  }
@@ -3116,13 +3118,13 @@ case 588:
   case_588();
   break;
 case 589:
-#line 4221 "cs-parser.jay"
+#line 4215 "cs-parser.jay"
   {
 		yyVal = new As ((Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop], GetLocation (yyVals[-1+yyTop]));
 	  }
   break;
 case 590:
-#line 4225 "cs-parser.jay"
+#line 4219 "cs-parser.jay"
   {
 		yyVal = new Is ((Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop], GetLocation (yyVals[-1+yyTop]));
 	  }
@@ -3284,14 +3286,14 @@ case 652:
   case_652();
   break;
 case 653:
-#line 4591 "cs-parser.jay"
+#line 4585 "cs-parser.jay"
   { yyVal = ParametersCompiled.EmptyReadOnlyParameters; }
   break;
 case 654:
   case_654();
   break;
 case 655:
-#line 4602 "cs-parser.jay"
+#line 4596 "cs-parser.jay"
   {
 		start_block (Location.Null);
 	  }
@@ -3324,7 +3326,7 @@ case 666:
   case_666();
   break;
 case 667:
-#line 4669 "cs-parser.jay"
+#line 4663 "cs-parser.jay"
   {
 	  	valid_param_mod = ParameterModifierType.Ref | ParameterModifierType.Out;
 	  }
@@ -3336,7 +3338,7 @@ case 669:
   case_669();
   break;
 case 670:
-#line 4683 "cs-parser.jay"
+#line 4677 "cs-parser.jay"
   {
 	  	valid_param_mod = ParameterModifierType.Ref | ParameterModifierType.Out;	  
 	  }
@@ -3348,7 +3350,7 @@ case 672:
   case_672();
   break;
 case 678:
-#line 4708 "cs-parser.jay"
+#line 4702 "cs-parser.jay"
   {
 		yyVal = new ArglistAccess (GetLocation (yyVals[0+yyTop]));
 	  }
@@ -3363,13 +3365,13 @@ case 681:
   case_681();
   break;
 case 683:
-#line 4737 "cs-parser.jay"
+#line 4731 "cs-parser.jay"
   {
 		yyVal = new BooleanExpression ((Expression) yyVals[0+yyTop]);
 	  }
   break;
 case 684:
-#line 4749 "cs-parser.jay"
+#line 4743 "cs-parser.jay"
   {
 	  }
   break;
@@ -3386,18 +3388,18 @@ case 688:
   case_688();
   break;
 case 689:
-#line 4796 "cs-parser.jay"
+#line 4790 "cs-parser.jay"
   { yyVal = null; }
   break;
 case 690:
-#line 4798 "cs-parser.jay"
+#line 4792 "cs-parser.jay"
   { yyVal = yyVals[0+yyTop]; StoreModifierLocation (Modifiers.PARTIAL, GetLocation (yyVals[0+yyTop])); }
   break;
 case 691:
   case_691();
   break;
 case 692:
-#line 4811 "cs-parser.jay"
+#line 4805 "cs-parser.jay"
   {
 		lexer.parsing_modifiers = false;		
 	  }
@@ -3457,7 +3459,7 @@ case 712:
   case_712();
   break;
 case 714:
-#line 4937 "cs-parser.jay"
+#line 4931 "cs-parser.jay"
   {
 		yyVal = yyVals[0+yyTop];
 	  }
@@ -3487,19 +3489,19 @@ case 722:
   case_722();
   break;
 case 723:
-#line 5030 "cs-parser.jay"
+#line 5024 "cs-parser.jay"
   {
 		yyVal = new SpecialContraintExpr (SpecialConstraint.Class, GetLocation (yyVals[0+yyTop]));
 	  }
   break;
 case 724:
-#line 5034 "cs-parser.jay"
+#line 5028 "cs-parser.jay"
   {
 		yyVal = new SpecialContraintExpr (SpecialConstraint.Struct, GetLocation (yyVals[0+yyTop]));
 	  }
   break;
 case 725:
-#line 5041 "cs-parser.jay"
+#line 5035 "cs-parser.jay"
   {
 		yyVal = Variance.None;
 	  }
@@ -3517,7 +3519,7 @@ case 729:
   case_729();
   break;
 case 730:
-#line 5086 "cs-parser.jay"
+#line 5080 "cs-parser.jay"
   {
 		yyVal = yyVals[0+yyTop];
 	  }
@@ -3544,13 +3546,13 @@ case 737:
   case_737();
   break;
 case 742:
-#line 5148 "cs-parser.jay"
+#line 5142 "cs-parser.jay"
   {
 		current_block.AddStatement ((Statement) yyVals[0+yyTop]);
 	  }
   break;
 case 743:
-#line 5152 "cs-parser.jay"
+#line 5146 "cs-parser.jay"
   {
 		current_block.AddStatement ((Statement) yyVals[0+yyTop]);
 	  }
@@ -3562,13 +3564,13 @@ case 746:
   case_746();
   break;
 case 749:
-#line 5186 "cs-parser.jay"
+#line 5180 "cs-parser.jay"
   {
 		current_block.AddStatement ((Statement) yyVals[0+yyTop]);
 	  }
   break;
 case 750:
-#line 5190 "cs-parser.jay"
+#line 5184 "cs-parser.jay"
   {
 		current_block.AddStatement ((Statement) yyVals[0+yyTop]);
 	  }
@@ -3601,13 +3603,13 @@ case 789:
   case_789();
   break;
 case 790:
-#line 5334 "cs-parser.jay"
+#line 5328 "cs-parser.jay"
   {
 		yyVal = new ComposedCast ((FullNamedExpression) yyVals[-1+yyTop], (ComposedTypeSpecifier) yyVals[0+yyTop]);
 	  }
   break;
 case 791:
-#line 5338 "cs-parser.jay"
+#line 5332 "cs-parser.jay"
   {
 		yyVal = new ComposedCast (new TypeExpression (compiler.BuiltinTypes.Void, GetLocation (yyVals[-1+yyTop])), (ComposedTypeSpecifier) yyVals[0+yyTop]);
 	  }
@@ -3619,13 +3621,13 @@ case 794:
   case_794();
   break;
 case 795:
-#line 5359 "cs-parser.jay"
+#line 5353 "cs-parser.jay"
   {
 		yyVal = ComposedTypeSpecifier.CreatePointer (GetLocation (yyVals[0+yyTop]));
 	  }
   break;
 case 797:
-#line 5367 "cs-parser.jay"
+#line 5361 "cs-parser.jay"
   {
 	  	yyVal = Error_AwaitAsIdentifier (yyVals[0+yyTop]);
 	  }
@@ -3661,7 +3663,7 @@ case 814:
   case_814();
   break;
 case 815:
-#line 5481 "cs-parser.jay"
+#line 5475 "cs-parser.jay"
   {
 		report.Error (145, lexer.Location, "A const field requires a value to be provided");
 	  }
@@ -3682,18 +3684,18 @@ case 825:
   case_825();
   break;
 case 826:
-#line 5531 "cs-parser.jay"
+#line 5525 "cs-parser.jay"
   { yyVal = yyVals[-1+yyTop]; }
   break;
 case 827:
   case_827();
   break;
 case 828:
-#line 5541 "cs-parser.jay"
+#line 5535 "cs-parser.jay"
   { yyVal = yyVals[-1+yyTop]; }
   break;
 case 829:
-#line 5542 "cs-parser.jay"
+#line 5536 "cs-parser.jay"
   { yyVal = yyVals[-1+yyTop]; }
   break;
 case 830:
@@ -3715,7 +3717,7 @@ case 837:
   case_837();
   break;
 case 838:
-#line 5617 "cs-parser.jay"
+#line 5608 "cs-parser.jay"
   {
 		start_block (GetLocation (yyVals[0+yyTop]));
 	  }
@@ -3727,13 +3729,13 @@ case 840:
   case_840();
   break;
 case 841:
-#line 5637 "cs-parser.jay"
+#line 5628 "cs-parser.jay"
   {
 		report.Warning (1522, 1, current_block.StartLocation, "Empty switch block"); 
 	  }
   break;
 case 845:
-#line 5647 "cs-parser.jay"
+#line 5638 "cs-parser.jay"
   {
 		Error_SyntaxError (yyToken);
 	  }
@@ -3742,7 +3744,7 @@ case 847:
   case_847();
   break;
 case 848:
-#line 5664 "cs-parser.jay"
+#line 5655 "cs-parser.jay"
   {
 		current_block.AddStatement ((Statement) yyVals[0+yyTop]);
 	  }
@@ -3754,7 +3756,7 @@ case 850:
   case_850();
   break;
 case 851:
-#line 5681 "cs-parser.jay"
+#line 5672 "cs-parser.jay"
   {
 		yyVal = new SwitchLabel (null, GetLocation (yyVals[0+yyTop]));
 	  }
@@ -3778,7 +3780,7 @@ case 861:
   case_861();
   break;
 case 862:
-#line 5742 "cs-parser.jay"
+#line 5733 "cs-parser.jay"
   {
 		yyVal = yyVals[0+yyTop];
 	  }
@@ -3787,7 +3789,7 @@ case 863:
   case_863();
   break;
 case 864:
-#line 5757 "cs-parser.jay"
+#line 5748 "cs-parser.jay"
   {
 		yyVal = yyVals[0+yyTop];
 	  }
@@ -3799,7 +3801,7 @@ case 866:
   case_866();
   break;
 case 867:
-#line 5778 "cs-parser.jay"
+#line 5769 "cs-parser.jay"
   {
 		yyVal = yyVals[0+yyTop];
 	  }
@@ -3814,7 +3816,7 @@ case 870:
   case_870();
   break;
 case 871:
-#line 5812 "cs-parser.jay"
+#line 5803 "cs-parser.jay"
   { yyVal = new EmptyStatement (lexer.Location); }
   break;
 case 873:
@@ -3824,11 +3826,11 @@ case 874:
   case_874();
   break;
 case 876:
-#line 5836 "cs-parser.jay"
+#line 5827 "cs-parser.jay"
   { yyVal = null; }
   break;
 case 878:
-#line 5841 "cs-parser.jay"
+#line 5832 "cs-parser.jay"
   { yyVal = new EmptyStatement (lexer.Location); }
   break;
 case 882:
@@ -3894,15 +3896,15 @@ case 907:
 case 908:
   case_908();
   break;
-case 911:
-#line 6082 "cs-parser.jay"
+case 909:
+  case_909();
+  break;
+case 912:
+#line 6078 "cs-parser.jay"
   {
 		yyVal = new TryCatch ((Block) yyVals[-1+yyTop], (List<Catch>) yyVals[0+yyTop], GetLocation (yyVals[-2+yyTop]), false);
 	  }
   break;
-case 912:
-  case_912();
-  break;
 case 913:
   case_913();
   break;
@@ -3915,51 +3917,51 @@ case 915:
 case 916:
   case_916();
   break;
-case 919:
-#line 6131 "cs-parser.jay"
+case 917:
+  case_917();
+  break;
+case 920:
+#line 6127 "cs-parser.jay"
   {
 		yyVal = new Catch ((Block) yyVals[0+yyTop], GetLocation (yyVals[-1+yyTop]));
 	  }
   break;
-case 920:
-  case_920();
-  break;
 case 921:
-#line 6150 "cs-parser.jay"
+  case_921();
+  break;
+case 922:
+#line 6146 "cs-parser.jay"
   {
 		yyVal = yyVals[-1+yyTop];
 	  }
   break;
-case 922:
-  case_922();
-  break;
 case 923:
   case_923();
   break;
 case 924:
-#line 6191 "cs-parser.jay"
+  case_924();
+  break;
+case 925:
+#line 6187 "cs-parser.jay"
   {
 		yyVal = new Checked ((Block) yyVals[0+yyTop], GetLocation (yyVals[-1+yyTop]));
 	  }
   break;
-case 925:
-#line 6198 "cs-parser.jay"
+case 926:
+#line 6194 "cs-parser.jay"
   {
 		yyVal = new Unchecked ((Block) yyVals[0+yyTop], GetLocation (yyVals[-1+yyTop]));
 	  }
   break;
-case 926:
-  case_926();
-  break;
 case 927:
-#line 6208 "cs-parser.jay"
+  case_927();
+  break;
+case 928:
+#line 6204 "cs-parser.jay"
   {
 		yyVal = new Unsafe ((Block) yyVals[0+yyTop], GetLocation (yyVals[-2+yyTop]));
 	  }
   break;
-case 928:
-  case_928();
-  break;
 case 929:
   case_929();
   break;
@@ -3987,18 +3989,18 @@ case 936:
 case 937:
   case_937();
   break;
-case 939:
-  case_939();
+case 938:
+  case_938();
   break;
 case 940:
-#line 6313 "cs-parser.jay"
+  case_940();
+  break;
+case 941:
+#line 6309 "cs-parser.jay"
   {
 		Error_MissingInitializer (lexer.Location);
 	  }
   break;
-case 941:
-  case_941();
-  break;
 case 942:
   case_942();
   break;
@@ -4024,44 +4026,44 @@ case 949:
   case_949();
   break;
 case 950:
-#line 6418 "cs-parser.jay"
+  case_950();
+  break;
+case 951:
+#line 6414 "cs-parser.jay"
   {
 		current_block = new Linq.QueryBlock (current_block, lexer.Location);
 	  }
   break;
-case 951:
-  case_951();
-  break;
 case 952:
-#line 6434 "cs-parser.jay"
+  case_952();
+  break;
+case 953:
+#line 6430 "cs-parser.jay"
   {
 		current_block = new Linq.QueryBlock (current_block, lexer.Location);
 	  }
   break;
-case 953:
-  case_953();
-  break;
 case 954:
   case_954();
   break;
 case 955:
   case_955();
   break;
-case 957:
-  case_957();
+case 956:
+  case_956();
   break;
 case 958:
   case_958();
   break;
 case 959:
-#line 6498 "cs-parser.jay"
+  case_959();
+  break;
+case 960:
+#line 6494 "cs-parser.jay"
   {
 	  	current_block = new Linq.QueryBlock (current_block, lexer.Location);
 	  }
   break;
-case 960:
-  case_960();
-  break;
 case 961:
   case_961();
   break;
@@ -4072,35 +4074,35 @@ case 963:
   case_963();
   break;
 case 964:
-#line 6537 "cs-parser.jay"
+  case_964();
+  break;
+case 965:
+#line 6533 "cs-parser.jay"
   {
 	  	yyVal = new object[] { yyVals[0+yyTop], GetLocation (yyVals[-1+yyTop]) };
 	  }
   break;
-case 965:
-  case_965();
+case 966:
+  case_966();
   break;
-case 967:
-  case_967();
+case 968:
+  case_968();
   break;
-case 973:
-#line 6566 "cs-parser.jay"
+case 974:
+#line 6562 "cs-parser.jay"
   {
 	  	current_block = new Linq.QueryBlock (current_block, lexer.Location);
 	  }
   break;
-case 974:
-  case_974();
-  break;
 case 975:
-#line 6585 "cs-parser.jay"
+  case_975();
+  break;
+case 976:
+#line 6581 "cs-parser.jay"
   {
 	  	current_block = new Linq.QueryBlock (current_block, lexer.Location);
 	  }
   break;
-case 976:
-  case_976();
-  break;
 case 977:
   case_977();
   break;
@@ -4125,8 +4127,8 @@ case 983:
 case 984:
   case_984();
   break;
-case 986:
-  case_986();
+case 985:
+  case_985();
   break;
 case 987:
   case_987();
@@ -4134,87 +4136,87 @@ case 987:
 case 988:
   case_988();
   break;
-case 990:
-  case_990();
+case 989:
+  case_989();
   break;
 case 991:
   case_991();
   break;
-case 993:
-  case_993();
+case 992:
+  case_992();
   break;
 case 994:
   case_994();
   break;
 case 995:
-#line 6786 "cs-parser.jay"
+  case_995();
+  break;
+case 996:
+#line 6782 "cs-parser.jay"
   {
 		yyVal = new Linq.OrderByAscending ((Linq.QueryBlock) current_block, (Expression)yyVals[0+yyTop]);	
 	  }
   break;
-case 996:
-  case_996();
-  break;
 case 997:
   case_997();
   break;
 case 998:
-#line 6803 "cs-parser.jay"
+  case_998();
+  break;
+case 999:
+#line 6799 "cs-parser.jay"
   {
 		yyVal = new Linq.ThenByAscending ((Linq.QueryBlock) current_block, (Expression)yyVals[0+yyTop]);	
 	  }
   break;
-case 999:
-  case_999();
-  break;
 case 1000:
   case_1000();
   break;
-case 1002:
-  case_1002();
+case 1001:
+  case_1001();
   break;
 case 1003:
   case_1003();
   break;
-case 1006:
-  case_1006();
+case 1004:
+  case_1004();
   break;
 case 1007:
   case_1007();
   break;
-case 1015:
-#line 6925 "cs-parser.jay"
+case 1008:
+  case_1008();
+  break;
+case 1016:
+#line 6924 "cs-parser.jay"
   {
 		module.DocumentationBuilder.ParsedName = (MemberName) yyVals[0+yyTop];
 	  }
   break;
-case 1016:
-#line 6932 "cs-parser.jay"
+case 1017:
+#line 6931 "cs-parser.jay"
   {
 		module.DocumentationBuilder.ParsedParameters = (List<DocumentationParameter>)yyVals[0+yyTop];
 	  }
   break;
-case 1017:
-  case_1017();
-  break;
 case 1018:
   case_1018();
   break;
 case 1019:
-#line 6949 "cs-parser.jay"
+  case_1019();
+  break;
+case 1020:
+#line 6948 "cs-parser.jay"
   {
 		yyVal = new MemberName ((MemberName) yyVals[-2+yyTop], MemberCache.IndexerNameAlias, Location.Null);
 	  }
   break;
-case 1020:
-#line 6953 "cs-parser.jay"
+case 1021:
+#line 6952 "cs-parser.jay"
   {
 		valid_param_mod = ParameterModifierType.Ref | ParameterModifierType.Out;
 	  }
   break;
-case 1021:
-  case_1021();
-  break;
 case 1022:
   case_1022();
   break;
@@ -4224,39 +4226,42 @@ case 1023:
 case 1024:
   case_1024();
   break;
-case 1026:
-#line 6989 "cs-parser.jay"
+case 1025:
+  case_1025();
+  break;
+case 1027:
+#line 6988 "cs-parser.jay"
   {
 		yyVal = new MemberName (((MemberName) yyVals[-2+yyTop]), (MemberName) yyVals[0+yyTop]);
 	  }
   break;
-case 1028:
-#line 6997 "cs-parser.jay"
+case 1029:
+#line 6996 "cs-parser.jay"
   {
 		valid_param_mod = ParameterModifierType.Ref | ParameterModifierType.Out;
 	  }
   break;
-case 1029:
-#line 7001 "cs-parser.jay"
+case 1030:
+#line 7000 "cs-parser.jay"
   {
 		yyVal = yyVals[-1+yyTop];
 	  }
   break;
-case 1030:
-#line 7008 "cs-parser.jay"
+case 1031:
+#line 7007 "cs-parser.jay"
   {
 		yyVal = new List<DocumentationParameter> (0);
 	  }
   break;
-case 1032:
-  case_1032();
-  break;
 case 1033:
   case_1033();
   break;
 case 1034:
   case_1034();
   break;
+case 1035:
+  case_1035();
+  break;
 #line default
         }
         yyTop -= yyLen[yyN];
@@ -4293,7 +4298,7 @@ case 1034:
  All more than 3 lines long rules are wrapped into a method
 */
 void case_6()
-#line 394 "cs-parser.jay"
+#line 395 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] != null) {
 			Attributes attrs = (Attributes) yyVals[0+yyTop];
@@ -4305,7 +4310,7 @@ void case_6()
 	  }
 
 void case_8()
-#line 408 "cs-parser.jay"
+#line 409 "cs-parser.jay"
 {
 		if (yyToken == Token.EXTERN_ALIAS)
 			report.Error (439, lexer.Location, "An extern alias declaration must precede all other elements");
@@ -4314,7 +4319,7 @@ void case_8()
 	  }
 
 void case_13()
-#line 428 "cs-parser.jay"
+#line 429 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-2+yyTop];
 		string s = lt.Value;
@@ -4337,14 +4342,14 @@ void case_13()
 	  }
 
 void case_17()
-#line 461 "cs-parser.jay"
+#line 462 "cs-parser.jay"
 {
 		if (doc_support)
 			Lexer.doc_state = XmlCommentState.Allowed;
 	  }
 
 void case_18()
-#line 469 "cs-parser.jay"
+#line 470 "cs-parser.jay"
 {
 		var un = new UsingNamespace ((ATypeNameExpression) yyVals[-1+yyTop], GetLocation (yyVals[-2+yyTop]));
 		current_namespace.AddUsing (un);
@@ -4353,7 +4358,7 @@ void case_18()
 	  }
 
 void case_19()
-#line 476 "cs-parser.jay"
+#line 477 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-3+yyTop];
 		if (lang_version != LanguageVersion.ISO_1 && lt.Value == "global") {
@@ -4367,14 +4372,14 @@ void case_19()
 	  }
 
 void case_20()
-#line 488 "cs-parser.jay"
+#line 489 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = null;
 	 }
 
 void case_21()
-#line 501 "cs-parser.jay"
+#line 502 "cs-parser.jay"
 {
 		Attributes attrs = (Attributes) yyVals[-2+yyTop];
 		var name = (MemberName) yyVals[0+yyTop];
@@ -4404,14 +4409,14 @@ void case_21()
 	  }
 
 void case_22()
-#line 529 "cs-parser.jay"
+#line 530 "cs-parser.jay"
 {
 		if (doc_support)
 			Lexer.doc_state = XmlCommentState.Allowed;
 	  }
 
 void case_23()
-#line 534 "cs-parser.jay"
+#line 535 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] != null)
 			lbag.AddLocation (current_container, GetLocation (yyVals[-9+yyTop]), GetLocation (yyVals[-6+yyTop]), GetLocation (yyVals[-1+yyTop]), GetLocation (yyVals[0+yyTop]));
@@ -4422,7 +4427,7 @@ void case_23()
 	  }
 
 void case_24()
-#line 543 "cs-parser.jay"
+#line 544 "cs-parser.jay"
 {
 		report.Error (1514, lexer.Location, "Unexpected symbol `{0}', expecting `.' or `{{'", GetSymbolName (yyToken));
 
@@ -4433,21 +4438,21 @@ void case_24()
 	  }
 
 void case_27()
-#line 557 "cs-parser.jay"
+#line 558 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 	  	yyVal = null;
 	  }
 
 void case_28()
-#line 565 "cs-parser.jay"
+#line 566 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[0+yyTop];
 		yyVal = new MemberName (lt.Value, lt.Location);
 	  }
 
 void case_29()
-#line 570 "cs-parser.jay"
+#line 571 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[0+yyTop];
 		yyVal = new MemberName ((MemberName) yyVals[-2+yyTop], lt.Value, lt.Location);
@@ -4455,14 +4460,14 @@ void case_29()
 	  }
 
 void case_30()
-#line 576 "cs-parser.jay"
+#line 577 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = new MemberName ("<invalid>", lexer.Location);
 	  }
 
 void case_43()
-#line 614 "cs-parser.jay"
+#line 615 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] != null) {
 			TypeContainer ds = (TypeContainer)yyVals[0+yyTop];
@@ -4483,7 +4488,7 @@ void case_43()
 	  }
 
 void case_45()
-#line 636 "cs-parser.jay"
+#line 637 "cs-parser.jay"
 {
 		current_namespace.UnattachedAttributes = (Attributes) yyVals[-1+yyTop];
 		report.Error (1518, lexer.Location, "Attributes must be attached to class, delegate, enum, interface or struct");
@@ -4491,50 +4496,40 @@ void case_45()
 	  }
 
 void case_53()
-#line 669 "cs-parser.jay"
+#line 670 "cs-parser.jay"
 {
 		var sect = (List<Attribute>) yyVals[0+yyTop];
 		yyVal = new Attributes (sect);
-		if (locationListStack.Count > 0)
-			lbag.AddLocation (sect, locationListStack.Pop ());
-		if (attributeCommas.Count > 0) {
-			lbag.AddLocation (sect, attributeCommas);
-			attributeCommas.Clear ();
-		}
 	  }
 
 void case_54()
-#line 680 "cs-parser.jay"
+#line 675 "cs-parser.jay"
 {
 		Attributes attrs = yyVals[-1+yyTop] as Attributes;
 		var sect = (List<Attribute>) yyVals[0+yyTop];
-		
-		if (locationListStack.Count > 0)
-			lbag.AddLocation (sect, locationListStack.Pop ());
 		if (attrs == null)
 			attrs = new Attributes (sect);
-		else
+		else if (sect != null)
 			attrs.AddAttributes (sect);
 		yyVal = attrs;
 	  }
 
 void case_55()
-#line 696 "cs-parser.jay"
+#line 688 "cs-parser.jay"
 {
 	  	PushLocation (GetLocation (yyVals[0+yyTop]));
 		lexer.parsing_attribute_section = true;
-		savedOpenLocation = GetLocation (yyVals[0+yyTop]);
 	  }
 
 void case_56()
-#line 702 "cs-parser.jay"
+#line 693 "cs-parser.jay"
 {
 		lexer.parsing_attribute_section = false;
 		yyVal = yyVals[0+yyTop];
 	  }
 
 void case_57()
-#line 710 "cs-parser.jay"
+#line 701 "cs-parser.jay"
 {
 		current_attr_target = (string) yyVals[-1+yyTop];
 		if (current_attr_target == "assembly" || current_attr_target == "module") {
@@ -4543,19 +4538,20 @@ void case_57()
 	  }
 
 void case_58()
-#line 717 "cs-parser.jay"
+#line 708 "cs-parser.jay"
 {
 		/* when attribute target is invalid*/
 		if (current_attr_target == string.Empty)
 			yyVal = new List<Attribute> (0);
 		else
 			yyVal = yyVals[-2+yyTop];
-
+		lbag.InsertLocation (yyVal, 0, GetLocation (yyVals[-4+yyTop]));
+		lbag.InsertLocation (yyVal, 0, PopLocation ());
 		lbag.InsertLocation (yyVal, 0, PopLocation ());
 		if (yyVals[-1+yyTop] != null) {
-			lbag.AddLocation (yyVal, GetLocation (yyVals[-4+yyTop]), GetLocation (yyVals[-1+yyTop]), GetLocation (yyVals[0+yyTop]));
+			lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]), GetLocation (yyVals[0+yyTop]));
 		} else {
-			lbag.AddLocation (yyVal, GetLocation (yyVals[-4+yyTop]), GetLocation (yyVals[0+yyTop]));
+			lbag.AddLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 		}
 
 		current_attr_target = null;
@@ -4563,10 +4559,9 @@ void case_58()
  	  }
 
 void case_59()
-#line 735 "cs-parser.jay"
+#line 727 "cs-parser.jay"
 {
 		yyVal = yyVals[-2+yyTop];
-
 		lbag.InsertLocation (yyVal, 0, PopLocation ());
 		if (yyVals[-1+yyTop] != null) {
 			lbag.AddLocation (yyVal, GetLocation(yyVals[-1+yyTop]), GetLocation (yyVals[0+yyTop]));
@@ -4576,7 +4571,7 @@ void case_59()
 	  }
 
 void case_60()
-#line 746 "cs-parser.jay"
+#line 737 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -4589,22 +4584,22 @@ void case_60()
 	  }
 
 void case_61()
-#line 757 "cs-parser.jay"
+#line 748 "cs-parser.jay"
 {
- 		yyVal = CheckAttributeTarget (GetTokenName (yyToken), GetLocation (yyVals[0+yyTop])); 
+ 		CheckAttributeTarget (GetTokenName (yyToken), GetLocation (yyVals[0+yyTop])); 
  		yyVal = null;
 	  }
 
 void case_62()
-#line 765 "cs-parser.jay"
+#line 756 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[0+yyTop];
 		yyVal = CheckAttributeTarget (lt.Value, lt.Location);
-		savedCloseLocation = GetLocation (yyVals[0+yyTop]);
+		PushLocation (GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_66()
-#line 780 "cs-parser.jay"
+#line 771 "cs-parser.jay"
 {
 		var attrs = (List<Attribute>) yyVals[-2+yyTop];
 		if (attrs != null) {
@@ -4616,7 +4611,7 @@ void case_66()
 	  }
 
 void case_68()
-#line 797 "cs-parser.jay"
+#line 788 "cs-parser.jay"
 {
 		--lexer.parsing_block;
 		
@@ -4638,7 +4633,7 @@ void case_68()
 	  }
 
 void case_71()
-#line 825 "cs-parser.jay"
+#line 816 "cs-parser.jay"
 {
 		savedAttrParenOpenLocation = GetLocation (yyVals[-2+yyTop]);
 		savedAttrParenCloseLocation = GetLocation (yyVals[0+yyTop]);
@@ -4647,7 +4642,7 @@ void case_71()
 	  }
 
 void case_73()
-#line 837 "cs-parser.jay"
+#line 828 "cs-parser.jay"
 {
 	  	Arguments a = new Arguments (4);
 		a.Add ((Argument) yyVals[0+yyTop]);
@@ -4655,7 +4650,7 @@ void case_73()
 	  }
 
 void case_74()
-#line 843 "cs-parser.jay"
+#line 834 "cs-parser.jay"
 {
 	  	Arguments a = new Arguments (4);
 		a.Add ((Argument) yyVals[0+yyTop]);  
@@ -4663,7 +4658,7 @@ void case_74()
 	  }
 
 void case_75()
-#line 849 "cs-parser.jay"
+#line 840 "cs-parser.jay"
 {
 		Arguments[] o = (Arguments[]) yyVals[-2+yyTop];
 		if (o [1] != null) {
@@ -4680,7 +4675,7 @@ void case_75()
 	  }
 
 void case_76()
-#line 864 "cs-parser.jay"
+#line 855 "cs-parser.jay"
 {
 		Arguments[] o = (Arguments[]) yyVals[-2+yyTop];
 		if (o [1] == null) {
@@ -4692,14 +4687,14 @@ void case_76()
 	  }
 
 void case_79()
-#line 882 "cs-parser.jay"
+#line 873 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = null;
 	  }
 
 void case_81()
-#line 894 "cs-parser.jay"
+#line 885 "cs-parser.jay"
 {
 	  	--lexer.parsing_block;
 	  	var lt = (LocatedToken) yyVals[-3+yyTop];
@@ -4708,7 +4703,7 @@ void case_81()
 	  }
 
 void case_82()
-#line 904 "cs-parser.jay"
+#line 895 "cs-parser.jay"
 {
 		if (lang_version <= LanguageVersion.V_3)
 			FeatureIsNotAvailable (GetLocation (yyVals[-3+yyTop]), "named argument");
@@ -4722,7 +4717,7 @@ void case_82()
 	  }
 
 void case_102()
-#line 959 "cs-parser.jay"
+#line 950 "cs-parser.jay"
 {
 		report.Error (1519, lexer.Location, "Unexpected symbol `{0}' in class, struct, or interface member declaration",
 			GetSymbolName (yyToken));
@@ -4731,7 +4726,7 @@ void case_102()
 	  }
 
 void case_104()
-#line 975 "cs-parser.jay"
+#line 966 "cs-parser.jay"
 { 
 		lexer.ConstraintsParsing = true;
 		push_current_container (new Struct (current_container, (MemberName) yyVals[0+yyTop], (Modifiers) yyVals[-4+yyTop], (Attributes) yyVals[-5+yyTop]), yyVals[-3+yyTop]);
@@ -4739,7 +4734,7 @@ void case_104()
 	  }
 
 void case_105()
-#line 982 "cs-parser.jay"
+#line 973 "cs-parser.jay"
 {
 		lexer.ConstraintsParsing = false;
 
@@ -4754,14 +4749,14 @@ void case_105()
 	  }
 
 void case_106()
-#line 995 "cs-parser.jay"
+#line 986 "cs-parser.jay"
 {
 		if (doc_support)
 			Lexer.doc_state = XmlCommentState.Allowed;
 	  }
 
 void case_107()
-#line 1000 "cs-parser.jay"
+#line 991 "cs-parser.jay"
 {
 		--lexer.parsing_declaration;
 		if (doc_support)
@@ -4769,7 +4764,7 @@ void case_107()
 	  }
 
 void case_108()
-#line 1006 "cs-parser.jay"
+#line 997 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] == null) {
 			lbag.AppendToMember (current_container, GetLocation (yyVals[-5+yyTop]), GetLocation (yyVals[-2+yyTop]));
@@ -4780,7 +4775,7 @@ void case_108()
 	  }
 
 void case_110()
-#line 1024 "cs-parser.jay"
+#line 1015 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[0+yyTop];
 		var mod = (Modifiers) yyVals[-3+yyTop];
@@ -4795,7 +4790,7 @@ void case_110()
 	  }
 
 void case_111()
-#line 1037 "cs-parser.jay"
+#line 1028 "cs-parser.jay"
 {
 		if (doc_support) {
 			current_field.DocComment = Lexer.consume_doc_comment ();
@@ -4808,7 +4803,7 @@ void case_111()
 	  }
 
 void case_112()
-#line 1050 "cs-parser.jay"
+#line 1041 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -4816,7 +4811,7 @@ void case_112()
 	  }
 
 void case_117()
-#line 1075 "cs-parser.jay"
+#line 1066 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];
 	  	yyVal = new FieldDeclarator (new SimpleMemberName (lt.Value, lt.Location), (ConstInitializer) yyVals[0+yyTop]);
@@ -4824,7 +4819,7 @@ void case_117()
 	  }
 
 void case_119()
-#line 1088 "cs-parser.jay"
+#line 1079 "cs-parser.jay"
 {
 		--lexer.parsing_block;
 		yyVal = new ConstInitializer (current_field, (Expression) yyVals[0+yyTop], GetLocation (yyVals[-2+yyTop]));
@@ -4832,14 +4827,14 @@ void case_119()
 	  }
 
 void case_120()
-#line 1094 "cs-parser.jay"
+#line 1085 "cs-parser.jay"
 {
 		report.Error (145, lexer.Location, "A const field requires a value to be provided");
 		yyVal = null;
 	  }
 
 void case_123()
-#line 1109 "cs-parser.jay"
+#line 1100 "cs-parser.jay"
 {
 	  	lexer.parsing_generic_declaration = false;
 
@@ -4854,7 +4849,7 @@ void case_123()
 	  }
 
 void case_124()
-#line 1124 "cs-parser.jay"
+#line 1115 "cs-parser.jay"
 { 
 		if (doc_support) {
 			current_field.DocComment = Lexer.consume_doc_comment ();
@@ -4867,7 +4862,7 @@ void case_124()
 	  }
 
 void case_125()
-#line 1137 "cs-parser.jay"
+#line 1128 "cs-parser.jay"
 { 
 		if (lang_version < LanguageVersion.ISO_2)
 			FeatureIsNotAvailable (GetLocation (yyVals[-2+yyTop]), "fixed size buffers");
@@ -4880,7 +4875,7 @@ void case_125()
 	  }
 
 void case_126()
-#line 1148 "cs-parser.jay"
+#line 1139 "cs-parser.jay"
 {
 		if (doc_support) {
 			current_field.DocComment = Lexer.consume_doc_comment ();
@@ -4894,7 +4889,7 @@ void case_126()
 	  }
 
 void case_129()
-#line 1171 "cs-parser.jay"
+#line 1162 "cs-parser.jay"
 {
 	  	++lexer.parsing_block;
 		current_local_parameters = ParametersCompiled.EmptyReadOnlyParameters;
@@ -4902,7 +4897,7 @@ void case_129()
 	  }
 
 void case_130()
-#line 1177 "cs-parser.jay"
+#line 1168 "cs-parser.jay"
 {
 	  	--lexer.parsing_block;
 		current_field.Initializer = (Expression) yyVals[0+yyTop];
@@ -4912,7 +4907,7 @@ void case_130()
 	  }
 
 void case_135()
-#line 1204 "cs-parser.jay"
+#line 1195 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[0+yyTop];
 	  	yyVal = new FieldDeclarator (new SimpleMemberName (lt.Value, lt.Location), null);
@@ -4920,7 +4915,7 @@ void case_135()
 	  }
 
 void case_137()
-#line 1214 "cs-parser.jay"
+#line 1205 "cs-parser.jay"
 {
 		--lexer.parsing_block;
 		var lt = (LocatedToken) yyVals[-3+yyTop];	  
@@ -4929,7 +4924,7 @@ void case_137()
 	  }
 
 void case_142()
-#line 1240 "cs-parser.jay"
+#line 1231 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];	  
 		yyVal = new FieldDeclarator (new SimpleMemberName (lt.Value, lt.Location), (ConstInitializer) yyVals[0+yyTop]);
@@ -4937,7 +4932,7 @@ void case_142()
 	  }
 
 void case_144()
-#line 1253 "cs-parser.jay"
+#line 1244 "cs-parser.jay"
 {
 		--lexer.parsing_block;
 		yyVal = new ConstInitializer (current_field, (Expression) yyVals[-1+yyTop], GetLocation (yyVals[-3+yyTop]));
@@ -4945,14 +4940,14 @@ void case_144()
 	  }
 
 void case_145()
-#line 1259 "cs-parser.jay"
+#line 1250 "cs-parser.jay"
 {
 		report.Error (443, lexer.Location, "Value or constant expected");
 		yyVal = null;
 	  }
 
 void case_148()
-#line 1269 "cs-parser.jay"
+#line 1260 "cs-parser.jay"
 {
 		/* It has to be here for the parent to safely restore artificial block*/
 	  	Error_SyntaxError (yyToken);
@@ -4960,7 +4955,7 @@ void case_148()
 	  }
 
 void case_149()
-#line 1278 "cs-parser.jay"
+#line 1269 "cs-parser.jay"
 {
 		if (doc_support)
 			Lexer.doc_state = XmlCommentState.NotAllowed;
@@ -4969,7 +4964,7 @@ void case_149()
 	  }
 
 void case_150()
-#line 1285 "cs-parser.jay"
+#line 1276 "cs-parser.jay"
 {
 		Method method = (Method) yyVals[-2+yyTop];
 		method.Block = (ToplevelBlock) yyVals[0+yyTop];
@@ -4997,7 +4992,7 @@ void case_150()
 	  }
 
 void case_152()
-#line 1321 "cs-parser.jay"
+#line 1312 "cs-parser.jay"
 {
 		valid_param_mod = 0;
 		MemberName name = (MemberName) yyVals[-4+yyTop];
@@ -5020,7 +5015,7 @@ void case_152()
 	  }
 
 void case_153()
-#line 1342 "cs-parser.jay"
+#line 1333 "cs-parser.jay"
 {
 		lexer.ConstraintsParsing = false;
 
@@ -5033,14 +5028,14 @@ void case_153()
 	  }
 
 void case_155()
-#line 1361 "cs-parser.jay"
+#line 1352 "cs-parser.jay"
 {
 		lexer.parsing_generic_declaration = false;
 	  	valid_param_mod = ParameterModifierType.All;
 	  }
 
 void case_157()
-#line 1370 "cs-parser.jay"
+#line 1361 "cs-parser.jay"
 {
 		lexer.ConstraintsParsing = false;
 		valid_param_mod = 0;
@@ -5070,7 +5065,7 @@ void case_157()
 	  }
 
 void case_158()
-#line 1401 "cs-parser.jay"
+#line 1392 "cs-parser.jay"
 {
 		MemberName name = (MemberName) yyVals[-3+yyTop];
 		report.Error (1585, name.Location, 
@@ -5090,7 +5085,7 @@ void case_158()
 	  }
 
 void case_159()
-#line 1422 "cs-parser.jay"
+#line 1413 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		current_local_parameters = ParametersCompiled.Undefined;
@@ -5108,7 +5103,7 @@ void case_159()
 	  }
 
 void case_164()
-#line 1451 "cs-parser.jay"
+#line 1442 "cs-parser.jay"
 {
 		var pars_list = (List<Parameter>) yyVals[0+yyTop];
 	  	yyVal = new ParametersCompiled (pars_list.ToArray ());
@@ -5116,7 +5111,7 @@ void case_164()
 	  }
 
 void case_165()
-#line 1457 "cs-parser.jay"
+#line 1448 "cs-parser.jay"
 {
 		var pars_list = (List<Parameter>) yyVals[-2+yyTop];
 		pars_list.Add ((Parameter) yyVals[0+yyTop]);
@@ -5127,7 +5122,7 @@ void case_165()
 	  }
 
 void case_166()
-#line 1466 "cs-parser.jay"
+#line 1457 "cs-parser.jay"
 {
 		var pars_list = (List<Parameter>) yyVals[-2+yyTop];
 		pars_list.Add (new ArglistParameter (GetLocation (yyVals[0+yyTop])));
@@ -5138,7 +5133,7 @@ void case_166()
 	  }
 
 void case_167()
-#line 1475 "cs-parser.jay"
+#line 1466 "cs-parser.jay"
 {
 		if (yyVals[-2+yyTop] != null)
 			report.Error (231, ((Parameter) yyVals[-2+yyTop]).Location, "A params parameter must be the last parameter in a formal parameter list");
@@ -5148,7 +5143,7 @@ void case_167()
 	  }
 
 void case_168()
-#line 1483 "cs-parser.jay"
+#line 1474 "cs-parser.jay"
 {
 		if (yyVals[-2+yyTop] != null)
 			report.Error (231, ((Parameter) yyVals[-2+yyTop]).Location, "A params parameter must be the last parameter in a formal parameter list");
@@ -5163,7 +5158,7 @@ void case_168()
 	  }
 
 void case_169()
-#line 1496 "cs-parser.jay"
+#line 1487 "cs-parser.jay"
 {
 		report.Error (257, GetLocation (yyVals[-2+yyTop]), "An __arglist parameter must be the last parameter in a formal parameter list");
 
@@ -5172,7 +5167,7 @@ void case_169()
 	  }
 
 void case_170()
-#line 1503 "cs-parser.jay"
+#line 1494 "cs-parser.jay"
 {
 		report.Error (257, GetLocation (yyVals[-2+yyTop]), "An __arglist parameter must be the last parameter in a formal parameter list");
 
@@ -5186,14 +5181,14 @@ void case_170()
 	  }
 
 void case_173()
-#line 1523 "cs-parser.jay"
+#line 1514 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = ParametersCompiled.EmptyReadOnlyParameters;
 	  }
 
 void case_174()
-#line 1531 "cs-parser.jay"
+#line 1522 "cs-parser.jay"
 {
 		parameters_bucket.Clear ();
 		Parameter p = (Parameter) yyVals[0+yyTop];
@@ -5204,7 +5199,7 @@ void case_174()
 	  }
 
 void case_175()
-#line 1540 "cs-parser.jay"
+#line 1531 "cs-parser.jay"
 {
 		var pars = (List<Parameter>) yyVals[-2+yyTop];
 		Parameter p = (Parameter) yyVals[0+yyTop];
@@ -5224,7 +5219,7 @@ void case_175()
 	  }
 
 void case_176()
-#line 1564 "cs-parser.jay"
+#line 1555 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[0+yyTop];
 		yyVal = new Parameter ((FullNamedExpression) yyVals[-1+yyTop], lt.Value, (Parameter.Modifier) yyVals[-2+yyTop], (Attributes) yyVals[-3+yyTop], lt.Location);
@@ -5232,7 +5227,7 @@ void case_176()
 	  }
 
 void case_177()
-#line 1573 "cs-parser.jay"
+#line 1564 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-2+yyTop];
 		report.Error (1552, lt.Location, "Array type specifier, [], must appear before parameter name");
@@ -5241,7 +5236,7 @@ void case_177()
 	  }
 
 void case_178()
-#line 1580 "cs-parser.jay"
+#line 1571 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 	  	Location l = GetLocation (yyVals[0+yyTop]);
@@ -5249,7 +5244,7 @@ void case_178()
 	  }
 
 void case_179()
-#line 1589 "cs-parser.jay"
+#line 1580 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 	  	Location l = GetLocation (yyVals[0+yyTop]);
@@ -5258,7 +5253,7 @@ void case_179()
 	  }
 
 void case_181()
-#line 1604 "cs-parser.jay"
+#line 1595 "cs-parser.jay"
 {
 	  	--lexer.parsing_block;
 		if (lang_version <= LanguageVersion.V_3) {
@@ -5297,7 +5292,7 @@ void case_181()
 	  }
 
 void case_185()
-#line 1653 "cs-parser.jay"
+#line 1644 "cs-parser.jay"
 {
 		Parameter.Modifier p2 = (Parameter.Modifier)yyVals[0+yyTop];
   		Parameter.Modifier mod = (Parameter.Modifier)yyVals[-1+yyTop] | p2;
@@ -5320,7 +5315,7 @@ void case_185()
 	  }
 
 void case_186()
-#line 1677 "cs-parser.jay"
+#line 1668 "cs-parser.jay"
 {
 	  	if ((valid_param_mod & ParameterModifierType.Ref) == 0)
 	  		Error_ParameterModifierNotValid ("ref", GetLocation (yyVals[0+yyTop]));
@@ -5329,7 +5324,7 @@ void case_186()
 	  }
 
 void case_187()
-#line 1684 "cs-parser.jay"
+#line 1675 "cs-parser.jay"
 {
 	  	if ((valid_param_mod & ParameterModifierType.Out) == 0)
 	  		Error_ParameterModifierNotValid ("out", GetLocation (yyVals[0+yyTop]));
@@ -5338,7 +5333,7 @@ void case_187()
 	  }
 
 void case_188()
-#line 1691 "cs-parser.jay"
+#line 1682 "cs-parser.jay"
 {
 		if ((valid_param_mod & ParameterModifierType.This) == 0)
 	  		Error_ParameterModifierNotValid ("this", GetLocation (yyVals[0+yyTop]));
@@ -5350,7 +5345,7 @@ void case_188()
 	  }
 
 void case_189()
-#line 1704 "cs-parser.jay"
+#line 1695 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[0+yyTop];
 		yyVal = new ParamsParameter ((FullNamedExpression) yyVals[-1+yyTop], lt.Value, (Attributes) yyVals[-3+yyTop], lt.Location);
@@ -5358,7 +5353,7 @@ void case_189()
 	  }
 
 void case_190()
-#line 1710 "cs-parser.jay"
+#line 1701 "cs-parser.jay"
 {
 		report.Error (1751, GetLocation (yyVals[-4+yyTop]), "Cannot specify a default value for a parameter array");
 		
@@ -5368,7 +5363,7 @@ void case_190()
 	  }
 
 void case_191()
-#line 1718 "cs-parser.jay"
+#line 1709 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -5376,7 +5371,7 @@ void case_191()
 	  }
 
 void case_192()
-#line 1727 "cs-parser.jay"
+#line 1718 "cs-parser.jay"
 {
 		if ((valid_param_mod & ParameterModifierType.Params) == 0)
 			report.Error (1670, (GetLocation (yyVals[0+yyTop])), "The `params' modifier is not allowed in current context");
@@ -5384,7 +5379,7 @@ void case_192()
 	  }
 
 void case_193()
-#line 1733 "cs-parser.jay"
+#line 1724 "cs-parser.jay"
 {
 		Parameter.Modifier mod = (Parameter.Modifier)yyVals[0+yyTop];
 		if ((mod & Parameter.Modifier.This) != 0) {
@@ -5396,21 +5391,21 @@ void case_193()
 	  }
 
 void case_195()
-#line 1750 "cs-parser.jay"
+#line 1741 "cs-parser.jay"
 {
 	  	if ((valid_param_mod & ParameterModifierType.Arglist) == 0)
 	  		report.Error (1669, GetLocation (yyVals[0+yyTop]), "__arglist is not valid in this context");
 	  }
 
 void case_196()
-#line 1761 "cs-parser.jay"
+#line 1752 "cs-parser.jay"
 {
 		if (doc_support)
 			tmpComment = Lexer.consume_doc_comment ();
 	  }
 
 void case_197()
-#line 1766 "cs-parser.jay"
+#line 1757 "cs-parser.jay"
 {
 		var type = (FullNamedExpression) yyVals[-3+yyTop];
 		current_property = new Property (current_type, type, (Modifiers) yyVals[-4+yyTop],
@@ -5426,7 +5421,7 @@ void case_197()
 	  }
 
 void case_198()
-#line 1780 "cs-parser.jay"
+#line 1771 "cs-parser.jay"
 {
 		lexer.PropertyParsing = false;
 		
@@ -5435,14 +5430,14 @@ void case_198()
 	  }
 
 void case_199()
-#line 1787 "cs-parser.jay"
+#line 1778 "cs-parser.jay"
 {
 		lbag.AppendToMember (current_property, GetLocation (yyVals[0+yyTop]));
 		current_property = null;
 	  }
 
 void case_201()
-#line 1801 "cs-parser.jay"
+#line 1792 "cs-parser.jay"
 {
 		valid_param_mod = 0;
 		var type = (FullNamedExpression) yyVals[-5+yyTop];
@@ -5469,7 +5464,7 @@ void case_201()
 	  }
 
 void case_203()
-#line 1830 "cs-parser.jay"
+#line 1821 "cs-parser.jay"
 {
 		if (current_property.AccessorFirst != null && current_property.AccessorFirst.Block == null)
 			((Indexer) current_property).ParameterInfo.CheckParameters (current_property);
@@ -5482,7 +5477,7 @@ void case_203()
 	  }
 
 void case_208()
-#line 1849 "cs-parser.jay"
+#line 1840 "cs-parser.jay"
 {
 	  	if (yyToken == Token.CLOSE_BRACE) {
 	  		report.Error (548, lexer.Location, "`{0}': property or indexer must have at least one accessor", current_property.GetSignatureForError ());
@@ -5495,7 +5490,7 @@ void case_208()
 	  }
 
 void case_209()
-#line 1863 "cs-parser.jay"
+#line 1854 "cs-parser.jay"
 {
 		if (yyVals[-1+yyTop] != ModifierNone && lang_version == LanguageVersion.ISO_1) {
 			FeatureIsNotAvailable (GetLocation (yyVals[-1+yyTop]), "access modifiers on properties");
@@ -5518,7 +5513,7 @@ void case_209()
 	  }
 
 void case_210()
-#line 1884 "cs-parser.jay"
+#line 1875 "cs-parser.jay"
 {
 	  	if (yyVals[0+yyTop] != null) {
 	  		current_property.Get.Block = (ToplevelBlock) yyVals[0+yyTop];			
@@ -5541,7 +5536,7 @@ void case_210()
 	  }
 
 void case_211()
-#line 1908 "cs-parser.jay"
+#line 1899 "cs-parser.jay"
 {
 		if (yyVals[-1+yyTop] != ModifierNone && lang_version == LanguageVersion.ISO_1) {
 			FeatureIsNotAvailable (GetLocation (yyVals[-1+yyTop]), "access modifiers on properties");
@@ -5569,7 +5564,7 @@ void case_211()
 	  }
 
 void case_212()
-#line 1934 "cs-parser.jay"
+#line 1925 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] != null) {		
 			current_property.Set.Block = (ToplevelBlock) yyVals[0+yyTop];
@@ -5592,21 +5587,21 @@ void case_212()
 	  }
 
 void case_214()
-#line 1959 "cs-parser.jay"
+#line 1950 "cs-parser.jay"
 {
 		savedLocation = GetLocation (yyVals[0+yyTop]);
 	  	yyVal = null;
 	  }
 
 void case_215()
-#line 1964 "cs-parser.jay"
+#line 1955 "cs-parser.jay"
 {
 	  	Error_SyntaxError (1043, yyToken, "Invalid accessor body");
 	  	yyVal = null;
 	  }
 
 void case_217()
-#line 1978 "cs-parser.jay"
+#line 1969 "cs-parser.jay"
 {
 		lexer.ConstraintsParsing = true;
 		push_current_container (new Interface (current_container, (MemberName) yyVals[0+yyTop], (Modifiers) yyVals[-4+yyTop], (Attributes) yyVals[-5+yyTop]), yyVals[-3+yyTop]);
@@ -5614,7 +5609,7 @@ void case_217()
 	  }
 
 void case_218()
-#line 1985 "cs-parser.jay"
+#line 1976 "cs-parser.jay"
 {
 		lexer.ConstraintsParsing = false;
 
@@ -5630,7 +5625,7 @@ void case_218()
 	  }
 
 void case_219()
-#line 1999 "cs-parser.jay"
+#line 1990 "cs-parser.jay"
 {
 		--lexer.parsing_declaration;	  
 		if (doc_support)
@@ -5638,7 +5633,7 @@ void case_219()
 	  }
 
 void case_220()
-#line 2005 "cs-parser.jay"
+#line 1996 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] == null) {
 			lbag.AppendToMember (current_container, GetLocation (yyVals[-4+yyTop]), GetLocation (yyVals[-2+yyTop]));
@@ -5649,7 +5644,7 @@ void case_220()
 	  }
 
 void case_236()
-#line 2067 "cs-parser.jay"
+#line 2058 "cs-parser.jay"
 {
 		OperatorDeclaration decl = (OperatorDeclaration) yyVals[-2+yyTop];
 		if (decl != null) {
@@ -5679,14 +5674,14 @@ void case_236()
 	  }
 
 void case_240()
-#line 2104 "cs-parser.jay"
+#line 2095 "cs-parser.jay"
 {
 		report.Error (590, GetLocation (yyVals[0+yyTop]), "User-defined operators cannot return void");
 		yyVal = new TypeExpression (compiler.BuiltinTypes.Void, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_242()
-#line 2116 "cs-parser.jay"
+#line 2107 "cs-parser.jay"
 {
 		valid_param_mod = 0;
 
@@ -5728,7 +5723,7 @@ void case_242()
 	  }
 
 void case_267()
-#line 2192 "cs-parser.jay"
+#line 2183 "cs-parser.jay"
 {
 		valid_param_mod = 0;
 
@@ -5749,7 +5744,7 @@ void case_267()
 	  }
 
 void case_269()
-#line 2215 "cs-parser.jay"
+#line 2206 "cs-parser.jay"
 {
 		valid_param_mod = 0;
 		
@@ -5770,7 +5765,7 @@ void case_269()
 	  }
 
 void case_270()
-#line 2234 "cs-parser.jay"
+#line 2225 "cs-parser.jay"
 {
 	  	Error_SyntaxError (yyToken);
 		current_local_parameters = ParametersCompiled.EmptyReadOnlyParameters;
@@ -5778,7 +5773,7 @@ void case_270()
 	  }
 
 void case_271()
-#line 2240 "cs-parser.jay"
+#line 2231 "cs-parser.jay"
 {
 	  	Error_SyntaxError (yyToken);
 		current_local_parameters = ParametersCompiled.EmptyReadOnlyParameters;
@@ -5786,7 +5781,7 @@ void case_271()
 	  }
 
 void case_272()
-#line 2250 "cs-parser.jay"
+#line 2241 "cs-parser.jay"
 { 
 		Constructor c = (Constructor) yyVals[-1+yyTop];
 		c.Block = (ToplevelBlock) yyVals[0+yyTop];
@@ -5800,7 +5795,7 @@ void case_272()
 	  }
 
 void case_273()
-#line 2267 "cs-parser.jay"
+#line 2258 "cs-parser.jay"
 {
 		if (doc_support) {
 			tmpComment = Lexer.consume_doc_comment ();
@@ -5811,7 +5806,7 @@ void case_273()
 	  }
 
 void case_274()
-#line 2276 "cs-parser.jay"
+#line 2267 "cs-parser.jay"
 {
 		valid_param_mod = 0;
 		current_local_parameters = (ParametersCompiled) yyVals[-1+yyTop];
@@ -5842,7 +5837,7 @@ void case_274()
 	  }
 
 void case_275()
-#line 2305 "cs-parser.jay"
+#line 2296 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] != null) {
 			var c = (Constructor) yyVals[-1+yyTop];
@@ -5859,7 +5854,7 @@ void case_275()
 	  }
 
 void case_281()
-#line 2337 "cs-parser.jay"
+#line 2328 "cs-parser.jay"
 {
 	  	--lexer.parsing_block;
 		yyVal = new ConstructorBaseInitializer ((Arguments) yyVals[-1+yyTop], GetLocation (yyVals[-4+yyTop]));
@@ -5867,7 +5862,7 @@ void case_281()
 	  }
 
 void case_283()
-#line 2347 "cs-parser.jay"
+#line 2338 "cs-parser.jay"
 {
 	  	--lexer.parsing_block;
 		yyVal = new ConstructorThisInitializer ((Arguments) yyVals[-1+yyTop], GetLocation (yyVals[-4+yyTop]));
@@ -5875,7 +5870,7 @@ void case_283()
 	  }
 
 void case_284()
-#line 2353 "cs-parser.jay"
+#line 2344 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);	  
 		yyVal = new ConstructorThisInitializer (null, GetLocation (yyVals[0+yyTop]));
@@ -5883,14 +5878,14 @@ void case_284()
 	  }
 
 void case_285()
-#line 2359 "cs-parser.jay"
+#line 2350 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = null;
 	  }
 
 void case_286()
-#line 2367 "cs-parser.jay"
+#line 2358 "cs-parser.jay"
 {
 		if (doc_support) {
 			tmpComment = Lexer.consume_doc_comment ();
@@ -5901,7 +5896,7 @@ void case_286()
 	  }
 
 void case_287()
-#line 2376 "cs-parser.jay"
+#line 2367 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-3+yyTop];
 		if (lt.Value != current_container.MemberName.Name){
@@ -5924,7 +5919,7 @@ void case_287()
 	  }
 
 void case_288()
-#line 2402 "cs-parser.jay"
+#line 2393 "cs-parser.jay"
 {
 		current_event_field = new EventField (current_type, (FullNamedExpression) yyVals[-1+yyTop], (Modifiers) yyVals[-3+yyTop], (MemberName) yyVals[0+yyTop], (Attributes) yyVals[-4+yyTop]);
 		current_type.AddMember (current_event_field);
@@ -5938,7 +5933,7 @@ void case_288()
 	  }
 
 void case_289()
-#line 2416 "cs-parser.jay"
+#line 2407 "cs-parser.jay"
 {
 		if (doc_support) {
 			current_event_field.DocComment = Lexer.consume_doc_comment ();
@@ -5953,7 +5948,7 @@ void case_289()
 	  }
 
 void case_290()
-#line 2432 "cs-parser.jay"
+#line 2423 "cs-parser.jay"
 {
 		current_event = new EventProperty (current_type, (FullNamedExpression) yyVals[-2+yyTop], (Modifiers) yyVals[-4+yyTop], (MemberName) yyVals[-1+yyTop], (Attributes) yyVals[-5+yyTop]);
 		current_type.AddMember (current_event);
@@ -5963,7 +5958,7 @@ void case_290()
 	  }
 
 void case_291()
-#line 2440 "cs-parser.jay"
+#line 2431 "cs-parser.jay"
 {
 		if (current_container.Kind == MemberKind.Interface)
 			report.Error (69, GetLocation (yyVals[-2+yyTop]), "Event in interface cannot have add or remove accessors");
@@ -5972,7 +5967,7 @@ void case_291()
 	  }
 
 void case_292()
-#line 2447 "cs-parser.jay"
+#line 2438 "cs-parser.jay"
 {
 		if (doc_support) {
 			current_event.DocComment = Lexer.consume_doc_comment ();
@@ -5985,7 +5980,7 @@ void case_292()
 	  }
 
 void case_293()
-#line 2460 "cs-parser.jay"
+#line 2451 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -5993,7 +5988,7 @@ void case_293()
 	  }
 
 void case_296()
-#line 2474 "cs-parser.jay"
+#line 2465 "cs-parser.jay"
 {
 	  	--lexer.parsing_block;
 	  	savedEventAssignLocation = GetLocation (yyVals[-2+yyTop]);
@@ -6001,7 +5996,7 @@ void case_296()
 	  }
 
 void case_301()
-#line 2499 "cs-parser.jay"
+#line 2490 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[0+yyTop];
 	  	yyVal = new FieldDeclarator (new SimpleMemberName (lt.Value, lt.Location), null);
@@ -6009,7 +6004,7 @@ void case_301()
 	  }
 
 void case_303()
-#line 2509 "cs-parser.jay"
+#line 2500 "cs-parser.jay"
 {
 		--lexer.parsing_block;
 		var lt = (LocatedToken) yyVals[-3+yyTop];	  
@@ -6018,7 +6013,7 @@ void case_303()
 	  }
 
 void case_304()
-#line 2518 "cs-parser.jay"
+#line 2509 "cs-parser.jay"
 {
 		if (current_container.Kind == MemberKind.Interface) {
 			report.Error (68, lexer.Location, "`{0}': event in interface cannot have an initializer",
@@ -6032,28 +6027,28 @@ void case_304()
 	  }
 
 void case_308()
-#line 2539 "cs-parser.jay"
+#line 2530 "cs-parser.jay"
 {
 		report.Error (65, lexer.Location, "`{0}': event property must have both add and remove accessors",
 			current_event.GetSignatureForError ());
 	  }
 
 void case_309()
-#line 2544 "cs-parser.jay"
+#line 2535 "cs-parser.jay"
 {
 		report.Error (65, lexer.Location, "`{0}': event property must have both add and remove accessors",
 			current_event.GetSignatureForError ());
 	  }
 
 void case_310()
-#line 2549 "cs-parser.jay"
+#line 2540 "cs-parser.jay"
 { 
 		report.Error (1055, GetLocation (yyVals[0+yyTop]), "An add or remove accessor expected");
 		yyVal = null;
 	  }
 
 void case_311()
-#line 2557 "cs-parser.jay"
+#line 2548 "cs-parser.jay"
 {
 	  	if (yyVals[-1+yyTop] != ModifierNone) {
 			report.Error (1609, GetLocation (yyVals[-1+yyTop]), "Modifiers cannot be placed on event accessor declarations");
@@ -6067,7 +6062,7 @@ void case_311()
 	  }
 
 void case_312()
-#line 2569 "cs-parser.jay"
+#line 2560 "cs-parser.jay"
 {
 		lexer.EventParsing = true;
 	  
@@ -6082,7 +6077,7 @@ void case_312()
 	  }
 
 void case_313()
-#line 2585 "cs-parser.jay"
+#line 2576 "cs-parser.jay"
 {
 	  	if (yyVals[-1+yyTop] != ModifierNone) {
 			report.Error (1609, GetLocation (yyVals[-1+yyTop]), "Modifiers cannot be placed on event accessor declarations");
@@ -6096,7 +6091,7 @@ void case_313()
 	  }
 
 void case_314()
-#line 2597 "cs-parser.jay"
+#line 2588 "cs-parser.jay"
 {
 		lexer.EventParsing = true;
 	  
@@ -6111,14 +6106,14 @@ void case_314()
 	  }
 
 void case_315()
-#line 2613 "cs-parser.jay"
+#line 2604 "cs-parser.jay"
 {
 		report.Error (73, lexer.Location, "An add or remove accessor must have a body");
 		yyVal = null;
 	  }
 
 void case_317()
-#line 2622 "cs-parser.jay"
+#line 2613 "cs-parser.jay"
 {
 		current_type.UnattachedAttributes = (Attributes) yyVals[-1+yyTop];
 		report.Error (1519, GetLocation (yyVals[-1+yyTop]), "An attribute is missing member declaration");
@@ -6126,7 +6121,7 @@ void case_317()
 	  }
 
 void case_318()
-#line 2633 "cs-parser.jay"
+#line 2624 "cs-parser.jay"
 {
 		report.Error (1519, lexer.Location, "Unexpected symbol `}' in class, struct, or interface member declaration");
  
@@ -6141,14 +6136,14 @@ void case_318()
 	  }
 
 void case_319()
-#line 2653 "cs-parser.jay"
+#line 2644 "cs-parser.jay"
 {
 		if (doc_support)
 			enumTypeComment = Lexer.consume_doc_comment ();
 	  }
 
 void case_320()
-#line 2658 "cs-parser.jay"
+#line 2649 "cs-parser.jay"
 {
 		if (doc_support)
 			Lexer.doc_state = XmlCommentState.Allowed;
@@ -6167,7 +6162,7 @@ void case_320()
 	  }
 
 void case_321()
-#line 2675 "cs-parser.jay"
+#line 2666 "cs-parser.jay"
 {
 	  	/* here will be evaluated after CLOSE_BLACE is consumed.*/
 		if (doc_support)
@@ -6175,7 +6170,7 @@ void case_321()
 	  }
 
 void case_322()
-#line 2681 "cs-parser.jay"
+#line 2672 "cs-parser.jay"
 {
 		lbag.AppendToMember (current_container, GetLocation (yyVals[-1+yyTop]));
 		if (yyVals[0+yyTop] != null) {
@@ -6193,28 +6188,28 @@ void case_322()
 	  }
 
 void case_324()
-#line 2701 "cs-parser.jay"
+#line 2692 "cs-parser.jay"
 {
 		savedLocation = GetLocation (yyVals[-1+yyTop]);
 		yyVal = yyVals[0+yyTop];
 	 }
 
 void case_325()
-#line 2706 "cs-parser.jay"
+#line 2697 "cs-parser.jay"
 {
 	 	Error_TypeExpected (GetLocation (yyVals[-1+yyTop]));
 		yyVal = null;
 	 }
 
 void case_330()
-#line 2724 "cs-parser.jay"
+#line 2715 "cs-parser.jay"
 {
 		lbag.AppendToMember (current_container, GetLocation (yyVals[-1+yyTop]));
 	  	yyVal = yyVals[0+yyTop];
 	  }
 
 void case_331()
-#line 2732 "cs-parser.jay"
+#line 2723 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[0+yyTop];
 	  	var em = new EnumMember ((Enum) current_type, new MemberName (lt.Value, lt.Location), (Attributes) yyVals[-1+yyTop]);
@@ -6229,7 +6224,7 @@ void case_331()
 	  }
 
 void case_332()
-#line 2745 "cs-parser.jay"
+#line 2736 "cs-parser.jay"
 {
 	  	++lexer.parsing_block;
 		if (doc_support) {
@@ -6239,7 +6234,7 @@ void case_332()
 	  }
 
 void case_333()
-#line 2753 "cs-parser.jay"
+#line 2744 "cs-parser.jay"
 { 
 		--lexer.parsing_block;
 		
@@ -6255,7 +6250,7 @@ void case_333()
 	  }
 
 void case_334()
-#line 2767 "cs-parser.jay"
+#line 2758 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 	  
@@ -6272,7 +6267,7 @@ void case_334()
 	  }
 
 void case_337()
-#line 2794 "cs-parser.jay"
+#line 2785 "cs-parser.jay"
 {
 		valid_param_mod = 0;
 
@@ -6289,7 +6284,7 @@ void case_337()
 	  }
 
 void case_339()
-#line 2813 "cs-parser.jay"
+#line 2804 "cs-parser.jay"
 {
 		if (doc_support) {
 			current_delegate.DocComment = Lexer.consume_doc_comment ();
@@ -6306,7 +6301,7 @@ void case_339()
 	  }
 
 void case_341()
-#line 2832 "cs-parser.jay"
+#line 2823 "cs-parser.jay"
 {
 		if (lang_version < LanguageVersion.ISO_2)
 			FeatureIsNotAvailable (GetLocation (yyVals[0+yyTop]), "nullable types");
@@ -6315,7 +6310,7 @@ void case_341()
 	  }
 
 void case_343()
-#line 2843 "cs-parser.jay"
+#line 2834 "cs-parser.jay"
 {
 		var lt1 = (LocatedToken) yyVals[-2+yyTop];
 		var lt2 = (LocatedToken) yyVals[-1+yyTop];
@@ -6325,7 +6320,7 @@ void case_343()
 	  }
 
 void case_345()
-#line 2855 "cs-parser.jay"
+#line 2846 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];
 		yyVal = new MemberAccess ((Expression) yyVals[-3+yyTop], lt.Value, (TypeArguments) yyVals[0+yyTop], lt.Location);
@@ -6333,14 +6328,14 @@ void case_345()
 	  }
 
 void case_346()
-#line 2864 "cs-parser.jay"
+#line 2855 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];
 		yyVal = new SimpleName (lt.Value, (TypeArguments)yyVals[0+yyTop], lt.Location);
 	  }
 
 void case_348()
-#line 2876 "cs-parser.jay"
+#line 2867 "cs-parser.jay"
 {
 		if (lang_version < LanguageVersion.ISO_2)
 			FeatureIsNotAvailable (GetLocation (yyVals[-2+yyTop]), "generics");
@@ -6353,14 +6348,14 @@ void case_348()
 	  }
 
 void case_349()
-#line 2887 "cs-parser.jay"
+#line 2878 "cs-parser.jay"
 {
 		Error_TypeExpected (lexer.Location);
 		yyVal = new TypeArguments ();
 	  }
 
 void case_350()
-#line 2895 "cs-parser.jay"
+#line 2886 "cs-parser.jay"
 {
 		TypeArguments type_args = new TypeArguments ();
 		type_args.Add ((FullNamedExpression) yyVals[0+yyTop]);
@@ -6369,7 +6364,7 @@ void case_350()
 	  }
 
 void case_351()
-#line 2902 "cs-parser.jay"
+#line 2893 "cs-parser.jay"
 {
 		TypeArguments type_args = (TypeArguments) yyVals[-2+yyTop];
 		type_args.Add ((FullNamedExpression) yyVals[0+yyTop]);
@@ -6378,7 +6373,7 @@ void case_351()
 	  }
 
 void case_353()
-#line 2919 "cs-parser.jay"
+#line 2910 "cs-parser.jay"
 {
 		lexer.parsing_generic_declaration = false;
 		var lt = (LocatedToken) yyVals[-2+yyTop];
@@ -6386,7 +6381,7 @@ void case_353()
 	  }
 
 void case_354()
-#line 2928 "cs-parser.jay"
+#line 2919 "cs-parser.jay"
 {
 	  	MemberName mn = (MemberName)yyVals[0+yyTop];
 	  	if (mn.TypeParameters != null)
@@ -6395,7 +6390,7 @@ void case_354()
 	  }
 
 void case_356()
-#line 2939 "cs-parser.jay"
+#line 2930 "cs-parser.jay"
 {
 		lexer.parsing_generic_declaration = false;	  
 		var lt = (LocatedToken) yyVals[-1+yyTop];
@@ -6403,21 +6398,21 @@ void case_356()
 	  }
 
 void case_357()
-#line 2948 "cs-parser.jay"
+#line 2939 "cs-parser.jay"
 {
 		lexer.parsing_generic_declaration = false;	  
 		yyVal = new MemberName (TypeDefinition.DefaultIndexerName, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_358()
-#line 2953 "cs-parser.jay"
+#line 2944 "cs-parser.jay"
 {
 		lexer.parsing_generic_declaration = false;
 		yyVal = new MemberName (TypeDefinition.DefaultIndexerName, null, (ATypeNameExpression) yyVals[-1+yyTop], GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_359()
-#line 2961 "cs-parser.jay"
+#line 2952 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-2+yyTop];
 		yyVal = new SimpleName (lt.Value, (TypeArguments) yyVals[-1+yyTop], lt.Location);
@@ -6425,7 +6420,7 @@ void case_359()
 	  }
 
 void case_360()
-#line 2967 "cs-parser.jay"
+#line 2958 "cs-parser.jay"
 {
 		var lt1 = (LocatedToken) yyVals[-3+yyTop];
 		var lt2 = (LocatedToken) yyVals[-2+yyTop];
@@ -6435,7 +6430,7 @@ void case_360()
 	  }
 
 void case_361()
-#line 2975 "cs-parser.jay"
+#line 2966 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-2+yyTop];
 		yyVal = new MemberAccess ((ATypeNameExpression) yyVals[-3+yyTop], lt.Value, (TypeArguments) yyVals[-1+yyTop], lt.Location);
@@ -6443,7 +6438,7 @@ void case_361()
 	  }
 
 void case_363()
-#line 2985 "cs-parser.jay"
+#line 2976 "cs-parser.jay"
 {
 		if (lang_version < LanguageVersion.ISO_2)
 			FeatureIsNotAvailable (GetLocation (yyVals[-2+yyTop]), "generics");
@@ -6456,7 +6451,7 @@ void case_363()
 	  }
 
 void case_364()
-#line 2999 "cs-parser.jay"
+#line 2990 "cs-parser.jay"
 {
 		var tparams = new TypeParameters ();
 		tparams.Add ((TypeParameter)yyVals[0+yyTop]);
@@ -6465,7 +6460,7 @@ void case_364()
 	  }
 
 void case_365()
-#line 3006 "cs-parser.jay"
+#line 2997 "cs-parser.jay"
 {
 		var tparams = (TypeParameters) yyVals[-2+yyTop];
 		tparams.Add ((TypeParameter)yyVals[0+yyTop]);
@@ -6474,7 +6469,7 @@ void case_365()
 	  }
 
 void case_366()
-#line 3016 "cs-parser.jay"
+#line 3007 "cs-parser.jay"
 {
 		var lt = (LocatedToken)yyVals[0+yyTop];
 		var variance = (Variance) yyVals[-1+yyTop];
@@ -6484,7 +6479,7 @@ void case_366()
   	  }
 
 void case_367()
-#line 3024 "cs-parser.jay"
+#line 3015 "cs-parser.jay"
 {
   	  	if (GetTokenName (yyToken) == "type")
 			report.Error (81, GetLocation (yyVals[0+yyTop]), "Type parameter declaration must be an identifier not a type");
@@ -6495,28 +6490,28 @@ void case_367()
   	  }
 
 void case_372()
-#line 3058 "cs-parser.jay"
+#line 3049 "cs-parser.jay"
 {
 	  	Expression.Error_VoidInvalidInTheContext (GetLocation (yyVals[0+yyTop]), report);
 		yyVal = new TypeExpression (compiler.BuiltinTypes.Void, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_374()
-#line 3067 "cs-parser.jay"
+#line 3058 "cs-parser.jay"
 {
 	  	Expression.Error_VoidInvalidInTheContext (GetLocation (yyVals[0+yyTop]), report);
 		yyVal = new TypeExpression (compiler.BuiltinTypes.Void, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_376()
-#line 3076 "cs-parser.jay"
+#line 3067 "cs-parser.jay"
 {
 	  	report.Error (1536, GetLocation (yyVals[0+yyTop]), "Invalid parameter type `void'");
 		yyVal = new TypeExpression (compiler.BuiltinTypes.Void, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_379()
-#line 3092 "cs-parser.jay"
+#line 3083 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] != null) {
 			yyVal = new ComposedCast ((ATypeNameExpression) yyVals[-1+yyTop], (ComposedTypeSpecifier) yyVals[0+yyTop]);
@@ -6530,14 +6525,14 @@ void case_379()
 	  }
 
 void case_381()
-#line 3108 "cs-parser.jay"
+#line 3099 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] != null)
 			yyVal = new ComposedCast ((FullNamedExpression) yyVals[-1+yyTop], (ComposedTypeSpecifier) yyVals[0+yyTop]);
 	  }
 
 void case_384()
-#line 3124 "cs-parser.jay"
+#line 3115 "cs-parser.jay"
 {
 		var types = new List<FullNamedExpression> (2);
 		types.Add ((FullNamedExpression) yyVals[0+yyTop]);
@@ -6545,7 +6540,7 @@ void case_384()
 	  }
 
 void case_385()
-#line 3130 "cs-parser.jay"
+#line 3121 "cs-parser.jay"
 {
 		var types = (List<FullNamedExpression>) yyVals[-2+yyTop];
 		types.Add ((FullNamedExpression) yyVals[0+yyTop]);
@@ -6554,7 +6549,7 @@ void case_385()
 	  }
 
 void case_386()
-#line 3140 "cs-parser.jay"
+#line 3131 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] is ComposedCast) {
 			report.Error (1521, GetLocation (yyVals[0+yyTop]), "Invalid base type `{0}'", ((ComposedCast)yyVals[0+yyTop]).GetSignatureForError ());
@@ -6563,28 +6558,28 @@ void case_386()
 	  }
 
 void case_423()
-#line 3204 "cs-parser.jay"
+#line 3195 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];
 		yyVal = new SimpleName (lt.Value, (TypeArguments)yyVals[0+yyTop], lt.Location);	  
 	  }
 
 void case_424()
-#line 3208 "cs-parser.jay"
+#line 3199 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];
 	       yyVal = new CompletionSimpleName (MemberName.MakeName (lt.Value, null), lt.Location);
 	  }
 
 void case_435()
-#line 3249 "cs-parser.jay"
+#line 3240 "cs-parser.jay"
 {
 		yyVal = new ParenthesizedExpression ((Expression) yyVals[-1+yyTop], GetLocation (yyVals[-2+yyTop]));
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-2+yyTop]), GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_437()
-#line 3261 "cs-parser.jay"
+#line 3252 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];
 		yyVal = new MemberAccess ((Expression) yyVals[-3+yyTop], lt.Value, (TypeArguments) yyVals[0+yyTop], lt.Location);
@@ -6592,7 +6587,7 @@ void case_437()
 	  }
 
 void case_438()
-#line 3267 "cs-parser.jay"
+#line 3258 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];
 		yyVal = new MemberAccess ((Expression) yyVals[-3+yyTop], lt.Value, (TypeArguments) yyVals[0+yyTop], lt.Location);
@@ -6600,7 +6595,7 @@ void case_438()
 	  }
 
 void case_439()
-#line 3273 "cs-parser.jay"
+#line 3264 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];
 		yyVal = new MemberAccess (new BaseThis (GetLocation (yyVals[-3+yyTop])), lt.Value, (TypeArguments) yyVals[0+yyTop], lt.Location);
@@ -6608,7 +6603,7 @@ void case_439()
 	  }
 
 void case_440()
-#line 3279 "cs-parser.jay"
+#line 3270 "cs-parser.jay"
 {
 		var lt1 = (LocatedToken) yyVals[-2+yyTop];
 		var lt2 = (LocatedToken) yyVals[-1+yyTop];
@@ -6618,28 +6613,28 @@ void case_440()
 	  }
 
 void case_442()
-#line 3289 "cs-parser.jay"
+#line 3280 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];
 		yyVal = new CompletionMemberAccess ((Expression) yyVals[-3+yyTop], lt.Value, lt.Location);
 	  }
 
 void case_444()
-#line 3297 "cs-parser.jay"
+#line 3288 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];
 		yyVal = new CompletionMemberAccess ((Expression) yyVals[-3+yyTop], lt.Value, lt.Location);
  	  }
 
 void case_445()
-#line 3305 "cs-parser.jay"
+#line 3296 "cs-parser.jay"
 {
 		yyVal = new Invocation ((Expression) yyVals[-3+yyTop], (Arguments) yyVals[-1+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-2+yyTop]), GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_446()
-#line 3310 "cs-parser.jay"
+#line 3301 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -6648,7 +6643,7 @@ void case_446()
 	  }
 
 void case_447()
-#line 3317 "cs-parser.jay"
+#line 3308 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -6657,7 +6652,7 @@ void case_447()
 	  }
 
 void case_450()
-#line 3332 "cs-parser.jay"
+#line 3323 "cs-parser.jay"
 {
 	  	if (yyVals[-1+yyTop] == null) {
 	  		yyVal = new CollectionOrObjectInitializers (GetLocation (yyVals[-2+yyTop]));
@@ -6668,14 +6663,14 @@ void case_450()
 	  }
 
 void case_451()
-#line 3341 "cs-parser.jay"
+#line 3332 "cs-parser.jay"
 {
 	  	yyVal = new CollectionOrObjectInitializers ((List<Expression>) yyVals[-2+yyTop], GetLocation (yyVals[-3+yyTop]));
 	  	lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]), GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_454()
-#line 3357 "cs-parser.jay"
+#line 3348 "cs-parser.jay"
 {
 	  	var a = new List<Expression> ();
 	  	a.Add ((Expression) yyVals[0+yyTop]);
@@ -6683,7 +6678,7 @@ void case_454()
 	  }
 
 void case_455()
-#line 3363 "cs-parser.jay"
+#line 3354 "cs-parser.jay"
 {
 	  	var a = (List<Expression>)yyVals[-2+yyTop];
 	  	a.Add ((Expression) yyVals[0+yyTop]);
@@ -6692,14 +6687,14 @@ void case_455()
 	  }
 
 void case_456()
-#line 3369 "cs-parser.jay"
+#line 3360 "cs-parser.jay"
 {
 	  	Error_SyntaxError (yyToken);
 		yyVal = yyVals[-1+yyTop];
 	  }
 
 void case_457()
-#line 3377 "cs-parser.jay"
+#line 3368 "cs-parser.jay"
 {
 	  	var lt = (LocatedToken) yyVals[-2+yyTop];
 	  	yyVal = new ElementInitializer (lt.Value, (Expression)yyVals[0+yyTop], lt.Location);
@@ -6707,7 +6702,7 @@ void case_457()
 	  }
 
 void case_458()
-#line 3383 "cs-parser.jay"
+#line 3374 "cs-parser.jay"
 {
 	  	var lt = (LocatedToken) Error_AwaitAsIdentifier (yyVals[-2+yyTop]);
 	  	yyVal = new ElementInitializer (lt.Value, (Expression)yyVals[0+yyTop], lt.Location);
@@ -6715,7 +6710,7 @@ void case_458()
 	  }
 
 void case_460()
-#line 3392 "cs-parser.jay"
+#line 3383 "cs-parser.jay"
 {
 		CompletionSimpleName csn = yyVals[-1+yyTop] as CompletionSimpleName;
 		if (csn == null)
@@ -6725,7 +6720,7 @@ void case_460()
 	  }
 
 void case_461()
-#line 3400 "cs-parser.jay"
+#line 3391 "cs-parser.jay"
 {
 		if (yyVals[-1+yyTop] == null)
 			yyVal = null;
@@ -6736,7 +6731,7 @@ void case_461()
 	  }
 
 void case_462()
-#line 3409 "cs-parser.jay"
+#line 3400 "cs-parser.jay"
 {
 	  	report.Error (1920, GetLocation (yyVals[-1+yyTop]), "An element initializer cannot be empty");
 		yyVal = new CollectionElementInitializer (new List<Expression> (), GetLocation (yyVals[-1+yyTop]));
@@ -6744,7 +6739,7 @@ void case_462()
 	  }
 
 void case_467()
-#line 3428 "cs-parser.jay"
+#line 3419 "cs-parser.jay"
 { 
 		Arguments list = new Arguments (4);
 		list.Add ((Argument) yyVals[0+yyTop]);
@@ -6752,7 +6747,7 @@ void case_467()
 	  }
 
 void case_468()
-#line 3434 "cs-parser.jay"
+#line 3425 "cs-parser.jay"
 {
 		Arguments list = (Arguments) yyVals[-2+yyTop];
 		if (list [list.Count - 1] is NamedArgument)
@@ -6764,7 +6759,7 @@ void case_468()
 	  }
 
 void case_469()
-#line 3444 "cs-parser.jay"
+#line 3435 "cs-parser.jay"
 {
 		Arguments list = (Arguments) yyVals[-2+yyTop];
 		NamedArgument a = (NamedArgument) yyVals[0+yyTop];
@@ -6781,7 +6776,7 @@ void case_469()
 	  }
 
 void case_470()
-#line 3459 "cs-parser.jay"
+#line 3450 "cs-parser.jay"
 {
 	  	if (lexer.putback_char == -1)
 	  		lexer.putback (')'); /* TODO: Wrong but what can I do*/
@@ -6790,63 +6785,63 @@ void case_470()
 	  }
 
 void case_471()
-#line 3466 "cs-parser.jay"
+#line 3457 "cs-parser.jay"
 {
 	  	report.Error (839, GetLocation (yyVals[-1+yyTop]), "An argument is missing");
 	  	yyVal = null;
 	  }
 
 void case_476()
-#line 3487 "cs-parser.jay"
+#line 3478 "cs-parser.jay"
 { 
 		yyVal = new Argument ((Expression) yyVals[0+yyTop], Argument.AType.Ref);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_477()
-#line 3492 "cs-parser.jay"
+#line 3483 "cs-parser.jay"
 { 
 		yyVal = new Argument ((Expression) yyVals[0+yyTop], Argument.AType.Out);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_478()
-#line 3497 "cs-parser.jay"
+#line 3488 "cs-parser.jay"
 {
 		yyVal = new Argument (new Arglist ((Arguments) yyVals[-1+yyTop], GetLocation (yyVals[-3+yyTop])));
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-2+yyTop]), GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_479()
-#line 3502 "cs-parser.jay"
+#line 3493 "cs-parser.jay"
 {
 		yyVal = new Argument (new Arglist (GetLocation (yyVals[-2+yyTop])));
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]), GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_481()
-#line 3514 "cs-parser.jay"
+#line 3505 "cs-parser.jay"
 {
 		yyVal = new ElementAccess ((Expression) yyVals[-3+yyTop], (Arguments) yyVals[-1+yyTop], GetLocation (yyVals[-2+yyTop]));
 		lbag.AddLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_482()
-#line 3519 "cs-parser.jay"
+#line 3510 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = new ElementAccess ((Expression) yyVals[-3+yyTop], (Arguments) yyVals[-1+yyTop], GetLocation (yyVals[-2+yyTop]));
 	  }
 
 void case_483()
-#line 3524 "cs-parser.jay"
+#line 3515 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = new ElementAccess ((Expression) yyVals[-2+yyTop], null, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_484()
-#line 3532 "cs-parser.jay"
+#line 3523 "cs-parser.jay"
 {
 		var list = new List<Expression> (4);
 		list.Add ((Expression) yyVals[0+yyTop]);
@@ -6854,7 +6849,7 @@ void case_484()
 	  }
 
 void case_485()
-#line 3538 "cs-parser.jay"
+#line 3529 "cs-parser.jay"
 {
 		var list = (List<Expression>) yyVals[-2+yyTop];
 		list.Add ((Expression) yyVals[0+yyTop]);
@@ -6863,7 +6858,7 @@ void case_485()
 	  }
 
 void case_486()
-#line 3548 "cs-parser.jay"
+#line 3539 "cs-parser.jay"
 {
 		Arguments args = new Arguments (4);
 		args.Add ((Argument) yyVals[0+yyTop]);
@@ -6871,7 +6866,7 @@ void case_486()
 	  }
 
 void case_487()
-#line 3554 "cs-parser.jay"
+#line 3545 "cs-parser.jay"
 {
 		Arguments args = (Arguments) yyVals[-2+yyTop];
 		if (args [args.Count - 1] is NamedArgument && !(yyVals[0+yyTop] is NamedArgument))
@@ -6883,21 +6878,21 @@ void case_487()
 	  }
 
 void case_491()
-#line 3582 "cs-parser.jay"
+#line 3573 "cs-parser.jay"
 {
 	  	yyVal = new ElementAccess (new BaseThis (GetLocation (yyVals[-3+yyTop])), (Arguments) yyVals[-1+yyTop], GetLocation (yyVals[-2+yyTop]));
 		lbag.AddLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_492()
-#line 3587 "cs-parser.jay"
+#line 3578 "cs-parser.jay"
 {
 	  	Error_SyntaxError (yyToken);
 		yyVal = new ElementAccess (null, null, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_495()
-#line 3609 "cs-parser.jay"
+#line 3600 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] != null) {
 			if (lang_version <= LanguageVersion.ISO_2)
@@ -6912,7 +6907,7 @@ void case_495()
 	  }
 
 void case_496()
-#line 3622 "cs-parser.jay"
+#line 3613 "cs-parser.jay"
 {
 		if (lang_version <= LanguageVersion.ISO_2)
 			FeatureIsNotAvailable (GetLocation (yyVals[-2+yyTop]), "collection initializers");
@@ -6921,7 +6916,7 @@ void case_496()
 	  }
 
 void case_497()
-#line 3634 "cs-parser.jay"
+#line 3625 "cs-parser.jay"
 {
 		yyVal = new ArrayCreation ((FullNamedExpression) yyVals[-5+yyTop], (List<Expression>) yyVals[-3+yyTop],
 				new ComposedTypeSpecifier (((List<Expression>) yyVals[-3+yyTop]).Count, GetLocation (yyVals[-4+yyTop])) {
@@ -6931,7 +6926,7 @@ void case_497()
 	  }
 
 void case_498()
-#line 3642 "cs-parser.jay"
+#line 3633 "cs-parser.jay"
 {
 	  	if (yyVals[0+yyTop] == null)
 	  		report.Error (1586, GetLocation (yyVals[-3+yyTop]), "Array creation must have array size or array initializer");
@@ -6940,7 +6935,7 @@ void case_498()
 	  }
 
 void case_499()
-#line 3649 "cs-parser.jay"
+#line 3640 "cs-parser.jay"
 {
 		if (lang_version <= LanguageVersion.ISO_2)
 			FeatureIsNotAvailable (GetLocation (yyVals[-2+yyTop]), "implicitly typed arrays");
@@ -6949,14 +6944,14 @@ void case_499()
 	  }
 
 void case_500()
-#line 3656 "cs-parser.jay"
+#line 3647 "cs-parser.jay"
 {
 		report.Error (178, GetLocation (yyVals[-1+yyTop]), "Invalid rank specifier, expecting `,' or `]'");
 		yyVal = new ArrayCreation ((FullNamedExpression) yyVals[-5+yyTop], null, GetLocation (yyVals[-6+yyTop]));
 	  }
 
 void case_501()
-#line 3661 "cs-parser.jay"
+#line 3652 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		/* It can be any of new expression, create the most common one*/
@@ -6964,14 +6959,14 @@ void case_501()
 	  }
 
 void case_503()
-#line 3673 "cs-parser.jay"
+#line 3664 "cs-parser.jay"
 {
 		--lexer.parsing_type;
 		yyVal = yyVals[0+yyTop];
 	  }
 
 void case_504()
-#line 3681 "cs-parser.jay"
+#line 3672 "cs-parser.jay"
 {
 		if (lang_version <= LanguageVersion.ISO_2)
 	  		FeatureIsNotAvailable (GetLocation (yyVals[-3+yyTop]), "anonymous types");
@@ -6983,7 +6978,7 @@ void case_504()
 	  }
 
 void case_509()
-#line 3704 "cs-parser.jay"
+#line 3695 "cs-parser.jay"
 {
 	  	var a = new List<AnonymousTypeParameter> (4);
 	  	a.Add ((AnonymousTypeParameter) yyVals[0+yyTop]);
@@ -6991,7 +6986,7 @@ void case_509()
 	  }
 
 void case_510()
-#line 3710 "cs-parser.jay"
+#line 3701 "cs-parser.jay"
 {
 	  	var a = (List<AnonymousTypeParameter>) yyVals[-2+yyTop];
 	  	a.Add ((AnonymousTypeParameter) yyVals[0+yyTop]);
@@ -7001,7 +6996,7 @@ void case_510()
 	  }
 
 void case_511()
-#line 3721 "cs-parser.jay"
+#line 3712 "cs-parser.jay"
 {
 		var lt = (LocatedToken)yyVals[-2+yyTop];
 	  	yyVal = new AnonymousTypeParameter ((Expression)yyVals[0+yyTop], lt.Value, lt.Location);
@@ -7009,7 +7004,7 @@ void case_511()
 	  }
 
 void case_512()
-#line 3727 "cs-parser.jay"
+#line 3718 "cs-parser.jay"
 {
 		var lt = (LocatedToken)yyVals[0+yyTop];
 	  	yyVal = new AnonymousTypeParameter (new SimpleName (lt.Value, lt.Location),
@@ -7017,14 +7012,14 @@ void case_512()
 	  }
 
 void case_513()
-#line 3733 "cs-parser.jay"
+#line 3724 "cs-parser.jay"
 {
 	  	MemberAccess ma = (MemberAccess) yyVals[0+yyTop];
 	  	yyVal = new AnonymousTypeParameter (ma, ma.Name, ma.Location);
 	  }
 
 void case_514()
-#line 3738 "cs-parser.jay"
+#line 3729 "cs-parser.jay"
 {
 		report.Error (746, lexer.Location,
 			"Invalid anonymous type member declarator. Anonymous type members must be a member assignment, simple name or member access expression");
@@ -7032,28 +7027,28 @@ void case_514()
 	  }
 
 void case_518()
-#line 3753 "cs-parser.jay"
+#line 3744 "cs-parser.jay"
 {
 	  	((ComposedTypeSpecifier) yyVals[-1+yyTop]).Next = (ComposedTypeSpecifier) yyVals[0+yyTop];
 	  	yyVal = yyVals[-1+yyTop];
 	  }
 
 void case_519()
-#line 3761 "cs-parser.jay"
+#line 3752 "cs-parser.jay"
 {
 		yyVal = ComposedTypeSpecifier.CreateArrayDimension (1, GetLocation (yyVals[-1+yyTop]));
 		lbag.AddLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_520()
-#line 3766 "cs-parser.jay"
+#line 3757 "cs-parser.jay"
 {
 		yyVal = ComposedTypeSpecifier.CreateArrayDimension ((int)yyVals[-1+yyTop], GetLocation (yyVals[-2+yyTop]));
 		lbag.AddLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_525()
-#line 3796 "cs-parser.jay"
+#line 3787 "cs-parser.jay"
 {
 		var ai = new ArrayInitializer (0, GetLocation (yyVals[-1+yyTop]));
 		ai.VariableDeclaration = current_variable;
@@ -7062,7 +7057,7 @@ void case_525()
 	  }
 
 void case_526()
-#line 3803 "cs-parser.jay"
+#line 3794 "cs-parser.jay"
 {
 		var ai = new ArrayInitializer ((List<Expression>) yyVals[-2+yyTop], GetLocation (yyVals[-3+yyTop]));
 		ai.VariableDeclaration = current_variable;
@@ -7075,7 +7070,7 @@ void case_526()
 	  }
 
 void case_527()
-#line 3817 "cs-parser.jay"
+#line 3808 "cs-parser.jay"
 {
 		var list = new List<Expression> (4);
 		list.Add ((Expression) yyVals[0+yyTop]);
@@ -7083,7 +7078,7 @@ void case_527()
 	  }
 
 void case_528()
-#line 3823 "cs-parser.jay"
+#line 3814 "cs-parser.jay"
 {
 		var list = (List<Expression>) yyVals[-2+yyTop];
 		list.Add ((Expression) yyVals[0+yyTop]);
@@ -7092,7 +7087,7 @@ void case_528()
 	  }
 
 void case_530()
-#line 3837 "cs-parser.jay"
+#line 3828 "cs-parser.jay"
 {
 	  	lexer.TypeOfParsing = false;
 		yyVal = new TypeOf ((FullNamedExpression) yyVals[-1+yyTop], GetLocation (yyVals[-4+yyTop]));
@@ -7100,14 +7095,14 @@ void case_530()
 	  }
 
 void case_533()
-#line 3848 "cs-parser.jay"
+#line 3839 "cs-parser.jay"
 {
 	 	Error_TypeExpected (lexer.Location);
 	 	yyVal = null;
 	 }
 
 void case_534()
-#line 3856 "cs-parser.jay"
+#line 3847 "cs-parser.jay"
 {  
 		var lt = (LocatedToken) yyVals[-1+yyTop];
 
@@ -7117,7 +7112,7 @@ void case_534()
 	  }
 
 void case_535()
-#line 3864 "cs-parser.jay"
+#line 3855 "cs-parser.jay"
 {
 		var lt1 = (LocatedToken) yyVals[-2+yyTop];
 		var lt2 = (LocatedToken) yyVals[-1+yyTop];
@@ -7129,7 +7124,7 @@ void case_535()
 	  }
 
 void case_536()
-#line 3874 "cs-parser.jay"
+#line 3865 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[0+yyTop];
 		
@@ -7138,7 +7133,7 @@ void case_536()
 	  }
 
 void case_537()
-#line 3881 "cs-parser.jay"
+#line 3872 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];
 		
@@ -7149,7 +7144,7 @@ void case_537()
 	  }
 
 void case_538()
-#line 3890 "cs-parser.jay"
+#line 3881 "cs-parser.jay"
 {
 		var tne = (ATypeNameExpression) yyVals[-3+yyTop];
 		if (tne.HasTypeArguments)
@@ -7162,7 +7157,7 @@ void case_538()
 	  }
 
 void case_539()
-#line 3904 "cs-parser.jay"
+#line 3895 "cs-parser.jay"
 {
 		if (lang_version < LanguageVersion.ISO_2)
 			FeatureIsNotAvailable (GetLocation (yyVals[0+yyTop]), "generics");
@@ -7171,7 +7166,7 @@ void case_539()
 	  }
 
 void case_540()
-#line 3914 "cs-parser.jay"
+#line 3905 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];
 		if (lang_version == LanguageVersion.ISO_1)
@@ -7181,14 +7176,14 @@ void case_540()
 	  }
 
 void case_541()
-#line 3925 "cs-parser.jay"
+#line 3916 "cs-parser.jay"
 { 
 		yyVal = new SizeOf ((Expression) yyVals[-1+yyTop], GetLocation (yyVals[-3+yyTop]));
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-2+yyTop]), GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_542()
-#line 3930 "cs-parser.jay"
+#line 3921 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7197,14 +7192,14 @@ void case_542()
 	  }
 
 void case_543()
-#line 3940 "cs-parser.jay"
+#line 3931 "cs-parser.jay"
 {
 		yyVal = new CheckedExpr ((Expression) yyVals[-1+yyTop], GetLocation (yyVals[-3+yyTop]));
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-2+yyTop]), GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_544()
-#line 3945 "cs-parser.jay"
+#line 3936 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7212,14 +7207,14 @@ void case_544()
 	  }
 
 void case_545()
-#line 3954 "cs-parser.jay"
+#line 3945 "cs-parser.jay"
 {
 		yyVal = new UnCheckedExpr ((Expression) yyVals[-1+yyTop], GetLocation (yyVals[-3+yyTop]));
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-2+yyTop]), GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_546()
-#line 3959 "cs-parser.jay"
+#line 3950 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7227,14 +7222,14 @@ void case_546()
 	  }
 
 void case_547()
-#line 3968 "cs-parser.jay"
+#line 3959 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];
 		yyVal = new MemberAccess (new Indirection ((Expression) yyVals[-3+yyTop], GetLocation (yyVals[-2+yyTop])), lt.Value, (TypeArguments) yyVals[0+yyTop], lt.Location);
 	  }
 
 void case_549()
-#line 3980 "cs-parser.jay"
+#line 3971 "cs-parser.jay"
 {
 		yyVal = end_anonymous ((ParametersBlock) yyVals[0+yyTop]);
 		if ((ParametersCompiled) yyVals[-2+yyTop] != ParametersCompiled.Undefined) {
@@ -7245,7 +7240,7 @@ void case_549()
 	  }
 
 void case_551()
-#line 3993 "cs-parser.jay"
+#line 3984 "cs-parser.jay"
 {
 		yyVal = end_anonymous ((ParametersBlock) yyVals[0+yyTop]);
 		
@@ -7257,7 +7252,7 @@ void case_551()
 	  }
 
 void case_555()
-#line 4018 "cs-parser.jay"
+#line 4009 "cs-parser.jay"
 {
 		valid_param_mod = 0;
 	  	yyVal = yyVals[-1+yyTop];
@@ -7266,7 +7261,7 @@ void case_555()
 	  }
 
 void case_556()
-#line 4028 "cs-parser.jay"
+#line 4019 "cs-parser.jay"
 {
 		if (lang_version < LanguageVersion.ISO_2)
 			FeatureIsNotAvailable (GetLocation (yyVals[-3+yyTop]), "default value expression");
@@ -7276,14 +7271,14 @@ void case_556()
 	  }
 
 void case_560()
-#line 4048 "cs-parser.jay"
+#line 4039 "cs-parser.jay"
 {
 		yyVal = new Cast ((FullNamedExpression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop], GetLocation (yyVals[-3+yyTop]));
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_561()
-#line 4053 "cs-parser.jay"
+#line 4044 "cs-parser.jay"
 {
 		if (!async_block) {
 			 if (current_anonymous_method is LambdaExpression) {
@@ -7292,6 +7287,9 @@ void case_561()
 			} else if (current_anonymous_method is AnonymousMethodExpression) {
 				report.Error (4035, GetLocation (yyVals[-1+yyTop]),
 					"The `await' operator can only be used when its containing anonymous method is marked with the `async' modifier");
+			} else if (interactive_async != null) {
+				current_block.Explicit.RegisterAsyncAwait ();
+				interactive_async = true;
 			} else {
 				report.Error (4033, GetLocation (yyVals[-1+yyTop]),
 					"The `await' operator can only be used when its containing method is marked with the `async' modifier");
@@ -7304,7 +7302,7 @@ void case_561()
 	  }
 
 void case_562()
-#line 4072 "cs-parser.jay"
+#line 4066 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7312,7 +7310,7 @@ void case_562()
 	  }
 
 void case_563()
-#line 4078 "cs-parser.jay"
+#line 4072 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7320,7 +7318,7 @@ void case_563()
 	  }
 
 void case_564()
-#line 4084 "cs-parser.jay"
+#line 4078 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7329,7 +7327,7 @@ void case_564()
 	  }
 
 void case_565()
-#line 4091 "cs-parser.jay"
+#line 4085 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7337,7 +7335,7 @@ void case_565()
 	  }
 
 void case_573()
-#line 4129 "cs-parser.jay"
+#line 4123 "cs-parser.jay"
 { 
 		Error_SyntaxError (yyToken);
 
@@ -7345,7 +7343,7 @@ void case_573()
 	  }
 
 void case_574()
-#line 4135 "cs-parser.jay"
+#line 4129 "cs-parser.jay"
 { 
 		Error_SyntaxError (yyToken);
 
@@ -7353,7 +7351,7 @@ void case_574()
 	  }
 
 void case_575()
-#line 4141 "cs-parser.jay"
+#line 4135 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7361,7 +7359,7 @@ void case_575()
 	  }
 
 void case_576()
-#line 4147 "cs-parser.jay"
+#line 4141 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7369,7 +7367,7 @@ void case_576()
 	  }
 
 void case_577()
-#line 4153 "cs-parser.jay"
+#line 4147 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7377,7 +7375,7 @@ void case_577()
 	  }
 
 void case_578()
-#line 4159 "cs-parser.jay"
+#line 4153 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7385,28 +7383,28 @@ void case_578()
 	  }
 
 void case_580()
-#line 4169 "cs-parser.jay"
+#line 4163 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.Multiply, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_581()
-#line 4174 "cs-parser.jay"
+#line 4168 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.Division, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_582()
-#line 4179 "cs-parser.jay"
+#line 4173 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.Modulus, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_583()
-#line 4184 "cs-parser.jay"
+#line 4178 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7415,7 +7413,7 @@ void case_583()
 	  }
 
 void case_584()
-#line 4191 "cs-parser.jay"
+#line 4185 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7424,7 +7422,7 @@ void case_584()
 	  }
 
 void case_585()
-#line 4198 "cs-parser.jay"
+#line 4192 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7433,21 +7431,21 @@ void case_585()
 	  }
 
 void case_587()
-#line 4209 "cs-parser.jay"
+#line 4203 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.Addition, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_588()
-#line 4214 "cs-parser.jay"
+#line 4208 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.Subtraction, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_591()
-#line 4227 "cs-parser.jay"
+#line 4221 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7456,7 +7454,7 @@ void case_591()
 	  }
 
 void case_592()
-#line 4234 "cs-parser.jay"
+#line 4228 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7465,7 +7463,7 @@ void case_592()
 	  }
 
 void case_593()
-#line 4241 "cs-parser.jay"
+#line 4235 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7473,7 +7471,7 @@ void case_593()
 	  }
 
 void case_594()
-#line 4247 "cs-parser.jay"
+#line 4241 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7481,21 +7479,21 @@ void case_594()
 	  }
 
 void case_596()
-#line 4257 "cs-parser.jay"
+#line 4251 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.LeftShift, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_597()
-#line 4262 "cs-parser.jay"
+#line 4256 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.RightShift, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_598()
-#line 4267 "cs-parser.jay"
+#line 4261 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7504,7 +7502,7 @@ void case_598()
 	  }
 
 void case_599()
-#line 4274 "cs-parser.jay"
+#line 4268 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7513,35 +7511,35 @@ void case_599()
 	  }
 
 void case_601()
-#line 4285 "cs-parser.jay"
+#line 4279 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.LessThan, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_602()
-#line 4290 "cs-parser.jay"
+#line 4284 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.GreaterThan, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_603()
-#line 4295 "cs-parser.jay"
+#line 4289 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.LessThanOrEqual, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_604()
-#line 4300 "cs-parser.jay"
+#line 4294 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.GreaterThanOrEqual, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_605()
-#line 4305 "cs-parser.jay"
+#line 4299 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7550,7 +7548,7 @@ void case_605()
 	  }
 
 void case_606()
-#line 4312 "cs-parser.jay"
+#line 4306 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7559,7 +7557,7 @@ void case_606()
 	  }
 
 void case_607()
-#line 4319 "cs-parser.jay"
+#line 4313 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7568,7 +7566,7 @@ void case_607()
 	  }
 
 void case_608()
-#line 4326 "cs-parser.jay"
+#line 4320 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7577,21 +7575,21 @@ void case_608()
 	  }
 
 void case_610()
-#line 4337 "cs-parser.jay"
+#line 4331 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.Equality, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_611()
-#line 4342 "cs-parser.jay"
+#line 4336 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.Inequality, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_612()
-#line 4347 "cs-parser.jay"
+#line 4341 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7600,7 +7598,7 @@ void case_612()
 	  }
 
 void case_613()
-#line 4354 "cs-parser.jay"
+#line 4348 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7609,14 +7607,14 @@ void case_613()
 	  }
 
 void case_615()
-#line 4365 "cs-parser.jay"
+#line 4359 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.BitwiseAnd, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_616()
-#line 4370 "cs-parser.jay"
+#line 4364 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7625,14 +7623,14 @@ void case_616()
 	  }
 
 void case_618()
-#line 4381 "cs-parser.jay"
+#line 4375 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.ExclusiveOr, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_619()
-#line 4386 "cs-parser.jay"
+#line 4380 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7641,14 +7639,14 @@ void case_619()
 	  }
 
 void case_621()
-#line 4397 "cs-parser.jay"
+#line 4391 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.BitwiseOr, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_622()
-#line 4402 "cs-parser.jay"
+#line 4396 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7657,14 +7655,14 @@ void case_622()
 	  }
 
 void case_624()
-#line 4413 "cs-parser.jay"
+#line 4407 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.LogicalAnd, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_625()
-#line 4418 "cs-parser.jay"
+#line 4412 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7673,14 +7671,14 @@ void case_625()
 	  }
 
 void case_627()
-#line 4429 "cs-parser.jay"
+#line 4423 "cs-parser.jay"
 {
 		yyVal = new Binary (Binary.Operator.LogicalOr, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_628()
-#line 4434 "cs-parser.jay"
+#line 4428 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7689,7 +7687,7 @@ void case_628()
 	  }
 
 void case_630()
-#line 4445 "cs-parser.jay"
+#line 4439 "cs-parser.jay"
 {
 		if (lang_version < LanguageVersion.ISO_2)
 			FeatureIsNotAvailable (GetLocation (yyVals[-1+yyTop]), "null coalescing operator");
@@ -7699,14 +7697,14 @@ void case_630()
 	  }
 
 void case_632()
-#line 4457 "cs-parser.jay"
+#line 4451 "cs-parser.jay"
 {
 		yyVal = new Conditional (new BooleanExpression ((Expression) yyVals[-4+yyTop]), (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop], GetLocation (yyVals[-3+yyTop]));
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_633()
-#line 4462 "cs-parser.jay"
+#line 4456 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7714,7 +7712,7 @@ void case_633()
 	  }
 
 void case_634()
-#line 4468 "cs-parser.jay"
+#line 4462 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -7723,7 +7721,7 @@ void case_634()
 	  }
 
 void case_635()
-#line 4475 "cs-parser.jay"
+#line 4469 "cs-parser.jay"
 {
 		Error_SyntaxError (Token.CLOSE_BRACE);
 
@@ -7733,84 +7731,84 @@ void case_635()
 	  }
 
 void case_636()
-#line 4486 "cs-parser.jay"
+#line 4480 "cs-parser.jay"
 {
 		yyVal = new SimpleAssign ((Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_637()
-#line 4491 "cs-parser.jay"
+#line 4485 "cs-parser.jay"
 {
 		yyVal = new CompoundAssign (Binary.Operator.Multiply, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_638()
-#line 4496 "cs-parser.jay"
+#line 4490 "cs-parser.jay"
 {
 		yyVal = new CompoundAssign (Binary.Operator.Division, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_639()
-#line 4501 "cs-parser.jay"
+#line 4495 "cs-parser.jay"
 {
 		yyVal = new CompoundAssign (Binary.Operator.Modulus, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_640()
-#line 4506 "cs-parser.jay"
+#line 4500 "cs-parser.jay"
 {
 		yyVal = new CompoundAssign (Binary.Operator.Addition, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_641()
-#line 4511 "cs-parser.jay"
+#line 4505 "cs-parser.jay"
 {
 		yyVal = new CompoundAssign (Binary.Operator.Subtraction, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_642()
-#line 4516 "cs-parser.jay"
+#line 4510 "cs-parser.jay"
 {
 		yyVal = new CompoundAssign (Binary.Operator.LeftShift, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_643()
-#line 4521 "cs-parser.jay"
+#line 4515 "cs-parser.jay"
 {
 		yyVal = new CompoundAssign (Binary.Operator.RightShift, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_644()
-#line 4526 "cs-parser.jay"
+#line 4520 "cs-parser.jay"
 {
 		yyVal = new CompoundAssign (Binary.Operator.BitwiseAnd, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_645()
-#line 4531 "cs-parser.jay"
+#line 4525 "cs-parser.jay"
 {
 		yyVal = new CompoundAssign (Binary.Operator.BitwiseOr, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_646()
-#line 4536 "cs-parser.jay"
+#line 4530 "cs-parser.jay"
 {
 		yyVal = new CompoundAssign (Binary.Operator.ExclusiveOr, (Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_647()
-#line 4544 "cs-parser.jay"
+#line 4538 "cs-parser.jay"
 {
 		var pars = new List<Parameter> (4);
 		pars.Add ((Parameter) yyVals[0+yyTop]);
@@ -7819,7 +7817,7 @@ void case_647()
 	  }
 
 void case_648()
-#line 4551 "cs-parser.jay"
+#line 4545 "cs-parser.jay"
 {
 		var pars = (List<Parameter>) yyVals[-2+yyTop];
 		Parameter p = (Parameter)yyVals[0+yyTop];
@@ -7834,7 +7832,7 @@ void case_648()
 	  }
 
 void case_649()
-#line 4567 "cs-parser.jay"
+#line 4561 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[0+yyTop];
 
@@ -7842,7 +7840,7 @@ void case_649()
 	  }
 
 void case_650()
-#line 4573 "cs-parser.jay"
+#line 4567 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[0+yyTop];
 
@@ -7850,21 +7848,21 @@ void case_650()
 	  }
 
 void case_651()
-#line 4579 "cs-parser.jay"
+#line 4573 "cs-parser.jay"
 {
 	  	var lt = (LocatedToken) yyVals[0+yyTop];
 		yyVal = new ImplicitLambdaParameter (lt.Value, lt.Location);
 	  }
 
 void case_652()
-#line 4584 "cs-parser.jay"
+#line 4578 "cs-parser.jay"
 {
 	  	var lt = (LocatedToken) Error_AwaitAsIdentifier (yyVals[0+yyTop]);
 		yyVal = new ImplicitLambdaParameter (lt.Value, lt.Location);
 	  }
 
 void case_654()
-#line 4592 "cs-parser.jay"
+#line 4586 "cs-parser.jay"
 { 
 		var pars_list = (List<Parameter>) yyVals[0+yyTop];
 		yyVal = new ParametersCompiled (pars_list.ToArray ());
@@ -7872,7 +7870,7 @@ void case_654()
 	  }
 
 void case_656()
-#line 4604 "cs-parser.jay"
+#line 4598 "cs-parser.jay"
 {
 		Block b = end_block (Location.Null);
 		b.IsCompilerGenerated = true;
@@ -7881,7 +7879,7 @@ void case_656()
 	  }
 
 void case_658()
-#line 4612 "cs-parser.jay"
+#line 4606 "cs-parser.jay"
 {
 	  	/* Handles only cases like foo = x.FirstOrDefault (l => );*/
 	  	/* where we must restore current_variable*/
@@ -7893,14 +7891,14 @@ void case_658()
 	  }
 
 void case_660()
-#line 4626 "cs-parser.jay"
+#line 4620 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = null;
 	  }
 
 void case_661()
-#line 4634 "cs-parser.jay"
+#line 4628 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];	
 		Parameter p = new ImplicitLambdaParameter (lt.Value, lt.Location);
@@ -7908,14 +7906,14 @@ void case_661()
 	  }
 
 void case_662()
-#line 4640 "cs-parser.jay"
+#line 4634 "cs-parser.jay"
 {
 		yyVal = end_anonymous ((ParametersBlock) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-2+yyTop]));
 	  }
 
 void case_663()
-#line 4645 "cs-parser.jay"
+#line 4639 "cs-parser.jay"
 {
 		var lt = (LocatedToken) Error_AwaitAsIdentifier (yyVals[-1+yyTop]);
 		Parameter p = new ImplicitLambdaParameter (lt.Value, lt.Location);
@@ -7923,14 +7921,14 @@ void case_663()
 	  }
 
 void case_664()
-#line 4651 "cs-parser.jay"
+#line 4645 "cs-parser.jay"
 {
 		yyVal = end_anonymous ((ParametersBlock) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-2+yyTop]));
 	  }
 
 void case_665()
-#line 4656 "cs-parser.jay"
+#line 4650 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];
 		Parameter p = new ImplicitLambdaParameter (lt.Value, lt.Location);
@@ -7938,63 +7936,63 @@ void case_665()
 	  }
 
 void case_666()
-#line 4662 "cs-parser.jay"
+#line 4656 "cs-parser.jay"
 {
 		yyVal = end_anonymous ((ParametersBlock) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-4+yyTop]), GetLocation (yyVals[-2+yyTop]));
 	  }
 
 void case_668()
-#line 4671 "cs-parser.jay"
+#line 4665 "cs-parser.jay"
 {
 	  	valid_param_mod = 0;
 		start_anonymous (true, (ParametersCompiled) yyVals[-2+yyTop], false, GetLocation (yyVals[-4+yyTop]));
 	  }
 
 void case_669()
-#line 4676 "cs-parser.jay"
+#line 4670 "cs-parser.jay"
 {
 		yyVal = end_anonymous ((ParametersBlock) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-6+yyTop]), GetLocation (yyVals[-3+yyTop]), GetLocation (yyVals[-2+yyTop]));
 	  }
 
 void case_671()
-#line 4685 "cs-parser.jay"
+#line 4679 "cs-parser.jay"
 {
 	  	valid_param_mod = 0;
 		start_anonymous (true, (ParametersCompiled) yyVals[-2+yyTop], true, GetLocation (yyVals[-5+yyTop]));
 	  }
 
 void case_672()
-#line 4690 "cs-parser.jay"
+#line 4684 "cs-parser.jay"
 {
 		yyVal = end_anonymous ((ParametersBlock) yyVals[0+yyTop]);
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-7+yyTop]), GetLocation (yyVals[-6+yyTop]), GetLocation (yyVals[-3+yyTop]), GetLocation (yyVals[-2+yyTop]));
 	  }
 
 void case_679()
-#line 4713 "cs-parser.jay"
+#line 4707 "cs-parser.jay"
 {
 		yyVal = new RefValueExpr ((Expression) yyVals[-3+yyTop], (FullNamedExpression) yyVals[-1+yyTop], GetLocation (yyVals[-5+yyTop]));
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-4+yyTop]), GetLocation (yyVals[-2+yyTop]), GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_680()
-#line 4718 "cs-parser.jay"
+#line 4712 "cs-parser.jay"
 {
 		yyVal = new RefTypeExpr ((Expression) yyVals[-1+yyTop], GetLocation (yyVals[-3+yyTop]));
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-2+yyTop]), GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_681()
-#line 4723 "cs-parser.jay"
+#line 4717 "cs-parser.jay"
 {
 		yyVal = new MakeRefExpr ((Expression) yyVals[-1+yyTop], GetLocation (yyVals[-3+yyTop]));
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-2+yyTop]), GetLocation (yyVals[0+yyTop]));	  
 	  }
 
 void case_685()
-#line 4751 "cs-parser.jay"
+#line 4745 "cs-parser.jay"
 {
 		lexer.ConstraintsParsing = true;
 
@@ -8008,7 +8006,7 @@ void case_685()
 	  }
 
 void case_686()
-#line 4764 "cs-parser.jay"
+#line 4758 "cs-parser.jay"
 {
 		lexer.ConstraintsParsing = false;
 
@@ -8024,7 +8022,7 @@ void case_686()
 	  }
 
 void case_687()
-#line 4778 "cs-parser.jay"
+#line 4772 "cs-parser.jay"
 {
 		--lexer.parsing_declaration;
 		if (doc_support)
@@ -8032,7 +8030,7 @@ void case_687()
 	  }
 
 void case_688()
-#line 4784 "cs-parser.jay"
+#line 4778 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] == null) {
 			lbag.AppendToMember (current_container, GetLocation (yyVals[-4+yyTop]), GetLocation (yyVals[-2+yyTop]));
@@ -8043,7 +8041,7 @@ void case_688()
 	  }
 
 void case_691()
-#line 4803 "cs-parser.jay"
+#line 4797 "cs-parser.jay"
 {
 	    mod_locations = null;
 		yyVal = ModifierNone;
@@ -8051,7 +8049,7 @@ void case_691()
 	  }
 
 void case_694()
-#line 4817 "cs-parser.jay"
+#line 4811 "cs-parser.jay"
 { 
 		var m1 = (Modifiers) yyVals[-1+yyTop];
 		var m2 = (Modifiers) yyVals[0+yyTop];
@@ -8069,7 +8067,7 @@ void case_694()
 	  }
 
 void case_695()
-#line 4836 "cs-parser.jay"
+#line 4830 "cs-parser.jay"
 {
 		yyVal = Modifiers.NEW;
 		StoreModifierLocation (yyVal, GetLocation (yyVals[0+yyTop]));
@@ -8079,91 +8077,91 @@ void case_695()
 	  }
 
 void case_696()
-#line 4844 "cs-parser.jay"
+#line 4838 "cs-parser.jay"
 {
 		yyVal = Modifiers.PUBLIC;
 		StoreModifierLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_697()
-#line 4849 "cs-parser.jay"
+#line 4843 "cs-parser.jay"
 {
 		yyVal = Modifiers.PROTECTED;
 		StoreModifierLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_698()
-#line 4854 "cs-parser.jay"
+#line 4848 "cs-parser.jay"
 {
 		yyVal = Modifiers.INTERNAL;
 		StoreModifierLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_699()
-#line 4859 "cs-parser.jay"
+#line 4853 "cs-parser.jay"
 {
 		yyVal = Modifiers.PRIVATE;
 		StoreModifierLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_700()
-#line 4864 "cs-parser.jay"
+#line 4858 "cs-parser.jay"
 {
 		yyVal = Modifiers.ABSTRACT;
 		StoreModifierLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_701()
-#line 4869 "cs-parser.jay"
+#line 4863 "cs-parser.jay"
 {
 		yyVal = Modifiers.SEALED;
 		StoreModifierLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_702()
-#line 4874 "cs-parser.jay"
+#line 4868 "cs-parser.jay"
 {
 		yyVal = Modifiers.STATIC;
 		StoreModifierLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_703()
-#line 4879 "cs-parser.jay"
+#line 4873 "cs-parser.jay"
 {
 		yyVal = Modifiers.READONLY;
 		StoreModifierLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_704()
-#line 4884 "cs-parser.jay"
+#line 4878 "cs-parser.jay"
 {
 		yyVal = Modifiers.VIRTUAL;
 		StoreModifierLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_705()
-#line 4889 "cs-parser.jay"
+#line 4883 "cs-parser.jay"
 {
 		yyVal = Modifiers.OVERRIDE;
 		StoreModifierLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_706()
-#line 4894 "cs-parser.jay"
+#line 4888 "cs-parser.jay"
 {
 		yyVal = Modifiers.EXTERN;
 		StoreModifierLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_707()
-#line 4899 "cs-parser.jay"
+#line 4893 "cs-parser.jay"
 {
 		yyVal = Modifiers.VOLATILE;
 		StoreModifierLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_708()
-#line 4904 "cs-parser.jay"
+#line 4898 "cs-parser.jay"
 {
 		yyVal = Modifiers.UNSAFE;
 		StoreModifierLocation (yyVal, GetLocation (yyVals[0+yyTop]));
@@ -8172,21 +8170,21 @@ void case_708()
 	  }
 
 void case_709()
-#line 4911 "cs-parser.jay"
+#line 4905 "cs-parser.jay"
 {
 		yyVal = Modifiers.ASYNC;
 		StoreModifierLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_711()
-#line 4920 "cs-parser.jay"
+#line 4914 "cs-parser.jay"
 {
 		current_type.SetBaseTypes ((List<FullNamedExpression>) yyVals[0+yyTop]);
 		lbag.AppendToMember (current_type, GetLocation (yyVals[-1+yyTop]));
 	 }
 
 void case_712()
-#line 4925 "cs-parser.jay"
+#line 4919 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -8194,7 +8192,7 @@ void case_712()
 	  }
 
 void case_715()
-#line 4942 "cs-parser.jay"
+#line 4936 "cs-parser.jay"
 {
 		var constraints = new List<Constraints> (1);
 		constraints.Add ((Constraints) yyVals[0+yyTop]);
@@ -8202,7 +8200,7 @@ void case_715()
 	  }
 
 void case_716()
-#line 4948 "cs-parser.jay"
+#line 4942 "cs-parser.jay"
 {
 		var constraints = (List<Constraints>) yyVals[-1+yyTop];
 		Constraints new_constraint = (Constraints)yyVals[0+yyTop];
@@ -8220,7 +8218,7 @@ void case_716()
 	  }
 
 void case_717()
-#line 4967 "cs-parser.jay"
+#line 4961 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-2+yyTop];
 		yyVal = new Constraints (new SimpleMemberName (lt.Value, lt.Location), (List<FullNamedExpression>) yyVals[0+yyTop], GetLocation (yyVals[-3+yyTop]));
@@ -8228,7 +8226,7 @@ void case_717()
 	  }
 
 void case_718()
-#line 4973 "cs-parser.jay"
+#line 4967 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 	  
@@ -8237,7 +8235,7 @@ void case_718()
 	  }
 
 void case_719()
-#line 4983 "cs-parser.jay"
+#line 4977 "cs-parser.jay"
 {
 		var constraints = new List<FullNamedExpression> (1);
 		constraints.Add ((FullNamedExpression) yyVals[0+yyTop]);
@@ -8245,7 +8243,7 @@ void case_719()
 	  }
 
 void case_720()
-#line 4989 "cs-parser.jay"
+#line 4983 "cs-parser.jay"
 {
 		var constraints = (List<FullNamedExpression>) yyVals[-2+yyTop];
 		var prev = constraints [constraints.Count - 1] as SpecialContraintExpr;
@@ -8271,7 +8269,7 @@ void case_720()
 	  }
 
 void case_721()
-#line 5016 "cs-parser.jay"
+#line 5010 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] is ComposedCast)
 			report.Error (706, GetLocation (yyVals[0+yyTop]), "Invalid constraint type `{0}'", ((ComposedCast)yyVals[0+yyTop]).GetSignatureForError ());
@@ -8280,14 +8278,14 @@ void case_721()
 	  }
 
 void case_722()
-#line 5023 "cs-parser.jay"
+#line 5017 "cs-parser.jay"
 {
 		yyVal = new SpecialContraintExpr (SpecialConstraint.Constructor, GetLocation (yyVals[-2+yyTop]));
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-1+yyTop]), GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_726()
-#line 5043 "cs-parser.jay"
+#line 5037 "cs-parser.jay"
 {
 		if (lang_version <= LanguageVersion.V_3)
 			FeatureIsNotAvailable (lexer.Location, "generic type variance");
@@ -8296,56 +8294,56 @@ void case_726()
 	  }
 
 void case_727()
-#line 5053 "cs-parser.jay"
+#line 5047 "cs-parser.jay"
 {
 		yyVal = Variance.Covariant;
 		savedLocation = GetLocation (yyVals[0+yyTop]);
 	  }
 
 void case_728()
-#line 5058 "cs-parser.jay"
+#line 5052 "cs-parser.jay"
 {
 		yyVal = Variance.Contravariant;
 		savedLocation = GetLocation (yyVals[0+yyTop]);
 	  }
 
 void case_729()
-#line 5079 "cs-parser.jay"
+#line 5073 "cs-parser.jay"
 {
 		++lexer.parsing_block;
 		start_block (GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_731()
-#line 5091 "cs-parser.jay"
+#line 5085 "cs-parser.jay"
 {
 	 	--lexer.parsing_block;
 		yyVal = end_block (GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_732()
-#line 5096 "cs-parser.jay"
+#line 5090 "cs-parser.jay"
 {
 	 	--lexer.parsing_block;
 		yyVal = end_block (lexer.Location);
 	  }
 
 void case_733()
-#line 5105 "cs-parser.jay"
+#line 5099 "cs-parser.jay"
 {
 		++lexer.parsing_block;
 		current_block.StartLocation = GetLocation (yyVals[0+yyTop]);
 	  }
 
 void case_734()
-#line 5110 "cs-parser.jay"
+#line 5104 "cs-parser.jay"
 {
 		--lexer.parsing_block;
 		yyVal = end_block (GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_735()
-#line 5114 "cs-parser.jay"
+#line 5108 "cs-parser.jay"
 {
 		report.Error (1525, GetLocation (yyVals[0+yyTop]), "Unexpected symbol '}', expected '{'");
 		lexer.putback ('}');
@@ -8353,21 +8351,21 @@ void case_735()
 	  }
 
 void case_736()
-#line 5123 "cs-parser.jay"
+#line 5117 "cs-parser.jay"
 {
 		++lexer.parsing_block;
 		current_block.StartLocation = GetLocation (yyVals[0+yyTop]);
 	  }
 
 void case_737()
-#line 5128 "cs-parser.jay"
+#line 5122 "cs-parser.jay"
 {
 		--lexer.parsing_block;
 		yyVal = end_block (GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_745()
-#line 5156 "cs-parser.jay"
+#line 5150 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		var lt =(LocatedToken) yyVals[-1+yyTop];
@@ -8377,42 +8375,42 @@ void case_745()
 	}
 
 void case_746()
-#line 5165 "cs-parser.jay"
+#line 5159 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = null;
 	  }
 
 void case_779()
-#line 5229 "cs-parser.jay"
+#line 5223 "cs-parser.jay"
 {
 		  report.Error (1023, GetLocation (yyVals[0+yyTop]), "An embedded statement may not be a declaration or labeled statement");
 		  yyVal = null;
 	  }
 
 void case_780()
-#line 5234 "cs-parser.jay"
+#line 5228 "cs-parser.jay"
 {
 		  report.Error (1023, GetLocation (yyVals[0+yyTop]), "An embedded statement may not be a declaration or labeled statement");
 		  yyVal = null;
 	  }
 
 void case_781()
-#line 5239 "cs-parser.jay"
+#line 5233 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = new EmptyStatement (GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_782()
-#line 5247 "cs-parser.jay"
+#line 5241 "cs-parser.jay"
 {
 		/* Uses lexer.Location because semicolon location is not kept in quick mode*/
 		yyVal = new EmptyStatement (lexer.Location);
 	  }
 
 void case_783()
-#line 5255 "cs-parser.jay"
+#line 5249 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];
 		LabeledStatement labeled = new LabeledStatement (lt.Value, current_block, lt.Location);
@@ -8422,7 +8420,7 @@ void case_783()
 	  }
 
 void case_786()
-#line 5268 "cs-parser.jay"
+#line 5262 "cs-parser.jay"
 {
 		if (yyVals[-1+yyTop] is VarExpr)
 			yyVals[-1+yyTop] = new SimpleName ("var", ((VarExpr) yyVals[-1+yyTop]).Location);
@@ -8431,7 +8429,7 @@ void case_786()
 	  }
 
 void case_787()
-#line 5284 "cs-parser.jay"
+#line 5278 "cs-parser.jay"
 { 
 		/* Ok, the above "primary_expression" is there to get rid of*/
 		/* both reduce/reduce and shift/reduces in the grammar, it should*/
@@ -8463,7 +8461,7 @@ void case_787()
 	  }
 
 void case_788()
-#line 5314 "cs-parser.jay"
+#line 5308 "cs-parser.jay"
 {
 		ATypeNameExpression expr = yyVals[-1+yyTop] as ATypeNameExpression;
 
@@ -8476,7 +8474,7 @@ void case_788()
 	  }
 
 void case_789()
-#line 5325 "cs-parser.jay"
+#line 5319 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] == null)
 			yyVal = yyVals[-1+yyTop];
@@ -8485,21 +8483,21 @@ void case_789()
 	  }
 
 void case_792()
-#line 5340 "cs-parser.jay"
+#line 5334 "cs-parser.jay"
 {
 		Expression.Error_VoidInvalidInTheContext (GetLocation (yyVals[0+yyTop]), report);
 		yyVal = new TypeExpression (compiler.BuiltinTypes.Void, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_794()
-#line 5349 "cs-parser.jay"
+#line 5343 "cs-parser.jay"
 {
 	  	((ComposedTypeSpecifier) yyVals[-1+yyTop]).Next = (ComposedTypeSpecifier) yyVals[0+yyTop];
 	  	yyVal = yyVals[-1+yyTop];
 	  }
 
 void case_798()
-#line 5372 "cs-parser.jay"
+#line 5366 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[0+yyTop];
 		var li = new LocalVariable (current_block, lt.Value, lt.Location);
@@ -8508,7 +8506,7 @@ void case_798()
 	  }
 
 void case_799()
-#line 5379 "cs-parser.jay"
+#line 5373 "cs-parser.jay"
 {
 		yyVal = current_variable;
 		current_variable = null;
@@ -8519,7 +8517,7 @@ void case_799()
 	  }
 
 void case_800()
-#line 5388 "cs-parser.jay"
+#line 5382 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[0+yyTop];
 		var li = new LocalVariable (current_block, lt.Value, LocalVariable.Flags.Constant, lt.Location);
@@ -8528,7 +8526,7 @@ void case_800()
 	  }
 
 void case_801()
-#line 5395 "cs-parser.jay"
+#line 5389 "cs-parser.jay"
 {
 		if (current_variable.Initializer != null) {
 			lbag.AddLocation (current_variable, GetLocation (yyVals[-6+yyTop]), savedLocation, GetLocation (yyVals[0+yyTop]));
@@ -8540,7 +8538,7 @@ void case_801()
 	  }
 
 void case_803()
-#line 5408 "cs-parser.jay"
+#line 5402 "cs-parser.jay"
 {
 		/* Redundant, but wont regress*/
 		report.Error (1525, lexer.Location, "Unexpected symbol }");
@@ -8549,7 +8547,7 @@ void case_803()
 	  }
 
 void case_805()
-#line 5419 "cs-parser.jay"
+#line 5413 "cs-parser.jay"
 {
 		current_variable.Initializer = (Expression) yyVals[0+yyTop];
 		PushLocation (GetLocation (yyVals[-1+yyTop]));
@@ -8557,7 +8555,7 @@ void case_805()
 	  }
 
 void case_806()
-#line 5425 "cs-parser.jay"
+#line 5419 "cs-parser.jay"
 {
 	  	if (yyToken == Token.OPEN_BRACKET_EXPR) {
 			report.Error (650, lexer.Location,
@@ -8568,7 +8566,7 @@ void case_806()
 	  }
 
 void case_810()
-#line 5443 "cs-parser.jay"
+#line 5437 "cs-parser.jay"
 {
 		foreach (var d in current_variable.Declarators) {
 			if (d.Initializer == null)
@@ -8577,7 +8575,7 @@ void case_810()
 	  }
 
 void case_813()
-#line 5458 "cs-parser.jay"
+#line 5452 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[0+yyTop];	  
 		var li = new LocalVariable (current_variable.Variable, lt.Value, lt.Location);
@@ -8588,7 +8586,7 @@ void case_813()
 	  }
 
 void case_814()
-#line 5467 "cs-parser.jay"
+#line 5461 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-2+yyTop];	  
 		var li = new LocalVariable (current_variable.Variable, lt.Value, lt.Location);
@@ -8599,14 +8597,14 @@ void case_814()
 	  }
 
 void case_816()
-#line 5483 "cs-parser.jay"
+#line 5477 "cs-parser.jay"
 {
 		savedLocation = GetLocation (yyVals[-1+yyTop]);
 		current_variable.Initializer = (Expression) yyVals[0+yyTop];
 	  }
 
 void case_821()
-#line 5501 "cs-parser.jay"
+#line 5495 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-2+yyTop];	  
 		var li = new LocalVariable (current_block, lt.Value, LocalVariable.Flags.Constant, lt.Location);
@@ -8617,28 +8615,28 @@ void case_821()
 	  }
 
 void case_823()
-#line 5514 "cs-parser.jay"
+#line 5508 "cs-parser.jay"
 {
 		yyVal = new StackAlloc ((Expression) yyVals[-3+yyTop], (Expression) yyVals[-1+yyTop], GetLocation (yyVals[-4+yyTop]));
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-2+yyTop]), GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_824()
-#line 5519 "cs-parser.jay"
+#line 5513 "cs-parser.jay"
 {
 		report.Error (1575, GetLocation (yyVals[-1+yyTop]), "A stackalloc expression requires [] after type");
 		yyVal = new StackAlloc ((Expression) yyVals[0+yyTop], null, GetLocation (yyVals[-1+yyTop]));		
 	  }
 
 void case_825()
-#line 5527 "cs-parser.jay"
+#line 5521 "cs-parser.jay"
 {
 		yyVal = yyVals[-1+yyTop];
 		lbag.AddStatement (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_827()
-#line 5533 "cs-parser.jay"
+#line 5527 "cs-parser.jay"
 {
 		yyVal = yyVals[-1+yyTop];
 		report.Error (1002, GetLocation (yyVals[0+yyTop]), "; expected");
@@ -8646,7 +8644,7 @@ void case_827()
 	  }
 
 void case_830()
-#line 5551 "cs-parser.jay"
+#line 5545 "cs-parser.jay"
 {
 		ExpressionStatement s = yyVals[0+yyTop] as ExpressionStatement;
 		if (s == null) {
@@ -8658,24 +8656,21 @@ void case_830()
 	  }
 
 void case_831()
-#line 5564 "cs-parser.jay"
+#line 5558 "cs-parser.jay"
 {
 		Expression expr = (Expression) yyVals[0+yyTop];
-		ExpressionStatement s;
-
-	        s = new OptionalAssign (new SimpleName ("$retval", lexer.Location), expr, lexer.Location);
-		yyVal = new StatementExpression (s);
+		yyVal = new StatementExpression (new OptionalAssign (expr, lexer.Location));
 	  }
 
 void case_832()
-#line 5572 "cs-parser.jay"
+#line 5563 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = new EmptyStatement (GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_835()
-#line 5586 "cs-parser.jay"
+#line 5577 "cs-parser.jay"
 { 
 		if (yyVals[0+yyTop] is EmptyStatement)
 			Warning_EmptyStatement (GetLocation (yyVals[0+yyTop]));
@@ -8685,7 +8680,7 @@ void case_835()
 	  }
 
 void case_836()
-#line 5595 "cs-parser.jay"
+#line 5586 "cs-parser.jay"
 {
 		yyVal = new If ((BooleanExpression) yyVals[-4+yyTop], (Statement) yyVals[-2+yyTop], (Statement) yyVals[0+yyTop], GetLocation (yyVals[-6+yyTop]));
 		lbag.AddStatement (yyVal, GetLocation (yyVals[-5+yyTop]), GetLocation (yyVals[-3+yyTop]), GetLocation (yyVals[-1+yyTop]));
@@ -8697,7 +8692,7 @@ void case_836()
 	  }
 
 void case_837()
-#line 5605 "cs-parser.jay"
+#line 5596 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		
@@ -8706,7 +8701,7 @@ void case_837()
 	  }
 
 void case_839()
-#line 5619 "cs-parser.jay"
+#line 5610 "cs-parser.jay"
 {
 		yyVal = new Switch ((Expression) yyVals[-5+yyTop], (ExplicitBlock) current_block.Explicit, GetLocation (yyVals[-7+yyTop]));	
 		end_block (GetLocation (yyVals[0+yyTop]));
@@ -8714,7 +8709,7 @@ void case_839()
 	  }
 
 void case_840()
-#line 5625 "cs-parser.jay"
+#line 5616 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 	  
@@ -8723,7 +8718,7 @@ void case_840()
 	  }
 
 void case_847()
-#line 5656 "cs-parser.jay"
+#line 5647 "cs-parser.jay"
 {
 	  	var label = (SwitchLabel) yyVals[0+yyTop];
 	  	label.SectionStart = true;
@@ -8731,21 +8726,21 @@ void case_847()
 	  }
 
 void case_849()
-#line 5669 "cs-parser.jay"
+#line 5660 "cs-parser.jay"
 {
 	 	yyVal = new SwitchLabel ((Expression) yyVals[-1+yyTop], GetLocation (yyVals[-2+yyTop]));
 	 	lbag.AddLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	 }
 
 void case_850()
-#line 5674 "cs-parser.jay"
+#line 5665 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = new SwitchLabel ((Expression) yyVals[-1+yyTop], GetLocation (yyVals[-2+yyTop]));
 	  }
 
 void case_856()
-#line 5693 "cs-parser.jay"
+#line 5684 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] is EmptyStatement && lexer.peek_token () == Token.OPEN_BRACE)
 			Warning_EmptyStatement (GetLocation (yyVals[0+yyTop]));
@@ -8755,7 +8750,7 @@ void case_856()
 	  }
 
 void case_857()
-#line 5701 "cs-parser.jay"
+#line 5692 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		
@@ -8764,21 +8759,21 @@ void case_857()
 	  }
 
 void case_858()
-#line 5711 "cs-parser.jay"
+#line 5702 "cs-parser.jay"
 {
 		yyVal = new Do ((Statement) yyVals[-5+yyTop], (BooleanExpression) yyVals[-2+yyTop], GetLocation (yyVals[-6+yyTop]), GetLocation (yyVals[-4+yyTop]));
 		lbag.AddStatement (yyVal, GetLocation (yyVals[-4+yyTop]), GetLocation (yyVals[-3+yyTop]), GetLocation (yyVals[-1+yyTop]), GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_859()
-#line 5716 "cs-parser.jay"
+#line 5707 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = new Do ((Statement) yyVals[-1+yyTop], null, GetLocation (yyVals[-2+yyTop]), Location.Null);
 	  }
 
 void case_860()
-#line 5721 "cs-parser.jay"
+#line 5712 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 	  
@@ -8787,7 +8782,7 @@ void case_860()
 	  }
 
 void case_861()
-#line 5731 "cs-parser.jay"
+#line 5722 "cs-parser.jay"
 {
 		start_block (GetLocation (yyVals[0+yyTop]));
 		current_block.IsCompilerGenerated = true;
@@ -8798,7 +8793,7 @@ void case_861()
 	  }
 
 void case_863()
-#line 5748 "cs-parser.jay"
+#line 5739 "cs-parser.jay"
 {
 		For f =  (For) yyVals[-2+yyTop];
 		f.Initializer = (Statement) yyVals[-1+yyTop];
@@ -8807,7 +8802,7 @@ void case_863()
 	  }
 
 void case_865()
-#line 5758 "cs-parser.jay"
+#line 5749 "cs-parser.jay"
 {
 		report.Error (1525, GetLocation (yyVals[0+yyTop]), "Unexpected symbol ')', expected ';'");
 		For f =  (For) yyVals[-2+yyTop];
@@ -8817,7 +8812,7 @@ void case_865()
 	}
 
 void case_866()
-#line 5769 "cs-parser.jay"
+#line 5760 "cs-parser.jay"
 {
 		For f =  (For) yyVals[-2+yyTop];
 		f.Condition = (BooleanExpression) yyVals[-1+yyTop];
@@ -8826,7 +8821,7 @@ void case_866()
 	  }
 
 void case_868()
-#line 5780 "cs-parser.jay"
+#line 5771 "cs-parser.jay"
 {
 		report.Error (1525, GetLocation (yyVals[0+yyTop]), "Unexpected symbol ')', expected ';'");
 		For f =  (For) yyVals[-2+yyTop];
@@ -8836,7 +8831,7 @@ void case_868()
 	}
 
 void case_869()
-#line 5792 "cs-parser.jay"
+#line 5783 "cs-parser.jay"
 {
 		For f =  (For) yyVals[-3+yyTop];
 		f.Iterator = (Statement) yyVals[-2+yyTop];
@@ -8851,14 +8846,14 @@ void case_869()
 	  }
 
 void case_870()
-#line 5805 "cs-parser.jay"
+#line 5796 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = end_block (current_block.StartLocation);
 	  }
 
 void case_873()
-#line 5818 "cs-parser.jay"
+#line 5809 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[0+yyTop];
 		var li = new LocalVariable (current_block, lt.Value, lt.Location);
@@ -8867,7 +8862,7 @@ void case_873()
 	  }
 
 void case_874()
-#line 5825 "cs-parser.jay"
+#line 5816 "cs-parser.jay"
 {
 		yyVal = current_variable;
 		if (yyVals[-1+yyTop] != null)
@@ -8877,7 +8872,7 @@ void case_874()
 	  }
 
 void case_882()
-#line 5852 "cs-parser.jay"
+#line 5843 "cs-parser.jay"
 {
 	  	var sl = yyVals[-2+yyTop] as StatementList;
 	  	if (sl == null) {
@@ -8893,7 +8888,7 @@ void case_882()
 	  }
 
 void case_883()
-#line 5869 "cs-parser.jay"
+#line 5860 "cs-parser.jay"
 {
 		report.Error (230, GetLocation (yyVals[-3+yyTop]), "Type and identifier are both required in a foreach statement");
 
@@ -8908,7 +8903,7 @@ void case_883()
 	  }
 
 void case_884()
-#line 5882 "cs-parser.jay"
+#line 5873 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 	
@@ -8927,7 +8922,7 @@ void case_884()
 	  }
 
 void case_885()
-#line 5899 "cs-parser.jay"
+#line 5890 "cs-parser.jay"
 {
 		start_block (GetLocation (yyVals[-5+yyTop]));
 		current_block.IsCompilerGenerated = true;
@@ -8939,7 +8934,7 @@ void case_885()
 	  }
 
 void case_886()
-#line 5909 "cs-parser.jay"
+#line 5900 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] is EmptyStatement && lexer.peek_token () == Token.OPEN_BRACE)
 			Warning_EmptyStatement (GetLocation (yyVals[0+yyTop]));
@@ -8952,7 +8947,7 @@ void case_886()
 	  }
 
 void case_887()
-#line 5920 "cs-parser.jay"
+#line 5911 "cs-parser.jay"
 {
 		start_block (GetLocation (yyVals[-3+yyTop]));
 		current_block.IsCompilerGenerated = true;
@@ -8967,7 +8962,7 @@ void case_887()
 	  }
 
 void case_888()
-#line 5933 "cs-parser.jay"
+#line 5924 "cs-parser.jay"
 {
 		Foreach f = new Foreach ((Expression) yyVals[-1+yyTop], null, null, null, null, GetLocation (yyVals[-3+yyTop]));
 		current_block.AddStatement (f);
@@ -8977,28 +8972,28 @@ void case_888()
 	  }
 
 void case_895()
-#line 5953 "cs-parser.jay"
+#line 5944 "cs-parser.jay"
 {
 		yyVal = new Break (GetLocation (yyVals[-1+yyTop]));
 		lbag.AddStatement (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_896()
-#line 5961 "cs-parser.jay"
+#line 5952 "cs-parser.jay"
 {
 		yyVal = new Continue (GetLocation (yyVals[-1+yyTop]));
 		lbag.AddStatement (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_897()
-#line 5966 "cs-parser.jay"
+#line 5957 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = new Continue (GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_898()
-#line 5974 "cs-parser.jay"
+#line 5965 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-1+yyTop];
 		yyVal = new Goto (lt.Value, GetLocation (yyVals[-2+yyTop]));
@@ -9006,56 +9001,63 @@ void case_898()
 	  }
 
 void case_899()
-#line 5980 "cs-parser.jay"
+#line 5971 "cs-parser.jay"
 {
 		yyVal = new GotoCase ((Expression) yyVals[-1+yyTop], GetLocation (yyVals[-3+yyTop]));
 		lbag.AddStatement (yyVal, GetLocation (yyVals[-2+yyTop]), GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_900()
-#line 5985 "cs-parser.jay"
+#line 5976 "cs-parser.jay"
 {
 		yyVal = new GotoDefault (GetLocation (yyVals[-2+yyTop]));
 		lbag.AddStatement (yyVal, GetLocation (yyVals[-1+yyTop]), GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_901()
-#line 5993 "cs-parser.jay"
+#line 5984 "cs-parser.jay"
 {
 		yyVal = new Return ((Expression) yyVals[-1+yyTop], GetLocation (yyVals[-2+yyTop]));
 		lbag.AddStatement (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_902()
-#line 5998 "cs-parser.jay"
+#line 5989 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = new Return ((Expression) yyVals[-1+yyTop], GetLocation (yyVals[-2+yyTop]));
 	  }
 
 void case_903()
-#line 6003 "cs-parser.jay"
+#line 5994 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = new Return (null, GetLocation (yyVals[-1+yyTop]));
 	  }
 
 void case_904()
-#line 6011 "cs-parser.jay"
+#line 6002 "cs-parser.jay"
 {
 		yyVal = new Throw ((Expression) yyVals[-1+yyTop], GetLocation (yyVals[-2+yyTop]));
 		lbag.AddStatement (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
 void case_905()
-#line 6016 "cs-parser.jay"
+#line 6007 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
-		yyVal = new Throw (null, GetLocation (yyVals[-1+yyTop]));
+		yyVal = new Throw ((Expression) yyVals[-1+yyTop], GetLocation (yyVals[-2+yyTop]));
 	  }
 
 void case_906()
-#line 6024 "cs-parser.jay"
+#line 6012 "cs-parser.jay"
+{
+		Error_SyntaxError (yyToken);
+		yyVal = new Throw (null, GetLocation (yyVals[-1+yyTop]));
+	  }
+
+void case_907()
+#line 6020 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-3+yyTop];
 		string s = lt.Value;
@@ -9072,8 +9074,8 @@ void case_906()
 		lbag.AddStatement (yyVal, GetLocation (yyVals[-2+yyTop]), GetLocation (yyVals[0+yyTop]));
 	  }
 
-void case_907()
-#line 6040 "cs-parser.jay"
+void case_908()
+#line 6036 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -9092,8 +9094,8 @@ void case_907()
 		lbag.AddStatement (yyVal, GetLocation (yyVals[-2+yyTop]));
 	  }
 
-void case_908()
-#line 6058 "cs-parser.jay"
+void case_909()
+#line 6054 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-2+yyTop];
 		string s = lt.Value;
@@ -9108,29 +9110,29 @@ void case_908()
 		lbag.AddStatement (yyVal, GetLocation (yyVals[-1+yyTop]), GetLocation (yyVals[0+yyTop]));
 	  }
 
-void case_912()
-#line 6084 "cs-parser.jay"
+void case_913()
+#line 6080 "cs-parser.jay"
 {
 		yyVal = new TryFinally ((Statement) yyVals[-2+yyTop], (Block) yyVals[0+yyTop], GetLocation (yyVals[-3+yyTop]));
 		lbag.AddStatement (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
-void case_913()
-#line 6089 "cs-parser.jay"
+void case_914()
+#line 6085 "cs-parser.jay"
 {
 		yyVal = new TryFinally (new TryCatch ((Block) yyVals[-3+yyTop], (List<Catch>) yyVals[-2+yyTop], GetLocation (yyVals[-4+yyTop]), true), (Block) yyVals[0+yyTop], GetLocation (yyVals[-4+yyTop]));
 		lbag.AddStatement (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
-void case_914()
-#line 6094 "cs-parser.jay"
+void case_915()
+#line 6090 "cs-parser.jay"
 {
 		Error_SyntaxError (1524, yyToken);
 		yyVal = new TryCatch ((Block) yyVals[-1+yyTop], null, GetLocation (yyVals[-2+yyTop]), false);
 	  }
 
-void case_915()
-#line 6102 "cs-parser.jay"
+void case_916()
+#line 6098 "cs-parser.jay"
 {
 		var l = new List<Catch> (2);
 
@@ -9138,8 +9140,8 @@ void case_915()
 		yyVal = l;
 	  }
 
-void case_916()
-#line 6109 "cs-parser.jay"
+void case_917()
+#line 6105 "cs-parser.jay"
 {
 		var l = (List<Catch>) yyVals[-1+yyTop];
 		
@@ -9152,8 +9154,8 @@ void case_916()
 		yyVal = l;
 	  }
 
-void case_920()
-#line 6133 "cs-parser.jay"
+void case_921()
+#line 6129 "cs-parser.jay"
 {
 		start_block (GetLocation (yyVals[-3+yyTop]));
 		var c = new Catch (current_block, GetLocation (yyVals[-4+yyTop]));
@@ -9169,8 +9171,8 @@ void case_920()
 		yyVal = c;
 	  }
 
-void case_922()
-#line 6152 "cs-parser.jay"
+void case_923()
+#line 6148 "cs-parser.jay"
 {
 	  	if (yyToken == Token.CLOSE_PARENS) {
 			report.Error (1015, lexer.Location,
@@ -9182,8 +9184,8 @@ void case_922()
 		yyVal = new Catch (null, GetLocation (yyVals[-2+yyTop]));
 	  }
 
-void case_923()
-#line 6163 "cs-parser.jay"
+void case_924()
+#line 6159 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -9207,15 +9209,15 @@ void case_923()
 		yyVal = c;
 	  }
 
-void case_926()
-#line 6203 "cs-parser.jay"
+void case_927()
+#line 6199 "cs-parser.jay"
 {
 		if (!settings.Unsafe)
 			Error_UnsafeCodeNotAllowed (GetLocation (yyVals[0+yyTop]));
 	  }
 
-void case_928()
-#line 6213 "cs-parser.jay"
+void case_929()
+#line 6209 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] is EmptyStatement && lexer.peek_token () == Token.OPEN_BRACE)
 			Warning_EmptyStatement (GetLocation (yyVals[0+yyTop]));
@@ -9224,8 +9226,8 @@ void case_928()
 		lbag.AddStatement (yyVal, GetLocation (yyVals[-3+yyTop]), GetLocation (yyVals[-1+yyTop]));
 	  }
 
-void case_929()
-#line 6221 "cs-parser.jay"
+void case_930()
+#line 6217 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 
@@ -9233,8 +9235,8 @@ void case_929()
 		lbag.AddStatement (yyVal, GetLocation (yyVals[-2+yyTop]));
 	  }
 
-void case_930()
-#line 6231 "cs-parser.jay"
+void case_931()
+#line 6227 "cs-parser.jay"
 {
 	    start_block (GetLocation (yyVals[-2+yyTop]));
 	    
@@ -9245,15 +9247,15 @@ void case_930()
 		current_variable = new Fixed.VariableDeclaration ((FullNamedExpression) yyVals[-1+yyTop], li);
 	  }
 
-void case_931()
-#line 6241 "cs-parser.jay"
+void case_932()
+#line 6237 "cs-parser.jay"
 {
 		yyVal = current_variable;
 		current_variable = null;
 	  }
 
-void case_932()
-#line 6246 "cs-parser.jay"
+void case_933()
+#line 6242 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] is EmptyStatement && lexer.peek_token () == Token.OPEN_BRACE)
 			Warning_EmptyStatement (GetLocation (yyVals[0+yyTop]));
@@ -9264,8 +9266,8 @@ void case_932()
 		yyVal = end_block (GetLocation (yyVals[-2+yyTop]));
 	  }
 
-void case_933()
-#line 6259 "cs-parser.jay"
+void case_934()
+#line 6255 "cs-parser.jay"
 {
 	    start_block (GetLocation (yyVals[-2+yyTop]));
 	    
@@ -9276,15 +9278,15 @@ void case_933()
 		current_variable = new Using.VariableDeclaration ((FullNamedExpression) yyVals[-1+yyTop], li);
 	  }
 
-void case_934()
-#line 6269 "cs-parser.jay"
+void case_935()
+#line 6265 "cs-parser.jay"
 {
 		yyVal = current_variable;	  
 		current_variable = null;
 	  }
 
-void case_935()
-#line 6274 "cs-parser.jay"
+void case_936()
+#line 6270 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] is EmptyStatement && lexer.peek_token () == Token.OPEN_BRACE)
 			Warning_EmptyStatement (GetLocation (yyVals[0+yyTop]));
@@ -9295,8 +9297,8 @@ void case_935()
 		yyVal = end_block (GetLocation (yyVals[-2+yyTop]));
 	  }
 
-void case_936()
-#line 6284 "cs-parser.jay"
+void case_937()
+#line 6280 "cs-parser.jay"
 {
 		if (yyVals[0+yyTop] is EmptyStatement && lexer.peek_token () == Token.OPEN_BRACE)
 			Warning_EmptyStatement (GetLocation (yyVals[0+yyTop]));
@@ -9305,8 +9307,8 @@ void case_936()
 		lbag.AddStatement (yyVal, GetLocation (yyVals[-3+yyTop]), GetLocation (yyVals[-1+yyTop]));
 	  }
 
-void case_937()
-#line 6292 "cs-parser.jay"
+void case_938()
+#line 6288 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		
@@ -9314,23 +9316,23 @@ void case_937()
 		lbag.AddStatement (yyVal, GetLocation (yyVals[-2+yyTop]));
 	  }
 
-void case_939()
-#line 6303 "cs-parser.jay"
+void case_940()
+#line 6299 "cs-parser.jay"
 {
 		/* It has to be here for the parent to safely restore artificial block*/
 	  	Error_SyntaxError (yyToken);
 	  }
 
-void case_941()
-#line 6315 "cs-parser.jay"
+void case_942()
+#line 6311 "cs-parser.jay"
 {
 		current_variable.Initializer = (Expression) yyVals[0+yyTop];
 		lbag.AddLocation (current_variable, GetLocation (yyVals[-1+yyTop]));
 		yyVal = current_variable;
 	  }
 
-void case_942()
-#line 6327 "cs-parser.jay"
+void case_943()
+#line 6323 "cs-parser.jay"
 {
 		lexer.query_parsing = false;
 			
@@ -9343,8 +9345,8 @@ void case_942()
 		current_block = current_block.Parent;
 	  }
 
-void case_943()
-#line 6339 "cs-parser.jay"
+void case_944()
+#line 6335 "cs-parser.jay"
 {
 		Linq.AQueryClause from = yyVals[-1+yyTop] as Linq.AQueryClause;
 			
@@ -9355,8 +9357,8 @@ void case_943()
 		current_block = current_block.Parent;
 	  }
 
-void case_944()
-#line 6350 "cs-parser.jay"
+void case_945()
+#line 6346 "cs-parser.jay"
 {
 	        lexer.query_parsing = false;
 		yyVal = yyVals[-1+yyTop];
@@ -9365,16 +9367,16 @@ void case_944()
 		current_block = current_block.Parent;
 	  }
 
-void case_945()
-#line 6357 "cs-parser.jay"
+void case_946()
+#line 6353 "cs-parser.jay"
 {
 	        yyVal = yyVals[-1+yyTop];
 		current_block.SetEndLocation (lexer.Location);
 		current_block = current_block.Parent;
 	  }
 
-void case_946()
-#line 6366 "cs-parser.jay"
+void case_947()
+#line 6362 "cs-parser.jay"
 {
 		current_block = new Linq.QueryBlock (current_block, lexer.Location);
 	  
@@ -9385,8 +9387,8 @@ void case_946()
 		yyVal = new Linq.QueryExpression (start);
 	  }
 
-void case_947()
-#line 6376 "cs-parser.jay"
+void case_948()
+#line 6372 "cs-parser.jay"
 {
 		current_block = new Linq.QueryBlock (current_block, lexer.Location);
 	  
@@ -9399,8 +9401,8 @@ void case_947()
 		yyVal = new Linq.QueryExpression (start);
 	  }
 
-void case_948()
-#line 6391 "cs-parser.jay"
+void case_949()
+#line 6387 "cs-parser.jay"
 {
 		current_block = new Linq.QueryBlock (current_block, lexer.Location);
 	  
@@ -9411,8 +9413,8 @@ void case_948()
 		yyVal = new Linq.QueryExpression (start);
 	  }
 
-void case_949()
-#line 6401 "cs-parser.jay"
+void case_950()
+#line 6397 "cs-parser.jay"
 {
 		current_block = new Linq.QueryBlock (current_block, lexer.Location);
 	  
@@ -9425,8 +9427,8 @@ void case_949()
 		yyVal = new Linq.QueryExpression (start);
 	  }
 
-void case_951()
-#line 6420 "cs-parser.jay"
+void case_952()
+#line 6416 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-3+yyTop];
 		var sn = new Linq.RangeVariable (lt.Value, lt.Location);
@@ -9439,8 +9441,8 @@ void case_951()
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-2+yyTop]));
 	  }
 
-void case_953()
-#line 6436 "cs-parser.jay"
+void case_954()
+#line 6432 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-3+yyTop];
 		var sn = new Linq.RangeVariable (lt.Value, lt.Location);
@@ -9457,8 +9459,8 @@ void case_953()
 		lbag.AddLocation (yyVal, GetLocation (yyVals[-2+yyTop]));
 	  }
 
-void case_954()
-#line 6455 "cs-parser.jay"
+void case_955()
+#line 6451 "cs-parser.jay"
 {
 	  	Linq.AQueryClause head = (Linq.AQueryClause)yyVals[-1+yyTop];
 		
@@ -9474,8 +9476,8 @@ void case_954()
 		yyVal = head;
 	  }
 
-void case_955()
-#line 6470 "cs-parser.jay"
+void case_956()
+#line 6466 "cs-parser.jay"
 {
 	  	Linq.AQueryClause head = (Linq.AQueryClause)yyVals[0+yyTop];
 
@@ -9488,22 +9490,22 @@ void case_955()
 		yyVal = head;
 	  }
 
-void case_957()
-#line 6483 "cs-parser.jay"
+void case_958()
+#line 6479 "cs-parser.jay"
 {
 		report.Error (742, GetLocation (yyVals[0+yyTop]), "Unexpected symbol `{0}'. A query body must end with select or group clause", GetSymbolName (yyToken));
 		yyVal = yyVals[-1+yyTop];
 	  }
 
-void case_958()
-#line 6488 "cs-parser.jay"
+void case_959()
+#line 6484 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = null;
 	  }
 
-void case_960()
-#line 6500 "cs-parser.jay"
+void case_961()
+#line 6496 "cs-parser.jay"
 {
 		yyVal = new Linq.Select ((Linq.QueryBlock)current_block, (Expression)yyVals[0+yyTop], GetLocation (yyVals[-2+yyTop]));
 
@@ -9511,8 +9513,8 @@ void case_960()
 		current_block = current_block.Parent;
 	  }
 
-void case_961()
-#line 6507 "cs-parser.jay"
+void case_962()
+#line 6503 "cs-parser.jay"
 {
 	  	if (linq_clause_blocks == null)
 	  		linq_clause_blocks = new Stack<Linq.QueryBlock> ();
@@ -9521,8 +9523,8 @@ void case_961()
 	  	linq_clause_blocks.Push ((Linq.QueryBlock)current_block);
 	  }
 
-void case_962()
-#line 6515 "cs-parser.jay"
+void case_963()
+#line 6511 "cs-parser.jay"
 {
 		current_block.SetEndLocation (lexer.Location);
 		current_block = current_block.Parent;
@@ -9530,8 +9532,8 @@ void case_962()
 		current_block = new Linq.QueryBlock (current_block, lexer.Location);
 	  }
 
-void case_963()
-#line 6522 "cs-parser.jay"
+void case_964()
+#line 6518 "cs-parser.jay"
 {
 		var obj = (object[]) yyVals[0+yyTop];
 
@@ -9542,22 +9544,22 @@ void case_963()
 		current_block = current_block.Parent;
 	  }
 
-void case_965()
-#line 6539 "cs-parser.jay"
+void case_966()
+#line 6535 "cs-parser.jay"
 {
 		Error_SyntaxError (yyToken);
 		yyVal = new object[2] { null, Location.Null };
 	  }
 
-void case_967()
-#line 6548 "cs-parser.jay"
+void case_968()
+#line 6544 "cs-parser.jay"
 {
 		((Linq.AQueryClause)yyVals[-1+yyTop]).Tail.Next = (Linq.AQueryClause)yyVals[0+yyTop];
 		yyVal = yyVals[-1+yyTop];
 	  }
 
-void case_974()
-#line 6568 "cs-parser.jay"
+void case_975()
+#line 6564 "cs-parser.jay"
 {
 		var lt = (LocatedToken) yyVals[-3+yyTop];
 		var sn = new Linq.RangeVariable (lt.Value, lt.Location);
@@ -9570,8 +9572,8 @@ void case_974()
 		((Linq.QueryBlock)current_block).AddRangeVariable (sn);
 	  }
 
-void case_976()
-#line 6587 "cs-parser.jay"
+void case_977()
+#line 6583 "cs-parser.jay"
 {
 		yyVal = new Linq.Where ((Linq.QueryBlock)current_block, (Expression)yyVals[0+yyTop], GetLocation (yyVals[-2+yyTop]));
 
@@ -9579,8 +9581,8 @@ void case_976()
 		current_block = current_block.Parent;
 	  }
 
-void case_977()
-#line 6597 "cs-parser.jay"
+void case_978()
+#line 6593 "cs-parser.jay"
 {
 		if (linq_clause_blocks == null)
 			linq_clause_blocks = new Stack<Linq.QueryBlock> ();
@@ -9589,8 +9591,8 @@ void case_977()
 		linq_clause_blocks.Push ((Linq.QueryBlock) current_block);
 	  }
 
-void case_978()
-#line 6605 "cs-parser.jay"
+void case_979()
+#line 6601 "cs-parser.jay"
 {
 		current_block.SetEndLocation (lexer.Location);
 		current_block = current_block.Parent;
@@ -9599,8 +9601,8 @@ void case_978()
 		linq_clause_blocks.Push ((Linq.QueryBlock) current_block);
 	  }
 
-void case_979()
-#line 6613 "cs-parser.jay"
+void case_980()
+#line 6609 "cs-parser.jay"
 {
 		current_block.AddStatement (new ContextualReturn ((Expression) yyVals[-1+yyTop]));
 		current_block.SetEndLocation (lexer.Location);
@@ -9609,8 +9611,8 @@ void case_979()
 		current_block = new Linq.QueryBlock (current_block, lexer.Location);
 	  }
 
-void case_980()
-#line 6621 "cs-parser.jay"
+void case_981()
+#line 6617 "cs-parser.jay"
 {
 		current_block.AddStatement (new ContextualReturn ((Expression) yyVals[-1+yyTop]));
 		current_block.SetEndLocation (lexer.Location);
@@ -9649,8 +9651,8 @@ void case_980()
 		((Linq.QueryBlock)current_block).AddRangeVariable (into);
 	  }
 
-void case_981()
-#line 6659 "cs-parser.jay"
+void case_982()
+#line 6655 "cs-parser.jay"
 {
 		if (linq_clause_blocks == null)
 			linq_clause_blocks = new Stack<Linq.QueryBlock> ();
@@ -9659,8 +9661,8 @@ void case_981()
 		linq_clause_blocks.Push ((Linq.QueryBlock) current_block);
 	  }
 
-void case_982()
-#line 6667 "cs-parser.jay"
+void case_983()
+#line 6663 "cs-parser.jay"
 {
 		current_block.SetEndLocation (lexer.Location);
 		current_block = current_block.Parent;
@@ -9669,8 +9671,8 @@ void case_982()
 		linq_clause_blocks.Push ((Linq.QueryBlock) current_block);
 	  }
 
-void case_983()
-#line 6675 "cs-parser.jay"
+void case_984()
+#line 6671 "cs-parser.jay"
 {
 		current_block.AddStatement (new ContextualReturn ((Expression) yyVals[-1+yyTop]));
 		current_block.SetEndLocation (lexer.Location);
@@ -9679,8 +9681,8 @@ void case_983()
 		current_block = new Linq.QueryBlock (current_block, lexer.Location);
 	  }
 
-void case_984()
-#line 6683 "cs-parser.jay"
+void case_985()
+#line 6679 "cs-parser.jay"
 {
 		current_block.AddStatement (new ContextualReturn ((Expression) yyVals[-1+yyTop]));
 		current_block.SetEndLocation (lexer.Location);
@@ -9723,22 +9725,22 @@ void case_984()
 		((Linq.QueryBlock)current_block).AddRangeVariable (into);		
 	  }
 
-void case_986()
-#line 6729 "cs-parser.jay"
+void case_987()
+#line 6725 "cs-parser.jay"
 {
 		opt_intoStack.Push (GetLocation (yyVals[-1+yyTop]));
 		yyVal = yyVals[0+yyTop];
 	  }
 
-void case_987()
-#line 6737 "cs-parser.jay"
+void case_988()
+#line 6733 "cs-parser.jay"
 {
 		current_block = new Linq.QueryBlock (current_block, lexer.Location);
 		lbag.AddLocation (current_block, GetLocation (yyVals[0+yyTop]));
 	  }
 
-void case_988()
-#line 6742 "cs-parser.jay"
+void case_989()
+#line 6738 "cs-parser.jay"
 {
 		current_block.SetEndLocation (lexer.Location);
 		current_block = current_block.Parent;
@@ -9746,8 +9748,8 @@ void case_988()
 		yyVal = yyVals[0+yyTop];
 	  }
 
-void case_990()
-#line 6753 "cs-parser.jay"
+void case_991()
+#line 6749 "cs-parser.jay"
 {
 		current_block.SetEndLocation (lexer.Location);
 		current_block = current_block.Parent;
@@ -9755,15 +9757,15 @@ void case_990()
 		current_block = new Linq.QueryBlock (current_block, lexer.Location);
 	  }
 
-void case_991()
-#line 6760 "cs-parser.jay"
+void case_992()
+#line 6756 "cs-parser.jay"
 {
 		((Linq.AQueryClause)yyVals[-3+yyTop]).Next = (Linq.AQueryClause)yyVals[0+yyTop];
 		yyVal = yyVals[-3+yyTop];
 	  }
 
-void case_993()
-#line 6769 "cs-parser.jay"
+void case_994()
+#line 6765 "cs-parser.jay"
 {
 		current_block.SetEndLocation (lexer.Location);
 		current_block = current_block.Parent;
@@ -9771,43 +9773,43 @@ void case_993()
 		current_block = new Linq.QueryBlock ((Linq.QueryBlock) current_block, lexer.Location);	 
 	 }
 
-void case_994()
-#line 6776 "cs-parser.jay"
+void case_995()
+#line 6772 "cs-parser.jay"
 {
 		((Linq.AQueryClause)yyVals[-3+yyTop]).Tail.Next = (Linq.AQueryClause)yyVals[0+yyTop];
 		yyVal = yyVals[-3+yyTop];
 	 }
 
-void case_996()
-#line 6788 "cs-parser.jay"
+void case_997()
+#line 6784 "cs-parser.jay"
 {
 		yyVal = new Linq.OrderByAscending ((Linq.QueryBlock) current_block, (Expression)yyVals[-1+yyTop]);	
 		lbag.AddLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
-void case_997()
-#line 6793 "cs-parser.jay"
+void case_998()
+#line 6789 "cs-parser.jay"
 {
 		yyVal = new Linq.OrderByDescending ((Linq.QueryBlock) current_block, (Expression)yyVals[-1+yyTop]);	
 		lbag.AddLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
-void case_999()
-#line 6805 "cs-parser.jay"
+void case_1000()
+#line 6801 "cs-parser.jay"
 {
 		yyVal = new Linq.ThenByAscending ((Linq.QueryBlock) current_block, (Expression)yyVals[-1+yyTop]);	
 		lbag.AddLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
-void case_1000()
-#line 6810 "cs-parser.jay"
+void case_1001()
+#line 6806 "cs-parser.jay"
 {
 		yyVal = new Linq.ThenByDescending ((Linq.QueryBlock) current_block, (Expression)yyVals[-1+yyTop]);	
 		lbag.AddLocation (yyVal, GetLocation (yyVals[0+yyTop]));
 	  }
 
-void case_1002()
-#line 6820 "cs-parser.jay"
+void case_1003()
+#line 6816 "cs-parser.jay"
 {
 		/* query continuation block is not linked with query block but with block*/
 		/* before. This means each query can use same range variable names for*/
@@ -9824,8 +9826,8 @@ void case_1002()
 		linq_clause_blocks.Push ((Linq.QueryBlock) current_block);		
 	  }
 
-void case_1003()
-#line 6836 "cs-parser.jay"
+void case_1004()
+#line 6832 "cs-parser.jay"
 {
 		var current_block = linq_clause_blocks.Pop ();	  
 		var lt = (LocatedToken) yyVals[-2+yyTop];
@@ -9835,8 +9837,8 @@ void case_1003()
   		};
 	  }
 
-void case_1006()
-#line 6863 "cs-parser.jay"
+void case_1007()
+#line 6859 "cs-parser.jay"
 { 
 		current_container = current_type = new Class (current_container, new MemberName ("<InteractiveExpressionClass>"), Modifiers.PUBLIC, null);
 
@@ -9850,43 +9852,46 @@ void case_1006()
 			mods |= Modifiers.UNSAFE;
 
 		current_local_parameters = pars;
-		Method method = new Method (
+		var method = new InteractiveMethod (
 			current_type,
 			new TypeExpression (compiler.BuiltinTypes.Void, Location.Null),
 			mods,
-			new MemberName ("Host"),
-			pars,
-			null /* attributes */);
+			pars);
 			
 		current_type.AddMember (method);			
-
 		oob_stack.Push (method);
+
+		interactive_async = false;
+
 		++lexer.parsing_block;
 		start_block (lexer.Location);
 	  }
 
-void case_1007()
-#line 6891 "cs-parser.jay"
+void case_1008()
+#line 6887 "cs-parser.jay"
 {
 		--lexer.parsing_block;
-		Method method = (Method) oob_stack.Pop ();
-
+		var method = (InteractiveMethod) oob_stack.Pop ();
 		method.Block = (ToplevelBlock) end_block(lexer.Location);
 
+		if (interactive_async == true) {
+			method.ChangeToAsync ();
+		}
+
 		InteractiveResult = (Class) pop_current_class ();
 		current_local_parameters = null;
 	  }
 
-void case_1017()
-#line 6934 "cs-parser.jay"
+void case_1018()
+#line 6933 "cs-parser.jay"
 {
 		module.DocumentationBuilder.ParsedBuiltinType = (TypeExpression)yyVals[-1+yyTop];
 		module.DocumentationBuilder.ParsedParameters = (List<DocumentationParameter>)yyVals[0+yyTop];
 		yyVal = null;
 	  }
 
-void case_1018()
-#line 6940 "cs-parser.jay"
+void case_1019()
+#line 6939 "cs-parser.jay"
 {
 		module.DocumentationBuilder.ParsedBuiltinType = (TypeExpression)yyVals[-3+yyTop];
 		module.DocumentationBuilder.ParsedParameters = (List<DocumentationParameter>)yyVals[0+yyTop];
@@ -9894,15 +9899,15 @@ void case_1018()
 		yyVal = new MemberName (lt.Value);
 	  }
 
-void case_1021()
-#line 6955 "cs-parser.jay"
+void case_1022()
+#line 6954 "cs-parser.jay"
 {
 		module.DocumentationBuilder.ParsedParameters = (List<DocumentationParameter>)yyVals[-1+yyTop];
 		yyVal = new MemberName ((MemberName) yyVals[-6+yyTop], MemberCache.IndexerNameAlias, Location.Null);
 	  }
 
-void case_1022()
-#line 6960 "cs-parser.jay"
+void case_1023()
+#line 6959 "cs-parser.jay"
 {
 		var p = (List<DocumentationParameter>)yyVals[0+yyTop] ?? new List<DocumentationParameter> (1);
 		p.Add (new DocumentationParameter ((FullNamedExpression) yyVals[-1+yyTop]));
@@ -9911,8 +9916,8 @@ void case_1022()
 		yyVal = null;
 	  }
 
-void case_1023()
-#line 6968 "cs-parser.jay"
+void case_1024()
+#line 6967 "cs-parser.jay"
 {
 		var p = (List<DocumentationParameter>)yyVals[0+yyTop] ?? new List<DocumentationParameter> (1);
 		p.Add (new DocumentationParameter ((FullNamedExpression) yyVals[-1+yyTop]));
@@ -9921,8 +9926,8 @@ void case_1023()
 		yyVal = null;
 	  }
 
-void case_1024()
-#line 6976 "cs-parser.jay"
+void case_1025()
+#line 6975 "cs-parser.jay"
 {
 		var p = (List<DocumentationParameter>)yyVals[0+yyTop] ?? new List<DocumentationParameter> (1);
 		module.DocumentationBuilder.ParsedParameters = p;
@@ -9930,24 +9935,24 @@ void case_1024()
 		yyVal = null;
 	  }
 
-void case_1032()
-#line 7014 "cs-parser.jay"
+void case_1033()
+#line 7013 "cs-parser.jay"
 {
 		var parameters = new List<DocumentationParameter> ();
 		parameters.Add ((DocumentationParameter) yyVals[0+yyTop]);
 		yyVal = parameters;
 	  }
 
-void case_1033()
-#line 7020 "cs-parser.jay"
+void case_1034()
+#line 7019 "cs-parser.jay"
 {
 		var parameters = yyVals[-2+yyTop] as List<DocumentationParameter>;
 		parameters.Add ((DocumentationParameter) yyVals[0+yyTop]);
 		yyVal = parameters;
 	  }
 
-void case_1034()
-#line 7029 "cs-parser.jay"
+void case_1035()
+#line 7028 "cs-parser.jay"
 {
 		if (yyVals[-1+yyTop] != null)
 			yyVal = new DocumentationParameter ((Parameter.Modifier) yyVals[-1+yyTop], (FullNamedExpression) yyVals[0+yyTop]);
@@ -10047,20 +10052,20 @@ void case_1034()
   377,  377,  385,  384,  384,  380,  380,  383,  383,  387,
   386,  386,  374,  374,  388,  374,  374,  374,  334,  334,
   334,  334,  334,  334,  389,  390,  390,  391,  391,  391,
-  392,  392,  392,  393,  393,  394,  394,  394,  395,  395,
-  335,  335,  335,  335,  396,  396,  398,  398,  397,  399,
-  397,  397,  397,  336,  337,  400,  340,  338,  338,  402,
-  403,  341,  405,  406,  339,  339,  339,  404,  404,  401,
-  401,  304,  304,  304,  304,  407,  407,  409,  409,  411,
-  410,  412,  410,  408,  408,  408,  408,  408,  416,  414,
-  417,  419,  414,  418,  418,  413,  413,  420,  420,  420,
-  420,  420,  425,  421,  426,  422,  427,  428,  429,  423,
-  431,  432,  433,  423,  430,  430,  435,  424,  434,  438,
-  434,  437,  440,  437,  436,  436,  436,  439,  439,  439,
-  415,  441,  415,    3,    3,  442,    3,    3,  443,  443,
-  248,  248,  243,  243,    5,  444,  444,  444,  444,  448,
-  444,  444,  444,  444,  445,  445,  446,  449,  446,  447,
-  447,  450,  450,  451,
+  392,  392,  392,  393,  393,  393,  394,  394,  394,  395,
+  395,  335,  335,  335,  335,  396,  396,  398,  398,  397,
+  399,  397,  397,  397,  336,  337,  400,  340,  338,  338,
+  402,  403,  341,  405,  406,  339,  339,  339,  404,  404,
+  401,  401,  304,  304,  304,  304,  407,  407,  409,  409,
+  411,  410,  412,  410,  408,  408,  408,  408,  408,  416,
+  414,  417,  419,  414,  418,  418,  413,  413,  420,  420,
+  420,  420,  420,  425,  421,  426,  422,  427,  428,  429,
+  423,  431,  432,  433,  423,  430,  430,  435,  424,  434,
+  438,  434,  437,  440,  437,  436,  436,  436,  439,  439,
+  439,  415,  441,  415,    3,    3,  442,    3,    3,  443,
+  443,  248,  248,  243,  243,    5,  444,  444,  444,  444,
+  448,  444,  444,  444,  444,  445,  445,  446,  449,  446,
+  447,  447,  450,  450,  451,
   };
    static readonly short [] yyLen = {           2,
     2,    0,    3,    1,    2,    4,    3,    1,    0,    1,
@@ -10153,31 +10158,31 @@ void case_1034()
     0,    1,    0,    5,    1,    0,    1,    0,    1,    1,
     1,    3,    4,    5,    0,    9,    5,    4,    1,    1,
     1,    1,    1,    1,    2,    2,    2,    3,    4,    3,
-    3,    3,    2,    3,    2,    4,    4,    3,    0,    1,
-    3,    4,    5,    3,    1,    2,    0,    1,    2,    0,
-    7,    3,    6,    2,    2,    0,    3,    5,    4,    0,
-    0,   10,    0,    0,    9,    5,    4,    2,    1,    0,
-    2,    2,    2,    2,    2,    4,    5,    4,    5,    0,
-    5,    0,    6,    3,    2,    2,    2,    1,    0,    3,
-    0,    0,    5,    2,    1,    1,    2,    1,    1,    1,
-    1,    1,    0,    5,    0,    3,    0,    0,    0,   12,
-    0,    0,    0,   13,    0,    2,    0,    3,    1,    0,
-    4,    1,    0,    4,    1,    2,    2,    1,    2,    2,
-    0,    0,    4,    2,    3,    0,    4,    2,    2,    3,
-    0,    1,    1,    1,    2,    2,    2,    4,    3,    0,
-    7,    4,    4,    3,    1,    3,    0,    0,    4,    0,
-    1,    1,    3,    2,
+    3,    3,    2,    3,    3,    2,    4,    4,    3,    0,
+    1,    3,    4,    5,    3,    1,    2,    0,    1,    2,
+    0,    7,    3,    6,    2,    2,    0,    3,    5,    4,
+    0,    0,   10,    0,    0,    9,    5,    4,    2,    1,
+    0,    2,    2,    2,    2,    2,    4,    5,    4,    5,
+    0,    5,    0,    6,    3,    2,    2,    2,    1,    0,
+    3,    0,    0,    5,    2,    1,    1,    2,    1,    1,
+    1,    1,    1,    0,    5,    0,    3,    0,    0,    0,
+   12,    0,    0,    0,   13,    0,    2,    0,    3,    1,
+    0,    4,    1,    0,    4,    1,    2,    2,    1,    2,
+    2,    0,    0,    4,    2,    3,    0,    4,    2,    2,
+    3,    0,    1,    1,    1,    2,    2,    2,    4,    3,
+    0,    7,    4,    4,    3,    1,    3,    0,    0,    4,
+    0,    1,    1,    3,    2,
   };
    static readonly short [] yyDefRed = {            0,
     8,    0,    0,    0,    0,    0,    0,    0,    2,    4,
-    0,    0,   11,   14,    0, 1004,    0,    0, 1008,    0,
+    0,    0,   11,   14,    0, 1005,    0,    0, 1009,    0,
     0,   15,   17,  389,  395,  402,  390,  392,    0,  391,
     0,  398,  400,  387,    0,  394,  396,  388,  399,  401,
-  397,  352, 1025,    0,  393, 1015,    0,   10,    1,    0,
+  397,  352, 1026,    0,  393, 1016,    0,   10,    1,    0,
     0,    0,   12,    0,  832,    0,    0,    0,    0,    0,
     0,    0,    0,  430,    0,    0,    0,    0,    0,    0,
     0,  428,    0,    0,    0,  490,    0,  429,    0,  529,
-    0,  926,    0,    0,    0,  678,    0,    0,    0,    0,
+    0,  927,    0,    0,    0,  678,    0,    0,    0,    0,
     0,    0,    0,  729,    0,  782,    0,    0,    0,    0,
     0,    0,    0,    0,  427,    0,  667,    0,  831,    0,
   765,    0,    0,    0,    0,  404,  405,  406,  407,  408,
@@ -10188,19 +10193,19 @@ void case_1034()
   768,  769,  770,  771,  772,  773,  774,  775,  776,  777,
   767,    0,    0,    0,  833,  834,  852,  853,  854,  855,
   889,  890,  891,  892,  893,  894,    0,    0,    0,   20,
-    0,    0,  342,    0,  344, 1012,   16, 1005,    0,    0,
+    0,    0,  342,    0,  344, 1013,   16, 1006,    0,    0,
   249,  248,  245,  250,  251,  244,  263,  262,  255,  256,
   252,  254,  253,  257,  246,  247,  258,  259,  265,  264,
-  260,  261,    0,    0, 1028,    0, 1017,    0, 1016,    3,
+  260,  261,    0,    0, 1029,    0, 1018,    0, 1017,    3,
    55,    0,    0,    0,   44,   41,   43,   46,   47,   48,
    49,   50,   53,   13,    0,    0,    0,  895,  544,  431,
-  432,  924,    0,    0,    0,    0,    0,    0,    0,  897,
+  432,  925,    0,    0,    0,    0,    0,    0,    0,  897,
   896,    0,  554,  548,  553,  781,  830,  752,  779,  778,
   780,  753,  754,  755,  756,  757,  758,  759,  760,  761,
   762,  763,  764,    0,    0,    0,  861,    0,    0,    0,
   797,  796,    0,    0,    0,    0,    0,    0,    0,    0,
-  903,    0,    0,    0,    0,  403,    0,    0,    0,  905,
-  910,    0,    0,    0,  546,  925,    0,    0,    0,  795,
+  903,    0,    0,    0,    0,  403,    0,    0,    0,  906,
+    0,    0,    0,    0,  546,  926,    0,    0,    0,  795,
   791,    0,    0,    0,    0,    0,    0,    0,  371,    0,
     0,    0,    0,    0,    0,    0,    0,  670,    0,  565,
   663,    0,  561,    0,    0,  563,  559,  573,  567,  574,
@@ -10210,913 +10215,929 @@ void case_1034()
     0,    0,    0,  787,  788,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0, 1007,  748,
-  798,  786,    0,  828,  829,  958,  975,    0,    0,  959,
-  961,    0,  987,  944,  942,  968,    0,    0,  966,  969,
-  970,  971,  972,  945,  943,    0,    0,    0,  346,    0,
-   18,    0,    0,    0, 1024,    0,  353,    0,    0,    0,
- 1026,    0,    0,   42,  700,  706,  698,    0,  695,  705,
+    0,    0,    0,    0,    0,    0,    0,    0, 1008,  748,
+  798,  786,    0,  828,  829,  959,  976,    0,    0,  960,
+  962,    0,  988,  945,  943,  969,    0,    0,  967,  970,
+  971,  972,  973,  946,  944,    0,    0,    0,  346,    0,
+   18,    0,    0,    0, 1025,    0,  353,    0,    0,    0,
+ 1027,    0,    0,   42,  700,  706,  698,    0,  695,  705,
   699,  697,  696,  703,  701,  702,  708,  704,  707,  709,
     0,    0,  693,   45,   54,  492,    0,  488,  489,    0,
     0,  486,    0,  800,    0,    0,    0,  859,    0,  827,
   825,  826,    0,    0,    0,  682,    0,  900,  898,  683,
     0,    0,  514,    0,    0,    0,    0,  505,    0,  509,
   519,  521,    0,  501,    0,    0,    0,    0,    0,  496,
-    0,  499,    0,  503,  373,  902,  901,    0,    0,  904,
-  914,    0,    0,    0,  915,    0,    0,  927,    0,    0,
-  794,    0,  383,  379,  380,    0,    0,  378,  381,  382,
-    0,    0,    0,  579,    0,    0,  550,    0,  665,    0,
-  746,    0,    0,    0,  740,  742,  743,  744,  435,  436,
-    0,  349,  350,    0,  187,  186,  188,    0,  652,    0,
-    0,    0,  375,    0,  647,    0,    0,  908,    0,    0,
-    0,  440,    0,  443,    0,    0,  441,    0,    0,  483,
-    0,  447,    0,    0,    0,    0,  472,  475,    0,    0,
-  467,  474,  473,  636,  637,  638,  639,  640,  641,  642,
-  643,  644,  646,  645,  583,  580,  585,  582,  584,  581,
-  593,  589,  594,  590,  591,    0,  592,    0,  598,    0,
-  599,    0,  605,    0,  606,    0,  607,    0,  608,    0,
-  612,    0,  613,    0,  616,    0,  619,    0,  622,    0,
-  625,    0,  628,    0,  630,    0,    0,  518,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  957,  956,    0,
-  967,    0,  955,    0,    0,  343, 1022, 1023,  367,    0,
-    0,    0,  364,    0,    0,  184,    0,    0, 1032, 1018,
- 1020,   61,   63,   64,    0,    0,   56,    0,    0,   65,
-   67,   30,   28,    0,    0,    0,  690,    0,  694,  439,
-    0,  491,    0,  543,    0,  556,  173,  195,    0,    0,
-    0,  163,    0,    0,    0,  174,  549,    0,  930,    0,
-  881,  862,    0,  872,    0,  883,    0,  899,  837,    0,
-  929,    0,    0,  504,    0,  520,  522,    0,    0,    0,
-  459,    0,    0,  454,    0,    0,  660,  659,  484,    0,
-  524,  498,    0,    0,  148,  525,  146,  147,  527,    0,
-  542,  541,  840,    0,  919,    0,  912,    0,  916,  533,
-    0,    0,    0,  368,    0,  531,    0,    0,  545,  937,
-    0,  933,  857,    0,  948,    0,  946,    0,    0,  680,
-  681,    0,    0,    0,  658,  657,  664,    0,  745,  731,
-  732,  730,  741,  662,    0,  348,  650,    0,    0,    0,
-  564,  560,  907,  906,  784,  444,  438,  442,  437,  547,
-  482,  481,  480,  477,  476,    0,  471,  433,  434,  445,
-  446,    0,  633,    0,  806,    0,    0,  976,  950,    0,
-  977,    0,  960,  962,  973,    0,  988,    0,  954, 1002,
-   19,  345,  728,  727,    0,  726,    0,  363, 1034,  185,
- 1029,    0,    0,   60,   57,    0,    0,    0,    0,    0,
-    0,  370,    0,  684,    0,    0,   85,   84,    0,  487,
-    0,    0,    0,    0,    0,  178,  555,    0,    0,    0,
-    0,    0,  873,  865,  863,    0,  884,    0,    0,  928,
-  511,  510,    0,  462,    0,    0, 1013, 1014,  450,  456,
-    0,  460,    0,    0,    0,    0,    0,    0,  838,  922,
-    0,  913,    0,  539,  534,    0,    0,  530,    0,  936,
-    0,  856,  949,  947,    0,  551,    0,  666,  656,  351,
-  649,  648,  668,  479,    0,  470,  469,  468,  634,  635,
-  632,    0,  822,  805,    0,    0,    0,  811,    0,  952,
-    0,  981,    0,    0,  996,  997,  990,    0,  366,  365,
- 1033,    0,    0,   66,   59,    0,   68,   29,   22,    0,
-    0,  319,    0,  221,    0,  109,    0,   82,  816,  121,
-  122,    0,    0,    0,  819,  193,  194,    0,    0,    0,
-    0,  166,  175,  167,  169,  860,    0,    0,    0,    0,
-    0,  882,    0,    0,  463,  464,  458,  461,  457,  451,
-  455,    0,  516,    0,  485,  495,  449,  528,  526,    0,
-  918,    0,    0,    0,  535,    0,  939,    0,    0,  679,
-  671,    0,  478,    0,    0,  803,  802,  799,  812,  951,
-    0,    0,    0,  965,    0,  963,  974,    0, 1003, 1021,
-    0,   79,    0,    0,   73,   74,   77,   78,    0,  336,
-  325,  324,    0,  685,  217,  104,    0,  801,  820,  179,
-    0,  191,    0,    0,    0,  858,  941,    0,    0,    0,
-    0,  864,    0,  885,  836,  500,  497,  845,    0,  851,
-    0,    0,  843,    0,  847,    0,  538,  537,  938,  934,
-    0,  669,    0,    0,  953,  978,    0,  964,    0,    0,
-  992,    0,   80,   71,    0,    0,    0,  320,    0,    0,
-    0,    0,    0,  180,    0,  170,  168,  931,  874,  868,
-  866,    0,    0,  839,  844,    0,  848,  923,    0,    0,
-  672,    0,  814,    0,  982,  999, 1000,  993,   58,    0,
-   75,   76,    0,    0,    0,    0,    0,    0,    0,  821,
-  177,    0,  190,    0,    0,  886,  850,  849,  736,  921,
-  935,  823,    0,    0,    0,   81,    0,    0,  337,    0,
-    0,  335,  321,    0,  329,  386,    0,  384,    0,  686,
-    0,  715,  218,  105,  181,  932,  870,  867,    0,    0,
-  879,    0,  979,    0,  994,    0,    0,    0,  317,    0,
-    0,  712,    0,    0,    0,  716,    0,    0,    0,    0,
-    0,  983,   27,   26,   23,  338,  334,    0,    0,  330,
-  385,  718,    0,    0,    0,  106,  869,  737,    0,    0,
-    0,    0,   32,  322,  723,    0,  724,  721,    0,  719,
-  102,    0,   99,    0,    0,   88,   90,   91,   92,   93,
-   94,   95,   96,   97,   98,  100,  101,  149,    0,    0,
-  234,  226,  227,  228,  229,  230,  231,  232,  233,    0,
-    0,  224,    0,    0,  980,    0,  339,  333,    0,    0,
-    0,  687,   89,    0,  733,  735,  277,  272,  276,    0,
-  219,  225,    0,  986,  984,  722,  720,    0,    0,    0,
-    0,    0,    0,    0,  286,    0,    0,  235,    0,    0,
-  243,    0,  161,  150,  160,    0,    0,    0,  107,    0,
-    0,  271,    0,    0,  270,    0,  154,    0,    0,  357,
-  318,    0,  355,    0,    0,  196,    0,    0,    0,    0,
-    0,  688,    0,  220,    0,  112,  110,  293,    0,  354,
-    0,    0,    0,    0,  125,    0,    0,    0,    0,    0,
-    0,  159,  151,    0,    0,  200,    0,  358,    0,  238,
-  237,  236,    0,  734,  108,    0,  290,    0,  268,  127,
-    0,  266,    0,    0,    0,  129,    0,  359,    0,    0,
-  197,    0,    0,    0,  356,  241,  120,  118,    0,    0,
-  295,    0,    0,    0,    0,    0,  155,    0,  274,    0,
-    0,    0,    0,  133,    0,    0,    0,    0,  360,  361,
-    0,    0,    0,    0,    0,  115,  310,    0,  291,    0,
-    0,  304,    0,    0,    0,  299,    0,  145,    0,    0,
-    0,    0,  140,    0,    0,  287,    0,  130,    0,  124,
-  134,  152,  158,  208,    0,  198,    0,    0,  201,    0,
-  119,    0,  111,  116,    0,    0,    0,  306,    0,  307,
-  296,    0,    0,  289,  300,  269,    0,    0,  126,  141,
-  267,    0,  285,    0,  275,  279,  136,    0,    0,    0,
-  205,  207,    0,  242,  117,  311,  313,  292,    0,    0,
-  305,  302,  144,  142,  156,  284,    0,    0,    0,  153,
-  209,  211,  199,    0,    0,    0,  304,    0,  280,  282,
-  137,    0,    0,  202,  315,  316,  312,  314,  303,  157,
-    0,    0,  215,  214,  213,  210,  212,    0,    0,    0,
-  203,  281,  283,
+    0,  499,    0,  503,  373,  902,  901,    0,    0,  905,
+  904,  915,    0,    0,    0,  916,    0,    0,  928,    0,
+    0,  794,    0,  383,  379,  380,    0,    0,  378,  381,
+  382,    0,    0,    0,  579,    0,    0,  550,    0,  665,
+    0,  746,    0,    0,    0,  740,  742,  743,  744,  435,
+  436,    0,  349,  350,    0,  187,  186,  188,    0,  652,
+    0,    0,    0,  375,    0,  647,    0,    0,  909,    0,
+    0,    0,  440,    0,  443,    0,    0,  441,    0,    0,
+  483,    0,  447,    0,    0,    0,    0,  472,  475,    0,
+    0,  467,  474,  473,  636,  637,  638,  639,  640,  641,
+  642,  643,  644,  646,  645,  583,  580,  585,  582,  584,
+  581,  593,  589,  594,  590,  591,    0,  592,    0,  598,
+    0,  599,    0,  605,    0,  606,    0,  607,    0,  608,
+    0,  612,    0,  613,    0,  616,    0,  619,    0,  622,
+    0,  625,    0,  628,    0,  630,    0,    0,  518,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  958,  957,
+    0,  968,    0,  956,    0,    0,  343, 1023, 1024,  367,
+    0,    0,    0,  364,    0,    0,  184,    0,    0, 1033,
+ 1019, 1021,   61,   63,   64,    0,    0,   56,    0,    0,
+   65,   67,   30,   28,    0,    0,    0,  690,    0,  694,
+  439,    0,  491,    0,  543,    0,  556,  173,  195,    0,
+    0,    0,  163,    0,    0,    0,  174,  549,    0,  931,
+    0,  881,  862,    0,  872,    0,  883,    0,  899,  837,
+    0,  930,    0,    0,  504,    0,  520,  522,    0,    0,
+    0,  459,    0,    0,  454,    0,    0,  660,  659,  484,
+    0,  524,  498,    0,    0,  148,  525,  146,  147,  527,
+    0,  542,  541,  840,    0,  920,    0,  913,    0,  917,
+  533,    0,    0,    0,  368,    0,  531,    0,    0,  545,
+  938,    0,  934,  857,    0,  949,    0,  947,    0,    0,
+  680,  681,    0,    0,    0,  658,  657,  664,    0,  745,
+  731,  732,  730,  741,  662,    0,  348,  650,    0,    0,
+    0,  564,  560,  908,  907,  784,  444,  438,  442,  437,
+  547,  482,  481,  480,  477,  476,    0,  471,  433,  434,
+  445,  446,    0,  633,    0,  806,    0,    0,  977,  951,
+    0,  978,    0,  961,  963,  974,    0,  989,    0,  955,
+ 1003,   19,  345,  728,  727,    0,  726,    0,  363, 1035,
+  185, 1030,    0,    0,   60,   57,    0,    0,    0,    0,
+    0,    0,  370,    0,  684,    0,    0,   85,   84,    0,
+  487,    0,    0,    0,    0,    0,  178,  555,    0,    0,
+    0,    0,    0,  873,  865,  863,    0,  884,    0,    0,
+  929,  511,  510,    0,  462,    0,    0, 1014, 1015,  450,
+  456,    0,  460,    0,    0,    0,    0,    0,    0,  838,
+  923,    0,  914,    0,  539,  534,    0,    0,  530,    0,
+  937,    0,  856,  950,  948,    0,  551,    0,  666,  656,
+  351,  649,  648,  668,  479,    0,  470,  469,  468,  634,
+  635,  632,    0,  822,  805,    0,    0,    0,  811,    0,
+  953,    0,  982,    0,    0,  997,  998,  991,    0,  366,
+  365, 1034,    0,    0,   66,   59,    0,   68,   29,   22,
+    0,    0,  319,    0,  221,    0,  109,    0,   82,  816,
+  121,  122,    0,    0,    0,  819,  193,  194,    0,    0,
+    0,    0,  166,  175,  167,  169,  860,    0,    0,    0,
+    0,    0,  882,    0,    0,  463,  464,  458,  461,  457,
+  451,  455,    0,  516,    0,  485,  495,  449,  528,  526,
+    0,  919,    0,    0,    0,  535,    0,  940,    0,    0,
+  679,  671,    0,  478,    0,    0,  803,  802,  799,  812,
+  952,    0,    0,    0,  966,    0,  964,  975,    0, 1004,
+ 1022,    0,   79,    0,    0,   73,   74,   77,   78,    0,
+  336,  325,  324,    0,  685,  217,  104,    0,  801,  820,
+  179,    0,  191,    0,    0,    0,  858,  942,    0,    0,
+    0,    0,  864,    0,  885,  836,  500,  497,  845,    0,
+  851,    0,    0,  843,    0,  847,    0,  538,  537,  939,
+  935,    0,  669,    0,    0,  954,  979,    0,  965,    0,
+    0,  993,    0,   80,   71,    0,    0,    0,  320,    0,
+    0,    0,    0,    0,  180,    0,  170,  168,  932,  874,
+  868,  866,    0,    0,  839,  844,    0,  848,  924,    0,
+    0,  672,    0,  814,    0,  983, 1000, 1001,  994,   58,
+    0,   75,   76,    0,    0,    0,    0,    0,    0,    0,
+  821,  177,    0,  190,    0,    0,  886,  850,  849,  736,
+  922,  936,  823,    0,    0,    0,   81,    0,    0,  337,
+    0,    0,  335,  321,    0,  329,  386,    0,  384,    0,
+  686,    0,  715,  218,  105,  181,  933,  870,  867,    0,
+    0,  879,    0,  980,    0,  995,    0,    0,    0,  317,
+    0,    0,  712,    0,    0,    0,  716,    0,    0,    0,
+    0,    0,  984,   27,   26,   23,  338,  334,    0,    0,
+  330,  385,  718,    0,    0,    0,  106,  869,  737,    0,
+    0,    0,    0,   32,  322,  723,    0,  724,  721,    0,
+  719,  102,    0,   99,    0,    0,   88,   90,   91,   92,
+   93,   94,   95,   96,   97,   98,  100,  101,  149,    0,
+    0,  234,  226,  227,  228,  229,  230,  231,  232,  233,
+    0,    0,  224,    0,    0,  981,    0,  339,  333,    0,
+    0,    0,  687,   89,    0,  733,  735,  277,  272,  276,
+    0,  219,  225,    0,  987,  985,  722,  720,    0,    0,
+    0,    0,    0,    0,    0,  286,    0,    0,  235,    0,
+    0,  243,    0,  161,  150,  160,    0,    0,    0,  107,
+    0,    0,  271,    0,    0,  270,    0,  154,    0,    0,
+  357,  318,    0,  355,    0,    0,  196,    0,    0,    0,
+    0,    0,  688,    0,  220,    0,  112,  110,  293,    0,
+  354,    0,    0,    0,    0,  125,    0,    0,    0,    0,
+    0,    0,  159,  151,    0,    0,  200,    0,  358,    0,
+  238,  237,  236,    0,  734,  108,    0,  290,    0,  268,
+  127,    0,  266,    0,    0,    0,  129,    0,  359,    0,
+    0,  197,    0,    0,    0,  356,  241,  120,  118,    0,
+    0,  295,    0,    0,    0,    0,    0,  155,    0,  274,
+    0,    0,    0,    0,  133,    0,    0,    0,    0,  360,
+  361,    0,    0,    0,    0,    0,  115,  310,    0,  291,
+    0,    0,  304,    0,    0,    0,  299,    0,  145,    0,
+    0,    0,    0,  140,    0,    0,  287,    0,  130,    0,
+  124,  134,  152,  158,  208,    0,  198,    0,    0,  201,
+    0,  119,    0,  111,  116,    0,    0,    0,  306,    0,
+  307,  296,    0,    0,  289,  300,  269,    0,    0,  126,
+  141,  267,    0,  285,    0,  275,  279,  136,    0,    0,
+    0,  205,  207,    0,  242,  117,  311,  313,  292,    0,
+    0,  305,  302,  144,  142,  156,  284,    0,    0,    0,
+  153,  209,  211,  199,    0,    0,    0,  304,    0,  280,
+  282,  137,    0,    0,  202,  315,  316,  312,  314,  303,
+  157,    0,    0,  215,  214,  213,  210,  212,    0,    0,
+    0,  203,  281,  283,
   };
   protected static readonly short [] yyDgoto  = {             7,
-    8,   49,    9,   50,   10,   11,   51,  232,  739,  701,
-   12,   13,   52,   22,   23,  326,  235,  724,  900, 1099,
- 1218, 1265, 1575,  897,  236,  237,  238,  239,  240,  241,
-  242,  243,  717,  462,  718,  719, 1003,  720,  721, 1007,
-  898, 1094, 1095, 1096,  267,  618, 1190,  110,  909,  779,
- 1294, 1295, 1296, 1297, 1298, 1299, 1300, 1301, 1302, 1303,
- 1304, 1305, 1306, 1307,  481,  728, 1383, 1017, 1197, 1161,
- 1230, 1258, 1323, 1395, 1226, 1449, 1426, 1474, 1475, 1476,
- 1019, 1472, 1020,  788,  901, 1437, 1410, 1462,  534, 1455,
- 1431, 1491,  983, 1460, 1463, 1464, 1559, 1492, 1493, 1489,
- 1308, 1364, 1334, 1384,  741, 1439, 1538, 1407, 1495, 1568,
-  482,  268,  742,  743,  744,  745,  746,  704,  591, 1202,
-  705,  706,  915, 1386, 1415, 1506, 1467, 1540, 1387, 1442,
- 1543, 1588, 1507, 1508, 1586, 1572, 1573, 1015, 1160, 1257,
- 1320, 1368, 1321, 1322, 1358, 1422, 1390, 1359,  329,  223,
- 1471, 1361, 1456, 1453, 1309, 1338, 1379, 1535, 1497, 1339,
- 1536,  619, 1581, 1582, 1378, 1452, 1428, 1484, 1479, 1450,
- 1516, 1521, 1482, 1485, 1486, 1567, 1522, 1480, 1481, 1577,
- 1565, 1566, 1012, 1103, 1223, 1195, 1250, 1224, 1225, 1268,
- 1157, 1247, 1281,  554,  193,  112,  366,  195,  584,  457,
-  224, 1402,  702,  703,  885,  902,  330,  422,  553,  305,
- 1227, 1228,   45,  114,  306,  116,  117,  118,  119,  120,
+    8,   49,    9,   50,   10,   11,   51,  232,  740,  702,
+   12,   13,   52,   22,   23,  326,  235,  725,  901, 1100,
+ 1219, 1266, 1576,  898,  236,  237,  238,  239,  240,  241,
+  242,  243,  718,  462,  719,  720, 1004,  721,  722, 1008,
+  899, 1095, 1096, 1097,  267,  619, 1191,  110,  910,  780,
+ 1295, 1296, 1297, 1298, 1299, 1300, 1301, 1302, 1303, 1304,
+ 1305, 1306, 1307, 1308,  481,  729, 1384, 1018, 1198, 1162,
+ 1231, 1259, 1324, 1396, 1227, 1450, 1427, 1475, 1476, 1477,
+ 1020, 1473, 1021,  789,  902, 1438, 1411, 1463,  534, 1456,
+ 1432, 1492,  984, 1461, 1464, 1465, 1560, 1493, 1494, 1490,
+ 1309, 1365, 1335, 1385,  742, 1440, 1539, 1408, 1496, 1569,
+  482,  268,  743,  744,  745,  746,  747,  705,  592, 1203,
+  706,  707,  916, 1387, 1416, 1507, 1468, 1541, 1388, 1443,
+ 1544, 1589, 1508, 1509, 1587, 1573, 1574, 1016, 1161, 1258,
+ 1321, 1369, 1322, 1323, 1359, 1423, 1391, 1360,  329,  223,
+ 1472, 1362, 1457, 1454, 1310, 1339, 1380, 1536, 1498, 1340,
+ 1537,  620, 1582, 1583, 1379, 1453, 1429, 1485, 1480, 1451,
+ 1517, 1522, 1483, 1486, 1487, 1568, 1523, 1481, 1482, 1578,
+ 1566, 1567, 1013, 1104, 1224, 1196, 1251, 1225, 1226, 1269,
+ 1158, 1248, 1282,  555,  193,  112,  366,  195,  585,  457,
+  224, 1403,  703,  704,  886,  903,  330,  422,  554,  305,
+ 1228, 1229,   45,  114,  306,  116,  117,  118,  119,  120,
   121,  122,  123,  124,  125,  126,  127,  128,  129,  130,
-  131,  132,  133,  134,  135,  136,  253,  860,  784, 1056,
- 1046,  772,  939,  773,  774, 1047,  137,  198,  780,  621,
-  622,  623,  854,  491,  492,  298, 1054,  782,  423,  300,
-  517,  518,  519,  520,  523,  790,  314,  807,  808,  955,
-  264,  497,  822,  265,  496,  138,  139,  140,  141,  142,
+  131,  132,  133,  134,  135,  136,  253,  861,  785, 1057,
+ 1047,  773,  940,  774,  775, 1048,  137,  198,  781,  622,
+  623,  624,  855,  491,  492,  298, 1055,  783,  423,  300,
+  517,  518,  519,  520,  523,  791,  314,  808,  809,  956,
+  264,  497,  823,  265,  496,  138,  139,  140,  141,  142,
   143,  144,  145,  146,  147,  148,  149,  150,  151,  152,
-  594,  595,  596,  827,  828,  153,  581,  570,  824,  367,
- 1072,  568, 1141,  154,  511, 1013, 1159, 1255, 1362,  483,
- 1231, 1232, 1289, 1290,  886,  573,  344,  832, 1366, 1210,
- 1242,  574,  575,  269,  270,  271,  157,  158,  159,  272,
+  595,  596,  597,  828,  829,  153,  582,  571,  825,  367,
+ 1073,  569, 1142,  154,  511, 1014, 1160, 1256, 1363,  483,
+ 1232, 1233, 1290, 1291,  887,  574,  344,  833, 1367, 1211,
+ 1243,  575,  576,  269,  270,  271,  157,  158,  159,  272,
   273,  274,  275,  276,  277,  278,  279,  280,  281,  282,
-  283,  171,  284,  601,  172,  173,  322,  867,  677,  986,
- 1078,  912,  735, 1023,  984,  987, 1119,  988, 1024, 1025,
-  285,  174,  175,  176, 1131, 1060, 1132, 1133, 1134, 1135,
-  177,  178,  179,  180,  752,  504,  753, 1122, 1041, 1123,
- 1238, 1205, 1239,  754, 1040,  755, 1241, 1172,  181,  182,
-  183,  184,  185,  186,  307,  544,  545, 1062, 1179,  318,
- 1039,  922, 1204, 1069,  961, 1180,  187,  435,  188,  436,
-  989, 1081,  437,  438,  693,  684,  685, 1086,  993,  439,
-  440,  441,  442,  443,  994,  679,  991, 1184, 1261, 1325,
- 1083, 1214, 1280,  877,  687,  878, 1150, 1088, 1151, 1215,
-  998,   17,   19,   46,   47,  227,  707,  893,  458,  708,
-  709,
+  283,  171,  284,  602,  172,  173,  322,  868,  678,  987,
+ 1079,  913,  736, 1024,  985,  988, 1120,  989, 1025, 1026,
+  285,  174,  175,  176, 1132, 1061, 1133, 1134, 1135, 1136,
+  177,  178,  179,  180,  753,  504,  754, 1123, 1042, 1124,
+ 1239, 1206, 1240,  755, 1041,  756, 1242, 1173,  181,  182,
+  183,  184,  185,  186,  307,  545,  546, 1063, 1180,  318,
+ 1040,  923, 1205, 1070,  962, 1181,  187,  435,  188,  436,
+  990, 1082,  437,  438,  694,  685,  686, 1087,  994,  439,
+  440,  441,  442,  443,  995,  680,  992, 1185, 1262, 1326,
+ 1084, 1215, 1281,  878,  688,  879, 1151, 1089, 1152, 1216,
+  999,   17,   19,   46,   47,  227,  708,  894,  458,  709,
+  710,
   };
-  protected static readonly short [] yySindex = {          -69,
-    0, -197,   55,  -20,  138, 1599,    0,  135,    0,    0,
-  138,  -20,    0,    0,  -93,    0, 6984,  138,    0, -180,
- -262,    0,    0,    0,    0,    0,    0,    0,  101,    0,
-  211,    0,    0,    0,  999,    0,    0,    0,    0,    0,
-    0,    0,    0,  662,    0,    0,  737,    0,    0,  135,
-  167,  138,    0,  319,    0,  385,  349, -174,16458, -162,
-  378,  268, 7141,    0,  378,  378,  378, -171,  378,  378,
-  768,    0, 8985,  378,  378,    0, 9142,    0,  396,    0,
- -156,    0,  378,  397,  378,    0,17002,17002,  493,  378,
-  378,   17,10215,    0,15697,    0,10346,10477,10608,10739,
-10870,11001,11132,11263,    0,  269,    0, 7943,    0,  174,
-    0,  229, -244,  939, -247,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0, 1167,  817,
-  208,  596,  664,  829,  453,  556,  497,  521,  421,  653,
-    0,    0,    0,    0,    0,    0, 3497,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  229,  682,  297,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  226,  362,  167,    0,
-  545,  625,    0,  638,    0,    0,    0,    0, 7943, 7943,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  692,  675,    0,  711,    0,   -5,    0,    0,
-    0,  167,17538,  880,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  886,  229,15833,    0,    0,    0,
-    0,    0,15697, -163, -153,  884, -282,  939,  229,    0,
-    0, 7943,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0, -191, -252,16458,    0, 7943,15697,  807,
-    0,    0,  820,15697,15697,14014,  478, -165,  804, 8100,
-    0,10215,  269,  930,  851,    0,  856, 7943,15697,    0,
-    0,  859,  531,  378,    0,    0,15697,  396,15289,    0,
-    0,  397,15697,  397,  413,  467,  899,  229,    0,  682,
- -247,  945,  229,15697,15697,15697,  268,    0,  909,    0,
-    0,11394,    0, 7298, -277,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0, 3903,    0,    0,16855,  413,  883,  897,
-15697,    0,  846,    0,  139,    0,    0,  225,    0,    0,
-  858, 9299, 7612,    0,    0,15697,15697,15697,15697,15697,
-15697,15697,15697,15697,15697,15697,11525,11656,11787, 4062,
- 4380,11918,12049,12180,12311,12442,12573,12704,12835,12966,
-13097,13228,13359,13490,13621,13752,16241,15697,    0,    0,
-    0,    0,  682,    0,    0,    0,    0,17002,17002,    0,
-    0,  229,    0,    0,    0,    0,  384,  923,    0,    0,
-    0,    0,    0,    0,    0,  167,  880,  865,    0,  903,
-    0,  846,  692,  692,    0,  -53,    0,  575,  692,  918,
-    0, -195,17538,    0,    0,    0,    0, -150,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  195,17568,    0,    0,    0,    0,  846,    0,    0,  942,
-  639,    0,  974,    0,  986,  253,  396,    0,  378,    0,
-    0,    0,  229,15289, -179,    0,  949,    0,    0,    0,
-   54,  103,    0, -282,  982,    0,  996,    0,  992,    0,
-    0,    0,  680,    0, 8355,  695, 9456,  804,15153,    0,
- 7769,    0,  397,    0,    0,    0,    0,  143,  147,    0,
-    0,  278,  396,  252,    0,  828,  998,    0,  148,  229,
-    0,  151,    0,    0,    0,15697, 1074,    0,    0,    0,
-15697, 1096, 1025,    0, 1028, 1031,    0,16855,    0,   75,
-    0, -172,  215, 7298,    0,    0,    0,    0,    0,    0,
-   75,    0,    0, -272,    0,    0,    0,  397,    0,  413,
-  229, 8531,    0, 1032,    0, 1033,13883,    0, 1151, 1035,
- 7298,    0,  980,    0,  846,  985,    0,  846,  846,    0,
-  137,    0,15697,15697, 1041, 1160,    0,    0,  145,  -78,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  817,    0,  817,    0,  208,
-    0,  208,    0,  596,    0,  596,    0,  596,    0,  596,
-    0,  664,    0,  664,    0,  829,    0,  453,    0,  556,
-    0,  497,    0,  521,    0,   68, -141,    0, 9456, 1123,
-  229, 1125,  229, 9456, 9456, 1039,15697,    0,    0,  923,
-    0,  229,    0,  706,  846,    0,    0,    0,    0,  532,
-  167,  331,    0, 8531,  575,    0, 1049, 1048,    0,    0,
-    0,    0,    0,    0,  -80, 1050,    0, 1052, 1051,    0,
-    0,    0,    0, 1055, 8688, 1006,    0,  466,    0,    0,
-  697,    0,15833,    0, 1054,    0,    0,    0,  686,  162,
- 1057,    0, 1056, 1058, 1062,    0,    0,15697,    0,  229,
-    0,    0,  739,    0, 1063,    0,  249,    0,    0, 7141,
-    0, 7141, 8514,    0,14014,    0,    0,10084, 8671,  220,
-    0,  234,   91,    0, 1002, 1018,    0,    0,    0,  751,
-    0,    0, 1070, 1072,    0,    0,    0,    0,    0, 1075,
-    0,    0,    0, 1077,    0, 4539,    0,  396,    0,    0,
-  397,  568, 1029,    0,  261,    0, 1079, 1080,    0,    0,
- 7141,    0,    0, 7141,    0,15697,    0,15697, 7943,    0,
-    0,  396, 1082,   75,    0,    0,    0,15697,    0,    0,
-    0,    0,    0,    0, 7943,    0,    0,  229,16855, 1109,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,15017,    0,    0,    0,    0,
-    0, 7926,    0, 8828,    0, 8083, 1084,    0,    0, 1162,
-    0, 1165,    0,    0,    0,  745,    0, 1086,    0,    0,
-    0,    0,    0,    0, 1044,    0,  -53,    0,    0,    0,
-    0,  575,  575,    0,    0,  865, 1093, 1094, 1046, 1101,
- 1006,    0, 1095,    0, 1213, 1215,    0,    0, 9456,    0,
-15425, 1099,  686, 8531, 7943,    0,    0,  428, 1218, 1219,
-  154, 1097,    0,    0,    0,15697,    0,15697, 1196,    0,
-    0,    0,15561,    0,   43,15561,    0,    0,    0,    0,
- 8219,    0, 1221,  682, 9456, 1112, 8514, 1114,    0,    0,
-  229,    0,  291,    0,    0,  846, 1029,    0,  229,    0,
- -121,    0,    0,    0, 1108,    0, 1140,    0,    0,    0,
-    0,    0,    0,    0,  818,    0,    0,    0,    0,    0,
-    0, 8100,    0,    0,  229, -246, 1084,    0, 9456,    0,
- 9456,    0,   90, 9456,    0,    0,    0,  728,    0,    0,
-    0, 1115,  865,    0,    0, 9613,    0,    0,    0, 1113,
- 4704,    0, 1006,    0, 1006,    0, 1006,    0,    0,    0,
-    0,  229, 1110, 1099,    0,    0,    0, -167, -145, 1116,
- 1119,    0,    0,    0,    0,    0, 1111, 8514, 1084, -141,
-15697,    0, 1117, 7141,    0,    0,    0,    0,    0,    0,
-    0, 1118,    0,  804,    0,    0,    0,    0,    0, -189,
-    0, 1122,  846, 1029,    0, 1029,    0, 1084, 1126,    0,
-    0,   75,    0, 1083, 1121,    0,    0,    0,    0,    0,
- 9456, 1148, 9456,    0, 9456,    0,    0,15697,    0,    0,
- 1051,    0,  329,  834,    0,    0,    0,    0,  -20,    0,
-    0,    0, 1130,    0,    0,    0, 1132,    0,    0,    0,
-  475,    0, 1133, 1244, 1247,    0,    0, 1084, 1143, 1084,
- 1144,    0, 1141,    0,    0,    0,    0,    0,15697,    0,
- 1153, -217,    0, 6825,    0, 1263,    0,    0,    0,    0,
-   75,    0,15697, 8083,    0,    0, 1175,    0,  946, 1152,
-    0, 1155,    0,    0, 9613,  138,  253,    0, 1154, 1154,
- 1154,15425, 1157,    0,15697,    0,    0,    0,    0,    0,
-    0, 7141,   77,    0,    0, 7298,    0,    0, 1163, 7141,
-    0, 1161,    0, 9456,    0,    0,    0,    0,    0,15697,
-    0,    0,  167, 1166,  167, 7943, 1194, 1194, 1194,    0,
-    0,15697,    0, 7141, 9770,    0,    0,    0,    0,    0,
-    0,    0, 1192, 9456,15697,    0,  167, 1173,    0, 1127,
-  927,    0,    0, 1169,    0,    0,  112,    0, 1131,    0,
- 1194,    0,    0,    0,    0,    0,    0,    0, 1172, 1063,
-    0, 7298,    0, 1202,    0, -160, 1194, 1296,    0, 1185,
-  167,    0, 7943,   88, 1187,    0, 1190, 1191, 7141, 1193,
- 9456,    0,    0,    0,    0,    0,    0, 1178, 1184,    0,
-    0,    0,16537,  166,  167,    0,    0,    0, 1210, 9456,
- 1203,15697,    0,    0,    0, 1209,    0,    0, 1207,    0,
-    0,17568,    0, 1214,  166,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  239,17568,
-    0,    0,    0,    0,    0,    0,    0,    0,    0, 1216,
-  167,    0,  166,  229,    0, 1210,    0,    0, 1211,16537,
-16703,    0,    0, -240,    0,    0,    0,    0,    0,16735,
-    0,    0, 1217,    0,    0,    0,    0, 7943, 7943,  510,
- 8100,  538,  397, 1249,    0,  413,14871,    0, 1282,    0,
-    0, 1184,    0,    0,    0, 7298,14909, 1184,    0, -139,
- -138,    0, 7943, -128,    0, 7943,    0, 1170, 1220,    0,
-    0,  413,    0,  107,14947,    0, 1223, 1171,    2,  104,
-  999,    0, 1222,    0, 1184,    0,    0,    0,  413,    0,
- 1226, 1176, 1224, 1225,    0, 1227, 1179, 1234,  253, 1242,
- 1233,    0,    0, 1254, 1229,    0,  846,    0,  901,    0,
-    0,    0, 1256,    0,    0,  -77,    0, 1243,    0,    0,
- 1259,    0, 1258, 1260, 1261,    0, 1257,    0,  253,  253,
-    0,  253, 1262, 1264,    0,    0,    0,    0, 1266,  199,
-    0, 1268,  253, 1378, 1269,  253,    0, -240,    0, 8514,
- 1230, 1271, 1257,    0, 1272, 1273,  212, 1279,    0,    0,
-  253,15425, 1236, 1275, 1266,    0,    0,17568,    0,  167,
-  167,    0, 1237, 1276, 1268,    0, 1284,    0,15697, 1239,
- 1283, 1269,    0, 1286,  253,    0,   89,    0, 1255,    0,
-    0,    0,    0,    0,17568,    0,  212,  212,    0, 1288,
-    0,  -77,    0,    0,  370, 1270,17568,    0,17568,    0,
-    0, 8514, 1280,    0,    0,    0, 1292, 1259,    0,    0,
-    0, 1291,    0,  339,    0,    0,    0, 1194,  984, 1300,
-    0,    0, 1297,    0,    0,    0,    0,    0, 1354, 1409,
-    0,    0,    0,    0,    0,    0, 1302, 1303, 8514,    0,
-    0,    0,    0,  212,  536,  536,    0, 1194,    0,    0,
-    0,   58,   58,    0,    0,    0,    0,    0,    0,    0,
-15153,15153,    0,    0,    0,    0,    0, 1307, 1305, 1310,
-    0,    0,    0,
+  protected static readonly short [] yySindex = {         -100,
+    0, -179, -141,  -43,   33,17069,    0,  162,    0,    0,
+   33,  -43,    0,    0,   19,    0, 7076,   33,    0, -164,
+   63,    0,    0,    0,    0,    0,    0,    0,  180,    0,
+  191,    0,    0,    0, 3956,    0,    0,    0,    0,    0,
+    0,    0,    0,  700,    0,    0,  726,    0,    0,  162,
+  224,   33,    0,  184,    0,  333,  251, -183,16498,  -63,
+ -266,  288, 7233,    0, -266, -266, -266, -185, -266, -266,
+  757,    0, 9077, -266, -266,    0, 9234,    0,  319,    0,
+ -163,    0, -266,  420, -266,    0,17088,17088,  450, -266,
+ -266,   17,10307,    0,15737,    0,10438,10569,10700,10831,
+10962,11093,11224,11355,    0,  151,    0, 8035,    0,  205,
+    0,  123,  434,  437,  337,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0, 1080,  795,
+  227, -258,  588,  389,  460,  478,  504,  523, -274,  564,
+    0,    0,    0,    0,    0,    0, 3657,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  123,  612, -286,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  225,  272,  224,    0,
+  445,  219,    0,  608,    0,    0,    0,    0, 8035, 8035,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  635,  596,    0,  617,    0, -236,    0,    0,
+    0,  224, 1481,  487,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  790,  123,15873,    0,    0,    0,
+    0,    0,15737, -197, -161,  778,  370,  437,  123,    0,
+    0, 8035,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0, -180,  215,16498,    0, 8035,15737,  692,
+    0,    0,  703,15737,15737,14106,  677, -201,  718, 8192,
+    0,10307,  151,  835,  721,    0,  739, 8035,15737,    0,
+  882,  769,  536, -266,    0,    0,15737,  319,15329,    0,
+    0,  420,15737,  420, -276,  530,  863,  123,    0,  612,
+  337,  868,  123,15737,15737,15737,  288,    0,  841,    0,
+    0,11486,    0, 7390, -264,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0, 1406,    0,    0,16895, -276,  817,  816,
+15737,    0,  783,    0,  181,    0,    0,  254,    0,    0,
+  784, 9391, 7704,    0,    0,15737,15737,15737,15737,15737,
+15737,15737,15737,15737,15737,15737,11617,11748,11879, 4222,
+ 4540,12010,12141,12272,12403,12534,12665,12796,12927,13058,
+13189,13320,13451,13582,13713,13844,16281,15737,    0,    0,
+    0,    0,  612,    0,    0,    0,    0,17088,17088,    0,
+    0,  123,    0,    0,    0,    0,  489,  856,    0,    0,
+    0,    0,    0,    0,    0,  224,  487,  823,    0,  826,
+    0,  783,  635,  635,    0,  129,    0,  539,  635,  881,
+    0, -111, 1481,    0,    0,    0,    0, -158,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  289,17624,    0,    0,    0,    0,  783,    0,    0,  840,
+  732,    0,  885,    0,  896,  198,  319,    0, -266,    0,
+    0,    0,  123,15329, -176,    0,  878,    0,    0,    0,
+   53,  100,    0,  370,  894,    0,  910,    0,  906,    0,
+    0,    0,  742,    0, 8447,  744, 9548,  718,15193,    0,
+ 7861,    0,  420,    0,    0,    0,    0,  106,  125,    0,
+    0,    0,  214,  319,  499,    0, 1129,  915,    0,  143,
+  123,    0,  146,    0,    0,    0,15737,  988,    0,    0,
+    0,15737,  994,  916,    0,  917,  919,    0,16895,    0,
+   84,    0, -125,  127, 7390,    0,    0,    0,    0,    0,
+    0,   84,    0,    0, -267,    0,    0,    0,  420,    0,
+ -276,  123, 8623,    0,  918,    0,  921,13975,    0, 1038,
+  920, 7390,    0,  869,    0,  783,  875,    0,  783,  783,
+    0, -168,    0,15737,15737,  928, 1046,    0,    0,  201,
+ -131,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  795,    0,  795,    0,
+  227,    0,  227,    0, -258,    0, -258,    0, -258,    0,
+ -258,    0,  588,    0,  588,    0,  389,    0,  460,    0,
+  478,    0,  504,    0,  523,    0,   54, -155,    0, 9548,
+ 1014,  123, 1017,  123, 9548, 9548,  931,15737,    0,    0,
+  856,    0,  123,    0,  534,  783,    0,    0,    0,    0,
+  223,  224,  322,    0, 8623,  539,    0,  941,  940,    0,
+    0,    0,    0,    0,    0,  -98,  942,    0,  945,  943,
+    0,    0,    0,    0,  948, 8780,  898,    0, -162,    0,
+    0,  631,    0,15873,    0,  949,    0,    0,    0,  577,
+  131,  950,    0,  952,  958,  969,    0,    0,15737,    0,
+  123,    0,    0,  764,    0,  971,    0,  372,    0,    0,
+ 7233,    0, 7233, 8606,    0,14106,    0,    0,10176, 8763,
+  271,    0,  134,  102,    0,  895,  923,    0,    0,    0,
+  767,    0,    0,  975,  976,    0,    0,    0,    0,    0,
+  978,    0,    0,    0,  982,    0, 4699,    0,  319,    0,
+    0,  420,  562,  932,    0,  150,    0,  983,  984,    0,
+    0, 7233,    0,    0, 7233,    0,15737,    0,15737, 8035,
+    0,    0,  319,  986,   84,    0,    0,    0,15737,    0,
+    0,    0,    0,    0,    0, 8035,    0,    0,  123,16895,
+ 1020,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,15057,    0,    0,    0,
+    0,    0, 8018,    0, 8920,    0, 8175,  992,    0,    0,
+ 1066,    0, 1073,    0,    0,    0,  797,    0,  996,    0,
+    0,    0,    0,    0,    0,  953,    0,  129,    0,    0,
+    0,    0,  539,  539,    0,    0,  823,  998, 1002,  956,
+ 1008,  898,    0, 1001,    0, 1121, 1122,    0,    0, 9548,
+    0,15465, 1005,  577, 8623, 8035,    0,    0, -227, 1124,
+ 1126,  164, 1003,    0,    0,    0,15737,    0,15737, 1103,
+    0,    0,    0,15601,    0,  451,15601,    0,    0,    0,
+    0, 8311,    0, 1131,  612, 9548, 1021, 8606, 1022,    0,
+    0,  123,    0,  266,    0,    0,  783,  932,    0,  123,
+    0,   82,    0,    0,    0, 1019,    0, 1049,    0,    0,
+    0,    0,    0,    0,    0,  801,    0,    0,    0,    0,
+    0,    0, 8192,    0,    0,  123,  486,  992,    0, 9548,
+    0, 9548,    0,  165, 9548,    0,    0,    0,  743,    0,
+    0,    0, 1025,  823,    0,    0, 9705,    0,    0,    0,
+ 1018, 4864,    0,  898,    0,  898,    0,  898,    0,    0,
+    0,    0,  123, 1024, 1005,    0,    0,    0, -174, -147,
+ 1023, 1027,    0,    0,    0,    0,    0, 1030, 8606,  992,
+ -155,15737,    0, 1026, 7233,    0,    0,    0,    0,    0,
+    0,    0, 1041,    0,  718,    0,    0,    0,    0,    0,
+ -184,    0, 1040,  783,  932,    0,  932,    0,  992, 1042,
+    0,    0,   84,    0,  990, 1037,    0,    0,    0,    0,
+    0, 9548, 1074, 9548,    0, 9548,    0,    0,15737,    0,
+    0,  943,    0,  302,  813,    0,    0,    0,    0,  -43,
+    0,    0,    0, 1053,    0,    0,    0, 1044,    0,    0,
+    0,  383,    0, 1045, 1166, 1167,    0,    0,  992, 1056,
+  992, 1058,    0, 1059,    0,    0,    0,    0,    0,15737,
+    0, 1064, -138,    0, 6917,    0, 1180,    0,    0,    0,
+    0,   84,    0,15737, 8175,    0,    0, 1090,    0,  811,
+ 1065,    0, 1068,    0,    0, 9705,   33,  198,    0, 1067,
+ 1067, 1067,15465, 1076,    0,15737,    0,    0,    0,    0,
+    0,    0, 7233,   74,    0,    0, 7390,    0,    0, 1083,
+ 7233,    0, 1084,    0, 9548,    0,    0,    0,    0,    0,
+15737,    0,    0,  224, 1071,  224, 8035, 1114, 1114, 1114,
+    0,    0,15737,    0, 7233, 9862,    0,    0,    0,    0,
+    0,    0,    0, 1107, 9548,15737,    0,  224, 1089,    0,
+ 1047,  574,    0,    0, 1088,    0,    0,  103,    0, 1051,
+    0, 1114,    0,    0,    0,    0,    0,    0,    0, 1092,
+  971,    0, 7390,    0, 1123,    0,   41, 1114, 1214,    0,
+ 1104,  224,    0, 8035,   78, 1108,    0, 1109, 1110, 7233,
+ 1111, 9548,    0,    0,    0,    0,    0,    0, 1097, 1105,
+    0,    0,    0,16577,  137,  224,    0,    0,    0, 1137,
+ 9548, 1118,15737,    0,    0,    0, 1132,    0,    0, 1134,
+    0,    0,17624,    0, 1127,  137,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  621,
+17624,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+ 1143,  224,    0,  137,  123,    0, 1137,    0,    0, 1125,
+16577,16743,    0,    0,  515,    0,    0,    0,    0,    0,
+16775,    0,    0, 1144,    0,    0,    0,    0, 8035, 8035,
+   83, 8192,  419,  420, 1176,    0, -276,14925,    0, 1209,
+    0,    0, 1105,    0,    0,    0, 7390,14963, 1105,    0,
+ -145, -144,    0, 8035, -137,    0, 8035,    0, 1099, 1148,
+    0,    0, -276,    0,   55,14993,    0, 1146, 1112,  119,
+  554, 3956,    0, 1153,    0, 1105,    0,    0,    0, -276,
+    0, 1155, 1113, 1152, 1151,    0, 1157, 1115, 1158,  198,
+ 1154, 1159,    0,    0, 1163, 1171,    0,  783,    0,  604,
+    0,    0,    0, 1168,    0,    0,   87,    0, 1160,    0,
+    0, 1173,    0, 1174, 1172, 1178,    0, 1177,    0,  198,
+  198,    0,  198, 1175, 1179,    0,    0,    0,    0, 1184,
+  183,    0, 1185,  198, 1290, 1186,  198,    0,  515,    0,
+ 8606, 1135, 1191, 1177,    0, 1182, 1189,  189, 1192,    0,
+    0,  198,15465, 1150, 1193, 1184,    0,    0,17624,    0,
+  224,  224,    0, 1156, 1194, 1185,    0, 1199,    0,15737,
+ 1161, 1197, 1186,    0, 1203,  198,    0,   91,    0, 1195,
+    0,    0,    0,    0,    0,17624,    0,  189,  189,    0,
+ 1205,    0,   87,    0,    0,   97, 1210,17624,    0,17624,
+    0,    0, 8606, 1202,    0,    0,    0, 1215, 1173,    0,
+    0,    0, 1212,    0,  287,    0,    0,    0, 1114,  814,
+ 1218,    0,    0, 1221,    0,    0,    0,    0,    0, 1286,
+ 1339,    0,    0,    0,    0,    0,    0, 1232, 1233, 8606,
+    0,    0,    0,    0,  189,  580,  580,    0, 1114,    0,
+    0,    0,   24,   24,    0,    0,    0,    0,    0,    0,
+    0,15193,15193,    0,    0,    0,    0,    0, 1237, 1234,
+ 1235,    0,    0,    0,
   };
-  protected static readonly short [] yyRindex = {         3000,
-    0,    0, 7455, 3000,    0,    0,    0, 1683,    0,    0,
- 3160, 1369,    0,    0,    0,    0,    0, 3160,    0,    0,
-   52,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0, 1684,    0,    0, 1684,    0,    0, 1683,
- 3203, 3043,    0,    0,    0,    0,    0,    0,    0,    0,
-    0, 1318,    0,    0,    0,    0,    0,    0,    0,    0,
- 8845,    0, 1311,    0,    0,    0, 1311,    0,    0,    0,
-    0,    0,    0,  130,    0,    0,    0,    0,    0,    0,
-    0,    0,  290,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0, 4697,    0,    0,    0,    0,
-    0,    0,  417, 4790, 4132,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0, 4946, 5014,
- 5254, 5458, 5798, 6002, 6138, 6274, 6410, 6546, 4877,  523,
-    0,    0,    0,    0,    0,    0,   52,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  359,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0, 3246,    0,
-  780,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0, 1684,   57,    0,    0,    0,    0,    0,    0,
-    0, 3289,  422, 3332,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0, 3743,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0, 1320,    0,    0,    0,    0,
-    0,    0, 3743, 1313,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0, 2373,    0, 2753,  256, 2503,    0,    0,    0, 1438,
- 2503,    0,    0,    0,    0,    0, 1318,    0,    0,    0,
-    0,    0,    0,  263,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0, 1319, 2607,    0,    0,
- 1311,    0, 3743,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  192,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0, 1766,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0, 2715,    0,    0,
-    0,    0,    0,    0,    0, 3375, 3418,    0,    0,    0,
-    0, 2227, 1684, 1684,    0,   36,    0, 7629, 1684, 1693,
-    0,    0,  217,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  537,16390,    0,    0,    0,    0, 3743,    0,    0,    0,
-    0,    0,    0,    0,    0,16779,    0,    0,    0,    0,
-    0,    0,    0,  758,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  869,  668,  795,    0,    0, 1327,    0,
-    0,    0,    0,    0,  264,    0,    0, 4220, 1325,    0,
-    0,    0,  594,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0, 1934,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0, 1319,    0,15969,
-    0, 6665,    0,  312,    0,    0,    0,    0,    0,    0,
-15969,    0,    0,    0,    0,    0,    0,   28,    0,  433,
-    0,    0,    0, 1326,    0,    0,    0,    0, 1313,    0,
-    0,    0, 3584,    0, 3743, 3584,    0, 3743, 4379,    0,
-    0,    0,    0,    0, -202,    0,    0,    0,    0,  242,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0, 5118,    0, 5186,    0, 5322,
-    0, 5390,    0, 5526,    0, 5594,    0, 5662,    0, 5730,
-    0, 5866,    0, 5934,    0, 6070,    0, 6206,    0, 6342,
-    0, 6478,    0, 6602,    0,    0,  607,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0, 2715,
-    0,    0,    0,    0, 2227,    0,    0,    0,    0, 1285,
-14176,    0,    0,    0, 9002,    0,    0,  839,    0,    0,
-    0,    0,    0,    0,  731,  674,    0,    0, 1331,    0,
-    0,    0,    0, 1639,    0,    0,    0,    0,    0,    0,
- 9927,    0,    0,    0,  838,    0,    0,    0, 9159,16926,
-    0,    0,  847,  875,  896,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  764,    0,    0,    0,    0,    0,
-    0,    0,    0,    0, 1338,    0,    0,    0,    0, 3650,
-    0,    0,  321,    0,   92, 3902,    0,    0,    0,    0,
-    0,    0,    0, 1336,    0,    0,    0,    0,    0, 1341,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
- -273,  701,    0,    0,    0,    0,    0, 1340,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,15969,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  574,    0,    0,    0,
-    0,    0,    0,    0,    0, -184,    0,  432,    0,    0,
-    0,    0,    0,    0,    0,    0,   36,    0,    0,    0,
-    0, 9159, 7786,    0,    0, 1343,    0,  800,    0,    0,
-    0,    0, 1347,    0, 1298, 1299,    0,    0,    0,    0,
-    0, 1334, 9316,    0,    0,    0,    0,16958,    0,    0,
-    0,  900,    0,    0,    0,    0,    0,    0, 2101,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0, 4061,    0, 4538, 1350,    0,    0,    0,
- 1057,    0,    0,    0,    0,  565,    0,    0,    0,    0,
-  900,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  647,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  916,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0, 1339,    0,    0,    0,    0,    0,  921,
-  941,    0,    0,    0,    0,    0,    0,    0,  998,  748,
- 1344,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0, 4220,    0,    0,    0,    0,    0, 1351,
-    0,    0,  565,    0,    0,  957,    0,  998,    0,    0,
-    0,15969,    0,  715,  720,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
- 1331,    0,14015,    0,    0,    0,    0,    0,17050,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  777,    0,  810,    0,    0,    0,    0, 1349,    0,  805,
- 1348,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0, 1355,    0,    0,    0, 1358,    0,    0,    0,    0,
-15969,    0,    0,    0,    0,    0,    0,    0, -164,  479,
-    0,    0,    0,    0,    0,17126,16779,    0,  576,  576,
-  576,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  -70,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,17231,    0, -245,    0, 1359, 1359, 1359,    0,
-    0,    0,    0,    0, 1356,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,17274,    0,    0,    0,
-14479,    0,    0, 1364,    0,    0,  579,    0,    0,    0,
-  591,    0,    0,    0,    0,    0,    0,    0,    0, 1361,
-    0, 1366,    0,    0,    0, 3086, 1363, -243,    0,    0,
-  209,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0, 2911,    0,
-    0,    0,    0,14281,14565,    0,    0,    0,  688,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  557,    0,
-    0,16561,    0,    0,14380,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,16629,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-14659,    0,14281,    0,    0,  688,    0,    0,    0,    0,
-  537,    0,    0,    0,    0,    0,    0,    0,    0,  537,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,14771,  587,    0,14701,    0,    0,    0,14833,
-    0, 2911,    0,    0,    0, 1366,    0, 2911,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  285,    0, 1360,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0, 2911,    0,    0,    0,  849,    0,
-  644,    0,    0,    0,    0,    0,    0,    0,16779,  959,
-    0,    0,    0,    0,    0,    0, 1368,    0,  394,    0,
-    0,    0,    0,    0,    0,    0,    0,  965,    0,    0,
-    0,    0,    0,    0,    0,    0, 1370,    0,16779,16779,
-    0,16811,    0,    0,    0,    0,    0,    0, 1375,17498,
-    0, 1377,16779,16105, 1380,16779,    0,    0,    0,    0,
-    0,    0, 1381,    0,    0,    0,17468,    0,    0,    0,
-16779,    0,    0,    0, 1382,    0,    0,  488,    0,17392,
-17430,    0,    0,    0, 1384,    0,    0,    0,    0,    0,
-    0, 1385,    0,    0,16779,    0,  588,    0,  966,    0,
-    0,    0,    0,    0,  988,    0,17316,17354,    0,    0,
-    0,    0,    0,    0,    0,    0, 1427,    0, 1481,    0,
-    0,    0,  971,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  611,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,17468,16277,17168,    0,  611,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
- 1325, 1325,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,
+  protected static readonly short [] yyRindex = {         3086,
+    0,    0, 7547, 3086,    0,    0,    0, 1608,    0,    0,
+ 3272, 1804,    0,    0,    0,    0,    0, 3272,    0,    0,
+   44,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0, 1609,    0,    0, 1609,    0,    0, 1608,
+ 3315, 3155,    0,    0,    0,    0,    0,    0,    0,    0,
+    0, 1245,    0,    0,    0,    0,    0,    0,    0,    0,
+ 8937,    0, 1240,    0,    0,    0, 1240,    0,    0,    0,
+    0,    0,    0,  310,    0,    0,    0,    0,    0,    0,
+    0,    0,  233,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0, 4857,    0,    0,    0,    0,
+    0,    0,  311, 4950, 4292,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0, 5106, 5174,
+ 5414, 5618, 5958, 1839, 6230, 6366, 6502, 6638, 1243,  524,
+    0,    0,    0,    0,    0,    0,   44,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  294,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0, 3378,    0,
+  603,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0, 1609,   67,    0,    0,    0,    0,    0,    0,
+    0, 3425,  632, 3492,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0, 3903,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0, 1246,    0,    0,    0,    0,
+    0,    0, 3903, 1244,    0,    0,    0,    0,    0,    0,
+ 1244,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0, 2404,    0, 2768,  341, 2534,    0,    0,    0, 2664,
+ 2534,    0,    0,    0,    0,    0, 1245,    0,    0,    0,
+    0,    0,    0,  208,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0, 1249, 1674,    0,    0,
+ 1240,    0, 3903,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  235,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0, 1964,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0, 4024,    0,    0,
+    0,    0,    0,    0,    0, 3535, 3578,    0,    0,    0,
+    0, 2258, 1609, 1609,    0, -207,    0, 7721, 1609, 1622,
+    0,    0,  207,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  425,16430,    0,    0,    0,    0, 3903,    0,    0,    0,
+    0,    0,    0,    0,    0,16819,    0,    0,    0,    0,
+    0,    0,    0,  771,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  836,  682,  936,    0,    0, 1255,    0,
+    0,    0,    0,    0,  226,    0,    0, 4380, 1252,    0,
+    0,    0,   42,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0, 1581,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0, 1249,    0,
+16009,    0, 6757,    0,  252,    0,    0,    0,    0,    0,
+    0,16009,    0,    0,    0,    0,    0,    0,  -28,    0,
+  680,    0,    0,    0, 1253,    0,    0,    0,    0, 1244,
+    0,    0,    0, 3744,    0, 3903, 3744,    0, 3903, 4539,
+    0,    0,    0,    0,    0, -195,    0,    0,    0,    0,
+  238,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0, 5278,    0, 5346,    0,
+ 5482,    0, 5550,    0, 5686,    0, 5754,    0, 5822,    0,
+ 5890,    0, 6026,    0, 6094,    0, 6162,    0, 6298,    0,
+ 6434,    0, 6570,    0, 6694,    0,    0,  660,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+ 4024,    0,    0,    0,    0, 2258,    0,    0,    0,    0,
+ 1208,14268,    0,    0,    0, 9094,    0,    0,  818,    0,
+    0,    0,    0,    0,    0,  760,  687,    0,    0, 1257,
+    0,    0,    0,    0, 3023,    0,    0,    0,    0,    0,
+    0,10019,    0,    0,    0,  820,    0,    0,    0, 9251,
+16966,    0,    0,  831,  846,  849,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  772,    0,    0,    0,    0,
+    0,    0,    0,    0,    0, 1260,    0,    0,    0,    0,
+ 3810,    0,    0,  258,    0,   99, 4062,    0,    0,    0,
+    0,    0,    0,    0, 1258,    0,    0,    0,    0,    0,
+ 1261,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  260,  626,    0,    0,    0,    0,    0, 1262,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,16009,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  618,    0,    0,
+    0,    0,    0,    0,    0,    0, -177,    0,  613,    0,
+    0,    0,    0,    0,    0,    0,    0, -207,    0,    0,
+    0,    0, 9251, 7878,    0,    0, 1268,    0,  780,    0,
+    0,    0,    0, 1265,    0, 1241, 1242,    0,    0,    0,
+    0,    0, 1263, 9408,    0,    0,    0,    0,16998,    0,
+    0,    0,  834,    0,    0,    0,    0,    0,    0, 2132,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0, 4221,    0, 4698, 1288,    0,    0,
+    0,  950,    0,    0,    0,    0, -240,    0,    0,    0,
+    0,  834,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  633,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  848,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0, 1282,    0,    0,    0,    0,    0,
+  866,  870,    0,    0,    0,    0,    0,    0,    0, 1289,
+  512, 1287,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0, 4380,    0,    0,    0,    0,    0,
+ 1296,    0,    0, -240,    0,    0,  853,    0, 1289,    0,
+    0,    0,16009,    0,  735,  749,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0, 1257,    0,14107,    0,    0,    0,    0,    0,17136,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  704,    0,  716,    0,    0,    0,    0,  915,    0,
+  787, 1291,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0, 1297,    0,    0,    0, 1302,    0,    0,    0,
+    0,16009,    0,    0,    0,    0,    0,    0,    0, -154,
+  671,    0,    0,    0,    0,    0,17212,16819,    0,  432,
+  432,  432,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0, -182,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,17317,    0, -255,    0, 1303, 1303, 1303,
+    0,    0,    0,    0,    0, 1306,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,17360,    0,    0,
+    0,14571,    0,    0, 1307,    0,    0,  447,    0,    0,
+    0,  591,    0,    0,    0,    0,    0,    0,    0,    0,
+ 1308,    0, 1311,    0,    0,    0, 3229, 1310,  363,    0,
+    0,  -54,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0, 2937,
+    0,    0,    0,    0,14373,14657,    0,    0,    0,  731,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  442,
+    0,    0,16601,    0,    0,14472,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+16669,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,14751,    0,14373,    0,    0,  731,    0,    0,    0,
+    0,  425,    0,    0,    0,    0,    0,    0,    0,    0,
+  425,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0, 5080,  443,    0,14793,    0,    0,    0,
+14863,    0, 2937,    0,    0,    0, 1311,    0, 2937,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  275,    0, 1315,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0, 2937,    0,    0,    0,  565,
+    0,  664,    0,    0,    0,    0,    0,    0,    0,16819,
+  877,    0,    0,    0,    0,    0,    0, 1314,    0,  402,
+    0,    0,    0,    0,    0,    0,    0,    0,  886,    0,
+    0,    0,    0,    0,    0,    0,    0, 1312,    0,16819,
+16819,    0,16851,    0,    0,    0,    0,    0,    0, 1313,
+17584,    0, 1316,16819,16145, 1319,16819,    0,    0,    0,
+    0,    0,    0, 1320,    0,    0,    0,17554,    0,    0,
+    0,16819,    0,    0,    0, 1321,    0,    0,  407,    0,
+17478,17516,    0,    0,    0, 1322,    0,    0,    0,    0,
+    0,    0, 1323,    0,    0,16819,    0,  665,    0,  887,
+    0,    0,    0,    0,    0,  867,    0,17402,17440,    0,
+    0,    0,    0,    0,    0,    0,    0, 1368,    0, 1421,
+    0,    0,    0,  891,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  593,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,17554,16317,17254,    0,  593,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0, 1252, 1252,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,
   };
   protected static readonly short [] yyGindex = {            0,
-    0, 1704,    0,    0,    0,   -2,  -15, -177,  -41,  -38,
-    0, 1750, 1759,  669,    0,    5,    0,    0,    0,    0,
-    0,    0, -974, -751, -211, -326,    0,    0,    0,    0,
-    0, -216,    0,    0,    0,  762,    0,  871,    0,    0,
-    0,    0,  613,  614,  -17, -232,    0,  -46,    0, -604,
-  447,    0,  477, -924, -779, -639, -594, -455, -434, -417,
- -386,    0,-1088,    0,-1202,    0,   13,    0,  200,    0,
--1149,    0,    0,    0,  -79,  266,    0,    0,    0,  298,
--1119,    0, -275, -294, -352,    0,    0,    0, -942,  247,
-    0,    0, -520,    0,    0,  316,    0,    0,  288,    0,
-    0,  323,    0, -454, -887,    0,    0,    0,    0,    0,
--1224,  -10,    0,    0,  878,  879,  881, 1059, -530,    0,
-    0, -293,  870,  436,    0,-1017,    0,    0,    0,    0,
-    0,    0,    0,    0,  230,    0,    0,    0,    0,    0,
-    0,    0,    0,  483,    0,    0,    0,    0, -309,  420,
+    0, 1641,    0,    0,    0,    1,  -15, -178,  -41,  -38,
+    0, 1688, 1698,  342,    0,    8,    0,    0,    0,    0,
+    0,    0, -974, -741, -214, -550,    0,    0,    0,    0,
+    0, -220,    0,    0,    0,  701,    0,  807,    0,    0,
+    0,    0,  551,  552,  -17, -230,    0,  -46,    0, -562,
+  385,    0,  415, -615, -587, -568, -567, -540, -527, -526,
+ -525,    0,-1102,    0,-1230,    0,   13,    0,   85,    0,
+-1142,    0,    0,    0,  -79,  199,    0,    0,    0,  237,
+-1120,    0, -269, -297, -350,    0,    0,    0, -945,  185,
+    0,    0, -516,    0,    0,  255,    0,    0,  222,    0,
+    0,  257,    0, -607, -853,    0,    0,    0,    0,    0,
+ -534,  -10,    0,    0,  799,  802,  804,  987, -548,    0,
+    0, -314,  812,  357,    0,-1412,    0,    0,    0,    0,
+    0,    0,    0,    0,  156,    0,    0,    0,    0,    0,
+    0,    0,    0,  409,    0,    0,    0,    0, -302,  340,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0, -523,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  248,    0,    0,  333,    0,    0,  343,  345,  260,
-    0,    0,    0,    0,    0,    0,    0,    0,  578,    0,
-    0,    0,    0,  -45,    0,  161, -161,    0,    0,  411,
-    0, -741,    0,  944,    0, 1294, -296, -266,  -60,  685,
-    0,  589,    0,  -33,   95,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0, -268,    0, 1253,    0, -348,    0,
- -271,    0,    0,    0,  902,  905, -300, -124, 1076,    0,
-  987,    0, 1232, 1462, 1120,    0,    0,  794, 1776,    0,
-    0,    0,    0, 1085,    0,    0,    0,    0,    0, -473,
- 1515,    0,    0,    0,    0,    0, 1205,  953,  968,  793,
-  964, 1443, 1445, 1446, 1444, 1447,    0, 1451,    0,    0,
-    0, 1023, 1304, -543,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0, -286,    0,    0,    0,    0, -465,
-    0,  640,    0,  540,    0,-1043,    0,    0,    0,    0,
-    0,  741, -538,  -16, -313,   -1,    0, 1716,    0,   69,
-    0,   71,   87,   97,  136,  142,  144,  178,  205,  207,
-  280,    0, -677,    0,  -12,    0,    0,  836,    0,  757,
-    0,    0,    0,    0,  735, -355,  812, -886,    0,  860,
- -481,    0,    0,    0,    0,    0,    0,  753,    0,  749,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  681,    0,    0,    0,    0,
-    0,    0,    0,    0,  -32,    0, 1346,    0,    0,    0,
-  932,    0,    0,    0,    0,    0,    0, -168,    0,    0,
-    0,    0,    0, 1454, 1198,    0,    0,    0,    0, 1458,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  571,
-    0,    0,    0,    0,    0,    0,    0,    0,  683,    0,
-    0,    0,    0,    0,    0,   -3, 1008,    0,    0,    0,
- 1010,
+    0,  170,    0,    0,  253,    0,    0,  264,  267,  187,
+    0,    0,    0,    0,    0,    0,    0,    0,  495,    0,
+    0,    0,    0,  -45,    0,  403,  -56,    0,    0,  330,
+    0, -515,    0,  876,    0, 1204, -288, -268,  -61,  905,
+    0,  502,    0,  -33,  188,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0, -257,    0, 1435,    0, -349,    0,
+ -271,    0,    0,    0,  815,  821, -301, -126,  989,    0,
+  897,    0, 1147, 1384, 1033,    0,    0,  713, 1699,    0,
+    0,    0,    0, 1006,    0,    0,    0,    0,    0, -483,
+ 1432,    0,    0,    0,    0,    0, 1238,  871,  872,  763,
+  874, 1361, 1363, 1360, 1364, 1365,    0, 1367,    0,    0,
+    0,  946, 1216, -546,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0, -299,    0,    0,    0,    0, -461,
+    0,  555,    0,  463,    0,-1121,    0,    0,    0,    0,
+    0,  661, -538,  -16, -319,  -13,    0, 1638,    0,   57,
+    0,   58,   68,  111,  142,  147,  163,  195,  200,  204,
+  247,    0, -712,    0,  -24,    0,    0,  756,    0,  678,
+    0,    0,    0,    0,  655, -246,  734, -884,    0,  776,
+ -472,    0,    0,    0,    0,    0,    0,  672,    0,  673,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  600,    0,    0,    0,    0,
+    0,    0,    0,    0,  -30,    0, 1264,    0,    0,    0,
+  845,    0,    0,    0,    0,    0,    0, -172,    0,    0,
+    0,    0,    0, 1373, 1136,    0,    0,    0,    0, 1375,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  488,
+    0,    0,    0,    0,    0,    0,    0,    0,  597,    0,
+    0,    0,    0,    0,    0,   -7,  922,    0,    0,    0,
+  925,
   };
   protected static readonly short [] yyTable = {           109,
-  155,   18,  189,  535,  532,  783,  111,  328,  333,  233,
-  789,  446,  234,  507,  489,  156,  729,  485,   43,  445,
-  464,  293,  751,  321,  192,  258,  530,  516,  369,  449,
-  577,  528,  419,  563,  620,  833,  552,  834,  948, 1074,
-  327,  332, 1200,  229,  312,  339,  259,  252, 1233, 1234,
- 1129, 1011,  377,  678,  385,  304,  362,  593,   14,  311,
-  712,  838,  845,  558,  498,  373, 1128,  376,  313,  384,
-  316,  995,   20,  592,  868,  190,  756,  345, 1129,  873,
-  874,  249,  929,  829,  930,  160,  713,  161, 1110, 1331,
-  524,  998,  249,  260,  579, 1263,  289, 1266,  369,  315,
- 1079,  835,  315,  162,  290,  722, 1222, 1340,  363,  374,
- 1112,  115,  374,  163,  865,  500, 1396, 1398,  714,  453,
-  454, 1076,  326,  501,  331,  421,   94, 1404,  375, 1077,
-  331,  364, 1385,  960, 1067, 1363,  962,  332,  320,  109,
-  155,  320, 1385,  836,  369,  365,  111,  233,  499,  489,
-  447,  580,  164,  115,  995,  156,  678,  115,  165,  995,
-  166,  995, 1222,  449,  995,  995,  196,  995,  995,  678,
-  362,  678,   51,  889,  998,  894,  502,  861, 1447,  998,
-  194,  998,  495,  291,  998,  998,    1,  998,  998,  995,
-  463,  291,   94,  447,  167,  291,  250,  846, 1260,  487,
-  490,  525,  699,  526, 1130,  250,  449,  250,  505,  998,
-   94,  602,  494,  261,  250, 1264,    6,  250,  363,  455,
-   15,  168,  715,  169,  775,  160,  678,  161,  538,  488,
-  485, 1079, 1130,  781,  464,  493,  804,  191,  292,  866,
-  461,  364,  931,  162,  995,  251,  292,  194,  194,  515,
-  292,  115,  258,  163,  251,  365,  251,  527,  593, 1038,
-  577,  551,  258,  251,  998,  555,  251,  723,  194, 1194,
-  560,  506, 1113,  503,  592, 1515,  510,  512, 1397, 1399,
-  968,  557,  593,  376,  583,  559,  562,  577,    2, 1405,
-  696,  539,  164,  337, 1284,  862,  170,  846,  165,  547,
-  166,  549, 1539, 1448, 1018,  510,  550,  548, 1011,  759,
-  363,   16,  362, 1583, 1549,  231, 1550,  565,  566,  460,
-  642,  644, 1393,  863,   54,  730, 1418,  576,  605,   51,
-  825,  608, 1207,  364,  167,  490,  490,    2,  600, 1152,
- 1055,   51,  578, 1272, 1533, 1084,  940, 1011,  681,  683,
- 1312,  846, 1511,  599,    3,    4,    5,    6,  761,  194,
-  194,  168, 1412,  169,  488,  617, 1125, 1252,  624,  625,
-  626,  627,  628,  629,  630,  631,  632,  633,  634,  291,
-  115,  680,  682, 1028, 1080,  686, 1082, 1392, 1560, 1087,
-  376,   48,  851, 1394,  593,  362, 1312,  376,  791,  376,
-  676,  376,  793,  810,  233,  199,  813,  447, 1374, 1036,
- 1048,  890,   42,  115,  700,  804,  945,  916, 1580, 1419,
- 1425, 1291,  194,  362,   94,  760, 1058,  362,  449,  362,
-  362,  362,  362, 1584,  292,  338,  170,  362,  115,  370,
- 1085,   94,  864,  847, 1042,  376,  849,  850,  194,  697,
-  698, 1208,  694,   51, 1477,  710,  749,  740,  757, 1011,
-  194,  921, 1273, 1534,  941, 1011,  716, 1504,  194,  400,
-   94,  725,   20,    6,  762,  726, 1145, 1413, 1147, 1420,
- 1148,  426,  490, 1065,  485, 1253,  747,  371,  691, 1541,
- 1542,  750,  792,  691, 1206, 1313,  516,  691,  792,  803,
-  489,  291, 1211,  812,  927,  401,  852,  975,  737,  778,
-  733,  617,  691,  787,  792,  200,  858, 1117,  794,  811,
-  542, 1435,  814,  485,  194, 1037, 1236,  194, 1142,  593,
-  231,  795,  797,  882,  231,  231,  727,  798,  815,  691,
-  352, 1313,  928,  817,  837,  592, 1574,  792,  372,  796,
-  802, 1465, 1466,  449, 1468,  797,  603,  576,  691,  826,
-  194,  194,  362,  465,  427, 1487,  604,  231, 1494,  428,
-  826,  429,  578,  859,  430,  431,  328,  432,  433, 1213,
-  231, 1277,  830, 1510,  576,  402,  403,  291,  194,  194,
- 1137,  291, 1138,  738, 1556,  853,  853, 1181,  115,  578,
-  936,  937, 1557,  797,  593, 1335, 1336, 1532,  194, 1244,
-  363,  362,  347,  466, 1337, 1389, 1021,  426,  347, 1026,
-  465,  231,  194,  291,  347, 1389,   51,  347,  347,  977,
-  738,  452, 1546,  364,  870, 1314,  872,  833,  263,  688,
-  775,  347,  606,  831,   94,  880,  292,  365,  250,  362,
-  942,  352,  607,  291,  434,  352, 1279,  347,  123,  363,
-  123,  778,  938, 1558,  797,  123,  778,  778,  115,  876,
-  466,  362,  424,  347, 1057, 1326,  796, 1053,  956,  739,
- 1315, 1314,  364, 1118, 1547,  535,  490,  989,  453,  197,
-   44,  738,  452,  691,  244,  115,  365,  251,  691,  352,
-  427,  113,  691,  923,  887,  428,  805,  429, 1063, 1153,
-  430,  431, 1118,  432,  433,  488,  951,  691,  515,  363,
-  197,  785,  427,  751,  248,  425, 1315,  428,  194,  429,
-  510,  258,  430,  431,  991,  432,  433,  904,  903,  965,
-  739,  555,  364,  113,  691,  787,  888,  113,  250,  453,
-  691,  778,  194,  245, 1121,  970,  365,  246,  957,  781,
-  362,  905,   94,  691,  362, 1372,  347,  362, 1030,  362,
-  989,  331,  331, 1098,  362,  989,  785,  989,  631,  340,
-  989,  989,  320,  989,  989,  340,  541,  952,  906,  347,
-  444,  971,  331, 1375,  696,  347,  231,  251,  963,  542,
-  964,  347,  691,  363,  651,  347,  651,  247,  689,  490,
-  969,  966,  689,  826, 1373,  490,  543,  991,  347, 1316,
-  577,  416,  991,  374,  991,  883,  364,  991,  991, 1089,
-  991,  991,  689,  417,  340, 1029,  412,  884,  617,  450,
- 1317,  113, 1376, 1163,  617,  700,  981,  521,  787,  374,
-  347,  522,  320, 1173,  115, 1164,  115, 1318,  690,  689,
-  989,  631,  577,  334,  194, 1316,  631, 1021,  631,  631,
-  631,  631,  631,  631,  631,  631,  631,  631,  631,  740,
-  585,  414,  690,  331,  331,  194, 1317,  586, 1319, 1203,
-  631,  778,  631,  506,  631,  717,  631,  631,  631,  587,
-  716,  882,   94, 1318, 1061,  115, 1064,  991,  115,  690,
- 1043, 1283, 1066, 1010,  710, 1045, 1400,  711, 1045,  729,
-  415,  347, 1098,  717,  374,  448, 1235,  778,  577,  787,
- 1414, 1102,  717,  347, 1319,  363,  347,  347, 1075, 1498,
-  953,  807,  710,  985,  413,  711,  331, 1293, 1311,  807,
-  347,  631, 1433,  320,  278,  278,  194,  714,  364,  490,
-  374,  374,  374,  278,  374,  374,  714,  374, 1293,  374,
-  113,  778,  331,  778,  804, 1107,  778,  713, 1357,  194,
-  804, 1111,  804,  426,  331,  796,  713, 1367, 1097,  404,
-  405,  585,  331,  913, 1311,  194, 1293,  450,  586,  194,
-  451, 1551,  907,  113,  485,  464, 1328,  716,  732,  908,
-  587,  374,  733,  374,  808, 1217,  374,  288,  808,  288,
-  787, 1360,  808,  510,  288, 1104,  985, 1105,  113, 1106,
- 1360,  985,  225,  985,  226,  512,  985,  985, 1571,  985,
-  985,  512,  418,   69,   69,  406,  407,   69,  331,  766,
-  297,  331,  577,  767,  535,  452,  194, 1589, 1590,  408,
-  409,  826,  225,  778,  776,  778,  427,  778,  522,  340,
- 1149,  428,  340,  429,  194,  194,  430,  431,  450,  432,
-  433,  881,  824,  800,  331,  331,  824,  813,  824,  456,
-  824,  813,   24,  813,   25,  813, 1156,   26,  995,  996,
-  347,  347,   27,  347,  347,   62,   28,  225,  490,  228,
-  924,  506,  331,  331,  925,   30,  985,  576,  740,  804,
-  944,  804,   32,  804,  945, 1182,  787,   33,  459,  871,
-  826,   34,  578,  871,  296,  875,  297, 1097,  115,  875,
- 1193,  486,  194,   36,  506,   37,  176,  506,  176,   38,
-  176,  233,  347, 1220,  447,  347, 1221,   39,   40,  576,
-  337,   41,  513,  194,  801,  425,  778,  425,  513,   70,
-  531,  194, 1216,   70,  578,  233,  807, 1021,  447,  189,
-  807,  189,  508,  189,  506,  536,  425,  425,  113, 1073,
-  291,  862,  556, 1288,  449,  509,  778, 1149,  654,  656,
-  658,  660,  397,  398,  399, 1154,  425, 1155, 1031, 1220,
- 1031,  815, 1221,  815,  425,  352,  164,  425,  164,  352,
- 1411,  347,  352,  375,  352,  576,  410,  411,  115,  352,
-  331,  537, 1292, 1310,  540, 1221,  796, 1411,  561,  347,
-  578,  347,  796,  778,  171,  325,  171,  484,  231,  796,
- 1288,  569,  331, 1292,  597, 1443, 1221, 1444,  113,  364,
-  347,  347,  778,  352,  506,  172,  115,  172, 1370, 1371,
-  115,  940,  598,  940,  115,  609,  331, 1344,  692, 1310,
-  347, 1292,  368,  201, 1221,  113,  711,   72,  347,   72,
-  195,  347,  195, 1403, 1249,  231, 1406,  343,  115, 1186,
- 1187,  347,  349,  351,  353,  355,  357,  359,  361,  250,
-  165,  378,  165,  262,  364,  456,  731,  286,  287,  288,
-  695,  294,  295, 1365,  758,  202,  308,  309,  536,  536,
-  379,  380,  128,  317,  128,  319,  115,  323,  294,  135,
-  294,  135,  335,  336,  301,  734,  301, 1561, 1562,  576,
-  381,  691,  691,  115,  646,  648,  194,  736,  251, 1198,
- 1199,  382,  763,  764,  578,  765,  383,  816,   38,  809,
-  740,  650,  652,  662,  664,  203,  204,  205,  206, 1421,
-  207,  208,  209,  210,  211,  212,  213,  214,  331,  818,
-  215,  216,  217,  218,  219,  220,  221,  222,  819,  820,
-  740,  740,  821,  740,  840,  839,  843,  846, 1478,  331,
-  844,  856,  848,  194,  740,  857,  869,  740,  871,  875,
-  891,  892,  450,   42,  896, 1505,  895,  899,  917,  918,
-  196,  919,  740,  194,  911,  920,  926,  377, 1517, 1519,
-  943,  946,  787,  949,  113,  862,  113, 1365,  947,  954,
-  958,  973,  959,  967,  506,  990,  740,  985,  992,  997,
-  115,  999, 1005, 1008, 1006, 1505, 1505, 1009, 1014, 1011,
- 1016, 1527, 1022, 1034, 1035, 1044, 1052, 1038,  525, 1070,
-  331, 1059, 1071, 1100, 1090, 1108, 1116, 1126, 1124, 1114,
-  194,  194, 1115, 1136, 1146,  113, 1158, 1140,  113, 1166,
-  194, 1144, 1167,  331,  787, 1143,  343,  317,  194,  194,
-  383,  194, 1162, 1165, 1168, 1170, 1171, 1388, 1178,  331,
- 1174, 1185, 1505,  331, 1189, 1188, 1201, 1388, 1196, 1209,
- 1212, 1388, 1229,  194,  490,  490,  194, 1219,  564, 1243,
- 1246,  787, 1251, 1259, 1248, 1388,  343,  386, 1254, 1262,
-  529, 1267, 1269, 1274, 1576, 1576, 1275, 1276, 1282, 1283,
- 1278, 1585, 1585,  617,  617, 1324,  546, 1388,  387,  388,
-  389,  390,  391,  392,  393,  394,  395,  396, 1327, 1329,
- 1330, 1332, 1346, 1341, 1369, 1377, 1391, 1408, 1417, 1424,
- 1409, 1416, 1427, 1419, 1429, 1441, 1399, 1432,  331,  331,
- 1430,  636,  638,  640, 1434, 1438,  564,  564,  564,  564,
-  564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-  564,  564, 1436, 1451, 1440,   38, 1446, 1454, 1457,   38,
- 1461, 1458, 1459, 1488, 1469, 1537, 1470, 1548,   24, 1473,
-   38, 1483, 1490, 1502, 1503,   38, 1500, 1499, 1509,   38,
- 1513, 1524,   38, 1512, 1523, 1526, 1528, 1531, 1529, 1544,
- 1552, 1553, 1555, 1564,   38,   38,  331, 1563, 1547,   38,
-   38, 1546, 1569, 1570, 1591,   38, 1592,   38,   38,   38,
-   38, 1593,    9, 1027,  552,   38,  909,  507,  910,   38,
-  653,   38, 1019,  377,  508,  331,  465,  654,  377,  377,
-   33,   38,  725,   38,   38,  506,   38,  466,   33,  817,
-   38,  532,   34,  323,  818,  216,  103,   34,  841,  876,
-  810,  377,  842,  877,  920,  713,  354,  878,  113,  564,
-   38,  327,  880,  738,  377,  377,   38,   38,  713,  377,
-  347,  691,  377,  691,  377,  131,  377,  377,  377,  377,
-  113,  748,  297,  230,  377,  138,  132,  114,  377,  298,
-  139,   53,  377,   21, 1091,  517, 1004, 1191, 1192, 1343,
-  377, 1333, 1514,  377, 1554,  377,  377, 1545, 1501, 1530,
- 1496,  377, 1027,  377,  377,  377,  377,  377,  377,  377,
-  377,  377,  377,  377,  796, 1031, 1032,  914, 1033,  377,
-  377,  842, 1587, 1342,  377,  377, 1401,  377,  377,  377,
- 1423,  377,  377,  377, 1579,  377,  377, 1525,  113,  377,
-  377,  377,  377, 1520, 1518, 1578,  377,  377, 1270, 1445,
- 1000,  377,  377,  377,  377,  377,  377,  377,  377,  806,
- 1049, 1271, 1051,  611,  935,  855,  299, 1127,  978,  932,
-  377,  567,  910,  377,  666,  377,  113,  668,  672,  670,
-  113,  972,  674,   24,  113,   25,  377,  675,   26, 1347,
- 1256,  823,  420,   27, 1176, 1120, 1169,   28, 1183, 1139,
-  331,   29, 1177, 1109, 1175, 1240,   30,  879,  113,  799,
-  690,   31, 1068,   32,  691,   24, 1345, 1245,   33,   24,
- 1002, 1001,   34,   35,    0,    0,    0,    0,    0,    0,
-   24,    0,    0,    0,   36,   24,   37,    0,    0,   24,
-   38,    0,   24,    0,    0,    0,  113,    0,   39,   40,
-    0,    0,   41,  911,   24,   24,    0,  331,    0,   24,
-   24,    0,    0,  113,    0,   24,    0,   24,   24,   24,
-   24,    0,    0,    0,    0,   24,    0,  331,    0,   24,
-    0,   24,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   24,  343,    0,   24,    0,   24,    0,    0,    0,
-   24,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   24,    0,    0,    0,    0,   21,   24,   24,    0,    0,
-    0,    0,    0,    0,  331,  331,   42,    0,    0,    0,
-    0,  517,    0,    0,  331,    0,  517,  517,    0,    0,
-    0,    0,  331,  331,    0,  331,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  517,
-  113,    0,    0,    0,    0,    0,    0,  331,    0,    0,
-  331,    0,  517,  517,    0,    0,    0,  517,    0,    0,
-  517,    0,  517,    0,  517,  517,  517,  517,    0,    0,
-    0,    0,  517,    0,    0,    0,  517,    0,    0,    0,
-  517,    0,    0,    0,    0,    0,    0,    0,  517,    0,
-  835,  517,    0,  517,  517,    0,    0,    0,    0,  517,
-    0,  517,  517,  517,  517,  517,  517,  517,  517,  517,
-  517,  517,    0,    0,    0,    0,    0,  517,  517,    0,
-    0,    0,  517,  517,    0,  517,  517,  517,  517,  517,
-  517,  517,    0,  517,  517,  564,  517,  517,  517,  517,
-  517,  517,  517,  517,  517,  517,    0,  517,  517,  517,
+  155,  532,  189,  156,   18,  784,  111,  328,  333,  233,
+  446,  535,  234,  485,  790,  445,  489,  464,   43,  507,
+  730,  293,  321,  553,  578,  258,  530,  192,  369,  528,
+  419,  752,  564,  621,  259,  835,  834, 1075,  516,  229,
+  327,  332, 1201, 1012,  839,  339,  312,  252,  930,  949,
+  931,  377,  593,  385,  524,  304, 1234, 1235,  249,  311,
+  678,  559, 1332,  846,  594,  373,  362,  376,  313,  384,
+  316, 1129,  249,  160,  161,  498,   14,  345,  996,  757,
+ 1341, 1111,  289, 1130,  162,  846,   51,  852,  460,  424,
+  290,  190,  315, 1223,  315, 1542, 1543,  723,   51,  961,
+  866,  999,  963, 1080,  250, 1267,  836,  580, 1113,  905,
+ 1397, 1399,  326, 1031,  363,   16,  347,  869, 1405,  453,
+  454, 1261,  874,  875,  862,  421,  416,  163,  347, 1130,
+  830,  347,  347,  906,  449,  404,  405,  364,  417,  109,
+  155,  231,  425,  156,  713,  347,  111,  233,  837, 1223,
+  447,  489, 1575,  251,  679,    1,  890,  895,  164,  499,
+  907,  996,   51,  165,  581,  525,  996,  526,  996,  250,
+  714,  996,  996,  250,  996,  996,  678,  291,  678,  166,
+  796,   42,  495,   94,  999,  846,  291,  250,  291,  999,
+  463,  999,  260,  447,  999,  999,  996,  999,  999,  487,
+  490,  853,  715,   94,  115,  734,    6,  250,  505,  250,
+   51,  167,  494,  160,  161,  455,  168,  362,  251,  999,
+  169,  527,  251,  776,  162,  867,  485,  376,  538,  488,
+  782,  464,  292,  678, 1080,  493,  251, 1131,   15,  846,
+  461,  292,  863,  292,  805, 1394,  115,  932, 1516,  515,
+  115,  996,  258,  191,  593,  578,  251,    2,  251,  724,
+  552,  503,  258,  170,  556,  363,  594,  163,  449,  561,
+ 1114,  506, 1398, 1400,  999, 1540,  510,  512,  969, 1584,
+ 1406,  558,  578, 1131,  584,  560,  563, 1550,  364, 1551,
+  594,  539,  363,  337,  551, 1285, 1264,  374,  164,  548,
+ 1012,  550,  365,  165, 1195,  510,  716,  549,  760,  864,
+ 1413,  449,  261,  328,    2,  364,  603,  566,  567,  166,
+  643,  645,  362,    3,    4,    5,    6,  577,  606, 1208,
+  579,  609, 1126, 1273,  376,  490,  490, 1068, 1373,  826,
+  601,  376, 1448,  376,  115,  376, 1534, 1019,  682,  684,
+ 1153,  167, 1512,  600, 1012,  762,  168,  941, 1253, 1547,
+  169,  792,  197,   51,  488,  618, 1029,   20,  625,  626,
+  627,  628,  629,  630,  631,  632,  633,  634,  635,  291,
+  794,  681,  683, 1056,  700,  687,  917, 1374, 1393,  376,
+   94,  891, 1292,  197, 1395,  697, 1561,   20,  811, 1585,
+  677,  814,  594,  170,  233,  362, 1375,  447,  374,  374,
+  374, 1548,  374,  374,  701,  374, 1265,  374,   48, 1037,
+ 1085, 1426,  194,  805,  761, 1414, 1581, 1081,  865, 1083,
+  731, 1059, 1088,  362,  292,  338,   54,  362, 1478,  362,
+  362,  362,  362, 1419, 1505,  698,  699,  362, 1209,  922,
+   94,  711, 1274,  738, 1043,  695,  750,  741,  758,  374,
+ 1207,  374, 1039,    6,  374, 1535, 1012, 1449, 1212,  717,
+  370,  763, 1012,  115, 1066,  942, 1254,  793,  691,  751,
+  426,  485,  490,  691,  199,  291,  748,  691,  400,  194,
+  194,  196, 1237,  362,  831,  200,  795,  231,  797,  231,
+  804,  938,  691,  489,  813,  231,  115,  976,  516,  779,
+  194,  618,  291,  788,  812, 1086,  884,  815,  371, 1146,
+  485, 1148, 1118, 1149,  401,  593, 1143,  426,  885,  691,
+  352,  115,  796,  798,  449, 1038, 1420,  594,  739,  816,
+  292,  363, 1557,  291,  818,  838,  797, 1278,  691,  848,
+ 1558,  231,  850,  851,  803,  832, 1436,  231,  577,  244,
+  827,  579,  939,  427,  364,  726,  231,  957,  428,  727,
+  429,  827,  859,  430,  431,  738,  432,  433,  365,  372,
+   94, 1138,  500, 1139,  250,  577, 1466, 1467,  579, 1469,
+  501,  450,  231,  452,  451, 1182,  854,  854,  604, 1027,
+ 1488,  194,  194, 1495,  402,  403,  465,  797,  605,  466,
+  427, 1559,  594,  362, 1022,  428,  291,  429, 1511,  739,
+  430,  431, 1214,  432,  433,  453,  248,  928,  291,  860,
+  728,  369,  978,  251,  796,  871,  738,  873,  834,  883,
+  776,  352, 1533,  502,  362,  352,  881,  347,  123,  943,
+  123,  937, 1245,  434,  452,  123,  785,  362,  263,  449,
+ 1313,  363,  779,  465,  194,  929,  466,  779,  779,  691,
+  877,  607,  792,  340, 1376, 1058, 1054,  369,  792,  340,
+  739,  608, 1154, 1064,  364,   94,  453,  490, 1314,  352,
+  194,  115,  363,  374,  535,  888,  689,  347,  365, 1280,
+  444,  245,  194,  347,  924,  246, 1313, 1315, 1316,  347,
+  194,  785,  347,  347,  690,  364,  488,  952, 1327,  515,
+  689,  691,  320, 1377, 1294, 1312,  347,  792,  340,  365,
+  331,  510,  258,  752, 1314, 1317,  331,  889,  690,  904,
+  966,  556, 1122,  332,  689, 1294,  788,  689, 1318, 1319,
+ 1320, 1164,  779, 1315, 1316,  247,  971,  782,  347,  958,
+  363,  796,  115, 1165, 1401,  690,  194,  543,  362,  194,
+  710, 1312,  362, 1294,  347,  362, 1099,  362, 1415,  631,
+  717, 1317,  362,  364,  799,  711,  410,  411,  953,  115,
+  374,  542,  972, 1119, 1318, 1319, 1320,  365,  710,  964,
+ 1434,  965,  194,  194,  543,  320,  375,  250,  717,  378,
+  490,  970,  967,  711,  827,  578,  490,  717, 1049,  320,
+  334,  544, 1119, 1386,  946,  448, 1090,  427,  379,  380,
+  194,  194,  428, 1386,  429,  363, 1030,  430,  431,  618,
+  432,  433, 1390,  412,  586,  618,  701,  982,  381,  788,
+  194,  587, 1390, 1077,  484,  231,  251,  578,  364,  382,
+ 1174, 1078,  631,  588,  194, 1022,  413,  631,  990,  631,
+  631,  631,  631,  631,  631,  631,  631,  631,  631,  631,
+  741,   94,  586,  804,  914,  804,  374,  804,  414,  587,
+ 1364,  631,  779,  631,  506,  631, 1204,  631,  631,  631,
+  697,  588,  450,  691,  717, 1062,  450, 1065,  691,  882,
+   44, 1044,  691, 1067, 1011,  320, 1046,  690,  374, 1046,
+   94,  113,  415,  578,  730, 1099,  992,  691,  779, 1421,
+  788,  352, 1103, 1236,  954,  352,  908,  347,  352, 1076,
+  352, 1250,  231,  909, 1499,  352,   94,  320,  115,  806,
+  115,  990,  631,  418,  691, 1284,  990,  714,  990,  713,
+  490,  990,  990,  113,  990,  990,  714,  113,  713,  406,
+  407,  194,  779,  691,  779,  347, 1108,  779,  347,  352,
+  297, 1358, 1112,  408,  409,  807,  986, 1336, 1337, 1098,
+ 1368,  331,  331,  807,  340,  194, 1338,  340,  426,  115,
+  808,  485,  115,  464,  808,  225, 1552,  883,  808,  992,
+  456,  717,  331, 1329,  992, 1218,  992,  364,  456,  992,
+  992,  788,  992,  992,  510,  452, 1105,  804, 1106, 1361,
+ 1107,  278,  278,  804,  459,  804,  347,  288, 1361,  288,
+  278,  990,  347, 1572,  288,  486,  521,  578,  347,  512,
+  522,  651,  347,  651,  337,  512,   69,   69, 1590, 1591,
+   69,  113,  827,  535,  779,  347,  779,  508,  779,  986,
+  225, 1150,  226,  176,  986,  176,  986,  176,  509,  986,
+  986,  427,  986,  986,  531,  189,  428,  189,  429,  189,
+  536,  430,  431,  375,  432,  433,  225,  347,  228,  992,
+ 1157,  733,  824,  331,  331,  734,  824,  194,  824,  490,
+  824,  767,  506,  777,  537,  768,  813,  522,  577,  741,
+  813,  579,  813,  296,  813,  297, 1183,  788,  194,  347,
+  347,  827,  347,  347,   62,  925,  945,  540, 1098,  926,
+  946, 1194,  871,  875,  541,  506,  871,  875,  506,   70,
+  996,  997,  233,   70, 1221,  447,  557, 1222,  807,  986,
+  577,  562,  807,  579, 1187, 1188,  331,  779,  655,  657,
+  659,  661, 1074, 1217,  863, 1022,  233, 1562, 1563,  447,
+  397,  398,  399,  570, 1155,  506, 1156, 1032,  598, 1032,
+  113,  599,  331,  815, 1289,  815,  364,  779, 1150,  194,
+  164,  610,  164,  796,  331,  941,  347,  941,  347,  796,
+ 1221,  693,  331, 1222,  732,  171,  796,  171,  172,   72,
+  172,   72,  194,  113,  536,  536,  577,  347,  347,  579,
+  691,  691,  115, 1293, 1311,  195, 1222,  195,  194,  165,
+  368,  165,  194,  696,  779, 1199, 1200,  347,  113,  712,
+  128, 1289,  128,  759, 1293,  347,  735, 1222,  347,  294,
+  135,  294,  135,  779,  301,  506,  301,  737,  331, 1371,
+ 1372,  331,  647,  649,  764,  651,  653,  765, 1345,  766,
+ 1311,  817, 1293,  663,  665, 1222,  810,  819,  821,  820,
+  822,  840,  841,  844, 1404,  845,  847, 1407,  857,  194,
+  449,  858,  849,  513,  331,  331,  425,  870,  425,  513,
+  872,  876,  892,  893,  450,   42,  897,  194,  194,  896,
+  900,  918,  115,  196, 1366,  919, 1412,  425,  425,  912,
+  343,  920,  331,  331,  347,  349,  351,  353,  355,  357,
+  359,  361,  921, 1412,  927,  944,  947,  425,  950,  863,
+  577,  948,  955,  579,  959,  425,  960,  968,  425,  991,
+  115, 1444,  974, 1445,  115,  986,  993, 1006,  115,  998,
+ 1000,  741, 1007, 1009, 1010, 1012, 1015, 1017, 1023, 1035,
+ 1422, 1036, 1045, 1039,  801,  194, 1053,  525, 1101, 1060,
+ 1071, 1072,  115,   24, 1091,   25, 1115, 1125,   26, 1109,
+ 1116,  741,  741,   27,  741, 1117,  194,   28,  113, 1479,
+ 1127, 1137, 1144, 1141,  194,  741,   30, 1145,  741, 1159,
+ 1147, 1167, 1168,   32, 1163, 1166, 1506, 1169,   33, 1171,
+  115, 1175,   34,  741, 1172, 1179, 1186, 1190, 1189, 1518,
+ 1520, 1197, 1220,  788,   36, 1202,   37,  115, 1366, 1210,
+   38,  331, 1230, 1213, 1244,  506, 1247,  741,   39,   40,
+  386, 1252,   41, 1260, 1249,  802, 1506, 1506, 1255, 1268,
+ 1263, 1270, 1528,  331, 1275, 1276, 1277, 1283, 1279,  113,
+ 1284,  387,  388,  389,  390,  391,  392,  393,  394,  395,
+  396,  291, 1325, 1328, 1333,  262, 1347,  331,  629,  286,
+  287,  288, 1330,  294,  295,  788,  113, 1331,  308,  309,
+ 1342, 1370, 1378, 1392, 1417,  317, 1409,  319, 1410,  323,
+ 1425, 1428, 1430, 1506,  335,  336, 1431, 1433, 1435, 1418,
+ 1420, 1439, 1400, 1441, 1437,  490,  490, 1442, 1447,  343,
+ 1452, 1455,  788, 1459, 1458, 1489,  325, 1470,  383, 1460,
+ 1462, 1471, 1500, 1503,  115, 1577, 1577, 1474, 1484, 1491,
+ 1504, 1510, 1586, 1586,  618,  618, 1501, 1513, 1514, 1525,
+ 1527,  565, 1530, 1524, 1532, 1538, 1545, 1549, 1529,  343,
+  912,  629, 1553, 1556, 1554, 1564,  629, 1565,  629,  629,
+  629,  629,  629,  629,  629,  629,  629,  629,  629,  194,
+ 1548, 1547, 1570, 1571, 1592, 1593, 1594,    9, 1028,  331,
+  629,  552,  629,  507,  629,  910,  629,  629,  629,  911,
+  653, 1020,  508,  465,  654,  725,   33,  506,   33,  466,
+  331,  323,  629,  532,  637,  639,  641,   34,  817,  565,
+  565,  565,  565,  565,  565,  565,  565,  565,  565,  565,
+  565,  565,  565,  565,  565,   34,  194,  818,  216,  103,
+  809,  583,  876,  841,  842,  113,  877,  113,  921,  713,
+   24,  629,   25,  347,  327,   26,  194,  878,  738,  880,
+   27,  354,  691,  691,   28,  713,  347,  131,  113,  317,
+  230,  297,  383,   30,  138,  132,  114,  298,  139,   53,
+   32,  331,   21, 1005, 1092,   33, 1192, 1193, 1344,   34,
+ 1334, 1546, 1515, 1555, 1531, 1497,  113, 1032, 1502,  113,
+ 1033,   36, 1034,   37,  331, 1028,  915,   38, 1402, 1588,
+ 1343, 1424,  529,  194,  194,   39,   40, 1580, 1526,   41,
+  331,  465,  324,  194,  331, 1521, 1271, 1519,  547, 1446,
+  807,  194,  194, 1579,  194, 1272, 1052, 1050,  936,  979,
+ 1389,  856,  565, 1001,  466,  612,  911, 1128,  568,  299,
+ 1389,  933,  667,  671, 1389,  669,  194,  467,  673,  194,
+  675,  468,  469,  676,  824,  973, 1257,  470, 1389,  471,
+  472,  473,  474, 1348,  420, 1177, 1121,  475, 1170, 1184,
+ 1110,  476, 1140,   38, 1176, 1241, 1069, 1178,  800,  691,
+ 1389,  692, 1246,  477, 1346, 1003,  478, 1002,  479,  331,
+  331,    0,    0,  368,    0,    0,  880,    0,    0,    0,
+    0,    0,    0,    0,    0,  843,  912,  912,    0,    0,
+    0,    0,  480,    0,  912,  912,  912,  912,  912,    0,
+  912,  912,    0,  912,  912,  912,  912,  912,  912,  912,
+  912,    0,    0,    0,    0,  912,    0,  912,  912,  912,
+  912,  912,  912,    0,    0,  912,    0,    0,    0,  912,
+  912,    0,  912,  912,  912,    0,    0,  331,    0,    0,
+    0,    0,    0,    0,  912,    0,  912,    0,  912,  912,
+    0,    0,  912,    0,  912,  912,  912,  912,  912,  912,
+  912,  912,  912,  912,  912,  912,  331,  912,    0,    0,
+  912,  912,    0,    0,  912,  912,    0,    0,    0,  347,
+    0,    0,    0,  749,    0,  347,    0,    0,    0,  912,
+  912,  912,  912,  912,    0,    0,    0,  912,  912,  113,
+    0,  912,    0,    0,    0,    0,  912,  912,  912,  912,
+  912,    0,    0,  517,  912,    0,  912,    0,    0,    0,
+    0,  347,  912,  912,    0,    0,    0,  797,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  912,  912,  912,
+  912,    0,  912,    0,    0,    0,  343,    0,    0,  912,
+    0,    0,  347,    0,    0,    0,    0,  347,    0,  347,
+  347,  347,  347,  347,  347,  347,  347,  347,  347,  347,
+  347,    0,    0,    0,    0,    0,  347,    0,    0,  113,
+  347,  347,  347,  347,  347,  347,  347,  347,  347,  347,
+    0,  347,  347,    0,    0,  347,  347,  347,  347,  347,
+   38,    0,  347,  347,   38,    0,    0,  347,  347,  347,
+  347,  347,  347,  347,  347,   38,    0,  113,    0,    0,
+   38,  113,    0,    0,   38,  113,  347,   38,    0,  347,
+    0,  347,    0,  347,  614,    0,  347,    0,    0,   38,
+   38,  331,  347,    0,   38,   38,    0,    0,    0,  113,
+   38,    0,   38,   38,   38,   38,    0,    0,    0,    0,
+   38,    0,    0,    0,   38,    0,   38,    0,    0,    0,
+    0,  835,    0,    0,    0,    0,   38,    0,   38,   38,
+    0,   38,    0,    0,    0,   38,    0,  113,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  331,    0,
+    0,    0,    0,    0,  113,   38,    0,    0,    0,    0,
+    0,   38,   38,    0,    0,    0,    0,  614,  331,  565,
+    0,    0,  614,    0,  614,  614,  614,  614,  614,  614,
+  614,  614,  614,  614,  614,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  614,    0,  614,    0,
+  614,    0,  614,  614,  614,    0,    0,    0,    0,  517,
+    0,    0,  614,  614,  517,  517,    0,  614,  614,    0,
+    0,    0,    0,    0,    0,  331,  331,    0,  614,  614,
+    0,    0,    0,    0,    0,  331,    0,  517,    0,    0,
+    0,  614,    0,  331,  331,    0,  331,  347,    0,    0,
+  517,  517,    0,    0,    0,  517,    0,  614,  517,    0,
+  517,  113,  517,  517,  517,  517,    0,    0,  331,    0,
+  517,  331,    0,    0,  517,    0,    0,    0,  517,    0,
+    0,    0,    0,    0,    0,    0,  517,    0,    0,  517,
+    0,  517,  517,    0,    0,    0,    0,  517,    0,  517,
   517,  517,  517,  517,  517,  517,  517,  517,  517,  517,
-  517,  517,  517,  517,  517,  517,  517,  517,  517,    0,
-    0,  517,    0,  517,    0,  517,    0,    0,  517,  911,
-  911,    0,    0,    0,  517,    0,    0,  911,  911,  911,
-  911,  911,    0,  911,  911,    0,  911,  911,  911,  911,
-  911,  911,  911,  911,    0,    0,    0,    0,  911,    0,
-  911,  911,  911,  911,  911,  911,  347,    0,  911,    0,
-    0,    0,  911,  911,    0,  911,  911,  911,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  911,    0,  911,
-    0,  911,  911,    0,    0,  911,    0,  911,  911,  911,
-  911,  911,  911,  911,  911,  911,  911,  911,  911,    0,
-  911,    0,    0,  911,  911,    0,    0,  911,  911,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  911,  911,  911,  911,  911,    0,    0,    0,
-  911,  911,    0,    0,  911,    0,    0,    0,    0,  911,
-  911,  911,  911,  911,    0,    0,    0,  911,    0,  911,
-    0,    0,    0,    0,    0,  911,  911,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  911,  911,  911,  911,    0,  911,  835,  835,    0,    0,
-    0,    0,  911,    0,  835,  835,  835,  835,  835,    0,
-  835,  835,  793,  835,  835,  835,  835,  835,  835,  835,
-    0,    0,    0,    0,    0,  835,    0,  835,  835,  835,
-  835,  835,  835,    0,    0,  835,    0,    0,    0,  835,
-  835,    0,  835,  835,  835,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  835,    0,  835,    0,  835,  835,
-    0,    0,  835,    0,  835,  835,  835,  835,  835,  835,
-  835,  835,  835,  835,  835,  835,    0,  835,    0,    0,
-  835,  835,    0,    0,  835,  835,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  835,
-  835,  835,  835,  835,    0,    0,    0,  835,  835,    0,
-    0,  835,    0,    0,    0,    0,  835,  835,  835,  835,
-  835,    0,  347,    0,  835,    0,  835,  347,  347,    0,
-    0,    0,  835,  835,    0,    0,    0,    0,    0,    0,
-    0,    0,  340,    0,    0,    0,    0,    0,    0,    0,
-  347,    0,    0,    0,    0,    0,    0,  835,  835,  835,
-  835,    0,  835,  347,  347,    0,    0,    0,  347,  835,
-    0,  347,    0,  347,    0,  347,  347,  347,  347,    0,
-    0,    0,    0,  347,    0,    0,    0,  347,    0,    0,
-    0,  347,    0,    0,    0,    0,    0,    0,    0,  347,
-    0,    0,  347,    0,  347,  347,    0,    0,    0,    0,
-  347,    0,  347,  347,  347,  347,  347,  347,  347,  347,
-  347,  347,  347,  347,    0,    0,    0,    0,  347,  347,
-    0,    0,    0,  347,  347,  347,  347,  347,  347,  347,
-  347,  347,  347,    0,  347,  347,  347,    0,  347,  347,
-  347,  347,  347,    0,    0,  347,  347,    0,    0,    0,
-  347,  347,  347,  347,  347,  347,  347,  347,  793,    0,
-    0,    0,    0,  793,  793,    0,    0,    0,    0,  347,
-    0,    0,  347,    0,  347,    0,  347,    0,    0,  347,
-    0,    0,    0,    0,    0,  347,  793,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  793,
-  793,    0,    0,    0,  793,    0,    0,  793,    0,  793,
-    0,  793,  793,  793,  793,    0,    0,    0,    0,  793,
-    0,    0,    0,  793,    0,    0,    0,  793,    0,    0,
-    0,    0,    0,    0,    0,  793,    0,    0,  793,    0,
-  793,  793,    0,    0,    0,    0,  793,    0,  793,  793,
-  793,  793,  793,  793,  793,  793,  793,  793,  793,    0,
-    0,    0,    0,    0,  793,  793,    0,    0,    0,  793,
-  793,  793,  793,  793,  793,    0,  793,  793,  793,    0,
-  793,  793,  372,    0,  793,  793,  793,  793,  340,    0,
-    0,  793,  793,  340,  340,    0,  793,  793,  793,  793,
-  793,  793,  793,  793,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  793,  340,    0,  793,    0,
-  793,    0,  793,    0,    0,  793,    0,    0,    0,  340,
-  340,  793,    0,    0,  340,    0,    0,  340,    0,  340,
-    0,  340,  340,  340,  340,    0,    0,    0,    0,  340,
-    0,    0,    0,  340,    0,    0,    0,  340,    0,    0,
-    0,    0,    0,    0,    0,  340,    0,    0,  340,    0,
-  340,  340,    0,    0,    0,    0,  340,    0,  340,  340,
-  340,  340,  340,  340,  340,  340,  340,  340,  340,    0,
-    0,    0,  347,    0,  340,  340,    0,    0,  347,  340,
-  340,  340,  340,  340,  340,    0,  340,  340,  340,    0,
-  340,  340,    0,    0,  340,  340,  340,  340,    0,    0,
-    0,  340,  340,    0,    0,    0,  340,  340,  340,  340,
-  340,  340,  340,  340,  347,    0,    0,    0,    0,    0,
-   31,    0,    0,    0,    0,  340,    0,    0,  340,    0,
-  340,    0,  340,    0,    0,  340,    0,    0,    0,    0,
-    0,  340,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  347,    0,    0,    0,    0,
-  347,    0,  347,  347,  347,  347,  347,  347,  347,  347,
-  347,  347,  347,  347,    0,    0,    0,    0,    0,  347,
- 1001,    0,    0,  347,  347,  347,  347,  347,  347,  347,
-  347,  347,  347,    0,  347,  347,    0,    0,  347,  347,
-  347,  347,  347,    0,    0,  347,  347,    0,    0,   37,
-  347,  347,  347,  347,  347,  347,  347,  347,  372,    0,
-    0,    0,    0,    0,  372,    0,    0,    0,    0,  347,
-    0,    0,  347,    0,  347,    0,  347,    0,    0,  347,
-    0,    0,    0,    0,    0,  347,    0,    0,    0,    0,
-    0,    0,   36,    0,    0,    0,    0,    0,    0,    0,
-  372,    0,    0, 1001,    0,    0,    0,    0, 1001,    0,
- 1001, 1001, 1001, 1001, 1001, 1001, 1001, 1001, 1001, 1001,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0, 1001,    0, 1001,   25, 1001,    0, 1001, 1001,
- 1001,  372,    0,    0,    0,    0,  372,    0,  372,  372,
-  372,  372,  372,  372,  372,  372,  372,  372,  372,    0,
-    0,    0,    0,    0,    0,  372,    0,    0,    0,  372,
-  372,    0,  372,  372,  372,    0,  372,  372,  372,    0,
-  372,  372,    0,    0,  372,  372,  372,  372,    0,    0,
-    0,  372,  372, 1001,    0,    0,  372,  372,  372,  372,
-  372,  372,  372,  372,    0,    0,    0,    0,    0,   35,
-    0,    0,    0,    0,    0,  372,   31,   31,  372,    0,
-  372,   31,    0,    0,    0,   31,    0,   31,    0,    0,
-   31,  372,   31,   31,    0,   31,    0,   31,    0,   31,
-    0,   31,   31,   31,   31,    0,    0,   31,   31,    0,
-    0,    0,    5,   31,    0,   31,   31,   31,    0,    0,
-   31,   31,   31,    0,   31,    0,    0,   31,    0,   31,
-   31,   31,   31,    0,    0,    0,   31,   31,   31,    0,
-    0,   31,   31,   31,    0,    0,    0,    0,    0,    0,
-   31,   31,    0,   31,   31, 1009,   31,   31,   31,    0,
-    0,    0,   31,    0,    0,    0,   37,    0,    0,    0,
-   37,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   37,   31,    0,    0,    0,   37,    0,   31,   31,
-   37,    0,    0,   37,    0,    0,    0,   31,   51,    0,
-    0,    0,    0,    0,    0,   37,   37,    0,    0,   36,
-   37,   37,    0,   36,    0,    0,   37,    0,   37,   37,
-   37,   37,    0,    0,   36,    0,   37,    0,    0,   36,
-   37,    0,   37,   36,    0,    0,   36,    0,   31,    0,
-    0,    7,   37,    0,   37,   37,    0,   37,   36,   36,
-    0,   37,   25,   36,   36,    0,   25,    0,    0,   36,
-    0,   36,   36,   36,   36,    0,    0,   25,    0,   36,
-    0,   37,   25,   36,    0,   36,   25,    0,   37,   25,
-    0,    0,    0,    0, 1010,   36,    0,    0,   36,    0,
-   36,   25,   25,    0,   36,    0,   25,   25,    0,    0,
-    0,    0,   25,    0,   25,   25,   25,   25,    0,    0,
-    0,    0,   25,    0,   36,    0,   25,    0,   25,    0,
-   36,   36,    0,    0,    0,    0,   35,   52,   25,    0,
-   35,   25,    0,   25,    0,    0,    0,   25,    0,    0,
-    0,   35,    0,    0,    0,    0,   35,    0,    0,    0,
-   35,    0,    0,   35,    0,    0,    0,   25,    0,    0,
-    0,    0,    0,   25,   25,   35,   35,    0,    0,    5,
-   35,   35,    0,   51,    0,    0,   35,    0,   35,   35,
-   35,   35,    0,    0,   51,    0,   35,    0,    0,   51,
-   35,    0,   35,   51,    0,    0,   51,    0,    0,    0,
-    0,    0,   35,    0,    0,   35,    0,   35,   51,   51,
-    0,   35, 1009,   51,   51,    0,   51,    0,    0,   51,
-    0,   51,   51,   51,   51,    0,    0,   51,    0,   51,
-    0,   35,   51,   51,    0,   51,   51,    0,   35,   51,
-    0,    0,    0,    0,    0,   51,    0,    0,   51,    0,
-   51,   51,   51,    0,   51,   51,   51,   51,    0,   51,
-    0,    0,   51,    0,   51,   51,   51,   51,    0,    0,
-   51,    0,   51,    0,   51,   51,   51,    0,   51,   51,
-    0,    0,   51,    0,    0,    0,    0,    0,   51,    0,
-    0,   51,    0,   51,   51,   51,    0,   51,    7,   51,
-   51,    0,   52,    0,    0,   51,    0,   51,   51,   51,
-   51,    0,    0,   52,    0,   51,    0,   51,   52,   51,
-    0,   51,   52,    0,    0,   52,    0,    0,    0,    0,
-    0,   51,    0,    0,   51,    0,   51,   52,   52,    0,
-   51, 1010,   52,   52,    0,   51,    0,    0,   52,    0,
+    0,    0,    0,    0,    0,  517,  517,    0,    0,    0,
+  517,  517,    0,  517,  517,  517,  517,  517,  517,  517,
+    0,  517,  517,    0,  517,  517,  517,  517,  517,  517,
+  517,  517,  517,  517,    0,  517,  517,  517,  517,  517,
+  517,  517,  517,  517,  517,  517,  517,  517,  517,  517,
+  517,  517,  517,  517,  517,  517,  517,    0,    0,  517,
+    0,  517,    0,  517,    0,    0,  517,  835,  835,    0,
+    0,    0,  517,    0,    0,  835,  835,  835,  835,  835,
+    0,  835,  835,  793,  835,  835,  835,  835,  835,  835,
+  835,    0,    0,    0,    0,    0,  835,    0,  835,  835,
+  835,  835,  835,  835,    0,    0,  835,    0,    0,    0,
+  835,  835,    0,  835,  835,  835,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  835,    0,  835,    0,  835,
+  835,    0,    0,  835,    0,  835,  835,  835,  835,  835,
+  835,  835,  835,  835,  835,  835,  835,    0,  835,    0,
+    0,  835,  835,    0,    0,  835,  835,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  835,  835,  835,  835,  835,    0,    0,    0,  835,  835,
+    0,    0,  835,    0,    0,    0,    0,  835,  835,  835,
+  835,  835,    0,  347,    0,  835,    0,  835,  347,  347,
+    0,    0,    0,  835,  835,    0,    0,    0,    0,    0,
+    0,    0,    0,  340,    0,    0,    0,    0,    0,    0,
+    0,  347,    0,    0,    0,    0,    0,    0,  835,  835,
+  835,  835,    0,  835,  347,  347,    0,    0,    0,  347,
+  835,    0,  347,    0,  347,    0,  347,  347,  347,  347,
+    0,    0,    0,    0,  347,    0,    0,    0,  347,    0,
+    0,    0,  347,    0,    0,    0,    0,    0,    0,    0,
+  347,    0,    0,  347,    0,  347,  347,    0,    0,    0,
+    0,  347,    0,  347,  347,  347,  347,  347,  347,  347,
+  347,  347,  347,  347,  347,    0,    0,    0,    0,  347,
+  347,    0,    0,    0,  347,  347,  347,  347,  347,  347,
+  347,  347,  347,  347,    0,  347,  347,    0,    0,  347,
+  347,  347,  347,  347,    0,    0,  347,  347,    0,    0,
+    0,  347,  347,  347,  347,  347,  347,  347,  347,  793,
+    0,    0,    0,  377,  793,  793,    0,    0,    0,    0,
+  347,    0,    0,  347,    0,  347,    0,  347,    0,    0,
+  347,    0,    0,    0,    0,    0,  347,  793,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  793,  793,    0,    0,    0,  793,    0,    0,  793,    0,
+  793,    0,  793,  793,  793,  793,    0,    0,    0,    0,
+  793,    0,    0,    0,  793,    0,    0,    0,  793,    0,
+    0,    0,    0,    0,    0,    0,  793,    0,    0,  793,
+    0,  793,  793,    0,    0,    0,    0,  793,    0,  793,
+  793,  793,  793,  793,  793,  793,  793,  793,  793,  793,
+    0,    0,    0,    0,    0,  793,  793,  372,    0,    0,
+  793,  793,  793,  793,  793,  793,    0,  793,  793,  793,
+    0,  793,  793,    0,    0,  793,  793,  793,  793,  340,
+    0,    0,  793,  793,  340,  340,    0,  793,  793,  793,
+  793,  793,  793,  793,  793,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  793,  340,    0,  793,
+    0,  793,    0,  793,    0,    0,  793,    0,    0,    0,
+  340,  340,  793,    0,    0,  340,    0,    0,  340,    0,
+  340,    0,  340,  340,  340,  340,    0,    0,    0,    0,
+  340,    0,    0,    0,  340,    0,    0,    0,  340,    0,
+    0,    0,    0,    0,    0,    0,  340,    0,    0,  340,
+    0,  340,  340,    0,    0,    0,    0,  340,    0,  340,
+  340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+    0,    0,    0,    0,    0,  340,  340,    0,    0,    0,
+  340,  340,  340,  340,  340,  340,    0,  340,  340,  340,
+    0,  340,  340,    0,    0,  340,  340,  340,  340,  377,
+    0,    0,  340,  340,  377,  377,    0,  340,  340,  340,
+  340,  340,  340,  340,  340,    0,   31,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  340,  377,    0,  340,
+    0,  340,    0,  340,    0,    0,  340,    0,    0,    0,
+  377,  377,  340,    0,    0,  377,    0,    0,  377,    0,
+  377,    0,  377,  377,  377,  377,    0,    0,    0,    0,
+  377,    0,    0,    0,  377,    0,    0,    0,  377,    0,
+    0,    0,    0,    0,    0,    0,  377,    0,    0,  377,
+    0,  377,  377,    0,    0,    0,    0,  377,    0,  377,
+  377,  377,  377,  377,  377,  377,  377,  377,  377,  377,
+    0,    0,   24,  372,    0,  377,  377,    0,    0,  372,
+  377,  377,    0,  377,  377,  377,    0,  377,  377,  377,
+    0,  377,  377,    0,    0,  377,  377,  377,  377,    0,
+    0,    0,  377,  377,    0,    0,    0,  377,  377,  377,
+  377,  377,  377,  377,  377,  372,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  377,    0,    0,  377,
+    0,  377,    0,    0,    0,   37,    0,    0,    0,    0,
+    0,    0,  377,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  372,    0,    0,    0,
+    0,  372,    0,  372,  372,  372,  372,  372,  372,  372,
+  372,  372,  372,  372,    0,    0,    0,    0,    0,    0,
+  372,    0,    0,    0,  372,  372,    0,  372,  372,  372,
+    0,  372,  372,  372,    0,  372,  372,    0,    0,  372,
+  372,  372,  372,    0,   36,    0,  372,  372,    0,    0,
+    0,  372,  372,  372,  372,  372,  372,  372,  372,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  372,    0,    0,  372,    0,  372,    0,    0,    0,    0,
+    0,    0,   31,   31,    0,    0,  372,   31,    0,    0,
+    0,   31,    0,   31,    0,    0,   31,    0,   31,   31,
+    0,   31,    0,   31,    0,   31,    0,   31,   31,   31,
+   31,    0,    0,   31,   31,    0,    0,    0,   25,   31,
+    0,   31,   31,   31,    0,    0,   31,   31,   31,    0,
+   31,    0,    0,   31,    0,   31,   31,   31,   31,    0,
+    0,    0,   31,   31,   31,    0,    0,   31,   31,   31,
+    0,    0,    0,    0,    0,    0,   31,   31,    0,   31,
+   31,   35,   31,   31,   31,    0,    0,    0,   31,   24,
+    0,    0,    0,   24,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   24,    0,    0,    0,   31,   24,
+    0,    0,    0,   24,   31,   31,   24,    0,    0,    0,
+    0,    0,    0,   31,    5,    0,    0,    0,   24,   24,
+    0,    0,    0,   24,   24,    0,    0,    0,    0,   24,
+    0,   24,   24,   24,   24,    0,    0,    0,    0,   24,
+    0,    0,   37,   24,    0,   24,   37,    0,    0,    0,
+    0,    0,    0,    0,   31,   24,    0,   37,   24,    0,
+   24,    0,   37,    0,   24,    0,   37,    0,    0,   37,
+    0,    0,    0,    0,    0,    0,    0, 1010,    0,    0,
+    0,   37,   37,    0,   24,    0,   37,   37,    0,   21,
+   24,   24,   37,    0,   37,   37,   37,   37,    0,    0,
+    0,    0,   37,    0,    0,    0,   37,    0,   37,    0,
+    0,   36,    0,    0,    0,   36,    0,    0,   37,    0,
+   37,   37,    0,   37,   51,    0,   36,   37,    0,    0,
+    0,   36,    0,    0,    0,   36,    0,    0,   36,    0,
+    0,    0,    0,    0,    0,    0,    0,   37,    0,    0,
+   36,   36,    0,    0,   37,   36,   36,    0,    0,    0,
+    0,   36,    0,   36,   36,   36,   36,    0,    0,    0,
+    0,   36,    0,    0,    0,   36,    0,   36,    0,    0,
+    0,    0,    0,    0,    0,   25,    0,   36,    0,   25,
+   36,    7,   36,    0,    0,    0,   36,    0,    0,    0,
+   25,    0,    0,    0,    0,   25,    0,    0,    0,   25,
+    0,    0,   25,    0,    0,    0,   36,    0,    0,    0,
+    0,    0,   36,   36,   25,   25,    0,    0,   35,   25,
+   25,    0,   35,    0, 1011,   25,    0,   25,   25,   25,
+   25,    0,    0,   35,    0,   25,    0,    0,   35,   25,
+    0,   25,   35,    0,    0,   35,    0,    0,    0,    0,
+    0,   25,    0,    0,   25,    0,   25,   35,   35,    0,
+   25,    5,   35,   35,    0,   51,    0,   52,   35,    0,
+   35,   35,   35,   35,    0,    0,   51,    0,   35,    0,
+   25,   51,   35,    0,   35,   51,   25,   25,   51,    0,
+    0,    0,    0,    0,   35,    0,    0,   35,    0,   35,
+   51,   51,    0,   35,    0,   51,   51,    0,    0,    0,
+    0,   51,    0,   51,   51,   51,   51,    0,    0,    0,
+    0,   51,    0,   35, 1010,   51,    0,   51,   51,    0,
+   35,    0,    0,    0,    0,    0,    0,   51,    0,   51,
+   51,    0,   51,    0,   51,    0,   51,    0,   51,    0,
+    0,   51,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,   51,   51,    0,   51,    0,   51,   51,
+    0,   51,    0,    0,   51,   51,   51,   51,   51,   51,
+    0,    0,    0,    0,   51,    0,   51,    0,   51,    0,
+   51,   51,    0,    0,    0,   51,    0,    0,   51,    0,
+   51,    0,    0,   51,    0,   51,    0,    0,    0,   51,
+   51,   51,    0,    0,    0,   51,   51,    0,    0,    0,
+    0,   51,    0,   51,   51,   51,   51,    0,    0,   51,
+    0,   51,    0,    0,    0,   51,    0,   51,    7,    0,
+    0,    0,   52,    0,    0,    0,    0,   51,    0,    0,
+   51,    0,   51,   52,    0,    0,   51,    0,   52,    0,
+    0,    0,   52,    0,    0,   52,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   51,   52,   52,    0,
+    0, 1011,   52,   52,    0,   51,    0,    0,   52,    0,
    52,   52,   52,   52,    0,    0,   51,    0,   52,    0,
-   51,   51,   52,    0,   52,   51,    0,    0,   51,    0,
+    0,   51,   52,    0,   52,   51,    0,    0,   51,    0,
     0,    0,    0,    0,   52,    0,    0,   52,    0,   52,
    51,   51,    0,   52,   52,   51,   51,    0,   52,    0,
     0,   51,    0,   51,   51,   51,   51,    0,    0,   52,
@@ -11159,31 +11180,31 @@ void case_1034()
   347,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,  347,  347,    0,    0,    0,    0,    0,    0,  347,
     0,    0,  347,    0,    0,    0,    0,    0,  347,    0,
-    0,  347,    0,    0,    0,    0,  347,    0,  347,  347,
+  201,  347,    0,    0,    0,    0,  347,    0,  347,  347,
   347,  347,  347,  347,  347,  347,  347,  347,  347,  347,
     0,    0,    0,    0,    0,  347,    0,    0,    0,    0,
-  347,  347,  347,  347,  347,  347,  347,  347,  347,    0,
-  347,  347,    0,  347,  347,  347,  347,  347,  347,  347,
+  347,  347,  347,  347,  347,  347,  347,  347,  347, 1002,
+  347,  347,  202,  347,  347,  347,  347,  347,  347,  347,
   347,  347,  347,    0,  347,  347,  347,  347,  347,  347,
   347,  347,  347,  347,  347,  347,  347,  347,  347,  347,
-  347,  347,  347,  347,  347,  347,    0,  519,  582,    0,
-  347,    0,  347,  519,    0,  347,    0,   24,    0,   25,
-    0,  347,   26,    0,    0,    0,    0,   27,    0,    0,
-    0,   28,    0,    0,    0,    0,    0,    0,    0,    0,
-   30,    0,    0,    0,    0,    0,    0,   32,    0,  519,
-    0,    0,   33,    0,    0,    0,   34,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   36,    0,
-   37,    0,    0,    0,   38,    0,    0,    0,    0,    0,
-    0,    0,   39,   40,    0,    0,   41,    0,    0,  324,
+  347,  347,  347,  347,  347,  347,    0,  519,    0,    0,
+  347,    0,  347,  519,    0,  347,    0,    0,    0,    0,
+    0,  347,  203,  204,  205,  206,    0,  207,  208,  209,
+  210,  211,  212,  213,  214,    0,    0,  215,  216,  217,
+  218,  219,  220,  221,  222,    0,    0,    0,    0,  519,
+    0,    0, 1002,    0,    0,    0,    0, 1002,    0, 1002,
+ 1002, 1002, 1002, 1002, 1002, 1002, 1002, 1002, 1002,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0, 1002,    0, 1002,    0, 1002,    0, 1002, 1002, 1002,
   519,    0,    0,    0,    0,  519,    0,  519,  519,  519,
   519,  519,  519,  519,  519,  519,  519,  519,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,  519,  519,
   519,  519,  519,  519,  519,  519,  519,  519,    0,  519,
   519,    0,  519,  519,  519,  519,  519,  519,  519,  519,
-  519,  519,    0,  519,  519,  519,  519,  519,  519,  519,
+  519,  519, 1002,  519,  519,  519,  519,  519,  519,  519,
   519,  519,  519,  519,  519,  519,  519,  519,  519,  519,
-  519,  519,  519,  519,  519,    0,  515,  641,    0,    0,
-  368,  519,  515,    0,    0,    0,   24,    0,   25,    0,
+  519,  519,  519,  519,  519,    0,  515,  642,    0,    0,
+    0,  519,  515,    0,    0,    0,   24,    0,   25,    0,
   519,   26,    0,    0,    0,    0,   27,    0,    0,    0,
    28,    0,    0,    0,    0,    0,    0,    0,    0,   30,
     0,    0,    0,    0,    0,    0,   32,    0,  515,    0,
@@ -11214,7 +11235,7 @@ void case_1034()
   523,  523,  523,  523,  523,  523,  523,  523,  523,  523,
     0,  523,  523,  523,  523,  523,  523,  523,  523,  523,
   523,  523,  523,  523,  523,  523,  523,  523,  523,  523,
-  523,  523,  523,    0,  347,  643,    0,    0,    0,  523,
+  523,  523,  523,    0,  347,  644,    0,    0,    0,  523,
   347,    0,  523,    0,   24,    0,   25,    0,  523,   26,
     0,    0,    0,    0,   27,    0,    0,    0,   28,    0,
     0,    0,    0,    0,    0,    0,    0,   30,    0,    0,
@@ -11230,7 +11251,7 @@ void case_1034()
   347,  347,  347,  347,  347,  347,  347,  347,  347,    0,
   347,  347,  347,  347,  347,  347,  347,  347,  347,  347,
   347,  347,  347,  347,  347,  347,  347,  347,  347,  347,
-  347,  347,    0,  448,  950,    0,    0,  368,  347,  448,
+  347,  347,    0,  448,  951,    0,    0,  368,  347,  448,
     0,  347,    0,   24,    0,   25,    0,  347,   26,    0,
     0,    0,    0,   27,    0,    0,    0,   28,    0,    0,
     0,    0,    0,    0,    0,    0,   30,    0,    0,    0,
@@ -11246,7 +11267,7 @@ void case_1034()
   448,  448,  448,  448,  448,  448,  448,  448,    0,  448,
   448,  448,  448,  448,  448,  448,  448,  448,  448,  448,
   448,  448,  448,  448,  448,  448,  448,  448,  448,  448,
-  448,    0,  347,    0,    0,    0,  368,  448,  347, 1101,
+  448,    0,  347,    0,    0,    0,  368,  448,  347, 1102,
   448,    0,  796,    0,    0,    0,  448,    0,   24,    0,
    25,    0,    0,   26,    0,    0,    0,    0,   27,    0,
     0,    0,   28,    0,    0,    0,    0,    0,    0,    0,
@@ -11264,27 +11285,27 @@ void case_1034()
   347,  347,  347,  347,  347,  347,  347,  347,  347,  347,
     0,    0,    0,    0,  347,    0,  347,    0,    0,  347,
     0,  368,    0,    0,    0,  347,    0,    0,  557,    0,
-    0,    0,  629,  557,    0,  557,  557,  557,  557,  557,
+    0,    0,    0,  557,    0,  557,  557,  557,  557,  557,
   557,  557,  557,  557,  557,  557,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,  557,    0,  557,
     0,  557,    0,  557,  557,  557,    0,  557,  557,    0,
   557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-    0,    0,    0,  557,  557,  557,  557,  557,  557,  557,
+  369,    0,    0,  557,  557,  557,  557,  557,  557,  557,
   557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-  557,  579,  557,    0,    0,    0,    0,  579,    0,    0,
-    0,    0,    0,    0,    0,  629,    0,    0,  557,    0,
-  629,    0,  629,  629,  629,  629,  629,  629,  629,  629,
-  629,  629,  629,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  579,  629,    0,  629,    0,  629,    0,
-  629,  629,  629,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  629,    0,    0,  586,
+  557,  579,  557,  369,    0,    0,    0,  579,    0,    0,
+    0,    0,    0,    0,    0,    0,  369,    0,  557,    0,
+    0,  369,    0,    0,  240,    0,  369,    0,  369,  369,
+  369,  369,    0,    0,    0,    0,  369,    0,    0,    0,
+  369,    0,    0,  579,  369,    0,    0,    0,    0,    0,
+    0,    0,  369,    0,    0,  369,    0,  369,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  586,
     0,    0,    0,    0,    0,  586,    0,    0,    0,    0,
-    0,    0,    0,    0,  579,    0,    0,    0,    0,  579,
+    0,  369,    0,    0,  579,    0,    0,  369,    0,  579,
     0,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-  579,  579,    0,    0,    0,  629,    0,    0,    0,    0,
+  579,  579,    0,    0,    0,    0,    0,    0,    0,    0,
     0,  586,    0,  579,    0,  579,    0,  579,    0,  579,
   579,  579,    0,  579,  579,    0,    0,  579,  579,  579,
-  579,  579,  579,  579,  579,  579,    0,    0,    0,  579,
+  579,  579,  579,  579,  579,  579,    0,  369,    0,  579,
   579,  579,  579,  579,  579,  579,  579,    0,    0,    0,
     0,    0,  586,    0,    0,    0,    0,  586,  579,  586,
   586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
@@ -11376,455 +11397,422 @@ void case_1034()
   610,  610,    0,    0,    0,    0,  609,    0,    0,    0,
     0,    0,    0,  610,    0,  610,    0,  610,    0,  610,
   610,  610,    0,    0,    0,    0,    0,    0,    0,  610,
-  610,    0,    0,    0,  610,  610,    0,  614,    0,    0,
+  610,    0,    0,    0,  610,  610,    0,  615,    0,    0,
     0,    0,    0,  610,  610,  610,  610,    0,    0,    0,
     0,    0,  611,    0,    0,    0,    0,  611,  610,  611,
   611,  611,  611,  611,  611,  611,  611,  611,  611,  611,
     0,    0,    0,    0,  610,    0,    0,    0,    0,    0,
     0,  611,    0,  611,    0,  611,    0,  611,  611,  611,
     0,    0,    0,    0,    0,    0,    0,  611,  611,    0,
-    0,    0,  611,  611,    0,  615,    0,    0,    0,    0,
+    0,    0,  611,  611,    0,  617,    0,    0,    0,    0,
     0,  611,  611,  611,  611,    0,    0,    0,    0,    0,
-  614,    0,    0,    0,    0,  614,  611,  614,  614,  614,
-  614,  614,  614,  614,  614,  614,  614,  614,    0,    0,
-    0,    0,  611,    0,    0,    0,    0,    0,    0,  614,
-    0,  614,    0,  614,    0,  614,  614,  614,    0,    0,
-    0,    0,    0,    0,    0,  614,  614,    0,    0,    0,
-  614,  614,    0,  617,    0,    0,    0,    0,    0,    0,
-    0,  614,  614,    0,    0,    0,    0,    0,  615,    0,
-    0,    0,    0,  615,  614,  615,  615,  615,  615,  615,
-  615,  615,  615,  615,  615,  615,    0,    0,    0,    0,
-  614,    0,    0,    0,    0,    0,    0,  615,    0,  615,
-    0,  615,    0,  615,  615,  615,    0,    0,    0,    0,
-    0,    0,    0,  615,  615,    0,    0,    0,  615,  615,
-    0,  618,    0,    0,    0,    0,    0,    0,    0,  615,
-  615,    0,    0,    0,    0,    0,  617,    0,    0,    0,
-    0,  617,  615,  617,  617,  617,  617,  617,  617,  617,
-  617,  617,  617,  617,    0,    0,    0,    0,  615,    0,
-    0,    0,    0,    0,    0,  617,    0,  617,    0,  617,
-    0,  617,  617,  617,    0,    0,    0,    0,    0,    0,
-    0,    0,  617,    0,    0,    0,  617,  617,    0,  620,
-    0,    0,    0,    0,    0,    0,    0,  617,  617,    0,
-    0,    0,    0,    0,  618,    0,    0,    0,    0,  618,
-  617,  618,  618,  618,  618,  618,  618,  618,  618,  618,
-  618,  618,    0,    0,    0,    0,  617,    0,    0,    0,
-    0,    0,    0,  618,    0,  618,    0,  618,    0,  618,
-  618,  618,    0,    0,    0,    0,    0,    0,    0,    0,
-  618,    0,    0,    0,  618,  618,    0,  621,    0,    0,
-    0,    0,    0,    0,    0,  618,  618,    0,    0,    0,
-    0,    0,  620,    0,    0,    0,    0,  620,  618,  620,
-  620,  620,  620,  620,  620,  620,  620,  620,  620,  620,
-    0,    0,    0,    0,  618,    0,    0,    0,    0,    0,
-    0,  620,    0,  620,    0,  620,    0,  620,  620,  620,
-    0,    0,    0,    0,    0,    0,    0,    0,  620,    0,
-    0,    0,    0,  620,    0,  623,    0,    0,    0,    0,
-    0,    0,    0,  620,  620,    0,    0,    0,    0,    0,
-  621,    0,    0,    0,    0,  621,  620,  621,  621,  621,
-  621,  621,  621,  621,  621,  621,  621,  621,    0,    0,
-    0,    0,  620,    0,    0,    0,    0,    0,    0,  621,
-    0,  621,    0,  621,    0,  621,  621,  621,    0,    0,
-    0,    0,    0,    0,    0,    0,  621,    0,    0,    0,
-    0,  621,    0,  624,    0,    0,    0,    0,    0,    0,
-    0,  621,  621,    0,    0,    0,    0,    0,  623,    0,
-    0,    0,    0,  623,  621,  623,  623,  623,  623,  623,
-  623,  623,  623,  623,  623,  623,    0,    0,    0,    0,
-  621,    0,    0,    0,    0,    0,    0,  623,    0,  623,
-    0,  623,    0,  623,  623,  623,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  623,
-    0,  626,    0,    0,    0,    0,    0,    0,    0,  623,
-  623,    0,    0,    0,    0,    0,  624,    0,    0,    0,
-    0,  624,  623,  624,  624,  624,  624,  624,  624,  624,
-  624,  624,  624,  624,    0,    0,    0,    0,  623,    0,
-    0,    0,    0,    0,    0,  624,    0,  624,    0,  624,
-    0,  624,  624,  624,    0,    0,    0,  627,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  624,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  624,  624,    0,
-    0,    0,    0,    0,  626,    0,    0,    0,    0,  626,
-  624,  626,  626,  626,  626,  626,  626,  626,  626,  626,
-  626,  626,    0,    0,    0,    0,  624,    0,    0,    0,
-    0,    0,    0,  626,    0,  626,    0,  626,    0,  626,
-  626,  626,    0,    0,    0,    0,  347,    0,    0,    0,
-  796,    0,    0,    0,    0,  626,    0,    0,    0,    0,
-  627,    0,    0,    0,    0,  627,  626,  627,  627,  627,
-  627,  627,  627,  627,  627,  627,  627,  627,  626,    0,
-    0,    0,  347,    0,    0,    0,    0,    0,    0,  627,
-    0,  627,    0,  627,  626,  627,  627,  627,  796,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  627,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  627,    0,    0,    0,    0,    0,    0,    0,
+  615,    0,    0,    0,    0,  615,  611,  615,  615,  615,
+  615,  615,  615,  615,  615,  615,  615,  615,    0,    0,
+    0,    0,  611,    0,    0,    0,    0,    0,    0,  615,
+    0,  615,    0,  615,    0,  615,  615,  615,    0,    0,
+    0,    0,    0,    0,    0,  615,  615,    0,    0,    0,
+  615,  615,    0,  618,    0,    0,    0,    0,    0,    0,
+    0,  615,  615,    0,    0,    0,    0,    0,  617,    0,
+    0,    0,    0,  617,  615,  617,  617,  617,  617,  617,
+  617,  617,  617,  617,  617,  617,    0,    0,    0,    0,
+  615,    0,    0,    0,    0,    0,    0,  617,    0,  617,
+    0,  617,    0,  617,  617,  617,    0,    0,    0,    0,
+    0,    0,    0,    0,  617,    0,    0,    0,  617,  617,
+    0,  620,    0,    0,    0,    0,    0,    0,    0,  617,
+  617,    0,    0,    0,    0,    0,  618,    0,    0,    0,
+    0,  618,  617,  618,  618,  618,  618,  618,  618,  618,
+  618,  618,  618,  618,    0,    0,    0,    0,  617,    0,
+    0,    0,    0,    0,    0,  618,    0,  618,    0,  618,
+    0,  618,  618,  618,    0,    0,    0,    0,    0,    0,
+    0,    0,  618,    0,    0,    0,  618,  618,    0,  621,
+    0,    0,    0,    0,    0,    0,    0,  618,  618,    0,
+    0,    0,    0,    0,  620,    0,    0,    0,    0,  620,
+  618,  620,  620,  620,  620,  620,  620,  620,  620,  620,
+  620,  620,    0,    0,    0,    0,  618,    0,    0,    0,
+    0,    0,    0,  620,    0,  620,    0,  620,    0,  620,
+  620,  620,    0,    0,    0,    0,    0,    0,    0,    0,
+  620,    0,    0,    0,    0,  620,    0,  623,    0,    0,
+    0,    0,    0,    0,    0,  620,  620,    0,    0,    0,
+    0,    0,  621,    0,    0,    0,    0,  621,  620,  621,
+  621,  621,  621,  621,  621,  621,  621,  621,  621,  621,
+    0,    0,    0,    0,  620,    0,    0,    0,    0,    0,
+    0,  621,    0,  621,    0,  621,    0,  621,  621,  621,
+    0,    0,    0,    0,    0,    0,    0,    0,  621,    0,
+    0,    0,    0,  621,    0,  624,    0,    0,    0,    0,
+    0,    0,    0,  621,  621,    0,    0,    0,    0,    0,
+  623,    0,    0,    0,    0,  623,  621,  623,  623,  623,
+  623,  623,  623,  623,  623,  623,  623,  623,    0,    0,
+    0,    0,  621,    0,    0,    0,    0,    0,    0,  623,
+    0,  623,    0,  623,    0,  623,  623,  623,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  623,    0,  626,    0,    0,    0,    0,    0,    0,
+    0,  623,  623,    0,    0,    0,    0,    0,  624,    0,
+    0,    0,    0,  624,  623,  624,  624,  624,  624,  624,
+  624,  624,  624,  624,  624,  624,    0,    0,    0,    0,
+  623,    0,    0,    0,    0,    0,    0,  624,    0,  624,
+    0,  624,    0,  624,  624,  624,    0,    0,    0,  627,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  624,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  624,
+  624,    0,    0,    0,    0,    0,  626,    0,    0,    0,
+    0,  626,  624,  626,  626,  626,  626,  626,  626,  626,
+  626,  626,  626,  626,    0,    0,    0,    0,  624,    0,
+    0,    0,    0,    0,    0,  626,    0,  626,    0,  626,
+    0,  626,  626,  626,    0,    0,    0,    0,  347,    0,
+    0,    0,  796,    0,    0,    0,    0,  626,    0,    0,
+    0,    0,  627,    0,    0,    0,    0,  627,  626,  627,
+  627,  627,  627,  627,  627,  627,  627,  627,  627,  627,
+  626,    0,    0,    0,  347,    0,    0,    0,    0,    0,
+    0,  627,    0,  627,    0,  627,  626,  627,  627,  627,
+  796,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  627,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,  627,    0,    0,    0,    0,    0,
-    0,  347,    0,    0,    0,    0,    0,  347,    0,    0,
-  627,    0,  347,  347,    0,  347,    0,  347,    0,  796,
-  347,    0,  347,  347,    0,  347,  347,  347,  347,  347,
-  347,  347,  347,  347,  347,    0,  347,  347,  347,  347,
+    0,    0,    0,    0,    0,    0,  627,    0,    0,    0,
+    0,    0,    0,  347,    0,    0,    0,    0,    0,  347,
+    0,    0,  627,    0,  347,  347,    0,  347,    0,  347,
+    0,  796,  347,    0,  347,  347,    0,  347,  347,  347,
+  347,  347,  347,  347,  347,  347,  347,    0,  347,  347,
   347,  347,  347,  347,  347,  347,  347,  347,  347,  347,
-  347,  347,  347,  347,  347,  347,  347,  347,    0,    0,
-  571,    0,  347,    0,  347,    0,    0,  347,   56,   24,
-   57,   25, 1129,  347,   26,   58,    0,   59,   60,   27,
-   61,   62,   63,   28,    0,    0,    0,    0,    0,   64,
-    0,   65,   30,   66,   67,   68,   69,    0,    0,   32,
-    0,    0,    0,   70,   33,    0,   71,   72,   34,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   73,    0,
-   36,    0,   37,   74,    0,    0,   38,    0,   75,   76,
-   77,   78,   79,   80,   39,   40,   81,   82,   41,   83,
-    0,   84,    0,    0,   85,   86,    0,    0,   87,   88,
+  347,  347,  347,  347,  347,  347,  347,  347,  347,  347,
+    0,    0,  572,    0,  347,    0,  347,    0,    0,  347,
+   56,   24,   57,   25, 1130,  347,   26,   58,    0,   59,
+   60,   27,   61,   62,   63,   28,    0,    0,    0,    0,
+    0,   64,    0,   65,   30,   66,   67,   68,   69,    0,
+    0,   32,    0,    0,    0,   70,   33,    0,   71,   72,
+   34,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   73,    0,   36,    0,   37,   74,    0,    0,   38,    0,
+   75,   76,   77,   78,   79,   80,   39,   40,   81,   82,
+   41,   83,    0,   84,    0,    0,   85,   86,    0,    0,
+   87,   88,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,   89,   90,   91,   92,   93,
+    0,    0,    0,   94,    0,    0,    0,   95,    0,    0,
+    0,    0,   96,   97,   98,   99,  100,    0,    0,    0,
+  101,    0,  102,    0,    0,    0,    0,    0,  103,  104,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   89,   90,   91,   92,   93,    0,    0,
-    0,   94,    0,    0,    0,   95,    0,    0,    0,    0,
-   96,   97,   98,   99,  100,    0,    0,    0,  101,    0,
-  102,    0,    0,    0,    0,    0,  103,  104,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   55,
-    0,  105,  572,  107,  108,    0, 1130,   56,   24,   57,
-   25,    0,    0,   26,   58,    0,   59,   60,   27,   61,
-   62,   63,   28,    0,    0,    0,    0,    0,   64,    0,
-   65,   30,   66,   67,   68,   69,    0,    0,   32,    0,
-    0,    0,   70,   33,    0,   71,   72,   34,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   73,    0,   36,
-    0,   37,   74,    0,    0,   38,    0,   75,   76,   77,
-   78,   79,   80,   39,   40,   81,   82,   41,   83,    0,
-   84,    0,    0,   85,   86,    0,    0,   87,   88,    0,
+    0,   55,    0,  105,  573,  107,  108,    0, 1131,   56,
+   24,   57,   25,    0,    0,   26,   58,    0,   59,   60,
+   27,   61,   62,   63,   28,    0,    0,    0,    0,    0,
+   64,    0,   65,   30,   66,   67,   68,   69,    0,    0,
+   32,    0,    0,    0,   70,   33,    0,   71,   72,   34,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   73,
+    0,   36,    0,   37,   74,    0,    0,   38,    0,   75,
+   76,   77,   78,   79,   80,   39,   40,   81,   82,   41,
+   83,    0,   84,    0,    0,   85,   86,    0,    0,   87,
+   88,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   89,   90,   91,   92,   93,    0,
+    0,    0,   94,    0,    0,    0,   95,    0,    0,    0,
+    0,   96,   97,   98,   99,  100,    0,    0,    0,  101,
+    0,  102,    0,    0,    0,    0,    0,  103,  104,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  266,    0,
+    0,    0,  105,  106,  107,  108,   56,   24,   57,   25,
+    0,    0,   26,   58,    0,   59,   60,   27,   61,   62,
+   63,   28,    0,    0,    0,    0,    0,   64,    0,   65,
+   30,   66,   67,   68,   69,    0,    0,   32,    0,    0,
+    0,   70,   33,    0,   71,   72,   34,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   73,    0,   36,    0,
+   37,   74,    0,    0,   38,    0,   75,   76,   77,   78,
+   79,   80,   39,   40,   81,   82,   41,   83,    0,   84,
+    0,    0,   85,   86,    0,    0,   87,   88,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,   89,   90,   91,   92,   93,    0,    0,    0,   94,
+    0,    0,    0,   95,    0,    0,    0,    0,   96,   97,
+   98,   99,  100,    0,    0,    0,  101,    0,  102,    0,
+    0,    0,    0,    0,  103,  104,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  572,    0,    0,    0,  105,
+  106,  107,  108,   56,   24,   57,   25,    0,    0,   26,
+   58,    0,   59,   60,   27,   61,   62,   63,   28,    0,
+    0,    0,    0,    0,   64,    0,   65,   30,   66,   67,
+   68,   69,    0,    0,   32,    0,    0,    0,   70,   33,
+    0,   71,   72,   34,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,   73,    0,   36,    0,   37,   74,    0,
+    0,   38,    0,   75,   76,   77,   78,   79,   80,   39,
+   40,   81,   82,   41,   83,    0,   84,    0,    0,   85,
+   86,    0,    0,   87,   88,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   89,   90,
+   91,   92,   93,    0,    0,    0,   94,    0,    0,    0,
+   95,    0,    0,    0,    0,   96,   97,   98,   99,  100,
+    0,    0,    0,  101,    0,  102,    0,    0,    0,    0,
+    0,  103,  104,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0, 1007,    0,    0,    0,  105,  573,  107,  108,
+ 1007, 1007, 1007, 1007,    0,    0, 1007, 1007,    0, 1007,
+ 1007, 1007, 1007, 1007, 1007, 1007,    0,    0,    0,    0,
+    0, 1007,    0, 1007, 1007, 1007, 1007, 1007, 1007,    0,
+    0, 1007,    0,    0,    0, 1007, 1007,    0, 1007, 1007,
+ 1007,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+ 1007,    0, 1007,    0, 1007, 1007,    0,    0, 1007,    0,
+ 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+ 1007, 1007,    0, 1007,    0,    0, 1007, 1007,    0,    0,
+ 1007, 1007,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0, 1007, 1007, 1007, 1007, 1007,
+    0,    0,    0, 1007,    0,    0,    0, 1007,    0,    0,
+    0,    0, 1007, 1007, 1007, 1007, 1007,    0,    0,    0,
+ 1007,    0, 1007,    0,    0,    0,    0,    0, 1007, 1007,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  613,
+    0,    0,    0, 1007, 1007, 1007, 1007,   56,   24,    0,
+   25,    0,    0,   26,  254,    0,    0,    0,   27,   61,
+   62,    0,   28,    0,    0,  182,    0,  182,   64,    0,
+  182,   30,    0,    0,    0,  182,    0,    0,   32,  182,
+    0,    0,    0,   33,    0,   71,   72,   34,  182,  614,
+    0,    0,    0,    0,    0,  182,  615,    0,    0,   36,
+  182,   37,   74,    0,  182,   38,    0,    0,   76,    0,
+   78,    0,   80,   39,   40,  255,  182,   41,  182,    0,
+    0,    0,  182,    0,  616,    0,    0,   87,   88,    0,
+  182,  182,    0,    0,  182,    0,    0,  182,    0,    0,
     0,    0,   89,   90,   91,   92,   93,    0,    0,    0,
-   94,    0,    0,    0,   95,    0,    0,    0,    0,   96,
+    0,    0,    0,    0,   95,    0,    0,  617,    0,    0,
    97,   98,   99,  100,    0,    0,    0,  101,    0,  102,
-    0,    0,    0,    0,    0,  103,  104,    0,    0,    0,
+    0,    0, 1031,    0,    0,  103,  104,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  786,    0,    0,    0,
+  105,  106,  107,  108,   56,   24,    0,   25,    0,    0,
+   26,  254,    0,    0,    0,   27,   61,   62,  182,   28,
+    0,    0,  182,    0,  182,   64,    0,  182,   30,    0,
+    0,    0,  182,    0,    0,   32,  182,    0,    0,    0,
+   33,    0,   71,   72,   34,  182,    0,    0,    0,    0,
+    0,    0,  182,    0,    0,    0,   36,  182,   37,   74,
+    0,  182,   38,    0,    0,   76,    0,   78,    0,   80,
+   39,   40,  255,  182,   41,  182,    0,    0,    0,  182,
+    0,   86,    0,    0,   87,   88,    0,  182,  182,    0,
+    0,  182,    0,    0,  182,    0,    0,    0,    0,   89,
+   90,   91,   92,  302,    0,    0,    0,  531,  787,    0,
+    0,   95,    0,    0,    0,    0,    0,   97,   98,   99,
+  100,    0,    0,    0,  101,    0,  102, 1031,    0,    0,
+    0,    0,  103,  104,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  977,    0,    0,    0,  105,  303,  107,
+  108,   56,   24,    0,   25,    0,    0,   26,  254,    0,
+    0,    0,   27,   61,   62,  182,   28,    0,    0,   24,
+    0,   25,   64,    0,   26,   30,    0,    0,    0,   27,
+    0,    0,   32,   28,    0,    0,    0,   33,    0,   71,
+   72,   34,   30,  614,    0,    0,    0,    0,    0,   32,
+  615,    0,    0,   36,   33,   37,   74,    0,   34,   38,
+    0,    0,   76,    0,   78,    0,   80,   39,   40,  255,
+   36,   41,   37,    0,    0,    0,   38,    0,  616,    0,
+    0,   87,   88,    0,   39,   40,    0,    0,   41,    0,
+    0,  324,    0,    0,    0,    0,   89,   90,   91,   92,
+   93,    0,    0,    0,    0,    0,    0,    0,   95,    0,
+    0,    0,    0,    0,   97,   98,   99,  100,    0,    0,
+    0,  101,    0,  102,    0,    0,    0,    0,    0,  103,
+  104,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  266,    0,    0,    0,
-  105,  106,  107,  108,   56,   24,   57,   25,    0,    0,
-   26,   58,    0,   59,   60,   27,   61,   62,   63,   28,
-    0,    0,    0,    0,    0,   64,    0,   65,   30,   66,
-   67,   68,   69,    0,    0,   32,    0,    0,    0,   70,
+  786,    0,    0,    0,  105,  106,  107,  108,   56,   24,
+    0,   25,    0,    0,   26,  254,    0,    0,    0,   27,
+   61,   62,  368,   28,    0,    0,   24,    0,   25,   64,
+    0,   26,   30,    0,    0,    0,   27,    0,    0,   32,
+   28,    0,    0,    0,   33,    0,   71,   72,   34,   30,
+    0,    0,    0,    0,    0,    0,   32,    0,    0,    0,
+   36,   33,   37,   74,  983,   34,   38,    0,    0,   76,
+    0,   78,    0,   80,   39,   40,  255,   36,   41,   37,
+    0,    0,    0,   38,    0,   86,    0,    0,   87,   88,
+    0,   39,   40,    0,    0,   41,    0,    0,  533,    0,
+    0,    0,    0,   89,   90,   91,   92,  302,    0,    0,
+    0,  531,    0,    0,    0,   95,    0,    0,    0,    0,
+    0,   97,   98,   99,  100,    0,    0,    0,  101,    0,
+  102,    0,    0,    0,    0,    0,  103,  104,    0,    0,
+    0,    0,    0,    0,   56,   24,    0,   25,    0,    0,
+   26,  254,    0,    0,    0,   27,   61,   62,    0,   28,
+    0,  105,  303,  107,  108,   64,    0,    0,   30,    0,
+    0,    0,    0,    0,    0,   32,    0,    0,    0,  368,
    33,    0,   71,   72,   34,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   73,    0,   36,    0,   37,   74,
-    0,    0,   38,    0,   75,   76,   77,   78,   79,   80,
-   39,   40,   81,   82,   41,   83,    0,   84,    0,    0,
-   85,   86,    0,    0,   87,   88,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   36,    0,   37,   74,
+    0,    0,   38,    0,    0,   76,    0,   78,    0,   80,
+   39,   40,  255,    0,   41,    0,    0,    0,    0,    0,
+    0,   86,    0,    0,   87,   88,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,   89,
-   90,   91,   92,   93,    0,    0,    0,   94,    0,    0,
-    0,   95,    0,    0,    0,    0,   96,   97,   98,   99,
+   90,   91,   92,  769,    0,    0,    0,  770, 1051,    0,
+    0,   95,    0,    0,    0,    0,    0,   97,   98,   99,
   100,    0,    0,    0,  101,    0,  102,    0,    0,    0,
     0,    0,  103,  104,    0,    0,    0,    0,    0,    0,
+   56,   24,    0,   25,    0,    0,   26,  254,    0,    0,
+    0,   27,   61,   62,    0,   28,    0,  105,  771,  107,
+  108,   64,    0,    0,   30,    0,    0,    0,  772,    0,
+    0,   32,    0,    0,    0,    0,   33,    0,   71,   72,
+   34,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,   36,    0,   37,   74,    0,    0,   38,    0,
+    0,   76,    0,   78,    0,   80,   39,   40,  255,    0,
+   41,    0,    0,    0,    0,    0,    0,   86,    0,    0,
+   87,   88,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,   89,   90,   91,   92,  769,
+    0,    0,    0,  770,    0,    0,    0,   95,    0,    0,
+    0,    0,    0,   97,   98,   99,  100,    0,    0,    0,
+  101,    0,  102,    0,    0,    0,    0,    0,  103,  104,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  571,    0,    0,    0,  105,  106,  107,
-  108,   56,   24,   57,   25,    0,    0,   26,   58,    0,
-   59,   60,   27,   61,   62,   63,   28,    0,    0,    0,
-    0,    0,   64,    0,   65,   30,   66,   67,   68,   69,
-    0,    0,   32,    0,    0,    0,   70,   33,    0,   71,
-   72,   34,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   73,    0,   36,    0,   37,   74,    0,    0,   38,
-    0,   75,   76,   77,   78,   79,   80,   39,   40,   81,
-   82,   41,   83,    0,   84,    0,    0,   85,   86,    0,
-    0,   87,   88,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   89,   90,   91,   92,
-   93,    0,    0,    0,   94,    0,    0,    0,   95,    0,
-    0,    0,    0,   96,   97,   98,   99,  100,    0,    0,
-    0,  101,    0,  102,    0,    0,    0,    0,    0,  103,
-  104,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
- 1006,    0,    0,    0,  105,  572,  107,  108, 1006, 1006,
- 1006, 1006,    0,    0, 1006, 1006,    0, 1006, 1006, 1006,
- 1006, 1006, 1006, 1006,    0,    0,    0,    0,    0, 1006,
-    0, 1006, 1006, 1006, 1006, 1006, 1006,    0,    0, 1006,
-    0,    0,    0, 1006, 1006,    0, 1006, 1006, 1006,    0,
-    0,    0,    0,    0,    0,    0,    0,    0, 1006,    0,
- 1006,    0, 1006, 1006,    0,    0, 1006,    0, 1006, 1006,
- 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
-    0, 1006,    0,    0, 1006, 1006,    0,    0, 1006, 1006,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0, 1006, 1006, 1006, 1006, 1006,    0,    0,
-    0, 1006,    0,    0,    0, 1006,    0,    0,    0,    0,
- 1006, 1006, 1006, 1006, 1006,    0,    0,    0, 1006,    0,
- 1006,    0,    0,    0,    0,    0, 1006, 1006,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  612,    0,    0,
-    0, 1006, 1006, 1006, 1006,   56,   24,    0,   25,    0,
-    0,   26,  254,    0,    0,    0,   27,   61,   62,    0,
-   28,    0,    0,  182,    0,  182,   64,    0,  182,   30,
-    0,    0,    0,  182,    0,    0,   32,  182,    0,    0,
-    0,   33,    0,   71,   72,   34,  182,  613,    0,    0,
-    0,    0,    0,  182,  614,    0,    0,   36,  182,   37,
-   74,    0,  182,   38,    0,    0,   76,    0,   78,    0,
-   80,   39,   40,  255,  182,   41,  182,    0,    0,    0,
-  182,    0,  615,    0,    0,   87,   88,    0,  182,  182,
-    0,    0,  182,    0,    0,  182,    0,    0,    0,    0,
-   89,   90,   91,   92,   93,    0,    0,    0,    0,    0,
-    0,    0,   95,    0,    0,  616,    0,    0,   97,   98,
-   99,  100,    0,    0,    0,  101,    0,  102,    0,    0,
- 1030,    0,    0,  103,  104,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  785,    0,    0,    0,  105,  106,
-  107,  108,   56,   24,    0,   25,    0,    0,   26,  254,
-    0,    0,    0,   27,   61,   62,  182,   28,    0,    0,
-  182,    0,  182,   64,    0,  182,   30,    0,    0,    0,
-  182,    0,    0,   32,  182,    0,    0,    0,   33,    0,
-   71,   72,   34,  182,    0,    0,    0,    0,    0,    0,
-  182,    0,    0,    0,   36,  182,   37,   74,    0,  182,
-   38,    0,    0,   76,    0,   78,    0,   80,   39,   40,
-  255,  182,   41,  182,    0,    0,    0,  182,    0,   86,
-    0,    0,   87,   88,    0,  182,  182,    0,    0,  182,
-    0,    0,  182,    0,    0,    0,    0,   89,   90,   91,
-   92,  302,    0,    0,    0,  531,  786,    0,    0,   95,
-    0,    0,    0,    0,    0,   97,   98,   99,  100,    0,
-    0,    0,  101,    0,  102, 1030,    0,    0,    0,    0,
-  103,  104,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  976,    0,    0,    0,  105,  303,  107,  108,   56,
-   24,    0,   25,    0,    0,   26,  254,    0,    0,    0,
-   27,   61,   62,  182,   28,    0,    0,   24,    0,   25,
+    0,  786,    0,  105,  771,  107,  108,    0,    0,   56,
+   24,    0,   25,    0,  772,   26,  254,    0,    0,    0,
+   27,   61,   62,    0,   28,    0,    0,   24,    0,   25,
    64,    0,   26,   30,    0,    0,    0,   27,    0,    0,
    32,   28,    0,    0,    0,   33,    0,   71,   72,   34,
-   30,  613,    0,    0,    0,    0,    0,   32,  614,    0,
+   30,    0,    0,    0,    0,    0,    0,   32,    0,    0,
     0,   36,   33,   37,   74,    0,   34,   38,    0,    0,
    76,    0,   78,    0,   80,   39,   40,  255,   36,   41,
-   37,    0,    0,    0,   38,    0,  615,    0,    0,   87,
-   88,    0,   39,   40,    0,    0,   41,    0,    0,  324,
-    0,    0,    0,    0,   89,   90,   91,   92,   93,    0,
-    0,    0,    0,    0,    0,    0,   95,    0,    0,    0,
+   37,    0,    0,    0,   38,    0,   86,    0,    0,   87,
+   88,    0,   39,   40,    0,    0,   41,    0,    0,  589,
+    0,    0,    0,    0,   89,   90,   91,   92,  302,    0,
+    0,    0,  531,    0,    0,    0,   95,    0,    0,    0,
     0,    0,   97,   98,   99,  100,    0,    0,    0,  101,
     0,  102,    0,    0,    0,    0,    0,  103,  104,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  785,    0,
-    0,    0,  105,  106,  107,  108,   56,   24,    0,   25,
+    0,    0,    0,    0,    0,    0,    0,    0,  778,    0,
+    0,    0,  105,  303,  107,  108,   56,   24,    0,   25,
     0,    0,   26,  254,    0,    0,    0,   27,   61,   62,
   368,   28,    0,    0,   24,    0,   25,   64,    0,   26,
    30,    0,    0,    0,   27,    0,    0,   32,   28,    0,
     0,    0,   33,    0,   71,   72,   34,   30,    0,    0,
     0,    0,    0,    0,   32,    0,    0,    0,   36,   33,
-   37,   74,  982,   34,   38,    0,    0,   76,    0,   78,
+   37,   74,    0,   34,   38,    0,    0,   76,    0,   78,
     0,   80,   39,   40,  255,   36,   41,   37,    0,    0,
     0,   38,    0,   86,    0,    0,   87,   88,    0,   39,
-   40,    0,    0,   41,    0,    0,  533,    0,    0,    0,
-    0,   89,   90,   91,   92,  302,    0,    0,    0,  531,
-    0,    0,    0,   95,    0,    0,    0,    0,    0,   97,
+   40,    0,    0,   41,    0,    0,  802,    0,    0,    0,
+    0,   89,   90,   91,   92,  302,    0,    0,    0,    0,
+  935,    0,    0,   95,    0,    0,    0,    0,    0,   97,
    98,   99,  100,    0,    0,    0,  101,    0,  102,    0,
     0,    0,    0,    0,  103,  104,    0,    0,    0,    0,
-    0,    0,   56,   24,    0,   25,    0,    0,   26,  254,
-    0,    0,    0,   27,   61,   62,    0,   28,    0,  105,
-  303,  107,  108,   64,    0,    0,   30,    0,    0,    0,
-    0,    0,    0,   32,    0,    0,    0,  368,   33,    0,
-   71,   72,   34,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   36,    0,   37,   74,    0,    0,
-   38,    0,    0,   76,    0,   78,    0,   80,   39,   40,
-  255,    0,   41,    0,    0,    0,    0,    0,    0,   86,
-    0,    0,   87,   88,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   89,   90,   91,
-   92,  768,    0,    0,    0,  769, 1050,    0,    0,   95,
-    0,    0,    0,    0,    0,   97,   98,   99,  100,    0,
-    0,    0,  101,    0,  102,    0,    0,    0,    0,    0,
-  103,  104,    0,    0,    0,    0,    0,    0,   56,   24,
-    0,   25,    0,    0,   26,  254,    0,    0,    0,   27,
-   61,   62,    0,   28,    0,  105,  770,  107,  108,   64,
-    0,    0,   30,    0,    0,    0,  771,    0,    0,   32,
-    0,    0,    0,    0,   33,    0,   71,   72,   34,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   36,    0,   37,   74,    0,    0,   38,    0,    0,   76,
-    0,   78,    0,   80,   39,   40,  255,    0,   41,    0,
-    0,    0,    0,    0,    0,   86,    0,    0,   87,   88,
+    0,    0,    0,    0,    0,  980,    0,    0,    0,  105,
+  303,  107,  108,   56,   24,    0,   25,    0,    0,   26,
+  254,    0,    0,    0,   27,   61,   62,  368,   28,    0,
+    0,  502,    0,  502,   64,    0,  502,   30,    0,    0,
+    0,  502,    0,    0,   32,  502,    0,    0,    0,   33,
+    0,   71,   72,   34,  502,    0,    0,    0,    0,    0,
+    0,  502,    0,    0,    0,   36,  502,   37,   74,    0,
+  502,   38,    0,    0,   76,    0,   78,    0,   80,   39,
+   40,  255,  502,   41,  502,    0,    0,    0,  502,    0,
+   86,    0,    0,   87,   88,    0,  502,  502,    0,    0,
+  502,    0,    0,  502,    0,    0,    0,    0,   89,   90,
+   91,   92,  302,    0,    0,    0,    0,  981,    0,    0,
+   95,    0,    0,    0,    0,    0,   97,   98,   99,  100,
+    0,    0,    0,  101,    0,  102,    0,    0,    0,    0,
+    0,  103,  104,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   89,   90,   91,   92,  768,    0,    0,
-    0,  769,    0,    0,    0,   95,    0,    0,    0,    0,
-    0,   97,   98,   99,  100,    0,    0,    0,  101,    0,
-  102,    0,    0,    0,    0,    0,  103,  104,    0,    0,
+    0,    0,  301,    0,    0,    0,  105,  303,  107,  108,
+   56,   24,    0,   25,    0,    0,   26,  254,    0,    0,
+    0,   27,   61,   62,  502,   28,    0,    0,  183,    0,
+  183,   64,    0,  183,   30,    0,    0,    0,  183,    0,
+    0,   32,  183,    0,    0,    0,   33,    0,   71,   72,
+   34,  183,    0,    0,    0,    0,    0,    0,  183,    0,
+    0,    0,   36,  183,   37,   74,    0,  183,   38,    0,
+    0,   76,    0,   78,    0,   80,   39,   40,  255,  183,
+   41,  183,    0,    0,    0,  183,    0,   86,    0,    0,
+   87,   88,    0,  183,  183,    0,    0,  183,    0,    0,
+  183,    0,    0,    0,    0,   89,   90,   91,   92,  302,
+    0,    0,    0,    0,    0,    0,    0,   95,    0,    0,
+    0,    0,    0,   97,   98,   99,  100,    0,    0,    0,
+  101,    0,  102,    0,    0,    0,    0,    0,  103,  104,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  785,
-    0,  105,  770,  107,  108,    0,    0,   56,   24,    0,
-   25,    0,  771,   26,  254,    0,    0,    0,   27,   61,
-   62,    0,   28,    0,    0,   24,    0,   25,   64,    0,
-   26,   30,    0,    0,    0,   27,    0,    0,   32,   28,
-    0,    0,    0,   33,    0,   71,   72,   34,   30,    0,
-    0,    0,    0,    0,    0,   32,    0,    0,    0,   36,
-   33,   37,   74,    0,   34,   38,    0,    0,   76,    0,
-   78,    0,   80,   39,   40,  255,   36,   41,   37,    0,
-    0,    0,   38,    0,   86,    0,    0,   87,   88,    0,
-   39,   40,    0,    0,   41,    0,    0,  588,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  310,
+    0,    0,    0,  105,  303,  107,  108,   56,   24,    0,
+   25,    0,    0,   26,  254,    0,    0,    0,   27,   61,
+   62,  183,   28,    0,    0,  182,    0,  182,   64,    0,
+  182,   30,    0,    0,    0,  182,    0,    0,   32,  182,
+    0,    0,    0,   33,    0,   71,   72,   34,  182,    0,
+    0,    0,    0,    0,    0,  182,    0,    0,    0,   36,
+  182,   37,   74,    0,  182,   38,    0,    0,   76,    0,
+   78,    0,   80,   39,   40,  255,  182,   41,  182,    0,
+    0,    0,  182,    0,   86,    0,    0,   87,   88,    0,
+  182,  182,    0,    0,  182,    0,    0,  182,    0,    0,
     0,    0,   89,   90,   91,   92,  302,    0,    0,    0,
-  531,    0,    0,    0,   95,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   95,    0,    0,    0,    0,    0,
    97,   98,   99,  100,    0,    0,    0,  101,    0,  102,
     0,    0,    0,    0,    0,  103,  104,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  777,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  611,    0,    0,    0,
   105,  303,  107,  108,   56,   24,    0,   25,    0,    0,
-   26,  254,    0,    0,    0,   27,   61,   62,  368,   28,
-    0,    0,   24,    0,   25,   64,    0,   26,   30,    0,
-    0,    0,   27,    0,    0,   32,   28,    0,    0,    0,
-   33,    0,   71,   72,   34,   30,    0,    0,    0,    0,
-    0,    0,   32,    0,    0,    0,   36,   33,   37,   74,
-    0,   34,   38,    0,    0,   76,    0,   78,    0,   80,
-   39,   40,  255,   36,   41,   37,    0,    0,    0,   38,
-    0,   86,    0,    0,   87,   88,    0,   39,   40,    0,
-    0,   41,    0,    0,  801,    0,    0,    0,    0,   89,
-   90,   91,   92,  302,    0,    0,    0,    0,  934,    0,
+   26,  254,    0,    0,    0,   27,   61,   62,  182,   28,
+    0,    0,  192,    0,  192,   64,    0,  192,   30,    0,
+    0,    0,  192,    0,    0,   32,  192,    0,    0,    0,
+   33,    0,   71,   72,   34,  192,    0,    0,    0,    0,
+    0,    0,  192,    0,    0,    0,   36,  192,   37,   74,
+    0,  192,   38,    0,    0,   76,    0,   78,    0,   80,
+   39,   40,  255,  192,   41,  192,    0,    0,    0,  192,
+    0,   86,    0,    0,   87,   88,    0,  192,  192,    0,
+    0,  192,    0,    0,  192,    0,    0,    0,    0,   89,
+   90,   91,   92,   93,    0,    0,    0,    0,    0,    0,
     0,   95,    0,    0,    0,    0,    0,   97,   98,   99,
   100,    0,    0,    0,  101,    0,  102,    0,    0,    0,
     0,    0,  103,  104,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  979,    0,    0,    0,  105,  303,  107,
+    0,    0,    0,  778,    0,    0,    0,  105,  106,  107,
   108,   56,   24,    0,   25,    0,    0,   26,  254,    0,
-    0,    0,   27,   61,   62,  368,   28,    0,    0,  502,
-    0,  502,   64,    0,  502,   30,    0,    0,    0,  502,
-    0,    0,   32,  502,    0,    0,    0,   33,    0,   71,
-   72,   34,  502,    0,    0,    0,    0,    0,    0,  502,
-    0,    0,    0,   36,  502,   37,   74,    0,  502,   38,
+    0,    0,   27,   61,   62,  192,   28,    0,    0,    0,
+    0,    0,   64,    0,    0,   30,    0,    0,    0,    0,
+    0,    0,   32,    0,    0,    0,    0,   33,    0,   71,
+   72,   34,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,   36,    0,   37,   74,    0,    0,   38,
     0,    0,   76,    0,   78,    0,   80,   39,   40,  255,
-  502,   41,  502,    0,    0,    0,  502,    0,   86,    0,
-    0,   87,   88,    0,  502,  502,    0,    0,  502,    0,
-    0,  502,    0,    0,    0,    0,   89,   90,   91,   92,
-  302,    0,    0,    0,    0,  980,    0,    0,   95,    0,
+    0,   41,    0,    0,    0,    0,    0,    0,   86,    0,
+    0,   87,   88,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   89,   90,   91,   92,
+  302,    0,    0,    0,    0,    0,    0,    0,   95,    0,
     0,    0,    0,    0,   97,   98,   99,  100,    0,    0,
     0,  101,    0,  102,    0,    0,    0,    0,    0,  103,
   104,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  301,    0,    0,    0,  105,  303,  107,  108,   56,   24,
+ 1093,    0,    0,    0,  105,  303,  107,  108,   56,   24,
     0,   25,    0,    0,   26,  254,    0,    0,    0,   27,
-   61,   62,  502,   28,    0,    0,  183,    0,  183,   64,
-    0,  183,   30,    0,    0,    0,  183,    0,    0,   32,
-  183,    0,    0,    0,   33,    0,   71,   72,   34,  183,
-    0,    0,    0,    0,    0,    0,  183,    0,    0,    0,
-   36,  183,   37,   74,    0,  183,   38,    0,    0,   76,
-    0,   78,    0,   80,   39,   40,  255,  183,   41,  183,
-    0,    0,    0,  183,    0,   86,    0,    0,   87,   88,
-    0,  183,  183,    0,    0,  183,    0,    0,  183,    0,
-    0,    0,    0,   89,   90,   91,   92,  302,    0,    0,
+   61,   62,    0,   28,    0,    0,    0,    0,    0,   64,
+    0,    0,   30,    0,    0,    0,    0,    0,    0,   32,
+    0,    0,    0,    0,   33,    0,   71,   72,   34,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   36,    0,   37,   74,    0,    0,   38,    0,    0,   76,
+    0,   78,    0,   80,   39,   40,  255,    0,   41,    0,
+    0,    0,    0,    0,    0,   86,    0,    0,   87,   88,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,   89,   90,   91,   92,   93,    0,    0,
     0,    0,    0,    0,    0,   95,    0,    0,    0,    0,
     0,   97,   98,   99,  100,    0,    0,    0,  101,    0,
   102,    0,    0,    0,    0,    0,  103,  104,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  310,    0,    0,
-    0,  105,  303,  107,  108,   56,   24,    0,   25,    0,
-    0,   26,  254,    0,    0,    0,   27,   61,   62,  183,
-   28,    0,    0,  182,    0,  182,   64,    0,  182,   30,
-    0,    0,    0,  182,    0,    0,   32,  182,    0,    0,
-    0,   33,    0,   71,   72,   34,  182,    0,    0,    0,
-    0,    0,    0,  182,    0,    0,    0,   36,  182,   37,
-   74,    0,  182,   38,    0,    0,   76,    0,   78,    0,
-   80,   39,   40,  255,  182,   41,  182,    0,    0,    0,
-  182,    0,   86,    0,    0,   87,   88,    0,  182,  182,
-    0,    0,  182,    0,    0,  182,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0, 1238,    0,    0,
+    0,  105, 1094,  107,  108,   56,   24,    0,   25,    0,
+    0,   26,  254,    0,    0,    0,   27,   61,   62,    0,
+   28,    0,    0,    0,    0,    0,   64,    0,    0,   30,
+    0,    0,    0,    0,    0,    0,   32,    0,    0,    0,
+    0,   33,    0,   71,   72,   34,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,   36,    0,   37,
+   74,    0,    0,   38,    0,    0,   76,    0,   78,    0,
+   80,   39,   40,  255,    0,   41,    0,    0,    0,    0,
+    0,    0,   86,    0,    0,   87,   88,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    89,   90,   91,   92,  302,    0,    0,    0,    0,    0,
     0,    0,   95,    0,    0,    0,    0,    0,   97,   98,
    99,  100,    0,    0,    0,  101,    0,  102,    0,    0,
     0,    0,    0,  103,  104,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  610,    0,    0,    0,  105,  303,
-  107,  108,   56,   24,    0,   25,    0,    0,   26,  254,
-    0,    0,    0,   27,   61,   62,  182,   28,    0,    0,
-  192,    0,  192,   64,    0,  192,   30,    0,    0,    0,
-  192,    0,    0,   32,  192,    0,    0,    0,   33,    0,
-   71,   72,   34,  192,    0,    0,    0,    0,    0,    0,
-  192,    0,    0,    0,   36,  192,   37,   74,    0,  192,
-   38,    0,    0,   76,    0,   78,    0,   80,   39,   40,
-  255,  192,   41,  192,    0,    0,    0,  192,    0,   86,
-    0,    0,   87,   88,    0,  192,  192,    0,    0,  192,
-    0,    0,  192,    0,    0,    0,    0,   89,   90,   91,
-   92,   93,    0,    0,    0,    0,    0,    0,    0,   95,
-    0,    0,    0,    0,    0,   97,   98,   99,  100,    0,
-    0,    0,  101,    0,  102,    0,    0,    0,    0,    0,
-  103,  104,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  777,    0,    0,    0,  105,  106,  107,  108,   56,
-   24,    0,   25,    0,    0,   26,  254,    0,    0,    0,
-   27,   61,   62,  192,   28,    0,    0,    0,    0,    0,
-   64,    0,    0,   30,    0,    0,    0,    0,    0,    0,
-   32,    0,    0,    0,    0,   33,    0,   71,   72,   34,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   36,    0,   37,   74,    0,    0,   38,    0,    0,
-   76,    0,   78,    0,   80,   39,   40,  255,    0,   41,
-    0,    0,    0,    0,    0,    0,   86,    0,    0,   87,
-   88,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   89,   90,   91,   92,  302,    0,
-    0,    0,    0,    0,    0,    0,   95,    0,    0,    0,
-    0,    0,   97,   98,   99,  100,    0,    0,    0,  101,
-    0,  102,    0,    0,    0,    0,    0,  103,  104,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0, 1092,    0,
-    0,    0,  105,  303,  107,  108,   56,   24,    0,   25,
-    0,    0,   26,  254,    0,    0,    0,   27,   61,   62,
-    0,   28,    0,    0,    0,    0,    0,   64,    0,    0,
-   30,    0,    0,    0,    0,    0,    0,   32,    0,    0,
-    0,    0,   33,    0,   71,   72,   34,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   36,    0,
-   37,   74,    0,    0,   38,    0,    0,   76,    0,   78,
-    0,   80,   39,   40,  255,    0,   41,    0,    0,    0,
-    0,    0,    0,   86,    0,    0,   87,   88,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   89,   90,   91,   92,   93,    0,    0,    0,    0,
-    0,    0,    0,   95,    0,    0,    0,    0,    0,   97,
-   98,   99,  100,    0,    0,    0,  101,    0,  102,    0,
-    0,    0,    0,    0,  103,  104,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0, 1237,    0,    0,    0,  105,
- 1093,  107,  108,   56,   24,    0,   25,    0,    0,   26,
-  254,    0,    0,    0,   27,   61,   62,    0,   28,    0,
-    0,    0,    0,    0,   64,    0,    0,   30,    0,    0,
-    0,    0,    0,    0,   32,    0,    0,    0,    0,   33,
-    0,   71,   72,   34,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   36,    0,   37,   74,    0,
-    0,   38,    0,    0,   76,    0,   78,    0,   80,   39,
-   40,  255,    0,   41,    0,    0,    0,    0,    0,    0,
-   86,    0,    0,   87,   88,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   89,   90,
-   91,   92,  302,    0,    0,    0,    0,    0,    0,    0,
-   95,    0,    0,    0,    0,    0,   97,   98,   99,  100,
-    0,    0,    0,  101,    0,  102,    0,    0,    0,    0,
-    0,  103,  104,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   83,    0,    0,    0,  105,  303,  107,  108,
-   83,   83,    0,   83,    0,    0,   83,   83,    0,    0,
-    0,   83,   83,   83,    0,   83,    0,    0,    0,    0,
-    0,   83,    0,    0,   83,    0,    0,    0,    0,    0,
-    0,   83,    0,    0,    0,    0,   83,    0,   83,   83,
-   83,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   83,    0,   83,   83,    0,    0,   83,    0,
-    0,   83,    0,   83,    0,   83,   83,   83,   83,    0,
-   83,    0,    0,    0,    0,    0,    0,   83,    0,    0,
+    0,    0,    0,    0,   83,    0,    0,    0,  105,  303,
+  107,  108,   83,   83,    0,   83,    0,    0,   83,   83,
+    0,    0,    0,   83,   83,   83,    0,   83,    0,    0,
+    0,    0,    0,   83,    0,    0,   83,    0,    0,    0,
+    0,    0,    0,   83,    0,    0,    0,    0,   83,    0,
+   83,   83,   83,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   83,    0,   83,   83,    0,    0,
+   83,    0,    0,   83,    0,   83,    0,   83,   83,   83,
+   83,    0,   83,    0,    0,    0,    0,    0,    0,   83,
+    0,    0,   83,   83,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,   83,   83,   83,
+   83,   83,    0,    0,    0,    0,    0,    0,    0,   83,
+    0,    0,    0,    0,    0,   83,   83,   83,   83,    0,
+    0,    0,   83,    0,   83,    0,    0,    0,    0,    0,
    83,   83,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   83,   83,   83,   83,   83,
-    0,    0,    0,    0,    0,    0,    0,   83,    0,    0,
-    0,    0,    0,   83,   83,   83,   83,    0,    0,    0,
-   83,    0,   83,    0,    0,    0,    0,    0,   83,   83,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  340,
-    0,    0,    0,   83,   83,   83,   83,   56,   24,    0,
-   25,    0,    0,   26,  254,    0,    0,    0,   27,   61,
-   62,    0,   28,    0,    0,    0,    0,    0,   64,    0,
-    0,   30,    0,    0,    0,    0,    0,    0,   32,    0,
-    0,    0,    0,   33,    0,   71,   72,   34,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   36,
-    0,   37,   74,    0,    0,   38,    0,    0,   76,    0,
-   78,    0,   80,   39,   40,  255,    0,   41,    0,    0,
-    0,    0,    0,    0,    0,    0,  341,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   89,   90,   91,  256,  342,    0,    0,    0,
-    0,    0,    0,    0,   95,    0,    0,    0,    0,    0,
-   97,   98,   99,  100,  933,    0,    0,  101,    0,  102,
-  340,    0,    0,    0,    0,  103,  104,    0,   56,   24,
-    0,   25,    0,    0,   26,  254,    0,    0,    0,   27,
-   61,   62,    0,   28,    0,    0,    0,    0,    0,   64,
-  105,  257,   30,  108,    0,    0,    0,    0,    0,   32,
-    0,    0,    0,    0,   33,    0,   71,   72,   34,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   36,    0,   37,   74,    0,    0,   38,    0,    0,   76,
-    0,   78,    0,   80,   39,   40,  255,    0,   41,    0,
-    0,    0,    0,    0,    0,    0,    0,  341,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   89,   90,   91,  256,  342,    0,    0,
-    0,    0,    0,    0,    0,   95,    0,    0,    0,    0,
-    0,   97,   98,   99,  100,    0,    0,    0,  101,    0,
-  102,  346,    0,    0,    0,    0,  103,  104,    0,   56,
+    0,  340,    0,    0,    0,   83,   83,   83,   83,   56,
    24,    0,   25,    0,    0,   26,  254,    0,    0,    0,
    27,   61,   62,    0,   28,    0,    0,    0,    0,    0,
-   64,  105,  257,   30,  108,    0,    0,    0,    0,    0,
+   64,    0,    0,   30,    0,    0,    0,    0,    0,    0,
    32,    0,    0,    0,    0,   33,    0,   71,   72,   34,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,   36,    0,   37,   74,    0,    0,   38,    0,    0,
    76,    0,   78,    0,   80,   39,   40,  255,    0,   41,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  341,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,   89,   90,   91,  256,  342,    0,
     0,    0,    0,    0,    0,    0,   95,    0,    0,    0,
-    0,    0,   97,   98,   99,  100,    0,    0,    0,  101,
-    0,  102,  348,    0,    0,    0,    0,  103,  104,    0,
+    0,    0,   97,   98,   99,  100,  934,    0,    0,  101,
+    0,  102,  340,    0,    0,    0,    0,  103,  104,    0,
    56,   24,    0,   25,    0,    0,   26,  254,    0,    0,
     0,   27,   61,   62,    0,   28,    0,    0,    0,    0,
     0,   64,  105,  257,   30,  108,    0,    0,    0,    0,
@@ -11832,12 +11820,12 @@ void case_1034()
    34,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,   36,    0,   37,   74,    0,    0,   38,    0,
     0,   76,    0,   78,    0,   80,   39,   40,  255,    0,
-   41,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   41,    0,    0,    0,    0,    0,    0,    0,    0,  341,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,   89,   90,   91,  256,  342,
     0,    0,    0,    0,    0,    0,    0,   95,    0,    0,
     0,    0,    0,   97,   98,   99,  100,    0,    0,    0,
-  101,    0,  102,  350,    0,    0,    0,    0,  103,  104,
+  101,    0,  102,  346,    0,    0,    0,    0,  103,  104,
     0,   56,   24,    0,   25,    0,    0,   26,  254,    0,
     0,    0,   27,   61,   62,    0,   28,    0,    0,    0,
     0,    0,   64,  105,  257,   30,  108,    0,    0,    0,
@@ -11850,7 +11838,7 @@ void case_1034()
     0,    0,    0,    0,    0,    0,   89,   90,   91,  256,
   342,    0,    0,    0,    0,    0,    0,    0,   95,    0,
     0,    0,    0,    0,   97,   98,   99,  100,    0,    0,
-    0,  101,    0,  102,  352,    0,    0,    0,    0,  103,
+    0,  101,    0,  102,  348,    0,    0,    0,    0,  103,
   104,    0,   56,   24,    0,   25,    0,    0,   26,  254,
     0,    0,    0,   27,   61,   62,    0,   28,    0,    0,
     0,    0,    0,   64,  105,  257,   30,  108,    0,    0,
@@ -11863,7 +11851,7 @@ void case_1034()
     0,    0,    0,    0,    0,    0,    0,   89,   90,   91,
   256,  342,    0,    0,    0,    0,    0,    0,    0,   95,
     0,    0,    0,    0,    0,   97,   98,   99,  100,    0,
-    0,    0,  101,    0,  102,  354,    0,    0,    0,    0,
+    0,    0,  101,    0,  102,  350,    0,    0,    0,    0,
   103,  104,    0,   56,   24,    0,   25,    0,    0,   26,
   254,    0,    0,    0,   27,   61,   62,    0,   28,    0,
     0,    0,    0,    0,   64,  105,  257,   30,  108,    0,
@@ -11876,7 +11864,7 @@ void case_1034()
     0,    0,    0,    0,    0,    0,    0,    0,   89,   90,
    91,  256,  342,    0,    0,    0,    0,    0,    0,    0,
    95,    0,    0,    0,    0,    0,   97,   98,   99,  100,
-    0,    0,    0,  101,    0,  102,  356,    0,    0,    0,
+    0,    0,    0,  101,    0,  102,  352,    0,    0,    0,
     0,  103,  104,    0,   56,   24,    0,   25,    0,    0,
    26,  254,    0,    0,    0,   27,   61,   62,    0,   28,
     0,    0,    0,    0,    0,   64,  105,  257,   30,  108,
@@ -11889,7 +11877,7 @@ void case_1034()
     0,    0,    0,    0,    0,    0,    0,    0,    0,   89,
    90,   91,  256,  342,    0,    0,    0,    0,    0,    0,
     0,   95,    0,    0,    0,    0,    0,   97,   98,   99,
-  100,    0,    0,    0,  101,    0,  102,  358,    0,    0,
+  100,    0,    0,    0,  101,    0,  102,  354,    0,    0,
     0,    0,  103,  104,    0,   56,   24,    0,   25,    0,
     0,   26,  254,    0,    0,    0,   27,   61,   62,    0,
    28,    0,    0,    0,    0,    0,   64,  105,  257,   30,
@@ -11902,7 +11890,7 @@ void case_1034()
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    89,   90,   91,  256,  342,    0,    0,    0,    0,    0,
     0,    0,   95,    0,    0,    0,    0,    0,   97,   98,
-   99,  100,    0,    0,    0,  101,    0,  102,  360,    0,
+   99,  100,    0,    0,    0,  101,    0,  102,  356,    0,
     0,    0,    0,  103,  104,    0,   56,   24,    0,   25,
     0,    0,   26,  254,    0,    0,    0,   27,   61,   62,
     0,   28,    0,    0,    0,    0,    0,   64,  105,  257,
@@ -11915,7 +11903,7 @@ void case_1034()
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,   89,   90,   91,  256,  342,    0,    0,    0,    0,
     0,    0,    0,   95,    0,    0,    0,    0,    0,   97,
-   98,   99,  100,    0,    0,    0,  101,    0,  102,  340,
+   98,   99,  100,    0,    0,    0,  101,    0,  102,  358,
     0,    0,    0,    0,  103,  104,    0,   56,   24,    0,
    25,    0,    0,   26,  254,    0,    0,    0,   27,   61,
    62,    0,   28,    0,    0,    0,    0,    0,   64,  105,
@@ -11929,7 +11917,7 @@ void case_1034()
     0,    0,   89,   90,   91,  256,  342,    0,    0,    0,
     0,    0,    0,    0,   95,    0,    0,    0,    0,    0,
    97,   98,   99,  100,    0,    0,    0,  101,    0,  102,
-  635,    0,    0,    0,    0,  103,  104,    0,   56,   24,
+  360,    0,    0,    0,    0,  103,  104,    0,   56,   24,
     0,   25,    0,    0,   26,  254,    0,    0,    0,   27,
    61,   62,    0,   28,    0,    0,    0,    0,    0,   64,
   105,  257,   30,  108,    0,    0,    0,    0,    0,   32,
@@ -11942,7 +11930,7 @@ void case_1034()
     0,    0,    0,   89,   90,   91,  256,  342,    0,    0,
     0,    0,    0,    0,    0,   95,    0,    0,    0,    0,
     0,   97,   98,   99,  100,    0,    0,    0,  101,    0,
-  102,  637,    0,    0,    0,    0,  103,  104,    0,   56,
+  102,  340,    0,    0,    0,    0,  103,  104,    0,   56,
    24,    0,   25,    0,    0,   26,  254,    0,    0,    0,
    27,   61,   62,    0,   28,    0,    0,    0,    0,    0,
    64,  105,  257,   30,  108,    0,    0,    0,    0,    0,
@@ -11955,7 +11943,7 @@ void case_1034()
     0,    0,    0,    0,   89,   90,   91,  256,  342,    0,
     0,    0,    0,    0,    0,    0,   95,    0,    0,    0,
     0,    0,   97,   98,   99,  100,    0,    0,    0,  101,
-    0,  102,  639,    0,    0,    0,    0,  103,  104,    0,
+    0,  102,  636,    0,    0,    0,    0,  103,  104,    0,
    56,   24,    0,   25,    0,    0,   26,  254,    0,    0,
     0,   27,   61,   62,    0,   28,    0,    0,    0,    0,
     0,   64,  105,  257,   30,  108,    0,    0,    0,    0,
@@ -11968,7 +11956,7 @@ void case_1034()
     0,    0,    0,    0,    0,   89,   90,   91,  256,  342,
     0,    0,    0,    0,    0,    0,    0,   95,    0,    0,
     0,    0,    0,   97,   98,   99,  100,    0,    0,    0,
-  101,    0,  102,  645,    0,    0,    0,    0,  103,  104,
+  101,    0,  102,  638,    0,    0,    0,    0,  103,  104,
     0,   56,   24,    0,   25,    0,    0,   26,  254,    0,
     0,    0,   27,   61,   62,    0,   28,    0,    0,    0,
     0,    0,   64,  105,  257,   30,  108,    0,    0,    0,
@@ -11981,7 +11969,7 @@ void case_1034()
     0,    0,    0,    0,    0,    0,   89,   90,   91,  256,
   342,    0,    0,    0,    0,    0,    0,    0,   95,    0,
     0,    0,    0,    0,   97,   98,   99,  100,    0,    0,
-    0,  101,    0,  102,  647,    0,    0,    0,    0,  103,
+    0,  101,    0,  102,  640,    0,    0,    0,    0,  103,
   104,    0,   56,   24,    0,   25,    0,    0,   26,  254,
     0,    0,    0,   27,   61,   62,    0,   28,    0,    0,
     0,    0,    0,   64,  105,  257,   30,  108,    0,    0,
@@ -11994,7 +11982,7 @@ void case_1034()
     0,    0,    0,    0,    0,    0,    0,   89,   90,   91,
   256,  342,    0,    0,    0,    0,    0,    0,    0,   95,
     0,    0,    0,    0,    0,   97,   98,   99,  100,    0,
-    0,    0,  101,    0,  102,  649,    0,    0,    0,    0,
+    0,    0,  101,    0,  102,  646,    0,    0,    0,    0,
   103,  104,    0,   56,   24,    0,   25,    0,    0,   26,
   254,    0,    0,    0,   27,   61,   62,    0,   28,    0,
     0,    0,    0,    0,   64,  105,  257,   30,  108,    0,
@@ -12007,7 +11995,7 @@ void case_1034()
     0,    0,    0,    0,    0,    0,    0,    0,   89,   90,
    91,  256,  342,    0,    0,    0,    0,    0,    0,    0,
    95,    0,    0,    0,    0,    0,   97,   98,   99,  100,
-    0,    0,    0,  101,    0,  102,  651,    0,    0,    0,
+    0,    0,    0,  101,    0,  102,  648,    0,    0,    0,
     0,  103,  104,    0,   56,   24,    0,   25,    0,    0,
    26,  254,    0,    0,    0,   27,   61,   62,    0,   28,
     0,    0,    0,    0,    0,   64,  105,  257,   30,  108,
@@ -12020,7 +12008,7 @@ void case_1034()
     0,    0,    0,    0,    0,    0,    0,    0,    0,   89,
    90,   91,  256,  342,    0,    0,    0,    0,    0,    0,
     0,   95,    0,    0,    0,    0,    0,   97,   98,   99,
-  100,    0,    0,    0,  101,    0,  102,  653,    0,    0,
+  100,    0,    0,    0,  101,    0,  102,  650,    0,    0,
     0,    0,  103,  104,    0,   56,   24,    0,   25,    0,
     0,   26,  254,    0,    0,    0,   27,   61,   62,    0,
    28,    0,    0,    0,    0,    0,   64,  105,  257,   30,
@@ -12033,7 +12021,7 @@ void case_1034()
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    89,   90,   91,  256,  342,    0,    0,    0,    0,    0,
     0,    0,   95,    0,    0,    0,    0,    0,   97,   98,
-   99,  100,    0,    0,    0,  101,    0,  102,  655,    0,
+   99,  100,    0,    0,    0,  101,    0,  102,  652,    0,
     0,    0,    0,  103,  104,    0,   56,   24,    0,   25,
     0,    0,   26,  254,    0,    0,    0,   27,   61,   62,
     0,   28,    0,    0,    0,    0,    0,   64,  105,  257,
@@ -12046,7 +12034,7 @@ void case_1034()
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,   89,   90,   91,  256,  342,    0,    0,    0,    0,
     0,    0,    0,   95,    0,    0,    0,    0,    0,   97,
-   98,   99,  100,    0,    0,    0,  101,    0,  102,  657,
+   98,   99,  100,    0,    0,    0,  101,    0,  102,  654,
     0,    0,    0,    0,  103,  104,    0,   56,   24,    0,
    25,    0,    0,   26,  254,    0,    0,    0,   27,   61,
    62,    0,   28,    0,    0,    0,    0,    0,   64,  105,
@@ -12060,7 +12048,7 @@ void case_1034()
     0,    0,   89,   90,   91,  256,  342,    0,    0,    0,
     0,    0,    0,    0,   95,    0,    0,    0,    0,    0,
    97,   98,   99,  100,    0,    0,    0,  101,    0,  102,
-  659,    0,    0,    0,    0,  103,  104,    0,   56,   24,
+  656,    0,    0,    0,    0,  103,  104,    0,   56,   24,
     0,   25,    0,    0,   26,  254,    0,    0,    0,   27,
    61,   62,    0,   28,    0,    0,    0,    0,    0,   64,
   105,  257,   30,  108,    0,    0,    0,    0,    0,   32,
@@ -12073,7 +12061,7 @@ void case_1034()
     0,    0,    0,   89,   90,   91,  256,  342,    0,    0,
     0,    0,    0,    0,    0,   95,    0,    0,    0,    0,
     0,   97,   98,   99,  100,    0,    0,    0,  101,    0,
-  102,  661,    0,    0,    0,    0,  103,  104,    0,   56,
+  102,  658,    0,    0,    0,    0,  103,  104,    0,   56,
    24,    0,   25,    0,    0,   26,  254,    0,    0,    0,
    27,   61,   62,    0,   28,    0,    0,    0,    0,    0,
    64,  105,  257,   30,  108,    0,    0,    0,    0,    0,
@@ -12086,7 +12074,7 @@ void case_1034()
     0,    0,    0,    0,   89,   90,   91,  256,  342,    0,
     0,    0,    0,    0,    0,    0,   95,    0,    0,    0,
     0,    0,   97,   98,   99,  100,    0,    0,    0,  101,
-    0,  102,  663,    0,    0,    0,    0,  103,  104,    0,
+    0,  102,  660,    0,    0,    0,    0,  103,  104,    0,
    56,   24,    0,   25,    0,    0,   26,  254,    0,    0,
     0,   27,   61,   62,    0,   28,    0,    0,    0,    0,
     0,   64,  105,  257,   30,  108,    0,    0,    0,    0,
@@ -12099,7 +12087,7 @@ void case_1034()
     0,    0,    0,    0,    0,   89,   90,   91,  256,  342,
     0,    0,    0,    0,    0,    0,    0,   95,    0,    0,
     0,    0,    0,   97,   98,   99,  100,    0,    0,    0,
-  101,    0,  102,  665,    0,    0,    0,    0,  103,  104,
+  101,    0,  102,  662,    0,    0,    0,    0,  103,  104,
     0,   56,   24,    0,   25,    0,    0,   26,  254,    0,
     0,    0,   27,   61,   62,    0,   28,    0,    0,    0,
     0,    0,   64,  105,  257,   30,  108,    0,    0,    0,
@@ -12112,7 +12100,7 @@ void case_1034()
     0,    0,    0,    0,    0,    0,   89,   90,   91,  256,
   342,    0,    0,    0,    0,    0,    0,    0,   95,    0,
     0,    0,    0,    0,   97,   98,   99,  100,    0,    0,
-    0,  101,    0,  102,  667,    0,    0,    0,    0,  103,
+    0,  101,    0,  102,  664,    0,    0,    0,    0,  103,
   104,    0,   56,   24,    0,   25,    0,    0,   26,  254,
     0,    0,    0,   27,   61,   62,    0,   28,    0,    0,
     0,    0,    0,   64,  105,  257,   30,  108,    0,    0,
@@ -12125,7 +12113,7 @@ void case_1034()
     0,    0,    0,    0,    0,    0,    0,   89,   90,   91,
   256,  342,    0,    0,    0,    0,    0,    0,    0,   95,
     0,    0,    0,    0,    0,   97,   98,   99,  100,    0,
-    0,    0,  101,    0,  102,  669,    0,    0,    0,    0,
+    0,    0,  101,    0,  102,  666,    0,    0,    0,    0,
   103,  104,    0,   56,   24,    0,   25,    0,    0,   26,
   254,    0,    0,    0,   27,   61,   62,    0,   28,    0,
     0,    0,    0,    0,   64,  105,  257,   30,  108,    0,
@@ -12138,7 +12126,7 @@ void case_1034()
     0,    0,    0,    0,    0,    0,    0,    0,   89,   90,
    91,  256,  342,    0,    0,    0,    0,    0,    0,    0,
    95,    0,    0,    0,    0,    0,   97,   98,   99,  100,
-    0,    0,    0,  101,    0,  102,  671,    0,    0,    0,
+    0,    0,    0,  101,    0,  102,  668,    0,    0,    0,
     0,  103,  104,    0,   56,   24,    0,   25,    0,    0,
    26,  254,    0,    0,    0,   27,   61,   62,    0,   28,
     0,    0,    0,    0,    0,   64,  105,  257,   30,  108,
@@ -12151,7 +12139,7 @@ void case_1034()
     0,    0,    0,    0,    0,    0,    0,    0,    0,   89,
    90,   91,  256,  342,    0,    0,    0,    0,    0,    0,
     0,   95,    0,    0,    0,    0,    0,   97,   98,   99,
-  100,    0,    0,    0,  101,    0,  102,  673,    0,    0,
+  100,    0,    0,    0,  101,    0,  102,  670,    0,    0,
     0,    0,  103,  104,    0,   56,   24,    0,   25,    0,
     0,   26,  254,    0,    0,    0,   27,   61,   62,    0,
    28,    0,    0,    0,    0,    0,   64,  105,  257,   30,
@@ -12164,7 +12152,7 @@ void case_1034()
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    89,   90,   91,  256,  342,    0,    0,    0,    0,    0,
     0,    0,   95,    0,    0,    0,    0,    0,   97,   98,
-   99,  100,    0,    0,    0,  101,    0,  102,  841,    0,
+   99,  100,    0,    0,    0,  101,    0,  102,  672,    0,
     0,    0,    0,  103,  104,    0,   56,   24,    0,   25,
     0,    0,   26,  254,    0,    0,    0,   27,   61,   62,
     0,   28,    0,    0,    0,    0,    0,   64,  105,  257,
@@ -12177,133 +12165,154 @@ void case_1034()
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,   89,   90,   91,  256,  342,    0,    0,    0,    0,
     0,    0,    0,   95,    0,    0,    0,    0,    0,   97,
-   98,   99,  100,    0,    0,    0,  101,    0,  102,  513,
-    0,    0,    0,    0,  103,  104,  347,   56,   24,    0,
+   98,   99,  100,    0,    0,    0,  101,    0,  102,  674,
+    0,    0,    0,    0,  103,  104,    0,   56,   24,    0,
    25,    0,    0,   26,  254,    0,    0,    0,   27,   61,
    62,    0,   28,    0,    0,    0,    0,    0,   64,  105,
   257,   30,  108,    0,    0,    0,    0,    0,   32,    0,
-    0,    0,  347,   33,    0,   71,   72,   34,    0,    0,
+    0,    0,    0,   33,    0,   71,   72,   34,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,   36,
     0,   37,   74,    0,    0,   38,    0,    0,   76,    0,
    78,    0,   80,   39,   40,  255,    0,   41,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   89,   90,   91,  256,  291,    0,    0,    0,
-    0,    0,    0,    0,   95,  347,  347,  347,  347,  796,
-    0,    0,  347,  347,    0,    0,  347,  347,  347,  347,
-  347,  347,  347,  347,  347,    0,  347,  347,  347,  347,
+    0,    0,   89,   90,   91,  256,  342,    0,    0,    0,
+    0,    0,    0,    0,   95,    0,    0,    0,    0,    0,
+   97,   98,   99,  100,    0,    0,    0,  101,    0,  102,
+  842,    0,    0,    0,    0,  103,  104,    0,   56,   24,
+    0,   25,    0,    0,   26,  254,    0,    0,    0,   27,
+   61,   62,    0,   28,    0,    0,    0,    0,    0,   64,
+  105,  257,   30,  108,    0,    0,    0,    0,    0,   32,
+    0,    0,    0,    0,   33,    0,   71,   72,   34,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   36,    0,   37,   74,    0,    0,   38,    0,    0,   76,
+    0,   78,    0,   80,   39,   40,  255,    0,   41,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,   89,   90,   91,  256,  342,    0,    0,
+    0,    0,    0,    0,    0,   95,    0,    0,    0,    0,
+    0,   97,   98,   99,  100,    0,    0,    0,  101,    0,
+  102,  513,    0,    0,    0,    0,  103,  104,  347,   56,
+   24,    0,   25,    0,    0,   26,  254,    0,    0,    0,
+   27,   61,   62,    0,   28,    0,    0,    0,    0,    0,
+   64,  105,  257,   30,  108,    0,    0,    0,    0,    0,
+   32,    0,    0,    0,  347,   33,    0,   71,   72,   34,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,   36,    0,   37,   74,    0,    0,   38,    0,    0,
+   76,    0,   78,    0,   80,   39,   40,  255,    0,   41,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   89,   90,   91,  256,  291,    0,
+    0,    0,    0,    0,    0,    0,   95,  347,  347,  347,
+  347,  796,    0,    0,  347,  347,    0,    0,  347,  347,
+  347,  347,  347,  347,  347,  347,  347,    0,  347,  347,
+  347,  347,  347,  347,  347,  347,  347,  347,  347,  347,
   347,  347,  347,  347,  347,  347,  347,  347,  347,  347,
-  347,  347,  347,  347,  347,  347,  347,  347,    0,    0,
-  105,  514,    0,    0,  347,    0,   52,  347,   52,    0,
-   52,    0,   52,    0,    0,   52,    0,   52,   52,    0,
-   52,    0,   52,    0,   52,    0,   52,   52,   52,   52,
-    0,    0,   52,   52,    0,    0,    0,    0,   52,   52,
-   52,   52,   52,    0,    0,   52,    0,   52,    0,   52,
-    0,   52,   52,    0,   52,   52,   52,   52,    0,    0,
-   52,   52,   52,   52,    0,    0,   52,   52,   52,    0,
-    0,    0,    0,    0,    0,   52,   52,    0,   52,   52,
-    0,   52,   52,   52,    0,    0,    0,   52,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   52,    0,   52,
-   52,   51,    0,    0,    0,   51,    0,   51,    0,    0,
-   51,    0,   51,   51,    0,   51,    0,   51,    0,   51,
+    0,    0,  105,  514,    0,    0,  347,    0,   52,  347,
+   52,    0,   52,    0,   52,    0,    0,   52,    0,   52,
+   52,    0,   52,    0,   52,    0,   52,    0,   52,   52,
+   52,   52,    0,    0,   52,   52,    0,    0,    0,    0,
+   52,   52,   52,   52,   52,    0,    0,   52,    0,   52,
+    0,   52,    0,   52,   52,    0,   52,   52,   52,   52,
+    0,    0,   52,   52,   52,   52,    0,    0,   52,   52,
+   52,    0,    0,    0,    0,    0,    0,   52,   52,    0,
+   52,   52,    0,   52,   52,   52,    0,    0,    0,   52,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   52,
+    0,   52,   52,   51,    0,    0,    0,   51,    0,   51,
+    0,    0,   51,    0,   51,   51,    0,   51,    0,   51,
+    0,   51,    0,   51,   51,   51,   51,    0,    0,   51,
+   51,    0,    0,    0,    0,   51,    0,   51,   51,   51,
+    0,    0,   51,    0,   51,    0,   51,    0,    0,   51,
+    0,   51,   51,   51,   51,   52,    0,    0,   51,   51,
+   51,    0,    0,   51,   51,   51,    0,    0,    0,    0,
+    0,    0,   51,   51,    0,   51,   51,    0,   51,   51,
+   51,    0,    0,    0,   51,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,   51,    0,   51,    0,   51,    0,   51,    0,
+   86,   51,    0,   51,   51,    0,   51,    0,   51,   51,
+   51,    0,   51,   51,   51,   51,    0,    0,   51,   51,
+    0,    0,    0,    0,   51,    0,   51,   51,   51,    0,
+    0,   51,    0,   51,    0,   51,    0,    0,   51,    0,
+   51,   51,   51,   51,    0,    0,    0,   51,   51,   51,
+   51,    0,   51,   51,   51,    0,    0,    0,    0,    0,
+    0,   51,   51,    0,   51,   51,    0,   51,   51,   51,
+    0,    0,    0,   51,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,   52,    0,   51,    0,   52,    0,   52,    0,   87,
+   52,    0,   52,   52,    0,   52,    0,   52,   51,   52,
+    0,   52,   52,   52,   52,    0,    0,   52,   52,    0,
+    0,    0,    0,   52,    0,   52,   52,   52,    0,    0,
+   52,    0,   52,    0,   52,    0,    0,   52,    0,   52,
+   52,   52,   52,    0,    0,    0,   52,   52,   52,   51,
+    0,   52,   52,   52,    0,    0,    0,    0,    0,    0,
+   52,   52,    0,   52,   52,    0,   52,   52,   52,    0,
+    0,    0,   52,    0,    0,    0,    0,   51,    0,    0,
+    0,   51,    0,   51,    0,    0,   51,    0,   51,   51,
+    0,   51,   52,   51,    0,   51,    0,   51,   51,   51,
+   51,    0,    0,   51,   51,    0,    0,   52,    0,   51,
+    0,   51,   51,   51,    0,    0,   51,    0,   51,    0,
+   51,    0,    0,   51,    0,   51,   51,   51,   51,    0,
+    0,    0,   51,   51,   51,    0,    0,   51,   51,   51,
+    0,    0,    0,    0,    0,    0,   51,   51,   52,   51,
+   51,    0,   51,   51,   51,    0,    0,    0,   51,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,   51,    0,    0,    0,   51,    0,   51,   51,    0,
+   51,    0,   51,   51,  222,   51,    0,   51,    0,   51,
     0,   51,   51,   51,   51,    0,    0,   51,   51,    0,
     0,    0,    0,   51,    0,   51,   51,   51,    0,    0,
-   51,    0,   51,    0,   51,    0,    0,   51,    0,   51,
-   51,   51,   51,   52,    0,    0,   51,   51,   51,    0,
-    0,   51,   51,   51,    0,    0,    0,    0,    0,    0,
-   51,   51,    0,   51,   51,    0,   51,   51,   51,    0,
-    0,    0,   51,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   51,    0,   51,    0,   51,    0,   51,    0,   86,   51,
-    0,   51,   51,    0,   51,    0,   51,   51,   51,    0,
-   51,   51,   51,   51,    0,    0,   51,   51,    0,    0,
-    0,    0,   51,    0,   51,   51,   51,    0,    0,   51,
-    0,   51,    0,   51,    0,    0,   51,    0,   51,   51,
-   51,   51,    0,    0,    0,   51,   51,   51,   51,    0,
-   51,   51,   51,    0,    0,    0,    0,    0,    0,   51,
-   51,    0,   51,   51,    0,   51,   51,   51,    0,    0,
-    0,   51,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   52,
-    0,   51,    0,   52,    0,   52,    0,   87,   52,    0,
-   52,   52,    0,   52,    0,   52,   51,   52,    0,   52,
-   52,   52,   52,    0,    0,   52,   52,    0,    0,    0,
-    0,   52,    0,   52,   52,   52,    0,    0,   52,    0,
-   52,    0,   52,    0,    0,   52,    0,   52,   52,   52,
-   52,    0,    0,    0,   52,   52,   52,   51,    0,   52,
-   52,   52,    0,    0,    0,    0,    0,    0,   52,   52,
-    0,   52,   52,    0,   52,   52,   52,    0,    0,    0,
-   52,    0,    0,    0,    0,   51,    0,    0,    0,   51,
-    0,   51,    0,    0,   51,    0,   51,   51,    0,   51,
-   52,   51,    0,   51,    0,   51,   51,   51,   51,    0,
-    0,   51,   51,    0,    0,   52,    0,   51,    0,   51,
-   51,   51,    0,    0,   51,    0,   51,    0,   51,    0,
-    0,   51,    0,   51,   51,   51,   51,    0,    0,    0,
-   51,   51,   51,    0,    0,   51,   51,   51,    0,    0,
-    0,    0,    0,    0,   51,   51,   52,   51,   51,    0,
-   51,   51,   51,    0,    0,    0,   51,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   51,
-    0,    0,    0,   51,    0,   51,   51,    0,   51,    0,
-   51,   51,  222,   51,    0,   51,    0,   51,    0,   51,
-   51,   51,   51,    0,    0,   51,   51,    0,    0,    0,
-    0,   51,    0,   51,   51,   51,    0,    0,   51,    0,
-   51,  347,   51,    0,    0,   51,    0,   51,   51,   51,
-   51,    0,    0,    0,   51,   51,   51,    0,    0,   51,
-   51,   51,   51,    0,  347,    0,    0,    0,   51,   51,
-    0,   51,   51,    0,   51,   51,   51,  347,    0,    0,
-   51,    0,  347,    0,    0,  347,    0,  347,    0,  347,
-  347,  347,  347,    0,    0,    0,    0,  347,    0,    0,
-   51,  347,    0,    0,    0,  347,  223,    0,    0,    0,
-    0,  369,    0,  347,    0,    0,  347,    0,  347,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  369,    0,    0,  347,    0,    0,
-    0,    0,  347,    0,    0,    0,    0,  369,  347,  347,
-    0,  273,  369,  347,    0,  240,   51,  369,    0,  369,
-  369,  369,  369,    0,    0,    0,  347,  369,    0,    0,
-    0,  369,    0,  368,    0,  369,    0,    0,    0,    0,
-    0,    0,    0,  369,    0,    0,  369,    0,  369,    0,
-    0,    0,    0,    0,    0,    0,  368,    0,  347,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  368,
-    0,  465,  369,    0,  368,    0,    0,  239,  369,  368,
-    0,  368,  368,  368,  368,    0,    0,    0,    0,  368,
-    0,    0,    0,  368,  466,    0,    0,  368,    0,    0,
-    0,    0,    0,    0,    0,  368,    0,  467,  368,  465,
-  368,    0,  469,    0,    0,    0,    0,  470,    0,  471,
-  472,  473,  474,    0,    0,    0,    0,  475,  369,    0,
-    0,  476,  466,    0,  368, 1380,    0,    0,    0,    0,
-  368,    0,    0,  477,    0,  467,  478,  465,  479,    0,
-  469,    0,    0,    0,    0,  470,    0,  471,  472,  473,
-  474,    0,    0,    0,    0,  475,    0,    0,    0,  476,
-  466,    0,  480, 1380,    0,    0,    0,    0, 1381,    0,
-    0,  477,    0,  467,  478,    0,  479,    0,  469,    0,
-  368,    0,    0,  470,    0,  471,  472,  473,  474,    0,
-    0,    0,    0,  475,    0,    0,    0,  476,    0,    0,
-  480,    0,    0,    0,    0,    0,    0,    0,    0,  477,
-   56,   24,  478,   25,  479,    0,   26,  254, 1382,    0,
-    0,   27,   61,   62,    0,   28,    0,    0,    0,    0,
-    0,   64,    0,    0,   30,    0,    0,    0,  480,    0,
-    0,   32,    0,    0,    0,    0,   33,    0,   71,   72,
-   34,    0,  613,    0,    0,    0, 1382,    0,    0,  614,
+   51,    0,   51,  347,   51,    0,    0,   51,    0,   51,
+   51,   51,   51,    0,    0,    0,   51,   51,   51,    0,
+    0,   51,   51,   51,   51,    0,  347,    0,    0,    0,
+   51,   51,    0,   51,   51,    0,   51,   51,   51,  347,
+    0,    0,   51,    0,  347,    0,    0,  347,    0,  347,
+    0,  347,  347,  347,  347,    0,    0,    0,    0,  347,
+    0,    0,   51,  347,    0,    0,    0,  347,  223,    0,
+    0,    0,    0,  368,    0,  347,    0,    0,  347,    0,
+  347,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  368,    0,    0,  347,
+    0,    0,    0,    0,  347,    0,    0,    0,    0,  368,
+  347,  347,    0,  273,  368,  347,    0,  239,   51,  368,
+    0,  368,  368,  368,  368,    0,    0,    0,  347,  368,
+    0,    0,    0,  368,    0,  465,    0,  368,    0,    0,
+    0,    0,    0,    0,    0,  368,    0,    0,  368,    0,
+  368,    0,    0,    0,    0,    0,    0,    0,  466,    0,
+  347,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  467,    0,  465,  368,    0,  469,    0,    0,    0,
+  368,  470,    0,  471,  472,  473,  474,    0,    0,    0,
+    0,  475,    0,    0,    0,  476,  466,    0,    0, 1381,
+    0,    0,    0,  465,    0,    0,    0,  477,    0,  467,
+  478,    0,  479,    0,  469,    0,    0,    0,    0,  470,
+    0,  471,  472,  473,  474,    0,  466,    0,    0,  475,
+  368,    0,    0,  476,    0,    0,  480, 1381,    0,  467,
+    0,    0, 1382,    0,  469,  477,    0,    0,  478,  470,
+  479,  471,  472,  473,  474,    0,    0,    0,    0,  475,
+    0,    0,    0,  476,    0,    0,    0,    0,    0,    0,
+   56,   24,    0,   25,  480,  477,   26,  254,  478,    0,
+  479,   27,   61,   62,    0,   28,    0,    0,    0,    0,
+    0,   64, 1383,    0,   30,    0,    0,    0,    0,    0,
+    0,   32,    0,    0,  480,    0,   33,    0,   71,   72,
+   34,    0,  614,    0,    0,    0,    0,    0,    0,  615,
     0,    0,   36,    0,   37,   74,    0,    0,   38,    0,
-    0,   76,    0,   78,    0,   80,   39,   40,  255,    0,
-   41,    0,    0,    0,    0,    0,    0,  615,    0,    0,
-   87,   88,    0,    0, 1399,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   89,   90,   91,   92,   93,
-    0,    0,    0,    0,    0,    0,    0,   95,  974,    0,
-  616,    0,    0,   97,   98,   99,  100,    0,    0,    0,
+ 1383,   76,    0,   78,    0,   80,   39,   40,  255,    0,
+   41,    0,    0,    0,    0,    0,    0,  616,    0,    0,
+   87,   88,    0,    0,    0,    0,    0,    0,    0,    0,
+ 1400,    0,    0,    0,    0,   89,   90,   91,   92,   93,
+    0,    0,    0,    0,    0,    0,    0,   95,  975,    0,
+  617,    0,    0,   97,   98,   99,  100,    0,    0,    0,
   101,    0,  102,    0,    0,    0,    0,    0,  103,  104,
     0,    0,    0,    0,    0,    0,   56,   24,    0,   25,
     0,    0,   26,  254,    0,    0,    0,   27,   61,   62,
     0,   28,    0,  105,  106,  107,  108,   64,    0,    0,
    30,    0,    0,    0,    0,    0,    0,   32,    0,    0,
-    0,    0,   33,    0,   71,   72,   34,    0,  613,    0,
-    0,    0,    0,    0,    0,  614,    0,    0,   36,    0,
+    0,    0,   33,    0,   71,   72,   34,    0,  614,    0,
+    0,    0,    0,    0,    0,  615,    0,    0,   36,    0,
    37,   74,    0,    0,   38,    0,    0,   76,    0,   78,
     0,   80,   39,   40,  255,    0,   41,    0,    0,    0,
-    0,    0,    0,  615,    0,    0,   87,   88,    0,    0,
+    0,    0,    0,  616,    0,    0,   87,   88,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,   89,   90,   91,   92,   93,    0,    0,    0,    0,
-    0,    0,    0,   95,    0,    0,  616,    0,    0,   97,
+    0,    0,    0,   95,    0,    0,  617,    0,    0,   97,
    98,   99,  100,    0,    0,    0,  101,    0,  102,    0,
     0,    0,    0,    0,  103,  104,    0,    0,    0,    0,
     0,    0,   56,   24,    0,   25,    0,    0,   26,  254,
@@ -12431,12 +12440,12 @@ void case_1034()
     0,    0,    0,   36,    0,   37,   74,    0,    0,   38,
     0,    0,   76,    0,   78,    0,   80,   39,   40,  255,
     0,   41,    0,    0,   84,    0,    0,    0,    0,    0,
-    0,   24,    0,   25,    0,    0,   26,  692, 1285,    0,
+    0,   24,    0,   25,    0,    0,   26,  692, 1286,    0,
     0,   27,    0,    0,    0,   28,   89,   90,   91,  256,
     0,    0,    0,    0,   30,  691,    0,  691,   95,    0,
-  691,   32,  691,  691,    0,  691,   33,  691, 1286,  691,
+  691,   32,  691,  691,    0,  691,   33,  691, 1287,  691,
    34,  691,  691,  691,    0,    0,    0,  691,  691,    0,
-    0,    0,   36,  691,   37,  691,  691,    0,   38, 1287,
+    0,    0,   36,  691,   37,  691,  691,    0,   38, 1288,
   691,    0,    0,    0,  691,    0,   39,   40,    0,    0,
    41,    0,    0,  324,  105,  257,  691,    0,  691,    0,
     0,    0,  691,  691,    0,    0,    0,    0,    0,    0,
@@ -12448,470 +12457,488 @@ void case_1034()
     0,    0,    0,    0,  691,    0,  691,    0,    0,    0,
   691,  691,    0,    0,  368,    0,    0,    0,  691,  691,
     0,    0,  691,    0,    0,  691,    0,   24,    0,   25,
-  691,    0,   26,    0,    0, 1348,    0,   27,  691,  725,
-    0,   28,    0,  726, 1349, 1350,    0,    0,    0, 1351,
-   30,    0,    0,    0,    0, 1352,    0,   32,    0,   24,
-    0,   25,   33,    0,   26,    0,   34, 1348,    0,   27,
-    0,  725,    0,   28,    0,  726, 1349, 1350,   36,    0,
-   37, 1351,   30,    0,   38,    0,    0, 1352,    0,   32,
-    0,    0,   39,   40,   33,    0,   41,    0,   34, 1353,
-    0,    0,    0,   51, 1354,   51,  691,    0,   51,    0,
+  691,    0,   26,    0,    0, 1349,    0,   27,  691,  726,
+    0,   28,    0,  727, 1350, 1351,    0,    0,    0, 1352,
+   30,    0,    0,    0,    0, 1353,    0,   32,    0,   24,
+    0,   25,   33,    0,   26,    0,   34, 1349,    0,   27,
+    0,  726,    0,   28,    0,  727, 1350, 1351,   36,    0,
+   37, 1352,   30,    0,   38,    0,    0, 1353,    0,   32,
+    0,    0,   39,   40,   33,    0,   41,    0,   34, 1354,
+    0,    0,    0,   51, 1355,   51,  691,    0,   51,    0,
    36,    0,   37,   51,    0,    0,   38,   51,    0,    0,
     0,    0,    0,    0,   39,   40,   51,    0,   41,    0,
-    0, 1353,    0,   51,    0,   51, 1354,   51,   51, 1355,
+    0, 1354,    0,   51,    0,   51, 1355,   51,   51, 1356,
    51,    0,   51,    0,   51,   51,   51,    0,    0,   51,
     0,   51,    0,    0,   51,    0,   51,    0,   51,    0,
    51,    0,    0,   51,    0,   51,    0,    0,   51,   51,
    51,    0,   51,    0,   51,   51,   51,    0,   51,   24,
- 1356,   25,    0,   51,   26,    0,   51,    0,   51,   27,
+ 1357,   25,    0,   51,   26,    0,   51,    0,   51,   27,
     0,    0,   51,   28,    0,   51,    0,    0,    0,    0,
    51,   51,   30,    0,   51,    0,    0,   51,    0,   32,
-  162,    0, 1356,    0,   33,    0,    0,    0,   34,    0,
-  585,    0,    0,    0,    0,    0,    0,  586,    0,    0,
-   36,    0,   37,    0,    0,    0,   38,    0,    0,  587,
+  162,    0, 1357,    0,   33,    0,    0,    0,   34,    0,
+  586,    0,    0,    0,    0,    0,    0,  587,    0,    0,
+   36,    0,   37,    0,    0,    0,   38,    0,    0,  588,
   162,    0,    0,    0,   39,   40,    0,    0,   41,    0,
-   52,  588,   52,    0,    0,   52,   51,    0,    0,    0,
+   52,  589,   52,    0,    0,   52,   51,    0,    0,    0,
    52,    0,    0,    0,   52,    0,    0,    0,    0,    0,
-    0,    0,    0,   52,    0,    0,    0,  589,    0,    0,
+    0,    0,    0,   52,    0,    0,    0,  590,    0,    0,
    52,    0,   51,    0,   51,   52,    0,   51,   51,   52,
     0,   52,   51,   52,    0,    0,   51,    0,   52,    0,
     0,   52,    0,   52,    0,   51,    0,   52,    0,    0,
    52,    0,   51,    0,    0,   52,   52,   51,    0,   52,
-    0,   51,   52,   51,    0,   51,   24,    0,   25,    0,
-   51,   26,  590,   51,    0,   51,   27,    0,    0,   51,
-   28,    0,   51,    0,    0,    0,    0,   51,   51,   30,
-    0,   51,    0,    0,   51,    0,   32,    0,    0,    0,
-    0,   33,    0,    0,    0,   34,    0,    0,    0,    0,
-   37,    0,    0,    0,    0,    0,    0,   36,    0,   37,
-    0,   37,    0,   38,    0,    0,   37,    0,    0,    0,
-   37,   39,   40,   37,    0,   41,    0,    0,  324,    0,
-    0,    0,    0,   52,    0,   37,   37,    0,    0,    0,
-   37,   37,    0,    0,    0,    0,   37,    0,   37,   37,
-   37,   37,    0,    0,  291,    0,   37,    0,    0,    0,
-   37,    0,   37,    0,    0,   51,    0,    0,    0,    0,
-    0,    0,   37,    0,   37,   37,   35,   37,    0,    0,
-    0,   37,    0,    0,    0,    0,    0,   35,    0,    0,
-    0,    0,   35,    0,    0,    0,   35,    0,    0,   35,
-    0,   37,    0,    0,    0,    0,    0,   37,   37,  325,
-    0,   35,   35,    0,    0,    0,   35,   35,   31,    0,
-   31,    0,   35,    0,   35,   35,   35,   35,    0,    0,
-    0,    0,   35,    0,    0,    0,   35,    0,   35,    0,
-    0,   31,    0,    0,    0,    0,    0,    0,   35,    0,
-    0,   35,    0,   35,   31,    0,    0,   35,    0,   31,
-    0,    0,    0,    0,   31,    0,   31,   31,   31,   31,
-    0,    0,    0,    0,   31,    0,    0,   35,   31,    0,
-    0,   51,    0,   35,   35,    0,    0,    0,    0,    0,
-   31,    0,   51,   31,    0,   31,    0,   51,    0,    0,
-    0,   51,    0,    0,   51,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   51,   51,    0,   31,
-    0,   51,   51,    0,   51,   31,   31,   51,    0,   51,
-   51,   51,   51,    0,    0,   51,    0,   51,    0,    0,
-   51,   51,    0,   51,   51,    0,    0,   51,    0,    0,
-    0,    0,    0,   51,    0,    0,   51,    0,   51,   51,
-   51,    0,   51,    0,   51,   51,   51,    0,    0,    0,
-   51,    0,   51,   51,   51,   51,    0,    0,    0,    0,
-   51,    0,   51,    0,   51,    0,   51,    0,   39,   51,
-    0,    0,    0,    0,    0,    0,   51,    0,    0,   51,
-    0,   51,   51,    0,   51,   51,    0,   51,    0,    0,
-    0,    0,   51,    0,   51,   51,   51,   51,    0,    0,
-    0,    0,   51,    0,    0,   51,   51,   51,    0,    0,
-    0,   40,    0,    0,    0,    0,    0,    0,   51,    0,
-   51,   51,   51,   51,    0,   51,    0,    0,    0,    0,
-   51,    0,   51,   51,   51,   51,    0,    0,    0,    0,
-   51,    0,    0,    0,   51,   51,    0,   51,    0,   51,
-   51,    0,    0,  204,    0,    0,   51,    0,   51,   51,
+    0,   51,   52,   51,    0,   51,    0,    0,    0,    0,
+   51,    0,  591,   51,    0,   51,    0,    0,    0,   51,
+    0,    0,   51,    0,    0,    0,    0,   51,   51,    0,
+    0,   51,    0,   24,   51,   25,    0,    0,   26,    0,
+    0,    0,    0,   27,    0,    0,    0,   28,    0,    0,
+    0,   29,   24,    0,   25,    0,   30,   26,    0,    0,
+    0,   31,   27,   32,    0,    0,   28,    0,   33,    0,
+    0,    0,   34,   35,    0,   30,    0,    0,    0,    0,
+    0,    0,   32,   52,   36,    0,   37,   33,    0,    0,
+   38,   34,    0,    0,    0,    0,   37,    0,   39,   40,
+    0,    0,   41,   36,    0,   37,    0,   37,    0,   38,
+    0,    0,   37,    0,    0,   51,   37,   39,   40,   37,
+    0,   41,    0,    0,  324,    0,    0,    0,    0,    0,
+    0,   37,   37,    0,    0,    0,   37,   37,    0,    0,
+    0,    0,   37,    0,   37,   37,   37,   37,    0,    0,
+  291,    0,   37,    0,    0,    0,   37,    0,   37,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   37,    0,
+   37,   37,   35,   37,    0,    0,    0,   37,    0,    0,
+    0,    0,    0,   35,    0,    0,   42,    0,   35,    0,
+    0,    0,   35,    0,    0,   35,    0,   37,    0,    0,
+    0,    0,    0,   37,   37,  325,    0,   35,   35,    0,
+    0,    0,   35,   35,   31,    0,   31,    0,   35,    0,
+   35,   35,   35,   35,    0,    0,    0,    0,   35,    0,
+    0,    0,   35,    0,   35,    0,    0,   31,    0,    0,
+    0,    0,    0,    0,   35,    0,    0,   35,    0,   35,
+   31,    0,    0,   35,    0,   31,    0,    0,    0,    0,
+   31,    0,   31,   31,   31,   31,    0,    0,    0,    0,
+   31,    0,    0,   35,   31,    0,    0,   51,    0,   35,
+   35,    0,    0,    0,    0,    0,   31,    0,   51,   31,
+    0,   31,    0,   51,    0,    0,    0,   51,    0,    0,
+   51,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,   51,   51,    0,   31,    0,   51,   51,    0,
+   51,   31,   31,   51,    0,   51,   51,   51,   51,    0,
+    0,   51,    0,   51,    0,    0,   51,   51,    0,   51,
+   51,    0,    0,   51,    0,    0,    0,    0,    0,   51,
+    0,    0,   51,    0,   51,   51,   51,    0,   51,    0,
+   51,   51,   51,    0,    0,    0,   51,    0,   51,   51,
+   51,   51,    0,    0,    0,    0,   51,    0,   51,    0,
+   51,    0,   51,    0,   39,   51,    0,    0,    0,    0,
+    0,    0,   51,    0,    0,   51,    0,   51,   51,    0,
+   51,   51,    0,   51,    0,    0,    0,    0,   51,    0,
    51,   51,   51,   51,    0,    0,    0,    0,   51,    0,
-   51,   51,   51,   51,    0,    0,   51,    0,   51,    0,
-    0,    0,   51,   51,    0,   51,    0,   51,   51,    0,
-    0,  206,    0,    0,   51,    0,   51,   51,   51,   51,
+    0,   51,   51,   51,    0,    0,    0,   40,    0,    0,
+    0,    0,    0,    0,   51,    0,   51,   51,   51,   51,
     0,   51,    0,    0,    0,    0,   51,    0,   51,   51,
    51,   51,    0,    0,    0,    0,   51,    0,    0,    0,
-   51,   51,    0,   51,    0,    0,    0,    0,   51,  308,
-   51,    0,   51,    0,   51,   51,    0,   51,    0,   51,
+   51,   51,    0,   51,    0,   51,   51,    0,    0,  204,
+    0,    0,   51,    0,   51,   51,   51,   51,   51,   51,
     0,    0,    0,    0,   51,    0,   51,   51,   51,   51,
-    0,   51,    0,    0,   51,    0,    0,    0,   51,    0,
-    0,   51,    0,    0,   51,    0,    0,  309,  465,   51,
-   51,    0,    0,   51,   51,   51,   51,   51,   51,   51,
-    0,    0,   51,    0,   51,    0,    0,    0,   51,    0,
-    0,  466,    0,    0,    0,    0,    0,    0,  465,   51,
-   51,   51,   51,   51,  467,   51,    0,    0,  468,  469,
-    0,    0,    0,    0,  470,    0,  471,  472,  473,  474,
-    0,  466,    0,    0,  475,    0,    0,    0,  476,   51,
-    0,    0,    0,    0,  467,    0,    0,    0,    0,  469,
-  477,    0,    0,  478,  470,  479,  471,  472,  473,  474,
-    0,    0,    0,    0,  475,    0,    0,    0,  476,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  480,
-  477,    0,    0,  478,    0,  479,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  480,
+    0,    0,   51,    0,   51,    0,    0,    0,   51,   51,
+    0,   51,    0,   51,   51,    0,    0,  206,    0,    0,
+   51,    0,   51,   51,   51,   51,    0,   51,    0,    0,
+    0,    0,   51,    0,   51,   51,   51,   51,    0,    0,
+    0,    0,   51,    0,    0,    0,   51,   51,    0,   51,
+    0,    0,    0,    0,   51,  308,   51,    0,   51,    0,
+   51,   51,    0,   51,    0,   51,    0,    0,    0,    0,
+   51,    0,   51,   51,   51,   51,    0,   51,    0,    0,
+   51,    0,    0,    0,   51,    0,    0,   51,    0,    0,
+   51,    0,    0,  309,  465,   51,   51,    0,    0,   51,
+   51,   51,   51,   51,   51,   51,    0,    0,   51,    0,
+   51,    0,    0,    0,   51,    0,    0,  466,    0,    0,
+    0,    0,    0,    0,    0,   51,   51,   51,   51,   51,
+  467,   51,    0,    0,    0,  469,    0,    0,    0,    0,
+  470,    0,  471,  472,  473,  474,    0,    0,    0,    0,
+  475,    0,    0,    0,  476,   51,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  477,    0,    0,  478,
+    0,  479,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  480,
   };
   protected static readonly short [] yyCheck = {            17,
-   17,    4,   18,  300,  299,  529,   17,   87,   88,   51,
-  531,  189,   51,  289,  247,   17,  482,  234,    6,  188,
-  232,   68,  504,   84,   20,   59,  298,  296,  108,  191,
-  344,  298,  157,  334,  383,  574,  323,  581,  790,  982,
-   87,   88, 1162,   47,   77,   92,   59,   58, 1198, 1199,
-  268,    0,  113,  256,  115,   73,    0,  367,  256,   77,
-  256,  592,  601,  330,  256,  112,  256,  113,   79,  115,
-   81,  256,  335,  367,  679,  256,  256,   95,  268,  684,
-  685,  256,  760,  256,  762,   17,  282,   17,  256, 1292,
-  256,  256,  256,  256,  372,  256,  268, 1247,  372,  256,
-  987,  374,  256,   17,  276,  256, 1195, 1310,  391,  357,
-  256,   17,  357,   17,  256,  368,  256,  256,  314,  199,
-  200,  368,  368,  376,  368,  172,  367,  256,  373,  376,
-  374,  414, 1357,  811,  256,  376,  814,  381,  386,  157,
-  157,  386, 1367,  416,  418,  428,  157,  189,  340,  382,
-  189,  429,   17,   59,  339,  157,  423,   63,   17,  344,
-   17,  346, 1251,  325,  349,  350,  429,  352,  353,  372,
-  343,  374,  418,  704,  339,  256,  429,  256,  256,  344,
-   20,  346,  262,  363,  349,  350,  256,  352,  353,  374,
-  232,  363,  367,  232,   17,  363,  371,  268, 1242,  246,
-  247,  367,  256,  369,  422,  371,  368,  371,  288,  374,
-  367,  373,  259,  376,  371,  376,    0,  371,  391,  223,
-  418,   17,  418,   17,  525,  157,  429,  157,  308,  247,
-  447, 1118,  422,  528,  446,  253,  546,  418,  418,  381,
-  228,  414,  763,  157,  429,  420,  418,   87,   88,  296,
-  418,  157,  286,  157,  420,  428,  420,  423,  568,  381,
-  574,  322,  296,  420,  429,  326,  420,  418,  108, 1157,
-  331,  289,  418,  286,  568, 1478,  294,  295,  418,  418,
-  824,  328,  592,  256,  364,  331,  333,  601,  358,  418,
-  452,  309,  157,  277, 1269,  374,   17,  368,  157,  317,
-  157,  319, 1505,  381,  909,  323,  319,  318,  257,  256,
-  391,  257,  256,  256, 1517,  369, 1519,  335,  336,  325,
-  400,  401, 1366,  256,  418,  487,  325,  344,  375,  294,
-  256,  378,  256,  414,  157,  382,  383,  358,  371, 1091,
-  945,  306,  344,  256,  256,  256,  256,  256,  428,  429,
- 1275,  422, 1472,  371,  424,  425,  426,  427,  256,  199,
-  200,  157,  256,  157,  382,  383, 1044,  256,  386,  387,
+   17,  299,   18,   17,    4,  529,   17,   87,   88,   51,
+  189,  300,   51,  234,  531,  188,  247,  232,    6,  289,
+  482,   68,   84,  323,  344,   59,  298,   20,  108,  298,
+  157,  504,  334,  383,   59,  582,  575,  983,  296,   47,
+   87,   88, 1163,    0,  593,   92,   77,   58,  761,  791,
+  763,  113,  367,  115,  256,   73, 1199, 1200,  256,   77,
+  256,  330, 1293,  602,  367,  112,    0,  113,   79,  115,
+   81,  256,  256,   17,   17,  256,  256,   95,  256,  256,
+ 1311,  256,  268,  268,   17,  268,  294,  256,  325,  376,
+  276,  256,  256, 1196,  256, 1508, 1509,  256,  306,  812,
+  256,  256,  815,  988,  371, 1248,  374,  372,  256,  272,
+  256,  256,  368,  341,  391,  257,  357,  680,  256,  199,
+  200, 1243,  685,  686,  256,  172,  401,   17,  369,  268,
+  256,  372,  373,  296,  191,  394,  395,  414,  413,  157,
+  157,  369,  429,  157,  256,  386,  157,  189,  416, 1252,
+  189,  382, 1565,  420,  423,  256,  705,  256,   17,  340,
+  323,  339,  418,   17,  429,  367,  344,  369,  346,  371,
+  282,  349,  350,  371,  352,  353,  372,  363,  374,   17,
+  421,  418,  262,  367,  339,  368,  363,  371,  363,  344,
+  232,  346,  256,  232,  349,  350,  374,  352,  353,  246,
+  247,  370,  314,  367,   17,  374,    0,  371,  288,  371,
+  418,   17,  259,  157,  157,  223,   17,  343,  420,  374,
+   17,  423,  420,  525,  157,  381,  447,  256,  308,  247,
+  528,  446,  418,  429, 1119,  253,  420,  422,  418,  422,
+  228,  418,  374,  418,  547, 1367,   59,  764, 1479,  296,
+   63,  429,  286,  418,  569,  575,  420,  358,  420,  418,
+  322,  286,  296,   17,  326,  391,  569,  157,  325,  331,
+  418,  289,  418,  418,  429, 1506,  294,  295,  825,  256,
+  418,  328,  602,  422,  364,  331,  333, 1518,  414, 1520,
+  593,  309,  391,  277,  319, 1270,  256,  256,  157,  317,
+  257,  319,  428,  157, 1158,  323,  418,  318,  256,  256,
+  256,  368,  376,  368,  358,  414,  373,  335,  336,  157,
+  400,  401,  256,  424,  425,  426,  427,  344,  375,  256,
+  344,  378, 1045,  256,  363,  382,  383,  256,  256,  256,
+  371,  370,  256,  372,  157,  374,  256,  910,  428,  429,
+ 1092,  157, 1473,  371,  256,  256,  157,  256,  256,  263,
+  157,  256,   21,  418,  382,  383,  915,  335,  386,  387,
   388,  389,  390,  391,  392,  393,  394,  395,  396,  363,
-  286,  428,  429,  914,  989,  432,  991, 1362, 1538,  994,
-  363,  257,  256, 1368,  704,  339, 1321,  370,  256,  372,
-  418,  374,  256,  256,  446,  305,  256,  446, 1351,  256,
-  368,  705,  418,  319,  456,  725,  374,  256, 1568,  418,
- 1395,  256,  262,  367,  367,  372,  947,  371,  590,  373,
-  374,  375,  376,  376,  418,  419,  157,  381,  344,  266,
-  351,  367,  375,  605,  926,  418,  608,  609,  288,  453,
-  454,  375,  448,  418,  256,  459,  503,  496,  505,  368,
-  300,  748,  375,  375,  374,  374,  462,  256,  308,  262,
-  367,  277,  335,  257,  372,  281, 1081,  371, 1083,  376,
- 1085,  256,  529,  957,  701,  374,  497,  314,  272, 1507,
- 1508,  504,  363,  277, 1172, 1275,  765,  281,  369,  546,
-  733,  363, 1180,  550,  256,  298,  370,  856,  256,  527,
-  374,  529,  296,  531,  372,  305,  372, 1038,  372,  372,
-  269, 1409,  372,  740,  364,  372, 1204,  367, 1072,  839,
-  369,  542,  543,  695,  369,  369,  342,  286,  556,  323,
-  256, 1321,  294,  561,  591,  839, 1564,  418,  375,  294,
-  546, 1439, 1440,  715, 1442,  266,  418,  574,  342,  570,
-  400,  401,  343,  372,  339, 1453,  428,  369, 1456,  344,
-  581,  346,  574,  429,  349,  350,  368,  352,  353, 1184,
-  369, 1259,  368, 1471,  601,  378,  379,  363,  428,  429,
- 1064,  363, 1066,  341,  256,  613,  614, 1141,  504,  601,
-  381,  368,  264,  314,  914,  367,  368, 1495,  448, 1214,
-  391,  343,  357,  372,  376, 1357,  911,  256,  363,  913,
-  429,  369,  462,  363,  369, 1367,  418,  372,  373,  862,
-  368,  368,  263,  414,  681, 1275,  683, 1176,  371,  256,
-  941,  386,  418,  429,  367,  692,  418,  428,  371,  256,
-  775,  367,  428,  363,  429,  371, 1261,  373,  374,  391,
-  376,  679,  429,  325,  375,  381,  684,  685,  574,  687,
-  429,  343,  376,  418,  946, 1280,  421,  944,  418,  368,
- 1275, 1321,  414, 1039,  315,  982,  733,  256,  368,   21,
-    6,  429,  429,  272,  376,  601,  428,  420,  277,  415,
-  339,   17,  281,  750,  374,  344,  546,  346,  418,  381,
-  349,  350, 1068,  352,  353,  733,  796,  296,  765,  391,
-   52,  363,  339, 1205,  376,  429, 1321,  344,  568,  346,
-  748,  765,  349,  350,  256,  352,  353,  272,  726,  819,
-  429,  802,  414,   59,  323,  763,  416,   63,  371,  429,
-  263,  769,  592,  369, 1041,  835,  428,  373,  805, 1054,
-  367,  296,  367,  342,  371,  256,  373,  374,  341,  376,
-  339,   87,   88, 1006,  381,  344,  418,  346,  256,  363,
-  349,  350,  386,  352,  353,  369,  256,  798,  323,  357,
-  429,  838,  108,  256,  956,  363,  369,  420,  816,  269,
-  818,  369,  315,  391,  372,  373,  374,  423,  272,  856,
-  828,  822,  429,  824,  305,  862,  286,  339,  386, 1275,
- 1134,  401,  344,  357,  346,  294,  414,  349,  350,  998,
-  352,  353,  296,  413,  418,  915,  384,  306,  856,  373,
- 1275,  157,  305,  369,  862,  887,  864,  370,  866,  256,
-  418,  374,  386, 1129,  760,  381,  762, 1275,  272,  323,
-  429,  339, 1176,  371,  704, 1321,  344, 1162,  346,  347,
-  348,  349,  350,  351,  352,  353,  354,  355,  356,  918,
-  306,  385,  296,  199,  200,  725, 1321,  313, 1275, 1165,
-  368,  909,  370,  911,  372,  339,  374,  375,  376,  325,
-  896, 1063,  367, 1321,  951,  811,  953,  429,  814,  323,
-  928,  376,  959,  901,  339,  933, 1371,  339,  936, 1385,
-  400,  357, 1155,  367,  357,  381, 1202,  945, 1242,  947,
- 1385, 1011,  376,  369, 1321,  391,  372,  373,  985, 1460,
-  373,  368,  367,  256,  389,  367,  262, 1274, 1275,  376,
-  386,  429, 1407,  386,  367,  368,  796,  367,  414, 1006,
-  367,  368,  369,  376,  371,  372,  376,  374, 1295,  376,
-  286,  989,  288,  991,  368, 1022,  994,  367, 1331,  819,
-  374, 1028,  376,  256,  300,  421,  376, 1340, 1006,  394,
-  395,  306,  308,  308, 1321,  835, 1323,  373,  313,  839,
-  376, 1522,  306,  319, 1221, 1217, 1282, 1003,  370,  313,
-  325,  418,  374,  420,  368, 1193,  423,  374,  372,  376,
- 1038, 1331,  376, 1041,  381, 1013,  339, 1015,  344, 1017,
- 1340,  344,  371,  346,  373,  368,  349,  350, 1559,  352,
-  353,  374,  390,  370,  371,  382,  383,  374,  364,  370,
-  369,  367, 1366,  374, 1351,  418,  896, 1581, 1582,  396,
-  397, 1072,  371, 1081,  370, 1083,  339, 1085,  374,  369,
- 1088,  344,  372,  346,  914,  915,  349,  350,  373,  352,
-  353,  376,  368,  256,  400,  401,  372,  368,  374,  415,
-  376,  372,  265,  374,  267,  376, 1099,  270,  354,  355,
-  370,  371,  275,  373,  374,  375,  279,  371, 1155,  373,
-  372, 1129,  428,  429,  376,  288,  429, 1134, 1157,  372,
-  370,  374,  295,  376,  374, 1143, 1144,  300,  418,  372,
- 1141,  304, 1134,  376,  367,  372,  369, 1155, 1044,  376,
- 1156,  256,  982,  316, 1162,  318,  370, 1165,  372,  322,
-  374, 1193,  373, 1195, 1193,  376, 1195,  330,  331, 1176,
-  277,  334,  368, 1003,  337,  371, 1184,  373,  374,  370,
-  367, 1011, 1190,  374, 1176, 1217,  372, 1472, 1217,  370,
-  376,  372,  376,  374, 1202,  256,  392,  393,  504,  372,
-  363,  374,  294, 1273, 1356,  376, 1214, 1215,  406,  407,
-  408,  409,  386,  387,  388,  372,  412,  374,  370, 1251,
-  372,  374, 1251,  376,  420,  367,  370,  423,  372,  371,
- 1382,  373,  374,  373,  376, 1242,  398,  399, 1134,  381,
-  546,  376, 1274, 1275,  376, 1274,  368, 1399,  294,  371,
- 1242,  373,  374, 1261,  370,  418,  372,  368,  369,  381,
- 1330,  343,  568, 1295,  372, 1417, 1295, 1419,  574,  414,
-  392,  393, 1280,  415, 1282,  370, 1172,  372, 1348, 1349,
- 1176,  372,  376,  374, 1180,  418,  592, 1324,  356, 1321,
-  412, 1323,  418,  285, 1323,  601,  369,  372,  420,  374,
-  370,  423,  372, 1373,  368,  369, 1376,   93, 1204,  354,
-  355,   97,   98,   99,  100,  101,  102,  103,  104,  371,
-  370,  373,  372,   61,  414,  415,  375,   65,   66,   67,
-  418,   69,   70, 1334,  376,  327,   74,   75,  372,  373,
-  392,  393,  374,   81,  376,   83, 1242,   85,  374,  374,
-  376,  376,   90,   91,  374,  372,  376,  364,  365, 1366,
-  412,  364,  365, 1259,  402,  403, 1196,  372,  420, 1160,
- 1161,  423,  381,  368, 1366,  374,  114,  294,    0,  372,
- 1409,  404,  405,  410,  411,  377,  378,  379,  380, 1390,
-  382,  383,  384,  385,  386,  387,  388,  389,  704,  294,
-  392,  393,  394,  395,  396,  397,  398,  399,  374,  372,
- 1439, 1440,  372, 1442,  372,  374,  256,  428, 1450,  725,
-  376,  371,  428, 1253, 1453,  256,  294, 1456,  294,  381,
-  372,  374,  373,  418,  374, 1467,  375,  373,  372,  374,
-  429,  374, 1471, 1273,  381,  374,  374,    0, 1480, 1481,
-  423,  372, 1460,  367,  760,  374,  762, 1458,  374,  421,
-  372,  343,  373,  372, 1472,  294, 1495,  374,  294,  374,
- 1366,  418,  370,  418,  371, 1507, 1508,  367,  256,  375,
-  256, 1489,  374,  256,  256,  280,  256,  381,  367,  372,
-  796,  368,  343,  371,  370,  376,  376,  370,  372,  374,
- 1330, 1331,  374,  372,  347,  811,  367,  372,  814,  256,
- 1340,  381,  256,  819, 1522,  423,  302,  255, 1348, 1349,
-  258, 1351,  381,  381,  372,  372,  376, 1357,  256,  835,
-  368,  347, 1564,  839,  370,  374,  370, 1367,  375,  367,
-  370, 1371,  339, 1373, 1581, 1582, 1376,  372,  334,  348,
-  368, 1559,  374,  372,  418, 1385,  342,  381,  418,  348,
-  298,  256,  368,  367, 1565, 1566,  367,  367,  381,  376,
-  368, 1572, 1573, 1581, 1582,  356,  314, 1407,  402,  403,
-  404,  405,  406,  407,  408,  409,  410,  411,  376,  371,
-  374,  368,  372,  368,  368,  337,  305,  418,  418,  368,
-  371,  369,  367,  418,  371,  367,  418,  371,  914,  915,
-  376,  397,  398,  399,  371,  373,  402,  403,  404,  405,
-  406,  407,  408,  409,  410,  411,  412,  413,  414,  415,
-  416,  417,  381,  381,  371,  257,  371,  369,  371,  261,
-  374,  372,  372,  256,  373,  381,  373,  368,    0,  374,
-  272,  374,  374,  372,  372,  277,  376,  418,  370,  281,
-  376,  376,  284,  418,  418,  372,  418,  372,  376,  372,
-  381,  370,  372,  367,  296,  297,  982,  368,  315,  301,
-  302,  263,  371,  371,  368,  307,  372,  309,  310,  311,
-  312,  372,    0,    0,  367,  317,  376,  368,  376,  321,
-  372,  323,    0,  256,  368, 1011,  372,  372,  261,  262,
-  370,  333,  418,  335,  336,  368,  338,  372,  368,  376,
-  342,  372,  370,  367,  376,  418,  418,  368,  368,  376,
-  372,  284,  368,  376,  367,  367,  367,  372, 1044,  525,
-  362,  368,  372,  368,  297,  298,  368,  369,  376,  302,
-  373,  315,  305,  263,  307,  376,  309,  310,  311,  312,
-  376,  499,  376,   50,  317,  376,  376,  376,  321,  376,
-  376,   12,  325,    5, 1003,    0,  896, 1155, 1155, 1323,
-  333, 1295, 1475,  336, 1528,  338,  339, 1512, 1463, 1492,
- 1458,  344,  913,  346,  347,  348,  349,  350,  351,  352,
-  353,  354,  355,  356,  542,  918,  918,  739,  918,  362,
-  363,  597, 1573, 1321,  367,  368, 1371,  370,  371,  372,
- 1391,  374,  375,  376, 1567,  378,  379, 1485, 1134,  382,
-  383,  384,  385, 1481, 1480, 1566,  389,  390, 1251, 1419,
-  887,  394,  395,  396,  397,  398,  399,  400,  401,  546,
-  936, 1253,  941,  382,  769,  614,   71, 1054,  862,  765,
-  413,  337,  733,  416,  412,  418, 1172,  413,  415,  414,
- 1176,  839,  416,  265, 1180,  267,  429,  417,  270, 1330,
- 1231,  568,  157,  275, 1134, 1040, 1120,  279, 1144, 1068,
- 1196,  283, 1134, 1024, 1132, 1205,  288,  690, 1204,  544,
-  437,  293,  961,  295,  437,  257, 1326, 1215,  300,  261,
-  893,  892,  304,  305,   -1,   -1,   -1,   -1,   -1,   -1,
-  272,   -1,   -1,   -1,  316,  277,  318,   -1,   -1,  281,
-  322,   -1,  284,   -1,   -1,   -1, 1242,   -1,  330,  331,
-   -1,   -1,  334,    0,  296,  297,   -1, 1253,   -1,  301,
-  302,   -1,   -1, 1259,   -1,  307,   -1,  309,  310,  311,
-  312,   -1,   -1,   -1,   -1,  317,   -1, 1273,   -1,  321,
-   -1,  323,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  333,  768,   -1,  336,   -1,  338,   -1,   -1,   -1,
-  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  362,   -1,   -1,   -1,   -1,  367,  368,  369,   -1,   -1,
-   -1,   -1,   -1,   -1, 1330, 1331,  418,   -1,   -1,   -1,
-   -1,  256,   -1,   -1, 1340,   -1,  261,  262,   -1,   -1,
-   -1,   -1, 1348, 1349,   -1, 1351,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  284,
- 1366,   -1,   -1,   -1,   -1,   -1,   -1, 1373,   -1,   -1,
- 1376,   -1,  297,  298,   -1,   -1,   -1,  302,   -1,   -1,
-  305,   -1,  307,   -1,  309,  310,  311,  312,   -1,   -1,
-   -1,   -1,  317,   -1,   -1,   -1,  321,   -1,   -1,   -1,
-  325,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  333,   -1,
-    0,  336,   -1,  338,  339,   -1,   -1,   -1,   -1,  344,
-   -1,  346,  347,  348,  349,  350,  351,  352,  353,  354,
-  355,  356,   -1,   -1,   -1,   -1,   -1,  362,  363,   -1,
-   -1,   -1,  367,  368,   -1,  370,  371,  372,  373,  374,
-  375,  376,   -1,  378,  379,  941,  381,  382,  383,  384,
-  385,  386,  387,  388,  389,  390,   -1,  392,  393,  394,
-  395,  396,  397,  398,  399,  400,  401,  402,  403,  404,
-  405,  406,  407,  408,  409,  410,  411,  412,  413,   -1,
-   -1,  416,   -1,  418,   -1,  420,   -1,   -1,  423,  256,
-  257,   -1,   -1,   -1,  429,   -1,   -1,  264,  265,  266,
-  267,  268,   -1,  270,  271,   -1,  273,  274,  275,  276,
-  277,  278,  279,  280,   -1,   -1,   -1,   -1,  285,   -1,
-  287,  288,  289,  290,  291,  292,    0,   -1,  295,   -1,
-   -1,   -1,  299,  300,   -1,  302,  303,  304,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  314,   -1,  316,
-   -1,  318,  319,   -1,   -1,  322,   -1,  324,  325,  326,
-  327,  328,  329,  330,  331,  332,  333,  334,  335,   -1,
-  337,   -1,   -1,  340,  341,   -1,   -1,  344,  345,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  359,  360,  361,  362,  363,   -1,   -1,   -1,
-  367,  368,   -1,   -1,  371,   -1,   -1,   -1,   -1,  376,
-  377,  378,  379,  380,   -1,   -1,   -1,  384,   -1,  386,
-   -1,   -1,   -1,   -1,   -1,  392,  393,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  417,  418,  419,  420,   -1,  422,  256,  257,   -1,   -1,
-   -1,   -1,  429,   -1,  264,  265,  266,  267,  268,   -1,
-  270,  271,    0,  273,  274,  275,  276,  277,  278,  279,
-   -1,   -1,   -1,   -1,   -1,  285,   -1,  287,  288,  289,
+  256,  428,  429,  946,  256,  432,  256,  305, 1363,  418,
+  367,  706,  256,   52, 1369,  452, 1539,  335,  256,  376,
+  418,  256,  705,  157,  446,  339, 1352,  446,  367,  368,
+  369,  315,  371,  372,  456,  374,  376,  376,  257,  256,
+  256, 1396,   20,  726,  372,  371, 1569,  990,  375,  992,
+  487,  948,  995,  367,  418,  419,  418,  371,  256,  373,
+  374,  375,  376,  325,  256,  453,  454,  381,  375,  749,
+  367,  459,  375,  256,  927,  448,  503,  496,  505,  418,
+ 1173,  420,  381,  257,  423,  375,  368,  381, 1181,  462,
+  266,  372,  374,  286,  958,  374,  374,  372,  272,  504,
+  256,  702,  529,  277,  305,  363,  497,  281,  262,   87,
+   88,  429, 1205,  343,  368,  305,  372,  369,  266,  369,
+  547,  368,  296,  734,  551,  369,  319,  857,  766,  527,
+  108,  529,  363,  531,  372,  351,  294,  372,  314, 1082,
+  741, 1084, 1039, 1086,  298,  840, 1073,  256,  306,  323,
+  256,  344,  543,  544,  591,  372,  418,  840,  341,  557,
+  418,  391,  256,  363,  562,  592,  314, 1260,  342,  606,
+  264,  369,  609,  610,  547,  429, 1410,  369,  575,  376,
+  571,  575,  429,  339,  414,  277,  369,  418,  344,  281,
+  346,  582,  372,  349,  350,  368,  352,  353,  428,  375,
+  367, 1065,  368, 1067,  371,  602, 1440, 1441,  602, 1443,
+  376,  373,  369,  368,  376, 1142,  614,  615,  418,  914,
+ 1454,  199,  200, 1457,  378,  379,  372,  375,  428,  372,
+  339,  325,  915,  343,  912,  344,  363,  346, 1472,  368,
+  349,  350, 1185,  352,  353,  368,  376,  256,  363,  429,
+  342,  372,  863,  420,  294,  682,  429,  684, 1177,  696,
+  942,  367, 1496,  429,  343,  371,  693,  373,  374,  776,
+  376,  381, 1215,  429,  429,  381,  363,  256,  371,  716,
+ 1276,  391,  680,  429,  262,  294,  429,  685,  686,  263,
+  688,  418,  363,  363,  256,  947,  945,  418,  369,  369,
+  429,  428,  381,  418,  414,  367,  429,  734, 1276,  415,
+  288,  504,  391,  357,  983,  374,  272,  357,  428, 1262,
+  429,  369,  300,  363,  751,  373, 1322, 1276, 1276,  369,
+  308,  418,  372,  373,  272,  414,  734,  797, 1281,  766,
+  296,  315,  386,  305, 1275, 1276,  386,  418,  418,  428,
+  368,  749,  766, 1206, 1322, 1276,  374,  416,  296,  727,
+  820,  803, 1042,  381,  256, 1296,  764,  323, 1276, 1276,
+ 1276,  369,  770, 1322, 1322,  423,  836, 1055,  418,  806,
+  391,  421,  575,  381, 1372,  323,  364,  269,  367,  367,
+  339, 1322,  371, 1324,  373,  374, 1007,  376, 1386,  256,
+  339, 1322,  381,  414,  286,  339,  398,  399,  799,  602,
+  357,  256,  839, 1040, 1322, 1322, 1322,  428,  367,  817,
+ 1408,  819,  400,  401,  269,  386,  373,  371,  367,  373,
+  857,  829,  823,  367,  825, 1135,  863,  376,  368,  386,
+  371,  286, 1069, 1358,  374,  381,  999,  339,  392,  393,
+  428,  429,  344, 1368,  346,  391,  916,  349,  350,  857,
+  352,  353, 1358,  384,  306,  863,  888,  865,  412,  867,
+  448,  313, 1368,  368,  368,  369,  420, 1177,  414,  423,
+ 1130,  376,  339,  325,  462, 1163,  389,  344,  256,  346,
+  347,  348,  349,  350,  351,  352,  353,  354,  355,  356,
+  919,  367,  306,  372,  308,  374,  357,  376,  385,  313,
+  376,  368,  910,  370,  912,  372, 1166,  374,  375,  376,
+  957,  325,  373,  272,  897,  952,  373,  954,  277,  376,
+    6,  929,  281,  960,  902,  386,  934,  429,  357,  937,
+  367,   17,  400, 1243, 1386, 1156,  256,  296,  946,  376,
+  948,  367, 1012, 1203,  373,  371,  306,  373,  374,  986,
+  376,  368,  369,  313, 1461,  381,  367,  386,  761,  547,
+  763,  339,  429,  390,  323,  376,  344,  367,  346,  367,
+ 1007,  349,  350,   59,  352,  353,  376,   63,  376,  382,
+  383,  569,  990,  342,  992,  373, 1023,  995,  376,  415,
+  369, 1332, 1029,  396,  397,  368,  256,  367,  368, 1007,
+ 1341,   87,   88,  376,  369,  593,  376,  372,  256,  812,
+  368, 1222,  815, 1218,  372,  371, 1523, 1064,  376,  339,
+  415, 1004,  108, 1283,  344, 1194,  346,  414,  415,  349,
+  350, 1039,  352,  353, 1042,  418, 1014,  368, 1016, 1332,
+ 1018,  367,  368,  374,  418,  376,  357,  374, 1341,  376,
+  376,  429,  363, 1560,  381,  256,  370, 1367,  369,  368,
+  374,  372,  373,  374,  277,  374,  370,  371, 1582, 1583,
+  374,  157, 1073, 1352, 1082,  386, 1084,  376, 1086,  339,
+  371, 1089,  373,  370,  344,  372,  346,  374,  376,  349,
+  350,  339,  352,  353,  367,  370,  344,  372,  346,  374,
+  256,  349,  350,  373,  352,  353,  371,  418,  373,  429,
+ 1100,  370,  368,  199,  200,  374,  372,  705,  374, 1156,
+  376,  370, 1130,  370,  376,  374,  368,  374, 1135, 1158,
+  372, 1135,  374,  367,  376,  369, 1144, 1145,  726,  370,
+  371, 1142,  373,  374,  375,  372,  370,  256, 1156,  376,
+  374, 1157,  372,  372,  376, 1163,  376,  376, 1166,  370,
+  354,  355, 1194,  374, 1196, 1194,  294, 1196,  372,  429,
+ 1177,  294,  376, 1177,  354,  355,  262, 1185,  406,  407,
+  408,  409,  372, 1191,  374, 1473, 1218,  364,  365, 1218,
+  386,  387,  388,  343,  372, 1203,  374,  370,  372,  372,
+  286,  376,  288,  374, 1274,  376,  414, 1215, 1216,  797,
+  370,  418,  372,  368,  300,  372,  371,  374,  373,  374,
+ 1252,  356,  308, 1252,  375,  370,  381,  372,  370,  372,
+  372,  374,  820,  319,  372,  373, 1243,  392,  393, 1243,
+  364,  365, 1045, 1275, 1276,  370, 1275,  372,  836,  370,
+  418,  372,  840,  418, 1262, 1161, 1162,  412,  344,  369,
+  374, 1331,  376,  376, 1296,  420,  372, 1296,  423,  374,
+  374,  376,  376, 1281,  374, 1283,  376,  372,  364, 1349,
+ 1350,  367,  402,  403,  381,  404,  405,  368, 1325,  374,
+ 1322,  294, 1324,  410,  411, 1324,  372,  294,  372,  374,
+  372,  374,  372,  256, 1374,  376,  428, 1377,  371,  897,
+ 1357,  256,  428,  368,  400,  401,  371,  294,  373,  374,
+  294,  381,  372,  374,  373,  418,  374,  915,  916,  375,
+  373,  372, 1135,  429, 1335,  374, 1383,  392,  393,  381,
+   93,  374,  428,  429,   97,   98,   99,  100,  101,  102,
+  103,  104,  374, 1400,  374,  423,  372,  412,  367,  374,
+ 1367,  374,  421, 1367,  372,  420,  373,  372,  423,  294,
+ 1173, 1418,  343, 1420, 1177,  374,  294,  370, 1181,  374,
+  418, 1410,  371,  418,  367,  375,  256,  256,  374,  256,
+ 1391,  256,  280,  381,  256,  983,  256,  367,  371,  368,
+  372,  343, 1205,  265,  370,  267,  374,  372,  270,  376,
+  374, 1440, 1441,  275, 1443,  376, 1004,  279,  504, 1451,
+  370,  372,  423,  372, 1012, 1454,  288,  381, 1457,  367,
+  347,  256,  256,  295,  381,  381, 1468,  372,  300,  372,
+ 1243,  368,  304, 1472,  376,  256,  347,  370,  374, 1481,
+ 1482,  375,  372, 1461,  316,  370,  318, 1260, 1459,  367,
+  322,  547,  339,  370,  348, 1473,  368, 1496,  330,  331,
+  381,  374,  334,  372,  418,  337, 1508, 1509,  418,  256,
+  348,  368, 1490,  569,  367,  367,  367,  381,  368,  575,
+  376,  402,  403,  404,  405,  406,  407,  408,  409,  410,
+  411,  363,  356,  376,  368,   61,  372,  593,  256,   65,
+   66,   67,  371,   69,   70, 1523,  602,  374,   74,   75,
+  368,  368,  337,  305,  369,   81,  418,   83,  371,   85,
+  368,  367,  371, 1565,   90,   91,  376,  371,  371,  418,
+  418,  373,  418,  371,  381, 1582, 1583,  367,  371,  302,
+  381,  369, 1560,  372,  371,  256,  418,  373,  114,  372,
+  374,  373,  418,  372, 1367, 1566, 1567,  374,  374,  374,
+  372,  370, 1573, 1574, 1582, 1583,  376,  418,  376,  376,
+  372,  334,  376,  418,  372,  381,  372,  368,  418,  342,
+    0,  339,  381,  372,  370,  368,  344,  367,  346,  347,
+  348,  349,  350,  351,  352,  353,  354,  355,  356, 1197,
+  315,  263,  371,  371,  368,  372,  372,    0,    0,  705,
+  368,  367,  370,  368,  372,  376,  374,  375,  376,  376,
+  372,    0,  368,  372,  372,  418,  370,  368,  368,  372,
+  726,  367,  390,  372,  397,  398,  399,  370,  376,  402,
+  403,  404,  405,  406,  407,  408,  409,  410,  411,  412,
+  413,  414,  415,  416,  417,  368, 1254,  376,  418,  418,
+  372,  256,  376,  368,  368,  761,  376,  763,  367,  367,
+  265,  429,  267,    0,  368,  270, 1274,  372,  368,  372,
+  275,  367,  315,  263,  279,  376,  373,  376,  376,  255,
+   50,  376,  258,  288,  376,  376,  376,  376,  376,   12,
+  295,  797,    5,  897, 1004,  300, 1156, 1156, 1324,  304,
+ 1296, 1513, 1476, 1529, 1493, 1459,  812,  919, 1464,  815,
+  919,  316,  919,  318,  820,  914,  740,  322, 1372, 1574,
+ 1322, 1392,  298, 1331, 1332,  330,  331, 1568, 1486,  334,
+  836,  261,  337, 1341,  840, 1482, 1252, 1481,  314, 1420,
+  547, 1349, 1350, 1567, 1352, 1254,  942,  937,  770,  863,
+ 1358,  615,  525,  888,  284,  382,  734, 1055,  337,   71,
+ 1368,  766,  412,  414, 1372,  413, 1374,  297,  415, 1377,
+  416,  301,  302,  417,  569,  840, 1232,  307, 1386,  309,
+  310,  311,  312, 1331,  157, 1135, 1041,  317, 1121, 1145,
+ 1025,  321, 1069,    0, 1133, 1206,  962, 1135,  545,  437,
+ 1408,  437, 1216,  333, 1327,  894,  336,  893,  338,  915,
+  916,   -1,   -1,  418,   -1,   -1,  691,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  598,  256,  257,   -1,   -1,
+   -1,   -1,  362,   -1,  264,  265,  266,  267,  268,   -1,
+  270,  271,   -1,  273,  274,  275,  276,  277,  278,  279,
+  280,   -1,   -1,   -1,   -1,  285,   -1,  287,  288,  289,
   290,  291,  292,   -1,   -1,  295,   -1,   -1,   -1,  299,
-  300,   -1,  302,  303,  304,   -1,   -1,   -1,   -1,   -1,
+  300,   -1,  302,  303,  304,   -1,   -1,  983,   -1,   -1,
    -1,   -1,   -1,   -1,  314,   -1,  316,   -1,  318,  319,
    -1,   -1,  322,   -1,  324,  325,  326,  327,  328,  329,
-  330,  331,  332,  333,  334,  335,   -1,  337,   -1,   -1,
-  340,  341,   -1,   -1,  344,  345,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  359,
-  360,  361,  362,  363,   -1,   -1,   -1,  367,  368,   -1,
+  330,  331,  332,  333,  334,  335, 1012,  337,   -1,   -1,
+  340,  341,   -1,   -1,  344,  345,   -1,   -1,   -1,  256,
+   -1,   -1,   -1,  499,   -1,  262,   -1,   -1,   -1,  359,
+  360,  361,  362,  363,   -1,   -1,   -1,  367,  368, 1045,
    -1,  371,   -1,   -1,   -1,   -1,  376,  377,  378,  379,
-  380,   -1,  256,   -1,  384,   -1,  386,  261,  262,   -1,
-   -1,   -1,  392,  393,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  284,   -1,   -1,   -1,   -1,   -1,   -1,  417,  418,  419,
-  420,   -1,  422,  297,  298,   -1,   -1,   -1,  302,  429,
-   -1,  305,   -1,  307,   -1,  309,  310,  311,  312,   -1,
-   -1,   -1,   -1,  317,   -1,   -1,   -1,  321,   -1,   -1,
-   -1,  325,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  333,
-   -1,   -1,  336,   -1,  338,  339,   -1,   -1,   -1,   -1,
-  344,   -1,  346,  347,  348,  349,  350,  351,  352,  353,
-  354,  355,  356,  357,   -1,   -1,   -1,   -1,  362,  363,
-   -1,   -1,   -1,  367,  368,  369,  370,  371,  372,  373,
-  374,  375,  376,   -1,  378,  379,    0,   -1,  382,  383,
-  384,  385,  386,   -1,   -1,  389,  390,   -1,   -1,   -1,
-  394,  395,  396,  397,  398,  399,  400,  401,  256,   -1,
-   -1,   -1,   -1,  261,  262,   -1,   -1,   -1,   -1,  413,
-   -1,   -1,  416,   -1,  418,   -1,  420,   -1,   -1,  423,
-   -1,   -1,   -1,   -1,   -1,  429,  284,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  297,
-  298,   -1,   -1,   -1,  302,   -1,   -1,  305,   -1,  307,
-   -1,  309,  310,  311,  312,   -1,   -1,   -1,   -1,  317,
-   -1,   -1,   -1,  321,   -1,   -1,   -1,  325,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  333,   -1,   -1,  336,   -1,
-  338,  339,   -1,   -1,   -1,   -1,  344,   -1,  346,  347,
-  348,  349,  350,  351,  352,  353,  354,  355,  356,   -1,
-   -1,   -1,   -1,   -1,  362,  363,   -1,   -1,   -1,  367,
-  368,  369,  370,  371,  372,   -1,  374,  375,  376,   -1,
-  378,  379,    0,   -1,  382,  383,  384,  385,  256,   -1,
-   -1,  389,  390,  261,  262,   -1,  394,  395,  396,  397,
-  398,  399,  400,  401,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  413,  284,   -1,  416,   -1,
-  418,   -1,  420,   -1,   -1,  423,   -1,   -1,   -1,  297,
-  298,  429,   -1,   -1,  302,   -1,   -1,  305,   -1,  307,
-   -1,  309,  310,  311,  312,   -1,   -1,   -1,   -1,  317,
-   -1,   -1,   -1,  321,   -1,   -1,   -1,  325,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  333,   -1,   -1,  336,   -1,
-  338,  339,   -1,   -1,   -1,   -1,  344,   -1,  346,  347,
-  348,  349,  350,  351,  352,  353,  354,  355,  356,   -1,
-   -1,   -1,  256,   -1,  362,  363,   -1,   -1,  262,  367,
-  368,  369,  370,  371,  372,   -1,  374,  375,  376,   -1,
-  378,  379,   -1,   -1,  382,  383,  384,  385,   -1,   -1,
-   -1,  389,  390,   -1,   -1,   -1,  394,  395,  396,  397,
-  398,  399,  400,  401,  298,   -1,   -1,   -1,   -1,   -1,
-    0,   -1,   -1,   -1,   -1,  413,   -1,   -1,  416,   -1,
-  418,   -1,  420,   -1,   -1,  423,   -1,   -1,   -1,   -1,
-   -1,  429,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  339,   -1,   -1,   -1,   -1,
-  344,   -1,  346,  347,  348,  349,  350,  351,  352,  353,
-  354,  355,  356,  357,   -1,   -1,   -1,   -1,   -1,  363,
-  256,   -1,   -1,  367,  368,  369,  370,  371,  372,  373,
-  374,  375,  376,   -1,  378,  379,   -1,   -1,  382,  383,
-  384,  385,  386,   -1,   -1,  389,  390,   -1,   -1,    0,
-  394,  395,  396,  397,  398,  399,  400,  401,  256,   -1,
-   -1,   -1,   -1,   -1,  262,   -1,   -1,   -1,   -1,  413,
-   -1,   -1,  416,   -1,  418,   -1,  420,   -1,   -1,  423,
-   -1,   -1,   -1,   -1,   -1,  429,   -1,   -1,   -1,   -1,
-   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  298,   -1,   -1,  339,   -1,   -1,   -1,   -1,  344,   -1,
-  346,  347,  348,  349,  350,  351,  352,  353,  354,  355,
+  380,   -1,   -1,    0,  384,   -1,  386,   -1,   -1,   -1,
+   -1,  298,  392,  393,   -1,   -1,   -1,  543,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  368,   -1,  370,    0,  372,   -1,  374,  375,
-  376,  339,   -1,   -1,   -1,   -1,  344,   -1,  346,  347,
-  348,  349,  350,  351,  352,  353,  354,  355,  356,   -1,
-   -1,   -1,   -1,   -1,   -1,  363,   -1,   -1,   -1,  367,
-  368,   -1,  370,  371,  372,   -1,  374,  375,  376,   -1,
-  378,  379,   -1,   -1,  382,  383,  384,  385,   -1,   -1,
-   -1,  389,  390,  429,   -1,   -1,  394,  395,  396,  397,
-  398,  399,  400,  401,   -1,   -1,   -1,   -1,   -1,    0,
-   -1,   -1,   -1,   -1,   -1,  413,  256,  257,  416,   -1,
-  418,  261,   -1,   -1,   -1,  265,   -1,  267,   -1,   -1,
-  270,  429,  272,  273,   -1,  275,   -1,  277,   -1,  279,
-   -1,  281,  282,  283,  284,   -1,   -1,  287,  288,   -1,
-   -1,   -1,    0,  293,   -1,  295,  296,  297,   -1,   -1,
-  300,  301,  302,   -1,  304,   -1,   -1,  307,   -1,  309,
-  310,  311,  312,   -1,   -1,   -1,  316,  317,  318,   -1,
-   -1,  321,  322,  323,   -1,   -1,   -1,   -1,   -1,   -1,
-  330,  331,   -1,  333,  334,    0,  336,  337,  338,   -1,
-   -1,   -1,  342,   -1,   -1,   -1,  257,   -1,   -1,   -1,
-  261,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  272,  362,   -1,   -1,   -1,  277,   -1,  368,  369,
-  281,   -1,   -1,  284,   -1,   -1,   -1,  377,    0,   -1,
-   -1,   -1,   -1,   -1,   -1,  296,  297,   -1,   -1,  257,
-  301,  302,   -1,  261,   -1,   -1,  307,   -1,  309,  310,
-  311,  312,   -1,   -1,  272,   -1,  317,   -1,   -1,  277,
-  321,   -1,  323,  281,   -1,   -1,  284,   -1,  418,   -1,
-   -1,    0,  333,   -1,  335,  336,   -1,  338,  296,  297,
-   -1,  342,  257,  301,  302,   -1,  261,   -1,   -1,  307,
-   -1,  309,  310,  311,  312,   -1,   -1,  272,   -1,  317,
-   -1,  362,  277,  321,   -1,  323,  281,   -1,  369,  284,
-   -1,   -1,   -1,   -1,    0,  333,   -1,   -1,  336,   -1,
-  338,  296,  297,   -1,  342,   -1,  301,  302,   -1,   -1,
-   -1,   -1,  307,   -1,  309,  310,  311,  312,   -1,   -1,
-   -1,   -1,  317,   -1,  362,   -1,  321,   -1,  323,   -1,
-  368,  369,   -1,   -1,   -1,   -1,  257,    0,  333,   -1,
-  261,  336,   -1,  338,   -1,   -1,   -1,  342,   -1,   -1,
-   -1,  272,   -1,   -1,   -1,   -1,  277,   -1,   -1,   -1,
-  281,   -1,   -1,  284,   -1,   -1,   -1,  362,   -1,   -1,
-   -1,   -1,   -1,  368,  369,  296,  297,   -1,   -1,  257,
-  301,  302,   -1,  261,   -1,   -1,  307,   -1,  309,  310,
-  311,  312,   -1,   -1,  272,   -1,  317,   -1,   -1,  277,
-  321,   -1,  323,  281,   -1,   -1,  284,   -1,   -1,   -1,
-   -1,   -1,  333,   -1,   -1,  336,   -1,  338,  296,  297,
-   -1,  342,  257,  301,  302,   -1,  261,   -1,   -1,  307,
-   -1,  309,  310,  311,  312,   -1,   -1,  272,   -1,  317,
-   -1,  362,  277,  321,   -1,  323,  281,   -1,  369,  284,
-   -1,   -1,   -1,   -1,   -1,  333,   -1,   -1,  336,   -1,
-  338,  296,  297,   -1,  342,  257,  301,  302,   -1,  261,
-   -1,   -1,  307,   -1,  309,  310,  311,  312,   -1,   -1,
-  272,   -1,  317,   -1,  362,  277,  321,   -1,  323,  281,
-   -1,   -1,  284,   -1,   -1,   -1,   -1,   -1,  333,   -1,
-   -1,  336,   -1,  338,  296,  297,   -1,  342,  257,  301,
-  302,   -1,  261,   -1,   -1,  307,   -1,  309,  310,  311,
-  312,   -1,   -1,  272,   -1,  317,   -1,  362,  277,  321,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  417,  418,  419,
+  420,   -1,  422,   -1,   -1,   -1,  769,   -1,   -1,  429,
+   -1,   -1,  339,   -1,   -1,   -1,   -1,  344,   -1,  346,
+  347,  348,  349,  350,  351,  352,  353,  354,  355,  356,
+  357,   -1,   -1,   -1,   -1,   -1,  363,   -1,   -1, 1135,
+  367,  368,  369,  370,  371,  372,  373,  374,  375,  376,
+   -1,  378,  379,   -1,   -1,  382,  383,  384,  385,  386,
+  257,   -1,  389,  390,  261,   -1,   -1,  394,  395,  396,
+  397,  398,  399,  400,  401,  272,   -1, 1173,   -1,   -1,
+  277, 1177,   -1,   -1,  281, 1181,  413,  284,   -1,  416,
+   -1,  418,   -1,  420,  256,   -1,  423,   -1,   -1,  296,
+  297, 1197,  429,   -1,  301,  302,   -1,   -1,   -1, 1205,
+  307,   -1,  309,  310,  311,  312,   -1,   -1,   -1,   -1,
+  317,   -1,   -1,   -1,  321,   -1,  323,   -1,   -1,   -1,
+   -1,    0,   -1,   -1,   -1,   -1,  333,   -1,  335,  336,
+   -1,  338,   -1,   -1,   -1,  342,   -1, 1243,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 1254,   -1,
+   -1,   -1,   -1,   -1, 1260,  362,   -1,   -1,   -1,   -1,
+   -1,  368,  369,   -1,   -1,   -1,   -1,  339, 1274,  942,
+   -1,   -1,  344,   -1,  346,  347,  348,  349,  350,  351,
+  352,  353,  354,  355,  356,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  368,   -1,  370,   -1,
+  372,   -1,  374,  375,  376,   -1,   -1,   -1,   -1,  256,
+   -1,   -1,  384,  385,  261,  262,   -1,  389,  390,   -1,
+   -1,   -1,   -1,   -1,   -1, 1331, 1332,   -1,  400,  401,
+   -1,   -1,   -1,   -1,   -1, 1341,   -1,  284,   -1,   -1,
+   -1,  413,   -1, 1349, 1350,   -1, 1352,    0,   -1,   -1,
+  297,  298,   -1,   -1,   -1,  302,   -1,  429,  305,   -1,
+  307, 1367,  309,  310,  311,  312,   -1,   -1, 1374,   -1,
+  317, 1377,   -1,   -1,  321,   -1,   -1,   -1,  325,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  333,   -1,   -1,  336,
+   -1,  338,  339,   -1,   -1,   -1,   -1,  344,   -1,  346,
+  347,  348,  349,  350,  351,  352,  353,  354,  355,  356,
+   -1,   -1,   -1,   -1,   -1,  362,  363,   -1,   -1,   -1,
+  367,  368,   -1,  370,  371,  372,  373,  374,  375,  376,
+   -1,  378,  379,   -1,  381,  382,  383,  384,  385,  386,
+  387,  388,  389,  390,   -1,  392,  393,  394,  395,  396,
+  397,  398,  399,  400,  401,  402,  403,  404,  405,  406,
+  407,  408,  409,  410,  411,  412,  413,   -1,   -1,  416,
+   -1,  418,   -1,  420,   -1,   -1,  423,  256,  257,   -1,
+   -1,   -1,  429,   -1,   -1,  264,  265,  266,  267,  268,
+   -1,  270,  271,    0,  273,  274,  275,  276,  277,  278,
+  279,   -1,   -1,   -1,   -1,   -1,  285,   -1,  287,  288,
+  289,  290,  291,  292,   -1,   -1,  295,   -1,   -1,   -1,
+  299,  300,   -1,  302,  303,  304,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  314,   -1,  316,   -1,  318,
+  319,   -1,   -1,  322,   -1,  324,  325,  326,  327,  328,
+  329,  330,  331,  332,  333,  334,  335,   -1,  337,   -1,
+   -1,  340,  341,   -1,   -1,  344,  345,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  359,  360,  361,  362,  363,   -1,   -1,   -1,  367,  368,
+   -1,   -1,  371,   -1,   -1,   -1,   -1,  376,  377,  378,
+  379,  380,   -1,  256,   -1,  384,   -1,  386,  261,  262,
+   -1,   -1,   -1,  392,  393,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  284,   -1,   -1,   -1,   -1,   -1,   -1,  417,  418,
+  419,  420,   -1,  422,  297,  298,   -1,   -1,   -1,  302,
+  429,   -1,  305,   -1,  307,   -1,  309,  310,  311,  312,
+   -1,   -1,   -1,   -1,  317,   -1,   -1,   -1,  321,   -1,
+   -1,   -1,  325,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  333,   -1,   -1,  336,   -1,  338,  339,   -1,   -1,   -1,
+   -1,  344,   -1,  346,  347,  348,  349,  350,  351,  352,
+  353,  354,  355,  356,  357,   -1,   -1,   -1,   -1,  362,
+  363,   -1,   -1,   -1,  367,  368,  369,  370,  371,  372,
+  373,  374,  375,  376,   -1,  378,  379,   -1,   -1,  382,
+  383,  384,  385,  386,   -1,   -1,  389,  390,   -1,   -1,
+   -1,  394,  395,  396,  397,  398,  399,  400,  401,  256,
+   -1,   -1,   -1,    0,  261,  262,   -1,   -1,   -1,   -1,
+  413,   -1,   -1,  416,   -1,  418,   -1,  420,   -1,   -1,
+  423,   -1,   -1,   -1,   -1,   -1,  429,  284,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  297,  298,   -1,   -1,   -1,  302,   -1,   -1,  305,   -1,
+  307,   -1,  309,  310,  311,  312,   -1,   -1,   -1,   -1,
+  317,   -1,   -1,   -1,  321,   -1,   -1,   -1,  325,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  333,   -1,   -1,  336,
+   -1,  338,  339,   -1,   -1,   -1,   -1,  344,   -1,  346,
+  347,  348,  349,  350,  351,  352,  353,  354,  355,  356,
+   -1,   -1,   -1,   -1,   -1,  362,  363,    0,   -1,   -1,
+  367,  368,  369,  370,  371,  372,   -1,  374,  375,  376,
+   -1,  378,  379,   -1,   -1,  382,  383,  384,  385,  256,
+   -1,   -1,  389,  390,  261,  262,   -1,  394,  395,  396,
+  397,  398,  399,  400,  401,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  413,  284,   -1,  416,
+   -1,  418,   -1,  420,   -1,   -1,  423,   -1,   -1,   -1,
+  297,  298,  429,   -1,   -1,  302,   -1,   -1,  305,   -1,
+  307,   -1,  309,  310,  311,  312,   -1,   -1,   -1,   -1,
+  317,   -1,   -1,   -1,  321,   -1,   -1,   -1,  325,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  333,   -1,   -1,  336,
+   -1,  338,  339,   -1,   -1,   -1,   -1,  344,   -1,  346,
+  347,  348,  349,  350,  351,  352,  353,  354,  355,  356,
+   -1,   -1,   -1,   -1,   -1,  362,  363,   -1,   -1,   -1,
+  367,  368,  369,  370,  371,  372,   -1,  374,  375,  376,
+   -1,  378,  379,   -1,   -1,  382,  383,  384,  385,  256,
+   -1,   -1,  389,  390,  261,  262,   -1,  394,  395,  396,
+  397,  398,  399,  400,  401,   -1,    0,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  413,  284,   -1,  416,
+   -1,  418,   -1,  420,   -1,   -1,  423,   -1,   -1,   -1,
+  297,  298,  429,   -1,   -1,  302,   -1,   -1,  305,   -1,
+  307,   -1,  309,  310,  311,  312,   -1,   -1,   -1,   -1,
+  317,   -1,   -1,   -1,  321,   -1,   -1,   -1,  325,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  333,   -1,   -1,  336,
+   -1,  338,  339,   -1,   -1,   -1,   -1,  344,   -1,  346,
+  347,  348,  349,  350,  351,  352,  353,  354,  355,  356,
+   -1,   -1,    0,  256,   -1,  362,  363,   -1,   -1,  262,
+  367,  368,   -1,  370,  371,  372,   -1,  374,  375,  376,
+   -1,  378,  379,   -1,   -1,  382,  383,  384,  385,   -1,
+   -1,   -1,  389,  390,   -1,   -1,   -1,  394,  395,  396,
+  397,  398,  399,  400,  401,  298,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  413,   -1,   -1,  416,
+   -1,  418,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
+   -1,   -1,  429,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  339,   -1,   -1,   -1,
+   -1,  344,   -1,  346,  347,  348,  349,  350,  351,  352,
+  353,  354,  355,  356,   -1,   -1,   -1,   -1,   -1,   -1,
+  363,   -1,   -1,   -1,  367,  368,   -1,  370,  371,  372,
+   -1,  374,  375,  376,   -1,  378,  379,   -1,   -1,  382,
+  383,  384,  385,   -1,    0,   -1,  389,  390,   -1,   -1,
+   -1,  394,  395,  396,  397,  398,  399,  400,  401,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  413,   -1,   -1,  416,   -1,  418,   -1,   -1,   -1,   -1,
+   -1,   -1,  256,  257,   -1,   -1,  429,  261,   -1,   -1,
+   -1,  265,   -1,  267,   -1,   -1,  270,   -1,  272,  273,
+   -1,  275,   -1,  277,   -1,  279,   -1,  281,  282,  283,
+  284,   -1,   -1,  287,  288,   -1,   -1,   -1,    0,  293,
+   -1,  295,  296,  297,   -1,   -1,  300,  301,  302,   -1,
+  304,   -1,   -1,  307,   -1,  309,  310,  311,  312,   -1,
+   -1,   -1,  316,  317,  318,   -1,   -1,  321,  322,  323,
+   -1,   -1,   -1,   -1,   -1,   -1,  330,  331,   -1,  333,
+  334,    0,  336,  337,  338,   -1,   -1,   -1,  342,  257,
+   -1,   -1,   -1,  261,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  272,   -1,   -1,   -1,  362,  277,
+   -1,   -1,   -1,  281,  368,  369,  284,   -1,   -1,   -1,
+   -1,   -1,   -1,  377,    0,   -1,   -1,   -1,  296,  297,
+   -1,   -1,   -1,  301,  302,   -1,   -1,   -1,   -1,  307,
+   -1,  309,  310,  311,  312,   -1,   -1,   -1,   -1,  317,
+   -1,   -1,  257,  321,   -1,  323,  261,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  418,  333,   -1,  272,  336,   -1,
+  338,   -1,  277,   -1,  342,   -1,  281,   -1,   -1,  284,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,
+   -1,  296,  297,   -1,  362,   -1,  301,  302,   -1,  367,
+  368,  369,  307,   -1,  309,  310,  311,  312,   -1,   -1,
+   -1,   -1,  317,   -1,   -1,   -1,  321,   -1,  323,   -1,
+   -1,  257,   -1,   -1,   -1,  261,   -1,   -1,  333,   -1,
+  335,  336,   -1,  338,    0,   -1,  272,  342,   -1,   -1,
+   -1,  277,   -1,   -1,   -1,  281,   -1,   -1,  284,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  362,   -1,   -1,
+  296,  297,   -1,   -1,  369,  301,  302,   -1,   -1,   -1,
+   -1,  307,   -1,  309,  310,  311,  312,   -1,   -1,   -1,
+   -1,  317,   -1,   -1,   -1,  321,   -1,  323,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  257,   -1,  333,   -1,  261,
+  336,    0,  338,   -1,   -1,   -1,  342,   -1,   -1,   -1,
+  272,   -1,   -1,   -1,   -1,  277,   -1,   -1,   -1,  281,
+   -1,   -1,  284,   -1,   -1,   -1,  362,   -1,   -1,   -1,
+   -1,   -1,  368,  369,  296,  297,   -1,   -1,  257,  301,
+  302,   -1,  261,   -1,    0,  307,   -1,  309,  310,  311,
+  312,   -1,   -1,  272,   -1,  317,   -1,   -1,  277,  321,
    -1,  323,  281,   -1,   -1,  284,   -1,   -1,   -1,   -1,
    -1,  333,   -1,   -1,  336,   -1,  338,  296,  297,   -1,
-  342,  257,  301,  302,   -1,  261,   -1,   -1,  307,   -1,
+  342,  257,  301,  302,   -1,  261,   -1,    0,  307,   -1,
+  309,  310,  311,  312,   -1,   -1,  272,   -1,  317,   -1,
+  362,  277,  321,   -1,  323,  281,  368,  369,  284,   -1,
+   -1,   -1,   -1,   -1,  333,   -1,   -1,  336,   -1,  338,
+  296,  297,   -1,  342,   -1,  301,  302,   -1,   -1,   -1,
+   -1,  307,   -1,  309,  310,  311,  312,   -1,   -1,   -1,
+   -1,  317,   -1,  362,  257,  321,   -1,  323,  261,   -1,
+  369,   -1,   -1,   -1,   -1,   -1,   -1,  333,   -1,  272,
+  336,   -1,  338,   -1,  277,   -1,  342,   -1,  281,   -1,
+   -1,  284,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  296,  297,   -1,  362,   -1,  301,  302,
+   -1,  257,   -1,   -1,  307,  261,  309,  310,  311,  312,
+   -1,   -1,   -1,   -1,  317,   -1,  272,   -1,  321,   -1,
+  323,  277,   -1,   -1,   -1,  281,   -1,   -1,  284,   -1,
+  333,   -1,   -1,  336,   -1,  338,   -1,   -1,   -1,  342,
+  296,  297,   -1,   -1,   -1,  301,  302,   -1,   -1,   -1,
+   -1,  307,   -1,  309,  310,  311,  312,   -1,   -1,  362,
+   -1,  317,   -1,   -1,   -1,  321,   -1,  323,  257,   -1,
+   -1,   -1,  261,   -1,   -1,   -1,   -1,  333,   -1,   -1,
+  336,   -1,  338,  272,   -1,   -1,  342,   -1,  277,   -1,
+   -1,   -1,  281,   -1,   -1,  284,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  362,  296,  297,   -1,
+   -1,  257,  301,  302,   -1,  261,   -1,   -1,  307,   -1,
   309,  310,  311,  312,   -1,   -1,  272,   -1,  317,   -1,
-  362,  277,  321,   -1,  323,  281,   -1,   -1,  284,   -1,
+   -1,  277,  321,   -1,  323,  281,   -1,   -1,  284,   -1,
    -1,   -1,   -1,   -1,  333,   -1,   -1,  336,   -1,  338,
   296,  297,   -1,  342,  257,  301,  302,   -1,  261,   -1,
    -1,  307,   -1,  309,  310,  311,  312,   -1,   -1,  272,
@@ -12954,31 +12981,31 @@ void case_1034()
   401,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,  412,  413,   -1,   -1,   -1,   -1,   -1,   -1,  420,
    -1,   -1,  423,   -1,   -1,   -1,   -1,   -1,  429,   -1,
-   -1,  339,   -1,   -1,   -1,   -1,  344,   -1,  346,  347,
+  285,  339,   -1,   -1,   -1,   -1,  344,   -1,  346,  347,
   348,  349,  350,  351,  352,  353,  354,  355,  356,  357,
    -1,   -1,   -1,   -1,   -1,  363,   -1,   -1,   -1,   -1,
-  368,  369,  370,  371,  372,  373,  374,  375,  376,   -1,
-  378,  379,   -1,  381,  382,  383,  384,  385,  386,  387,
+  368,  369,  370,  371,  372,  373,  374,  375,  376,  256,
+  378,  379,  327,  381,  382,  383,  384,  385,  386,  387,
   388,  389,  390,   -1,  392,  393,  394,  395,  396,  397,
   398,  399,  400,  401,  402,  403,  404,  405,  406,  407,
-  408,  409,  410,  411,  412,  413,   -1,  256,  256,   -1,
-  418,   -1,  420,  262,   -1,  423,   -1,  265,   -1,  267,
-   -1,  429,  270,   -1,   -1,   -1,   -1,  275,   -1,   -1,
-   -1,  279,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  288,   -1,   -1,   -1,   -1,   -1,   -1,  295,   -1,  298,
-   -1,   -1,  300,   -1,   -1,   -1,  304,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  316,   -1,
-  318,   -1,   -1,   -1,  322,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  330,  331,   -1,   -1,  334,   -1,   -1,  337,
+  408,  409,  410,  411,  412,  413,   -1,  256,   -1,   -1,
+  418,   -1,  420,  262,   -1,  423,   -1,   -1,   -1,   -1,
+   -1,  429,  377,  378,  379,  380,   -1,  382,  383,  384,
+  385,  386,  387,  388,  389,   -1,   -1,  392,  393,  394,
+  395,  396,  397,  398,  399,   -1,   -1,   -1,   -1,  298,
+   -1,   -1,  339,   -1,   -1,   -1,   -1,  344,   -1,  346,
+  347,  348,  349,  350,  351,  352,  353,  354,  355,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  368,   -1,  370,   -1,  372,   -1,  374,  375,  376,
   339,   -1,   -1,   -1,   -1,  344,   -1,  346,  347,  348,
   349,  350,  351,  352,  353,  354,  355,  356,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  367,  368,
   369,  370,  371,  372,  373,  374,  375,  376,   -1,  378,
   379,   -1,  381,  382,  383,  384,  385,  386,  387,  388,
-  389,  390,   -1,  392,  393,  394,  395,  396,  397,  398,
+  389,  390,  429,  392,  393,  394,  395,  396,  397,  398,
   399,  400,  401,  402,  403,  404,  405,  406,  407,  408,
   409,  410,  411,  412,  413,   -1,  256,  256,   -1,   -1,
-  418,  420,  262,   -1,   -1,   -1,  265,   -1,  267,   -1,
+   -1,  420,  262,   -1,   -1,   -1,  265,   -1,  267,   -1,
   429,  270,   -1,   -1,   -1,   -1,  275,   -1,   -1,   -1,
   279,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  288,
    -1,   -1,   -1,   -1,   -1,   -1,  295,   -1,  298,   -1,
@@ -13059,27 +13086,27 @@ void case_1034()
   404,  405,  406,  407,  408,  409,  410,  411,  412,  413,
    -1,   -1,   -1,   -1,  418,   -1,  420,   -1,   -1,  423,
    -1,  418,   -1,   -1,   -1,  429,   -1,   -1,  339,   -1,
-   -1,   -1,  256,  344,   -1,  346,  347,  348,  349,  350,
+   -1,   -1,   -1,  344,   -1,  346,  347,  348,  349,  350,
   351,  352,  353,  354,  355,  356,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,  368,   -1,  370,
    -1,  372,   -1,  374,  375,  376,   -1,  378,  379,   -1,
   381,  382,  383,  384,  385,  386,  387,  388,  389,  390,
-   -1,   -1,   -1,  394,  395,  396,  397,  398,  399,  400,
+  261,   -1,   -1,  394,  395,  396,  397,  398,  399,  400,
   401,  402,  403,  404,  405,  406,  407,  408,  409,  410,
-  411,  256,  413,   -1,   -1,   -1,   -1,  262,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  339,   -1,   -1,  429,   -1,
-  344,   -1,  346,  347,  348,  349,  350,  351,  352,  353,
-  354,  355,  356,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  298,  368,   -1,  370,   -1,  372,   -1,
-  374,  375,  376,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  390,   -1,   -1,  256,
+  411,  256,  413,  284,   -1,   -1,   -1,  262,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  297,   -1,  429,   -1,
+   -1,  302,   -1,   -1,  305,   -1,  307,   -1,  309,  310,
+  311,  312,   -1,   -1,   -1,   -1,  317,   -1,   -1,   -1,
+  321,   -1,   -1,  298,  325,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  333,   -1,   -1,  336,   -1,  338,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  256,
    -1,   -1,   -1,   -1,   -1,  262,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  339,   -1,   -1,   -1,   -1,  344,
+   -1,  362,   -1,   -1,  339,   -1,   -1,  368,   -1,  344,
    -1,  346,  347,  348,  349,  350,  351,  352,  353,  354,
-  355,  356,   -1,   -1,   -1,  429,   -1,   -1,   -1,   -1,
+  355,  356,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,  298,   -1,  368,   -1,  370,   -1,  372,   -1,  374,
   375,  376,   -1,  378,  379,   -1,   -1,  382,  383,  384,
-  385,  386,  387,  388,  389,  390,   -1,   -1,   -1,  394,
+  385,  386,  387,  388,  389,  390,   -1,  418,   -1,  394,
   395,  396,  397,  398,  399,  400,  401,   -1,   -1,   -1,
    -1,   -1,  339,   -1,   -1,   -1,   -1,  344,  413,  346,
   347,  348,  349,  350,  351,  352,  353,  354,  355,  356,
@@ -13191,7 +13218,7 @@ void case_1034()
   351,  352,  353,  354,  355,  356,   -1,   -1,   -1,   -1,
   429,   -1,   -1,   -1,   -1,   -1,   -1,  368,   -1,  370,
    -1,  372,   -1,  374,  375,  376,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  384,  385,   -1,   -1,   -1,  389,  390,
+   -1,   -1,   -1,   -1,  385,   -1,   -1,   -1,  389,  390,
    -1,  256,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  400,
   401,   -1,   -1,   -1,   -1,   -1,  339,   -1,   -1,   -1,
    -1,  344,  413,  346,  347,  348,  349,  350,  351,  352,
@@ -13205,7 +13232,7 @@ void case_1034()
   355,  356,   -1,   -1,   -1,   -1,  429,   -1,   -1,   -1,
    -1,   -1,   -1,  368,   -1,  370,   -1,  372,   -1,  374,
   375,  376,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  385,   -1,   -1,   -1,  389,  390,   -1,  256,   -1,   -1,
+  385,   -1,   -1,   -1,   -1,  390,   -1,  256,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,  400,  401,   -1,   -1,   -1,
    -1,   -1,  339,   -1,   -1,   -1,   -1,  344,  413,  346,
   347,  348,  349,  350,  351,  352,  353,  354,  355,  356,
@@ -13218,164 +13245,216 @@ void case_1034()
   349,  350,  351,  352,  353,  354,  355,  356,   -1,   -1,
    -1,   -1,  429,   -1,   -1,   -1,   -1,   -1,   -1,  368,
    -1,  370,   -1,  372,   -1,  374,  375,  376,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  385,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,  390,   -1,  256,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,  400,  401,   -1,   -1,   -1,   -1,   -1,  339,   -1,
    -1,   -1,   -1,  344,  413,  346,  347,  348,  349,  350,
   351,  352,  353,  354,  355,  356,   -1,   -1,   -1,   -1,
   429,   -1,   -1,   -1,   -1,   -1,   -1,  368,   -1,  370,
-   -1,  372,   -1,  374,  375,  376,   -1,   -1,   -1,   -1,
+   -1,  372,   -1,  374,  375,  376,   -1,   -1,   -1,  256,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  390,
-   -1,  256,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  400,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  400,
   401,   -1,   -1,   -1,   -1,   -1,  339,   -1,   -1,   -1,
    -1,  344,  413,  346,  347,  348,  349,  350,  351,  352,
   353,  354,  355,  356,   -1,   -1,   -1,   -1,  429,   -1,
    -1,   -1,   -1,   -1,   -1,  368,   -1,  370,   -1,  372,
-   -1,  374,  375,  376,   -1,   -1,   -1,  256,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  390,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  400,  401,   -1,
-   -1,   -1,   -1,   -1,  339,   -1,   -1,   -1,   -1,  344,
-  413,  346,  347,  348,  349,  350,  351,  352,  353,  354,
-  355,  356,   -1,   -1,   -1,   -1,  429,   -1,   -1,   -1,
-   -1,   -1,   -1,  368,   -1,  370,   -1,  372,   -1,  374,
-  375,  376,   -1,   -1,   -1,   -1,  262,   -1,   -1,   -1,
-  266,   -1,   -1,   -1,   -1,  390,   -1,   -1,   -1,   -1,
-  339,   -1,   -1,   -1,   -1,  344,  401,  346,  347,  348,
-  349,  350,  351,  352,  353,  354,  355,  356,  413,   -1,
-   -1,   -1,  298,   -1,   -1,   -1,   -1,   -1,   -1,  368,
-   -1,  370,   -1,  372,  429,  374,  375,  376,  314,   -1,
+   -1,  374,  375,  376,   -1,   -1,   -1,   -1,  262,   -1,
+   -1,   -1,  266,   -1,   -1,   -1,   -1,  390,   -1,   -1,
+   -1,   -1,  339,   -1,   -1,   -1,   -1,  344,  401,  346,
+  347,  348,  349,  350,  351,  352,  353,  354,  355,  356,
+  413,   -1,   -1,   -1,  298,   -1,   -1,   -1,   -1,   -1,
+   -1,  368,   -1,  370,   -1,  372,  429,  374,  375,  376,
+  314,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  390,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  401,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  413,   -1,   -1,   -1,
+   -1,   -1,   -1,  357,   -1,   -1,   -1,   -1,   -1,  363,
+   -1,   -1,  429,   -1,  368,  369,   -1,  371,   -1,  373,
+   -1,  375,  376,   -1,  378,  379,   -1,  381,  382,  383,
+  384,  385,  386,  387,  388,  389,  390,   -1,  392,  393,
+  394,  395,  396,  397,  398,  399,  400,  401,  402,  403,
+  404,  405,  406,  407,  408,  409,  410,  411,  412,  413,
+   -1,   -1,  256,   -1,  418,   -1,  420,   -1,   -1,  423,
+  264,  265,  266,  267,  268,  429,  270,  271,   -1,  273,
+  274,  275,  276,  277,  278,  279,   -1,   -1,   -1,   -1,
+   -1,  285,   -1,  287,  288,  289,  290,  291,  292,   -1,
+   -1,  295,   -1,   -1,   -1,  299,  300,   -1,  302,  303,
+  304,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  314,   -1,  316,   -1,  318,  319,   -1,   -1,  322,   -1,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+  334,  335,   -1,  337,   -1,   -1,  340,  341,   -1,   -1,
+  344,  345,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  359,  360,  361,  362,  363,
+   -1,   -1,   -1,  367,   -1,   -1,   -1,  371,   -1,   -1,
+   -1,   -1,  376,  377,  378,  379,  380,   -1,   -1,   -1,
+  384,   -1,  386,   -1,   -1,   -1,   -1,   -1,  392,  393,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  390,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  401,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  413,   -1,   -1,   -1,   -1,   -1,
-   -1,  357,   -1,   -1,   -1,   -1,   -1,  363,   -1,   -1,
-  429,   -1,  368,  369,   -1,  371,   -1,  373,   -1,  375,
-  376,   -1,  378,  379,   -1,  381,  382,  383,  384,  385,
-  386,  387,  388,  389,  390,   -1,  392,  393,  394,  395,
-  396,  397,  398,  399,  400,  401,  402,  403,  404,  405,
-  406,  407,  408,  409,  410,  411,  412,  413,   -1,   -1,
-  256,   -1,  418,   -1,  420,   -1,   -1,  423,  264,  265,
-  266,  267,  268,  429,  270,  271,   -1,  273,  274,  275,
-  276,  277,  278,  279,   -1,   -1,   -1,   -1,   -1,  285,
-   -1,  287,  288,  289,  290,  291,  292,   -1,   -1,  295,
-   -1,   -1,   -1,  299,  300,   -1,  302,  303,  304,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  314,   -1,
-  316,   -1,  318,  319,   -1,   -1,  322,   -1,  324,  325,
-  326,  327,  328,  329,  330,  331,  332,  333,  334,  335,
-   -1,  337,   -1,   -1,  340,  341,   -1,   -1,  344,  345,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  359,  360,  361,  362,  363,   -1,   -1,
-   -1,  367,   -1,   -1,   -1,  371,   -1,   -1,   -1,   -1,
-  376,  377,  378,  379,  380,   -1,   -1,   -1,  384,   -1,
-  386,   -1,   -1,   -1,   -1,   -1,  392,  393,   -1,   -1,
+   -1,  256,   -1,  417,  418,  419,  420,   -1,  422,  264,
+  265,  266,  267,   -1,   -1,  270,  271,   -1,  273,  274,
+  275,  276,  277,  278,  279,   -1,   -1,   -1,   -1,   -1,
+  285,   -1,  287,  288,  289,  290,  291,  292,   -1,   -1,
+  295,   -1,   -1,   -1,  299,  300,   -1,  302,  303,  304,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  314,
+   -1,  316,   -1,  318,  319,   -1,   -1,  322,   -1,  324,
+  325,  326,  327,  328,  329,  330,  331,  332,  333,  334,
+  335,   -1,  337,   -1,   -1,  340,  341,   -1,   -1,  344,
+  345,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  359,  360,  361,  362,  363,   -1,
+   -1,   -1,  367,   -1,   -1,   -1,  371,   -1,   -1,   -1,
+   -1,  376,  377,  378,  379,  380,   -1,   -1,   -1,  384,
+   -1,  386,   -1,   -1,   -1,   -1,   -1,  392,  393,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  256,
-   -1,  417,  418,  419,  420,   -1,  422,  264,  265,  266,
-  267,   -1,   -1,  270,  271,   -1,  273,  274,  275,  276,
-  277,  278,  279,   -1,   -1,   -1,   -1,   -1,  285,   -1,
-  287,  288,  289,  290,  291,  292,   -1,   -1,  295,   -1,
-   -1,   -1,  299,  300,   -1,  302,  303,  304,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  314,   -1,  316,
-   -1,  318,  319,   -1,   -1,  322,   -1,  324,  325,  326,
-  327,  328,  329,  330,  331,  332,  333,  334,  335,   -1,
-  337,   -1,   -1,  340,  341,   -1,   -1,  344,  345,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  256,   -1,
+   -1,   -1,  417,  418,  419,  420,  264,  265,  266,  267,
+   -1,   -1,  270,  271,   -1,  273,  274,  275,  276,  277,
+  278,  279,   -1,   -1,   -1,   -1,   -1,  285,   -1,  287,
+  288,  289,  290,  291,  292,   -1,   -1,  295,   -1,   -1,
+   -1,  299,  300,   -1,  302,  303,  304,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  314,   -1,  316,   -1,
+  318,  319,   -1,   -1,  322,   -1,  324,  325,  326,  327,
+  328,  329,  330,  331,  332,  333,  334,  335,   -1,  337,
+   -1,   -1,  340,  341,   -1,   -1,  344,  345,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  359,  360,  361,  362,  363,   -1,   -1,   -1,  367,
+   -1,   -1,   -1,  371,   -1,   -1,   -1,   -1,  376,  377,
+  378,  379,  380,   -1,   -1,   -1,  384,   -1,  386,   -1,
+   -1,   -1,   -1,   -1,  392,  393,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  256,   -1,   -1,   -1,  417,
+  418,  419,  420,  264,  265,  266,  267,   -1,   -1,  270,
+  271,   -1,  273,  274,  275,  276,  277,  278,  279,   -1,
+   -1,   -1,   -1,   -1,  285,   -1,  287,  288,  289,  290,
+  291,  292,   -1,   -1,  295,   -1,   -1,   -1,  299,  300,
+   -1,  302,  303,  304,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  314,   -1,  316,   -1,  318,  319,   -1,
+   -1,  322,   -1,  324,  325,  326,  327,  328,  329,  330,
+  331,  332,  333,  334,  335,   -1,  337,   -1,   -1,  340,
+  341,   -1,   -1,  344,  345,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  359,  360,
+  361,  362,  363,   -1,   -1,   -1,  367,   -1,   -1,   -1,
+  371,   -1,   -1,   -1,   -1,  376,  377,  378,  379,  380,
+   -1,   -1,   -1,  384,   -1,  386,   -1,   -1,   -1,   -1,
+   -1,  392,  393,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  256,   -1,   -1,   -1,  417,  418,  419,  420,
+  264,  265,  266,  267,   -1,   -1,  270,  271,   -1,  273,
+  274,  275,  276,  277,  278,  279,   -1,   -1,   -1,   -1,
+   -1,  285,   -1,  287,  288,  289,  290,  291,  292,   -1,
+   -1,  295,   -1,   -1,   -1,  299,  300,   -1,  302,  303,
+  304,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  314,   -1,  316,   -1,  318,  319,   -1,   -1,  322,   -1,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+  334,  335,   -1,  337,   -1,   -1,  340,  341,   -1,   -1,
+  344,  345,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  359,  360,  361,  362,  363,
+   -1,   -1,   -1,  367,   -1,   -1,   -1,  371,   -1,   -1,
+   -1,   -1,  376,  377,  378,  379,  380,   -1,   -1,   -1,
+  384,   -1,  386,   -1,   -1,   -1,   -1,   -1,  392,  393,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  256,
+   -1,   -1,   -1,  417,  418,  419,  420,  264,  265,   -1,
+  267,   -1,   -1,  270,  271,   -1,   -1,   -1,  275,  276,
+  277,   -1,  279,   -1,   -1,  265,   -1,  267,  285,   -1,
+  270,  288,   -1,   -1,   -1,  275,   -1,   -1,  295,  279,
+   -1,   -1,   -1,  300,   -1,  302,  303,  304,  288,  306,
+   -1,   -1,   -1,   -1,   -1,  295,  313,   -1,   -1,  316,
+  300,  318,  319,   -1,  304,  322,   -1,   -1,  325,   -1,
+  327,   -1,  329,  330,  331,  332,  316,  334,  318,   -1,
+   -1,   -1,  322,   -1,  341,   -1,   -1,  344,  345,   -1,
+  330,  331,   -1,   -1,  334,   -1,   -1,  337,   -1,   -1,
    -1,   -1,  359,  360,  361,  362,  363,   -1,   -1,   -1,
-  367,   -1,   -1,   -1,  371,   -1,   -1,   -1,   -1,  376,
+   -1,   -1,   -1,   -1,  371,   -1,   -1,  374,   -1,   -1,
   377,  378,  379,  380,   -1,   -1,   -1,  384,   -1,  386,
-   -1,   -1,   -1,   -1,   -1,  392,  393,   -1,   -1,   -1,
+   -1,   -1,  372,   -1,   -1,  392,  393,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,  256,   -1,   -1,   -1,
-  417,  418,  419,  420,  264,  265,  266,  267,   -1,   -1,
-  270,  271,   -1,  273,  274,  275,  276,  277,  278,  279,
-   -1,   -1,   -1,   -1,   -1,  285,   -1,  287,  288,  289,
-  290,  291,  292,   -1,   -1,  295,   -1,   -1,   -1,  299,
-  300,   -1,  302,  303,  304,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  314,   -1,  316,   -1,  318,  319,
-   -1,   -1,  322,   -1,  324,  325,  326,  327,  328,  329,
-  330,  331,  332,  333,  334,  335,   -1,  337,   -1,   -1,
-  340,  341,   -1,   -1,  344,  345,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  359,
-  360,  361,  362,  363,   -1,   -1,   -1,  367,   -1,   -1,
-   -1,  371,   -1,   -1,   -1,   -1,  376,  377,  378,  379,
-  380,   -1,   -1,   -1,  384,   -1,  386,   -1,   -1,   -1,
+  417,  418,  419,  420,  264,  265,   -1,  267,   -1,   -1,
+  270,  271,   -1,   -1,   -1,  275,  276,  277,  418,  279,
+   -1,   -1,  265,   -1,  267,  285,   -1,  270,  288,   -1,
+   -1,   -1,  275,   -1,   -1,  295,  279,   -1,   -1,   -1,
+  300,   -1,  302,  303,  304,  288,   -1,   -1,   -1,   -1,
+   -1,   -1,  295,   -1,   -1,   -1,  316,  300,  318,  319,
+   -1,  304,  322,   -1,   -1,  325,   -1,  327,   -1,  329,
+  330,  331,  332,  316,  334,  318,   -1,   -1,   -1,  322,
+   -1,  341,   -1,   -1,  344,  345,   -1,  330,  331,   -1,
+   -1,  334,   -1,   -1,  337,   -1,   -1,   -1,   -1,  359,
+  360,  361,  362,  363,   -1,   -1,   -1,  367,  368,   -1,
+   -1,  371,   -1,   -1,   -1,   -1,   -1,  377,  378,  379,
+  380,   -1,   -1,   -1,  384,   -1,  386,  370,   -1,   -1,
    -1,   -1,  392,  393,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,  256,   -1,   -1,   -1,  417,  418,  419,
-  420,  264,  265,  266,  267,   -1,   -1,  270,  271,   -1,
-  273,  274,  275,  276,  277,  278,  279,   -1,   -1,   -1,
-   -1,   -1,  285,   -1,  287,  288,  289,  290,  291,  292,
-   -1,   -1,  295,   -1,   -1,   -1,  299,  300,   -1,  302,
-  303,  304,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  314,   -1,  316,   -1,  318,  319,   -1,   -1,  322,
-   -1,  324,  325,  326,  327,  328,  329,  330,  331,  332,
-  333,  334,  335,   -1,  337,   -1,   -1,  340,  341,   -1,
-   -1,  344,  345,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  359,  360,  361,  362,
-  363,   -1,   -1,   -1,  367,   -1,   -1,   -1,  371,   -1,
-   -1,   -1,   -1,  376,  377,  378,  379,  380,   -1,   -1,
+  420,  264,  265,   -1,  267,   -1,   -1,  270,  271,   -1,
+   -1,   -1,  275,  276,  277,  418,  279,   -1,   -1,  265,
+   -1,  267,  285,   -1,  270,  288,   -1,   -1,   -1,  275,
+   -1,   -1,  295,  279,   -1,   -1,   -1,  300,   -1,  302,
+  303,  304,  288,  306,   -1,   -1,   -1,   -1,   -1,  295,
+  313,   -1,   -1,  316,  300,  318,  319,   -1,  304,  322,
+   -1,   -1,  325,   -1,  327,   -1,  329,  330,  331,  332,
+  316,  334,  318,   -1,   -1,   -1,  322,   -1,  341,   -1,
+   -1,  344,  345,   -1,  330,  331,   -1,   -1,  334,   -1,
+   -1,  337,   -1,   -1,   -1,   -1,  359,  360,  361,  362,
+  363,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  371,   -1,
+   -1,   -1,   -1,   -1,  377,  378,  379,  380,   -1,   -1,
    -1,  384,   -1,  386,   -1,   -1,   -1,   -1,   -1,  392,
   393,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
   256,   -1,   -1,   -1,  417,  418,  419,  420,  264,  265,
-  266,  267,   -1,   -1,  270,  271,   -1,  273,  274,  275,
-  276,  277,  278,  279,   -1,   -1,   -1,   -1,   -1,  285,
-   -1,  287,  288,  289,  290,  291,  292,   -1,   -1,  295,
-   -1,   -1,   -1,  299,  300,   -1,  302,  303,  304,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  314,   -1,
-  316,   -1,  318,  319,   -1,   -1,  322,   -1,  324,  325,
-  326,  327,  328,  329,  330,  331,  332,  333,  334,  335,
-   -1,  337,   -1,   -1,  340,  341,   -1,   -1,  344,  345,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  267,   -1,   -1,  270,  271,   -1,   -1,   -1,  275,
+  276,  277,  418,  279,   -1,   -1,  265,   -1,  267,  285,
+   -1,  270,  288,   -1,   -1,   -1,  275,   -1,   -1,  295,
+  279,   -1,   -1,   -1,  300,   -1,  302,  303,  304,  288,
+   -1,   -1,   -1,   -1,   -1,   -1,  295,   -1,   -1,   -1,
+  316,  300,  318,  319,  320,  304,  322,   -1,   -1,  325,
+   -1,  327,   -1,  329,  330,  331,  332,  316,  334,  318,
+   -1,   -1,   -1,  322,   -1,  341,   -1,   -1,  344,  345,
+   -1,  330,  331,   -1,   -1,  334,   -1,   -1,  337,   -1,
    -1,   -1,   -1,  359,  360,  361,  362,  363,   -1,   -1,
    -1,  367,   -1,   -1,   -1,  371,   -1,   -1,   -1,   -1,
-  376,  377,  378,  379,  380,   -1,   -1,   -1,  384,   -1,
+   -1,  377,  378,  379,  380,   -1,   -1,   -1,  384,   -1,
   386,   -1,   -1,   -1,   -1,   -1,  392,  393,   -1,   -1,
+   -1,   -1,   -1,   -1,  264,  265,   -1,  267,   -1,   -1,
+  270,  271,   -1,   -1,   -1,  275,  276,  277,   -1,  279,
+   -1,  417,  418,  419,  420,  285,   -1,   -1,  288,   -1,
+   -1,   -1,   -1,   -1,   -1,  295,   -1,   -1,   -1,  418,
+  300,   -1,  302,  303,  304,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  316,   -1,  318,  319,
+   -1,   -1,  322,   -1,   -1,  325,   -1,  327,   -1,  329,
+  330,  331,  332,   -1,  334,   -1,   -1,   -1,   -1,   -1,
+   -1,  341,   -1,   -1,  344,  345,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  359,
+  360,  361,  362,  363,   -1,   -1,   -1,  367,  368,   -1,
+   -1,  371,   -1,   -1,   -1,   -1,   -1,  377,  378,  379,
+  380,   -1,   -1,   -1,  384,   -1,  386,   -1,   -1,   -1,
+   -1,   -1,  392,  393,   -1,   -1,   -1,   -1,   -1,   -1,
+  264,  265,   -1,  267,   -1,   -1,  270,  271,   -1,   -1,
+   -1,  275,  276,  277,   -1,  279,   -1,  417,  418,  419,
+  420,  285,   -1,   -1,  288,   -1,   -1,   -1,  428,   -1,
+   -1,  295,   -1,   -1,   -1,   -1,  300,   -1,  302,  303,
+  304,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  316,   -1,  318,  319,   -1,   -1,  322,   -1,
+   -1,  325,   -1,  327,   -1,  329,  330,  331,  332,   -1,
+  334,   -1,   -1,   -1,   -1,   -1,   -1,  341,   -1,   -1,
+  344,  345,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  359,  360,  361,  362,  363,
+   -1,   -1,   -1,  367,   -1,   -1,   -1,  371,   -1,   -1,
+   -1,   -1,   -1,  377,  378,  379,  380,   -1,   -1,   -1,
+  384,   -1,  386,   -1,   -1,   -1,   -1,   -1,  392,  393,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  256,   -1,   -1,
-   -1,  417,  418,  419,  420,  264,  265,   -1,  267,   -1,
-   -1,  270,  271,   -1,   -1,   -1,  275,  276,  277,   -1,
-  279,   -1,   -1,  265,   -1,  267,  285,   -1,  270,  288,
-   -1,   -1,   -1,  275,   -1,   -1,  295,  279,   -1,   -1,
-   -1,  300,   -1,  302,  303,  304,  288,  306,   -1,   -1,
-   -1,   -1,   -1,  295,  313,   -1,   -1,  316,  300,  318,
-  319,   -1,  304,  322,   -1,   -1,  325,   -1,  327,   -1,
-  329,  330,  331,  332,  316,  334,  318,   -1,   -1,   -1,
-  322,   -1,  341,   -1,   -1,  344,  345,   -1,  330,  331,
-   -1,   -1,  334,   -1,   -1,  337,   -1,   -1,   -1,   -1,
-  359,  360,  361,  362,  363,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  371,   -1,   -1,  374,   -1,   -1,  377,  378,
-  379,  380,   -1,   -1,   -1,  384,   -1,  386,   -1,   -1,
-  372,   -1,   -1,  392,  393,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  256,   -1,   -1,   -1,  417,  418,
-  419,  420,  264,  265,   -1,  267,   -1,   -1,  270,  271,
-   -1,   -1,   -1,  275,  276,  277,  418,  279,   -1,   -1,
-  265,   -1,  267,  285,   -1,  270,  288,   -1,   -1,   -1,
-  275,   -1,   -1,  295,  279,   -1,   -1,   -1,  300,   -1,
-  302,  303,  304,  288,   -1,   -1,   -1,   -1,   -1,   -1,
-  295,   -1,   -1,   -1,  316,  300,  318,  319,   -1,  304,
-  322,   -1,   -1,  325,   -1,  327,   -1,  329,  330,  331,
-  332,  316,  334,  318,   -1,   -1,   -1,  322,   -1,  341,
-   -1,   -1,  344,  345,   -1,  330,  331,   -1,   -1,  334,
-   -1,   -1,  337,   -1,   -1,   -1,   -1,  359,  360,  361,
-  362,  363,   -1,   -1,   -1,  367,  368,   -1,   -1,  371,
-   -1,   -1,   -1,   -1,   -1,  377,  378,  379,  380,   -1,
-   -1,   -1,  384,   -1,  386,  370,   -1,   -1,   -1,   -1,
-  392,  393,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  256,   -1,   -1,   -1,  417,  418,  419,  420,  264,
-  265,   -1,  267,   -1,   -1,  270,  271,   -1,   -1,   -1,
-  275,  276,  277,  418,  279,   -1,   -1,  265,   -1,  267,
+   -1,  256,   -1,  417,  418,  419,  420,   -1,   -1,  264,
+  265,   -1,  267,   -1,  428,  270,  271,   -1,   -1,   -1,
+  275,  276,  277,   -1,  279,   -1,   -1,  265,   -1,  267,
   285,   -1,  270,  288,   -1,   -1,   -1,  275,   -1,   -1,
   295,  279,   -1,   -1,   -1,  300,   -1,  302,  303,  304,
-  288,  306,   -1,   -1,   -1,   -1,   -1,  295,  313,   -1,
+  288,   -1,   -1,   -1,   -1,   -1,   -1,  295,   -1,   -1,
    -1,  316,  300,  318,  319,   -1,  304,  322,   -1,   -1,
   325,   -1,  327,   -1,  329,  330,  331,  332,  316,  334,
   318,   -1,   -1,   -1,  322,   -1,  341,   -1,   -1,  344,
   345,   -1,  330,  331,   -1,   -1,  334,   -1,   -1,  337,
    -1,   -1,   -1,   -1,  359,  360,  361,  362,  363,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  371,   -1,   -1,   -1,
+   -1,   -1,  367,   -1,   -1,   -1,  371,   -1,   -1,   -1,
    -1,   -1,  377,  378,  379,  380,   -1,   -1,   -1,  384,
    -1,  386,   -1,   -1,   -1,   -1,   -1,  392,  393,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
@@ -13386,46 +13465,50 @@ void case_1034()
   288,   -1,   -1,   -1,  275,   -1,   -1,  295,  279,   -1,
    -1,   -1,  300,   -1,  302,  303,  304,  288,   -1,   -1,
    -1,   -1,   -1,   -1,  295,   -1,   -1,   -1,  316,  300,
-  318,  319,  320,  304,  322,   -1,   -1,  325,   -1,  327,
+  318,  319,   -1,  304,  322,   -1,   -1,  325,   -1,  327,
    -1,  329,  330,  331,  332,  316,  334,  318,   -1,   -1,
    -1,  322,   -1,  341,   -1,   -1,  344,  345,   -1,  330,
   331,   -1,   -1,  334,   -1,   -1,  337,   -1,   -1,   -1,
-   -1,  359,  360,  361,  362,  363,   -1,   -1,   -1,  367,
-   -1,   -1,   -1,  371,   -1,   -1,   -1,   -1,   -1,  377,
+   -1,  359,  360,  361,  362,  363,   -1,   -1,   -1,   -1,
+  368,   -1,   -1,  371,   -1,   -1,   -1,   -1,   -1,  377,
   378,  379,  380,   -1,   -1,   -1,  384,   -1,  386,   -1,
    -1,   -1,   -1,   -1,  392,  393,   -1,   -1,   -1,   -1,
-   -1,   -1,  264,  265,   -1,  267,   -1,   -1,  270,  271,
-   -1,   -1,   -1,  275,  276,  277,   -1,  279,   -1,  417,
-  418,  419,  420,  285,   -1,   -1,  288,   -1,   -1,   -1,
-   -1,   -1,   -1,  295,   -1,   -1,   -1,  418,  300,   -1,
-  302,  303,  304,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  316,   -1,  318,  319,   -1,   -1,
-  322,   -1,   -1,  325,   -1,  327,   -1,  329,  330,  331,
-  332,   -1,  334,   -1,   -1,   -1,   -1,   -1,   -1,  341,
-   -1,   -1,  344,  345,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  359,  360,  361,
-  362,  363,   -1,   -1,   -1,  367,  368,   -1,   -1,  371,
-   -1,   -1,   -1,   -1,   -1,  377,  378,  379,  380,   -1,
-   -1,   -1,  384,   -1,  386,   -1,   -1,   -1,   -1,   -1,
-  392,  393,   -1,   -1,   -1,   -1,   -1,   -1,  264,  265,
-   -1,  267,   -1,   -1,  270,  271,   -1,   -1,   -1,  275,
-  276,  277,   -1,  279,   -1,  417,  418,  419,  420,  285,
-   -1,   -1,  288,   -1,   -1,   -1,  428,   -1,   -1,  295,
-   -1,   -1,   -1,   -1,  300,   -1,  302,  303,  304,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  316,   -1,  318,  319,   -1,   -1,  322,   -1,   -1,  325,
-   -1,  327,   -1,  329,  330,  331,  332,   -1,  334,   -1,
-   -1,   -1,   -1,   -1,   -1,  341,   -1,   -1,  344,  345,
+   -1,   -1,   -1,   -1,   -1,  256,   -1,   -1,   -1,  417,
+  418,  419,  420,  264,  265,   -1,  267,   -1,   -1,  270,
+  271,   -1,   -1,   -1,  275,  276,  277,  418,  279,   -1,
+   -1,  265,   -1,  267,  285,   -1,  270,  288,   -1,   -1,
+   -1,  275,   -1,   -1,  295,  279,   -1,   -1,   -1,  300,
+   -1,  302,  303,  304,  288,   -1,   -1,   -1,   -1,   -1,
+   -1,  295,   -1,   -1,   -1,  316,  300,  318,  319,   -1,
+  304,  322,   -1,   -1,  325,   -1,  327,   -1,  329,  330,
+  331,  332,  316,  334,  318,   -1,   -1,   -1,  322,   -1,
+  341,   -1,   -1,  344,  345,   -1,  330,  331,   -1,   -1,
+  334,   -1,   -1,  337,   -1,   -1,   -1,   -1,  359,  360,
+  361,  362,  363,   -1,   -1,   -1,   -1,  368,   -1,   -1,
+  371,   -1,   -1,   -1,   -1,   -1,  377,  378,  379,  380,
+   -1,   -1,   -1,  384,   -1,  386,   -1,   -1,   -1,   -1,
+   -1,  392,  393,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  359,  360,  361,  362,  363,   -1,   -1,
-   -1,  367,   -1,   -1,   -1,  371,   -1,   -1,   -1,   -1,
-   -1,  377,  378,  379,  380,   -1,   -1,   -1,  384,   -1,
-  386,   -1,   -1,   -1,   -1,   -1,  392,  393,   -1,   -1,
+   -1,   -1,  256,   -1,   -1,   -1,  417,  418,  419,  420,
+  264,  265,   -1,  267,   -1,   -1,  270,  271,   -1,   -1,
+   -1,  275,  276,  277,  418,  279,   -1,   -1,  265,   -1,
+  267,  285,   -1,  270,  288,   -1,   -1,   -1,  275,   -1,
+   -1,  295,  279,   -1,   -1,   -1,  300,   -1,  302,  303,
+  304,  288,   -1,   -1,   -1,   -1,   -1,   -1,  295,   -1,
+   -1,   -1,  316,  300,  318,  319,   -1,  304,  322,   -1,
+   -1,  325,   -1,  327,   -1,  329,  330,  331,  332,  316,
+  334,  318,   -1,   -1,   -1,  322,   -1,  341,   -1,   -1,
+  344,  345,   -1,  330,  331,   -1,   -1,  334,   -1,   -1,
+  337,   -1,   -1,   -1,   -1,  359,  360,  361,  362,  363,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  371,   -1,   -1,
+   -1,   -1,   -1,  377,  378,  379,  380,   -1,   -1,   -1,
+  384,   -1,  386,   -1,   -1,   -1,   -1,   -1,  392,  393,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  256,
-   -1,  417,  418,  419,  420,   -1,   -1,  264,  265,   -1,
-  267,   -1,  428,  270,  271,   -1,   -1,   -1,  275,  276,
-  277,   -1,  279,   -1,   -1,  265,   -1,  267,  285,   -1,
+   -1,   -1,   -1,  417,  418,  419,  420,  264,  265,   -1,
+  267,   -1,   -1,  270,  271,   -1,   -1,   -1,  275,  276,
+  277,  418,  279,   -1,   -1,  265,   -1,  267,  285,   -1,
   270,  288,   -1,   -1,   -1,  275,   -1,   -1,  295,  279,
    -1,   -1,   -1,  300,   -1,  302,  303,  304,  288,   -1,
    -1,   -1,   -1,   -1,   -1,  295,   -1,   -1,   -1,  316,
@@ -13434,7 +13517,7 @@ void case_1034()
    -1,   -1,  322,   -1,  341,   -1,   -1,  344,  345,   -1,
   330,  331,   -1,   -1,  334,   -1,   -1,  337,   -1,   -1,
    -1,   -1,  359,  360,  361,  362,  363,   -1,   -1,   -1,
-  367,   -1,   -1,   -1,  371,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  371,   -1,   -1,   -1,   -1,   -1,
   377,  378,  379,  380,   -1,   -1,   -1,  384,   -1,  386,
    -1,   -1,   -1,   -1,   -1,  392,  393,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
@@ -13449,37 +13532,37 @@ void case_1034()
   330,  331,  332,  316,  334,  318,   -1,   -1,   -1,  322,
    -1,  341,   -1,   -1,  344,  345,   -1,  330,  331,   -1,
    -1,  334,   -1,   -1,  337,   -1,   -1,   -1,   -1,  359,
-  360,  361,  362,  363,   -1,   -1,   -1,   -1,  368,   -1,
+  360,  361,  362,  363,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,  371,   -1,   -1,   -1,   -1,   -1,  377,  378,  379,
   380,   -1,   -1,   -1,  384,   -1,  386,   -1,   -1,   -1,
    -1,   -1,  392,  393,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,  256,   -1,   -1,   -1,  417,  418,  419,
   420,  264,  265,   -1,  267,   -1,   -1,  270,  271,   -1,
-   -1,   -1,  275,  276,  277,  418,  279,   -1,   -1,  265,
-   -1,  267,  285,   -1,  270,  288,   -1,   -1,   -1,  275,
-   -1,   -1,  295,  279,   -1,   -1,   -1,  300,   -1,  302,
-  303,  304,  288,   -1,   -1,   -1,   -1,   -1,   -1,  295,
-   -1,   -1,   -1,  316,  300,  318,  319,   -1,  304,  322,
+   -1,   -1,  275,  276,  277,  418,  279,   -1,   -1,   -1,
+   -1,   -1,  285,   -1,   -1,  288,   -1,   -1,   -1,   -1,
+   -1,   -1,  295,   -1,   -1,   -1,   -1,  300,   -1,  302,
+  303,  304,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  316,   -1,  318,  319,   -1,   -1,  322,
    -1,   -1,  325,   -1,  327,   -1,  329,  330,  331,  332,
-  316,  334,  318,   -1,   -1,   -1,  322,   -1,  341,   -1,
-   -1,  344,  345,   -1,  330,  331,   -1,   -1,  334,   -1,
-   -1,  337,   -1,   -1,   -1,   -1,  359,  360,  361,  362,
-  363,   -1,   -1,   -1,   -1,  368,   -1,   -1,  371,   -1,
+   -1,  334,   -1,   -1,   -1,   -1,   -1,   -1,  341,   -1,
+   -1,  344,  345,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  359,  360,  361,  362,
+  363,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  371,   -1,
    -1,   -1,   -1,   -1,  377,  378,  379,  380,   -1,   -1,
    -1,  384,   -1,  386,   -1,   -1,   -1,   -1,   -1,  392,
   393,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
   256,   -1,   -1,   -1,  417,  418,  419,  420,  264,  265,
    -1,  267,   -1,   -1,  270,  271,   -1,   -1,   -1,  275,
-  276,  277,  418,  279,   -1,   -1,  265,   -1,  267,  285,
-   -1,  270,  288,   -1,   -1,   -1,  275,   -1,   -1,  295,
-  279,   -1,   -1,   -1,  300,   -1,  302,  303,  304,  288,
-   -1,   -1,   -1,   -1,   -1,   -1,  295,   -1,   -1,   -1,
-  316,  300,  318,  319,   -1,  304,  322,   -1,   -1,  325,
-   -1,  327,   -1,  329,  330,  331,  332,  316,  334,  318,
-   -1,   -1,   -1,  322,   -1,  341,   -1,   -1,  344,  345,
-   -1,  330,  331,   -1,   -1,  334,   -1,   -1,  337,   -1,
+  276,  277,   -1,  279,   -1,   -1,   -1,   -1,   -1,  285,
+   -1,   -1,  288,   -1,   -1,   -1,   -1,   -1,   -1,  295,
+   -1,   -1,   -1,   -1,  300,   -1,  302,  303,  304,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  316,   -1,  318,  319,   -1,   -1,  322,   -1,   -1,  325,
+   -1,  327,   -1,  329,  330,  331,  332,   -1,  334,   -1,
+   -1,   -1,   -1,   -1,   -1,  341,   -1,   -1,  344,  345,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,  359,  360,  361,  362,  363,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,  371,   -1,   -1,   -1,   -1,
    -1,  377,  378,  379,  380,   -1,   -1,   -1,  384,   -1,
@@ -13487,15 +13570,15 @@ void case_1034()
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,  256,   -1,   -1,
    -1,  417,  418,  419,  420,  264,  265,   -1,  267,   -1,
-   -1,  270,  271,   -1,   -1,   -1,  275,  276,  277,  418,
-  279,   -1,   -1,  265,   -1,  267,  285,   -1,  270,  288,
-   -1,   -1,   -1,  275,   -1,   -1,  295,  279,   -1,   -1,
-   -1,  300,   -1,  302,  303,  304,  288,   -1,   -1,   -1,
-   -1,   -1,   -1,  295,   -1,   -1,   -1,  316,  300,  318,
-  319,   -1,  304,  322,   -1,   -1,  325,   -1,  327,   -1,
-  329,  330,  331,  332,  316,  334,  318,   -1,   -1,   -1,
-  322,   -1,  341,   -1,   -1,  344,  345,   -1,  330,  331,
-   -1,   -1,  334,   -1,   -1,  337,   -1,   -1,   -1,   -1,
+   -1,  270,  271,   -1,   -1,   -1,  275,  276,  277,   -1,
+  279,   -1,   -1,   -1,   -1,   -1,  285,   -1,   -1,  288,
+   -1,   -1,   -1,   -1,   -1,   -1,  295,   -1,   -1,   -1,
+   -1,  300,   -1,  302,  303,  304,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  316,   -1,  318,
+  319,   -1,   -1,  322,   -1,   -1,  325,   -1,  327,   -1,
+  329,  330,  331,  332,   -1,  334,   -1,   -1,   -1,   -1,
+   -1,   -1,  341,   -1,   -1,  344,  345,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
   359,  360,  361,  362,  363,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,  371,   -1,   -1,   -1,   -1,   -1,  377,  378,
   379,  380,   -1,   -1,   -1,  384,   -1,  386,   -1,   -1,
@@ -13503,15 +13586,15 @@ void case_1034()
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,  256,   -1,   -1,   -1,  417,  418,
   419,  420,  264,  265,   -1,  267,   -1,   -1,  270,  271,
-   -1,   -1,   -1,  275,  276,  277,  418,  279,   -1,   -1,
-  265,   -1,  267,  285,   -1,  270,  288,   -1,   -1,   -1,
-  275,   -1,   -1,  295,  279,   -1,   -1,   -1,  300,   -1,
-  302,  303,  304,  288,   -1,   -1,   -1,   -1,   -1,   -1,
-  295,   -1,   -1,   -1,  316,  300,  318,  319,   -1,  304,
+   -1,   -1,   -1,  275,  276,  277,   -1,  279,   -1,   -1,
+   -1,   -1,   -1,  285,   -1,   -1,  288,   -1,   -1,   -1,
+   -1,   -1,   -1,  295,   -1,   -1,   -1,   -1,  300,   -1,
+  302,  303,  304,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  316,   -1,  318,  319,   -1,   -1,
   322,   -1,   -1,  325,   -1,  327,   -1,  329,  330,  331,
-  332,  316,  334,  318,   -1,   -1,   -1,  322,   -1,  341,
-   -1,   -1,  344,  345,   -1,  330,  331,   -1,   -1,  334,
-   -1,   -1,  337,   -1,   -1,   -1,   -1,  359,  360,  361,
+  332,   -1,  334,   -1,   -1,   -1,   -1,   -1,   -1,  341,
+   -1,   -1,  344,  345,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  359,  360,  361,
   362,  363,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  371,
    -1,   -1,   -1,   -1,   -1,  377,  378,  379,  380,   -1,
    -1,   -1,  384,   -1,  386,   -1,   -1,   -1,   -1,   -1,
@@ -13519,106 +13602,17 @@ void case_1034()
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,  256,   -1,   -1,   -1,  417,  418,  419,  420,  264,
   265,   -1,  267,   -1,   -1,  270,  271,   -1,   -1,   -1,
-  275,  276,  277,  418,  279,   -1,   -1,   -1,   -1,   -1,
-  285,   -1,   -1,  288,   -1,   -1,   -1,   -1,   -1,   -1,
-  295,   -1,   -1,   -1,   -1,  300,   -1,  302,  303,  304,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  316,   -1,  318,  319,   -1,   -1,  322,   -1,   -1,
-  325,   -1,  327,   -1,  329,  330,  331,  332,   -1,  334,
-   -1,   -1,   -1,   -1,   -1,   -1,  341,   -1,   -1,  344,
-  345,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  359,  360,  361,  362,  363,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  371,   -1,   -1,   -1,
-   -1,   -1,  377,  378,  379,  380,   -1,   -1,   -1,  384,
-   -1,  386,   -1,   -1,   -1,   -1,   -1,  392,  393,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  256,   -1,
-   -1,   -1,  417,  418,  419,  420,  264,  265,   -1,  267,
-   -1,   -1,  270,  271,   -1,   -1,   -1,  275,  276,  277,
-   -1,  279,   -1,   -1,   -1,   -1,   -1,  285,   -1,   -1,
-  288,   -1,   -1,   -1,   -1,   -1,   -1,  295,   -1,   -1,
-   -1,   -1,  300,   -1,  302,  303,  304,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  316,   -1,
-  318,  319,   -1,   -1,  322,   -1,   -1,  325,   -1,  327,
-   -1,  329,  330,  331,  332,   -1,  334,   -1,   -1,   -1,
-   -1,   -1,   -1,  341,   -1,   -1,  344,  345,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  359,  360,  361,  362,  363,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  371,   -1,   -1,   -1,   -1,   -1,  377,
-  378,  379,  380,   -1,   -1,   -1,  384,   -1,  386,   -1,
-   -1,   -1,   -1,   -1,  392,  393,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  256,   -1,   -1,   -1,  417,
-  418,  419,  420,  264,  265,   -1,  267,   -1,   -1,  270,
-  271,   -1,   -1,   -1,  275,  276,  277,   -1,  279,   -1,
-   -1,   -1,   -1,   -1,  285,   -1,   -1,  288,   -1,   -1,
-   -1,   -1,   -1,   -1,  295,   -1,   -1,   -1,   -1,  300,
-   -1,  302,  303,  304,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  316,   -1,  318,  319,   -1,
-   -1,  322,   -1,   -1,  325,   -1,  327,   -1,  329,  330,
-  331,  332,   -1,  334,   -1,   -1,   -1,   -1,   -1,   -1,
-  341,   -1,   -1,  344,  345,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  359,  360,
-  361,  362,  363,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  371,   -1,   -1,   -1,   -1,   -1,  377,  378,  379,  380,
-   -1,   -1,   -1,  384,   -1,  386,   -1,   -1,   -1,   -1,
-   -1,  392,  393,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  256,   -1,   -1,   -1,  417,  418,  419,  420,
-  264,  265,   -1,  267,   -1,   -1,  270,  271,   -1,   -1,
-   -1,  275,  276,  277,   -1,  279,   -1,   -1,   -1,   -1,
-   -1,  285,   -1,   -1,  288,   -1,   -1,   -1,   -1,   -1,
-   -1,  295,   -1,   -1,   -1,   -1,  300,   -1,  302,  303,
-  304,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  316,   -1,  318,  319,   -1,   -1,  322,   -1,
-   -1,  325,   -1,  327,   -1,  329,  330,  331,  332,   -1,
-  334,   -1,   -1,   -1,   -1,   -1,   -1,  341,   -1,   -1,
-  344,  345,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  359,  360,  361,  362,  363,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  371,   -1,   -1,
-   -1,   -1,   -1,  377,  378,  379,  380,   -1,   -1,   -1,
-  384,   -1,  386,   -1,   -1,   -1,   -1,   -1,  392,  393,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  256,
-   -1,   -1,   -1,  417,  418,  419,  420,  264,  265,   -1,
-  267,   -1,   -1,  270,  271,   -1,   -1,   -1,  275,  276,
-  277,   -1,  279,   -1,   -1,   -1,   -1,   -1,  285,   -1,
-   -1,  288,   -1,   -1,   -1,   -1,   -1,   -1,  295,   -1,
-   -1,   -1,   -1,  300,   -1,  302,  303,  304,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  316,
-   -1,  318,  319,   -1,   -1,  322,   -1,   -1,  325,   -1,
-  327,   -1,  329,  330,  331,  332,   -1,  334,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  343,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  359,  360,  361,  362,  363,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  371,   -1,   -1,   -1,   -1,   -1,
-  377,  378,  379,  380,  381,   -1,   -1,  384,   -1,  386,
-  256,   -1,   -1,   -1,   -1,  392,  393,   -1,  264,  265,
-   -1,  267,   -1,   -1,  270,  271,   -1,   -1,   -1,  275,
-  276,  277,   -1,  279,   -1,   -1,   -1,   -1,   -1,  285,
-  417,  418,  288,  420,   -1,   -1,   -1,   -1,   -1,  295,
-   -1,   -1,   -1,   -1,  300,   -1,  302,  303,  304,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  316,   -1,  318,  319,   -1,   -1,  322,   -1,   -1,  325,
-   -1,  327,   -1,  329,  330,  331,  332,   -1,  334,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  343,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  359,  360,  361,  362,  363,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  371,   -1,   -1,   -1,   -1,
-   -1,  377,  378,  379,  380,   -1,   -1,   -1,  384,   -1,
-  386,  256,   -1,   -1,   -1,   -1,  392,  393,   -1,  264,
-  265,   -1,  267,   -1,   -1,  270,  271,   -1,   -1,   -1,
   275,  276,  277,   -1,  279,   -1,   -1,   -1,   -1,   -1,
-  285,  417,  418,  288,  420,   -1,   -1,   -1,   -1,   -1,
+  285,   -1,   -1,  288,   -1,   -1,   -1,   -1,   -1,   -1,
   295,   -1,   -1,   -1,   -1,  300,   -1,  302,  303,  304,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,  316,   -1,  318,  319,   -1,   -1,  322,   -1,   -1,
   325,   -1,  327,   -1,  329,  330,  331,  332,   -1,  334,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  343,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,  359,  360,  361,  362,  363,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,  371,   -1,   -1,   -1,
-   -1,   -1,  377,  378,  379,  380,   -1,   -1,   -1,  384,
+   -1,   -1,  377,  378,  379,  380,  381,   -1,   -1,  384,
    -1,  386,  256,   -1,   -1,   -1,   -1,  392,  393,   -1,
   264,  265,   -1,  267,   -1,   -1,  270,  271,   -1,   -1,
    -1,  275,  276,  277,   -1,  279,   -1,   -1,   -1,   -1,
@@ -13627,7 +13621,7 @@ void case_1034()
   304,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,  316,   -1,  318,  319,   -1,   -1,  322,   -1,
    -1,  325,   -1,  327,   -1,  329,  330,  331,  332,   -1,
-  334,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  334,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  343,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,  359,  360,  361,  362,  363,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,  371,   -1,   -1,
@@ -13973,117 +13967,138 @@ void case_1034()
    -1,  359,  360,  361,  362,  363,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,  371,   -1,   -1,   -1,   -1,   -1,  377,
   378,  379,  380,   -1,   -1,   -1,  384,   -1,  386,  256,
-   -1,   -1,   -1,   -1,  392,  393,  262,  264,  265,   -1,
+   -1,   -1,   -1,   -1,  392,  393,   -1,  264,  265,   -1,
   267,   -1,   -1,  270,  271,   -1,   -1,   -1,  275,  276,
   277,   -1,  279,   -1,   -1,   -1,   -1,   -1,  285,  417,
   418,  288,  420,   -1,   -1,   -1,   -1,   -1,  295,   -1,
-   -1,   -1,  298,  300,   -1,  302,  303,  304,   -1,   -1,
+   -1,   -1,   -1,  300,   -1,  302,  303,  304,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  316,
    -1,  318,  319,   -1,   -1,  322,   -1,   -1,  325,   -1,
   327,   -1,  329,  330,  331,  332,   -1,  334,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,  359,  360,  361,  362,  363,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  371,  371,  372,  373,  374,  375,
-   -1,   -1,  378,  379,   -1,   -1,  382,  383,  384,  385,
-  386,  387,  388,  389,  390,   -1,  392,  393,  394,  395,
-  396,  397,  398,  399,  400,  401,  402,  403,  404,  405,
-  406,  407,  408,  409,  410,  411,  412,  413,   -1,   -1,
-  417,  418,   -1,   -1,  420,   -1,  261,  423,  263,   -1,
-  265,   -1,  267,   -1,   -1,  270,   -1,  272,  273,   -1,
-  275,   -1,  277,   -1,  279,   -1,  281,  282,  283,  284,
-   -1,   -1,  287,  288,   -1,   -1,   -1,   -1,  293,  294,
-  295,  296,  297,   -1,   -1,  300,   -1,  302,   -1,  304,
-   -1,  306,  307,   -1,  309,  310,  311,  312,   -1,   -1,
-  315,  316,  317,  318,   -1,   -1,  321,  322,  323,   -1,
-   -1,   -1,   -1,   -1,   -1,  330,  331,   -1,  333,  334,
-   -1,  336,  337,  338,   -1,   -1,   -1,  342,   -1,   -1,
+   -1,   -1,   -1,   -1,  371,   -1,   -1,   -1,   -1,   -1,
+  377,  378,  379,  380,   -1,   -1,   -1,  384,   -1,  386,
+  256,   -1,   -1,   -1,   -1,  392,  393,   -1,  264,  265,
+   -1,  267,   -1,   -1,  270,  271,   -1,   -1,   -1,  275,
+  276,  277,   -1,  279,   -1,   -1,   -1,   -1,   -1,  285,
+  417,  418,  288,  420,   -1,   -1,   -1,   -1,   -1,  295,
+   -1,   -1,   -1,   -1,  300,   -1,  302,  303,  304,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  316,   -1,  318,  319,   -1,   -1,  322,   -1,   -1,  325,
+   -1,  327,   -1,  329,  330,  331,  332,   -1,  334,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  359,  360,  361,  362,  363,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  371,   -1,   -1,   -1,   -1,
+   -1,  377,  378,  379,  380,   -1,   -1,   -1,  384,   -1,
+  386,  256,   -1,   -1,   -1,   -1,  392,  393,  262,  264,
+  265,   -1,  267,   -1,   -1,  270,  271,   -1,   -1,   -1,
+  275,  276,  277,   -1,  279,   -1,   -1,   -1,   -1,   -1,
+  285,  417,  418,  288,  420,   -1,   -1,   -1,   -1,   -1,
+  295,   -1,   -1,   -1,  298,  300,   -1,  302,  303,  304,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  316,   -1,  318,  319,   -1,   -1,  322,   -1,   -1,
+  325,   -1,  327,   -1,  329,  330,  331,  332,   -1,  334,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  362,   -1,  364,
-  365,  261,   -1,   -1,   -1,  265,   -1,  267,   -1,   -1,
-  270,   -1,  272,  273,   -1,  275,   -1,  277,   -1,  279,
+   -1,   -1,   -1,   -1,  359,  360,  361,  362,  363,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  371,  371,  372,  373,
+  374,  375,   -1,   -1,  378,  379,   -1,   -1,  382,  383,
+  384,  385,  386,  387,  388,  389,  390,   -1,  392,  393,
+  394,  395,  396,  397,  398,  399,  400,  401,  402,  403,
+  404,  405,  406,  407,  408,  409,  410,  411,  412,  413,
+   -1,   -1,  417,  418,   -1,   -1,  420,   -1,  261,  423,
+  263,   -1,  265,   -1,  267,   -1,   -1,  270,   -1,  272,
+  273,   -1,  275,   -1,  277,   -1,  279,   -1,  281,  282,
+  283,  284,   -1,   -1,  287,  288,   -1,   -1,   -1,   -1,
+  293,  294,  295,  296,  297,   -1,   -1,  300,   -1,  302,
+   -1,  304,   -1,  306,  307,   -1,  309,  310,  311,  312,
+   -1,   -1,  315,  316,  317,  318,   -1,   -1,  321,  322,
+  323,   -1,   -1,   -1,   -1,   -1,   -1,  330,  331,   -1,
+  333,  334,   -1,  336,  337,  338,   -1,   -1,   -1,  342,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  362,
+   -1,  364,  365,  261,   -1,   -1,   -1,  265,   -1,  267,
+   -1,   -1,  270,   -1,  272,  273,   -1,  275,   -1,  277,
+   -1,  279,   -1,  281,  282,  283,  284,   -1,   -1,  287,
+  288,   -1,   -1,   -1,   -1,  293,   -1,  295,  296,  297,
+   -1,   -1,  300,   -1,  302,   -1,  304,   -1,   -1,  307,
+   -1,  309,  310,  311,  312,  418,   -1,   -1,  316,  317,
+  318,   -1,   -1,  321,  322,  323,   -1,   -1,   -1,   -1,
+   -1,   -1,  330,  331,   -1,  333,  334,   -1,  336,  337,
+  338,   -1,   -1,   -1,  342,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  261,   -1,  362,   -1,  265,   -1,  267,   -1,
+  368,  270,   -1,  272,  273,   -1,  275,   -1,  277,  377,
+  279,   -1,  281,  282,  283,  284,   -1,   -1,  287,  288,
+   -1,   -1,   -1,   -1,  293,   -1,  295,  296,  297,   -1,
+   -1,  300,   -1,  302,   -1,  304,   -1,   -1,  307,   -1,
+  309,  310,  311,  312,   -1,   -1,   -1,  316,  317,  318,
+  418,   -1,  321,  322,  323,   -1,   -1,   -1,   -1,   -1,
+   -1,  330,  331,   -1,  333,  334,   -1,  336,  337,  338,
+   -1,   -1,   -1,  342,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  261,   -1,  362,   -1,  265,   -1,  267,   -1,  368,
+  270,   -1,  272,  273,   -1,  275,   -1,  277,  377,  279,
    -1,  281,  282,  283,  284,   -1,   -1,  287,  288,   -1,
    -1,   -1,   -1,  293,   -1,  295,  296,  297,   -1,   -1,
   300,   -1,  302,   -1,  304,   -1,   -1,  307,   -1,  309,
-  310,  311,  312,  418,   -1,   -1,  316,  317,  318,   -1,
+  310,  311,  312,   -1,   -1,   -1,  316,  317,  318,  418,
    -1,  321,  322,  323,   -1,   -1,   -1,   -1,   -1,   -1,
   330,  331,   -1,  333,  334,   -1,  336,  337,  338,   -1,
-   -1,   -1,  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  342,   -1,   -1,   -1,   -1,  261,   -1,   -1,
+   -1,  265,   -1,  267,   -1,   -1,  270,   -1,  272,  273,
+   -1,  275,  362,  277,   -1,  279,   -1,  281,  282,  283,
+  284,   -1,   -1,  287,  288,   -1,   -1,  377,   -1,  293,
+   -1,  295,  296,  297,   -1,   -1,  300,   -1,  302,   -1,
+  304,   -1,   -1,  307,   -1,  309,  310,  311,  312,   -1,
+   -1,   -1,  316,  317,  318,   -1,   -1,  321,  322,  323,
+   -1,   -1,   -1,   -1,   -1,   -1,  330,  331,  418,  333,
+  334,   -1,  336,  337,  338,   -1,   -1,   -1,  342,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  261,   -1,  362,   -1,  265,   -1,  267,   -1,  368,  270,
-   -1,  272,  273,   -1,  275,   -1,  277,  377,  279,   -1,
-  281,  282,  283,  284,   -1,   -1,  287,  288,   -1,   -1,
-   -1,   -1,  293,   -1,  295,  296,  297,   -1,   -1,  300,
-   -1,  302,   -1,  304,   -1,   -1,  307,   -1,  309,  310,
-  311,  312,   -1,   -1,   -1,  316,  317,  318,  418,   -1,
-  321,  322,  323,   -1,   -1,   -1,   -1,   -1,   -1,  330,
-  331,   -1,  333,  334,   -1,  336,  337,  338,   -1,   -1,
-   -1,  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  261,
-   -1,  362,   -1,  265,   -1,  267,   -1,  368,  270,   -1,
-  272,  273,   -1,  275,   -1,  277,  377,  279,   -1,  281,
-  282,  283,  284,   -1,   -1,  287,  288,   -1,   -1,   -1,
-   -1,  293,   -1,  295,  296,  297,   -1,   -1,  300,   -1,
-  302,   -1,  304,   -1,   -1,  307,   -1,  309,  310,  311,
-  312,   -1,   -1,   -1,  316,  317,  318,  418,   -1,  321,
-  322,  323,   -1,   -1,   -1,   -1,   -1,   -1,  330,  331,
-   -1,  333,  334,   -1,  336,  337,  338,   -1,   -1,   -1,
-  342,   -1,   -1,   -1,   -1,  261,   -1,   -1,   -1,  265,
-   -1,  267,   -1,   -1,  270,   -1,  272,  273,   -1,  275,
-  362,  277,   -1,  279,   -1,  281,  282,  283,  284,   -1,
-   -1,  287,  288,   -1,   -1,  377,   -1,  293,   -1,  295,
-  296,  297,   -1,   -1,  300,   -1,  302,   -1,  304,   -1,
-   -1,  307,   -1,  309,  310,  311,  312,   -1,   -1,   -1,
-  316,  317,  318,   -1,   -1,  321,  322,  323,   -1,   -1,
-   -1,   -1,   -1,   -1,  330,  331,  418,  333,  334,   -1,
-  336,  337,  338,   -1,   -1,   -1,  342,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  261,
-   -1,   -1,   -1,  265,   -1,  267,  362,   -1,  270,   -1,
-  272,  273,  368,  275,   -1,  277,   -1,  279,   -1,  281,
-  282,  283,  284,   -1,   -1,  287,  288,   -1,   -1,   -1,
-   -1,  293,   -1,  295,  296,  297,   -1,   -1,  300,   -1,
-  302,  261,  304,   -1,   -1,  307,   -1,  309,  310,  311,
-  312,   -1,   -1,   -1,  316,  317,  318,   -1,   -1,  321,
-  322,  323,  418,   -1,  284,   -1,   -1,   -1,  330,  331,
-   -1,  333,  334,   -1,  336,  337,  338,  297,   -1,   -1,
-  342,   -1,  302,   -1,   -1,  305,   -1,  307,   -1,  309,
-  310,  311,  312,   -1,   -1,   -1,   -1,  317,   -1,   -1,
-  362,  321,   -1,   -1,   -1,  325,  368,   -1,   -1,   -1,
-   -1,  261,   -1,  333,   -1,   -1,  336,   -1,  338,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  284,   -1,   -1,  357,   -1,   -1,
-   -1,   -1,  362,   -1,   -1,   -1,   -1,  297,  368,  369,
-   -1,  371,  302,  373,   -1,  305,  418,  307,   -1,  309,
-  310,  311,  312,   -1,   -1,   -1,  386,  317,   -1,   -1,
-   -1,  321,   -1,  261,   -1,  325,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  333,   -1,   -1,  336,   -1,  338,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  284,   -1,  418,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  297,
-   -1,  261,  362,   -1,  302,   -1,   -1,  305,  368,  307,
+   -1,  261,   -1,   -1,   -1,  265,   -1,  267,  362,   -1,
+  270,   -1,  272,  273,  368,  275,   -1,  277,   -1,  279,
+   -1,  281,  282,  283,  284,   -1,   -1,  287,  288,   -1,
+   -1,   -1,   -1,  293,   -1,  295,  296,  297,   -1,   -1,
+  300,   -1,  302,  261,  304,   -1,   -1,  307,   -1,  309,
+  310,  311,  312,   -1,   -1,   -1,  316,  317,  318,   -1,
+   -1,  321,  322,  323,  418,   -1,  284,   -1,   -1,   -1,
+  330,  331,   -1,  333,  334,   -1,  336,  337,  338,  297,
+   -1,   -1,  342,   -1,  302,   -1,   -1,  305,   -1,  307,
    -1,  309,  310,  311,  312,   -1,   -1,   -1,   -1,  317,
-   -1,   -1,   -1,  321,  284,   -1,   -1,  325,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  333,   -1,  297,  336,  261,
-  338,   -1,  302,   -1,   -1,   -1,   -1,  307,   -1,  309,
-  310,  311,  312,   -1,   -1,   -1,   -1,  317,  418,   -1,
-   -1,  321,  284,   -1,  362,  325,   -1,   -1,   -1,   -1,
-  368,   -1,   -1,  333,   -1,  297,  336,  261,  338,   -1,
-  302,   -1,   -1,   -1,   -1,  307,   -1,  309,  310,  311,
-  312,   -1,   -1,   -1,   -1,  317,   -1,   -1,   -1,  321,
-  284,   -1,  362,  325,   -1,   -1,   -1,   -1,  368,   -1,
-   -1,  333,   -1,  297,  336,   -1,  338,   -1,  302,   -1,
-  418,   -1,   -1,  307,   -1,  309,  310,  311,  312,   -1,
-   -1,   -1,   -1,  317,   -1,   -1,   -1,  321,   -1,   -1,
-  362,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  333,
-  264,  265,  336,  267,  338,   -1,  270,  271,  418,   -1,
-   -1,  275,  276,  277,   -1,  279,   -1,   -1,   -1,   -1,
-   -1,  285,   -1,   -1,  288,   -1,   -1,   -1,  362,   -1,
-   -1,  295,   -1,   -1,   -1,   -1,  300,   -1,  302,  303,
-  304,   -1,  306,   -1,   -1,   -1,  418,   -1,   -1,  313,
+   -1,   -1,  362,  321,   -1,   -1,   -1,  325,  368,   -1,
+   -1,   -1,   -1,  261,   -1,  333,   -1,   -1,  336,   -1,
+  338,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  284,   -1,   -1,  357,
+   -1,   -1,   -1,   -1,  362,   -1,   -1,   -1,   -1,  297,
+  368,  369,   -1,  371,  302,  373,   -1,  305,  418,  307,
+   -1,  309,  310,  311,  312,   -1,   -1,   -1,  386,  317,
+   -1,   -1,   -1,  321,   -1,  261,   -1,  325,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  333,   -1,   -1,  336,   -1,
+  338,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  284,   -1,
+  418,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  297,   -1,  261,  362,   -1,  302,   -1,   -1,   -1,
+  368,  307,   -1,  309,  310,  311,  312,   -1,   -1,   -1,
+   -1,  317,   -1,   -1,   -1,  321,  284,   -1,   -1,  325,
+   -1,   -1,   -1,  261,   -1,   -1,   -1,  333,   -1,  297,
+  336,   -1,  338,   -1,  302,   -1,   -1,   -1,   -1,  307,
+   -1,  309,  310,  311,  312,   -1,  284,   -1,   -1,  317,
+  418,   -1,   -1,  321,   -1,   -1,  362,  325,   -1,  297,
+   -1,   -1,  368,   -1,  302,  333,   -1,   -1,  336,  307,
+  338,  309,  310,  311,  312,   -1,   -1,   -1,   -1,  317,
+   -1,   -1,   -1,  321,   -1,   -1,   -1,   -1,   -1,   -1,
+  264,  265,   -1,  267,  362,  333,  270,  271,  336,   -1,
+  338,  275,  276,  277,   -1,  279,   -1,   -1,   -1,   -1,
+   -1,  285,  418,   -1,  288,   -1,   -1,   -1,   -1,   -1,
+   -1,  295,   -1,   -1,  362,   -1,  300,   -1,  302,  303,
+  304,   -1,  306,   -1,   -1,   -1,   -1,   -1,   -1,  313,
    -1,   -1,  316,   -1,  318,  319,   -1,   -1,  322,   -1,
-   -1,  325,   -1,  327,   -1,  329,  330,  331,  332,   -1,
+  418,  325,   -1,  327,   -1,  329,  330,  331,  332,   -1,
   334,   -1,   -1,   -1,   -1,   -1,   -1,  341,   -1,   -1,
-  344,  345,   -1,   -1,  418,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  359,  360,  361,  362,  363,
+  344,  345,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  418,   -1,   -1,   -1,   -1,  359,  360,  361,  362,  363,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,  371,  372,   -1,
   374,   -1,   -1,  377,  378,  379,  380,   -1,   -1,   -1,
   384,   -1,  386,   -1,   -1,   -1,   -1,   -1,  392,  393,
@@ -14272,76 +14287,78 @@ void case_1034()
    -1,  306,  275,  308,   -1,   -1,  279,   -1,  313,   -1,
    -1,  316,   -1,  318,   -1,  288,   -1,  322,   -1,   -1,
   325,   -1,  295,   -1,   -1,  330,  331,  300,   -1,  334,
-   -1,  304,  337,  306,   -1,  308,  265,   -1,  267,   -1,
-  313,  270,  418,  316,   -1,  318,  275,   -1,   -1,  322,
-  279,   -1,  325,   -1,   -1,   -1,   -1,  330,  331,  288,
-   -1,  334,   -1,   -1,  337,   -1,  295,   -1,   -1,   -1,
-   -1,  300,   -1,   -1,   -1,  304,   -1,   -1,   -1,   -1,
-  261,   -1,   -1,   -1,   -1,   -1,   -1,  316,   -1,  318,
-   -1,  272,   -1,  322,   -1,   -1,  277,   -1,   -1,   -1,
-  281,  330,  331,  284,   -1,  334,   -1,   -1,  337,   -1,
-   -1,   -1,   -1,  418,   -1,  296,  297,   -1,   -1,   -1,
-  301,  302,   -1,   -1,   -1,   -1,  307,   -1,  309,  310,
-  311,  312,   -1,   -1,  363,   -1,  317,   -1,   -1,   -1,
-  321,   -1,  323,   -1,   -1,  418,   -1,   -1,   -1,   -1,
-   -1,   -1,  333,   -1,  335,  336,  261,  338,   -1,   -1,
-   -1,  342,   -1,   -1,   -1,   -1,   -1,  272,   -1,   -1,
-   -1,   -1,  277,   -1,   -1,   -1,  281,   -1,   -1,  284,
-   -1,  362,   -1,   -1,   -1,   -1,   -1,  368,  369,  418,
-   -1,  296,  297,   -1,   -1,   -1,  301,  302,  261,   -1,
-  263,   -1,  307,   -1,  309,  310,  311,  312,   -1,   -1,
-   -1,   -1,  317,   -1,   -1,   -1,  321,   -1,  323,   -1,
-   -1,  284,   -1,   -1,   -1,   -1,   -1,   -1,  333,   -1,
-   -1,  336,   -1,  338,  297,   -1,   -1,  342,   -1,  302,
-   -1,   -1,   -1,   -1,  307,   -1,  309,  310,  311,  312,
-   -1,   -1,   -1,   -1,  317,   -1,   -1,  362,  321,   -1,
-   -1,  261,   -1,  368,  369,   -1,   -1,   -1,   -1,   -1,
-  333,   -1,  272,  336,   -1,  338,   -1,  277,   -1,   -1,
-   -1,  281,   -1,   -1,  284,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  296,  297,   -1,  362,
-   -1,  301,  302,   -1,  261,  368,  369,  307,   -1,  309,
-  310,  311,  312,   -1,   -1,  272,   -1,  317,   -1,   -1,
-  277,  321,   -1,  323,  281,   -1,   -1,  284,   -1,   -1,
-   -1,   -1,   -1,  333,   -1,   -1,  336,   -1,  338,  296,
-  297,   -1,  342,   -1,  301,  302,  261,   -1,   -1,   -1,
-  307,   -1,  309,  310,  311,  312,   -1,   -1,   -1,   -1,
-  317,   -1,  362,   -1,  321,   -1,  323,   -1,  368,  284,
-   -1,   -1,   -1,   -1,   -1,   -1,  333,   -1,   -1,  336,
-   -1,  338,  297,   -1,  261,  342,   -1,  302,   -1,   -1,
+   -1,  304,  337,  306,   -1,  308,   -1,   -1,   -1,   -1,
+  313,   -1,  418,  316,   -1,  318,   -1,   -1,   -1,  322,
+   -1,   -1,  325,   -1,   -1,   -1,   -1,  330,  331,   -1,
+   -1,  334,   -1,  265,  337,  267,   -1,   -1,  270,   -1,
+   -1,   -1,   -1,  275,   -1,   -1,   -1,  279,   -1,   -1,
+   -1,  283,  265,   -1,  267,   -1,  288,  270,   -1,   -1,
+   -1,  293,  275,  295,   -1,   -1,  279,   -1,  300,   -1,
+   -1,   -1,  304,  305,   -1,  288,   -1,   -1,   -1,   -1,
+   -1,   -1,  295,  418,  316,   -1,  318,  300,   -1,   -1,
+  322,  304,   -1,   -1,   -1,   -1,  261,   -1,  330,  331,
+   -1,   -1,  334,  316,   -1,  318,   -1,  272,   -1,  322,
+   -1,   -1,  277,   -1,   -1,  418,  281,  330,  331,  284,
+   -1,  334,   -1,   -1,  337,   -1,   -1,   -1,   -1,   -1,
+   -1,  296,  297,   -1,   -1,   -1,  301,  302,   -1,   -1,
    -1,   -1,  307,   -1,  309,  310,  311,  312,   -1,   -1,
-   -1,   -1,  317,   -1,   -1,  362,  321,  284,   -1,   -1,
-   -1,  368,   -1,   -1,   -1,   -1,   -1,   -1,  333,   -1,
-  297,  336,  261,  338,   -1,  302,   -1,   -1,   -1,   -1,
+  363,   -1,  317,   -1,   -1,   -1,  321,   -1,  323,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  333,   -1,
+  335,  336,  261,  338,   -1,   -1,   -1,  342,   -1,   -1,
+   -1,   -1,   -1,  272,   -1,   -1,  418,   -1,  277,   -1,
+   -1,   -1,  281,   -1,   -1,  284,   -1,  362,   -1,   -1,
+   -1,   -1,   -1,  368,  369,  418,   -1,  296,  297,   -1,
+   -1,   -1,  301,  302,  261,   -1,  263,   -1,  307,   -1,
+  309,  310,  311,  312,   -1,   -1,   -1,   -1,  317,   -1,
+   -1,   -1,  321,   -1,  323,   -1,   -1,  284,   -1,   -1,
+   -1,   -1,   -1,   -1,  333,   -1,   -1,  336,   -1,  338,
+  297,   -1,   -1,  342,   -1,  302,   -1,   -1,   -1,   -1,
   307,   -1,  309,  310,  311,  312,   -1,   -1,   -1,   -1,
-  317,   -1,   -1,   -1,  321,  284,   -1,  362,   -1,  364,
-  365,   -1,   -1,  368,   -1,   -1,  333,   -1,  297,  336,
-  261,  338,  263,  302,   -1,   -1,   -1,   -1,  307,   -1,
-  309,  310,  311,  312,   -1,   -1,  315,   -1,  317,   -1,
-   -1,   -1,  321,  284,   -1,  362,   -1,  364,  365,   -1,
-   -1,  368,   -1,   -1,  333,   -1,  297,  336,  261,  338,
+  317,   -1,   -1,  362,  321,   -1,   -1,  261,   -1,  368,
+  369,   -1,   -1,   -1,   -1,   -1,  333,   -1,  272,  336,
+   -1,  338,   -1,  277,   -1,   -1,   -1,  281,   -1,   -1,
+  284,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  296,  297,   -1,  362,   -1,  301,  302,   -1,
+  261,  368,  369,  307,   -1,  309,  310,  311,  312,   -1,
+   -1,  272,   -1,  317,   -1,   -1,  277,  321,   -1,  323,
+  281,   -1,   -1,  284,   -1,   -1,   -1,   -1,   -1,  333,
+   -1,   -1,  336,   -1,  338,  296,  297,   -1,  342,   -1,
+  301,  302,  261,   -1,   -1,   -1,  307,   -1,  309,  310,
+  311,  312,   -1,   -1,   -1,   -1,  317,   -1,  362,   -1,
+  321,   -1,  323,   -1,  368,  284,   -1,   -1,   -1,   -1,
+   -1,   -1,  333,   -1,   -1,  336,   -1,  338,  297,   -1,
+  261,  342,   -1,  302,   -1,   -1,   -1,   -1,  307,   -1,
+  309,  310,  311,  312,   -1,   -1,   -1,   -1,  317,   -1,
+   -1,  362,  321,  284,   -1,   -1,   -1,  368,   -1,   -1,
+   -1,   -1,   -1,   -1,  333,   -1,  297,  336,  261,  338,
    -1,  302,   -1,   -1,   -1,   -1,  307,   -1,  309,  310,
   311,  312,   -1,   -1,   -1,   -1,  317,   -1,   -1,   -1,
-  321,  284,   -1,  362,   -1,   -1,   -1,   -1,  261,  368,
-  263,   -1,  333,   -1,  297,  336,   -1,  338,   -1,  302,
-   -1,   -1,   -1,   -1,  307,   -1,  309,  310,  311,  312,
-   -1,  284,   -1,   -1,  317,   -1,   -1,   -1,  321,   -1,
-   -1,  362,   -1,   -1,  297,   -1,   -1,  368,  261,  302,
-  333,   -1,   -1,  336,  307,  338,  309,  310,  311,  312,
-   -1,   -1,  315,   -1,  317,   -1,   -1,   -1,  321,   -1,
-   -1,  284,   -1,   -1,   -1,   -1,   -1,   -1,  261,  362,
-  333,  364,  365,  336,  297,  338,   -1,   -1,  301,  302,
+  321,  284,   -1,  362,   -1,  364,  365,   -1,   -1,  368,
+   -1,   -1,  333,   -1,  297,  336,  261,  338,  263,  302,
    -1,   -1,   -1,   -1,  307,   -1,  309,  310,  311,  312,
-   -1,  284,   -1,   -1,  317,   -1,   -1,   -1,  321,  362,
-   -1,   -1,   -1,   -1,  297,   -1,   -1,   -1,   -1,  302,
-  333,   -1,   -1,  336,  307,  338,  309,  310,  311,  312,
-   -1,   -1,   -1,   -1,  317,   -1,   -1,   -1,  321,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  362,
-  333,   -1,   -1,  336,   -1,  338,   -1,   -1,   -1,   -1,
+   -1,   -1,  315,   -1,  317,   -1,   -1,   -1,  321,  284,
+   -1,  362,   -1,  364,  365,   -1,   -1,  368,   -1,   -1,
+  333,   -1,  297,  336,  261,  338,   -1,  302,   -1,   -1,
+   -1,   -1,  307,   -1,  309,  310,  311,  312,   -1,   -1,
+   -1,   -1,  317,   -1,   -1,   -1,  321,  284,   -1,  362,
+   -1,   -1,   -1,   -1,  261,  368,  263,   -1,  333,   -1,
+  297,  336,   -1,  338,   -1,  302,   -1,   -1,   -1,   -1,
+  307,   -1,  309,  310,  311,  312,   -1,  284,   -1,   -1,
+  317,   -1,   -1,   -1,  321,   -1,   -1,  362,   -1,   -1,
+  297,   -1,   -1,  368,  261,  302,  333,   -1,   -1,  336,
+  307,  338,  309,  310,  311,  312,   -1,   -1,  315,   -1,
+  317,   -1,   -1,   -1,  321,   -1,   -1,  284,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  362,  333,  364,  365,  336,
+  297,  338,   -1,   -1,   -1,  302,   -1,   -1,   -1,   -1,
+  307,   -1,  309,  310,  311,  312,   -1,   -1,   -1,   -1,
+  317,   -1,   -1,   -1,  321,  362,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  333,   -1,   -1,  336,
+   -1,  338,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  362,
+   -1,   -1,   -1,   -1,   -1,  362,
   };
 
-#line 7038 "cs-parser.jay"
+#line 7037 "cs-parser.jay"
 
 // <summary>
 //  A class used to hold info about an operator declarator
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.jay b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.jay
index 58a268219b..618d22932a 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.jay
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.jay
@@ -116,6 +116,8 @@ namespace Mono.CSharp
 		// Keeps track of global data changes to undo on parser error
 		//
 		public Undo undo;
+
+		bool? interactive_async;
 		
 		Stack<Linq.QueryBlock> linq_clause_blocks;
 
@@ -145,7 +147,6 @@ namespace Mono.CSharp
 		Stack<Location> opt_intoStack = new Stack<Location> ();
 
 		bool HadAttributeParens;
-		List<Location> attributeCommas = new List<Location> ();
 		List<Location> attributeArgumentCommas = new List<Location> ();
 		List<Location> parameterListCommas = new List<Location> ();
 		Stack<Location> location_stack;
@@ -669,23 +670,14 @@ attribute_sections
 	  {
 		var sect = (List<Attribute>) $1;
 		$$ = new Attributes (sect);
-		if (locationListStack.Count > 0)
-			lbag.AddLocation (sect, locationListStack.Pop ());
-		if (attributeCommas.Count > 0) {
-			lbag.AddLocation (sect, attributeCommas);
-			attributeCommas.Clear ();
-		}
 	  }
 	| attribute_sections attribute_section
 	  {
 		Attributes attrs = $1 as Attributes;
 		var sect = (List<Attribute>) $2;
-		
-		if (locationListStack.Count > 0)
-			lbag.AddLocation (sect, locationListStack.Pop ());
 		if (attrs == null)
 			attrs = new Attributes (sect);
-		else
+		else if (sect != null)
 			attrs.AddAttributes (sect);
 		$$ = attrs;
 	  }
@@ -696,7 +688,6 @@ attribute_section
 	  {
 	  	PushLocation (GetLocation ($1));
 		lexer.parsing_attribute_section = true;
-		savedOpenLocation = GetLocation ($1);
 	  }
 	  attribute_section_cont
 	  {
@@ -720,12 +711,13 @@ attribute_section_cont
 			$$ = new List<Attribute> (0);
 		else
 			$$ = $4;
-
+		lbag.InsertLocation ($$, 0, GetLocation ($2));
+		lbag.InsertLocation ($$, 0, PopLocation ());
 		lbag.InsertLocation ($$, 0, PopLocation ());
 		if ($5 != null) {
-			lbag.AddLocation ($$, GetLocation ($2), GetLocation ($5), GetLocation ($6));
+			lbag.AddLocation ($$, GetLocation ($5), GetLocation ($6));
 		} else {
-			lbag.AddLocation ($$, GetLocation ($2), GetLocation ($6));
+			lbag.AddLocation ($$, GetLocation ($6));
 		}
 
 		current_attr_target = null;
@@ -734,7 +726,6 @@ attribute_section_cont
 	| attribute_list opt_comma CLOSE_BRACKET
 	  {
 		$$ = $1;
-
 		lbag.InsertLocation ($$, 0, PopLocation ());
 		if ($2 != null) {
 			lbag.AddLocation ($$, GetLocation($2), GetLocation ($3));
@@ -755,7 +746,7 @@ attribute_section_cont
 	  }
 	| error
 	  {
- 		$$ = CheckAttributeTarget (GetTokenName (yyToken), GetLocation ($1)); 
+ 		CheckAttributeTarget (GetTokenName (yyToken), GetLocation ($1)); 
  		$$ = null;
 	  }
 	;	
@@ -765,10 +756,10 @@ attribute_target
 	  {
 		var lt = (LocatedToken) $1;
 		$$ = CheckAttributeTarget (lt.Value, lt.Location);
-		savedCloseLocation = GetLocation ($1);
+		PushLocation (GetLocation ($1));
 	  }
-	| EVENT  { $$ = "event"; savedCloseLocation = GetLocation ($1); }
-	| RETURN { $$ = "return"; savedCloseLocation = GetLocation ($1); }
+	| EVENT  { $$ = "event"; PushLocation (GetLocation ($1)); }
+	| RETURN { $$ = "return"; PushLocation (GetLocation ($1)); }
 	;
 
 attribute_list
@@ -4058,6 +4049,9 @@ unary_expression
 			} else if (current_anonymous_method is AnonymousMethodExpression) {
 				report.Error (4035, GetLocation ($1),
 					"The `await' operator can only be used when its containing anonymous method is marked with the `async' modifier");
+			} else if (interactive_async != null) {
+				current_block.Explicit.RegisterAsyncAwait ();
+				interactive_async = true;
 			} else {
 				report.Error (4033, GetLocation ($1),
 					"The `await' operator can only be used when its containing method is marked with the `async' modifier");
@@ -5563,10 +5557,7 @@ interactive_statement_expression
 	: expression
 	  {
 		Expression expr = (Expression) $1;
-		ExpressionStatement s;
-
-	        s = new OptionalAssign (new SimpleName ("$retval", lexer.Location), expr, lexer.Location);
-		$$ = new StatementExpression (s);
+		$$ = new StatementExpression (new OptionalAssign (expr, lexer.Location));
 	  }
 	| error
 	  {
@@ -6012,6 +6003,11 @@ throw_statement
 		$$ = new Throw ((Expression) $2, GetLocation ($1));
 		lbag.AddStatement ($$, GetLocation ($3));
 	  }
+	| THROW expression error
+	  {
+		Error_SyntaxError (yyToken);
+		$$ = new Throw ((Expression) $2, GetLocation ($1));
+	  }
 	| THROW error
 	  {
 		Error_SyntaxError (yyToken);
@@ -6873,27 +6869,30 @@ interactive_parsing
 			mods |= Modifiers.UNSAFE;
 
 		current_local_parameters = pars;
-		Method method = new Method (
+		var method = new InteractiveMethod (
 			current_type,
 			new TypeExpression (compiler.BuiltinTypes.Void, Location.Null),
 			mods,
-			new MemberName ("Host"),
-			pars,
-			null /* attributes */);
+			pars);
 			
 		current_type.AddMember (method);			
-
 		oob_stack.Push (method);
+
+		interactive_async = false;
+
 		++lexer.parsing_block;
 		start_block (lexer.Location);
 	  }		
 	  interactive_statement_list opt_COMPLETE_COMPLETION
 	  {
 		--lexer.parsing_block;
-		Method method = (Method) oob_stack.Pop ();
-
+		var method = (InteractiveMethod) oob_stack.Pop ();
 		method.Block = (ToplevelBlock) end_block(lexer.Location);
 
+		if (interactive_async == true) {
+			method.ChangeToAsync ();
+		}
+
 		InteractiveResult = (Class) pop_current_class ();
 		current_local_parameters = null;
 	  } 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs
index d0891b121a..ef720ebd17 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs
@@ -249,6 +249,9 @@ namespace Mono.CSharp
 		public const int EvalCompilationUnitParserCharacter = 0x100001;
 		public const int EvalUsingDeclarationsParserCharacter = 0x100002;
 		public const int DocumentationXref = 0x100003;
+
+		const int UnicodeLS = 0x2028;
+		const int UnicodePS = 0x2029;
 		
 		//
 		// XML documentation buffer. The save point is used to divide
@@ -1232,7 +1235,9 @@ namespace Mono.CSharp
 			int the_token;
 
 			PushPosition ();
+			sbag.Suppress = true;
 			the_token = token ();
+			sbag.Suppress = false;
 			PopPosition ();
 			
 			return the_token;
@@ -1828,20 +1833,27 @@ namespace Mono.CSharp
 				x = reader.Read ();
 			}
 			
-			if (x == '\r') {
-				if (peek_char () == '\n') {
-					putback_char = -1;
-					advance_line (SpecialsBag.NewLine.Windows);
-				} else {
+			if (x <= 13) {
+				if (x == '\r') {
+					if (peek_char () == '\n') {
+						putback_char = -1;
+						advance_line (SpecialsBag.NewLine.Windows);
+					} else {
+						advance_line (SpecialsBag.NewLine.Unix);
+					}
+
+					x = '\n';
+				} else if (x == '\n') {
 					advance_line (SpecialsBag.NewLine.Unix);
+				} else {
+					col++;
 				}
-				x = '\n';
-			} else if (x == '\n') {
+			} else if (x >= UnicodeLS && x <= UnicodePS) {
 				advance_line (SpecialsBag.NewLine.Unix);
-
 			} else {
 				col++;
 			}
+
 			return x;
 		}
 
@@ -1877,7 +1889,7 @@ namespace Mono.CSharp
 				throw new InternalErrorException (string.Format ("Secondary putback [{0}] putting back [{1}] is not allowed", (char)putback_char, (char) c), Location);
 			}
 
-			if (c == '\n' || col == 0) {
+			if (c == '\n' || col == 0 || (c >= UnicodeLS && c <= UnicodePS)) {
 				// It won't happen though.
 				line--;
 				ref_line--;
@@ -1912,11 +1924,11 @@ namespace Mono.CSharp
 
 		int TokenizePreprocessorIdentifier (out int c)
 		{
-			int endLine, endCol;
-			return TokenizePreprocessorIdentifier (out c, out endLine, out endCol);
+			int startCol, endLine, endCol;
+			return TokenizePreprocessorIdentifier (out c, out startCol, out endLine, out endCol);
 		}
 
-		int TokenizePreprocessorIdentifier (out int c, out int endLine, out int endCol)
+		int TokenizePreprocessorIdentifier (out int c, out int startCol, out int endLine, out int endCol)
 		{
 			// skip over white space
 			do {
@@ -1924,7 +1936,7 @@ namespace Mono.CSharp
 				endCol = col;
 				c = get_char ();
 			} while (c == ' ' || c == '\t');
-			
+			startCol = col;
 			int pos = 0;
 			while (c != -1 && c >= 'a' && c <= 'z') {
 				id_builder[pos++] = (char) c;
@@ -1956,8 +1968,8 @@ namespace Mono.CSharp
 			tokens_seen = false;
 			arg = "";
 			
-			int endLine, endCol;
-			var cmd = GetPreprocessorDirective (id_builder, TokenizePreprocessorIdentifier (out c, out endLine, out endCol));
+			int startCol2, endLine, endCol;
+			var cmd = GetPreprocessorDirective (id_builder, TokenizePreprocessorIdentifier (out c, out startCol2, out endLine, out endCol));
 			
 			if ((cmd & PreprocessorDirective.CustomArgumentsParsing) != 0) {
 				if (position_stack.Count == 0)
@@ -1970,9 +1982,8 @@ namespace Mono.CSharp
 				c = get_char ();
 			}
 			int has_identifier_argument = (int)(cmd & PreprocessorDirective.RequiresArgument);
-
 			int pos = 0;
-			while (c != -1 && c != '\n' && c != '\r') {
+			while (c != -1 && c != '\n' && c != UnicodeLS && c != UnicodePS) {
 				if (c == '\\' && has_identifier_argument >= 0) {
 					if (has_identifier_argument != 0) {
 						has_identifier_argument = 1;
@@ -1999,10 +2010,7 @@ namespace Mono.CSharp
 					// Eat single-line comments
 					//
 					get_char ();
-					do {
-						c = get_char ();
-					} while (c != -1 && c != '\n');
-
+					ReadToEndOfLine ();
 					break;
 				}
 				
@@ -2072,10 +2080,7 @@ namespace Mono.CSharp
 				//
 				// Eat any remaining characters to continue parsing on next line
 				//
-				while (c != -1 && c != '\n') {
-					c = get_char ();
-				}
-
+				ReadToEndOfLine ();
 				return false;
 			}
 
@@ -2084,10 +2089,7 @@ namespace Mono.CSharp
 				//
 				// Eat any remaining characters to continue parsing on next line
 				//
-				while (c != -1 && c != '\n') {
-					c = get_char ();
-				}
-
+				ReadToEndOfLine ();
 				return new_line != 0;
 			}
 			#if FULL_AST
@@ -2104,13 +2106,11 @@ namespace Mono.CSharp
 				c = 0;
 			}
 
-			if (c != '\n' && c != '/' && c != '"') {
+			if (c != '\n' && c != '/' && c != '"' && c != UnicodeLS && c != UnicodePS) {
 				//
 				// Eat any remaining characters to continue parsing on next line
 				//
-				while (c != -1 && c != '\n') {
-					c = get_char ();
-				}
+				ReadToEndOfLine ();
 
 				Report.Error (1578, loc, "Filename, single-line comment or end-of-line expected");
 				return true;
@@ -2129,16 +2129,15 @@ namespace Mono.CSharp
 				}
 			}
 
-			if (c == '\n') {
+			if (c == '\n' || c == UnicodeLS || c == UnicodePS) {
+
 			} else if (c == '/') {
 				ReadSingleLineComment ();
 			} else {
 				//
 				// Eat any remaining characters to continue parsing on next line
 				//
-				while (c != -1 && c != '\n') {
-					c = get_char ();
-				}
+				ReadToEndOfLine ();
 
 				Error_EndLineExpected ();
 				return true;
@@ -2373,7 +2372,7 @@ namespace Mono.CSharp
 		string TokenizeFileName (ref int c)
 		{
 			var string_builder = new StringBuilder ();
-			while (c != -1 && c != '\n') {
+			while (c != -1 && c != '\n' && c != UnicodeLS && c != UnicodePS) {
 				c = get_char ();
 				if (c == '"') {
 					c = get_char ();
@@ -2421,16 +2420,21 @@ namespace Mono.CSharp
 					Report.Warning (1692, 1, Location, "Invalid number");
 
 					// Read everything till the end of the line or file
-					do {
-						c = get_char ();
-					} while (c != -1 && c != '\n');
+					ReadToEndOfLine ();
 				}
 			}
 
 			return number;
 		}
-		
-		
+
+		void ReadToEndOfLine ()
+		{
+			int c;
+			do {
+				c = get_char ();
+			} while (c != -1 && c != '\n' && c != UnicodeLS && c != UnicodePS);
+		}
+
 		void ReadSingleLineComment ()
 		{
 			if (peek_char () != '/')
@@ -2444,9 +2448,9 @@ namespace Mono.CSharp
 				if (position_stack.Count == 0)
 					sbag.PushCommentChar (c);
 				var pc = peek_char ();
-				if ((pc == '\n' || pc == -1) && position_stack.Count == 0) 
+				if ((pc == '\n' || pc == -1 || pc == UnicodeLS || pc == UnicodePS) && position_stack.Count == 0) 
 					sbag.EndComment (line, col + 1);
-			} while (c != -1 && c != '\n');
+			} while (c != -1 && c != '\n' && c != UnicodeLS && c != UnicodePS);
 		}
 
 		/// <summary>
@@ -2455,9 +2459,17 @@ namespace Mono.CSharp
 		void ParsePragmaDirective (string arg)
 		{
 			int c;
-			int length = TokenizePreprocessorIdentifier (out c);
+			int startCol, endLine, endCol;
+			int length = TokenizePreprocessorIdentifier (out c, out startCol, out endLine, out endCol);
+			#if FULL_AST
+			var pragmaDirective = sbag.GetPragmaPreProcessorDirective();
+			pragmaDirective.WarningColumn = startCol;
+			#endif
 			if (length == pragma_warning.Length && IsTokenIdentifierEqual (pragma_warning)) {
-				length = TokenizePreprocessorIdentifier (out c);
+				length = TokenizePreprocessorIdentifier (out c, out startCol, out endLine, out endCol);
+				#if FULL_AST
+				pragmaDirective.DisableRestoreColumn = startCol;
+				#endif
 
 				//
 				// #pragma warning disable
@@ -2465,7 +2477,9 @@ namespace Mono.CSharp
 				//
 				if (length == pragma_warning_disable.Length) {
 					bool disable = IsTokenIdentifierEqual (pragma_warning_disable);
-					sbag.SetPragmaDisable (disable);
+					#if FULL_AST
+					pragmaDirective.Disalbe = disable;
+					#endif
 					if (disable || IsTokenIdentifierEqual (pragma_warning_restore)) {
 						// skip over white space
 						while (c == ' ' || c == '\t')
@@ -2473,7 +2487,7 @@ namespace Mono.CSharp
 
 						var loc = Location;
 
-						if (c == '\n' || c == '/') {
+						if (c == '\n' || c == '/' || c == UnicodeLS || c == UnicodePS) {
 							if (c == '/')
 								ReadSingleLineComment ();
 
@@ -2491,16 +2505,24 @@ namespace Mono.CSharp
 							//
 							int code;
 							do {
+								var startLoc = loc;
+								#if FULL_AST
+								// int read_start = reader.Position;
+								#endif
 								code = TokenizePragmaNumber (ref c);
 								if (code > 0) {
-									sbag.AddPragmaCode (code);
+									#if FULL_AST
+									var literal = new IntConstant(context.BuiltinTypes, code, startLoc);
+									pragmaDirective.Codes.Add (literal);
+								//	literal.ParsedValue = reader.ReadChars (read_start, reader.Position + 1);
+									#endif
 									if (disable) {
 										Report.RegisterWarningRegion (loc).WarningDisable (loc, code, context.Report);
 									} else {
 										Report.RegisterWarningRegion (loc).WarningEnable (loc, code, context);
 									}
 								}
-							} while (code >= 0 && c != '\n' && c != -1);
+							} while (code >= 0 && c != '\n' && c != -1 && c != UnicodeLS && c != UnicodePS);
 						}
 
 						return;
@@ -2510,8 +2532,7 @@ namespace Mono.CSharp
 				Report.Warning (1634, 1, Location, "Expected disable or restore");
 
 				// Eat any remaining characters on the line
-				while (c != '\n' && c != -1)
-					c = get_char ();
+				ReadToEndOfLine ();
 
 				return;
 			}
@@ -2996,7 +3017,7 @@ namespace Mono.CSharp
 					return Token.LITERAL;
 				}
 
-				if (c == '\n') {
+				if (c == '\n' || c == UnicodeLS || c == UnicodePS) {
 					if (!quoted) {
 						Report.Error (1010, Location, "Newline in constant");
 
@@ -3235,6 +3256,8 @@ namespace Mono.CSharp
 					case '\v':
 					case '\r':
 					case '\n':
+					case UnicodeLS:
+					case UnicodePS:
 					case '/':
 						next = peek_token ();
 						if (next == Token.COMMA || next == Token.CLOSE_BRACKET)
@@ -3265,6 +3288,7 @@ namespace Mono.CSharp
 						case Token.FOREACH:
 						case Token.TYPEOF:
 						case Token.WHILE:
+						case Token.SWITCH:
 						case Token.USING:
 						case Token.DEFAULT:
 						case Token.DELEGATE:
@@ -3461,7 +3485,7 @@ namespace Mono.CSharp
 						
 						d = peek_char ();
 						int endLine = line, endCol = col;
-						while ((d = get_char ()) != -1 && (d != '\n') && d != '\r') {
+						while ((d = get_char ()) != -1 && (d != '\n') && d != '\r' && d != UnicodePS && d != UnicodeLS) {
 							if (position_stack.Count == 0)
 								sbag.PushCommentChar (d);
 							endLine = line;
@@ -3469,7 +3493,6 @@ namespace Mono.CSharp
 						}
 						if (position_stack.Count == 0)
 							sbag.EndComment (endLine, endCol + 1);
-												
 						any_token_seen |= tokens_seen;
 						tokens_seen = false;
 						comments_seen = false;
@@ -3524,7 +3547,7 @@ namespace Mono.CSharp
 							if (docAppend)
 								xml_comment_buffer.Append ((char) d);
 							
-							if (d == '\n'){
+							if (d == '\n' || d == UnicodeLS || d == UnicodePS){
 								any_token_seen |= tokens_seen;
 								tokens_seen = false;
 								// 
@@ -3575,6 +3598,8 @@ namespace Mono.CSharp
 					return is_number (c, false);
 
 				case '\n': // white space
+				case UnicodeLS:
+				case UnicodePS:
 					any_token_seen |= tokens_seen;
 					tokens_seen = false;
 					comments_seen = false;
@@ -3613,13 +3638,17 @@ namespace Mono.CSharp
 							continue;
 						}
 
-						if (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\v' ) {
+						if (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\v' || c == UnicodeLS || c == UnicodePS) {
 							sbag.PushCommentChar (c);
 							continue;
 						}
 
 						if (c == '#') {
-							if (ParsePreprocessingDirective (false))
+							var oldNL = recordNewLine;
+							recordNewLine = true;
+							var continueNormalLexing = ParsePreprocessingDirective(false);
+							recordNewLine = oldNL;
+							if (continueNormalLexing)
 								break;
 							sbag.StartComment(SpecialsBag.CommentType.InactiveCode, false, line, 1);
 						}
@@ -3702,7 +3731,7 @@ namespace Mono.CSharp
 				return Token.LITERAL;
 			}
 
-			if (c == '\n') {
+			if (c == '\n' || c == UnicodeLS || c == UnicodePS) {
 				Report.Error (1010, start_location, "Newline in constant");
 				return Token.ERROR;
 			}
@@ -3723,7 +3752,7 @@ namespace Mono.CSharp
 
 				// Try to recover, read until newline or next "'"
 				while ((c = get_char ()) != -1) {
-					if (c == '\n' || c == '\'')
+					if (c == '\n' || c == '\'' || c == UnicodeLS || c == UnicodePS)
 						break;
 				}
 			}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/delegate.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/delegate.cs
index f6018715e5..ca6327d869 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/delegate.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/delegate.cs
@@ -663,7 +663,7 @@ namespace Mono.CSharp {
 		//
 		// Returns true when type is MVAR or has MVAR reference
 		//
-		static bool ContainsMethodTypeParameter (TypeSpec type)
+		public static bool ContainsMethodTypeParameter (TypeSpec type)
 		{
 			var tps = type as TypeParameterSpec;
 			if (tps != null)
@@ -857,7 +857,7 @@ namespace Mono.CSharp {
 			//
 			var call = new CallEmitter ();
 			call.InstanceExpression = InstanceExpr;
-			call.EmitPredefined (ec, method, arguments);
+			call.EmitPredefined (ec, method, arguments, loc);
 		}
 
 		public override void EmitStatement (EmitContext ec)
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/ecore.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/ecore.cs
index 8f2c72898f..6fde26fcd5 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/ecore.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/ecore.cs
@@ -435,8 +435,14 @@ namespace Mono.CSharp {
 		/// </remarks>
 		public Expression Resolve (ResolveContext ec, ResolveFlags flags)
 		{
-			if (eclass != ExprClass.Unresolved)
+			if (eclass != ExprClass.Unresolved) {
+				if ((flags & ExprClassToResolveFlags) == 0) {
+					Error_UnexpectedKind (ec, flags, loc);
+					return null;
+				}
+
 				return this;
+			}
 			
 			Expression e;
 			try {
@@ -511,6 +517,23 @@ namespace Mono.CSharp {
 			return e;
 		}
 
+		public Constant ResolveLabelConstant (ResolveContext rc)
+		{
+			var expr = Resolve (rc);
+			if (expr == null)
+				return null;
+
+			Constant c = expr as Constant;
+			if (c == null) {
+				if (c.type != InternalType.ErrorType)
+					rc.Report.Error (150, StartLocation, "A constant value is expected");
+
+				return null;
+			}
+
+			return c;
+		}
+
 		public virtual void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType)
 		{
 			rc.Module.Compiler.Report.Error (182, loc,
@@ -761,8 +784,18 @@ namespace Mono.CSharp {
 					}
 
 					if ((restrictions & MemberLookupRestrictions.InvocableOnly) != 0) {
-						if (member is MethodSpec)
+						if (member is MethodSpec) {
+							//
+							// Interface members that are hidden by class members are removed from the set. This
+							// step only has an effect if T is a type parameter and T has both an effective base 
+							// class other than object and a non-empty effective interface set
+							//
+							var tps = queried_type as TypeParameterSpec;
+							if (tps != null && tps.HasTypeConstraint)
+								members = RemoveHiddenTypeParameterMethods (members);
+
 							return new MethodGroupExpr (members, queried_type, loc);
+						}
 
 						if (!Invocation.IsMemberInvocable (member))
 							continue;
@@ -817,6 +850,54 @@ namespace Mono.CSharp {
 			return null;
 		}
 
+		static IList<MemberSpec> RemoveHiddenTypeParameterMethods (IList<MemberSpec> members)
+		{
+			if (members.Count < 2)
+				return members;
+
+			//
+			// If M is a method, then all non-method members declared in an interface declaration
+			// are removed from the set, and all methods with the same signature as M declared in
+			// an interface declaration are removed from the set
+			//
+
+			bool copied = false;
+			for (int i = 0; i < members.Count; ++i) {
+				var method = members[i] as MethodSpec;
+				if (method == null) {
+					if (!copied) {
+						copied = true;
+						members = new List<MemberSpec> (members);
+					} 
+					
+					members.RemoveAt (i--);
+					continue;
+				}
+
+				if (!method.DeclaringType.IsInterface)
+					continue;
+
+				for (int ii = 0; ii < members.Count; ++ii) {
+					var candidate = members[ii] as MethodSpec;
+					if (candidate == null || !candidate.DeclaringType.IsClass)
+						continue;
+
+					if (!TypeSpecComparer.Override.IsEqual (candidate.Parameters, method.Parameters))
+						continue;
+
+					if (!copied) {
+						copied = true;
+						members = new List<MemberSpec> (members);
+					}
+
+					members.RemoveAt (i--);
+					break;
+				}
+			}
+
+			return members;
+		}
+
 		protected virtual void Error_NegativeArrayIndex (ResolveContext ec, Location loc)
 		{
 			throw new NotImplementedException ();
@@ -1253,8 +1334,20 @@ namespace Mono.CSharp {
 		public static Expression Create (Expression child, TypeSpec type)
 		{
 			Constant c = child as Constant;
-			if (c != null)
-				return new EmptyConstantCast (c, type);
+			if (c != null) {
+				var enum_constant = c as EnumConstant;
+				if (enum_constant != null)
+					c = enum_constant.Child;
+
+				if (!(c is ReducedExpression.ReducedConstantExpression)) {
+					if (c.Type == type)
+						return c;
+
+					var res = c.ConvertImplicitly (type);
+					if (res != null)
+						return res;
+				}
+			}
 
 			EmptyCast e = child as EmptyCast;
 			if (e != null)
@@ -1680,7 +1773,11 @@ namespace Mono.CSharp {
 		public override void Emit (EmitContext ec)
 		{
 			base.Emit (ec);
+			Emit (ec, mode);
+		}
 
+		public static void Emit (EmitContext ec, Mode mode)
+		{
 			if (ec.HasSet (EmitContext.Options.CheckedScope)) {
 				switch (mode){
 				case Mode.I1_U1: ec.Emit (OpCodes.Conv_Ovf_U1); break;
@@ -1949,7 +2046,7 @@ namespace Mono.CSharp {
 	//
 	public class ReducedExpression : Expression
 	{
-		sealed class ReducedConstantExpression : EmptyConstantCast
+		public sealed class ReducedConstantExpression : EmptyConstantCast
 		{
 			readonly Expression orig_expr;
 
@@ -2361,7 +2458,7 @@ namespace Mono.CSharp {
 
 		protected override Expression DoResolve (ResolveContext rc)
 		{
-			var e = SimpleNameResolve (rc, null, false);
+			var e = SimpleNameResolve (rc, null);
 
 			var fe = e as FieldExpr;
 			if (fe != null) {
@@ -2373,7 +2470,7 @@ namespace Mono.CSharp {
 
 		public override Expression DoResolveLValue (ResolveContext ec, Expression right_side)
 		{
-			return SimpleNameResolve (ec, right_side, false);
+			return SimpleNameResolve (ec, right_side);
 		}
 
 		protected virtual void Error_TypeOrNamespaceNotFound (IMemberContext ctx)
@@ -2639,7 +2736,10 @@ namespace Mono.CSharp {
 							}
 
 							if (e is TypeExpr) {
-								e.Error_UnexpectedKind (rc, e, "variable", e.ExprClassName, loc);
+								// TypeExpression does not have correct location
+								if (e is TypeExpression)
+									e = new TypeExpression (e.Type, loc);
+
 								return e;
 							}
 						}
@@ -2661,19 +2761,19 @@ namespace Mono.CSharp {
 			}
 		}
 		
-		Expression SimpleNameResolve (ResolveContext ec, Expression right_side, bool intermediate)
+		Expression SimpleNameResolve (ResolveContext ec, Expression right_side)
 		{
 			Expression e = LookupNameExpression (ec, right_side == null ? MemberLookupRestrictions.ReadAccess : MemberLookupRestrictions.None);
 
 			if (e == null)
 				return null;
 
-			if (right_side != null) {
-				if (e is FullNamedExpression && e.eclass != ExprClass.Unresolved) {
-					e.Error_UnexpectedKind (ec, e, "variable", e.ExprClassName, loc);
-				    return null;
-				}
+			if (e is FullNamedExpression && e.eclass != ExprClass.Unresolved) {
+				e.Error_UnexpectedKind (ec, e, "variable", e.ExprClassName, loc);
+				return e;
+			}
 
+			if (right_side != null) {
 				e = e.ResolveLValue (ec, right_side);
 			} else {
 				e = e.Resolve (ec);
@@ -3574,7 +3674,7 @@ namespace Mono.CSharp {
 							InstanceExpression = ProbeIdenticalTypeName (ec, InstanceExpression, simple_name);
 						}
 
-						InstanceExpression.Resolve (ec);
+						InstanceExpression.Resolve (ec, ResolveFlags.VariableOrValue | ResolveFlags.MethodGroup | ResolveFlags.Type);
 					}
 				}
 
@@ -3648,7 +3748,7 @@ namespace Mono.CSharp {
 		//
 		public virtual MethodGroupExpr LookupExtensionMethod (ResolveContext rc)
 		{
-			if (InstanceExpression == null)
+			if (InstanceExpression == null || InstanceExpression.eclass == ExprClass.Type)
 				return null;
 
 			InstanceExpression = InstanceExpression.Resolve (rc);
@@ -4677,7 +4777,7 @@ namespace Mono.CSharp {
 				// is used as argument or delegate conversion
 				//
 				if (!Convert.ImplicitConversionExists (ec, argument.Expr, parameter)) {
-					return 2;
+					return parameter.IsDelegate && argument.Expr is AnonymousMethodExpression ? 2 : 3;
 				}
 			}
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/eval.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/eval.cs
index cae7fe0610..6f3ffd7c4c 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/eval.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/eval.cs
@@ -128,6 +128,12 @@ namespace Mono.CSharp
 			Location.Initialize (ctx.SourceFiles);
 		}
 
+		/// <summary>
+		/// When set evaluator will automatically wait on Task of async methods. When not
+		/// set it's called responsibility to handle Task execution
+		/// </summary>
+		public bool WaitOnTask { get; set; }
+
 		/// <summary>
 		///   If true, turns type expressions into valid expressions
 		///   and calls the describe method on it
@@ -426,7 +432,7 @@ namespace Mono.CSharp
 				throw new ArgumentException ("Syntax error on input: partial input");
 			
 			if (result_set == false)
-				throw new ArgumentException ("The expression did not set a result");
+				throw new ArgumentException ("The expression failed to resolve");
 
 			return result;
 		}
@@ -654,11 +660,47 @@ namespace Mono.CSharp
 
 				host.SetBaseTypes (baseclass_list);
 
-				host.CreateContainer ();
-				host.DefineContainer ();
-				host.Define ();
-
 				expression_method = (Method) host.Members[0];
+
+				if ((expression_method.ModFlags & Modifiers.ASYNC) != 0) {
+					//
+					// Host method is async. When WaitOnTask is set we wrap it with wait
+					//
+					// void AsyncWait (ref object $retval) {
+					//	$retval = Host();
+					//	((Task)$retval).Wait();  // When WaitOnTask is set
+					// }
+					//
+					var p = new ParametersCompiled (
+						new Parameter (new TypeExpression (module.Compiler.BuiltinTypes.Object, Location.Null), "$retval", Parameter.Modifier.REF, null, Location.Null)
+					);
+
+					var method = new Method(host, new TypeExpression(module.Compiler.BuiltinTypes.Void, Location.Null),
+						Modifiers.PUBLIC | Modifiers.STATIC, new MemberName("AsyncWait"), p, null);
+
+					method.Block = new ToplevelBlock(method.Compiler, p, Location.Null);
+					method.Block.AddStatement(new StatementExpression (new SimpleAssign(
+						new SimpleName(p [0].Name, Location.Null),
+						new Invocation(new SimpleName(expression_method.MemberName.Name, Location.Null), new Arguments(0)),
+						Location.Null), Location.Null));
+
+					if (WaitOnTask) {
+						var task = new Cast (expression_method.TypeExpression, new SimpleName (p [0].Name, Location.Null), Location.Null);
+
+						method.Block.AddStatement (new StatementExpression (new Invocation (
+								new MemberAccess (task, "Wait", Location.Null),
+							new Arguments (0)), Location.Null));
+					}
+
+					host.AddMember(method);
+
+					expression_method = method;
+				}
+
+				host.CreateContainer();
+				host.DefineContainer();
+				host.Define();
+
 			} else {
 				expression_method = null;
 			}
@@ -1053,6 +1095,27 @@ namespace Mono.CSharp
 #endif
 	}
 
+	class InteractiveMethod : Method
+	{
+		public InteractiveMethod(TypeDefinition parent, FullNamedExpression returnType, Modifiers mod, ParametersCompiled parameters)
+			: base(parent, returnType, mod, new MemberName("Host"), parameters, null)
+		{
+		}
+
+		public void ChangeToAsync ()
+		{
+			ModFlags |= Modifiers.ASYNC;
+			ModFlags &= ~Modifiers.UNSAFE;
+			type_expr = new TypeExpression(Module.PredefinedTypes.Task.TypeSpec, Location);
+			parameters = ParametersCompiled.EmptyReadOnlyParameters;
+		}
+
+		public override string GetSignatureForError()
+		{
+			return "InteractiveHost";
+		}
+	}
+
 	class HoistedEvaluatorVariable : HoistedVariable
 	{
 		public HoistedEvaluatorVariable (Field field)
@@ -1073,11 +1136,17 @@ namespace Mono.CSharp
 	///    the return value for an invocation.
 	/// </summary>
 	class OptionalAssign : SimpleAssign {
-		public OptionalAssign (Expression t, Expression s, Location loc)
-			: base (t, s, loc)
+		public OptionalAssign (Expression s, Location loc)
+			: base (null, s, loc)
 		{
 		}
 
+		public override Location StartLocation {
+			get {
+				return Location.Null;
+			}
+		}
+
 		protected override Expression DoResolve (ResolveContext ec)
 		{
 			Expression clone = source.Clone (new CloneContext ());
@@ -1090,7 +1159,7 @@ namespace Mono.CSharp
 			// A useful feature for the REPL: if we can resolve the expression
 			// as a type, Describe the type;
 			//
-			if (ec.Module.Evaluator.DescribeTypeExpressions){
+			if (ec.Module.Evaluator.DescribeTypeExpressions && !(ec.CurrentAnonymousMethod is AsyncInitializer)) {
 				var old_printer = ec.Report.SetPrinter (new SessionReportPrinter ());
 				Expression tclone;
 				try {
@@ -1116,8 +1185,29 @@ namespace Mono.CSharp
 			}
 
 			source = clone;
+
+			var host = (Method) ec.MemberContext.CurrentMemberDefinition;
+
+			if (host.ParameterInfo.IsEmpty) {
+				eclass = ExprClass.Value;
+				type = InternalType.FakeInternalType;
+				return this;
+			}
+
+			target = new SimpleName (host.ParameterInfo[0].Name, Location);
+
 			return base.DoResolve (ec);
 		}
+
+		public override void EmitStatement(EmitContext ec)
+		{
+			if (target == null) {
+				source.Emit (ec);
+				return;
+			}
+
+			base.EmitStatement(ec);
+		}
 	}
 
 	public class Undo
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/expression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/expression.cs
index bda38a7383..51fac1ebd4 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/expression.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/expression.cs
@@ -80,7 +80,7 @@ namespace Mono.CSharp
 		public override void Emit (EmitContext ec)
 		{
 			var call = new CallEmitter ();
-			call.EmitPredefined (ec, oper, arguments);
+			call.EmitPredefined (ec, oper, arguments, loc);
 		}
 
 		public override SLE.Expression MakeExpression (BuilderContext ctx)
@@ -1868,6 +1868,8 @@ namespace Mono.CSharp
 		{
 			protected readonly TypeSpec left;
 			protected readonly TypeSpec right;
+			protected readonly TypeSpec left_unwrap;
+			protected readonly TypeSpec right_unwrap;
 			public readonly Operator OperatorsMask;
 			public TypeSpec ReturnType;
 
@@ -1891,45 +1893,183 @@ namespace Mono.CSharp
 				if ((op_mask & Operator.ValuesOnlyMask) != 0)
 					throw new InternalErrorException ("Only masked values can be used");
 
+				if ((op_mask & Operator.NullableMask) != 0) {
+					left_unwrap = Nullable.NullableInfo.GetUnderlyingType (ltype);
+					right_unwrap = Nullable.NullableInfo.GetUnderlyingType (rtype);
+				} else {
+					left_unwrap = ltype;
+					right_unwrap = rtype;
+				}
+
 				this.left = ltype;
 				this.right = rtype;
 				this.OperatorsMask = op_mask;
 				this.ReturnType = return_type;
 			}
 
-			public virtual Expression ConvertResult (ResolveContext ec, Binary b)
+			public bool IsLifted {
+				get {
+					return (OperatorsMask & Operator.NullableMask) != 0;
+				}
+			}
+
+			public virtual Expression ConvertResult (ResolveContext rc, Binary b)
 			{
+				Constant c;
+
+				var left_expr = b.left;
+				var right_expr = b.right;
+
 				b.type = ReturnType;
 
-				b.left = Convert.ImplicitConversion (ec, b.left, left, b.left.Location);
-				b.right = Convert.ImplicitConversion (ec, b.right, right, b.right.Location);
+				if (IsLifted) {
+					if (rc.HasSet (ResolveContext.Options.ExpressionTreeConversion)) {
+						b.left = Convert.ImplicitConversion (rc, b.left, left, b.left.Location);
+						b.right = Convert.ImplicitConversion (rc, b.right, right, b.right.Location);
+					}
+
+					if (right_expr.IsNull) {
+						if ((b.oper & Operator.EqualityMask) != 0) {
+							if (!left_expr.Type.IsNullableType && left_expr.Type == left_unwrap)
+								return b.CreateLiftedValueTypeResult (rc, left_unwrap);
+						} else if ((b.oper & Operator.BitwiseMask) != 0) {
+							if (left_unwrap.BuiltinType != BuiltinTypeSpec.Type.Bool)
+								return Nullable.LiftedNull.CreateFromExpression (rc, b);
+						} else {
+							b.left = Convert.ImplicitConversion (rc, b.left, left, b.left.Location);
+							b.right = Convert.ImplicitConversion (rc, b.right, right, b.right.Location);
+
+							if ((b.Oper & (Operator.ArithmeticMask | Operator.ShiftMask)) != 0)
+								return Nullable.LiftedNull.CreateFromExpression (rc, b);
+
+							return b.CreateLiftedValueTypeResult (rc, left);
+						}
+					} else if (left_expr.IsNull) {
+						if ((b.oper & Operator.EqualityMask) != 0) {
+							if (!right_expr.Type.IsNullableType && right_expr.Type == right_unwrap)
+								return b.CreateLiftedValueTypeResult (rc, right_unwrap);
+						} else if ((b.oper & Operator.BitwiseMask) != 0) {
+							if (right_unwrap.BuiltinType != BuiltinTypeSpec.Type.Bool)
+								return Nullable.LiftedNull.CreateFromExpression (rc, b);
+						} else {
+							b.left = Convert.ImplicitConversion (rc, b.left, left, b.left.Location);
+							b.right = Convert.ImplicitConversion (rc, b.right, right, b.right.Location);
+
+							if ((b.Oper & (Operator.ArithmeticMask | Operator.ShiftMask)) != 0)
+								return Nullable.LiftedNull.CreateFromExpression (rc, b);
+
+							return b.CreateLiftedValueTypeResult (rc, right);
+						}
+					}
+				}
 
 				//
 				// A user operators does not support multiple user conversions, but decimal type
 				// is considered to be predefined type therefore we apply predefined operators rules
 				// and then look for decimal user-operator implementation
 				//
-				if (left.BuiltinType == BuiltinTypeSpec.Type.Decimal)
-					return b.ResolveUserOperator (ec, b.left, b.right);
+				if (left.BuiltinType == BuiltinTypeSpec.Type.Decimal) {
+					b.left = Convert.ImplicitConversion (rc, b.left, left, b.left.Location);
+					b.right = Convert.ImplicitConversion (rc, b.right, right, b.right.Location);
+
+					return b.ResolveUserOperator (rc, b.left, b.right);
+				}
 
-				var c = b.right as Constant;
+				c = right_expr as Constant;
 				if (c != null) {
-					if (c.IsDefaultValue && (b.oper == Operator.Addition || b.oper == Operator.Subtraction || (b.oper == Operator.BitwiseOr && !(b is Nullable.LiftedBinaryOperator))))
-						return ReducedExpression.Create (b.left, b).Resolve (ec);
+					if (c.IsDefaultValue) {
+						//
+						// Optimizes
+						// 
+						// (expr + 0) to expr
+						// (expr - 0) to expr
+						// (bool? | false) to bool?
+						//
+						if (b.oper == Operator.Addition || b.oper == Operator.Subtraction ||
+							(b.oper == Operator.BitwiseOr && left_unwrap.BuiltinType == BuiltinTypeSpec.Type.Bool && c is BoolConstant)) {
+							b.left = Convert.ImplicitConversion (rc, b.left, left, b.left.Location);
+							return ReducedExpression.Create (b.left, b).Resolve (rc);
+						}
+					} else {
+						//
+						// Optimizes
+						//
+						// (bool? & true) to bool?
+						//
+						if (IsLifted && left_unwrap.BuiltinType == BuiltinTypeSpec.Type.Bool && b.oper == Operator.BitwiseAnd) {
+							return ReducedExpression.Create (b.left, b).Resolve (rc);
+						}
+					}
+
 					if ((b.oper == Operator.Multiply || b.oper == Operator.Division) && c.IsOneInteger)
-						return ReducedExpression.Create (b.left, b).Resolve (ec);
-					return b;
+						return ReducedExpression.Create (b.left, b).Resolve (rc);
+
+					if ((b.oper & Operator.ShiftMask) != 0 && c is IntConstant) {
+						b.right = new IntConstant (rc.BuiltinTypes, ((IntConstant) c).Value & GetShiftMask (left_unwrap), b.right.Location);
+					}
 				}
 
 				c = b.left as Constant;
 				if (c != null) {
-					if (c.IsDefaultValue && (b.oper == Operator.Addition || (b.oper == Operator.BitwiseOr && !(b is Nullable.LiftedBinaryOperator))))
-						return ReducedExpression.Create (b.right, b).Resolve (ec);
+					if (c.IsDefaultValue) {
+						//
+						// Optimizes
+						// 
+						// (0 + expr) to expr
+						// (false | bool?) to bool?
+						//
+						if (b.oper == Operator.Addition ||
+							(b.oper == Operator.BitwiseOr && right_unwrap.BuiltinType == BuiltinTypeSpec.Type.Bool && c is BoolConstant)) {
+							b.right = Convert.ImplicitConversion (rc, b.right, right, b.right.Location);
+							return ReducedExpression.Create (b.right, b).Resolve (rc);
+						}
+					} else {
+						//
+						// Optimizes
+						//
+						// (true & bool?) to bool?
+						//
+						if (IsLifted && left_unwrap.BuiltinType == BuiltinTypeSpec.Type.Bool && b.oper == Operator.BitwiseAnd) {
+							return ReducedExpression.Create (b.right, b).Resolve (rc);
+						}
+					}
+
 					if (b.oper == Operator.Multiply && c.IsOneInteger)
-						return ReducedExpression.Create (b.right, b).Resolve (ec);
-					return b;
+						return ReducedExpression.Create (b.right, b).Resolve (rc);
+				}
+
+				if (IsLifted) {
+					var lifted = new Nullable.LiftedBinaryOperator (b);
+
+					TypeSpec ltype, rtype;
+					if (b.left.Type.IsNullableType) {
+						lifted.UnwrapLeft = new Nullable.Unwrap (b.left);
+						ltype = left_unwrap;
+					} else {
+						ltype = left;
+					}
+
+					if (b.right.Type.IsNullableType) {
+						lifted.UnwrapRight = new Nullable.Unwrap (b.right);
+						rtype = right_unwrap;
+					} else {
+						rtype = right;
+					}
+
+					lifted.Left = b.left.IsNull ?
+						b.left :
+						Convert.ImplicitConversion (rc, lifted.UnwrapLeft ?? b.left, ltype, b.left.Location);
+
+					lifted.Right = b.right.IsNull ?
+						b.right :
+						Convert.ImplicitConversion (rc, lifted.UnwrapRight ?? b.right, rtype, b.right.Location);
+
+					return lifted.Resolve (rc);
 				}
 
+				b.left = Convert.ImplicitConversion (rc, b.left, left, b.left.Location);
+				b.right = Convert.ImplicitConversion (rc, b.right, right, b.right.Location);
+
 				return b;
 			}
 
@@ -1953,16 +2093,22 @@ namespace Mono.CSharp
 
 			public PredefinedOperator ResolveBetterOperator (ResolveContext ec, PredefinedOperator best_operator)
 			{
+				if ((OperatorsMask & Operator.DecomposedMask) != 0)
+					return best_operator;
+
+				if ((best_operator.OperatorsMask & Operator.DecomposedMask) != 0)
+					return this;
+
 				int result = 0;
 				if (left != null && best_operator.left != null) {
-					result = OverloadResolver.BetterTypeConversion (ec, best_operator.left, left);
+					result = OverloadResolver.BetterTypeConversion (ec, best_operator.left_unwrap, left_unwrap);
 				}
 
 				//
 				// When second argument is same as the first one, the result is same
 				//
 				if (right != null && (left != right || best_operator.left != best_operator.right)) {
-					result |= OverloadResolver.BetterTypeConversion (ec, best_operator.right, right);
+					result |= OverloadResolver.BetterTypeConversion (ec, best_operator.right_unwrap, right_unwrap);
 				}
 
 				if (result == 0 || result > 2)
@@ -2007,44 +2153,6 @@ namespace Mono.CSharp
 			}
 		}
 
-		sealed class PredefinedShiftOperator : PredefinedOperator
-		{
-			public PredefinedShiftOperator (TypeSpec ltype, TypeSpec rtype, Operator op_mask)
-				: base (ltype, rtype, op_mask)
-			{
-			}
-
-			public override Expression ConvertResult (ResolveContext ec, Binary b)
-			{
-				b.left = Convert.ImplicitConversion (ec, b.left, left, b.left.Location);
-
-				Expression expr_tree_expr = Convert.ImplicitConversion (ec, b.right, right, b.right.Location);
-
-				int right_mask = left.BuiltinType == BuiltinTypeSpec.Type.Int || left.BuiltinType == BuiltinTypeSpec.Type.UInt ? 0x1f : 0x3f;
-
-				//
-				// b = b.left >> b.right & (0x1f|0x3f)
-				//
-				b.right = new Binary (Operator.BitwiseAnd,
-					b.right, new IntConstant (ec.BuiltinTypes, right_mask, b.right.Location)).Resolve (ec);
-
-				//
-				// Expression tree representation does not use & mask
-				//
-				b.right = ReducedExpression.Create (b.right, expr_tree_expr).Resolve (ec);
-				b.type = ReturnType;
-
-				//
-				// Optimize shift by 0
-				//
-				var c = b.right as Constant;
-				if (c != null && c.IsDefaultValue)
-					return ReducedExpression.Create (b.left, b).Resolve (ec);
-
-				return b;
-			}
-		}
-
 		sealed class PredefinedEqualityOperator : PredefinedOperator
 		{
 			MethodSpec equal_method, inequal_method;
@@ -2198,21 +2306,22 @@ namespace Mono.CSharp
 			LogicalMask		= 1 << 10,
 			AdditionMask	= 1 << 11,
 			SubtractionMask	= 1 << 12,
-			RelationalMask	= 1 << 13
+			RelationalMask	= 1 << 13,
+
+			DecomposedMask	= 1 << 19,
+			NullableMask	= 1 << 20,
 		}
 
-		protected enum State
+		enum State : byte
 		{
 			None = 0,
 			Compound = 1 << 1,
-			LeftNullLifted = 1 << 2,
-			RightNullLifted = 1 << 3
 		}
 
 		readonly Operator oper;
-		protected Expression left, right;
-		protected State state;
-		Expression enum_conversion;
+		Expression left, right;
+		State state;
+		ConvCast.Mode enum_conversion;
 
 		public Binary (Operator oper, Expression left, Expression right, bool isCompound)
 			: this (oper, left, right)
@@ -2353,7 +2462,7 @@ namespace Mono.CSharp
 				oper, l, r);
 		}
 		
-		protected void Error_OperatorCannotBeApplied (ResolveContext ec, Expression left, Expression right)
+		void Error_OperatorCannotBeApplied (ResolveContext ec, Expression left, Expression right)
 		{
 			Error_OperatorCannotBeApplied (ec, left, right, OperName (oper), loc);
 		}
@@ -2452,7 +2561,7 @@ namespace Mono.CSharp
 			return left.ContainsEmitWithAwait () || right.ContainsEmitWithAwait ();
 		}
 
-		public static void EmitOperatorOpcode (EmitContext ec, Operator oper, TypeSpec l)
+		public static void EmitOperatorOpcode (EmitContext ec, Operator oper, TypeSpec l, Expression right)
 		{
 			OpCode opcode;
 
@@ -2509,6 +2618,11 @@ namespace Mono.CSharp
 				break;
 
 			case Operator.RightShift:
+				if (!(right is IntConstant)) {
+					ec.EmitInt (GetShiftMask (l));
+					ec.Emit (OpCodes.And);
+				}
+
 				if (IsUnsigned (l))
 					opcode = OpCodes.Shr_Un;
 				else
@@ -2516,6 +2630,11 @@ namespace Mono.CSharp
 				break;
 				
 			case Operator.LeftShift:
+				if (!(right is IntConstant)) {
+					ec.EmitInt (GetShiftMask (l));
+					ec.Emit (OpCodes.And);
+				}
+
 				opcode = OpCodes.Shl;
 				break;
 
@@ -2584,6 +2703,11 @@ namespace Mono.CSharp
 			ec.Emit (opcode);
 		}
 
+		static int GetShiftMask (TypeSpec type)
+		{
+			return type.BuiltinType == BuiltinTypeSpec.Type.Int || type.BuiltinType == BuiltinTypeSpec.Type.UInt ? 0x1f : 0x3f;
+		}
+
 		static bool IsUnsigned (TypeSpec t)
 		{
 			switch (t.BuiltinType) {
@@ -2603,8 +2727,10 @@ namespace Mono.CSharp
 			return t.BuiltinType == BuiltinTypeSpec.Type.Float || t.BuiltinType == BuiltinTypeSpec.Type.Double;
 		}
 
-		Expression ResolveOperator (ResolveContext ec)
+		public Expression ResolveOperator (ResolveContext rc)
 		{
+			eclass = ExprClass.Value;
+
 			TypeSpec l = left.Type;
 			TypeSpec r = right.Type;
 			Expression expr;
@@ -2613,54 +2739,106 @@ namespace Mono.CSharp
 			//
 			// Handles predefined primitive types
 			//
-			if (BuiltinTypeSpec.IsPrimitiveType (l) && BuiltinTypeSpec.IsPrimitiveType (r)) {
+			if ((BuiltinTypeSpec.IsPrimitiveType (l) || (l.IsNullableType && BuiltinTypeSpec.IsPrimitiveType (Nullable.NullableInfo.GetUnderlyingType (l)))) &&
+				(BuiltinTypeSpec.IsPrimitiveType (r) || (r.IsNullableType && BuiltinTypeSpec.IsPrimitiveType (Nullable.NullableInfo.GetUnderlyingType (r))))) {
 				if ((oper & Operator.ShiftMask) == 0) {
-					if (l.BuiltinType != BuiltinTypeSpec.Type.Bool && !DoBinaryOperatorPromotion (ec))
+					if (!DoBinaryOperatorPromotion (rc))
 						return null;
 
-					primitives_only = true;
+					primitives_only = BuiltinTypeSpec.IsPrimitiveType (l) && BuiltinTypeSpec.IsPrimitiveType (r);
 				}
 			} else {
 				// Pointers
 				if (l.IsPointer || r.IsPointer)
-					return ResolveOperatorPointer (ec, l, r);
+					return ResolveOperatorPointer (rc, l, r);
+
+				// User operators
+				expr = ResolveUserOperator (rc, left, right);
+				if (expr != null)
+					return expr;
+
 
-				// Enums
 				bool lenum = l.IsEnum;
 				bool renum = r.IsEnum;
-				if (lenum || renum) {
-					expr = ResolveOperatorEnum (ec, lenum, renum, l, r);
+				if ((oper & (Operator.ComparisonMask | Operator.BitwiseMask)) != 0) {
+					//
+					// Enumerations
+					//
+					if (IsEnumOrNullableEnum (l) || IsEnumOrNullableEnum (r)) {
+						expr = ResolveSingleEnumOperators (rc, lenum, renum, l, r);
 
-					if (expr != null)
-						return expr;
-				}
+						if (expr == null)
+							return null;
 
-				// Delegates
-				if ((oper == Operator.Addition || oper == Operator.Subtraction) && (l.IsDelegate || r.IsDelegate)) {
-						
-					expr = ResolveOperatorDelegate (ec, l, r);
+						if ((oper & Operator.BitwiseMask) != 0) {
+							expr = EmptyCast.Create (expr, type);
+							AddEnumResultCast (type);
+
+							if (oper == Operator.BitwiseAnd && left.Type.IsEnum && right.Type.IsEnum) {
+								expr = OptimizeAndOperation (expr);
+							}
+						}
 
-					// TODO: Can this be ambiguous
-					if (expr != null)
+						left = ConvertEnumOperandToUnderlyingType (rc, left);
+						right = ConvertEnumOperandToUnderlyingType (rc, right);
 						return expr;
-				}
+					}
+				} else if ((oper == Operator.Addition || oper == Operator.Subtraction)) {
+					if (IsEnumOrNullableEnum (l) || IsEnumOrNullableEnum (r)) {
+						//
+						// Enumerations
+						//
+						expr = ResolveEnumOperators (rc, lenum, renum, l, r);
 
-				// User operators
-				expr = ResolveUserOperator (ec, left, right);
-				if (expr != null)
-					return expr;
+						//
+						// We cannot break here there is also Enum + String possible match
+						// which is not ambiguous with predefined enum operators
+						//
+						if (expr != null) {
+							left = ConvertEnumOperandToUnderlyingType (rc, left);
+							right = ConvertEnumOperandToUnderlyingType (rc, right);
 
-				// Predefined reference types equality
-				if ((oper & Operator.EqualityMask) != 0) {
-					expr = ResolveOperatorEquality (ec, l, r);
-					if (expr != null)
-						return expr;
+							return expr;
+						}
+					} else if (l.IsDelegate || r.IsDelegate) {
+						//
+						// Delegates
+						//
+						expr = ResolveOperatorDelegate (rc, l, r);
+
+						// TODO: Can this be ambiguous
+						if (expr != null)
+							return expr;
+					}
 				}
 			}
+			
+			//
+			// Equality operators are more complicated
+			//
+			if ((oper & Operator.EqualityMask) != 0) {
+				return ResolveEquality (rc, l, r, primitives_only);
+			}
+
+			expr = ResolveOperatorPredefined (rc, rc.BuiltinTypes.OperatorsBinaryStandard, primitives_only);
+			if (expr != null)
+				return expr;
+
+			if (primitives_only)
+				return null;
 
-			return ResolveOperatorPredefined (ec, ec.BuiltinTypes.OperatorsBinaryStandard, primitives_only, null);
+			//
+			// Lifted operators have lower priority
+			//
+			return ResolveOperatorPredefined (rc, rc.Module.OperatorsBinaryLifted, false);
+		}
+
+		static bool IsEnumOrNullableEnum (TypeSpec type)
+		{
+			return type.IsEnum || (type.IsNullableType && Nullable.NullableInfo.GetUnderlyingType (type).IsEnum);
 		}
 
+
 		// at least one of 'left' or 'right' is an enumeration constant (EnumConstant or SideEffectConstant or ...)
 		// if 'left' is not an enumeration constant, create one from the type of 'right'
 		Constant EnumLiftUp (ResolveContext ec, Constant left, Constant right, Location loc)
@@ -2765,8 +2943,9 @@ namespace Mono.CSharp
 		public static PredefinedOperator[] CreateStandardOperatorsTable (BuiltinTypes types)
 		{
 			TypeSpec bool_type = types.Bool;
-			return new PredefinedOperator[] {
-				new PredefinedOperator (types.Int, Operator.ArithmeticMask | Operator.BitwiseMask),
+
+			return new [] {
+				new PredefinedOperator (types.Int, Operator.ArithmeticMask | Operator.BitwiseMask | Operator.ShiftMask),
 				new PredefinedOperator (types.UInt, Operator.ArithmeticMask | Operator.BitwiseMask),
 				new PredefinedOperator (types.Long, Operator.ArithmeticMask | Operator.BitwiseMask),
 				new PredefinedOperator (types.ULong, Operator.ArithmeticMask | Operator.BitwiseMask),
@@ -2783,15 +2962,64 @@ namespace Mono.CSharp
 				new PredefinedOperator (types.Decimal, Operator.ComparisonMask, bool_type),
 
 				new PredefinedStringOperator (types.String, Operator.AdditionMask, types.String),
-				new PredefinedStringOperator (types.String, types.Object, Operator.AdditionMask, types.String),
-				new PredefinedStringOperator (types.Object, types.String, Operator.AdditionMask, types.String),
+				// Remaining string operators are in lifted tables
 
 				new PredefinedOperator (bool_type, Operator.BitwiseMask | Operator.LogicalMask | Operator.EqualityMask, bool_type),
 
-				new PredefinedShiftOperator (types.Int, types.Int, Operator.ShiftMask),
-				new PredefinedShiftOperator (types.UInt, types.Int, Operator.ShiftMask),
-				new PredefinedShiftOperator (types.Long, types.Int, Operator.ShiftMask),
-				new PredefinedShiftOperator (types.ULong, types.Int, Operator.ShiftMask)
+				new PredefinedOperator (types.UInt, types.Int, Operator.ShiftMask),
+				new PredefinedOperator (types.Long, types.Int, Operator.ShiftMask),
+				new PredefinedOperator (types.ULong, types.Int, Operator.ShiftMask)
+			};
+
+		}
+		public static PredefinedOperator[] CreateStandardLiftedOperatorsTable (ModuleContainer module)
+		{
+			var nullable = module.PredefinedTypes.Nullable.TypeSpec;
+			if (nullable == null)
+				return new PredefinedOperator [0];
+
+			var types = module.Compiler.BuiltinTypes;
+			var bool_type = types.Bool;
+
+			var nullable_bool = nullable.MakeGenericType (module, new[] { bool_type });
+			var nullable_int = nullable.MakeGenericType (module, new[] { types.Int });
+			var nullable_uint = nullable.MakeGenericType (module, new[] { types.UInt });
+			var nullable_long = nullable.MakeGenericType (module, new[] { types.Long });
+			var nullable_ulong = nullable.MakeGenericType (module, new[] { types.ULong });
+			var nullable_float = nullable.MakeGenericType (module, new[] { types.Float });
+			var nullable_double = nullable.MakeGenericType (module, new[] { types.Double });
+			var nullable_decimal = nullable.MakeGenericType (module, new[] { types.Decimal });
+
+			return new[] {
+				new PredefinedOperator (nullable_int, Operator.NullableMask | Operator.ArithmeticMask | Operator.BitwiseMask | Operator.ShiftMask),
+				new PredefinedOperator (nullable_uint, Operator.NullableMask | Operator.ArithmeticMask | Operator.BitwiseMask),
+				new PredefinedOperator (nullable_long, Operator.NullableMask | Operator.ArithmeticMask | Operator.BitwiseMask),
+				new PredefinedOperator (nullable_ulong, Operator.NullableMask | Operator.ArithmeticMask | Operator.BitwiseMask),
+				new PredefinedOperator (nullable_float, Operator.NullableMask | Operator.ArithmeticMask),
+				new PredefinedOperator (nullable_double, Operator.NullableMask | Operator.ArithmeticMask),
+				new PredefinedOperator (nullable_decimal, Operator.NullableMask | Operator.ArithmeticMask),
+
+				new PredefinedOperator (nullable_int, Operator.NullableMask | Operator.ComparisonMask, bool_type),
+				new PredefinedOperator (nullable_uint, Operator.NullableMask | Operator.ComparisonMask, bool_type),
+				new PredefinedOperator (nullable_long, Operator.NullableMask | Operator.ComparisonMask, bool_type),
+				new PredefinedOperator (nullable_ulong, Operator.NullableMask | Operator.ComparisonMask, bool_type),
+				new PredefinedOperator (nullable_float, Operator.NullableMask | Operator.ComparisonMask, bool_type),
+				new PredefinedOperator (nullable_double, Operator.NullableMask | Operator.ComparisonMask, bool_type),
+				new PredefinedOperator (nullable_decimal, Operator.NullableMask | Operator.ComparisonMask, bool_type),
+
+				new PredefinedOperator (nullable_bool, Operator.NullableMask | Operator.BitwiseMask, nullable_bool),
+
+				new PredefinedOperator (nullable_uint, nullable_int, Operator.NullableMask | Operator.ShiftMask),
+				new PredefinedOperator (nullable_long, nullable_int, Operator.NullableMask | Operator.ShiftMask),
+				new PredefinedOperator (nullable_ulong, nullable_int, Operator.NullableMask | Operator.ShiftMask),
+
+				//
+				// Not strictly lifted but need to be in second group otherwise expressions like
+				// int + null would resolve to +(object, string) instead of +(int?, int?)
+				//
+				new PredefinedStringOperator (types.String, types.Object, Operator.AdditionMask, types.String),
+				new PredefinedStringOperator (types.Object, types.String, Operator.AdditionMask, types.String),
+
 			};
 		}
 
@@ -2799,113 +3027,168 @@ namespace Mono.CSharp
 		{
 			TypeSpec bool_type = types.Bool;
 
-			return new PredefinedOperator[] {
+			return new[] {
 				new PredefinedEqualityOperator (types.String, bool_type),
 				new PredefinedEqualityOperator (types.Delegate, bool_type),
-				new PredefinedOperator (bool_type, Operator.EqualityMask, bool_type)
+				new PredefinedOperator (bool_type, Operator.EqualityMask, bool_type),
+				new PredefinedOperator (types.Int, Operator.EqualityMask, bool_type),
+				new PredefinedOperator (types.UInt, Operator.EqualityMask, bool_type),
+				new PredefinedOperator (types.Long, Operator.EqualityMask, bool_type),
+				new PredefinedOperator (types.ULong, Operator.EqualityMask, bool_type),
+				new PredefinedOperator (types.Float, Operator.EqualityMask, bool_type),
+				new PredefinedOperator (types.Double, Operator.EqualityMask, bool_type),
+				new PredefinedOperator (types.Decimal, Operator.EqualityMask, bool_type),
+			};
+		}
+
+		public static PredefinedOperator[] CreateEqualityLiftedOperatorsTable (ModuleContainer module)
+		{
+			var nullable = module.PredefinedTypes.Nullable.TypeSpec;
+
+			if (nullable == null)
+				return new PredefinedOperator [0];
+
+			var types = module.Compiler.BuiltinTypes;
+			var bool_type = types.Bool;
+			var nullable_bool = nullable.MakeGenericType (module, new [] { bool_type });
+			var nullable_int = nullable.MakeGenericType (module, new[] { types.Int });
+			var nullable_uint = nullable.MakeGenericType (module, new[] { types.UInt });
+			var nullable_long = nullable.MakeGenericType (module, new[] { types.Long });
+			var nullable_ulong = nullable.MakeGenericType (module, new[] { types.ULong });
+			var nullable_float = nullable.MakeGenericType (module, new[] { types.Float });
+			var nullable_double = nullable.MakeGenericType (module, new[] { types.Double });
+			var nullable_decimal = nullable.MakeGenericType (module, new[] { types.Decimal });
+
+			return new [] {
+				new PredefinedOperator (nullable_bool, Operator.NullableMask | Operator.EqualityMask, bool_type),
+				new PredefinedOperator (nullable_int, Operator.NullableMask | Operator.EqualityMask, bool_type),
+				new PredefinedOperator (nullable_uint, Operator.NullableMask | Operator.EqualityMask, bool_type),
+				new PredefinedOperator (nullable_long, Operator.NullableMask | Operator.EqualityMask, bool_type),
+				new PredefinedOperator (nullable_ulong, Operator.NullableMask | Operator.EqualityMask, bool_type),
+				new PredefinedOperator (nullable_float, Operator.NullableMask | Operator.EqualityMask, bool_type),
+				new PredefinedOperator (nullable_double, Operator.NullableMask | Operator.EqualityMask, bool_type),
+				new PredefinedOperator (nullable_decimal, Operator.NullableMask | Operator.EqualityMask, bool_type)
 			};
 		}
 
 		//
-		// Rules used during binary numeric promotion
+		// 7.2.6.2 Binary numeric promotions
 		//
-		static bool DoNumericPromotion (ResolveContext rc, ref Expression prim_expr, ref Expression second_expr, TypeSpec type)
+		bool DoBinaryOperatorPromotion (ResolveContext rc)
 		{
-			Expression temp;
+			TypeSpec ltype = left.Type;
+			if (ltype.IsNullableType) {
+				ltype = Nullable.NullableInfo.GetUnderlyingType (ltype);
+			}
 
-			Constant c = prim_expr as Constant;
-			if (c != null) {
-				temp = c.ConvertImplicitly (type);
-				if (temp != null) {
-					prim_expr = temp;
-					return true;
-				}
+			//
+			// This is numeric promotion code only
+			//
+			if (ltype.BuiltinType == BuiltinTypeSpec.Type.Bool)
+				return true;
+
+			TypeSpec rtype = right.Type;
+			if (rtype.IsNullableType) {
+				rtype = Nullable.NullableInfo.GetUnderlyingType (rtype);
 			}
 
-			if (type.BuiltinType == BuiltinTypeSpec.Type.UInt) {
-				switch (prim_expr.Type.BuiltinType) {
-				case BuiltinTypeSpec.Type.Int:
-				case BuiltinTypeSpec.Type.Short:
-				case BuiltinTypeSpec.Type.SByte:
-				case BuiltinTypeSpec.Type.Long:
-					type = rc.BuiltinTypes.Long;
+			var lb = ltype.BuiltinType;
+			var rb = rtype.BuiltinType;
+			TypeSpec type;
+			Expression expr;
 
-					if (type != second_expr.Type) {
-						c = second_expr as Constant;
-						if (c != null)
-							temp = c.ConvertImplicitly (type);
-						else
-							temp = Convert.ImplicitNumericConversion (second_expr, type);
-						if (temp == null)
-							return false;
-						second_expr = temp;
-					}
-					break;
+			if (lb == BuiltinTypeSpec.Type.Decimal || rb == BuiltinTypeSpec.Type.Decimal) {
+				type = rc.BuiltinTypes.Decimal;
+			} else if (lb == BuiltinTypeSpec.Type.Double || rb == BuiltinTypeSpec.Type.Double) {
+				type = rc.BuiltinTypes.Double;
+			} else if (lb == BuiltinTypeSpec.Type.Float || rb == BuiltinTypeSpec.Type.Float) {
+				type = rc.BuiltinTypes.Float;
+			} else if (lb == BuiltinTypeSpec.Type.ULong || rb == BuiltinTypeSpec.Type.ULong) {
+				type = rc.BuiltinTypes.ULong;
+
+				if (IsSignedType (lb)) {
+					expr = ConvertSignedConstant (left, type);
+					if (expr == null)
+						return false;
+					left = expr;
+				} else if (IsSignedType (rb)) {
+					expr = ConvertSignedConstant (right, type);
+					if (expr == null)
+						return false;
+					right = expr;
 				}
-			} else if (type.BuiltinType == BuiltinTypeSpec.Type.ULong) {
-				//
-				// A compile-time error occurs if the other operand is of type sbyte, short, int, or long
-				//
-				switch (type.BuiltinType) {
-				case BuiltinTypeSpec.Type.Int:
-				case BuiltinTypeSpec.Type.Long:
-				case BuiltinTypeSpec.Type.Short:
-				case BuiltinTypeSpec.Type.SByte:
-					return false;
+
+			} else if (lb == BuiltinTypeSpec.Type.Long || rb == BuiltinTypeSpec.Type.Long) {
+				type = rc.BuiltinTypes.Long;
+			} else if (lb == BuiltinTypeSpec.Type.UInt || rb == BuiltinTypeSpec.Type.UInt) {
+				type = rc.BuiltinTypes.UInt;
+
+				if (IsSignedType (lb)) {
+					expr = ConvertSignedConstant (left, type);
+					if (expr == null)
+						type = rc.BuiltinTypes.Long;
+				} else if (IsSignedType (rb)) {
+					expr = ConvertSignedConstant (right, type);
+					if (expr == null)
+						type = rc.BuiltinTypes.Long;
 				}
+			} else {
+				type = rc.BuiltinTypes.Int;
 			}
 
-			temp = Convert.ImplicitNumericConversion (prim_expr, type);
-			if (temp == null)
-				return false;
-
-			prim_expr = temp;
-			return true;
-		}
+			if (ltype != type) {
+				expr = PromoteExpression (rc, left, type);
+				if (expr == null)
+					return false;
 
-		//
-		// 7.2.6.2 Binary numeric promotions
-		//
-		public bool DoBinaryOperatorPromotion (ResolveContext ec)
-		{
-			TypeSpec ltype = left.Type;
-			TypeSpec rtype = right.Type;
-			Expression temp;
+				left = expr;
+			}
 
-			foreach (TypeSpec t in ec.BuiltinTypes.BinaryPromotionsTypes) {
-				if (t == ltype)
-					return t == rtype || DoNumericPromotion (ec, ref right, ref left, t);
+			if (rtype != type) {
+				expr = PromoteExpression (rc, right, type);
+				if (expr == null)
+					return false;
 
-				if (t == rtype)
-					return t == ltype || DoNumericPromotion (ec, ref left, ref right, t);
+				right = expr;
 			}
 
-			TypeSpec int32 = ec.BuiltinTypes.Int;
-			if (ltype != int32) {
-				Constant c = left as Constant;
-				if (c != null)
-					temp = c.ConvertImplicitly (int32);
-				else
-					temp = Convert.ImplicitNumericConversion (left, int32);
+			return true;
+		}
 
-				if (temp == null)
-					return false;
-				left = temp;
+		static bool IsSignedType (BuiltinTypeSpec.Type type)
+		{
+			switch (type) {
+			case BuiltinTypeSpec.Type.Int:
+			case BuiltinTypeSpec.Type.Short:
+			case BuiltinTypeSpec.Type.SByte:
+			case BuiltinTypeSpec.Type.Long:
+				return true;
+			default:
+				return false;
 			}
+		}
 
-			if (rtype != int32) {
-				Constant c = right as Constant;
-				if (c != null)
-					temp = c.ConvertImplicitly (int32);
-				else
-					temp = Convert.ImplicitNumericConversion (right, int32);
+		static Expression ConvertSignedConstant (Expression expr, TypeSpec type)
+		{
+			var c = expr as Constant;
+			if (c == null)
+				return null;
 
-				if (temp == null)
-					return false;
-				right = temp;
+			return c.ConvertImplicitly (type);
+		}
+
+		static Expression PromoteExpression (ResolveContext rc, Expression expr, TypeSpec type)
+		{
+			if (expr.Type.IsNullableType) {
+				return Convert.ImplicitConversionStandard (rc, expr,
+					rc.Module.PredefinedTypes.Nullable.TypeSpec.MakeGenericType (rc, new[] { type }), expr.Location);
 			}
 
-			return true;
+			var c = expr as Constant;
+			if (c != null)
+				return c.ConvertImplicitly (type);
+
+			return Convert.ImplicitNumericConversion (expr, type);
 		}
 
 		protected override Expression DoResolve (ResolveContext ec)
@@ -2946,7 +3229,6 @@ namespace Mono.CSharp
 			if (right == null)
 				return null;
 
-			eclass = ExprClass.Value;
 			Constant rc = right as Constant;
 
 			// The conversion rules are ignored in enum context but why
@@ -3045,20 +3327,10 @@ namespace Mono.CSharp
 				return new DynamicExpressionStatement (this, args, loc).Resolve (ec);
 			}
 
-			if (ec.Module.Compiler.Settings.Version >= LanguageVersion.ISO_2 &&
-				((left.Type.IsNullableType && (right is NullLiteral || right.Type.IsNullableType || TypeSpec.IsValueType (right.Type))) ||
-				(TypeSpec.IsValueType (left.Type) && right is NullLiteral) ||
-				(right.Type.IsNullableType && (left is NullLiteral || left.Type.IsNullableType || TypeSpec.IsValueType (left.Type))) ||
-				(TypeSpec.IsValueType (right.Type) && left is NullLiteral))) {
-				var lifted = new Nullable.LiftedBinaryOperator (oper, left, right);
-				lifted.state = state;
-				return lifted.Resolve (ec);
-			}
-
 			return DoResolveCore (ec, left, right);
 		}
 
-		protected Expression DoResolveCore (ResolveContext ec, Expression left_orig, Expression right_orig)
+		Expression DoResolveCore (ResolveContext ec, Expression left_orig, Expression right_orig)
 		{
 			Expression expr = ResolveOperator (ec);
 			if (expr == null)
@@ -3075,6 +3347,13 @@ namespace Mono.CSharp
 
 		public override SLE.Expression MakeExpression (BuilderContext ctx)
 		{
+			return MakeExpression (ctx, left, right);
+		}
+
+		public SLE.Expression MakeExpression (BuilderContext ctx, Expression left, Expression right)
+		{
+			Console.WriteLine ("{0} x {1}", left.Type.GetSignatureForError (), right.Type.GetSignatureForError ());
+
 			var le = left.MakeExpression (ctx);
 			var re = right.MakeExpression (ctx);
 			bool is_checked = ctx.HasSet (BuilderContext.Options.CheckedScope);
@@ -3160,15 +3439,14 @@ namespace Mono.CSharp
 			if (method == null)
 				return new EmptyExpression (ec.BuiltinTypes.Decimal);
 
-			MethodGroupExpr mg = MethodGroupExpr.CreatePredefined (method, ec.BuiltinTypes.Delegate, loc);
-			Expression expr = new UserOperatorCall (mg.BestCandidate, args, CreateExpressionTree, loc);
+			Expression expr = new UserOperatorCall (method, args, CreateExpressionTree, loc);
 			return new ClassCast (expr, l);
 		}
 
 		//
-		// Enumeration operators
+		// Resolves enumeration operators where only single predefined overload exists, handles lifted versions too
 		//
-		Expression ResolveOperatorEnum (ResolveContext ec, bool lenum, bool renum, TypeSpec ltype, TypeSpec rtype)
+		Expression ResolveSingleEnumOperators (ResolveContext rc, bool lenum, bool renum, TypeSpec ltype, TypeSpec rtype)
 		{
 			//
 			// bool operator == (E x, E y);
@@ -3182,264 +3460,388 @@ namespace Mono.CSharp
 			// E operator | (E x, E y);
 			// E operator ^ (E x, E y);
 			//
-			// U operator - (E e, E f)
-			// E operator - (E e, U x)
-			// E operator - (U x, E e)	// LAMESPEC: Not covered by the specification
-			//
-			// E operator + (E e, U x)
-			// E operator + (U x, E e)
-			//
-			Expression ltemp = left;
-			Expression rtemp = right;
-			TypeSpec underlying_type;
-			TypeSpec underlying_type_result;
-			TypeSpec res_type;
 			Expression expr;
-			
-			//
-			// LAMESPEC: There is never ambiguous conversion between enum operators
-			// the one which contains more enum parameters always wins even if there
-			// is an implicit conversion involved
-			//
-			if ((oper & (Operator.ComparisonMask | Operator.BitwiseMask)) != 0) {
-				if (renum) {
-					underlying_type = EnumSpec.GetUnderlyingType (rtype);
-					expr = Convert.ImplicitConversion (ec, left, rtype, loc);
-					if (expr == null)
-						return null;
+			if ((oper & Operator.ComparisonMask) != 0) {
+				type = rc.BuiltinTypes.Bool;
+			} else {
+				if (lenum)
+					type = ltype;
+				else if (renum)
+					type = rtype;
+				else if (ltype.IsNullableType && Nullable.NullableInfo.GetUnderlyingType (ltype).IsEnum)
+					type = ltype;
+				else
+					type = rtype;
+			}
 
-					left = expr;
-					ltype = expr.Type;
-				} else if (lenum) {
-					underlying_type = EnumSpec.GetUnderlyingType (ltype);
-					expr = Convert.ImplicitConversion (ec, right, ltype, loc);
-					if (expr == null)
-						return null;
+			if (ltype == rtype) {
+				if (lenum || renum)
+					return this;
+
+				var lifted = new Nullable.LiftedBinaryOperator (this);
+				lifted.Left = left;
+				lifted.Right = right;
+				return lifted.Resolve (rc);
+			}
 
+			if (renum && !ltype.IsNullableType) {
+				expr = Convert.ImplicitConversion (rc, left, rtype, loc);
+				if (expr != null) {
+					left = expr;
+					return this;
+				}
+			} else if (lenum && !rtype.IsNullableType) {
+				expr = Convert.ImplicitConversion (rc, right, ltype, loc);
+				if (expr != null) {
 					right = expr;
-					rtype = expr.Type;
-				} else {
-					return null;
+					return this;
 				}
+			}
 
-				if ((oper & Operator.BitwiseMask) != 0) {
-					res_type = ltype;
-					underlying_type_result = underlying_type;
-				} else {
-					res_type = null;
-					underlying_type_result = null;
-				}
-			} else if (oper == Operator.Subtraction) {
-				if (renum) {
-					underlying_type = EnumSpec.GetUnderlyingType (rtype);
-					if (ltype != rtype) {
-						expr = Convert.ImplicitConversion (ec, left, rtype, left.Location);
-						if (expr == null) {
-							expr = Convert.ImplicitConversion (ec, left, underlying_type, left.Location);
-							if (expr == null)
-								return null;
-
-							res_type = rtype;
-						} else {
-							res_type = underlying_type;
-						}
+			//
+			// Now try lifted version of predefined operator
+			//
+			var nullable_type = rc.Module.PredefinedTypes.Nullable.TypeSpec;
+			if (nullable_type != null) {
+				if (renum && !ltype.IsNullableType) {
+					var lifted_type = nullable_type.MakeGenericType (rc.Module, new[] { rtype });
 
+					expr = Convert.ImplicitConversion (rc, left, lifted_type, loc);
+					if (expr != null) {
 						left = expr;
-					} else {
-						res_type = underlying_type;
+						right = Convert.ImplicitConversion (rc, right, lifted_type, loc);
 					}
 
-					underlying_type_result = underlying_type;
-				} else if (lenum) {
-					underlying_type = EnumSpec.GetUnderlyingType (ltype);
-					expr = Convert.ImplicitConversion (ec, right, ltype, right.Location);
-					if (expr == null || expr is EnumConstant) {
-						expr = Convert.ImplicitConversion (ec, right, underlying_type, right.Location);
-						if (expr == null)
-							return null;
+					if ((oper & Operator.BitwiseMask) != 0)
+						type = lifted_type;
 
-						res_type = ltype;
-					} else {
-						res_type = underlying_type;
+					if (left.IsNull) {
+						if ((oper & Operator.BitwiseMask) != 0)
+							return Nullable.LiftedNull.CreateFromExpression (rc, this);
+
+						return CreateLiftedValueTypeResult (rc, rtype);
 					}
 
-					right = expr;
-					underlying_type_result = underlying_type;
-				} else {
-					return null;
-				}
-			} else if (oper == Operator.Addition) {
-				if (lenum) {
-					underlying_type = EnumSpec.GetUnderlyingType (ltype);
-					res_type = ltype;
+					if (expr != null) {
+						var lifted = new Nullable.LiftedBinaryOperator (this);
+						lifted.Left = expr;
+						lifted.Right = right;
+						return lifted.Resolve (rc);
+					}
+				} else if (lenum && !rtype.IsNullableType) {
+					var lifted_type = nullable_type.MakeGenericType (rc.Module, new[] { ltype });
+
+					expr = Convert.ImplicitConversion (rc, right, lifted_type, loc);
+					if (expr != null) {
+						right = expr;
+						left = Convert.ImplicitConversion (rc, left, lifted_type, loc);
+					}
 
-					if (rtype != underlying_type && (state & (State.RightNullLifted | State.LeftNullLifted)) == 0) {
-						expr = Convert.ImplicitConversion (ec, right, underlying_type, right.Location);
+					if ((oper & Operator.BitwiseMask) != 0)
+						type = lifted_type;
+
+					if (right.IsNull) {
+						if ((oper & Operator.BitwiseMask) != 0)
+							return Nullable.LiftedNull.CreateFromExpression (rc, this);
+
+						return CreateLiftedValueTypeResult (rc, ltype);
+					}
+
+					if (expr != null) {
+						var lifted = new Nullable.LiftedBinaryOperator (this);
+						lifted.Left = left;
+						lifted.Right = expr;
+						return lifted.Resolve (rc);
+					}
+				} else if (rtype.IsNullableType && Nullable.NullableInfo.GetUnderlyingType (rtype).IsEnum) {
+					if (left.IsNull) {
+						if (rc.HasSet (ResolveContext.Options.ExpressionTreeConversion))
+							left = Convert.ImplicitConversion (rc, left, rtype, left.Location);
+
+						if ((oper & Operator.RelationalMask) != 0)
+							return CreateLiftedValueTypeResult (rc, rtype);
+
+						if ((oper & Operator.BitwiseMask) != 0)
+							return Nullable.LiftedNull.CreateFromExpression (rc, this);
+
+						// Equality operators are valid between E? and null
+						expr = left;
+					} else {
+						expr = Convert.ImplicitConversion (rc, left, Nullable.NullableInfo.GetUnderlyingType (rtype), loc);
 						if (expr == null)
 							return null;
+					}
 
-						right = expr;
+					if (expr != null) {
+						var lifted = new Nullable.LiftedBinaryOperator (this);
+						lifted.Left = expr;
+						lifted.Right = right;
+						return lifted.Resolve (rc);
 					}
-				} else {
-					underlying_type = EnumSpec.GetUnderlyingType (rtype);
-					res_type = rtype;
-					if (ltype != underlying_type) {
-						expr = Convert.ImplicitConversion (ec, left, underlying_type, left.Location);
+				} else if (ltype.IsNullableType && Nullable.NullableInfo.GetUnderlyingType (ltype).IsEnum) {
+					if (right.IsNull) {
+						if (rc.HasSet (ResolveContext.Options.ExpressionTreeConversion))
+							right = Convert.ImplicitConversion (rc, right, ltype, right.Location);
+
+						if ((oper & Operator.RelationalMask) != 0)
+							return CreateLiftedValueTypeResult (rc, ltype);
+
+						if ((oper & Operator.BitwiseMask) != 0)
+							return Nullable.LiftedNull.CreateFromExpression (rc, this);
+
+						// Equality operators are valid between E? and null
+						expr = right;
+					} else {
+						expr = Convert.ImplicitConversion (rc, right, Nullable.NullableInfo.GetUnderlyingType (ltype), loc);
 						if (expr == null)
 							return null;
+					}
 
-						left = expr;
+					if (expr != null) {
+						var lifted = new Nullable.LiftedBinaryOperator (this);
+						lifted.Left = left;
+						lifted.Right = expr;
+						return lifted.Resolve (rc);
 					}
 				}
-
-				underlying_type_result = underlying_type;
-			} else {
-				return null;
 			}
 
-			// Unwrap the constant correctly, so DoBinaryOperatorPromotion can do the magic
-			// with constants and expressions
-			if (left.Type != underlying_type) {
-				if (left is Constant)
-					left = ((Constant) left).ConvertExplicitly (false, underlying_type);
+			return null;
+		}
+
+		static Expression ConvertEnumOperandToUnderlyingType (ResolveContext rc, Expression expr)
+		{
+			TypeSpec underlying_type;
+			if (expr.Type.IsNullableType) {
+				var nt = Nullable.NullableInfo.GetUnderlyingType (expr.Type);
+				if (nt.IsEnum)
+					underlying_type = EnumSpec.GetUnderlyingType (nt);
 				else
-					left = EmptyCast.Create (left, underlying_type);
+					underlying_type = nt;
+			} else if (expr.Type.IsEnum) {
+				underlying_type = EnumSpec.GetUnderlyingType (expr.Type);
+			} else {
+				underlying_type = expr.Type;
 			}
 
-			if (right.Type != underlying_type) {
-				if (right is Constant)
-					right = ((Constant) right).ConvertExplicitly (false, underlying_type);
-				else
-					right = EmptyCast.Create (right, underlying_type);
+			switch (underlying_type.BuiltinType) {
+			case BuiltinTypeSpec.Type.SByte:
+			case BuiltinTypeSpec.Type.Byte:
+			case BuiltinTypeSpec.Type.Short:
+			case BuiltinTypeSpec.Type.UShort:
+				underlying_type = rc.BuiltinTypes.Int;
+				break;
 			}
 
+			if (expr.Type.IsNullableType)
+				underlying_type = rc.Module.PredefinedTypes.Nullable.TypeSpec.MakeGenericType (rc.Module, new[] { underlying_type });
+
+			if (expr.Type == underlying_type)
+				return expr;
+
+			return EmptyCast.Create (expr, underlying_type);
+		}
+
+		Expression ResolveEnumOperators (ResolveContext rc, bool lenum, bool renum, TypeSpec ltype, TypeSpec rtype)
+		{
 			//
-			// C# specification uses explicit cast syntax which means binary promotion
-			// should happen, however it seems that csc does not do that
+			// U operator - (E e, E f)
+			// E operator - (E e, U x)  // Internal decomposition operator
+			// E operator - (U x, E e)	// Internal decomposition operator
 			//
-			if (!DoBinaryOperatorPromotion (ec)) {
-				left = ltemp;
-				right = rtemp;
-				return null;
+			// E operator + (E e, U x)
+			// E operator + (U x, E e)
+			//
+
+			TypeSpec enum_type;
+
+			if (lenum)
+				enum_type = ltype;
+			else if (renum)
+				enum_type = rtype;
+			else if (ltype.IsNullableType && Nullable.NullableInfo.GetUnderlyingType (ltype).IsEnum)
+				enum_type = ltype;
+			else
+				enum_type = rtype;
+
+			Expression expr;
+			if (!enum_type.IsNullableType) {
+				expr = ResolveOperatorPredefined (rc, rc.Module.GetPredefinedEnumAritmeticOperators (enum_type, false), false);
+				if (expr != null) {
+					if (oper == Operator.Subtraction)
+						expr = ConvertEnumSubtractionResult (rc, expr);
+					else
+						expr = ConvertEnumAdditionalResult (expr, enum_type);
+
+					AddEnumResultCast (expr.Type);
+
+					return expr;
+				}
+
+				enum_type = rc.Module.PredefinedTypes.Nullable.TypeSpec.MakeGenericType (rc.Module, new[] { enum_type });
 			}
 
-			if (underlying_type_result != null && left.Type != underlying_type_result) {
-				enum_conversion = Convert.ExplicitNumericConversion (ec, new EmptyExpression (left.Type), underlying_type_result);
+			expr = ResolveOperatorPredefined (rc, rc.Module.GetPredefinedEnumAritmeticOperators (enum_type, true), false);
+			if (expr != null) {
+				if (oper == Operator.Subtraction)
+					expr = ConvertEnumSubtractionResult (rc, expr);
+				else
+					expr = ConvertEnumAdditionalResult (expr, enum_type);
+
+				AddEnumResultCast (expr.Type);
 			}
 
-			expr = ResolveOperatorPredefined (ec, ec.BuiltinTypes.OperatorsBinaryStandard, true, res_type);
-			if (expr == null)
-				return null;
+			return expr;
+		}
 
-			if (!IsCompound)
-				return expr;
+		static Expression ConvertEnumAdditionalResult (Expression expr, TypeSpec enumType)
+		{
+			return EmptyCast.Create (expr, enumType);
+		}
 
+		Expression ConvertEnumSubtractionResult (ResolveContext rc, Expression expr)
+		{
 			//
-			// Section: 7.16.2
+			// Enumeration subtraction has different result type based on
+			// best overload
 			//
+			TypeSpec result_type;
+			if (left.Type == right.Type) {
+				var c = right as EnumConstant;
+				if (c != null && c.IsZeroInteger) {
+					//
+					// LAMESPEC: This is quite unexpected for expression E - 0 the return type is
+					// E which is not what expressions E - 1 or 0 - E return
+					//
+					result_type = left.Type;
+				} else {
+					result_type = left.Type.IsNullableType ?
+						Nullable.NullableInfo.GetEnumUnderlyingType (rc.Module, left.Type) :
+						EnumSpec.GetUnderlyingType (left.Type);
+				}
+			} else if (IsEnumOrNullableEnum (left.Type)) {
+				result_type = left.Type;
+			} else {
+				result_type = right.Type;
+			}
 
-			//
-			// If the return type of the selected operator is implicitly convertible to the type of x
-			//
-			if (Convert.ImplicitConversionExists (ec, expr, ltype))
-				return expr;
+			return EmptyCast.Create (expr, result_type);
+		}
 
-			//
-			// Otherwise, if the selected operator is a predefined operator, if the return type of the
-			// selected operator is explicitly convertible to the type of x, and if y is implicitly
-			// convertible to the type of x or the operator is a shift operator, then the operation
-			// is evaluated as x = (T)(x op y), where T is the type of x
-			//
-			expr = Convert.ExplicitConversion (ec, expr, ltype, loc);
-			if (expr == null)
-				return null;
+		void AddEnumResultCast (TypeSpec type)
+		{
+			if (type.IsNullableType)
+				type = Nullable.NullableInfo.GetUnderlyingType (type);
 
-			if (Convert.ImplicitConversionExists (ec, ltemp, ltype))
-				return expr;
+			if (type.IsEnum)
+				type = EnumSpec.GetUnderlyingType (type);
 
-			return null;
+			switch (type.BuiltinType) {
+			case BuiltinTypeSpec.Type.SByte:
+				enum_conversion = ConvCast.Mode.I4_I1;
+				break;
+			case BuiltinTypeSpec.Type.Byte:
+				enum_conversion = ConvCast.Mode.I4_U1;
+				break;
+			case BuiltinTypeSpec.Type.Short:
+				enum_conversion = ConvCast.Mode.I4_I2;
+				break;
+			case BuiltinTypeSpec.Type.UShort:
+				enum_conversion = ConvCast.Mode.I4_U2;
+				break;
+			}
 		}
 
 		//
-		// 7.9.6 Reference type equality operators
+		// Equality operators rules
 		//
-		Expression ResolveOperatorEquality (ResolveContext ec, TypeSpec l, TypeSpec r)
+		Expression ResolveEquality (ResolveContext ec, TypeSpec l, TypeSpec r, bool primitives_only)
 		{
 			Expression result;
 			type = ec.BuiltinTypes.Bool;
+			bool no_arg_conv = false;
 
-			//
-			// a, Both operands are reference-type values or the value null
-			// b, One operand is a value of type T where T is a type-parameter and
-			// the other operand is the value null. Furthermore T does not have the
-			// value type constraint
-			//
-			// LAMESPEC: Very confusing details in the specification, basically any
-			// reference like type-parameter is allowed
-			//
-			var tparam_l = l as TypeParameterSpec;
-			var tparam_r = r as TypeParameterSpec;
-			if (tparam_l != null) {
-				if (right is NullLiteral && !tparam_l.HasSpecialStruct) {
-					left = new BoxedCast (left, ec.BuiltinTypes.Object);
-					return this;
-				}
+			if (!primitives_only) {
 
-				if (!tparam_l.IsReferenceType)
-					return null;
+				//
+				// a, Both operands are reference-type values or the value null
+				// b, One operand is a value of type T where T is a type-parameter and
+				// the other operand is the value null. Furthermore T does not have the
+				// value type constraint
+				//
+				// LAMESPEC: Very confusing details in the specification, basically any
+				// reference like type-parameter is allowed
+				//
+				var tparam_l = l as TypeParameterSpec;
+				var tparam_r = r as TypeParameterSpec;
+				if (tparam_l != null) {
+					if (right is NullLiteral) {
+						if (tparam_l.GetEffectiveBase ().BuiltinType == BuiltinTypeSpec.Type.ValueType)
+							return null;
 
-				l = tparam_l.GetEffectiveBase ();
-				left = new BoxedCast (left, l);
-			} else if (left is NullLiteral && tparam_r == null) {
-				if (!TypeSpec.IsReferenceType (r) || r.Kind == MemberKind.InternalCompilerType)
-					return null;
+						left = new BoxedCast (left, ec.BuiltinTypes.Object);
+						return this;
+					}
 
-				return this;
-			}
+					if (!tparam_l.IsReferenceType)
+						return null;
 
-			if (tparam_r != null) {
-				if (left is NullLiteral && !tparam_r.HasSpecialStruct) {
-					right = new BoxedCast (right, ec.BuiltinTypes.Object);
-					return this;
+					l = tparam_l.GetEffectiveBase ();
+					left = new BoxedCast (left, l);
+				} else if (left is NullLiteral && tparam_r == null) {
+					if (TypeSpec.IsReferenceType (r))
+						return this;
+
+					if (r.Kind == MemberKind.InternalCompilerType)
+						return null;
 				}
 
-				if (!tparam_r.IsReferenceType)
-					return null;
+				if (tparam_r != null) {
+					if (left is NullLiteral) {
+						if (tparam_r.GetEffectiveBase ().BuiltinType == BuiltinTypeSpec.Type.ValueType)
+							return null;
 
-				r = tparam_r.GetEffectiveBase ();
-				right = new BoxedCast (right, r);
-			} else if (right is NullLiteral) {
-				if (!TypeSpec.IsReferenceType (l) || l.Kind == MemberKind.InternalCompilerType)
-					return null;
+						right = new BoxedCast (right, ec.BuiltinTypes.Object);
+						return this;
+					}
 
-				return this;
-			}
+					if (!tparam_r.IsReferenceType)
+						return null;
 
-			bool no_arg_conv = false;
+					r = tparam_r.GetEffectiveBase ();
+					right = new BoxedCast (right, r);
+				} else if (right is NullLiteral) {
+					if (TypeSpec.IsReferenceType (l))
+						return this;
 
-			//
-			// LAMESPEC: method groups can be compared when they convert to other side delegate
-			//
-			if (l.IsDelegate) {
-				if (right.eclass == ExprClass.MethodGroup) {
-					result = Convert.ImplicitConversion (ec, right, l, loc);
+					if (l.Kind == MemberKind.InternalCompilerType)
+						return null;
+				}
+
+				//
+				// LAMESPEC: method groups can be compared when they convert to other side delegate
+				//
+				if (l.IsDelegate) {
+					if (right.eclass == ExprClass.MethodGroup) {
+						result = Convert.ImplicitConversion (ec, right, l, loc);
+						if (result == null)
+							return null;
+
+						right = result;
+						r = l;
+					} else if (r.IsDelegate && l != r) {
+						return null;
+					}
+				} else if (left.eclass == ExprClass.MethodGroup && r.IsDelegate) {
+					result = Convert.ImplicitConversionRequired (ec, left, r, loc);
 					if (result == null)
 						return null;
 
-					right = result;
-					r = l;
-				} else if (r.IsDelegate && l != r) {
-					return null;
+					left = result;
+					l = r;
+				} else {
+					no_arg_conv = l == r && !l.IsStruct;
 				}
-			} else if (left.eclass == ExprClass.MethodGroup && r.IsDelegate) {
-				result = Convert.ImplicitConversionRequired (ec, left, r, loc);
-				if (result == null)
-					return null;
-
-				left = result;
-				l = r;
-			} else {
-				no_arg_conv = l == r && !l.IsStruct;
 			}
 
 			//
@@ -3457,9 +3859,34 @@ namespace Mono.CSharp
 			// not apply when both operands are of same reference type
 			//
 			if (r.BuiltinType != BuiltinTypeSpec.Type.Object && l.BuiltinType != BuiltinTypeSpec.Type.Object) {
-				result = ResolveOperatorPredefined (ec, ec.BuiltinTypes.OperatorsBinaryEquality, no_arg_conv, null);
+				result = ResolveOperatorPredefined (ec, ec.BuiltinTypes.OperatorsBinaryEquality, no_arg_conv);	
 				if (result != null)
 					return result;
+
+				//
+				// Now try lifted version of predefined operators
+				//
+				if (no_arg_conv && !l.IsNullableType) {
+					//
+					// Optimizes cases which won't match
+					//
+				} else {
+					result = ResolveOperatorPredefined (ec, ec.Module.OperatorsBinaryEqualityLifted, no_arg_conv);
+					if (result != null)
+						return result;
+				}
+
+				//
+				// The == and != operators permit one operand to be a value of a nullable
+				// type and the other to be the null literal, even if no predefined or user-defined
+				// operator (in unlifted or lifted form) exists for the operation.
+				//
+				if ((l.IsNullableType && right.IsNull) || (r.IsNullableType && left.IsNull)) {
+					var lifted = new Nullable.LiftedBinaryOperator (this);
+					lifted.Left = left;
+					lifted.Right = right;
+					return lifted.Resolve (ec);
+				}
 			}
 
 			//
@@ -3527,13 +3954,13 @@ namespace Mono.CSharp
 				return this;
 			}
 
-			return ResolveOperatorPredefined (ec, ec.BuiltinTypes.OperatorsBinaryUnsafe, false, null);
+			return ResolveOperatorPredefined (ec, ec.BuiltinTypes.OperatorsBinaryUnsafe, false);
 		}
 
 		//
 		// Build-in operators method overloading
 		//
-		protected virtual Expression ResolveOperatorPredefined (ResolveContext ec, PredefinedOperator [] operators, bool primitives_only, TypeSpec enum_type)
+		Expression ResolveOperatorPredefined (ResolveContext ec, PredefinedOperator [] operators, bool primitives_only)
 		{
 			PredefinedOperator best_operator = null;
 			TypeSpec l = left.Type;
@@ -3574,41 +4001,68 @@ namespace Mono.CSharp
 			if (best_operator == null)
 				return null;
 
-			Expression expr = best_operator.ConvertResult (ec, this);
+			var expr = best_operator.ConvertResult (ec, this);
 
-			//
-			// Optimize &/&& constant expressions with 0 value
-			//
-			if (oper == Operator.BitwiseAnd || oper == Operator.LogicalAnd) {
-				Constant rc = right as Constant;
-				Constant lc = left as Constant;
-				if (((lc != null && lc.IsDefaultValue) || (rc != null && rc.IsDefaultValue)) && !(this is Nullable.LiftedBinaryOperator)) {
-					//
-					// The result is a constant with side-effect
-					//
-					Constant side_effect = rc == null ?
-						new SideEffectConstant (lc, right, loc) :
-						new SideEffectConstant (rc, left, loc);
+			if ((oper == Operator.BitwiseAnd || oper == Operator.LogicalAnd) && !best_operator.IsLifted) {
+				expr = OptimizeAndOperation (expr);
+			}
 
-					return ReducedExpression.Create (side_effect, expr);
-				}
+			return expr;
+		}
+
+		//
+		// Optimize &/&& constant expressions with 0 value
+		//
+		Expression OptimizeAndOperation (Expression expr)
+		{
+			Constant rc = right as Constant;
+			Constant lc = left as Constant;
+			if ((lc != null && lc.IsDefaultValue) || (rc != null && rc.IsDefaultValue)) {
+				//
+				// The result is a constant with side-effect
+				//
+				Constant side_effect = rc == null ?
+					new SideEffectConstant (lc, right, loc) :
+					new SideEffectConstant (rc, left, loc);
+
+				return ReducedExpression.Create (side_effect, expr);
 			}
 
-			if (enum_type == null)
-				return expr;
+			return expr;
+		}
 
-			//
-			// HACK: required by enum_conversion
-			//
-			expr.Type = enum_type;
-			return EmptyCast.Create (expr, enum_type);
+		//
+		// Value types can be compared with the null literal because of the lifting
+		// language rules. However the result is always true or false.
+		//
+		public Expression CreateLiftedValueTypeResult (ResolveContext rc, TypeSpec valueType)
+		{
+			if (rc.HasSet (ResolveContext.Options.ExpressionTreeConversion)) {
+				type = rc.BuiltinTypes.Bool;
+				return this;
+			}
+
+			// FIXME: Handle side effect constants
+			Constant c = new BoolConstant (rc.BuiltinTypes, Oper == Operator.Inequality, loc);
+
+			if ((Oper & Operator.EqualityMask) != 0) {
+				rc.Report.Warning (472, 2, loc, "The result of comparing value type `{0}' with null is always `{1}'",
+					valueType.GetSignatureForError (), c.GetValueAsLiteral ());
+			} else {
+				rc.Report.Warning (464, 2, loc, "The result of comparing type `{0}' with null is always `{1}'",
+					valueType.GetSignatureForError (), c.GetValueAsLiteral ());
+			}
+
+			return c;
 		}
 
 		//
 		// Performs user-operator overloading
 		//
-		protected virtual Expression ResolveUserOperator (ResolveContext ec, Expression left, Expression right)
+		Expression ResolveUserOperator (ResolveContext rc, Expression left, Expression right)
 		{
+			Expression oper_expr;
+
 			var op = ConvertBinaryToUserOperator (oper);
 			var l = left.Type;
 			if (l.IsNullableType)
@@ -3630,7 +4084,7 @@ namespace Mono.CSharp
 
 			Arguments args = new Arguments (2);
 			Argument larg = new Argument (left);
-			args.Add (larg);
+			args.Add (larg);	
 			Argument rarg = new Argument (right);
 			args.Add (rarg);
 
@@ -3644,50 +4098,198 @@ namespace Mono.CSharp
 				left_operators = right_operators;
 			}
 
-			var res = new OverloadResolver (left_operators, OverloadResolver.Restrictions.ProbingOnly | 
-				OverloadResolver.Restrictions.NoBaseMembers | OverloadResolver.Restrictions.BaseMembersIncluded, loc);
+			const OverloadResolver.Restrictions restr = OverloadResolver.Restrictions.ProbingOnly |
+				OverloadResolver.Restrictions.NoBaseMembers | OverloadResolver.Restrictions.BaseMembersIncluded;
 
-			var oper_method = res.ResolveOperator (ec, ref args);
-			if (oper_method == null)
-				return null;
+			var res = new OverloadResolver (left_operators, restr, loc);
 
-			var llifted = (state & State.LeftNullLifted) != 0;
-			var rlifted = (state & State.RightNullLifted) != 0;
-			if ((Oper & Operator.EqualityMask) != 0) {
-				var parameters = oper_method.Parameters;
-				// LAMESPEC: No idea why this is not allowed
-				if ((left is Nullable.Unwrap || right is Nullable.Unwrap) && parameters.Types [0] != parameters.Types [1])
+			var oper_method = res.ResolveOperator (rc, ref args);
+			if (oper_method == null) {
+				//
+				// Logical && and || cannot be lifted
+				//
+				if ((oper & Operator.LogicalMask) != 0)
+					return null;
+
+				//
+				// Apply lifted user operators only for liftable types. Implicit conversion
+				// to nullable types is not allowed
+				//
+				if (!IsLiftedOperatorApplicable ())
+					return null;
+
+				// TODO: Cache the result in module container
+				var lifted_methods = CreateLiftedOperators (rc, left_operators);
+				if (lifted_methods == null)
+					return null;
+
+				res = new OverloadResolver (lifted_methods, restr | OverloadResolver.Restrictions.ProbingOnly, loc);
+
+				oper_method = res.ResolveOperator (rc, ref args);
+				if (oper_method == null)
 					return null;
 
-				// Binary operation was lifted but we have found a user operator
-				// which requires value-type argument, we downgrade ourself back to
-				// binary operation
-				// LAMESPEC: The user operator is not called (it cannot be we are passing null to struct)
-				// but compilation succeeds
-				if ((llifted && !parameters.Types[0].IsStruct) || (rlifted && !parameters.Types[1].IsStruct)) {
-					state &= ~(State.LeftNullLifted | State.RightNullLifted);
+				MethodSpec best_original = null;
+				foreach (MethodSpec ms in left_operators) {
+					if (ms.MemberDefinition == oper_method.MemberDefinition) {
+						best_original = ms;
+						break;
+					}
 				}
-			}
 
-			Expression oper_expr;
+				if (rc.HasSet (ResolveContext.Options.ExpressionTreeConversion)) {
+					//
+					// Expression trees use lifted notation in this case
+					//
+					this.left = Convert.ImplicitConversion (rc, left, oper_method.Parameters.Types[0], left.Location);
+					this.right = Convert.ImplicitConversion (rc, right, oper_method.Parameters.Types[1], left.Location);
+				}
+
+				var ptypes = best_original.Parameters.Types;
+
+				if (left.IsNull || right.IsNull) {
+					//
+					// The lifted operator produces the value false if one or both operands are null for
+					// relational operators.
+					//
+					if ((oper & Operator.ComparisonMask) != 0) {
+						//
+						// CSC BUG: This should be different warning, csc reports CS0458 with bool? which is wrong
+						// because return type is actually bool
+						//
+						// For some reason CSC does not report this warning for equality operators
+						//
+						return CreateLiftedValueTypeResult (rc, left.IsNull ? ptypes [1] : ptypes [0]);
+					}
+
+					// The lifted operator produces a null value if one or both operands are null
+					//
+					if ((oper & (Operator.ArithmeticMask | Operator.ShiftMask | Operator.BitwiseMask)) != 0) {
+						type = oper_method.ReturnType;
+						return Nullable.LiftedNull.CreateFromExpression (rc, this);
+					}
+				}
+
+				type = oper_method.ReturnType;
+				var lifted = new Nullable.LiftedBinaryOperator (this);
+				lifted.UserOperator = best_original;
 
-			// TODO: CreateExpressionTree is allocated every time
+				if (left.Type.IsNullableType && !ptypes[0].IsNullableType) {
+					lifted.UnwrapLeft = new Nullable.Unwrap (left);
+				}
+
+				if (right.Type.IsNullableType && !ptypes[1].IsNullableType) {
+					lifted.UnwrapRight = new Nullable.Unwrap (right);
+				}
+
+				lifted.Left = Convert.ImplicitConversion (rc, lifted.UnwrapLeft ?? left, ptypes[0], left.Location);
+				lifted.Right = Convert.ImplicitConversion (rc, lifted.UnwrapRight ?? right, ptypes[1], right.Location);
+
+				return lifted.Resolve (rc);
+			}
+			
 			if ((oper & Operator.LogicalMask) != 0) {
+				// TODO: CreateExpressionTree is allocated every time		
 				oper_expr = new ConditionalLogicalOperator (oper_method, args, CreateExpressionTree,
-					oper == Operator.LogicalAnd, loc).Resolve (ec);
+					oper == Operator.LogicalAnd, loc).Resolve (rc);
 			} else {
 				oper_expr = new UserOperatorCall (oper_method, args, CreateExpressionTree, loc);
 			}
 
-			if (!llifted)
-				this.left = larg.Expr;
-
-			if (!rlifted)
-				this.right = rarg.Expr;
+			this.left = larg.Expr;
+			this.right = rarg.Expr;
 
 			return oper_expr;
 		}
 
+		bool IsLiftedOperatorApplicable ()
+		{
+			if (left.Type.IsNullableType) {
+				if ((oper & Operator.EqualityMask) != 0)
+					return !right.IsNull;
+
+				return true;
+			}
+
+			if (right.Type.IsNullableType) {
+				if ((oper & Operator.EqualityMask) != 0)
+					return !left.IsNull;
+
+				return true;
+			}
+
+			if (TypeSpec.IsValueType (left.Type))
+				return right.IsNull;
+
+			if (TypeSpec.IsValueType (right.Type))
+				return left.IsNull;
+
+			return false;
+		}
+
+		List<MemberSpec> CreateLiftedOperators (ResolveContext rc, IList<MemberSpec> operators)
+		{
+			var nullable_type = rc.Module.PredefinedTypes.Nullable.TypeSpec;
+			if (nullable_type == null)
+				return null;
+
+			//
+			// Lifted operators permit predefined and user-defined operators that operate
+			// on non-nullable value types to also be used with nullable forms of those types.
+			// Lifted operators are constructed from predefined and user-defined operators
+			// that meet certain requirements
+			//
+			List<MemberSpec> lifted = null;
+			foreach (MethodSpec oper in operators) {
+				TypeSpec rt;
+				if ((Oper & Operator.ComparisonMask) != 0) {
+					//
+					// Result type must be of type bool for lifted comparison operators
+					//
+					rt = oper.ReturnType;
+					if (rt.BuiltinType != BuiltinTypeSpec.Type.Bool)
+						continue;
+				} else {
+					if (!TypeSpec.IsNonNullableValueType (oper.ReturnType))
+						continue;
+
+					rt = null;
+				}
+
+				var ptypes = oper.Parameters.Types;
+				if (!TypeSpec.IsNonNullableValueType (ptypes [0]) || !TypeSpec.IsNonNullableValueType (ptypes [1]))
+					continue;
+
+				//
+				// LAMESPEC: I am not sure why but for equality operators to be lifted
+				// both types have to match
+				//
+				if ((Oper & Operator.EqualityMask) != 0 && ptypes [0] != ptypes [1])
+					continue;
+
+				if (lifted == null)
+					lifted = new List<MemberSpec> ();
+
+				//
+				// The lifted form is constructed by adding a single ? modifier to each operand and
+				// result type except for comparison operators where return type is bool
+				//
+				if (rt == null)
+					rt = nullable_type.MakeGenericType (rc.Module, new[] { oper.ReturnType });
+
+				var parameters = ParametersCompiled.CreateFullyResolved (
+					nullable_type.MakeGenericType (rc.Module, new [] { ptypes[0] }),
+					nullable_type.MakeGenericType (rc.Module, new [] { ptypes[1] }));
+
+				var lifted_op = new MethodSpec (oper.Kind, oper.DeclaringType, oper.MemberDefinition,
+					rt, parameters, oper.Modifiers);
+
+				lifted.Add (lifted_op);
+			}
+
+			return lifted;
+		}
+
 		//
 		// Merge two sets of user operators into one, they are mostly distinguish
 		// except when they share base type and it contains an operator
@@ -3887,11 +4489,6 @@ namespace Mono.CSharp
 		}
 		
 		public override void Emit (EmitContext ec)
-		{
-			EmitOperator (ec, left.Type);
-		}
-
-		protected virtual void EmitOperator (EmitContext ec, TypeSpec l)
 		{
 			if (ec.HasSet (BuilderContext.Options.AsyncBody) && right.ContainsEmitWithAwait ()) {
 				left = left.EmitToField (ec);
@@ -3932,16 +4529,22 @@ namespace Mono.CSharp
 				}
 			}
 
+			EmitOperator (ec, left, right);
+		}
+
+		public void EmitOperator (EmitContext ec, Expression left, Expression right)
+		{
 			left.Emit (ec);
 			right.Emit (ec);
-			EmitOperatorOpcode (ec, oper, l);
+
+			EmitOperatorOpcode (ec, oper, left.Type, right);
 
 			//
-			// Nullable enum could require underlying type cast and we cannot simply wrap binary
-			// expression because that would wrap lifted binary operation
+			// Emit result enumerable conversion this way because it's quite complicated get it
+			// to resolved tree because expression tree cannot see it.
 			//
-			if (enum_conversion != null)
-				enum_conversion.Emit (ec);
+			if (enum_conversion != 0)
+				ConvCast.Emit (ec, enum_conversion);
 		}
 
 		public override void EmitSideEffect (EmitContext ec)
@@ -4011,7 +4614,7 @@ namespace Mono.CSharp
 			return CreateExpressionTree (ec, null);
 		}
 
-		Expression CreateExpressionTree (ResolveContext ec, Expression method)		
+		public Expression CreateExpressionTree (ResolveContext ec, Expression method)		
 		{
 			string method_name;
 			bool lift_arg = false;
@@ -4460,7 +5063,7 @@ namespace Mono.CSharp
 					if (rtype.BuiltinType == BuiltinTypeSpec.Type.Long || rtype.BuiltinType == BuiltinTypeSpec.Type.ULong)
 						ec.Emit (OpCodes.Conv_I8);
 
-					Binary.EmitOperatorOpcode (ec, Binary.Operator.Multiply, rtype);
+					Binary.EmitOperatorOpcode (ec, Binary.Operator.Multiply, rtype, right);
 				}
 
 				if (left_const == null) {
@@ -4469,7 +5072,7 @@ namespace Mono.CSharp
 					else if (rtype.BuiltinType == BuiltinTypeSpec.Type.ULong)
 						ec.Emit (OpCodes.Conv_U);
 
-					Binary.EmitOperatorOpcode (ec, op, op_type);
+					Binary.EmitOperatorOpcode (ec, op, op_type, right);
 				}
 			}
 		}
@@ -5433,7 +6036,7 @@ namespace Mono.CSharp
 				if (member_expr != null)
 					member_expr = member_expr.Resolve (ec);
 			} else {
-				member_expr = expr.Resolve (ec, ResolveFlags.VariableOrValue | ResolveFlags.MethodGroup);
+				member_expr = expr.Resolve (ec);
 			}
 
 			if (member_expr == null)
@@ -5957,14 +6560,16 @@ namespace Mono.CSharp
 				}
 
 				if (vr != null) {
+					ec.MarkCallEntry (loc);
 					ec.Emit (OpCodes.Call, method);
 					return false;
 				}
 			}
 			
 			if (type is TypeParameterSpec)
-				return DoEmitTypeParameter (ec);			
+				return DoEmitTypeParameter (ec);
 
+			ec.MarkCallEntry (loc);
 			ec.Emit (OpCodes.Newobj, method);
 			return true;
 		}
@@ -8031,7 +8636,7 @@ namespace Mono.CSharp
 
 				e = e.ResolveLValue (rc, right_side);
 			} else {
-				e = e.Resolve (rc, ResolveFlags.VariableOrValue | ResolveFlags.Type);
+				e = e.Resolve (rc, ResolveFlags.VariableOrValue | ResolveFlags.Type | ResolveFlags.MethodGroup);
 			}
 
 			return e;
@@ -9485,6 +10090,7 @@ namespace Mono.CSharp
 		public override void Emit (EmitContext ec)
 		{
 			source.Emit (ec);
+			ec.MarkCallEntry (loc);
 			ec.Emit (OpCodes.Call, method);
 		}
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/flowanalysis.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/flowanalysis.cs
index e71051994e..4fee5a1f70 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/flowanalysis.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/flowanalysis.cs
@@ -800,7 +800,7 @@ namespace Mono.CSharp
 		}
 	}
 
-	public  class FlowBranchingAsync : FlowBranchingBlock
+	public class FlowBranchingAsync : FlowBranchingBlock
 	{
 		readonly AsyncInitializer async_init;
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/import.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/import.cs
index 35d32c1d11..3576f28a7b 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/import.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/import.cs
@@ -774,24 +774,34 @@ namespace Mono.CSharp
 
 					for (int i = nested_hierarchy.Count; i != 0; --i) {
 						var t = nested_hierarchy [i - 1];
-						spec = MemberCache.FindNestedType (spec, t.Name, t.Arity);
+						if (t.Kind == MemberKind.MissingType)
+							spec = t;
+						else
+							spec = MemberCache.FindNestedType (spec, t.Name, t.Arity);
+
 						if (t.Arity > 0) {
 							spec = spec.MakeGenericType (module, targs.Skip (targs_pos).Take (spec.Arity).ToArray ());
 							targs_pos += t.Arity;
 						}
 					}
 
-					string name = type.Name;
-					int index = name.IndexOf ('`');
-					if (index > 0)
-						name = name.Substring (0, index);
+					if (spec.Kind == MemberKind.MissingType) {
+						spec = new TypeSpec (MemberKind.MissingType, spec, new ImportedTypeDefinition (type_def, this), type_def, Modifiers.PUBLIC);
+						spec.MemberCache = MemberCache.Empty;
+					} else {
+						if ((type_def.Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NestedPrivate && IgnorePrivateMembers)
+							return null;
+
+						string name = type.Name;
+						int index = name.IndexOf ('`');
+						if (index > 0)
+							name = name.Substring (0, index);
 
-					spec = MemberCache.FindNestedType (spec, name, targs.Length - targs_pos);
-					if (spec == null)
-						return null;
+						spec = MemberCache.FindNestedType (spec, name, targs.Length - targs_pos);
 
-					if (spec.Arity > 0) {
-						spec = spec.MakeGenericType (module, targs.Skip (targs_pos).ToArray ());
+						if (spec.Arity > 0) {
+							spec = spec.MakeGenericType (module, targs.Skip (targs_pos).ToArray ());
+						}
 					}
 				}
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/location.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/location.cs
index 2d63c312cd..a601200d82 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/location.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/location.cs
@@ -415,6 +415,11 @@ if (checkpoints.Length <= CheckpointIndex) throw new Exception (String.Format ("
 			InactiveCode
 		}
 
+		public bool Suppress {
+			get;
+			set;
+		}
+
 		public class SpecialVisitor
 		{
 			public virtual void Visit (Comment comment)
@@ -486,7 +491,18 @@ if (checkpoints.Length <= CheckpointIndex) throw new Exception (String.Format ("
 		public class PragmaPreProcessorDirective : PreProcessorDirective
 		{
 			public bool Disalbe { get; set; }
-			public List<int> Codes = new List<int> ();
+
+			public int WarningColumn {
+				get;
+				set;
+			}
+
+			public int DisableRestoreColumn {
+				get;
+				set;
+			}
+
+			public List<Constant> Codes = new List<Constant> ();
 
 			public PragmaPreProcessorDirective (int line, int col, int endLine, int endCol, Tokenizer.PreprocessorDirective cmd, string arg) : base (line, col, endLine, endCol, cmd, arg)
 			{
@@ -546,6 +562,8 @@ if (checkpoints.Length <= CheckpointIndex) throw new Exception (String.Format ("
 		[Conditional ("FULL_AST")]
 		public void StartComment (CommentType type, bool startsLine, int startLine, int startCol)
 		{
+			if (Suppress)
+				return;
 			inComment = true;
 			curComment = type;
 			this.startsLine = startsLine;
@@ -557,6 +575,8 @@ if (checkpoints.Length <= CheckpointIndex) throw new Exception (String.Format ("
 		[Conditional ("FULL_AST")]
 		public void PushCommentChar (int ch)
 		{
+			if (Suppress)
+				return;
 			if (ch < 0)
 				return;
 			contentBuilder.Append ((char)ch);
@@ -564,6 +584,8 @@ if (checkpoints.Length <= CheckpointIndex) throw new Exception (String.Format ("
 		[Conditional ("FULL_AST")]
 		public void PushCommentString (string str)
 		{
+			if (Suppress)
+				return;
 			contentBuilder.Append (str);
 		}
 		
@@ -571,15 +593,22 @@ if (checkpoints.Length <= CheckpointIndex) throw new Exception (String.Format ("
 		[Conditional ("FULL_AST")]
 		public void EndComment (int endLine, int endColumn)
 		{
+			if (Suppress)
+				return;
 			if (!inComment)
 				return;
 			inComment = false;
+			// Ignore empty comments
+			if (startLine == endLine && startCol == endColumn)
+				return;
 			Specials.Add (new Comment (curComment, startsLine, startLine, startCol, endLine, endColumn, contentBuilder.ToString ()));
 		}
 		
 		[Conditional ("FULL_AST")]
 		public void AddPreProcessorDirective (int startLine, int startCol, int endLine, int endColumn, Tokenizer.PreprocessorDirective cmd, string arg)
 		{
+			if (Suppress)
+				return;
 			if (inComment)
 				EndComment (startLine, startCol);
 			switch (cmd) {
@@ -595,34 +624,47 @@ if (checkpoints.Length <= CheckpointIndex) throw new Exception (String.Format ("
 			}
 		}
 
-		[Conditional ("FULL_AST")]
-		public void SetPragmaDisable(bool disable)
+		#if FULL_AST
+		public PragmaPreProcessorDirective SetPragmaDisable(bool disable)
 		{
+			if (Suppress)
+				return null;
 			var pragmaDirective = Specials [Specials.Count - 1] as PragmaPreProcessorDirective;
 			if (pragmaDirective == null)
-				return;
+				return null;
 			pragmaDirective.Disalbe = disable;
+			return pragmaDirective;
 		}
+		#endif
 
-		[Conditional ("FULL_AST")]
-		public void AddPragmaCode(int code)
+		public PragmaPreProcessorDirective GetPragmaPreProcessorDirective()
 		{
-			var pragmaDirective = Specials [Specials.Count - 1] as PragmaPreProcessorDirective;
-			if (pragmaDirective == null)
-				return;
-			pragmaDirective.Codes.Add (code);
+			if (Suppress)
+				return null;
+			return Specials [Specials.Count - 1] as PragmaPreProcessorDirective;
 		}
 
+
 		public LineProcessorDirective GetCurrentLineProcessorDirective()
 		{
+			if (Suppress)
+				return null;
 			return Specials [Specials.Count - 1] as LineProcessorDirective;
 		}
 
 		public enum NewLine { Unix, Windows }
 
+		int lastNewLine = -1;
+		int lastNewCol = -1;
 		[Conditional ("FULL_AST")]
 		public void AddNewLine (int line, int col, NewLine newLine)
 		{
+			if (Suppress)
+				return;
+			if (line == lastNewLine && col == lastNewCol)
+				return;
+			lastNewLine = line;
+			lastNewCol = col;
 			Specials.Add (new NewLineToken (line, col, newLine));
 		}
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/module.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/module.cs
index 017664e0b3..ceb73afc74 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/module.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/module.cs
@@ -128,6 +128,9 @@ namespace Mono.CSharp
 		PredefinedTypes predefined_types;
 		PredefinedMembers predefined_members;
 
+		public Binary.PredefinedOperator[] OperatorsBinaryEqualityLifted;
+		public Binary.PredefinedOperator[] OperatorsBinaryLifted;
+
 		static readonly string[] attribute_targets = new string[] { "assembly", "module" };
 
 		public ModuleContainer (CompilerContext context)
@@ -311,7 +314,7 @@ namespace Mono.CSharp
 
 		public override void AddTypeContainer (TypeContainer tc)
 		{
-			containers.Add (tc);
+			AddTypeContainerMember (tc);
 		}
 
 		public override void ApplyAttributeBuilder (Attribute a, MethodSpec ctor, byte[] cdata, PredefinedAttributes pa)
@@ -529,11 +532,37 @@ namespace Mono.CSharp
 			return "<module>";
 		}
 
+		public Binary.PredefinedOperator[] GetPredefinedEnumAritmeticOperators (TypeSpec enumType, bool nullable)
+		{
+			TypeSpec underlying;
+			Binary.Operator mask = 0;
+
+			if (nullable) {
+				underlying = Nullable.NullableInfo.GetEnumUnderlyingType (this, enumType);
+				mask = Binary.Operator.NullableMask;
+			} else {
+				underlying = EnumSpec.GetUnderlyingType (enumType);
+			}
+
+			var operators = new[] {
+				new Binary.PredefinedOperator (enumType, underlying,
+					mask | Binary.Operator.AdditionMask | Binary.Operator.SubtractionMask | Binary.Operator.DecomposedMask, enumType),
+				new Binary.PredefinedOperator (underlying, enumType,
+					mask | Binary.Operator.AdditionMask | Binary.Operator.SubtractionMask | Binary.Operator.DecomposedMask, enumType),
+				new Binary.PredefinedOperator (enumType, mask | Binary.Operator.SubtractionMask, underlying)
+			};
+
+			return operators;
+		}
+
 		public void InitializePredefinedTypes ()
 		{
 			predefined_attributes = new PredefinedAttributes (this);
 			predefined_types = new PredefinedTypes (this);
 			predefined_members = new PredefinedMembers (this);
+
+			OperatorsBinaryEqualityLifted = Binary.CreateEqualityLiftedOperatorsTable (this);
+			OperatorsBinaryLifted = Binary.CreateStandardLiftedOperatorsTable (this);
 		}
 
 		public override bool IsClsComplianceRequired ()
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/namespace.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/namespace.cs
index 7965e05ed1..9f0914738c 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/namespace.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/namespace.cs
@@ -760,6 +760,11 @@ namespace Mono.CSharp {
 
 			return Compiler.Settings.IsConditionalSymbolDefined (value);
 		}
+
+		public override void Accept (StructuralVisitor visitor)
+		{
+			visitor.Visit (this);
+		}
 	}
 
 
@@ -895,7 +900,7 @@ namespace Mono.CSharp {
 			MemberCore mc;
 			if (names_container.DefinedNames.TryGetValue (name, out mc)) {
 				if (tc is NamespaceContainer && mc is NamespaceContainer) {
-					containers.Add (tc);
+					AddTypeContainerMember (tc);
 					return;
 				}
 
@@ -1065,6 +1070,9 @@ namespace Mono.CSharp {
 
 		public override void GetCompletionStartingWith (string prefix, List<string> results)
 		{
+			if (Usings == null)
+				return;
+
 			foreach (var un in Usings) {
 				if (un.Alias != null)
 					continue;
@@ -1333,7 +1341,7 @@ namespace Mono.CSharp {
 
 			return false;
 		}
-		
+
 		public override void Accept (StructuralVisitor visitor)
 		{
 			visitor.Visit (this);
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/nullable.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/nullable.cs
index badf5e1a73..96afce4fd5 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/nullable.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/nullable.cs
@@ -13,6 +13,7 @@
 //
 
 using System;
+using SLE = System.Linq.Expressions;
 
 #if STATIC
 using IKVM.Reflection.Emit;
@@ -81,6 +82,12 @@ namespace Mono.CSharp.Nullable
 		{
 			return ((InflatedTypeSpec) nullableType).TypeArguments[0];
 		}
+
+		public static TypeSpec GetEnumUnderlyingType (ModuleContainer module, TypeSpec nullableEnum)
+		{
+			return module.PredefinedTypes.Nullable.TypeSpec.MakeGenericType (module,
+				new[] { EnumSpec.GetUnderlyingType (GetUnderlyingType (nullableEnum)) });
+		}
 	}
 
 	public class Unwrap : Expression, IMemoryLocation
@@ -88,9 +95,10 @@ namespace Mono.CSharp.Nullable
 		Expression expr;
 
 		LocalTemporary temp;
+		Expression temp_field;
 		readonly bool useDefaultValue;
 
-		Unwrap (Expression expr, bool useDefaultValue)
+		public Unwrap (Expression expr, bool useDefaultValue = true)
 		{
 			this.expr = expr;
 			this.loc = expr.Location;
@@ -105,6 +113,7 @@ namespace Mono.CSharp.Nullable
 			return expr.ContainsEmitWithAwait ();
 		}
 
+		// TODO: REMOVE
 		public static Expression Create (Expression expr)
 		{
 			//
@@ -117,6 +126,18 @@ namespace Mono.CSharp.Nullable
 			return Create (expr, false);
 		}
 
+		public static Expression CreateUnwrapped (Expression expr)
+		{
+			//
+			// Avoid unwraping and wraping of same type
+			//
+			Wrap wrap = expr as Wrap;
+			if (wrap != null)
+				return wrap.Child;
+
+			return Create (expr, true);
+		}
+
 		public static Unwrap Create (Expression expr, bool useDefaultValue)
 		{
 			return new Unwrap (expr, useDefaultValue);
@@ -166,6 +187,14 @@ namespace Mono.CSharp.Nullable
 			call.EmitPredefined (ec, NullableInfo.GetHasValue (expr.Type), null);
 		}
 
+		public override Expression EmitToField (EmitContext ec)
+		{
+			if (temp_field == null)
+				temp_field = this.expr.EmitToField (ec);
+			
+			return this;
+		}
+
 		public override bool Equals (object obj)
 		{
 			Unwrap uw = obj as Unwrap;
@@ -189,9 +218,9 @@ namespace Mono.CSharp.Nullable
 			}
 		}
 
-		void Store (EmitContext ec)
+		public void Store (EmitContext ec)
 		{
-			if (temp != null)
+			if (temp != null || temp_field != null)
 				return;
 
 			if (expr is VariableReference)
@@ -203,20 +232,35 @@ namespace Mono.CSharp.Nullable
 
 		public void Load (EmitContext ec)
 		{
-			if (expr is VariableReference)
+			if (temp_field != null)
+				temp_field.Emit (ec);
+			else if (expr is VariableReference)
 				expr.Emit (ec);
 			else
 				LocalVariable.Emit (ec);
 		}
 
-		public override System.Linq.Expressions.Expression MakeExpression (BuilderContext ctx)
+		public override SLE.Expression MakeExpression (BuilderContext ctx)
 		{
 			return expr.MakeExpression (ctx);
 		}
 
 		public void AddressOf (EmitContext ec, AddressOp mode)
 		{
-			IMemoryLocation ml = expr as VariableReference;
+			IMemoryLocation ml;
+
+			if (temp_field != null) {
+				ml = temp_field as IMemoryLocation;
+				if (ml == null) {
+					var lt = new LocalTemporary (temp_field.Type);
+					temp_field.Emit (ec);
+					lt.Store (ec);
+					ml = lt;
+				}
+			} else {
+				ml = expr as VariableReference;
+			}
+
 			if (ml != null)
 				ml.AddressOf (ec, mode);
 			else
@@ -228,7 +272,7 @@ namespace Mono.CSharp.Nullable
 		//
 		LocalTemporary LocalVariable {
 			get {
-				if (temp == null)
+				if (temp == null && temp_field == null)
 					temp = new LocalTemporary (expr.Type);
 				return temp;
 			}
@@ -279,6 +323,12 @@ namespace Mono.CSharp.Nullable
 				return child_cast.CreateExpressionTree (ec);
 			}
 
+			var user_cast = child as UserCast;
+			if (user_cast != null) {
+				child.Type = type;
+				return user_cast.CreateExpressionTree (ec);
+			}
+
 			return base.CreateExpressionTree (ec);
 		}
 
@@ -317,10 +367,12 @@ namespace Mono.CSharp.Nullable
 			return new LiftedNull (nullable, loc);
 		}
 
-		public static Constant CreateFromExpression (ResolveContext ec, Expression e)
+		public static Constant CreateFromExpression (ResolveContext rc, Expression e)
 		{
-			ec.Report.Warning (458, 2, e.Location, "The result of the expression is always `null' of type `{0}'",
-				e.Type.GetSignatureForError ());
+			if (!rc.HasSet (ResolveContext.Options.ExpressionTreeConversion)) {
+				rc.Report.Warning (458, 2, e.Location, "The result of the expression is always `null' of type `{0}'",
+					e.Type.GetSignatureForError ());
+			}
 
 			return ReducedExpression.Create (Create (e.Type, e.Location), e);
 		}
@@ -349,12 +401,12 @@ namespace Mono.CSharp.Nullable
 	//
 	// Generic lifting expression, supports all S/S? -> T/T? cases
 	//
-	public class Lifted : Expression, IMemoryLocation
+	public class LiftedConversion : Expression, IMemoryLocation
 	{
 		Expression expr, null_value;
 		Unwrap unwrap;
 
-		public Lifted (Expression expr, Unwrap unwrap, TypeSpec type)
+		public LiftedConversion (Expression expr, Unwrap unwrap, TypeSpec type)
 		{
 			this.expr = expr;
 			this.unwrap = unwrap;
@@ -362,7 +414,7 @@ namespace Mono.CSharp.Nullable
 			this.type = type;
 		}
 
-		public Lifted (Expression expr, Expression unwrap, TypeSpec type)
+		public LiftedConversion (Expression expr, Expression unwrap, TypeSpec type)
 			: this (expr, unwrap as Unwrap, type)
 		{
 		}
@@ -393,9 +445,11 @@ namespace Mono.CSharp.Nullable
 
 			// Wrap target for T?
 			if (type.IsNullableType) {
-				expr = Wrap.Create (expr, type);
-				if (expr == null)
-					return null;
+				if (!expr.Type.IsNullableType) {
+					expr = Wrap.Create (expr, type);
+					if (expr == null)
+						return null;
+				}
 
 				null_value = LiftedNull.Create (type, loc);
 			} else if (TypeSpec.IsValueType (type)) {
@@ -422,6 +476,7 @@ namespace Mono.CSharp.Nullable
 			ec.MarkLabel (is_null_label);
 
 			null_value.Emit (ec);
+
 			ec.MarkLabel (end_label);
 		}
 
@@ -540,266 +595,90 @@ namespace Mono.CSharp.Nullable
 		}
 	}
 
-	public class LiftedBinaryOperator : Binary
+	//
+	// Lifted version of binary operators
+	//
+	class LiftedBinaryOperator : Expression
 	{
-		Unwrap left_unwrap, right_unwrap;
-		Expression left_orig, right_orig;
-		Expression user_operator;
-		MethodSpec wrap_ctor;
-
-		public LiftedBinaryOperator (Binary.Operator op, Expression left, Expression right)
-			: base (op, left, right)
+		public LiftedBinaryOperator (Binary b)
 		{
+			this.Binary = b;
+			this.loc = b.Location;
 		}
 
-		bool IsBitwiseBoolean {
-			get {
-				return (Oper == Operator.BitwiseAnd || Oper == Operator.BitwiseOr) &&
-				((left_unwrap != null && left_unwrap.Type.BuiltinType == BuiltinTypeSpec.Type.Bool) ||
-				 (right_unwrap != null && right_unwrap.Type.BuiltinType == BuiltinTypeSpec.Type.Bool));
-			}
-		}
+		public Binary Binary { get; private set; }
 
-		bool IsLeftNullLifted {
-			get {
-				return (state & State.LeftNullLifted) != 0;
-			}
-		}
+		public Expression Left { get; set; }
 
-		bool IsRightNullLifted {
-			get {
-				return (state & State.RightNullLifted) != 0;
-			}
-		}
+		public Expression Right { get; set; }
 
-		public override Expression CreateExpressionTree (ResolveContext ec)
-		{
-			if (user_operator != null)
-				return user_operator.CreateExpressionTree (ec);
+		public Unwrap UnwrapLeft { get; set; }
 
-			return base.CreateExpressionTree (ec);
-		}
+		public Unwrap UnwrapRight { get; set; }
 
-		//
-		// CSC 2 has this behavior, it allows structs to be compared
-		// with the null literal *outside* of a generics context and
-		// inlines that as true or false.
-		//
-		Constant CreateNullConstant (ResolveContext ec, Expression expr)
-		{
-			// FIXME: Handle side effect constants
-			Constant c = new BoolConstant (ec.BuiltinTypes, Oper == Operator.Inequality, loc);
+		public MethodSpec UserOperator { get; set; }
 
-			if ((Oper & Operator.EqualityMask) != 0) {
-				ec.Report.Warning (472, 2, loc, "The result of comparing value type `{0}' with null is always `{1}'",
-					expr.Type.GetSignatureForError (), c.GetValueAsLiteral ());
-			} else {
-				ec.Report.Warning (464, 2, loc, "The result of comparing type `{0}' with null is always `{1}'",
-					expr.Type.GetSignatureForError (), c.GetValueAsLiteral ());
+		bool IsBitwiseBoolean {
+			get {
+				return (Binary.Oper == Binary.Operator.BitwiseAnd || Binary.Oper == Binary.Operator.BitwiseOr) &&
+				((UnwrapLeft != null && UnwrapLeft.Type.BuiltinType == BuiltinTypeSpec.Type.Bool) ||
+				 (UnwrapRight != null && UnwrapRight.Type.BuiltinType == BuiltinTypeSpec.Type.Bool));
 			}
-
-			return ReducedExpression.Create (c, this);
 		}
 
-		protected override Expression DoResolve (ResolveContext ec)
+		public override bool ContainsEmitWithAwait ()
 		{
-			if ((Oper & Operator.LogicalMask) != 0) {
-				Error_OperatorCannotBeApplied (ec, left, right);
-				return null;
-			}
-
-			bool use_default_call = (Oper & (Operator.BitwiseMask | Operator.EqualityMask)) != 0;
-			left_orig = left;
-			if (left.Type.IsNullableType) {
-				left = left_unwrap = Unwrap.Create (left, use_default_call);
-				if (left == null)
-					return null;
-			}
-
-			right_orig = right;
-			if (right.Type.IsNullableType) {
-				right = right_unwrap = Unwrap.Create (right, use_default_call);
-				if (right == null)
-					return null;
-			}
-
-			//
-			// Some details are in 6.4.2, 7.2.7
-			// Arguments can be lifted for equal operators when the return type is bool and both
-			// arguments are of same type
-			//	
-			if (left_orig is NullLiteral) {
-				left = right;
-				state |= State.LeftNullLifted;
-				type = ec.BuiltinTypes.Bool;
-			}
-
-			if (right_orig.IsNull) {
-				if ((Oper & Operator.ShiftMask) != 0)
-					right = new EmptyExpression (ec.BuiltinTypes.Int);
-				else
-					right = left;
-
-				state |= State.RightNullLifted;
-				type = ec.BuiltinTypes.Bool;
-			}
-
-			eclass = ExprClass.Value;
-			return DoResolveCore (ec, left_orig, right_orig);
+			return Left.ContainsEmitWithAwait () || Right.ContainsEmitWithAwait ();
 		}
 
-		void EmitBitwiseBoolean (EmitContext ec)
+		public override Expression CreateExpressionTree (ResolveContext rc)
 		{
-			Label load_left = ec.DefineLabel ();
-			Label load_right = ec.DefineLabel ();
-			Label end_label = ec.DefineLabel ();
-
-			// null & value, null | value
-			if (left_unwrap == null) {
-				left_unwrap = right_unwrap;
-				right_unwrap = null;
-				right = left;
-			}
-
-			left_unwrap.Emit (ec);
-			ec.Emit (OpCodes.Brtrue, load_right);
-
-			// value & null, value | null
-			if (right_unwrap != null) {
-				right_unwrap.Emit (ec);
-				ec.Emit (OpCodes.Brtrue_S, load_left);
-			}
-
-			left_unwrap.EmitCheck (ec);
-			ec.Emit (OpCodes.Brfalse_S, load_right);
-
-			// load left
-			ec.MarkLabel (load_left);
+			if (UserOperator != null) {
+				Arguments args = new Arguments (2);
+				args.Add (new Argument (Binary.Left));
+				args.Add (new Argument (Binary.Right));
 
-			if (Oper == Operator.BitwiseAnd) {
-				left_unwrap.Load (ec);
-			} else {
-				if (right_unwrap == null) {
-					right.Emit (ec);
-					if (right is EmptyConstantCast || right is EmptyCast)
-						ec.Emit (OpCodes.Newobj, NullableInfo.GetConstructor (type));
-				} else {
-					right_unwrap.Load (ec);
-					right_unwrap = left_unwrap;
-				}
-			}
-			ec.Emit (OpCodes.Br_S, end_label);
-
-			// load right
-			ec.MarkLabel (load_right);
-			if (right_unwrap == null) {
-				if (Oper == Operator.BitwiseAnd) {
-					right.Emit (ec);
-					if (right is EmptyConstantCast || right is EmptyCast)
-						ec.Emit (OpCodes.Newobj, NullableInfo.GetConstructor (type));
-				} else {
-					left_unwrap.Load (ec);
-				}
-			} else {
-				right_unwrap.Load (ec);
+				var method = new UserOperatorCall (UserOperator, args, Binary.CreateExpressionTree, loc);
+				return method.CreateExpressionTree (rc);
 			}
 
-			ec.MarkLabel (end_label);
+			return Binary.CreateExpressionTree (rc);
 		}
 
-		//
-		// Emits optimized equality or inequality operator when possible
-		//
-		void EmitEquality (EmitContext ec)
+		protected override Expression DoResolve (ResolveContext rc)
 		{
-			//
-			// Either left or right is null
-			//
-			if (left_unwrap != null && (IsRightNullLifted || right.IsNull)) {
-				left_unwrap.EmitCheck (ec);
-				if (Oper == Binary.Operator.Equality) {
-					ec.EmitInt (0);
-					ec.Emit (OpCodes.Ceq);
-				}
-				return;
-			}
-
-			if (right_unwrap != null && (IsLeftNullLifted || left.IsNull)) {
-				right_unwrap.EmitCheck (ec);
-				if (Oper == Binary.Operator.Equality) {
-					ec.EmitInt (0);
-					ec.Emit (OpCodes.Ceq);
-				}
-				return;
-			}
-
-			Label dissimilar_label = ec.DefineLabel ();
-			Label end_label = ec.DefineLabel ();
+			if (rc.IsRuntimeBinder) {
+				if (UnwrapLeft == null && !Left.Type.IsNullableType)
+					Left = Wrap.Create (Left, rc.Module.PredefinedTypes.Nullable.TypeSpec.MakeGenericType (rc.Module, new[] { Left.Type }));
 
-			if (user_operator != null) {
-				user_operator.Emit (ec);
-				ec.Emit (Oper == Operator.Equality ? OpCodes.Brfalse_S : OpCodes.Brtrue_S, dissimilar_label);
+				if (UnwrapRight == null && !Right.Type.IsNullableType)
+					Right = Wrap.Create (Right, rc.Module.PredefinedTypes.Nullable.TypeSpec.MakeGenericType (rc.Module, new[] { Right.Type }));
 			} else {
-				if (ec.HasSet (BuilderContext.Options.AsyncBody) && right.ContainsEmitWithAwait ()) {
-					left = left.EmitToField (ec);
-					right = right.EmitToField (ec);
+				if (UnwrapLeft == null && Left != null && Left.Type.IsNullableType) {
+					Left = Unwrap.CreateUnwrapped (Left);
+					UnwrapLeft = Left as Unwrap;
 				}
 
-				left.Emit (ec);
-				right.Emit (ec);
-
-				ec.Emit (OpCodes.Bne_Un_S, dissimilar_label);
-			}
-
-			if (left_unwrap != null)
-				left_unwrap.EmitCheck (ec);
-
-			if (right_unwrap != null)
-				right_unwrap.EmitCheck (ec);
-
-			if (left_unwrap != null && right_unwrap != null) {
-				if (Oper == Operator.Inequality)
-					ec.Emit (OpCodes.Xor);
-				else
-					ec.Emit (OpCodes.Ceq);
-			} else {
-				if (Oper == Operator.Inequality) {
-					ec.EmitInt (0);
-					ec.Emit (OpCodes.Ceq);
+				if (UnwrapRight == null && Right != null && Right.Type.IsNullableType) {
+					Right = Unwrap.CreateUnwrapped (Right);
+					UnwrapRight = Right as Unwrap;
 				}
 			}
 
-			ec.Emit (OpCodes.Br_S, end_label);
-
-			ec.MarkLabel (dissimilar_label);
-			if (Oper == Operator.Inequality)
-				ec.EmitInt (1);
-			else
-				ec.EmitInt (0);
+			type = Binary.Type;
+			eclass = Binary.eclass;	
 
-			ec.MarkLabel (end_label);
+			return this;
 		}
-		
-		public override void EmitBranchable (EmitContext ec, Label target, bool onTrue)
-		{
-			Emit (ec);
-			ec.Emit (onTrue ? OpCodes.Brtrue : OpCodes.Brfalse, target);
-		}			
 
 		public override void Emit (EmitContext ec)
 		{
-			//
-			// Optimize same expression operation
-			//
-			if (right_unwrap != null && right.Equals (left))
-				right_unwrap = left_unwrap;
-
-			if (user_operator == null && IsBitwiseBoolean) {
+			if (IsBitwiseBoolean && UserOperator == null) {
 				EmitBitwiseBoolean (ec);
 				return;
 			}
 
-			if ((Oper & Operator.EqualityMask) != 0) {
+			if ((Binary.Oper & Binary.Operator.EqualityMask) != 0) {
 				EmitEquality (ec);
 				return;
 			}
@@ -807,28 +686,48 @@ namespace Mono.CSharp.Nullable
 			Label is_null_label = ec.DefineLabel ();
 			Label end_label = ec.DefineLabel ();
 
-			if (left_unwrap != null) {
-				left_unwrap.EmitCheck (ec);
-				ec.Emit (OpCodes.Brfalse, is_null_label);
+			if (ec.HasSet (BuilderContext.Options.AsyncBody) && Right.ContainsEmitWithAwait ()) {
+				Left = Left.EmitToField (ec);
+				Right = Right.EmitToField (ec);
+			}
+
+			if (UnwrapLeft != null) {
+				UnwrapLeft.EmitCheck (ec);
 			}
 
 			//
 			// Don't emit HasValue check when left and right expressions are same
 			//
-			if (right_unwrap != null && !left.Equals (right)) {
-				right_unwrap.EmitCheck (ec);
-				ec.Emit (OpCodes.Brfalse, is_null_label);
+			if (UnwrapRight != null && !Binary.Left.Equals (Binary.Right)) {
+				UnwrapRight.EmitCheck (ec);
+				if (UnwrapLeft != null) {
+					ec.Emit (OpCodes.And);
+				}
 			}
 
-			EmitOperator (ec, left.Type);
+			ec.Emit (OpCodes.Brfalse, is_null_label);
+
+			if (UserOperator != null) {
+				var args = new Arguments (2);
+				args.Add (new Argument (Left));
+				args.Add (new Argument (Right));
+
+				var call = new CallEmitter ();
+				call.EmitPredefined (ec, UserOperator, args);
+			} else {
+				Binary.EmitOperator (ec, Left, Right);
+			}
 
-			if (wrap_ctor != null)
-				ec.Emit (OpCodes.Newobj, wrap_ctor);
+			//
+			// Wrap the result when the operator return type is nullable type
+			//
+			if (type.IsNullableType)
+				ec.Emit (OpCodes.Newobj, NullableInfo.GetConstructor (type));
 
 			ec.Emit (OpCodes.Br_S, end_label);
 			ec.MarkLabel (is_null_label);
 
-			if ((Oper & Operator.ComparisonMask) != 0) {
+			if ((Binary.Oper & Binary.Operator.ComparisonMask) != 0) {
 				ec.EmitInt (0);
 			} else {
 				LiftedNull.Create (type, loc).Emit (ec);
@@ -837,170 +736,283 @@ namespace Mono.CSharp.Nullable
 			ec.MarkLabel (end_label);
 		}
 
-		protected override void EmitOperator (EmitContext ec, TypeSpec l)
+		void EmitBitwiseBoolean (EmitContext ec)
 		{
-			if (user_operator != null) {
-				user_operator.Emit (ec);
-				return;
-			}
+			Label load_left = ec.DefineLabel ();
+			Label load_right = ec.DefineLabel ();
+			Label end_label = ec.DefineLabel ();
+			Label is_null_label = ec.DefineLabel ();
 
-			if (left.Type.IsNullableType) {
-				l = NullableInfo.GetUnderlyingType (left.Type);
-				left = EmptyCast.Create (left, l);
-			}
+			bool or = Binary.Oper == Binary.Operator.BitwiseOr;
 
-			if (right.Type.IsNullableType) {
-				right = EmptyCast.Create (right, NullableInfo.GetUnderlyingType (right.Type));
-			}
+			//
+			// Both operands are bool? types
+			//
+			if (UnwrapLeft != null && UnwrapRight != null) {
+				if (ec.HasSet (BuilderContext.Options.AsyncBody) && Binary.Right.ContainsEmitWithAwait ()) {
+					Left = Left.EmitToField (ec);
+					Right = Right.EmitToField (ec);
+				}
 
-			base.EmitOperator (ec, l);
-		}
+				Left.Emit (ec);
+				ec.Emit (OpCodes.Brtrue_S, load_right);
 
-		Expression LiftResult (ResolveContext ec, Expression res_expr)
-		{
-			TypeSpec lifted_type;
+				Right.Emit (ec);
+				ec.Emit (OpCodes.Brtrue_S, load_left);
 
-			//
-			// Avoid double conversion
-			//
-			if (left_unwrap == null || IsLeftNullLifted || left_unwrap.Type != left.Type || (left_unwrap != null && IsRightNullLifted)) {
-				lifted_type = new NullableType (left.Type, loc).ResolveAsType (ec);
-				if (lifted_type == null)
-					return null;
+				UnwrapLeft.EmitCheck (ec);
+				ec.Emit (OpCodes.Brfalse_S, load_right);
 
-				if (left is UserCast || left is EmptyCast || left is OpcodeCast)
-					left.Type = lifted_type;
+				// load left
+				ec.MarkLabel (load_left);
+				if (or)
+					UnwrapRight.Load (ec);
 				else
-					left = EmptyCast.Create (left, lifted_type);
-			}
+					UnwrapLeft.Load (ec);
 
-			if (left != right && (right_unwrap == null || IsRightNullLifted || right_unwrap.Type != right.Type || (right_unwrap != null && IsLeftNullLifted))) {
-				lifted_type = new NullableType (right.Type, loc).ResolveAsType (ec);
-				if (lifted_type == null)
-					return null;
-
-				var r = right;
-				if (r is ReducedExpression)
-					r = ((ReducedExpression) r).OriginalExpression;
+				ec.Emit (OpCodes.Br_S, end_label);
 
-				if (r is UserCast || r is EmptyCast || r is OpcodeCast)
-					r.Type = lifted_type;
+				// load right
+				ec.MarkLabel (load_right);
+				if (or)
+					UnwrapLeft.Load (ec);
 				else
-					right = EmptyCast.Create (right, lifted_type);
+					UnwrapRight.Load (ec);
+
+				ec.MarkLabel (end_label);
+				return;
 			}
 
-			if ((Oper & Operator.ComparisonMask) == 0) {
-				lifted_type = new NullableType (res_expr.Type, loc).ResolveAsType (ec);
-				if (lifted_type == null)
-					return null;
+			//
+			// Faster version when one operand is bool
+			//
+			if (UnwrapLeft == null) {
+				//
+				// (bool, bool?)
+				//
+				// Optimizes remaining (false & bool?), (true | bool?) which are not easy to handle
+				// in binary expression reduction
+				//
+				var c = Left as BoolConstant;
+				if (c != null) {
+					// Keep evaluation order
+					UnwrapRight.Store (ec);
+
+					ec.EmitInt (or ? 1 : 0);
+					ec.Emit (OpCodes.Newobj, NullableInfo.GetConstructor (type));
+				} else if (Left.IsNull) {
+					UnwrapRight.Emit (ec);
+					ec.Emit (or ? OpCodes.Brfalse_S : OpCodes.Brtrue_S, is_null_label);
+
+					UnwrapRight.Load (ec);
+					ec.Emit (OpCodes.Br_S, end_label);
+
+					ec.MarkLabel (is_null_label);
+					LiftedNull.Create (type, loc).Emit (ec);
+				} else {
+					Left.Emit (ec);
+					ec.Emit (or ? OpCodes.Brfalse_S : OpCodes.Brtrue_S, load_right);
 
-				wrap_ctor = NullableInfo.GetConstructor (lifted_type);
-				type = res_expr.Type = lifted_type;
-			}
+					ec.EmitInt (or ? 1 : 0);
+					ec.Emit (OpCodes.Newobj, NullableInfo.GetConstructor (type));
 
-			if (IsLeftNullLifted) {
-				left = LiftedNull.Create (right.Type, left.Location);
+					ec.Emit (OpCodes.Br_S, end_label);
 
+					ec.MarkLabel (load_right);
+					UnwrapRight.Original.Emit (ec);
+				}
+			} else {
 				//
-				// Special case for bool?, the result depends on both null right side and left side value
+				// (bool?, bool)
 				//
-				if ((Oper == Operator.BitwiseAnd || Oper == Operator.BitwiseOr) && NullableInfo.GetUnderlyingType (type).BuiltinType == BuiltinTypeSpec.Type.Bool) {
-					return res_expr;
-				}
-
-				if ((Oper & (Operator.ArithmeticMask | Operator.ShiftMask | Operator.BitwiseMask)) != 0)
-					return LiftedNull.CreateFromExpression (ec, res_expr);
+				// Keep left-right evaluation order
+				UnwrapLeft.Store (ec);
 
 				//
-				// Value types and null comparison
+				// Optimizes remaining (bool? & false), (bool? | true) which are not easy to handle
+				// in binary expression reduction
 				//
-				if (right_unwrap == null || (Oper & Operator.RelationalMask) != 0)
-					return CreateNullConstant (ec, right_orig);
+				var c = Right as BoolConstant;
+				if (c != null) {
+					ec.EmitInt (or ? 1 : 0);
+					ec.Emit (OpCodes.Newobj, NullableInfo.GetConstructor (type));
+				} else if (Right.IsNull) {
+					UnwrapLeft.Emit (ec);
+					ec.Emit (or ? OpCodes.Brfalse_S : OpCodes.Brtrue_S, is_null_label);
+
+					UnwrapLeft.Load (ec);
+					ec.Emit (OpCodes.Br_S, end_label);
+
+					ec.MarkLabel (is_null_label);
+					LiftedNull.Create (type, loc).Emit (ec);
+				} else {
+					Right.Emit (ec);
+					ec.Emit (or ? OpCodes.Brfalse_S : OpCodes.Brtrue_S, load_right);
+
+					ec.EmitInt (or ? 1 : 0);
+					ec.Emit (OpCodes.Newobj, NullableInfo.GetConstructor (type));
+
+					ec.Emit (OpCodes.Br_S, end_label);
+
+					ec.MarkLabel (load_right);
+
+					UnwrapLeft.Load (ec);
+				}
 			}
 
-			if (IsRightNullLifted) {
-				right = LiftedNull.Create (left.Type, right.Location);
+			ec.MarkLabel (end_label);
+ 		}
 
+		//
+		// Emits optimized equality or inequality operator when possible
+		//
+		void EmitEquality (EmitContext ec)
+		{
+			//
+			// Either left or right is null
+			// 
+			if (UnwrapLeft != null && Binary.Right.IsNull) { // TODO: Optimize for EmitBranchable
 				//
-				// Special case for bool?, the result depends on both null right side and left side value
+				// left.HasValue == false 
 				//
-				if ((Oper == Operator.BitwiseAnd || Oper == Operator.BitwiseOr) && NullableInfo.GetUnderlyingType (type).BuiltinType == BuiltinTypeSpec.Type.Bool) {
-					return res_expr;
+				UnwrapLeft.EmitCheck (ec);
+				if (Binary.Oper == Binary.Operator.Equality) {
+					ec.EmitInt (0);
+					ec.Emit (OpCodes.Ceq);
 				}
+				return;
+			}
 
-				if ((Oper & (Operator.ArithmeticMask | Operator.ShiftMask | Operator.BitwiseMask)) != 0)
-					return LiftedNull.CreateFromExpression (ec, res_expr);
-
+			if (UnwrapRight != null && Binary.Left.IsNull) {
 				//
-				// Value types and null comparison
+				// right.HasValue == false 
 				//
-				if (left_unwrap == null || (Oper & Operator.RelationalMask) != 0)
-					return CreateNullConstant (ec, left_orig);
+				UnwrapRight.EmitCheck (ec);
+				if (Binary.Oper == Binary.Operator.Equality) {
+					ec.EmitInt (0);
+					ec.Emit (OpCodes.Ceq);
+				}
+				return;
 			}
 
-			return res_expr;
-		}
+			Label dissimilar_label = ec.DefineLabel ();
+			Label end_label = ec.DefineLabel ();
 
-		protected override Expression ResolveOperatorPredefined (ResolveContext ec, Binary.PredefinedOperator [] operators, bool primitives_only, TypeSpec enum_type)
-		{
-			Expression e = base.ResolveOperatorPredefined (ec, operators, primitives_only, enum_type);
+			if (UserOperator != null) {
+				var left = Left;
 
-			if (e == this || enum_type != null)
-				return LiftResult (ec, e);
+				if (UnwrapLeft != null) {
+					UnwrapLeft.EmitCheck (ec);
+				} else {
+					// Keep evaluation order same
+					if (!(Left is VariableReference)) {
+						Left.Emit (ec);
+						var lt = new LocalTemporary (Left.Type);
+						lt.Store (ec);
+						left = lt;
+					}
+				}
 
-			//
-			// 7.9.9 Equality operators and null
-			//
-			// The == and != operators permit one operand to be a value of a nullable type and
-			// the other to be the null literal, even if no predefined or user-defined operator
-			// (in unlifted or lifted form) exists for the operation.
-			//
-			if (e == null && (Oper & Operator.EqualityMask) != 0) {
-				if ((IsLeftNullLifted && right_unwrap != null) || (IsRightNullLifted && left_unwrap != null))
-					return LiftResult (ec, this);
-			}
+				if (UnwrapRight != null) {
+					UnwrapRight.EmitCheck (ec);
 
-			return e;
-		}
+					if (UnwrapLeft != null) {
+						ec.Emit (OpCodes.Bne_Un, dissimilar_label);
 
-		protected override Expression ResolveUserOperator (ResolveContext ec, Expression left, Expression right)
-		{
-			//
-			// Try original types first for exact match without unwrapping
-			//
-			Expression expr = base.ResolveUserOperator (ec, left_orig, right_orig);
-			if (expr != null)
-				return expr;
+						Label compare_label = ec.DefineLabel ();
+						UnwrapLeft.EmitCheck (ec);
+						ec.Emit (OpCodes.Brtrue, compare_label);
 
-			State orig_state = state;
+						if (Binary.Oper == Binary.Operator.Equality)
+							ec.EmitInt (1);
+						else
+							ec.EmitInt (0);
 
-			//
-			// One side is a nullable type, try to match underlying types
-			//
-			if (left_unwrap != null || right_unwrap != null || (state & (State.RightNullLifted | State.LeftNullLifted)) != 0) {
-				expr = base.ResolveUserOperator (ec, left, right);
+						ec.Emit (OpCodes.Br, end_label);
+
+						ec.MarkLabel (compare_label);
+					} else {
+						ec.Emit (OpCodes.Brfalse, dissimilar_label);
+					}
+				} else {
+					ec.Emit (OpCodes.Brfalse, dissimilar_label);
+				}
+
+				var args = new Arguments (2);
+				args.Add (new Argument (left));
+				args.Add (new Argument (Right));
+
+				var call = new CallEmitter ();
+				call.EmitPredefined (ec, UserOperator, args);
+			} else {
+				if (ec.HasSet (BuilderContext.Options.AsyncBody) && Binary.Right.ContainsEmitWithAwait ()) {
+					Left = Left.EmitToField (ec);
+					Right = Right.EmitToField (ec);
+				}
+
+				//
+				// Emit underlying value comparison first.
+				//
+				// For this code: int? a = 1; bool b = a == 1;
+				//
+				// We emit something similar to this. Expressions with side effects have local
+				// variable created by Unwrap expression
+				//
+				//	left.GetValueOrDefault ()
+				//	right
+				//	bne.un.s   dissimilar_label
+				//  left.HasValue
+				//	br.s       end_label
+				// dissimilar_label:
+				//	ldc.i4.0
+				// end_label:
+				//
+
+				Left.Emit (ec);
+				Right.Emit (ec);
+
+				ec.Emit (OpCodes.Bne_Un_S, dissimilar_label);
+
+				//
+				// Check both left and right expressions for Unwrap call in which
+				// case we need to run get_HasValue() check because the type is
+				// nullable and could have null value
+				//
+				if (UnwrapLeft != null)
+					UnwrapLeft.EmitCheck (ec);
+
+				if (UnwrapRight != null)
+					UnwrapRight.EmitCheck (ec);
+
+				if (UnwrapLeft != null && UnwrapRight != null) {
+					if (Binary.Oper == Binary.Operator.Inequality)
+						ec.Emit (OpCodes.Xor);
+					else
+						ec.Emit (OpCodes.Ceq);
+				} else {
+					if (Binary.Oper == Binary.Operator.Inequality) {
+						ec.EmitInt (0);
+						ec.Emit (OpCodes.Ceq);
+					}
+				}
 			}
 
-			if (expr == null)
-				return null;
+			ec.Emit (OpCodes.Br_S, end_label);
 
-			//
-			// Lift the result in the case it can be null and predefined or user operator
-			// result type is of a value type
-			//
-			if (!TypeSpec.IsValueType (expr.Type))
-				return null;
+			ec.MarkLabel (dissimilar_label);
+			if (Binary.Oper == Binary.Operator.Inequality)
+				ec.EmitInt (1);
+			else
+				ec.EmitInt (0);
 
-			if (state != orig_state)
-				return expr;
+			ec.MarkLabel (end_label);
+		}
 
-			expr = LiftResult (ec, expr);
-			if (expr is Constant)
-				return expr;
+		public override SLE.Expression MakeExpression (BuilderContext ctx)
+		{
+			Console.WriteLine (":{0} x {1}", Left.GetType (), Right.GetType ());
 
-			type = expr.Type;
-			user_operator = expr;
-			return this;
+			return Binary.MakeExpression (ctx, Left, Right);
 		}
 	}
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/property.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/property.cs
index 6172fa8c86..3e76e36333 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/property.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/property.cs
@@ -253,7 +253,7 @@ namespace Mono.CSharp
 					return;
 				}
 
-				base.ApplyAttributeBuilder (a, ctor, cdata, pa);
+				base.ApplyToExtraTarget (a, ctor, cdata, pa);
 			}
 
 			public override ParametersCompiled ParameterInfo {
@@ -1171,7 +1171,7 @@ namespace Mono.CSharp
 					return;
 				}
 
-				base.ApplyAttributeBuilder (a, ctor, cdata, pa);
+				base.ApplyToExtraTarget (a, ctor, cdata, pa);
 			}
 
 			public override AttributeTargets AttributeTargets {
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/statement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/statement.cs
index 92d596f854..4afe0abf6b 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/statement.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/statement.cs
@@ -57,6 +57,7 @@ namespace Mono.CSharp {
 			}
 
 			ec.StartFlowBranching (FlowBranching.BranchingType.Block, loc);
+			ec.CurrentBranching.CurrentUsageVector.Goto ();
 			bool ok = Resolve (ec);
 			ec.KillFlowBranching ();
 
@@ -1197,10 +1198,7 @@ namespace Mono.CSharp {
 				return false;
 			}
 
-			if (ec.Switch.DefaultLabel == null) {
-				FlowBranchingBlock.Error_UnknownLabel (loc, "default", ec.Report);
-				return false;
-			}
+			ec.Switch.RegisterGotoCase (null, null);
 
 			return true;
 		}
@@ -1221,7 +1219,6 @@ namespace Mono.CSharp {
 	/// </summary>
 	public class GotoCase : Statement {
 		Expression expr;
-		SwitchLabel sl;
 		
 		public GotoCase (Expression e, Location l)
 		{
@@ -1234,6 +1231,8 @@ namespace Mono.CSharp {
  				return this.expr;
 			}
 		}
+
+		public SwitchLabel Label { get; set; }
 		
 		public override bool Resolve (BlockContext ec)
 		{
@@ -1244,13 +1243,8 @@ namespace Mono.CSharp {
 
 			ec.CurrentBranching.CurrentUsageVector.Goto ();
 
-			expr = expr.Resolve (ec);
-			if (expr == null)
-				return false;
-
-			Constant c = expr as Constant;
+			Constant c = expr.ResolveLabelConstant (ec);
 			if (c == null) {
-				ec.Report.Error (150, expr.Location, "A constant value is expected");
 				return false;
 			}
 
@@ -1272,13 +1266,13 @@ namespace Mono.CSharp {
 
 			}
 
-			sl = ec.Switch.ResolveGotoCase (ec, res);
+			ec.Switch.RegisterGotoCase (this, res);
 			return true;
 		}
 
 		protected override void DoEmit (EmitContext ec)
 		{
-			ec.Emit (OpCodes.Br, sl.GetILLabel (ec));
+			ec.Emit (OpCodes.Br, Label.GetILLabel (ec));
 		}
 
 		protected override void CloneTo (CloneContext clonectx, Statement t)
@@ -2249,6 +2243,11 @@ namespace Mono.CSharp {
 				scope_initializers.Add (s);
 			}
 		}
+
+		public void InsertStatement (int index, Statement s)
+		{
+			statements.Insert (index, s);
+		}
 		
 		public void AddStatement (Statement s)
 		{
@@ -2627,6 +2626,24 @@ namespace Mono.CSharp {
 								if (pb.StateMachine == storey)
 									break;
 
+								//
+								// If we are state machine with no parent we can hook into we don't
+ 								// add reference but capture this directly
+								//
+								ExplicitBlock parent_storey_block = pb;
+								while (parent_storey_block.Parent != null) {
+									parent_storey_block = parent_storey_block.Parent.Explicit;
+									if (parent_storey_block.AnonymousMethodStorey != null) {
+										break;
+									}
+								}
+
+								if (parent_storey_block.AnonymousMethodStorey == null) {
+									pb.StateMachine.AddCapturedThisField (ec);
+									b.HasCapturedThis = true;
+									continue;
+								}
+
 								pb.StateMachine.AddParentStoreyReference (ec, storey);
 							}
 							
@@ -3628,6 +3645,9 @@ namespace Mono.CSharp {
 
 		public override bool Resolve (BlockContext bc)
 		{
+			if (ResolveAndReduce (bc))
+				bc.Switch.RegisterLabel (bc, this);
+
 			bc.CurrentBranching.CurrentUsageVector.ResetBarrier ();
 
 			return base.Resolve (bc);
@@ -3637,29 +3657,25 @@ namespace Mono.CSharp {
 		// Resolves the expression, reduces it to a literal if possible
 		// and then converts it to the requested type.
 		//
-		public bool ResolveAndReduce (ResolveContext ec, TypeSpec required_type, bool allow_nullable)
-		{	
-			Expression e = label.Resolve (ec);
-
-			if (e == null)
-				return false;
+		bool ResolveAndReduce (ResolveContext rc)
+		{
+			if (IsDefault)
+				return true;
 
-			Constant c = e as Constant;
-			if (c == null){
-				ec.Report.Error (150, loc, "A constant value is expected");
+			var c = label.ResolveLabelConstant (rc);
+			if (c == null)
 				return false;
-			}
 
-			if (allow_nullable && c is NullLiteral) {
+			if (rc.Switch.IsNullable && c is NullLiteral) {
 				converted = c;
 				return true;
 			}
 
-			converted = c.ImplicitConversionRequired (ec, required_type, loc);
+			converted = c.ImplicitConversionRequired (rc, rc.Switch.SwitchType, loc);
 			return converted != null;
 		}
 
-		public void Error_AlreadyOccurs (ResolveContext ec, TypeSpec switch_type, SwitchLabel collision_with)
+		public void Error_AlreadyOccurs (ResolveContext ec, SwitchLabel collision_with)
 		{
 			string label;
 			if (converted == null)
@@ -3765,6 +3781,8 @@ namespace Mono.CSharp {
 		Dictionary<string, SwitchLabel> string_labels;
 		List<SwitchLabel> case_labels;
 
+		List<Tuple<GotoCase, Constant>> goto_cases;
+
 		/// <summary>
 		///   The governing switch type
 		/// </summary>
@@ -3884,88 +3902,40 @@ namespace Mono.CSharp {
 			};
 		}
 
-		//
-		// Performs the basic sanity checks on the switch statement
-		// (looks for duplicate keys and non-constant expressions).
-		//
-		// It also returns a hashtable with the keys that we will later
-		// use to compute the switch tables
-		//
-		bool ResolveLabels (ResolveContext ec, Constant value)
+		public void RegisterLabel (ResolveContext rc, SwitchLabel sl)
 		{
-			bool error = false;
-			if (SwitchType.BuiltinType == BuiltinTypeSpec.Type.String) {
-				string_labels = new Dictionary<string, SwitchLabel> ();
-			} else {
-				labels = new Dictionary<long, SwitchLabel> ();
-			}
+			case_labels.Add (sl);
 
-			case_labels = new List<SwitchLabel> ();
-			int default_label_index = -1;
-			bool constant_label_found = false;
-
-			for (int i = 0; i < block.Statements.Count; ++i) {
-				var s = block.Statements[i];
-
-				var sl = s as SwitchLabel;
-				if (sl == null) {
-					continue;
-				}
-
-				case_labels.Add (sl);
-
-				if (sl.IsDefault) {
-					if (case_default != null) {
-						sl.Error_AlreadyOccurs (ec, SwitchType, case_default);
-						error = true;
-					}
-
-					default_label_index = i;
+			if (sl.IsDefault) {
+				if (case_default != null) {
+					sl.Error_AlreadyOccurs (rc, case_default);
+				} else {
 					case_default = sl;
-					continue;
 				}
 
-				if (!sl.ResolveAndReduce (ec, SwitchType, IsNullable)) {
-					error = true;
-					continue;
-				}
+				return;
+			}
 
-				try {
-					if (string_labels != null) {
-						string string_value = sl.Converted.GetValue () as string;
-						if (string_value == null)
-							case_null = sl;
-						else
-							string_labels.Add (string_value, sl);
+			try {
+				if (string_labels != null) {
+					string string_value = sl.Converted.GetValue () as string;
+					if (string_value == null)
+						case_null = sl;
+					else
+						string_labels.Add (string_value, sl);
+				} else {
+					if (sl.Converted is NullLiteral) {
+						case_null = sl;
 					} else {
-						if (sl.Converted is NullLiteral) {
-							case_null = sl;
-						} else {
-							labels.Add (sl.Converted.GetValueAsLong (), sl);
-						}
+						labels.Add (sl.Converted.GetValueAsLong (), sl);
 					}
-				} catch (ArgumentException) {
-					if (string_labels != null)
-						sl.Error_AlreadyOccurs (ec, SwitchType, string_labels[(string) sl.Converted.GetValue ()]);
-					else
-						sl.Error_AlreadyOccurs (ec, SwitchType, labels[sl.Converted.GetValueAsLong ()]);
-
-					error = true;
-				}
-
-				if (value != null) {
-					var constant_label = constant_label_found ? null : FindLabel (value);
-					if (constant_label == null || constant_label != sl)
-						block.Statements[i] = new EmptyStatement (s.loc);
-					else
-						constant_label_found = true;
 				}
+			} catch (ArgumentException) {
+				if (string_labels != null)
+					sl.Error_AlreadyOccurs (rc, string_labels[(string) sl.Converted.GetValue ()]);
+				else
+					sl.Error_AlreadyOccurs (rc, labels[sl.Converted.GetValueAsLong ()]);
 			}
-
-			if (value != null && constant_label_found && default_label_index >= 0)
-				block.Statements[default_label_index] = new EmptyStatement (case_default.loc);
-
-			return !error;
 		}
 		
 		//
@@ -4158,24 +4128,29 @@ namespace Mono.CSharp {
 			if (block.Statements.Count == 0)
 				return true;
 
-			var constant = new_expr as Constant;
+			if (SwitchType.BuiltinType == BuiltinTypeSpec.Type.String) {
+				string_labels = new Dictionary<string, SwitchLabel> ();
+			} else {
+				labels = new Dictionary<long, SwitchLabel> ();
+			}
 
-			if (!ResolveLabels (ec, constant))
-				return false;
+			case_labels = new List<SwitchLabel> ();
+
+			var constant = new_expr as Constant;
 
 			//
 			// Don't need extra variable for constant switch or switch with
 			// only default case
 			//
-			if (constant == null && (case_labels.Count - (case_default != null ? 1 : 0)) != 0) {
+			if (constant == null) {
 				//
 				// Store switch expression for comparison purposes
 				//
 				value = new_expr as VariableReference;
-				if (value == null) {
-					// Create temporary variable inside switch scope
+				if (value == null && !HasOnlyDefaultSection ()) {
 					var current_block = ec.CurrentBlock;
 					ec.CurrentBlock = Block;
+					// Create temporary variable inside switch scope
 					value = TemporaryVariableReference.Create (SwitchType, ec.CurrentBlock, loc);
 					value.Resolve (ec);
 					ec.CurrentBlock = current_block;
@@ -4198,6 +4173,33 @@ namespace Mono.CSharp {
 			ec.EndFlowBranching ();
 			ec.Switch = old_switch;
 
+			//
+			// Check if all goto cases are valid. Needs to be done after switch
+			// is resolved becuase goto can jump forward in the scope.
+			//
+			if (goto_cases != null) {
+				foreach (var gc in goto_cases) {
+					if (gc.Item1 == null) {
+						if (DefaultLabel == null) {
+							FlowBranchingBlock.Error_UnknownLabel (loc, "default", ec.Report);
+						}
+
+						continue;
+					}
+
+					var sl = FindLabel (gc.Item2);
+					if (sl == null) {
+						FlowBranchingBlock.Error_UnknownLabel (loc, "case " + gc.Item2.GetValueAsLiteral (), ec.Report);
+					} else {
+						gc.Item1.Label = sl;
+					}
+				}
+			}
+
+			if (constant != null) {
+				ResolveUnreachableSections (ec, constant);
+			}
+
 			if (!ok)
 				return false;
 
@@ -4206,23 +4208,34 @@ namespace Mono.CSharp {
 			}
 
 			//
-			// Needed to emit anonymous storey initialization before
+			// Anonymous storey initialization has to happen before
 			// any generated switch dispatch
 			//
-			block.AddScopeStatement (new DispatchStatement (this));
+			block.InsertStatement (0, new DispatchStatement (this));
 
 			return true;
 		}
 
-		public SwitchLabel ResolveGotoCase (ResolveContext rc, Constant value)
+		bool HasOnlyDefaultSection ()
 		{
-			var sl = FindLabel (value);
+			for (int i = 0; i < block.Statements.Count; ++i) {
+				var s = block.Statements[i] as SwitchLabel;
 
-			if (sl == null) {
-				FlowBranchingBlock.Error_UnknownLabel (loc, "case " + value.GetValueAsLiteral (), rc.Report);
+				if (s == null || s.IsDefault)
+					continue;
+
+				return false;
 			}
 
-			return sl;
+			return true;
+		}
+
+		public void RegisterGotoCase (GotoCase gotoCase, Constant value)
+		{
+			if (goto_cases == null)
+				goto_cases = new List<Tuple<GotoCase, Constant>> ();
+
+			goto_cases.Add (Tuple.Create (gotoCase, value));
 		}
 
 		//
@@ -4283,6 +4296,38 @@ namespace Mono.CSharp {
 			string_dictionary = new SimpleAssign (switch_cache_field, initializer.Resolve (ec));
 		}
 
+		void ResolveUnreachableSections (BlockContext bc, Constant value)
+		{
+			var constant_label = FindLabel (value) ?? case_default;
+
+			bool found = false;
+			bool unreachable_reported = false;
+			for (int i = 0; i < block.Statements.Count; ++i) {
+				var s = block.Statements[i];
+
+				if (s is SwitchLabel) {
+					if (unreachable_reported) {
+						found = unreachable_reported = false;
+					}
+
+					found |= s == constant_label;
+					continue;
+				}
+
+				if (found) {
+					unreachable_reported = true;
+					continue;
+				}
+
+				if (!unreachable_reported) {
+					unreachable_reported = true;
+					bc.Report.Warning (162, 2, s.loc, "Unreachable code detected");
+				}
+
+				block.Statements[i] = new EmptyStatement (s.loc);
+			}
+		}
+
 		void DoEmitStringSwitch (EmitContext ec)
 		{
 			Label l_initialized = ec.DefineLabel ();
@@ -4393,12 +4438,6 @@ namespace Mono.CSharp {
 				return;
 			}
 
-			//
-			// Mark sequence point explicitly to switch
-			//
-			ec.Mark (block.StartLocation);
-			block.IsCompilerGenerated = true;
-
 			if (string_dictionary != null) {
 				DoEmitStringSwitch (ec);
 			} else if (case_labels.Count < 4 || string_labels != null) {
@@ -4434,6 +4473,14 @@ namespace Mono.CSharp {
 				} else if (new_expr != value) {
 					value.EmitAssign (ec, new_expr, false, false);
 				}
+
+
+				//
+				// Next statement is compiler generated we don't need extra
+				// nop when we can use the statement for sequence point
+				//
+				ec.Mark (block.StartLocation);
+				block.IsCompilerGenerated = true;
 			}
 
 			block.Emit (ec);
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/support.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/support.cs
index fa63a971b7..d127d7289f 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/support.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/support.cs
@@ -327,4 +327,38 @@ namespace Mono.CSharp {
 			}
 		}
 	}
+
+	struct TypeNameParser
+	{
+		internal static string Escape(string name)
+		{
+			if (name == null) {
+				return null;
+			}
+			StringBuilder sb = null;
+			for (int pos = 0; pos < name.Length; pos++) {
+				char c = name[pos];
+				switch (c) {
+					case '\\':
+					case '+':
+					case ',':
+					case '[':
+					case ']':
+					case '*':
+					case '&':
+						if (sb == null) {
+							sb = new StringBuilder(name, 0, pos, name.Length + 3);
+						}
+						sb.Append("\\").Append(c);
+						break;
+					default:
+						if (sb != null) {
+							sb.Append(c);
+						}
+						break;
+				}
+			}
+			return sb != null ? sb.ToString() : name;
+		}
+	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/typemanager.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/typemanager.cs
index 6eb7648ce5..b77dfef531 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/typemanager.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/typemanager.cs
@@ -835,15 +835,22 @@ namespace Mono.CSharp
 			}
 
 			if (best_match == null && reportErrors) {
-				Location loc;
-				if (found[0].MemberDefinition is MemberCore) {
-					loc = ((MemberCore) found[0].MemberDefinition).Location;
+				var found_member = found[0];
+
+				if (found_member.Kind == MemberKind.MissingType) {
+					// CSC: should be different error number
+					module.Compiler.Report.Error (518, "The predefined type `{0}.{1}' is defined in an assembly that is not referenced.", ns, name);
 				} else {
-					loc = Location.Null;
-					module.Compiler.Report.SymbolRelatedToPreviousError (found[0]);
-				}
+					Location loc;
+					if (found_member.MemberDefinition is MemberCore) {
+						loc = ((MemberCore) found_member.MemberDefinition).Location;
+					} else {
+						loc = Location.Null;
+						module.Compiler.Report.SymbolRelatedToPreviousError (found_member);
+					}
 
-				module.Compiler.Report.Error (520, loc, "The predefined type `{0}.{1}' is not declared correctly", ns, name);
+					module.Compiler.Report.Error (520, loc, "The predefined type `{0}.{1}' is not declared correctly", ns, name);
+				}
 			}
 
 			return best_match;
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/typespec.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/typespec.cs
index 2657956a2f..3740a8c54a 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/typespec.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/typespec.cs
@@ -653,6 +653,20 @@ namespace Mono.CSharp
 			}
 		}
 
+		public static bool IsNonNullableValueType (TypeSpec t)
+		{
+			switch (t.Kind) {
+			case MemberKind.TypeParameter:
+				return ((TypeParameterSpec) t).IsValueType;
+			case MemberKind.Struct:
+				return !t.IsNullableType;
+			case MemberKind.Enum:
+				return true;
+			default:
+				return false;
+			}
+		}
+
 		public static bool IsValueType (TypeSpec t)
 		{
 			switch (t.Kind) {
@@ -784,6 +798,31 @@ namespace Mono.CSharp
 		{
 			modifiers |= Modifiers.METHOD_EXTENSION;
 		}
+
+		public void UpdateInflatedInstancesBaseType ()
+		{
+			//
+			// When nested class has a partial part the situation where parent type
+			// is inflated before its base type is defined can occur. In such case
+			// all inflated (should be only 1) instansted need to be updated
+			//
+			// partial class A<T> {
+			//   partial class B : A<int> { }
+			// }
+			//
+			// partial class A<T> : X {}
+			//
+			if (inflated_instances == null)
+				return;
+
+			foreach (var inflated in inflated_instances) {
+				//
+				// Don't need to inflate possible generic type because for now the method
+				// is always used from within the nested type
+				//
+				inflated.Value.BaseType = base_type;
+			}
+		}
 	}
 
 	//
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/visit.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/visit.cs
index 2411bf56e4..446f56bedb 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/visit.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/visit.cs
@@ -51,7 +51,11 @@ namespace Mono.CSharp
 		public virtual void Visit (UsingExternAlias uea)
 		{
 		}
-		
+
+		public virtual void Visit (CompilationSourceFile csf)
+		{
+		}
+
 		public virtual void Visit (Class c)
 		{
 			VisitTypeDefinition (c);
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/PatternMatching/AnyType.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/PatternMatching/AnyType.cs
new file mode 100644
index 0000000000..41e3778dae
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/PatternMatching/AnyType.cs
@@ -0,0 +1,37 @@
+//
+// AnyType.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp;
+
+namespace ICSharpCode.NRefactory.PatternMatching
+{
+
+
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Properties/AssemblyInfo.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Properties/AssemblyInfo.cs
index 4dcf57290f..e19210c5db 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Properties/AssemblyInfo.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Properties/AssemblyInfo.cs
@@ -15,6 +15,7 @@
 // FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
+using System.Runtime.CompilerServices;
 
 #region Using directives
 
@@ -29,3 +30,4 @@ using System.Runtime.InteropServices;
 // associated with an assembly.
 [assembly: AssemblyTitle("ICSharpCode.NRefactory.CSharp")]
 [assembly: AssemblyDescription("C# parser and semantic analysis")]
+[assembly: InternalsVisibleTo("ICSharpCode.NRefactory.CSharp.Refactoring, PublicKey=00240000048000009400000006020000002400005253413100040000010001004dcf3979c4e902efa4dd2163a039701ed5822e6f1134d77737296abbb97bf0803083cfb2117b4f5446a217782f5c7c634f9fe1fc60b4c11d62c5b3d33545036706296d31903ddcf750875db38a8ac379512f51620bb948c94d0831125fbc5fe63707cbb93f48c1459c4d1749eb7ac5e681a2f0d6d7c60fa527a3c0b8f92b02bf")]
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/QueryExpressionExpander.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/QueryExpressionExpander.cs
index 2bde5e761c..2870e824ed 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/QueryExpressionExpander.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/QueryExpressionExpander.cs
@@ -47,8 +47,7 @@ namespace ICSharpCode.NRefactory.CSharp {
 
 	public class QueryExpressionExpander {
 		class Visitor : DepthFirstAstVisitor<AstNode> {
-			int currentTransparentParameter;
-			const string TransparentParameterNameTemplate = "<>x{0}";
+			internal IEnumerator<string> TransparentIdentifierNamePicker;
 
 			protected override AstNode VisitChildren(AstNode node) {
 				List<AstNode> newChildren = null;
@@ -122,6 +121,15 @@ namespace ICSharpCode.NRefactory.CSharp {
 				expressions[orig] = newExpr;
 			}
 
+			internal static IEnumerable<string> FallbackTransparentIdentifierNamePicker()
+			{
+				const string TransparentParameterNameTemplate = "x{0}";
+				int currentTransparentParameter = 0;
+				for (;;) {
+					yield return string.Format(CultureInfo.InvariantCulture, TransparentParameterNameTemplate, currentTransparentParameter++);
+				}
+			}
+
 			ParameterDeclaration CreateParameterForCurrentRangeVariable() {
 				var param = new ParameterDeclaration();
 
@@ -132,7 +140,12 @@ namespace ICSharpCode.NRefactory.CSharp {
 					param.AddChild(clonedRangeVariable, Roles.Identifier);
 				}
 				else {
-					param.AddChild(Identifier.Create(string.Format(CultureInfo.InvariantCulture, TransparentParameterNameTemplate, currentTransparentParameter++)), Roles.Identifier);
+					if (!TransparentIdentifierNamePicker.MoveNext()) {
+						TransparentIdentifierNamePicker = FallbackTransparentIdentifierNamePicker().GetEnumerator();
+						TransparentIdentifierNamePicker.MoveNext();
+					}
+					string name = TransparentIdentifierNamePicker.Current;
+					param.AddChild(Identifier.Create(name), Roles.Identifier);
 				}
 				return param;
 			}
@@ -209,19 +222,45 @@ namespace ICSharpCode.NRefactory.CSharp {
 				return prev;
 			}
 
+			static bool NeedsToBeParenthesized(Expression expr)
+			{
+				UnaryOperatorExpression unary = expr as UnaryOperatorExpression;
+				if (unary != null) {
+					if (unary.Operator == UnaryOperatorType.PostIncrement || unary.Operator == UnaryOperatorType.PostDecrement) {
+						return false;
+					}
+					return true;
+				}
+			
+				if (expr is BinaryOperatorExpression || expr is ConditionalExpression || expr is AssignmentExpression) {
+					return true;
+				}
+
+				return false;
+			}
+
+			static Expression ParenthesizeIfNeeded(Expression expr)
+			{
+				return NeedsToBeParenthesized(expr) ? new ParenthesizedExpression(expr.Clone()) : expr;
+			}
+
 			public override AstNode VisitQueryFromClause(QueryFromClause queryFromClause) {
 				if (currentResult == null) {
 					AddFirstMemberToCurrentTransparentType(queryFromClause.IdentifierToken);
 					if (queryFromClause.Type.IsNull) {
-						return VisitNested(queryFromClause.Expression, null);
+						return VisitNested(ParenthesizeIfNeeded(queryFromClause.Expression), null);
 					}
 					else {
-						return VisitNested(queryFromClause.Expression, null).Invoke("Cast", new[] { queryFromClause.Type.Clone() }, new Expression[0]);
+						return VisitNested(ParenthesizeIfNeeded(queryFromClause.Expression), null).Invoke("Cast", new[] { queryFromClause.Type.Clone() }, new Expression[0]);
 					}
 				}
 				else {
 					var innerSelectorParam = CreateParameterForCurrentRangeVariable();
-					var innerSelector = CreateLambda(new[] { innerSelectorParam }, VisitNested(queryFromClause.Expression, innerSelectorParam));
+					var lambdaContent = VisitNested(queryFromClause.Expression, innerSelectorParam);
+					if (!queryFromClause.Type.IsNull) {
+						lambdaContent = lambdaContent.Invoke("Cast", new[] { queryFromClause.Type.Clone() }, new Expression[0]);
+					}
+					var innerSelector = CreateLambda(new[] { innerSelectorParam }, lambdaContent);
 
 					var clonedIdentifier = (Identifier)queryFromClause.IdentifierToken.Clone();
 
@@ -261,6 +300,9 @@ namespace ICSharpCode.NRefactory.CSharp {
 			public override AstNode VisitQueryJoinClause(QueryJoinClause queryJoinClause) {
 				Expression resultSelectorBody = null;
 				var inExpression = VisitNested(queryJoinClause.InExpression, null);
+				if (!queryJoinClause.Type.IsNull) {
+					inExpression = inExpression.Invoke("Cast", new[] { queryJoinClause.Type.Clone() }, EmptyList<Expression>.Instance);
+				}
 				var key1SelectorFirstParam = CreateParameterForCurrentRangeVariable();
 				var key1Selector = CreateLambda(new[] { key1SelectorFirstParam }, VisitNested(queryJoinClause.OnExpression, key1SelectorFirstParam));
 				var key2Param = CreateParameter(Identifier.Create(queryJoinClause.JoinIdentifier));
@@ -359,9 +401,11 @@ namespace ICSharpCode.NRefactory.CSharp {
 		/// Expands all occurances of query patterns in the specified node. Returns a clone of the node with all query patterns expanded, or null if there was no query pattern to expand.
 		/// </summary>
 		/// <param name="node"></param>
+		/// <param name="transparentIdentifierNamePicker">A sequence of names to use for transparent identifiers. Once the sequence is over, a fallback name generator is used</param> 
 		/// <returns></returns>
-		public QueryExpressionExpansionResult ExpandQueryExpressions(AstNode node) {
+		public QueryExpressionExpansionResult ExpandQueryExpressions(AstNode node, IEnumerable<string> transparentIdentifierNamePicker) {
 			var visitor = new Visitor();
+			visitor.TransparentIdentifierNamePicker = transparentIdentifierNamePicker.GetEnumerator();
 			var astNode = node.AcceptVisitor(visitor);
 			if (astNode != null) {
 				astNode.Freeze();
@@ -371,5 +415,16 @@ namespace ICSharpCode.NRefactory.CSharp {
 				return null;
 			}
 		}
+
+		
+		/// <summary>
+		/// Expands all occurances of query patterns in the specified node. Returns a clone of the node with all query patterns expanded, or null if there was no query pattern to expand.
+		/// </summary>
+		/// <param name="node"></param>
+		/// <returns></returns>
+		public QueryExpressionExpansionResult ExpandQueryExpressions(AstNode node)
+		{
+			return ExpandQueryExpressions(node, Enumerable.Empty<string>());
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/BaseRefactoringContext.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/BaseRefactoringContext.cs
index 9ade41803a..7f5d9381fe 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/BaseRefactoringContext.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/BaseRefactoringContext.cs
@@ -37,6 +37,7 @@ using System.ComponentModel.Design;
 using ICSharpCode.NRefactory.CSharp.Analysis;
 using ICSharpCode.NRefactory.Utils;
 using System.Collections.Generic;
+using ICSharpCode.NRefactory.Analysis;
 
 namespace ICSharpCode.NRefactory.CSharp.Refactoring
 {
@@ -50,6 +51,13 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			return true;
 		}
 
+		/// <summary>
+		/// Gets the default namespace which should be defined in this file.
+		/// </summary>
+		public abstract string DefaultNamespace {
+			get;
+		}
+
 		/// <summary>
 		/// Gets a value indicating if 'var' keyword should be used or explicit types.
 		/// </summary>
@@ -84,6 +92,13 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			get { return resolver.Compilation; }
 		}
 
+		/// <summary>
+		/// Gets the type graph for the current compilation.
+		/// </summary>
+		public virtual TypeGraph TypeGraph {
+			get { return new TypeGraph(Compilation.Assemblies); }
+		}
+		
 		public BaseRefactoringContext (ICSharpCode.NRefactory.CSharp.Resolver.CSharpAstResolver resolver, System.Threading.CancellationToken cancellationToken)
 		{
 			this.resolver = resolver;
@@ -151,12 +166,15 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		/// <param name="statement">
 		/// The statement to start the analysis.
 		/// </param>
+		/// <param name="recursiveDetectorVisitor">
+		/// TODO.
+		/// </param>
 		/// <returns>
 		/// The reachability analysis object.
 		/// </returns>
-		public ReachabilityAnalysis CreateReachabilityAnalysis (Statement statement)
+		public ReachabilityAnalysis CreateReachabilityAnalysis (Statement statement, ReachabilityAnalysis.RecursiveDetectorVisitor recursiveDetectorVisitor = null)
 		{
-			return ReachabilityAnalysis.Create (statement, resolver, CancellationToken);
+			return ReachabilityAnalysis.Create (statement, resolver, recursiveDetectorVisitor, CancellationToken);
 		}
 
 		/// <summary>
@@ -179,6 +197,76 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 
 		#endregion
 
+
+		#region Naming
+		public virtual string GetNameProposal (string name, TextLocation loc, bool camelCase = true)
+		{
+			string baseName = (camelCase ? char.ToLower (name [0]) : char.ToUpper (name [0])) + name.Substring (1);
+
+			var type = RootNode.GetNodeAt<TypeDeclaration>(loc);
+			if (type == null)
+				return baseName;
+
+			int number = -1;
+			string proposedName;
+			do {
+				proposedName = AppendNumberToName (baseName, number++);
+			} while (type.Members.Select (m => m.GetChildByRole (Roles.Identifier)).Any (n => n.Name == proposedName));
+			return proposedName;
+		}
+
+		static string AppendNumberToName (string baseName, int number)
+		{
+			return baseName + (number > 0 ? (number + 1).ToString () : "");
+		}
+		#endregion
+
+		#region Text stuff
+		public virtual TextEditorOptions TextEditorOptions {
+			get {
+				return TextEditorOptions.Default;
+			}
+		}
+
+		public virtual bool IsSomethingSelected {
+			get {
+				return SelectionStart != TextLocation.Empty;
+			}
+		}
+
+		public virtual string SelectedText {
+			get { return string.Empty; }
+		}
+
+		public virtual TextLocation SelectionStart {
+			get {
+				return TextLocation.Empty;
+			}
+		}
+
+		public virtual TextLocation SelectionEnd {
+			get {
+				return TextLocation.Empty;
+			}
+		}
+
+		public abstract int GetOffset (TextLocation location);
+
+		public abstract IDocumentLine GetLineByOffset (int offset);
+
+		public int GetOffset (int line, int col)
+		{
+			return GetOffset (new TextLocation (line, col));
+		}
+
+		public abstract TextLocation GetLocation (int offset);
+
+		public abstract string GetText (int offset, int length);
+
+		public abstract string GetText (ISegment segment);
+		#endregion
+
+
 		/// <summary>
 		/// Translates the english input string to the context language.
 		/// </summary>
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeAction.cs
index 7658a9e071..3acd746980 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeAction.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeAction.cs
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using ICSharpCode.NRefactory.Refactoring;
 
 namespace ICSharpCode.NRefactory.CSharp.Refactoring
 {
@@ -63,9 +64,45 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			get;
 			private set;
 		}
+		
+		/// <summary>
+		/// This property is used to identify which actions are "siblings", ie which actions
+		/// are the same kind of fix. This is used to group issues when batch fixing them.
+		/// </summary>
+		/// <remarks>
+		/// Although the type is <see cref="object"/>, there is a restriction: The instance
+		/// used must behave well as a key (for instance in a hash table). Additionaly, this
+		/// value must be independent of the specific <see cref="CodeIssueProvider"/> instance
+		/// which created it. In other words two different instances of the same issue provider
+		/// implementation should use the same sibling keys for the same kinds of issues.
+		/// </remarks>
+		/// <value>The non-null sibling key if this type of action is batchable, null otherwise.</value>
+		public object SiblingKey {
+			get;
+			private set;
+		}
+
+		Severity severity = Severity.Suggestion;
 
 		/// <summary>
-		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.CSharp.Refactoring.CodeAction"/> class.
+		/// Gets or sets the severity of the code action. 
+		/// Actions are sorted according to their Severity.
+		/// </summary>
+		/// <value>The severity.</value>
+		public Severity Severity {
+			get {
+				return severity;
+			}
+			set {
+				severity = value;
+			}
+		}
+
+		const string defaultSiblingKey = "default";
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.CSharp.Refactoring.CodeAction"/> class,
+		/// using a non-null default value for <see cref="SiblingKey"/>.
 		/// </summary>
 		/// <param name='description'>
 		/// The description.
@@ -77,6 +114,26 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		/// A node that specifies the start/end positions for the code action.
 		/// </param>
 		public CodeAction (string description, Action<Script> action, AstNode astNode)
+			: this (description, action, astNode, defaultSiblingKey)
+		{
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.CSharp.Refactoring.CodeAction"/> class.
+		/// </summary>
+		/// <param name='description'>
+		/// The description.
+		/// </param>
+		/// <param name='action'>
+		/// The code transformation.
+		/// </param>
+		/// <param name='astNode'>
+		/// A node that specifies the start/end positions for the code action.
+		/// </param>
+		/// <param name="siblingKey>
+		/// The key used to associate this action with other actions that should be fixed together in batch mode.
+		/// </param>
+		public CodeAction (string description, Action<Script> action, AstNode astNode, object siblingKey)
 		{
 			if (action == null)
 				throw new ArgumentNullException ("action");
@@ -88,10 +145,12 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			Run = action;
 			Start = astNode.StartLocation;
 			End = astNode.EndLocation;
+			SiblingKey = siblingKey;
 		}
 
 		/// <summary>
-		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.CSharp.Refactoring.CodeAction"/> class.
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.CSharp.Refactoring.CodeAction"/> class,
+		/// using a non-null default value for <see cref="SiblingKey"/>.
 		/// </summary>
 		/// <param name='description'>
 		/// The description.
@@ -102,6 +161,26 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		/// <param name='start'>Start position for the code action.</param>
 		/// <param name='end'>End position for the code action.</param>
 		public CodeAction (string description, Action<Script> action, TextLocation start, TextLocation end)
+			: this (description, action, start, end, defaultSiblingKey)
+		{
+			SiblingKey = defaultSiblingKey;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.CSharp.Refactoring.CodeAction"/> class.
+		/// </summary>
+		/// <param name='description'>
+		/// The description.
+		/// </param>
+		/// <param name='action'>
+		/// The code transformation.
+		/// </param>
+		/// <param name='start'>Start position for the code action.</param>
+		/// <param name='end'>End position for the code action.</param>
+		/// <param name="siblingKey>
+		/// The key used to associate this action with other actions that should be fixed together in batch mode.
+		/// </param>
+		public CodeAction (string description, Action<Script> action, TextLocation start, TextLocation end, object siblingKey)
 		{
 			if (action == null)
 				throw new ArgumentNullException ("action");
@@ -111,6 +190,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			Run = action;
 			this.Start = start;
 			this.End = end;
+			SiblingKey = siblingKey;
 		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActionProvider.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActionProvider.cs
new file mode 100644
index 0000000000..bc14e3612e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActionProvider.cs
@@ -0,0 +1,37 @@
+// 
+// ContextAction.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	public abstract class CodeActionProvider
+	{
+		public abstract IEnumerable<CodeAction> GetActions (RefactoringContext context);
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/AddAnotherAccessorAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/AddAnotherAccessorAction.cs
deleted file mode 100644
index 69384a1278..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/AddAnotherAccessorAction.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-// 
-// AddAnotherAccessor.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Threading;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// Add another accessor to a property declaration that has only one.
-	/// </summary>
-	[ContextAction("Add another accessor", Description = "Adds second accessor to a property.")]
-	public class AddAnotherAccessorAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var pdecl = GetPropertyDeclaration(context);
-			if (pdecl == null || !pdecl.Getter.IsNull && !pdecl.Setter.IsNull) { 
-				yield break;
-			}
-
-			var type = pdecl.Parent as TypeDeclaration;
-			if (type != null && type.ClassType == ClassType.Interface) {
-				yield break;
-			}
-			yield return new CodeAction (pdecl.Setter.IsNull ? context.TranslateString("Add setter") : context.TranslateString("Add getter"), script => {
-				Statement accessorStatement = null;
-			
-				var accessor = new Accessor ();
-				if (!pdecl.Getter.IsNull && !pdecl.Getter.Body.IsNull || !pdecl.Setter.IsNull && !pdecl.Setter.Body.IsNull) {
-					accessorStatement = BuildAccessorStatement(context, pdecl);
-					accessor.Body = new BlockStatement { accessorStatement };
-				}
-
-				accessor.Role = pdecl.Setter.IsNull ? PropertyDeclaration.SetterRole : PropertyDeclaration.GetterRole;
-
-				if (pdecl.Setter.IsNull && !pdecl.Getter.IsNull) {
-					script.InsertAfter(pdecl.Getter, accessor);
-				} else if (pdecl.Getter.IsNull && !pdecl.Setter.IsNull) {
-					script.InsertBefore(pdecl.Setter, accessor);
-				} else {
-					script.InsertBefore(pdecl.Getter, accessor);
-				}
-				if (accessorStatement != null)
-					script.Select(accessorStatement);
-				script.FormatText(pdecl);
-			}, pdecl.NameToken);
-		}
-		
-		static Statement BuildAccessorStatement (RefactoringContext context, PropertyDeclaration pdecl)
-		{
-			if (pdecl.Setter.IsNull && !pdecl.Getter.IsNull) {
-				var field = RemoveBackingStoreAction.ScanGetter (context, pdecl);
-				if (field != null && !field.IsReadOnly && !field.IsConst) 
-					return new ExpressionStatement (new AssignmentExpression (new IdentifierExpression (field.Name), AssignmentOperatorType.Assign, new IdentifierExpression ("value")));
-			}
-			
-			if (!pdecl.Setter.IsNull && pdecl.Getter.IsNull) {
-				var field = RemoveBackingStoreAction.ScanSetter (context, pdecl);
-				if (field != null) 
-					return new ReturnStatement (new IdentifierExpression (field.Name));
-			}
-			
-			return new ThrowStatement (new ObjectCreateExpression (context.CreateShortType ("System", "NotImplementedException")));
-		}
-		
-		static PropertyDeclaration GetPropertyDeclaration (RefactoringContext context)
-		{
-			var node = context.GetNode ();
-			if (node == null)
-				return null;
-			return node.Parent as PropertyDeclaration;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/AddCatchTypeAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/AddCatchTypeAction.cs
deleted file mode 100644
index 6f7232b26f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/AddCatchTypeAction.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// AddCatchTypeAction.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using ICSharpCode.NRefactory.CSharp;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Add type to general catch clause",
-	               Description = "Adds an exception type specifier to general catch clauses.")]
-	public class AddCatchTypeAction : ICodeActionProvider
-	{
-		#region ICodeActionProvider implementation
-
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var catchClause = context.GetNode<CatchClause>();
-			if (catchClause == null)
-				yield break;
-			if (!catchClause.Type.IsNull)
-				yield break;
-			yield return new CodeAction(context.TranslateString("Add type specifier"), script => {
-				var newType = context.CreateShortType("System", "Exception");
-				var namingHelper = new NamingHelper(context);
-				var newIdentifier = Identifier.Create(namingHelper.GenerateVariableName(newType, "e"));
-
-				script.Replace(catchClause, new CatchClause {
-					Type = newType,
-					VariableNameToken = newIdentifier,
-					Body = catchClause.Body.Clone() as BlockStatement
-				});
-				script.Select(newType);
-			}, catchClause);
-		}
-
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/AddUsingAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/AddUsingAction.cs
deleted file mode 100644
index b2f34ee227..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/AddUsingAction.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) 2013 Daniel Grunwald
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// 1) When a type cannot be resolved, offers to add a using declaration
-	/// or to replace it with the fully qualified type name.
-	/// 2) When an extension method cannot be resolved, offers to add a using declaration.
-	/// 3) When the caret is on a namespace name, offers to add a using declaration
-	/// and simplify the type references to use the new shorter option.
-	/// </summary>
-	[ContextAction ("Add using", Description = "Add missing using declaration.")]
-	public class AddUsingAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			AstNode node = context.GetNode();
-			if (node is Identifier)
-				node = node.Parent;
-			if (node is SimpleType || node is IdentifierExpression) {
-				return GetActionsForType(context, node)
-					.Concat(GetActionsForAddNamespaceUsing(context, node));
-			} else if (node is MemberReferenceExpression && node.Parent is InvocationExpression) {
-				return GetActionsForExtensionMethodInvocation(context, (InvocationExpression)node.Parent);
-			} else if (node is MemberReferenceExpression) {
-				return GetActionsForAddNamespaceUsing(context, node);
-			} else {
-				return EmptyList<CodeAction>.Instance;
-			}
-		}
-		
-		IEnumerable<CodeAction> GetActionsForType(RefactoringContext context, AstNode node)
-		{
-			var rr = context.Resolve(node) as UnknownIdentifierResolveResult;
-			if (rr == null)
-				return EmptyList<CodeAction>.Instance;
-			
-			string identifier = rr.Identifier;
-			int tc = rr.TypeArgumentCount;
-			string attributeIdentifier = null;
-			if (node.Parent is Attribute)
-				attributeIdentifier = identifier + "Attribute";
-			
-			var lookup = new MemberLookup(null, context.Compilation.MainAssembly);
-			List<CodeAction> actions = new List<CodeAction>();
-			foreach (var typeDefinition in context.Compilation.GetAllTypeDefinitions()) {
-				if ((typeDefinition.Name == identifier || typeDefinition.Name == attributeIdentifier)
-				    && typeDefinition.TypeParameterCount == tc
-				    && lookup.IsAccessible(typeDefinition, false))
-				{
-					if (typeDefinition.DeclaringTypeDefinition == null) {
-						actions.Add(NewUsingAction(context, node, typeDefinition.Namespace));
-					}
-					actions.Add(ReplaceWithFullTypeNameAction(context, node, typeDefinition));
-				}
-			}
-			return actions;
-		}
-		
-		CodeAction NewUsingAction(RefactoringContext context, AstNode node, string ns)
-		{
-			return new CodeAction("using " + ns + ";", s => UsingHelper.InsertUsingAndRemoveRedundantNamespaceUsage(context, s, ns), node);
-		}
-		
-		CodeAction ReplaceWithFullTypeNameAction(RefactoringContext context, AstNode node, ITypeDefinition typeDefinition)
-		{
-			AstType astType = context.CreateShortType(typeDefinition);
-			string textWithoutGenerics = astType.ToString();
-			foreach (var typeArg in node.GetChildrenByRole(Roles.TypeArgument)) {
-				astType.AddChild(typeArg.Clone(), Roles.TypeArgument);
-			}
-			return new CodeAction(textWithoutGenerics, s => s.Replace(node, astType), node);
-		}
-		
-		IEnumerable<CodeAction> GetActionsForExtensionMethodInvocation(RefactoringContext context, InvocationExpression invocation)
-		{
-			var rr = context.Resolve(invocation) as UnknownMethodResolveResult;
-			if (rr == null)
-				return EmptyList<CodeAction>.Instance;
-			
-			var lookup = new MemberLookup(null, context.Compilation.MainAssembly);
-			HashSet<string> namespaces = new HashSet<string>();
-			List<CodeAction> result = new List<CodeAction>();
-			foreach (var typeDefinition in context.Compilation.GetAllTypeDefinitions()) {
-				if (!(typeDefinition.HasExtensionMethods && lookup.IsAccessible(typeDefinition, false))) {
-					continue;
-				}
-				foreach (var method in typeDefinition.Methods.Where(m => m.IsExtensionMethod && m.Name == rr.MemberName)) {
-					IType[] inferredTypes;
-					if (CSharpResolver.IsEligibleExtensionMethod(rr.TargetType, method, true, out inferredTypes)) {
-						// avoid offering the same namespace twice
-						if (namespaces.Add(typeDefinition.Namespace)) {
-							result.Add(NewUsingAction(context, invocation, typeDefinition.Namespace));
-						}
-						break; // continue with the next type
-					}
-				}
-			}
-			return result;
-		}
-		
-		IEnumerable<CodeAction> GetActionsForAddNamespaceUsing(RefactoringContext context, AstNode node)
-		{
-			var nrr = context.Resolve(node) as NamespaceResolveResult;
-			if (nrr == null)
-				return EmptyList<CodeAction>.Instance;
-			
-			var trr = context.Resolve(node.Parent) as TypeResolveResult;
-			if (trr == null)
-				return EmptyList<CodeAction>.Instance;
-			ITypeDefinition typeDef = trr.Type.GetDefinition();
-			if (typeDef == null)
-				return EmptyList<CodeAction>.Instance;
-			
-			IList<IType> typeArguments;
-			ParameterizedType parameterizedType = trr.Type as ParameterizedType;
-			if (parameterizedType != null)
-				typeArguments = parameterizedType.TypeArguments;
-			else
-				typeArguments = EmptyList<IType>.Instance;
-			
-			var resolver = context.GetResolverStateBefore(node.Parent);
-			if (resolver.ResolveSimpleName(typeDef.Name, typeArguments) is UnknownIdentifierResolveResult) {
-				// It's possible to remove the explicit namespace usage and introduce a using instead
-				return new[] { NewUsingAction(context, node, typeDef.Namespace) };
-			}
-			return EmptyList<CodeAction>.Instance;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CheckIfParameterIsNullAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CheckIfParameterIsNullAction.cs
deleted file mode 100644
index 3afb497399..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CheckIfParameterIsNullAction.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// 
-// CheckIfParameterIsNull.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.PatternMatching;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// Creates a 'if (param == null) throw new System.ArgumentNullException ();' contruct for a parameter.
-	/// </summary>
-	[ContextAction("Check if parameter is null", Description = "Checks function parameter is not null.")]
-	public class CheckIfParameterIsNullAction : SpecializedCodeAction<ParameterDeclaration>
-	{
-		protected override CodeAction GetAction(RefactoringContext context, ParameterDeclaration parameter)
-		{
-			BlockStatement bodyStatement;
-			if (parameter.Parent is LambdaExpression) {
-				bodyStatement = parameter.Parent.GetChildByRole (LambdaExpression.BodyRole) as BlockStatement;
-			} else {
-				bodyStatement = parameter.Parent.GetChildByRole (Roles.Body);
-			}
-			if (bodyStatement == null || bodyStatement.IsNull)
-				return null;
-			var type = context.ResolveType(parameter.Type);
-			if (type.IsReferenceType == false || HasNullCheck(parameter)) 
-				return null;
-			
-			return new CodeAction(context.TranslateString("Add null check for parameter"), script => {
-				var statement = new IfElseStatement() {
-					Condition = new BinaryOperatorExpression (new IdentifierExpression (parameter.Name), BinaryOperatorType.Equality, new NullReferenceExpression ()),
-					TrueStatement = new ThrowStatement (new ObjectCreateExpression (context.CreateShortType("System", "ArgumentNullException"), new PrimitiveExpression (parameter.Name)))
-				};
-				script.AddTo(bodyStatement, statement);
-			}, parameter.NameToken);
-		}
-
-		static bool HasNullCheck (ParameterDeclaration parameter)
-		{
-			var visitor = new CheckNullVisitor (parameter);
-			parameter.Parent.AcceptVisitor (visitor, null);
-			return visitor.ContainsNullCheck;
-		}
-		
-		class CheckNullVisitor : DepthFirstAstVisitor<object, object>
-		{
-			readonly Expression pattern;
-			
-			internal bool ContainsNullCheck;
-			
-			public CheckNullVisitor (ParameterDeclaration parameter)
-			{
-				pattern = PatternHelper.CommutativeOperator(new IdentifierExpression(parameter.Name), BinaryOperatorType.Any, new NullReferenceExpression());
-			}
-			
-			public override object VisitIfElseStatement (IfElseStatement ifElseStatement, object data)
-			{
-				if (ifElseStatement.Condition is BinaryOperatorExpression) {
-					var binOp = ifElseStatement.Condition as BinaryOperatorExpression;
-					if ((binOp.Operator == BinaryOperatorType.Equality || binOp.Operator == BinaryOperatorType.InEquality) && pattern.IsMatch(binOp)) {
-						ContainsNullCheck = true;
-					}
-				}
-				
-				return base.VisitIfElseStatement (ifElseStatement, data);
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertAnonymousDelegateToLambdaAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertAnonymousDelegateToLambdaAction.cs
deleted file mode 100644
index d838033d9d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertAnonymousDelegateToLambdaAction.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// ConvertAnonymousDelegateToExpression.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Convert anonymous delegate to lambda block",
-	               Description = "Converts an anonymous delegate into a lambda in block form.")]
-	public class ConvertAnonymousDelegateToLambdaAction : SpecializedCodeAction<AnonymousMethodExpression>
-	{
-		#region implemented abstract members of SpecializedCodeAction
-		protected override CodeAction GetAction(RefactoringContext context, AnonymousMethodExpression node)
-		{
-			if (context.Location < node.DelegateToken.StartLocation || context.Location >= node.Body.StartLocation)
-				return null;
-
-			if (!node.HasParameterList)
-				return null;
-
-			return new CodeAction(context.TranslateString("Convert to lambda block"), script => {
-				var parent = node.Parent;
-				while (!(parent is Statement))
-					parent = parent.Parent;
-				bool explicitLambda = parent is VariableDeclarationStatement && ((VariableDeclarationStatement)parent).Type.IsVar();
-				var lambda = new LambdaExpression {	Body = node.Body.Clone() };
-				foreach (var parameter in node.Parameters) {
-					if (explicitLambda) {
-						lambda.Parameters.Add(new ParameterDeclaration { Type = parameter.Type.Clone(), Name = parameter.Name });
-					} else {
-						lambda.Parameters.Add(new ParameterDeclaration { Name = parameter.Name });
-					}
-				}
-				script.Replace(node, lambda);
-			}, node);
-		}
-		#endregion
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertAsToCastAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertAsToCastAction.cs
deleted file mode 100644
index 79563c472d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertAsToCastAction.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// 
-// ConvertAsToCastAction.cs
-//  
-// Author:
-//       Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// Converts an 'as' expression to a cast expression
-	/// </summary>
-	[ContextAction("Convert 'as' to cast.", Description = "Convert 'as' to cast.")]
-	public class ConvertAsToCastAction : SpecializedCodeAction <AsExpression>
-	{
-		static InsertParenthesesVisitor insertParentheses = new InsertParenthesesVisitor ();
-		protected override CodeAction GetAction (RefactoringContext context, AsExpression node)
-		{
-			if (!node.AsToken.Contains (context.Location))
-				return null;
-			return new CodeAction (context.TranslateString ("Convert 'as' to cast"),  script => {
-				var castExpr = new CastExpression (node.Type.Clone (), node.Expression.Clone ());
-				var parenthesizedExpr = node.Parent as ParenthesizedExpression;
-				if (parenthesizedExpr != null && parenthesizedExpr.Parent is Expression) {
-					// clone parent expression and replace the ParenthesizedExpression with castExpr to remove
-					// parentheses, then insert parentheses if necessary
-					var parentExpr = (Expression)parenthesizedExpr.Parent.Clone ();
-					parentExpr.GetNodeContaining (parenthesizedExpr.StartLocation, parenthesizedExpr.EndLocation)
-						.ReplaceWith (castExpr);
-					parentExpr.AcceptVisitor (insertParentheses);
-					script.Replace (parenthesizedExpr.Parent, parentExpr);
-				} else {
-					castExpr.AcceptVisitor (insertParentheses);
-					script.Replace (node, castExpr);
-				}
-			}, node);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertConditionalToIfAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertConditionalToIfAction.cs
deleted file mode 100644
index 63b654b430..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertConditionalToIfAction.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-// 
-// ConvertConditionalToIfAction.cs
-//  
-// Author:
-//       Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction ("Convert '?:' to 'if'", Description = "Convert '?:' operator to 'if' statement.")]
-	public class ConvertConditionalToIfAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions (RefactoringContext context)
-		{
-			// return
-			var returnStatement = context.GetNode<ReturnStatement> ();
-			if (returnStatement != null) {
-				var action = GetAction (context, returnStatement, returnStatement.Expression,
-					expr => new Statement[]
-					{
-						new IfElseStatement (expr.Condition.Clone (), 
-											 new ReturnStatement (expr.TrueExpression.Clone ()),
-											 new ReturnStatement (expr.FalseExpression.Clone ()))
-					});
-				if (action != null)
-					yield return action;
-				yield break;
-			}
-
-			// assignment
-			var assignment = context.GetNode<AssignmentExpression> ();
-			if (assignment != null) {
-				var statement = assignment.Parent as ExpressionStatement;
-				if (statement == null)
-					yield break;
-
-				// statement is in for initializer/iterator
-				if (statement.Parent is ForStatement &&
-					statement != ((ForStatement)statement.Parent).EmbeddedStatement)
-					yield break;
-
-				// statement is in using resource-acquisition
-				if (statement.Parent is UsingStatement &&
-					statement != ((UsingStatement)statement.Parent).EmbeddedStatement)
-					yield break;
-
-				var action = GetAction (context, statement, assignment.Right,
-					expr => new Statement [] { ConvertAssignment (assignment.Left, assignment.Operator, expr) });
-				if (action != null)
-					yield return action;
-
-				yield break;
-			}
-
-			// variable initializer
-			var initializer = context.GetNode<VariableInitializer> ();
-			if (initializer != null && initializer.Parent is VariableDeclarationStatement &&
-				initializer.Parent.Parent is BlockStatement) {
-
-				var variableDecl = (VariableDeclarationStatement)initializer.Parent;
-				var newVariableDecl = (VariableDeclarationStatement)variableDecl.Clone ();
-				foreach (var variable in newVariableDecl.Variables) {
-					if (variable.Name == initializer.Name)
-						variable.Initializer = Expression.Null;
-				}
-
-				var action = GetAction (context, variableDecl, initializer.Initializer,
-					expr => new Statement []
-					{
-						newVariableDecl,
-						ConvertAssignment (new IdentifierExpression (initializer.Name), AssignmentOperatorType.Assign,
-										   expr)
-					});
-				if (action != null)
-					yield return action;
-			}
-		}
-
-		CodeAction GetAction (RefactoringContext context, Statement originalStatement, Expression conditionalCandidate, 
-							  Func<ConditionalExpression, IEnumerable<Statement>> getReplacement)
-		{
-			var conditionalExpr = GetConditionalExpression (conditionalCandidate);
-			if (conditionalExpr == null || 
-				!(conditionalExpr.QuestionMarkToken.Contains(context.Location) ||
-				  conditionalExpr.ColonToken.Contains(context.Location)))
-				return null;
-
-			return new CodeAction (context.TranslateString ("Convert '?:' to 'if'"),
-				script =>
-				{
-					foreach (var node in getReplacement (conditionalExpr))
-						script.InsertBefore (originalStatement, node);
-					script.Remove (originalStatement);
-			}, conditionalExpr);
-		}
-
-		static ConditionalExpression GetConditionalExpression (Expression expr)
-		{
-			while (expr != null) {
-				if (expr is ConditionalExpression)
-					return (ConditionalExpression)expr;
-
-				var parenthesizedExpr = expr as ParenthesizedExpression;
-				if (parenthesizedExpr == null)
-					break;
-				expr = parenthesizedExpr.Expression;
-			}
-			return null;
-		}
-
-		static IfElseStatement ConvertAssignment (Expression target, AssignmentOperatorType op,
-												  ConditionalExpression conditionalExpr)
-		{
-			var trueAssignment = new AssignmentExpression (target.Clone (), op,
-														   conditionalExpr.TrueExpression.Clone ());
-			var falseAssignment = new AssignmentExpression (target.Clone (), op,
-															conditionalExpr.FalseExpression.Clone ());
-			return new IfElseStatement (conditionalExpr.Condition.Clone (),
-										new ExpressionStatement (trueAssignment),
-										new ExpressionStatement (falseAssignment));
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertDecToHexAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertDecToHexAction.cs
deleted file mode 100644
index 524d5b8379..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertDecToHexAction.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// 
-// ConvertDecToHex.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Threading;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// Convert a dec numer to hex. For example: 16 -> 0x10
-	/// </summary>
-	[ContextAction("Convert dec to hex.", Description = "Convert dec to hex.")]
-	public class ConvertDecToHexAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var pexpr = context.GetNode<PrimitiveExpression>();
-			if (pexpr == null || pexpr.LiteralValue.StartsWith("0X", System.StringComparison.OrdinalIgnoreCase))
-				yield break;
-
-			var value = pexpr.Value;
-			if (value is string || value is bool || value is float || value is double || value is char)
-				yield break;
-
-			yield return new CodeAction(context.TranslateString("Convert dec to hex"), script => {
-				script.Replace(pexpr, new PrimitiveExpression (value, string.Format("0x{0:x}", value)));
-			}, pexpr);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertForeachToForAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertForeachToForAction.cs
deleted file mode 100644
index fec7dcee05..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertForeachToForAction.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// 
-// ConvertForeachToFor.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Threading;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// Converts a foreach loop to for.
-	/// </summary>
-	[ContextAction("Convert 'foreach' loop to 'for'", Description = "Works on 'foreach' loops that allow direct access to its elements.")]
-	public class ConvertForeachToForAction : ICodeActionProvider
-	{
-		static string[] VariableNames = new string[] { "i", "j", "k", "l", "n", "m", "x", "y", "z"};
-		static string[] CollectionNames = new string[] { "list" };
-
-		static string GetName(ICSharpCode.NRefactory.CSharp.Resolver.CSharpResolver state, string[] variableNames)
-		{
-			for (int i = 0; i < 1000; i++) {
-				foreach (var vn in variableNames) {
-					string id = i > 0 ? vn + i : vn;
-					var rr = state.LookupSimpleNameOrTypeName(id, new IType[0], NameLookupMode.Expression);
-					if (rr.IsError) 
-						return id;
-				}
-			}
-			return null;
-		}
-
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var foreachStatement = GetForeachStatement(context);
-			if (foreachStatement == null) {
-				yield break;
-			}
-
-			var state = context.GetResolverStateBefore (foreachStatement.EmbeddedStatement);
-			string name = GetName(state, VariableNames);
-			if (name == null) // very unlikely, but just in case ...
-				yield break;
-
-			yield return new CodeAction(context.TranslateString("Convert 'foreach' loop to 'for'"), script => {
-				var result = context.Resolve(foreachStatement.InExpression);
-				var countProperty = GetCountProperty(result.Type);
-
-				// TODO: use another variable name if 'i' is already in use
-				var initializer = new VariableDeclarationStatement(new PrimitiveType("int"), name, new PrimitiveExpression(0));
-				var id1 = new IdentifierExpression(name);
-				var id2 = id1.Clone();
-				var id3 = id1.Clone();
-				var inExpression = foreachStatement.InExpression;
-				Statement declarationStatement = null;
-				if (inExpression is ObjectCreateExpression || inExpression is ArrayCreateExpression) {
-					string listName = GetName(state, CollectionNames) ?? "col";
-					declarationStatement = new VariableDeclarationStatement (
-						new PrimitiveType ("var"),
-						listName,
-						inExpression.Clone ()
-					);
-					inExpression = new IdentifierExpression (listName);
-				}
-
-				var variableDeclarationStatement = new VariableDeclarationStatement(
-					foreachStatement.VariableType.Clone(),
-					foreachStatement.VariableName,
-					new IndexerExpression(inExpression.Clone(), id3)
-					);
-				var forStatement = new ForStatement() {
-					Initializers = { initializer },
-					Condition = new BinaryOperatorExpression (id1, BinaryOperatorType.LessThan, new MemberReferenceExpression (inExpression.Clone (), countProperty)),
-					Iterators = { new ExpressionStatement (new UnaryOperatorExpression (UnaryOperatorType.PostIncrement, id2)) },
-					EmbeddedStatement = new BlockStatement {
-						variableDeclarationStatement
-					}
-				};
-				
-				if (foreachStatement.EmbeddedStatement is BlockStatement) {
-					variableDeclarationStatement.Remove();
-					var oldBlock = (BlockStatement)foreachStatement.EmbeddedStatement.Clone();
-					if (oldBlock.Statements.Any()) {
-						oldBlock.Statements.InsertBefore(oldBlock.Statements.First(), variableDeclarationStatement);
-					} else {
-						oldBlock.Statements.Add(variableDeclarationStatement);
-					}
-					forStatement.EmbeddedStatement = oldBlock;
-				} else {
-					forStatement.EmbeddedStatement.AddChild (foreachStatement.EmbeddedStatement.Clone (), BlockStatement.StatementRole);
-				}
-				if (declarationStatement != null)
-					script.InsertBefore (foreachStatement, declarationStatement);
-				script.Replace (foreachStatement, forStatement);
-				script.Link (initializer.Variables.First ().NameToken, id1, id2, id3);
-			}, foreachStatement);
-		}
-		
-		static string GetCountProperty(IType type)
-		{
-			if (type.Kind == TypeKind.Array) {
-				return "Length";
-			}
-			return "Count";
-		}
-
-		static ForeachStatement GetForeachStatement (RefactoringContext context)
-		{
-			var astNode = context.GetNode ();
-			if (astNode == null)
-				return null;
-			var result = (astNode as ForeachStatement) ?? astNode.Parent as ForeachStatement;
-			if (result == null)
-				return null;
-			var collection = context.Resolve (result.InExpression);
-			if (collection.Type.Kind != TypeKind.Array && !collection.Type.GetProperties(p => p.IsIndexer).Any())
-				return null;
-			return result;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertHexToDecAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertHexToDecAction.cs
deleted file mode 100644
index 2f248d95b8..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertHexToDecAction.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// 
-// ConvertHexToDec.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Threading;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// Convert a hex numer to dec. For example: 0x10 -> 16
-	/// </summary>
-	[ContextAction("Convert hex to dec.", Description = "Convert hex to dec.")]
-	public class ConvertHexToDecAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var pexpr = context.GetNode<PrimitiveExpression>();
-			if (pexpr == null || !pexpr.LiteralValue.StartsWith("0X", System.StringComparison.OrdinalIgnoreCase)) {
-				yield break;
-			}
-			if (!((pexpr.Value is int) || (pexpr.Value is long) || (pexpr.Value is short) || (pexpr.Value is sbyte) ||
-				(pexpr.Value is uint) || (pexpr.Value is ulong) || (pexpr.Value is ushort) || (pexpr.Value is byte))) {
-				yield break;
-			}
-			
-			yield return new CodeAction(context.TranslateString("Convert hex to dec"), script => {
-				script.Replace(pexpr, new PrimitiveExpression (pexpr.Value));
-			}, pexpr);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertIfToConditionalAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertIfToConditionalAction.cs
deleted file mode 100644
index ebd627999b..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertIfToConditionalAction.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-// 
-// ConvertIfToConditionalAction.cs
-//  
-// Author:
-//       Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Linq;
-using ICSharpCode.NRefactory.PatternMatching;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction ("Convert 'if' to '?:'", Description = "Convert 'if' statement to '?:' operator.")]
-	public class ConvertIfToConditionalAction : SpecializedCodeAction <IfElseStatement>
-	{
-		static readonly InsertParenthesesVisitor insertParenthesesVisitor = new InsertParenthesesVisitor ();
-		protected override CodeAction GetAction (RefactoringContext context, IfElseStatement ifElseStatement)
-		{
-			if (!ifElseStatement.IfToken.Contains (context.Location))
-				return null;
-			var convertAssignment = GetConvertAssignmentAction (context, ifElseStatement);
-			if (convertAssignment != null)
-				return convertAssignment;
-			var convertReturn = GetConvertReturnAction (context, ifElseStatement);
-			return convertReturn;
-		}
-
-		CodeAction GetConvertAssignmentAction (RefactoringContext context, IfElseStatement ifElseStatement)
-		{
-			Func<Statement, AssignmentExpression> extractAssignment =
-				node =>
-				{
-					var exprStatement = node as ExpressionStatement;
-					if (exprStatement != null)
-						return exprStatement.Expression as AssignmentExpression;
-					return	null;
-				};
-			return GetAction (context, ifElseStatement, extractAssignment,
-				(assignment1, assignment2) =>
-				{
-					if (assignment1.Operator != assignment2.Operator || !assignment1.Left.Match (assignment2.Left).Success)
-						return null;
-					var conditionalExpr = new ConditionalExpression (ifElseStatement.Condition.Clone (),
-																	 assignment1.Right.Clone (),
-																	 assignment2.Right.Clone ());
-					conditionalExpr.AcceptVisitor (insertParenthesesVisitor);
-
-					var assignment = new AssignmentExpression (assignment1.Left.Clone (), assignment1.Operator,
-															   conditionalExpr);
-					return new ExpressionStatement (assignment);
-				});
-		}
-
-		CodeAction GetConvertReturnAction (RefactoringContext context, IfElseStatement ifElseStatement)
-		{
-			Func<Statement, ReturnStatement> extractReturn = node => node as ReturnStatement;
-			return GetAction (context, ifElseStatement, extractReturn,
-				(return1, return2) =>
-				{
-					var conditionalExpr = new ConditionalExpression (ifElseStatement.Condition.Clone (),
-																	 return1.Expression.Clone (),
-																	 return2.Expression.Clone ());
-					conditionalExpr.AcceptVisitor (insertParenthesesVisitor);
-					return new ReturnStatement (conditionalExpr);
-				},
-				true);
-		}
-
-		CodeAction GetAction<T> (RefactoringContext context, IfElseStatement ifElseStatement,
-								 Func<Statement, T> extractor, Func<T, T, Statement> getReplaceStatement,
-								 bool findImplicitFalseStatement = false)
-			where T : AstNode
-		{
-
-			var node1 = GetNode (ifElseStatement.TrueStatement, extractor);
-			if (node1 == null)
-				return null;
-
-			var falseStatement = ifElseStatement.FalseStatement;
-			// try next statement if there is no FalseStatement
-			if (falseStatement.IsNull && findImplicitFalseStatement)
-				falseStatement = ifElseStatement.GetNextSibling (n => n is Statement) as Statement;
-
-			var node2 = GetNode (falseStatement, extractor);
-			if (node2 == null)
-				return null;
-
-			var replacement = getReplaceStatement (node1, node2);
-			if (replacement == null)
-				return null;
-
-			return new CodeAction (context.TranslateString ("Convert 'if' to '?:'"),
-				script =>
-				{
-					script.Replace (ifElseStatement, replacement);
-					// remove implicit false statement
-					if (falseStatement != ifElseStatement.FalseStatement)
-						script.Remove (falseStatement);
-				}, 
-				ifElseStatement
-			);
-		}
-
-		static T GetNode<T> (Statement node, Func<Statement, T> extract)
-			where T : AstNode
-		{
-			var result = extract (node);
-			if (result != null)
-				return result;
-
-			var blockStatement = node as BlockStatement;
-			if (blockStatement != null && blockStatement.Statements.Count == 1)
-				return GetNode (blockStatement.Statements.First (), extract);
-			return null;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertIfToSwitchAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertIfToSwitchAction.cs
deleted file mode 100644
index a7410fcd02..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertIfToSwitchAction.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-// 
-// ConvertIfToSwitchAction.cs
-//  
-// Author:
-//       Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.PatternMatching;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction ("Convert 'if' to 'switch'", Description = "Convert 'if' statement to 'switch' statement")]
-	public class ConvertIfToSwitchAction : SpecializedCodeAction<IfElseStatement>
-	{
-		protected override CodeAction GetAction (RefactoringContext context, IfElseStatement node)
-		{
-			if (!node.IfToken.Contains (context.Location))
-				return null;
-
-			var switchExpr = GetSwitchExpression (context, node.Condition);
-			if (switchExpr == null)
-				return null;
-
-			var switchSections = new List<SwitchSection> ();
-			if (!CollectSwitchSections (switchSections, context, node, switchExpr))
-				return null;
-
-			return new CodeAction (context.TranslateString ("Convert 'if' to 'switch'"),
-				script =>
-				{
-					var switchStatement = new SwitchStatement { Expression = switchExpr.Clone () };
-					switchStatement.SwitchSections.AddRange (switchSections);
-					script.Replace (node, switchStatement);
-				},
-				node
-			);
-		}
-
-		static Expression GetSwitchExpression (RefactoringContext context, Expression expr)
-		{
-			var binaryOp = expr as BinaryOperatorExpression;
-			if (binaryOp == null)
-				return null;
-
-			if (binaryOp.Operator == BinaryOperatorType.ConditionalOr)
-				return GetSwitchExpression (context, binaryOp.Left);
-
-			if (binaryOp.Operator == BinaryOperatorType.Equality) {
-				Expression switchExpr = null;
-				if (IsConstantExpression (context, binaryOp.Right))
-					switchExpr = binaryOp.Left;
-				if (IsConstantExpression (context, binaryOp.Left))
-					switchExpr = binaryOp.Right;
-				if (switchExpr != null && IsValidSwitchType (context.Resolve (switchExpr).Type))
-					return switchExpr;
-			}
-
-			return null;
-		}
-
-		static bool IsConstantExpression (RefactoringContext context, Expression expr)
-		{
-			if (expr is PrimitiveExpression || expr is NullReferenceExpression)
-				return true;
-			return context.Resolve (expr).IsCompileTimeConstant;
-		}
-
-		static readonly KnownTypeCode [] validTypes = 
-		{
-			KnownTypeCode.String, KnownTypeCode.Boolean, KnownTypeCode.Char,
-			KnownTypeCode.Byte, KnownTypeCode.SByte,
-			KnownTypeCode.Int16, KnownTypeCode.Int32, KnownTypeCode.Int64,
-			KnownTypeCode.UInt16, KnownTypeCode.UInt32, KnownTypeCode.UInt64
-		};
-
-		static bool IsValidSwitchType (IType type)
-		{
-			if (type.Kind == TypeKind.Enum)
-				return true;
-			var typeDefinition = type.GetDefinition ();
-			if (typeDefinition == null)
-				return false;
-
-			if (typeDefinition.KnownTypeCode == KnownTypeCode.NullableOfT) {
-				var nullableType = (ParameterizedType)type;
-				typeDefinition = nullableType.TypeArguments [0].GetDefinition ();
-				if (typeDefinition == null)
-					return false;
-			}
-			return Array.IndexOf (validTypes, typeDefinition.KnownTypeCode) != -1;
-		}
-
-		static bool CollectSwitchSections (ICollection<SwitchSection> result, RefactoringContext context, 
-										   IfElseStatement ifStatement, Expression switchExpr)
-		{
-			// if
-			var section = new SwitchSection ();
-			if (!CollectCaseLabels (section.CaseLabels, context, ifStatement.Condition, switchExpr))
-				return false;
-			CollectSwitchSectionStatements (section.Statements, context, ifStatement.TrueStatement);
-			result.Add (section);
-
-			if (ifStatement.FalseStatement.IsNull)
-				return true;
-
-			// else if
-			var falseStatement = ifStatement.FalseStatement as IfElseStatement;
-			if (falseStatement != null)
-				return CollectSwitchSections (result, context, falseStatement, switchExpr);
-
-			// else (default label)
-			var defaultSection = new SwitchSection ();
-			defaultSection.CaseLabels.Add (new CaseLabel ());
-			CollectSwitchSectionStatements (defaultSection.Statements, context, ifStatement.FalseStatement);
-			result.Add (defaultSection);
-
-			return true;
-		}
-
-		static bool CollectCaseLabels (AstNodeCollection<CaseLabel> result, RefactoringContext context, 
-									   Expression condition, Expression switchExpr)
-		{
-			if (condition is ParenthesizedExpression)
-				return CollectCaseLabels (result, context, ((ParenthesizedExpression)condition).Expression, switchExpr);
-
-			var binaryOp = condition as BinaryOperatorExpression;
-			if (binaryOp == null)
-				return false;
-
-			if (binaryOp.Operator == BinaryOperatorType.ConditionalOr)
-				return CollectCaseLabels (result, context, binaryOp.Left, switchExpr) &&
-					   CollectCaseLabels (result, context, binaryOp.Right, switchExpr);
-
-			if (binaryOp.Operator == BinaryOperatorType.Equality) {
-				if (switchExpr.Match (binaryOp.Left).Success) {
-					if (IsConstantExpression (context, binaryOp.Right)) {
-						result.Add (new CaseLabel (binaryOp.Right.Clone ()));
-						return true;
-					}
-				} else if (switchExpr.Match (binaryOp.Right).Success) {
-					if (IsConstantExpression (context, binaryOp.Left)) {
-						result.Add (new CaseLabel (binaryOp.Left.Clone ()));
-						return true;
-					}
-				}
-			}
-
-			return false;
-		}
-		
-		static void CollectSwitchSectionStatements (AstNodeCollection<Statement> result, RefactoringContext context, 
-												    Statement statement)
-		{
-			BlockStatement blockStatement = statement as BlockStatement;
-			if (blockStatement != null)
-				result.AddRange(blockStatement.Statements.Select(s => s.Clone()));
-			else
-				result.Add(statement.Clone());
-
-			// add 'break;' at end if necessary
-			var reachabilityAnalysis = context.CreateReachabilityAnalysis (statement);
-			if (reachabilityAnalysis.IsEndpointReachable(statement))
-				result.Add(new BreakStatement());
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertLambdaBodyExpressionToStatementAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertLambdaBodyExpressionToStatementAction.cs
deleted file mode 100644
index 0d1aa80d98..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertLambdaBodyExpressionToStatementAction.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// 
-// ConvertLambdaBodyExpressionToStatementAction.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction ("Converts expression of lambda body to statement",
-					Description = "Converts expression of lambda body to statement")]
-	public class ConvertLambdaBodyExpressionToStatementAction : SpecializedCodeAction<LambdaExpression>
-	{
-
-		protected override CodeAction GetAction (RefactoringContext context, LambdaExpression node)
-		{
-			if (!node.ArrowToken.Contains (context.Location))
-				return null;
-
-			var bodyExpr = node.Body as Expression;
-			if (bodyExpr == null)
-				return null;
-			return new CodeAction (context.TranslateString ("Convert to lambda statement"),
-				script =>
-				{
-					var body = new BlockStatement ();
-					if (RequireReturnStatement (context, node)) {
-						body.Add (new ReturnStatement (bodyExpr.Clone ()));
-					} else {
-						body.Add (new ExpressionStatement (bodyExpr.Clone ()));
-					}
-					script.Replace (bodyExpr, body);
-				},
-				node
-			);
-		}
-
-		static bool RequireReturnStatement (RefactoringContext context, LambdaExpression lambda)
-		{
-			var type = LambdaHelper.GetLambdaReturnType (context, lambda);
-			return type != null && type.ReflectionName != "System.Void";
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertLambdaBodyStatementToExpressionAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertLambdaBodyStatementToExpressionAction.cs
deleted file mode 100644
index eabdbe4646..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertLambdaBodyStatementToExpressionAction.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// 
-// ConvertLambdaBodyStatementToExpressionAction.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction ("Converts statement of lambda body to expression",
-					Description = "Converts statement of lambda body to expression")]
-	public class ConvertLambdaBodyStatementToExpressionAction : SpecializedCodeAction<LambdaExpression>
-	{
-		protected override CodeAction GetAction (RefactoringContext context, LambdaExpression node)
-		{
-			if (!node.ArrowToken.Contains (context.Location))
-				return null;
-
-			var blockStatement = node.Body as BlockStatement;
-			if (blockStatement == null || blockStatement.Statements.Count > 1)
-				return null;
-
-			Expression expr;
-			var returnStatement = blockStatement.Statements.FirstOrNullObject () as ReturnStatement;
-			if (returnStatement != null) {
-				expr = returnStatement.Expression;
-			} else {
-				var exprStatement = blockStatement.Statements.FirstOrNullObject () as ExpressionStatement;
-				if (exprStatement == null)
-					return null;
-				expr = exprStatement.Expression;
-			}
-			
-			return new CodeAction (context.TranslateString ("Convert to lambda expression"),
-				script => script.Replace (blockStatement, expr.Clone ()), node);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertLambdaToAnonymousDelegateAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertLambdaToAnonymousDelegateAction.cs
deleted file mode 100644
index b0cf4ed87d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertLambdaToAnonymousDelegateAction.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// ConvertLambdaToDelegateAction.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Convert lambda to anonymous delegate",
-	               Description = "Converts a lambda to an anonymous delegate.")]
-	public class ConvertLambdaToAnonymousDelegateAction : SpecializedCodeAction<LambdaExpression>
-	{
-		#region implemented abstract members of SpecializedCodeAction
-		protected override CodeAction GetAction(RefactoringContext context, LambdaExpression node)
-		{
-			if (context.Location < node.StartLocation || context.Location >= node.Body.StartLocation)
-				return null;
-
-			var lambdaResolveResult = context.Resolve(node) as LambdaResolveResult;
-			if (lambdaResolveResult == null)
-				return null;
-
-			return new CodeAction(context.TranslateString("Convert to anonymous delegate"), script => {
-				BlockStatement newBody;
-				if (node.Body is BlockStatement) {
-					newBody = (BlockStatement)node.Body.Clone();
-				} else {
-					var expression = (Expression)node.Body.Clone();
-
-					Statement statement;
-					if (RequireReturnStatement(context, node)) {
-						statement = new ReturnStatement(expression);
-					}
-					else {
-						statement = new ExpressionStatement(expression);
-					}
-
-					newBody = new BlockStatement {
-						Statements = {
-							statement
-						}
-					};
-				}
-				var method = new AnonymousMethodExpression (newBody, GetParameters(lambdaResolveResult.Parameters, context));
-				script.Replace(node, method);
-			}, node);
-		}
-		#endregion
-
-		IEnumerable<ParameterDeclaration> GetParameters(IList<IParameter> parameters, RefactoringContext context)
-		{
-			if (parameters == null || parameters.Count == 0)
-				return null;
-			var result = new List<ParameterDeclaration> ();
-			foreach (var parameter in parameters) {
-				var type = context.CreateShortType(parameter.Type);
-				var name = parameter.Name;
-				ParameterModifier modifier = ParameterModifier.None;
-				if (parameter.IsRef) 
-					modifier |= ParameterModifier.Ref;
-				if (parameter.IsOut)
-					modifier |= ParameterModifier.Out;
-				result.Add (new ParameterDeclaration(type, name, modifier));
-			}
-			return result;
-		}
-
-		static bool RequireReturnStatement (RefactoringContext context, LambdaExpression lambda)
-		{
-			var type = LambdaHelper.GetLambdaReturnType (context, lambda);
-			return type != null && type.ReflectionName != "System.Void";
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertSwitchToIfAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertSwitchToIfAction.cs
deleted file mode 100644
index 5822e111e2..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertSwitchToIfAction.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// 
-// ConvertSwitchToIfAction.cs
-//  
-// Author:
-//       Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction ("Convert 'switch' to 'if'", Description = "Convert 'switch' statement to 'if' statement")]
-	public class ConvertSwitchToIfAction : SpecializedCodeAction<SwitchStatement>
-	{
-		static readonly InsertParenthesesVisitor insertParenthesesVisitor = new InsertParenthesesVisitor ();
-
-		protected override CodeAction GetAction (RefactoringContext context, SwitchStatement node)
-		{
-			if (!node.SwitchToken.Contains (context.Location))
-				return null;
-
-			// empty switch
-			if (node.SwitchSections.Count == 0)
-				return null;
-
-			// switch with default only
-			if (node.SwitchSections.First ().CaseLabels.Any (label => label.Expression.IsNull))
-				return null;
-
-			// check non-trailing breaks
-			foreach (var switchSection in node.SwitchSections) {
-				var lastStatement = switchSection.Statements.LastOrDefault ();
-				var finder = new NonTrailingBreakFinder (lastStatement as BreakStatement);
-				if (switchSection.AcceptVisitor (finder))
-					return null;
-			}
-			
-			return new CodeAction (context.TranslateString ("Convert 'switch' to 'if'"),
-				script =>
-				{
-					IfElseStatement ifStatement = null;
-					IfElseStatement currentStatement = null;
-					foreach (var switchSection in node.SwitchSections) {
-						var condition = CollectCondition (node.Expression, switchSection.CaseLabels);
-						var bodyStatement = new BlockStatement ();
-						var lastStatement = switchSection.Statements.LastOrDefault ();
-						foreach (var statement in switchSection.Statements) {
-							// skip trailing break
-							if (statement == lastStatement && statement is BreakStatement)
-								continue;
-							bodyStatement.Add (statement.Clone ());
-						}
-
-						// default -> else
-						if (condition == null) {
-							currentStatement.FalseStatement = bodyStatement;
-							break;
-						}
-						var elseIfStatement = new IfElseStatement (condition, bodyStatement);
-						if (ifStatement == null)
-							ifStatement = elseIfStatement;
-						else
-							currentStatement.FalseStatement = elseIfStatement;
-						currentStatement = elseIfStatement;
-					}
-					script.Replace (node, ifStatement);
-					script.FormatText (ifStatement);
-				}, node);
-		}
-
-		static Expression CollectCondition(Expression switchExpr, AstNodeCollection<CaseLabel> caseLabels)
-		{
-			// default
-			if (caseLabels.Count == 0 || caseLabels.Any (label => label.Expression.IsNull))
-				return null;
-
-			var conditionList = caseLabels.Select (
-				label => new BinaryOperatorExpression (switchExpr.Clone (), BinaryOperatorType.Equality, label.Expression.Clone ()))
-				.ToArray ();
-
-			// insert necessary parentheses
-			foreach (var expr in conditionList)
-				expr.AcceptVisitor (insertParenthesesVisitor);
-
-			if (conditionList.Length == 1)
-				return conditionList [0];
-
-			// combine case labels into an conditional or expression
-			BinaryOperatorExpression condition = null;
-			BinaryOperatorExpression currentCondition = null;
-			for (int i = 0; i < conditionList.Length - 1; i++) {
-				var newCondition = new BinaryOperatorExpression
-				{
-					Operator = BinaryOperatorType.ConditionalOr,
-					Left = conditionList[i]
-				};
-				if (currentCondition == null)
-					condition = newCondition;
-				else
-					currentCondition.Right = newCondition;
-				currentCondition = newCondition;
-			}
-			currentCondition.Right = conditionList [conditionList.Length - 1];
-
-			return condition;
-		}
-		
-		class NonTrailingBreakFinder : DepthFirstAstVisitor<bool>
-		{
-			BreakStatement trailingBreakStatement;
-
-			public NonTrailingBreakFinder (BreakStatement trailingBreak)
-			{
-				trailingBreakStatement = trailingBreak;
-			}
-
-			protected override bool VisitChildren (AstNode node)
-			{
-				return node.Children.Any (child => child.AcceptVisitor (this));
-			}
-
-			public override bool VisitBreakStatement (BreakStatement breakStatement)
-			{
-				return breakStatement != trailingBreakStatement;
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertToInitializer/ConvertInitializerToExplicitInitializationsAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertToInitializer/ConvertInitializerToExplicitInitializationsAction.cs
deleted file mode 100644
index 3af7d7bd00..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertToInitializer/ConvertInitializerToExplicitInitializationsAction.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-//
-// ConvertInitializerToExplicitInitializationsAction.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Convert to explicit initializers",
-	               Description = "Converts an object or collection initializer to explicit initializations.")]
-	public class ConvertInitializerToExplicitInitializationsAction : ICodeActionProvider
-	{
-		#region ICodeActionProvider implementation
-
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var codeAction = GetActionForVariableInitializer(context);
-			if (codeAction != null) {
-				yield return codeAction;
-				yield break;
-			}
-			codeAction = GetActionForAssignmentExpression(context);
-			if (codeAction != null) {
-				yield return codeAction;
-				yield break;
-			}
-		}
-		
-		public CodeAction GetActionForVariableInitializer(RefactoringContext context)
-		{
-			var variableInitializer = context.GetNode<VariableInitializer>();
-			if (variableInitializer == null)
-				return null;
-			var declaration = variableInitializer.Parent as VariableDeclarationStatement;
-			if (declaration == null)
-				return null;
-			if (variableInitializer.Initializer.IsNull)
-				return null;
-			var objectCreateExpression = variableInitializer.Initializer as ObjectCreateExpression;
-			if (objectCreateExpression == null)
-				return null;
-			var converter = new InitializerConversionVisitor(context);
-			Expression finalExpression;
-			var statements = converter.ConvertInitializer(objectCreateExpression, out finalExpression);
-			if (statements.Count > 0) {
-				return new CodeAction(context.TranslateString("Convert to explicit initializers"), script => {
-					foreach (var statement in statements) {
-						script.InsertBefore(declaration, statement);
-					}
-					script.Replace(variableInitializer.Initializer, finalExpression);
-				}, variableInitializer);
-			}
-			return null;
-		}
-		
-		public CodeAction GetActionForAssignmentExpression(RefactoringContext context)
-		{
-			var assignmentExpression = context.GetNode<AssignmentExpression>();
-			if (assignmentExpression == null)
-				return null;
-			var expressionStatement = assignmentExpression.Parent as ExpressionStatement;
-			if (expressionStatement == null)
-				return null;
-			var objectCreateExpression = assignmentExpression.Right as ObjectCreateExpression;
-			if (objectCreateExpression == null)
-				return null;
-			var converter = new InitializerConversionVisitor(context);
-			Expression finalExpression;
-			var statements = converter.ConvertInitializer(objectCreateExpression, out finalExpression);
-			if (statements.Count > 0) {
-				return new CodeAction(context.TranslateString("Convert to explicit initializers"), script => {
-					foreach (var statement in statements) {
-						script.InsertBefore(expressionStatement, statement);
-					}
-					script.Replace(assignmentExpression.Right, finalExpression);
-				}, assignmentExpression);
-			}
-			return null;
-		}
-		#endregion
-
-		class InitializerConversionVisitor : DepthFirstAstVisitor<Expression, Expression>
-		{
-			RefactoringContext context;
-			IList<Statement> statements;
-			NamingHelper namingHelper;
-
-			public InitializerConversionVisitor(RefactoringContext context)
-			{
-				this.context = context;
-				namingHelper = new NamingHelper(context);
-			}
-
-			AstType GetDeclarationType(AstType type)
-			{
-				AstType declarationType;
-				if (context.UseExplicitTypes) {
-					declarationType = type.Clone();
-				} else {
-					declarationType = new SimpleType("var");
-				}
-				return declarationType;
-			}
-
-			public IList<Statement> ConvertInitializer(ObjectCreateExpression initializer, out Expression finalExpression)
-			{
-				statements = new List<Statement>();
-
-				finalExpression = initializer.AcceptVisitor(this, null);
-
-				return statements;
-			}
-
-			public override Expression VisitObjectCreateExpression(ObjectCreateExpression objectCreateExpression, Expression data)
-			{
-				var creationType = objectCreateExpression.Type.Clone();
-
-				var parameters = objectCreateExpression.Arguments.Select(arg => arg.Clone());
-				var newCreation = new ObjectCreateExpression(creationType, parameters);
-				if (objectCreateExpression.Initializer.IsNull) {
-					return newCreation;
-				} else {
-					AstType declarationType = GetDeclarationType(objectCreateExpression.Type);
-					var name = namingHelper.GenerateVariableName(objectCreateExpression.Type);
-					var variableInitializer = new VariableDeclarationStatement(declarationType, name, newCreation);
-					statements.Add(variableInitializer);
-
-					var identifier = new IdentifierExpression(name);
-					base.VisitObjectCreateExpression(objectCreateExpression, identifier);
-
-					return identifier;
-				}
-			}
-
-			public override Expression VisitArrayInitializerExpression(ArrayInitializerExpression arrayInitializerExpression, Expression data)
-			{
-				if (!(arrayInitializerExpression.Parent is ArrayInitializerExpression)) {
-					return base.VisitArrayInitializerExpression(arrayInitializerExpression, data);
-				}
-				// this a tuple in a collection initializer
-				var arguments = arrayInitializerExpression.Elements.Select(element => element.AcceptVisitor(this, null).Clone());
-				var method = new MemberReferenceExpression {
-					Target = data.Clone(),
-					MemberName = "Add"
-				};
-				var statement = new ExpressionStatement(new InvocationExpression(method, arguments));
-				statements.Add(statement);
-
-				return null;
-			}
-
-			public override Expression VisitNamedExpression(NamedExpression namedExpression, Expression data)
-			{
-				var member = new MemberReferenceExpression {
-					Target = data.Clone(),
-					MemberName = namedExpression.Name
-				};
-				var expression = namedExpression.Expression.AcceptVisitor(this, member);
-				if (expression != null) {
-					var statement = new ExpressionStatement {
-						Expression = new AssignmentExpression {
-							Left = member,
-							Right = expression.Clone()
-						}
-					};
-					statements.Add(statement);
-				}
-
-				return null;
-			}
-
-			protected override Expression VisitChildren(AstNode node, Expression data)
-			{
-				// Most expressions should just be used as-is, and
-				// a) need not be visited
-				// b) only return themselves
-				if (node is Expression && !(node is ObjectCreateExpression || node is ArrayInitializerExpression || node is NamedExpression)){
-					return (Expression)node;
-				}
-				return base.VisitChildren(node, data);
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertToInitializer/ConvertToInitializerAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertToInitializer/ConvertToInitializerAction.cs
deleted file mode 100644
index 2ca7304390..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertToInitializer/ConvertToInitializerAction.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// ConvertToInitializerAction.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Convert to initializer",
-	               Description = "Converts a set of assignments and .Add() calls to an initializer.")]
-	public class ConvertToInitializerAction : ICodeActionProvider
-	{
-		#region ICodeActionProvider implementation
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var initializer = context.GetNode<VariableInitializer>();
-			if (initializer != null) {
-				var action = HandleInitializer(context, initializer);
-				if (action != null)
-					yield return action;
-			}
-			var expressionStatement = context.GetNode<ExpressionStatement>();
-			if (expressionStatement != null) {
-				var action = HandleExpressionStatement(context, expressionStatement);
-				if (action != null)
-					yield return action;
-			}
-		}
-
-		CodeAction HandleInitializer(RefactoringContext context, VariableInitializer initializer)
-		{
-			var objectCreateExpression = initializer.Initializer as ObjectCreateExpression;
-			if (objectCreateExpression == null)
-				return null;
-			var initializerRR = context.Resolve(initializer) as LocalResolveResult;
-			if (initializerRR == null)
-				return null;
-			IList<AstNode> statements = GetNodes(context.GetNode<Statement>());
-			var converter = new StatementsToInitializerConverter(context);
-			var newInitializer = converter.ConvertToInitializer(initializer, ref statements);
-			if (newInitializer == null || statements.Count == 0)
-				return null;
-			return MakeAction(context, initializer, newInitializer, statements);
-		}
-
-		CodeAction HandleExpressionStatement(RefactoringContext context, ExpressionStatement expressionStatement)
-		{
-			var expression = expressionStatement.Expression as AssignmentExpression;
-			if (expression == null || expression.Operator != AssignmentOperatorType.Assign)
-				return null;
-			if (!(expression.Right is ObjectCreateExpression))
-				return null;
-			var expressionResolveResult = context.Resolve(expression.Left);
-			if (!(expressionResolveResult is LocalResolveResult) && !(expressionResolveResult is MemberResolveResult))
-				return null;
-			IList<AstNode> statements = GetNodes(context.GetNode<Statement>());
-			var converter = new StatementsToInitializerConverter(context);
-			var newExpression = converter.ConvertToInitializer(expression, ref statements);
-			if (newExpression == null || statements.Count == 0)
-				return null;
-			return MakeAction(context, expression, newExpression, statements);
-		}
-		
-		List<AstNode> GetNodes(Statement startStatement)
-		{
-			var statements = new List<AstNode>();
-			AstNode currentNode = startStatement.NextSibling;
-			while (currentNode != null) {
-				if (currentNode is Statement || currentNode is Comment)
-					statements.Add(currentNode);
-				currentNode = currentNode.NextSibling;
-			}
-			return statements;
-		}
-		
-		CodeAction MakeAction(RefactoringContext context, AstNode oldNode, AstNode replacementNode, IEnumerable<AstNode> toRemove)
-		{
-			return new CodeAction(context.TranslateString("Convert to initializer"), script => {
-				foreach (var statement in toRemove)
-					script.Remove(statement);
-				script.Replace(oldNode, replacementNode);
-			}, oldNode);
-		}
-		#endregion
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateBackingStoreAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateBackingStoreAction.cs
deleted file mode 100644
index 1ab23cf692..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateBackingStoreAction.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// 
-// CreateBackingStore.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Create backing store for auto property", Description = "Creates a backing field for an auto property.")]
-	public class CreateBackingStoreAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var property = context.GetNode<PropertyDeclaration>();
-			if (!(property != null &&
-				!property.Getter.IsNull && !property.Setter.IsNull && // automatic properties always need getter & setter
-				property.Getter.Body.IsNull &&
-				property.Setter.Body.IsNull)) {
-				yield break;
-			}
-			
-			yield return new CodeAction(context.TranslateString("Create backing store"), script => {
-				string backingStoreName = context.GetNameProposal (property.Name);
-				
-				// create field
-				var backingStore = new FieldDeclaration ();
-				if (property.Modifiers.HasFlag (Modifiers.Static))
-					backingStore.Modifiers |= Modifiers.Static;
-				backingStore.ReturnType = property.ReturnType.Clone ();
-				
-				var initializer = new VariableInitializer (backingStoreName);
-				backingStore.Variables.Add (initializer);
-				
-				// create new property & implement the get/set bodies
-				var newProperty = (PropertyDeclaration)property.Clone ();
-				Expression id1;
-				if (backingStoreName == "value")
-					id1 = new ThisReferenceExpression().Member("value");
-				else
-					id1 = new IdentifierExpression (backingStoreName);
-				Expression id2 = id1.Clone();
-				newProperty.Getter.Body = new BlockStatement () {
-					new ReturnStatement (id1)
-				};
-				newProperty.Setter.Body = new BlockStatement () {
-					new AssignmentExpression (id2, AssignmentOperatorType.Assign, new IdentifierExpression ("value"))
-				};
-				
-				script.Replace (property, newProperty);
-				script.InsertBefore (property, backingStore);
-				script.Link (initializer, id1, id2);
-			}, property.NameToken);
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateClassDeclarationAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateClassDeclarationAction.cs
deleted file mode 100644
index 4cf9f68ed6..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateClassDeclarationAction.cs
+++ /dev/null
@@ -1,330 +0,0 @@
-// 
-// CreateClassDeclarationAction.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Create class", Description = "Creates a class declaration out of an object creation.")]
-	public class CreateClassDeclarationAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var simpleType = context.GetNode<SimpleType>();
-			if (simpleType != null && !(simpleType.Parent is EventDeclaration || simpleType.Parent is CustomEventDeclaration)) 
-				return GetActions(context, simpleType);
-
-			var createExpression = context.GetNode<ObjectCreateExpression>();
-			if (createExpression != null) 
-				return GetActions(context, createExpression);
-
-			var identifier = context.GetNode<IdentifierExpression>();
-			if (identifier != null && (identifier.Parent is MemberReferenceExpression)) 
-				return GetActions(context, identifier);
-
-			return Enumerable.Empty<CodeAction>();
-		}
-
-		static IEnumerable<CodeAction> GetActions(RefactoringContext context, AstNode node)
-		{
-			var resolveResult = context.Resolve(node) as UnknownIdentifierResolveResult;
-			if (resolveResult == null)
-				yield break;
-
-			var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
-			if (service != null && !service.IsValidName(resolveResult.Identifier, AffectedEntity.Class)) { 
-				yield break;
-			}
-			ClassType classType = GuessClassTypeByName(service, node);
-			ModifyClassTypeBasedOnTypeGuessing(context, node, ref classType);
-
-			string message;
-			switch (classType) {
-				case ClassType.Struct:
-					message = context.TranslateString("Create struct");
-					break;
-				case ClassType.Interface:
-					message = context.TranslateString("Create interface");
-					break;
-				default:
-					message = context.TranslateString("Create class");
-					break;
-			}
-			yield return new CodeAction(message, script => {
-				script.CreateNewType(CreateType(context, service, node, classType));
-			}, node);
-
-			if (node.Parent is TypeDeclaration || classType != ClassType.Class)
-				yield break;
-			yield return new CodeAction(context.TranslateString("Create nested class"), script => {
-				script.InsertWithCursor(
-					context.TranslateString("Create nested class"),
-					Script.InsertPosition.Before,
-					CreateType(context, service, node, classType)
-				);
-			}, node);
-		}
-
-		static void ModifyClassTypeBasedOnTypeGuessing(RefactoringContext context, AstNode node, ref ClassType classType)
-		{
-			var guessedType = CreateFieldAction.GuessType(context, node);
-			if (guessedType.Kind == TypeKind.TypeParameter) {
-				var tp = (ITypeParameter)guessedType;
-				if (tp.HasValueTypeConstraint)
-					classType = ClassType.Struct;
-				if (tp.HasReferenceTypeConstraint)
-					classType = ClassType.Class;
-			}
-		}
-		
-		static ClassType GuessClassTypeByName(NamingConventionService service,  string identifier)
-		{
-			if (service == null)
-				return ClassType.Class;
-			if (service.IsValidName (identifier, AffectedEntity.Interface, Modifiers.Public))
-				return ClassType.Interface;
-			if (!service.IsValidName (identifier, AffectedEntity.Class, Modifiers.Public) &&
-			     service.IsValidName (identifier, AffectedEntity.Struct, Modifiers.Public))
-				return ClassType.Struct;
-			return ClassType.Class;
-		}
-
-		static ClassType GuessClassTypeByName(NamingConventionService service, AstNode node)
-		{
-			if (node is SimpleType) 
-				return GuessClassTypeByName (service, ((SimpleType)node).Identifier);
-			if (node is IdentifierExpression) 
-				return GuessClassTypeByName (service, ((IdentifierExpression)node).Identifier);
-			return ClassType.Class;
-		}
-
-		static TypeDeclaration CreateType(RefactoringContext context, NamingConventionService service, AstNode node, ClassType classType)
-		{
-			TypeDeclaration result;
-			if (node is SimpleType) {
-				result = CreateClassFromType(context, classType, (SimpleType)node);
-			} else if (node is ObjectCreateExpression) {
-				result = CreateClassFromObjectCreation(context, (ObjectCreateExpression)node);
-			} else {
-				result = CreateClassFromIdentifier(context, classType, (IdentifierExpression)node);
-			}
-
-			return AddBaseTypesAccordingToNamingRules(context, service, result);
-		}
-
-		static TypeDeclaration CreateClassFromIdentifier(RefactoringContext context, ClassType classType, IdentifierExpression identifierExpression)
-		{
-			var result = new TypeDeclaration { Name = identifierExpression.Identifier, ClassType = classType };
-			var entity = identifierExpression.GetParent<EntityDeclaration>();
-			if (entity != null)
-				result.Modifiers |= entity.Modifiers & Modifiers.Public;
-			return result;
-		}
-
-		static TypeDeclaration CreateClassFromType(RefactoringContext context, ClassType classType, SimpleType simpleType)
-		{
-			TypeDeclaration result;
-			string className = simpleType.Identifier;
-
-			if (simpleType.Parent is Attribute && classType == ClassType.Class) {
-				if (!className.EndsWith("Attribute", System.StringComparison.Ordinal))
-					className += "Attribute";
-			}
-
-			result = new TypeDeclaration { Name = className, ClassType = classType };
-			var entity = simpleType.GetParent<EntityDeclaration>();
-			if (entity != null)
-				result.Modifiers |= entity.Modifiers & Modifiers.Public;
-
-			var guessedType = CreateFieldAction.GuessType (context, simpleType);
-			if (guessedType.Kind == TypeKind.TypeParameter)
-				ImplementConstraints (context, result, (ITypeParameter)guessedType);
-			return result;
-		}
-
-		static void ImplementConstraints(RefactoringContext context, TypeDeclaration result, ITypeParameter tp)
-		{
-			if (tp.HasValueTypeConstraint)
-				result.ClassType = ClassType.Struct;
-			if (tp.HasReferenceTypeConstraint)
-				result.ClassType = ClassType.Class;
-			if (tp.HasDefaultConstructorConstraint)
-				result.AddChild (new ConstructorDeclaration { Modifiers = Modifiers.Public, Body = new BlockStatement () }, Roles.TypeMemberRole);
-			foreach (var baseType in tp.DirectBaseTypes) {
-				if (baseType.Namespace == "System") {
-					if (baseType.Name == "Object" || baseType.Name == "ValueType")
-						continue;
-				}
-				result.BaseTypes.Add (context.CreateShortType (baseType));
-			}
-		}
-
-		static TypeDeclaration CreateClassFromObjectCreation(RefactoringContext context, ObjectCreateExpression createExpression)
-		{
-			TypeDeclaration result;
-			string className = createExpression.Type.ToString();
-			if (!createExpression.Arguments.Any()) {
-				result = new TypeDeclaration { Name = className };
-			} else {
-				var decl = new ConstructorDeclaration {
-					Name = className,
-					Modifiers = Modifiers.Public,
-					Body = new BlockStatement {
-						new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
-					}
-				};
-				result = new TypeDeclaration {
-					Name = className,
-					Members = {
-						decl
-					}
-				};
-				decl.Parameters.AddRange(CreateMethodDeclarationAction.GenerateParameters(context, createExpression.Arguments));
-			}
-			var guessedType = CreateFieldAction.GuessType(context, createExpression);
-			if (guessedType.Kind == TypeKind.Interface || guessedType.Kind == TypeKind.Class && guessedType.GetDefinition ().IsAbstract) {
-				result.BaseTypes.Add(context.CreateShortType(guessedType));
-				AddImplementation(context, result, guessedType);
-			}
-			
-			return result;
-		}
-
-		static Modifiers GetModifiers(IEntity property)
-		{
-			if (property.DeclaringType.Kind == TypeKind.Interface)
-				return Modifiers.Public;
-			switch (property.Accessibility) {
-				case Accessibility.Public:
-					return Modifiers.Public | Modifiers.Override;
-				case Accessibility.Protected:
-					return Modifiers.Protected | Modifiers.Override;
-				case Accessibility.Internal:
-					return Modifiers.Internal | Modifiers.Override;
-				case Accessibility.ProtectedOrInternal:
-					// TODO: oops
-					return Modifiers.Internal | Modifiers.Protected | Modifiers.Override;
-				case Accessibility.ProtectedAndInternal:
-					// TODO: oops
-					return Modifiers.Internal | Modifiers.Protected | Modifiers.Override;
-			}
-			return Modifiers.Override;
-		}
-
-		static void AddImplementation(RefactoringContext context, TypeDeclaration result, IType guessedType)
-		{
-			foreach (var property in guessedType.GetProperties ()) {
-				if (!property.IsAbstract)
-					continue;
-				if (property.IsIndexer) {
-					var indexerDecl = new IndexerDeclaration {
-						ReturnType = context.CreateShortType(property.ReturnType),
-						Modifiers = GetModifiers(property),
-						Name = property.Name
-					};
-					indexerDecl.Parameters.AddRange(ConvertParameters(context, property.Parameters));
-					if (property.CanGet)
-						indexerDecl.Getter = new Accessor();
-					if (property.CanSet)
-						indexerDecl.Setter = new Accessor();
-					result.AddChild(indexerDecl, Roles.TypeMemberRole);
-					continue;
-				}
-				var propDecl = new PropertyDeclaration {
-					ReturnType = context.CreateShortType(property.ReturnType),
-					Modifiers = GetModifiers (property),
-					Name = property.Name
-				};
-				if (property.CanGet)
-					propDecl.Getter = new Accessor();
-				if (property.CanSet)
-					propDecl.Setter = new Accessor();
-				result.AddChild(propDecl, Roles.TypeMemberRole);
-			}
-			
-			foreach (var method in guessedType.GetMethods ()) {
-				if (!method.IsAbstract)
-					continue;
-				var decl = new MethodDeclaration {
-					ReturnType = context.CreateShortType(method.ReturnType),
-					Modifiers = GetModifiers (method),
-					Name = method.Name,
-					Body = new BlockStatement {
-						new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
-					}
-				};
-				decl.Parameters.AddRange(ConvertParameters(context, method.Parameters));
-				result.AddChild(decl, Roles.TypeMemberRole);
-			}
-
-			foreach (var evt in guessedType.GetEvents ()) {
-				if (!evt.IsAbstract)
-					continue;
-				var decl = new EventDeclaration {
-					ReturnType = context.CreateShortType(evt.ReturnType),
-					Modifiers = GetModifiers (evt),
-					Variables = {
-						new VariableInitializer {
-							Name = evt.Name
-						}
-					}
-				};
-				decl.Variables.Add(new VariableInitializer(evt.Name));
-				result.AddChild(decl, Roles.TypeMemberRole);
-			}
-		}
-
-		static IEnumerable<ParameterDeclaration> ConvertParameters(RefactoringContext context, IList<IParameter> parameters)
-		{
-			foreach (var param in parameters) {
-				ParameterModifier mod = ParameterModifier.None;
-				if (param.IsOut) {
-					mod = ParameterModifier.Out;
-				} else if (param.IsRef) {
-					mod = ParameterModifier.Ref;
-				} else if (param.IsParams) {
-					mod = ParameterModifier.Params;
-				}
-				yield return new ParameterDeclaration(context.CreateShortType(param.Type), param.Name, mod);
-			}
-		}
-
-		static TypeDeclaration AddBaseTypesAccordingToNamingRules(RefactoringContext context, NamingConventionService service, TypeDeclaration result)
-		{
-			if (service.HasValidRule(result.Name, AffectedEntity.CustomAttributes, Modifiers.Public)) {
-				result.BaseTypes.Add(context.CreateShortType("System", "Attribute"));
-			} else if (service.HasValidRule(result.Name, AffectedEntity.CustomEventArgs, Modifiers.Public)) {
-				result.BaseTypes.Add(context.CreateShortType("System", "EventArgs"));
-			} else if (service.HasValidRule(result.Name, AffectedEntity.CustomExceptions, Modifiers.Public)) {
-				result.BaseTypes.Add(context.CreateShortType("System", "Exception"));
-			}
-			return result;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateConstructorDeclarationAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateConstructorDeclarationAction.cs
deleted file mode 100644
index 32d0f0a56d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateConstructorDeclarationAction.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// 
-// CreateClassDeclarationAction.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Create constructor", Description = "Creates a constructor declaration out of an object creation.")]
-	public class CreateConstructorDeclarationAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var createExpression = context.GetNode<Expression>() as ObjectCreateExpression;
-			if (createExpression == null) 
-				yield break;
-			
-			var resolveResult = context.Resolve(createExpression) as CSharpInvocationResolveResult;
-			if (resolveResult == null || !resolveResult.IsError || resolveResult.Member.DeclaringTypeDefinition == null || resolveResult.Member.DeclaringTypeDefinition.IsSealed || resolveResult.Member.DeclaringTypeDefinition.Region.IsEmpty)
-				yield break;
-
-			yield return new CodeAction(context.TranslateString("Create constructor"), script => {
-				var decl = new ConstructorDeclaration() {
-					Name = resolveResult.Member.DeclaringTypeDefinition.Name,
-					Modifiers = Modifiers.Public,
-					Body = new BlockStatement() {
-						new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
-					}
-				};
-				decl.Parameters.AddRange(CreateMethodDeclarationAction.GenerateParameters(context, createExpression.Arguments));
-
-				script.InsertWithCursor(
-					context.TranslateString("Create constructor"),
-					resolveResult.Member.DeclaringTypeDefinition,
-					decl
-				);
-			}, createExpression);
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateDelegateAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateDelegateAction.cs
deleted file mode 100644
index f93d0a44e0..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateDelegateAction.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// 
-// CreateDelegateAction.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Create delegate", Description = "Creates a delegate declaration out of an event declaration.")]
-	public class CreateDelegateAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var simpleType = context.GetNode<SimpleType>();
-			if (simpleType != null && (simpleType.Parent is EventDeclaration || simpleType.Parent is CustomEventDeclaration)) 
-				return GetActions(context, simpleType);
-
-			return Enumerable.Empty<CodeAction>();
-		}
-
-		static IEnumerable<CodeAction> GetActions(RefactoringContext context, SimpleType node)
-		{
-			var resolveResult = context.Resolve(node) as UnknownIdentifierResolveResult;
-			if (resolveResult == null)
-				yield break;
-
-			yield return new CodeAction(context.TranslateString("Create delegate"), script => {
-				script.CreateNewType(CreateType(context,  node));
-			}, node);
-
-		}
-
-		static DelegateDeclaration CreateType(RefactoringContext context, SimpleType simpleType)
-		{
-			var result = new DelegateDeclaration() {
-				Name = simpleType.Identifier,
-				Modifiers = ((EntityDeclaration)simpleType.Parent).Modifiers,
-				ReturnType = new PrimitiveType("void"),
-				Parameters = {
-					new ParameterDeclaration(new PrimitiveType("object"), "sender"),
-					new ParameterDeclaration(context.CreateShortType("System", "EventArgs"), "e")
-				}
-			};
-			return result;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateEnumValue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateEnumValue.cs
deleted file mode 100644
index 44e49ad7bb..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateEnumValue.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// CreateEnumValue.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.PatternMatching;
-using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Threading;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Create enum value", Description = "Creates an enum value for a undefined enum value.")]
-	public class CreateEnumValue : ICodeActionProvider
-	{
-		internal static bool IsInvocationTarget(AstNode node)
-		{
-			var invoke = node.Parent as InvocationExpression;
-			return invoke != null && invoke.Target == node;
-		}
-		
-		internal static Expression GetCreatePropertyOrFieldNode(RefactoringContext context)
-		{
-			return context.GetNode(n => n is IdentifierExpression || n is MemberReferenceExpression || n is NamedExpression) as Expression;
-		}
-		
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var expr = GetCreatePropertyOrFieldNode(context);
-			if (expr == null)
-				yield break;
-			if (!(expr is MemberReferenceExpression))
-				yield break;
-			var propertyName = CreatePropertyAction.GetPropertyName(expr);
-			if (propertyName == null)
-				yield break;
-			if (IsInvocationTarget(expr))
-				yield break;
-			var statement = expr.GetParent<Statement>();
-			if (statement == null)
-				yield break;
-			if (!(context.Resolve(expr).IsError))
-				yield break;
-			var guessedType = CreateFieldAction.GuessType(context, expr);
-			if (guessedType == null || guessedType.Kind != TypeKind.Enum)
-				yield break;
-			var state = context.GetResolverStateBefore(expr);
-			if (state.CurrentMember == null || state.CurrentTypeDefinition == null)
-				yield break;
-
-			yield return new CodeAction(context.TranslateString("Create enum value"), script => {
-				var decl = new EnumMemberDeclaration {
-					Name = propertyName
-				};
-				script.InsertWithCursor(context.TranslateString("Create enum value"), guessedType.GetDefinition (), decl);
-			}, expr);
-			
-		}
-		
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateEventInvocatorAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateEventInvocatorAction.cs
deleted file mode 100644
index 14ad2c0d3d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateEventInvocatorAction.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// 
-// CreateEventInvocator.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Create event invocator", Description = "Creates a standard OnXXX event method.")]
-	public class CreateEventInvocatorAction : ICodeActionProvider
-	{
-		/// <summary>
-		/// If <c>true</c> an explicit type will be used for the handler variable; otherwise, 'var' will be used as type.
-		/// Default value is <c>false</c>
-		/// </summary>
-		public bool UseExplictType {
-			get;
-			set;
-		}
-
-		public static MethodDeclaration CreateEventInvocator (RefactoringContext context, TypeDeclaration declaringType, EventDeclaration eventDeclaration, VariableInitializer initializer, IMethod invokeMethod, bool useExplictType)
-		{
-			bool hasSenderParam = false;
-			IEnumerable<IParameter> pars = invokeMethod.Parameters;
-			if (invokeMethod.Parameters.Any()) {
-				var first = invokeMethod.Parameters [0];
-				if (first.Name == "sender" /*&& first.Type == "System.Object"*/) {
-					hasSenderParam = true;
-					pars = invokeMethod.Parameters.Skip(1);
-				}
-			}
-			const string handlerName = "handler";
-
-			var arguments = new List<Expression>();
-			if (hasSenderParam)
-				arguments.Add(eventDeclaration.HasModifier (Modifiers.Static) ? (Expression)new PrimitiveExpression (null) : new ThisReferenceExpression());
-			bool useThisMemberReference = false;
-			foreach (var par in pars) {
-				arguments.Add(new IdentifierExpression(par.Name));
-				useThisMemberReference |= par.Name == initializer.Name;
-			}
-			var proposedHandlerName = GetNameProposal(initializer);
-			var modifiers = eventDeclaration.HasModifier(Modifiers.Static) ? Modifiers.Static : Modifiers.Protected | Modifiers.Virtual;
-			if (declaringType.HasModifier (Modifiers.Sealed)) {
-				modifiers = Modifiers.None;
-			}
-			var methodDeclaration = new MethodDeclaration {
-				Name = proposedHandlerName,
-				ReturnType = new PrimitiveType ("void"),
-				Modifiers = modifiers,
-				Body = new BlockStatement {
-					new VariableDeclarationStatement (
-						useExplictType ? eventDeclaration.ReturnType.Clone () : new PrimitiveType ("var"), handlerName, 
-						useThisMemberReference ? 
-						(Expression)new MemberReferenceExpression (new ThisReferenceExpression (), initializer.Name) 
-						: new IdentifierExpression (initializer.Name)
-						),
-					new IfElseStatement {
-						Condition = new BinaryOperatorExpression (new IdentifierExpression (handlerName), BinaryOperatorType.InEquality, new PrimitiveExpression (null)),
-						TrueStatement = new ExpressionStatement (new InvocationExpression (new IdentifierExpression (handlerName), arguments))
-					}
-				}
-			};
-
-			foreach (var par in pars) {
-				var typeName = context.CreateShortType(par.Type);
-				var decl = new ParameterDeclaration(typeName, par.Name);
-				methodDeclaration.Parameters.Add(decl);
-			}
-			return methodDeclaration;
-		}
-
-		static string GetNameProposal(VariableInitializer initializer)
-		{
-			return "On" + char.ToUpper(initializer.Name[0]) + initializer.Name.Substring(1);
-		}
-
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			VariableInitializer initializer;
-			var eventDeclaration = GetEventDeclaration(context, out initializer);
-			if (eventDeclaration == null) {
-				yield break;
-			}
-			var type = (TypeDeclaration)eventDeclaration.Parent;
-			var proposedHandlerName = GetNameProposal(initializer);
-			if (type.Members.Any(m => m is MethodDeclaration && m.Name == proposedHandlerName)) {
-				yield break;
-			}
-			var resolvedType = context.Resolve(eventDeclaration.ReturnType).Type;
-			if (resolvedType.Kind == TypeKind.Unknown) {
-				yield break;
-			}
-			var invokeMethod = resolvedType.GetDelegateInvokeMethod();
-			if (invokeMethod == null) {
-				yield break;
-			}
-			yield return new CodeAction(context.TranslateString("Create event invocator"), script => {
-				var methodDeclaration = CreateEventInvocator (context, type, eventDeclaration, initializer, invokeMethod, UseExplictType);
-				script.InsertWithCursor(
-					context.TranslateString("Create event invocator"),
-					Script.InsertPosition.After,
-					methodDeclaration
-				);
-			}, initializer);
-		}
-
-		static EventDeclaration GetEventDeclaration (RefactoringContext context, out VariableInitializer initializer)
-		{
-			var result = context.GetNode<EventDeclaration> ();
-			if (result == null) {
-				initializer = null;
-				return null;
-			}
-			initializer = result.Variables.FirstOrDefault (v => v.NameToken.Contains (context.Location));
-			return initializer != null ? result : null;
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateFieldAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateFieldAction.cs
deleted file mode 100644
index 4642df2d63..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateFieldAction.cs
+++ /dev/null
@@ -1,326 +0,0 @@
-// 
-// CreateField.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using ICSharpCode.NRefactory.PatternMatching;
-using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Threading;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Create field", Description = "Creates a field for a undefined variable.")]
-	public class CreateFieldAction : ICodeActionProvider
-	{
-		internal static bool IsInvocationTarget(AstNode node)
-		{
-			var invoke = node.Parent as InvocationExpression;
-			return invoke != null && invoke.Target == node;
-		}
-
-		internal static Expression GetCreatePropertyOrFieldNode(RefactoringContext context)
-		{
-			return context.GetNode(n => n is IdentifierExpression || n is MemberReferenceExpression || n is NamedExpression) as Expression;
-		}
-
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var expr = GetCreatePropertyOrFieldNode(context);
-			if (expr == null)
-				yield break;
-
-			if (expr is MemberReferenceExpression && !(((MemberReferenceExpression)expr).Target is ThisReferenceExpression))
-				yield break;
-
-			var propertyName = CreatePropertyAction.GetPropertyName(expr);
-			if (propertyName == null)
-				yield break;
-
-			if (IsInvocationTarget(expr))
-				yield break;
-			var statement = expr.GetParent<Statement>();
-			if (statement == null)
-				yield break;
-			if (!(context.Resolve(expr).IsError))
-				yield break;
-			var guessedType = CreateFieldAction.GuessAstType(context, expr);
-			if (guessedType == null)
-				yield break;
-			var state = context.GetResolverStateBefore(expr);
-			if (state.CurrentMember == null || state.CurrentTypeDefinition == null)
-				yield break;
-			bool isStatic =  !(expr is NamedExpression) && (state.CurrentMember.IsStatic | state.CurrentTypeDefinition.IsStatic);
-
-//			var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
-//			if (service != null && !service.IsValidName(identifier.Identifier, AffectedEntity.Field, Modifiers.Private, isStatic)) { 
-//				yield break;
-//			}
-
-			yield return new CodeAction(context.TranslateString("Create field"), script => {
-				var decl = new FieldDeclaration {
-					ReturnType = guessedType,
-					Variables = { new VariableInitializer(propertyName) }
-				};
-				if (isStatic)
-					decl.Modifiers |= Modifiers.Static;
-				script.InsertWithCursor(context.TranslateString("Create field"), Script.InsertPosition.Before, decl);
-			}, expr);
-
-		}
-
-		#region Type guessing
-		static int GetArgumentIndex(IEnumerable<Expression> arguments, AstNode parameter)
-		{
-			int argumentNumber = 0;
-			foreach (var arg in arguments) {
-				if (arg == parameter) {
-					return argumentNumber;
-				}
-				argumentNumber++;
-			}
-			return -1;
-		}
-
-		static IEnumerable<IType> GetAllValidTypesFromInvokation(CSharpAstResolver resolver, InvocationExpression invoke, AstNode parameter)
-		{
-			int index = GetArgumentIndex(invoke.Arguments, parameter);
-			if (index < 0)
-				yield break;
-					
-			var targetResult = resolver.Resolve(invoke.Target) as MethodGroupResolveResult;
-			if (targetResult != null) {
-				foreach (var method in targetResult.Methods) {
-					if (index < method.Parameters.Count) {
-						yield return method.Parameters [index].Type;
-					}
-				}
-				foreach (var extMethods in targetResult.GetExtensionMethods ()) {
-					foreach (var extMethod in extMethods) {
-						if (index + 1 < extMethod.Parameters.Count) {
-							yield return extMethod.Parameters [index + 1].Type;
-						}
-					}
-				}
-			}
-		}
-
-		static IEnumerable<IType> GetAllValidTypesFromObjectCreation(CSharpAstResolver resolver, ObjectCreateExpression invoke, AstNode parameter)
-		{
-			int index = GetArgumentIndex(invoke.Arguments, parameter);
-			if (index < 0)
-				yield break;
-
-			var targetResult = resolver.Resolve(invoke.Type);
-			if (targetResult is TypeResolveResult) {
-				var type = ((TypeResolveResult)targetResult).Type;
-				if (type.Kind == TypeKind.Delegate && index == 0) {
-					yield return type;
-					yield break;
-				}
-				foreach (var constructor in type.GetConstructors ()) {
-					if (index < constructor.Parameters.Count)
-						yield return constructor.Parameters [index].Type;
-				}
-			}
-		}
-
-		static IType GetElementType(CSharpAstResolver resolver, IType type)
-		{
-			// TODO: A better get element type method.
-			if (type.Kind == TypeKind.Array || type.Kind == TypeKind.Dynamic) {
-				if (type.Kind == TypeKind.Array)
-					return ((ArrayType)type).ElementType;
-				return resolver.Compilation.FindType(KnownTypeCode.Object);
-			}
-
-
-			foreach (var method in type.GetMethods (m => m.Name == "GetEnumerator")) {
-				IType returnType = null;
-				foreach (var prop in method.ReturnType.GetProperties(p => p.Name == "Current")) {
-					if (returnType != null && prop.ReturnType.IsKnownType (KnownTypeCode.Object))
-						continue;
-					returnType = prop.ReturnType;
-				}
-				if (returnType != null)
-					return returnType;
-			}
-
-			return resolver.Compilation.FindType(KnownTypeCode.Object);
-		}
-
-		internal static IEnumerable<IType> GetValidTypes(CSharpAstResolver resolver, AstNode expr)
-		{
-			if (expr.Role == Roles.Condition) {
-				return new [] { resolver.Compilation.FindType (KnownTypeCode.Boolean) };
-			}
-
-			if (expr.Parent is DirectionExpression) {
-				var parent = expr.Parent.Parent;
-				if (parent is InvocationExpression) {
-					var invoke = (InvocationExpression)parent;
-					return GetAllValidTypesFromInvokation(resolver, invoke, expr.Parent);
-				}
-			}
-
-			if (expr.Parent is ArrayInitializerExpression) {
-				if (expr is NamedExpression)
-				return new [] { resolver.Resolve(((NamedExpression)expr).Expression).Type };
-
-				var aex = expr.Parent as ArrayInitializerExpression;
-				if (aex.IsSingleElement)
-					aex = aex.Parent as ArrayInitializerExpression;
-				var type = GetElementType(resolver, resolver.Resolve(aex.Parent).Type);
-				if (type.Kind != TypeKind.Unknown)
-				return new [] { type };
-			}
-
-			if (expr.Parent is ObjectCreateExpression) {
-				var invoke = (ObjectCreateExpression)expr.Parent;
-				return GetAllValidTypesFromObjectCreation(resolver, invoke, expr);
-			}
-
-			if (expr.Parent is ArrayCreateExpression) {
-				var ace = (ArrayCreateExpression)expr.Parent;
-				if (!ace.Type.IsNull) {
-					return new [] { resolver.Resolve(ace.Type).Type };
-				}
-			}
-
-			if (expr.Parent is InvocationExpression) {
-				var parent = expr.Parent;
-				if (parent is InvocationExpression) {
-					var invoke = (InvocationExpression)parent;
-					return GetAllValidTypesFromInvokation(resolver, invoke, expr);
-				}
-			}
-			
-			if (expr.Parent is VariableInitializer) {
-				var initializer = (VariableInitializer)expr.Parent;
-				var field = initializer.GetParent<FieldDeclaration>();
-				if (field != null)
-					return new [] { resolver.Resolve(field.ReturnType).Type };
-				return new [] { resolver.Resolve(initializer).Type };
-			}
-			
-			if (expr.Parent is CastExpression) {
-				var cast = (CastExpression)expr.Parent;
-				return new [] { resolver.Resolve(cast.Type).Type };
-			}
-			
-			if (expr.Parent is AsExpression) {
-				var cast = (AsExpression)expr.Parent;
-				return new [] { resolver.Resolve(cast.Type).Type };
-			}
-
-			if (expr.Parent is AssignmentExpression) {
-				var assign = (AssignmentExpression)expr.Parent;
-				var other = assign.Left == expr ? assign.Right : assign.Left;
-				return new [] { resolver.Resolve(other).Type };
-			}
-
-			if (expr.Parent is BinaryOperatorExpression) {
-				var assign = (BinaryOperatorExpression)expr.Parent;
-				var other = assign.Left == expr ? assign.Right : assign.Left;
-				return new [] { resolver.Resolve(other).Type };
-			}
-			
-			if (expr.Parent is ReturnStatement) {
-				var state = resolver.GetResolverStateBefore(expr.Parent);
-				if (state != null  && state.CurrentMember != null)
-					return new [] { state.CurrentMember.ReturnType };
-			}
-
-			if (expr.Parent is YieldReturnStatement) {
-				var state = resolver.GetResolverStateBefore(expr);
-				if (state != null && (state.CurrentMember.ReturnType is ParameterizedType)) {
-					var pt = (ParameterizedType)state.CurrentMember.ReturnType;
-					if (pt.FullName == "System.Collections.Generic.IEnumerable") {
-						return new [] { pt.TypeArguments.First() };
-					}
-				}
-			}
-
-			if (expr.Parent is UnaryOperatorExpression) {
-				var uop = (UnaryOperatorExpression)expr.Parent;
-				switch (uop.Operator) {
-					case UnaryOperatorType.Not:
-						return new [] { resolver.Compilation.FindType(KnownTypeCode.Boolean) };
-					case UnaryOperatorType.Minus:
-					case UnaryOperatorType.Plus:
-					case UnaryOperatorType.Increment:
-					case UnaryOperatorType.Decrement:
-					case UnaryOperatorType.PostIncrement:
-					case UnaryOperatorType.PostDecrement:
-						return new [] { resolver.Compilation.FindType(KnownTypeCode.Int32) };
-				}
-			}
-			return Enumerable.Empty<IType>();
-		}
-		static readonly IType[] emptyTypes = new IType[0];
-		public static AstType GuessAstType(RefactoringContext context, AstNode expr)
-		{
-			var type = GetValidTypes(context.Resolver, expr).ToArray();
-			var typeInference = new TypeInference(context.Compilation);
-			typeInference.Algorithm = TypeInferenceAlgorithm.Improved;
-			var inferedType = typeInference.FindTypeInBounds(type, emptyTypes);
-			if (inferedType.Kind == TypeKind.Unknown)
-				return new PrimitiveType("object");
-			return context.CreateShortType(inferedType);
-		}
-
-		public static IType GuessType(RefactoringContext context, AstNode expr)
-		{
-			if (expr is SimpleType && expr.Role == Roles.TypeArgument) {
-				if (expr.Parent is MemberReferenceExpression || expr.Parent is IdentifierExpression) {
-					var rr = context.Resolve (expr.Parent);
-					var argumentNumber = expr.Parent.GetChildrenByRole (Roles.TypeArgument).TakeWhile (c => c != expr).Count ();
-					
-					var mgrr = rr as MethodGroupResolveResult;
-					if (mgrr != null && mgrr.Methods.Any () && mgrr.Methods.First ().TypeArguments.Count > argumentNumber)
-						return mgrr.Methods.First ().TypeParameters[argumentNumber]; 
-				} else if (expr.Parent is MemberType || expr.Parent is SimpleType) {
-					var rr = context.Resolve (expr.Parent);
-					var argumentNumber = expr.Parent.GetChildrenByRole (Roles.TypeArgument).TakeWhile (c => c != expr).Count ();
-					var mgrr = rr as TypeResolveResult;
-					if (mgrr != null &&  mgrr.Type.TypeParameterCount > argumentNumber) {
-						return mgrr.Type.GetDefinition ().TypeParameters[argumentNumber]; 
-					}
-				}
-			}
-
-			var type = GetValidTypes(context.Resolver, expr).ToArray();
-			var typeInference = new TypeInference(context.Compilation);
-			typeInference.Algorithm = TypeInferenceAlgorithm.Improved;
-			var inferedType = typeInference.FindTypeInBounds(type, emptyTypes);
-			return inferedType;
-		}
-		#endregion
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateIndexerAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateIndexerAction.cs
deleted file mode 100644
index 841b2b37c0..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateIndexerAction.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// 
-// CreateIndexerAction.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Text;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Create indexer", Description = "Creates an indexer declaration out of an indexer expression.")]
-	public class CreateIndexerAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var indexer = context.GetNode<IndexerExpression>();
-			if (indexer == null)
-				yield break;
-			if (!(context.Resolve(indexer).IsError))
-				yield break;
-
-			var state = context.GetResolverStateBefore(indexer);
-			if (state.CurrentTypeDefinition == null)
-				yield break;
-			var guessedType = CreateFieldAction.GuessAstType(context, indexer);
-
-			bool createInOtherType = false;
-			ResolveResult targetResolveResult = null;
-			targetResolveResult = context.Resolve(indexer.Target);
-			createInOtherType = !state.CurrentTypeDefinition.Equals(targetResolveResult.Type.GetDefinition());
-
-			bool isStatic;
-			if (createInOtherType) {
-				if (targetResolveResult.Type.GetDefinition() == null || targetResolveResult.Type.GetDefinition().Region.IsEmpty)
-					yield break;
-				isStatic = targetResolveResult is TypeResolveResult;
-				if (isStatic && targetResolveResult.Type.Kind == TypeKind.Interface || targetResolveResult.Type.Kind == TypeKind.Enum)
-					yield break;
-			} else {
-				isStatic = indexer.Target is IdentifierExpression && state.CurrentMember.IsStatic;
-			}
-
-			yield return new CodeAction(context.TranslateString("Create indexer"), script => {
-				var decl = new IndexerDeclaration() {
-					ReturnType = guessedType,
-					Getter = new Accessor() {
-						Body = new BlockStatement() {
-							new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
-						}
-					},
-					Setter = new Accessor() {
-						Body = new BlockStatement() {
-							new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
-						}
-					},
-				};
-				decl.Parameters.AddRange(CreateMethodDeclarationAction.GenerateParameters(context, indexer.Arguments));
-				if (isStatic)
-					decl.Modifiers |= Modifiers.Static;
-				
-				if (createInOtherType) {
-					if (targetResolveResult.Type.Kind == TypeKind.Interface) {
-						decl.Getter.Body = null;
-						decl.Setter.Body = null;
-						decl.Modifiers = Modifiers.None;
-					} else {
-						decl.Modifiers |= Modifiers.Public;
-					}
-
-					script.InsertWithCursor(context.TranslateString("Create indexer"), targetResolveResult.Type.GetDefinition(), decl);
-					return;
-				}
-
-				script.InsertWithCursor(context.TranslateString("Create indexer"), Script.InsertPosition.Before, decl);
-			}, indexer);
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateLocalVariableAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateLocalVariableAction.cs
deleted file mode 100644
index e20027aaa0..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateLocalVariableAction.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// 
-// CreateLocalVariable.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Create local variable", Description = "Creates a local variable for a undefined variable.")]
-	public class CreateLocalVariableAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var identifier = context.GetNode<IdentifierExpression>();
-			if (identifier == null) {
-				yield break;
-			}
-			if (CreateFieldAction.IsInvocationTarget(identifier)) {
-				yield break;
-			}
-			var statement = context.GetNode<Statement>();
-			if (statement == null) {
-				yield break;
-			}
-
-			if (!(context.Resolve(identifier).IsError)) {
-				yield break;
-			}
-			var guessedType = CreateFieldAction.GuessAstType(context, identifier);
-			if (guessedType == null) {
-				yield break;
-			}
-
-			yield return new CodeAction(context.TranslateString("Create local variable"), script => {
-				var initializer = new VariableInitializer(identifier.Identifier);
-				var decl = new VariableDeclarationStatement() {
-					Type = guessedType,
-					Variables = { initializer }
-				};
-				if (identifier.Parent is AssignmentExpression && ((AssignmentExpression)identifier.Parent).Left == identifier) {
-					initializer.Initializer = ((AssignmentExpression)identifier.Parent).Right.Clone();
-					if (!context.UseExplicitTypes)
-						decl.Type = new SimpleType("var");
-					script.Replace(statement, decl);
-				} else {
-					script.InsertBefore(statement, decl);
-				}
-			}, identifier);
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateMethodDeclarationAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateMethodDeclarationAction.cs
deleted file mode 100644
index c4a7c6a705..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateMethodDeclarationAction.cs
+++ /dev/null
@@ -1,369 +0,0 @@
-// 
-// CreateMethodDeclarationAction.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Text;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Create method", Description = "Creates a method declaration out of an invocation.")]
-	public class CreateMethodDeclarationAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var identifier = context.GetNode<IdentifierExpression>();
-			if (identifier != null && !(identifier.Parent is InvocationExpression && ((InvocationExpression)identifier.Parent).Target == identifier))
-				return GetActionsFromIdentifier(context, identifier);
-			
-			var memberReference = context.GetNode<MemberReferenceExpression>();
-			if (memberReference != null && !(memberReference.Parent is InvocationExpression && ((InvocationExpression)memberReference.Parent).Target == memberReference))
-				return GetActionsFromMemberReferenceExpression(context, memberReference);
-
-			var invocation = context.GetNode<InvocationExpression>();
-			if (invocation != null)
-				return GetActionsFromInvocation(context, invocation);
-			return Enumerable.Empty<CodeAction>();
-		}
-
-		IEnumerable<CodeAction> GetActionsFromMemberReferenceExpression(RefactoringContext context, MemberReferenceExpression invocation)
-		{
-			if (!(context.Resolve(invocation).IsError)) 
-					yield break;
-
-			var methodName = invocation.MemberName;
-			var guessedType = CreateFieldAction.GuessType(context, invocation);
-			if (guessedType.Kind != TypeKind.Delegate)
-					yield break;
-			var invocationMethod = guessedType.GetDelegateInvokeMethod();
-			var state = context.GetResolverStateBefore(invocation);
-			if (state.CurrentTypeDefinition == null)
-				yield break;
-			ResolveResult targetResolveResult = context.Resolve(invocation.Target);
-			bool createInOtherType = !state.CurrentTypeDefinition.Equals(targetResolveResult.Type.GetDefinition());
-
-			bool isStatic;
-			if (createInOtherType) {
-				if (targetResolveResult.Type.GetDefinition() == null || targetResolveResult.Type.GetDefinition().Region.IsEmpty)
-					yield break;
-				isStatic = targetResolveResult is TypeResolveResult;
-				if (isStatic && targetResolveResult.Type.Kind == TypeKind.Interface || targetResolveResult.Type.Kind == TypeKind.Enum)
-					yield break;
-			} else {
-				if (state.CurrentMember == null)
-					yield break;
-				isStatic = state.CurrentMember.IsStatic || state.CurrentTypeDefinition.IsStatic;
-			}
-
-//			var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
-//			if (service != null && !service.IsValidName(methodName, AffectedEntity.Method, Modifiers.Private, isStatic)) { 
-//				yield break;
-//			}
-
-			yield return CreateAction(
-				context, 
-				invocation,
-				methodName, 
-				context.CreateShortType(invocationMethod.ReturnType),
-				invocationMethod.Parameters.Select(parameter => new ParameterDeclaration(context.CreateShortType(parameter.Type), parameter.Name) { 
-					ParameterModifier = GetModifiers(parameter)
-				}),
-				createInOtherType,
-				isStatic,
-				targetResolveResult);
-		}
-		
-		IEnumerable<CodeAction> GetActionsFromIdentifier(RefactoringContext context, IdentifierExpression identifier)
-		{
-			if (!(context.Resolve(identifier).IsError))
-				yield break;
-			var methodName = identifier.Identifier;
-			var guessedType = CreateFieldAction.GuessType(context, identifier);
-			if (guessedType.Kind != TypeKind.Delegate)
-				yield break;
-			var invocationMethod = guessedType.GetDelegateInvokeMethod();
-			if (invocationMethod == null)
-				yield break;
-			var state = context.GetResolverStateBefore(identifier);
-			if (state.CurrentMember == null || state.CurrentTypeDefinition == null)
-				yield break;
-			bool isStatic = state.CurrentMember.IsStatic || state.CurrentTypeDefinition.IsStatic;
-
-			var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
-			if (service != null && !service.IsValidName(methodName, AffectedEntity.Method, Modifiers.Private, isStatic))
-				yield break;
-
-			yield return CreateAction(
-				context, 
-				identifier,
-				methodName, 
-				context.CreateShortType(invocationMethod.ReturnType),
-				invocationMethod.Parameters.Select(parameter => new ParameterDeclaration(context.CreateShortType(parameter.Type), parameter.Name) { 
-					ParameterModifier = GetModifiers(parameter)
-				}),
-				false,
-				isStatic,
-				null);
-		}
-
-		IEnumerable<CodeAction> GetActionsFromInvocation(RefactoringContext context, InvocationExpression invocation)
-		{
-			if (!(context.Resolve(invocation.Target).IsError)) 
-				yield break;
-
-			var methodName = GetMethodName(invocation);
-			if (methodName == null)
-				yield break;
-			var state = context.GetResolverStateBefore(invocation);
-			if (state.CurrentMember == null || state.CurrentTypeDefinition == null)
-				yield break;
-			var guessedType = invocation.Parent is ExpressionStatement ? new PrimitiveType("void") : CreateFieldAction.GuessAstType(context, invocation);
-
-			bool createInOtherType = false;
-			ResolveResult targetResolveResult = null;
-			if (invocation.Target is MemberReferenceExpression) {
-				targetResolveResult = context.Resolve(((MemberReferenceExpression)invocation.Target).Target);
-				createInOtherType = !state.CurrentTypeDefinition.Equals(targetResolveResult.Type.GetDefinition());
-			}
-
-			bool isStatic;
-			if (createInOtherType) {
-				if (targetResolveResult.Type.GetDefinition() == null || targetResolveResult.Type.GetDefinition().Region.IsEmpty)
-					yield break;
-				isStatic = targetResolveResult is TypeResolveResult;
-				if (isStatic && targetResolveResult.Type.Kind == TypeKind.Interface || targetResolveResult.Type.Kind == TypeKind.Enum)
-					yield break;
-			} else {
-				isStatic = state.CurrentMember.IsStatic || state.CurrentTypeDefinition.IsStatic;
-			}
-
-//			var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
-//			if (service != null && !service.IsValidName(methodName, AffectedEntity.Method, Modifiers.Private, isStatic)) { 
-//				yield break;
-//			}
-
-
-			yield return CreateAction(
-				context, 
-				invocation,
-				methodName, 
-				guessedType,
-				GenerateParameters(context, invocation.Arguments),
-				createInOtherType,
-				isStatic,
-				targetResolveResult);
-		}
-
-		static ParameterModifier GetModifiers(IParameter parameter)
-		{
-			if (parameter.IsOut)
-				return ParameterModifier.Out;
-			if (parameter.IsRef)
-				return ParameterModifier.Ref;
-			if (parameter.IsParams)
-				return ParameterModifier.Params;
-			return ParameterModifier.None;
-		}
-
-		static CodeAction CreateAction(RefactoringContext context, AstNode createFromNode, string methodName, AstType returnType, IEnumerable<ParameterDeclaration> parameters, bool createInOtherType, bool isStatic, ResolveResult targetResolveResult)
-		{
-			return new CodeAction(context.TranslateString("Create method"), script => {
-				var decl = new MethodDeclaration() {
-					ReturnType = returnType,
-					Name = methodName,
-					Body = new BlockStatement() {
-						new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
-					}
-				};
-				decl.Parameters.AddRange(parameters);
-				
-				if (isStatic)
-					decl.Modifiers |= Modifiers.Static;
-				
-				if (createInOtherType) {
-					if (targetResolveResult.Type.Kind == TypeKind.Interface) {
-						decl.Body = null;
-						decl.Modifiers = Modifiers.None;
-					} else {
-						decl.Modifiers |= Modifiers.Public;
-					}
-
-					script.InsertWithCursor(context.TranslateString("Create method"), targetResolveResult.Type.GetDefinition(), decl);
-					return;
-				}
-
-				script.InsertWithCursor(context.TranslateString("Create method"), Script.InsertPosition.Before, decl);
-			}, createFromNode);
-		}
-
-		public static IEnumerable<ParameterDeclaration> GenerateParameters(RefactoringContext context, IEnumerable<Expression> arguments)
-		{
-			var nameCounter = new Dictionary<string, int>();
-			foreach (var argument in arguments) {
-				var direction = ParameterModifier.None;
-				AstNode node;
-				if (argument is DirectionExpression) {
-					var de = (DirectionExpression)argument;
-					direction = de.FieldDirection == FieldDirection.Out ? ParameterModifier.Out : ParameterModifier.Ref;
-					node = de.Expression;
-				} else {
-					node = argument;
-				}
-
-				var resolveResult = context.Resolve(node);
-				string name = CreateBaseName(argument, resolveResult.Type);
-				if (!nameCounter.ContainsKey(name)) {
-					nameCounter [name] = 1;
-				} else {
-					nameCounter [name]++;
-					name += nameCounter [name].ToString();
-				}
-				var type = resolveResult.Type.Kind == TypeKind.Unknown || resolveResult.Type.Kind == TypeKind.Null ? new PrimitiveType("object") : context.CreateShortType(resolveResult.Type);
-
-				yield return new ParameterDeclaration(type, name) { ParameterModifier = direction};
-			}
-		}
-
-		static string CreateBaseNameFromString(string str)
-		{
-			if (string.IsNullOrEmpty(str)) {
-				return "empty";
-			}
-			var sb = new StringBuilder();
-			bool firstLetter = true, wordStart = false;
-			foreach (char ch in str) {
-				if (char.IsWhiteSpace(ch)) {
-					wordStart = true;
-					continue;
-				}
-				if (!char.IsLetter(ch))
-					continue;
-				if (firstLetter) {
-					sb.Append(char.ToLower(ch));
-					firstLetter = false;
-					continue;
-				}
-				if (wordStart) {
-					sb.Append(char.ToUpper(ch));
-					wordStart = false;
-					continue;
-				}
-				sb.Append(ch);
-			}
-			return sb.Length == 0 ? "str" : sb.ToString();
-		}
-
-		public static string CreateBaseName(AstNode node, IType type)
-		{
-			string name = null;
-			if (node is NullReferenceExpression)
-				return "o";
-			if (node is DirectionExpression)
-				node = ((DirectionExpression)node).Expression;
-			if (node is IdentifierExpression) {
-				name = ((IdentifierExpression)node).Identifier;
-			} else if (node is MemberReferenceExpression) {
-				name = ((MemberReferenceExpression)node).MemberName;
-			} else if (node is PrimitiveExpression) {
-				var pe = (PrimitiveExpression)node;
-				if (pe.Value is string) {
-					name = CreateBaseNameFromString(pe.Value.ToString());
-				} else {
-					return char.ToLower(type.Name [0]).ToString();
-				}
-			} else if (node is ArrayCreateExpression) {
-				name = "arr";
-			} else {
-				if (type.Kind == TypeKind.Unknown)
-					return "par";
-				name = GuessNameFromType(type);
-			}
-			var sb = new StringBuilder ();
-			sb.Append (char.ToLower(name [0]));
-			for (int i = 1; i < name.Length; i++) {
-				var ch = name[i];
-				if (char.IsLetterOrDigit (ch) || ch == '_')
-					sb.Append (ch);
-			}
-			return sb.ToString ();
-		}
-
-		static string GuessNameFromType(IType returnType)
-		{
-			switch (returnType.ReflectionName) {
-				case "System.Byte":
-				case "System.SByte":
-					return "b";
-				
-				case "System.Int16":
-				case "System.UInt16":
-				case "System.Int32":
-				case "System.UInt32":
-				case "System.Int64":
-				case "System.UInt64":
-					return "i";
-				
-				case "System.Boolean":
-					return "b";
-				
-				case "System.DateTime":
-					return "date";
-				
-				case "System.Char":
-					return "ch";
-				case "System.Double":
-				case "System.Decimal":
-					return "d";
-				case "System.Single":
-					return "f";
-				case "System.String":
-					return "str";
-				
-				case "System.Exception":
-					return "e";
-				case "System.Object":
-					return "obj";
-				case "System.Func":
-					return "func";
-				case "System.Action":
-					return "action";
-			}
-			return returnType.Name;
-		}
-		
-		string GetMethodName(InvocationExpression invocation)
-		{
-			if (invocation.Target is IdentifierExpression)
-				return ((IdentifierExpression)invocation.Target).Identifier;
-			if (invocation.Target is MemberReferenceExpression)
-				return ((MemberReferenceExpression)invocation.Target).MemberName;
-
-			return null;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateOverloadWithoutParameterAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateOverloadWithoutParameterAction.cs
deleted file mode 100644
index b8d775689d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateOverloadWithoutParameterAction.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-// 
-// CreateOverloadWithoutParameterAction.cs
-//  
-// Author:
-//       Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction ("Create overload without parameter", Description = "Create overload without the selected parameter.")]
-	public class CreateOverloadWithoutParameterAction : SpecializedCodeAction<ParameterDeclaration>
-	{
-		protected override CodeAction GetAction (RefactoringContext context, ParameterDeclaration node)
-		{
-			if (!node.DefaultExpression.IsNull)
-				return null;
-			if (node.ParameterModifier == ParameterModifier.This || node.ParameterModifier == ParameterModifier.Params)
-				return null;
-
-			var methodDecl = node.Parent as MethodDeclaration;
-			if (methodDecl == null)
-				return null;
-
-			// explicit implementation
-			if (!methodDecl.PrivateImplementationType.IsNull)
-				return null;
-
-			// find existing method
-			var method = (IMethod)((MemberResolveResult)context.Resolve (methodDecl)).Member;
-			var parameters = new List<IParameter> (method.Parameters.Where (param => param.Name != node.Name));
-			if (method.DeclaringType.GetMethods (
-				m => m.Name == method.Name && m.TypeParameters.Count == method.TypeParameters.Count)
-				.Any (m => ParameterListComparer.Instance.Equals (m.Parameters, parameters)))
-				return null;
-			
-			return new CodeAction (context.TranslateString ("Create overload without parameter"),
-				script =>
-				{
-					var defaultExpr = GetDefaultValueExpression (context, node.Type);
-
-					var body = new BlockStatement ();
-					Expression argExpr;
-					if (node.ParameterModifier == ParameterModifier.Ref) {
-						body.Add (new VariableDeclarationStatement (node.Type.Clone (), node.Name, defaultExpr));
-						argExpr = GetArgumentExpression (node);
-					} else if (node.ParameterModifier == ParameterModifier.Out) {
-						body.Add (new VariableDeclarationStatement (node.Type.Clone (), node.Name));
-						argExpr = GetArgumentExpression (node);
-					} else {
-						argExpr = defaultExpr;
-					}
-					body.Add (new InvocationExpression (new IdentifierExpression (methodDecl.Name),
-						methodDecl.Parameters.Select (param => param == node ? argExpr : GetArgumentExpression(param))));
-
-					var decl = (MethodDeclaration)methodDecl.Clone ();
-					decl.Parameters.Remove (decl.Parameters.First (param => param.Name == node.Name));
-					decl.Body = body;
-
-					script.InsertWithCursor ("Create overload without parameter", Script.InsertPosition.Before, decl);
-
-					//if (node.ParameterModifier != ParameterModifier.Out)
-					//    script.Link (defaultExpr);
-				}, node.NameToken); 
-		}
-
-		static Expression GetArgumentExpression(ParameterDeclaration parameter)
-		{
-			var identifierExpr = new IdentifierExpression(parameter.Name);
-			switch (parameter.ParameterModifier) {
-				case ParameterModifier.Out:
-					return new DirectionExpression (FieldDirection.Out, identifierExpr);
-				case ParameterModifier.Ref:
-					return new DirectionExpression (FieldDirection.Ref, identifierExpr);
-			}
-			return identifierExpr;
-		}
-
-		static Expression GetDefaultValueExpression (RefactoringContext context, AstType astType)
-		{
-			var type = context.ResolveType (astType);
-
-			// array
-			if (type.Kind == TypeKind.Array)
-				return new ObjectCreateExpression (astType.Clone ());
-
-			// enum
-			if (type.Kind == TypeKind.Enum) {
-				var members = type.GetMembers ().ToArray();
-				if (members.Length == 0)
-					return new DefaultValueExpression (astType.Clone ());
-				return astType.Member(members[0].Name).Clone ();
-			}
-
-			if ((type.IsReferenceType ?? false) || type.Kind == TypeKind.Dynamic)
-				return new NullReferenceExpression ();
-
-			var typeDefinition = type.GetDefinition ();
-			if (typeDefinition != null) {
-				switch (typeDefinition.KnownTypeCode) {
-					case KnownTypeCode.Boolean:
-						return new PrimitiveExpression (false);
-
-					case KnownTypeCode.Char:
-						return new PrimitiveExpression ('\0');
-
-					case KnownTypeCode.SByte:
-					case KnownTypeCode.Byte:
-					case KnownTypeCode.Int16:
-					case KnownTypeCode.UInt16:
-					case KnownTypeCode.Int32:
-					case KnownTypeCode.UInt32:
-					case KnownTypeCode.Int64:
-					case KnownTypeCode.UInt64:
-					case KnownTypeCode.Single:
-					case KnownTypeCode.Double:
-					case KnownTypeCode.Decimal:
-						return new PrimitiveExpression (0);
-
-					case KnownTypeCode.NullableOfT:
-						return new NullReferenceExpression ();
-				}
-				if (type.Kind == TypeKind.Struct)
-					return new ObjectCreateExpression (astType.Clone ());
-			}
-			return new DefaultValueExpression (astType.Clone ());
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreatePropertyAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreatePropertyAction.cs
deleted file mode 100644
index b54cbfb7d9..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreatePropertyAction.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// 
-// CreateProperty.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Create property", Description = "Creates a property for a undefined variable.")]
-	public class CreatePropertyAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var identifier = CreateFieldAction.GetCreatePropertyOrFieldNode (context);
-			if (identifier == null)
-				yield break;
-			if (CreateFieldAction.IsInvocationTarget(identifier))
-				yield break;
-
-			var propertyName = GetPropertyName(identifier);
-			if (propertyName == null)
-				yield break;
-
-			var statement = context.GetNode<Statement>();
-			if (statement == null)
-				yield break;
-
-			if (!(context.Resolve(identifier).IsError))
-				yield break;
-
-			var guessedType = CreateFieldAction.GuessAstType(context, identifier);
-			if (guessedType == null)
-				yield break;
-			var state = context.GetResolverStateBefore(identifier);
-			if (state.CurrentTypeDefinition == null)
-				yield break;
-			
-			bool createInOtherType = false;
-			ResolveResult targetResolveResult = null;
-			if (identifier is MemberReferenceExpression) {
-				targetResolveResult = context.Resolve(((MemberReferenceExpression)identifier).Target);
-				if (targetResolveResult.Type.GetDefinition() == null || targetResolveResult.Type.GetDefinition().Region.IsEmpty)
-					yield break;
-				createInOtherType = !state.CurrentTypeDefinition.Equals(targetResolveResult.Type.GetDefinition());
-			}
-
-			bool isStatic = targetResolveResult is TypeResolveResult;
-			if (createInOtherType) {
-				if (isStatic && targetResolveResult.Type.Kind == TypeKind.Interface || targetResolveResult.Type.Kind == TypeKind.Enum)
-					yield break;
-			} else {
-				if (state.CurrentMember == null)
-					yield break;
-				isStatic |= state.CurrentTypeDefinition.IsStatic;
-				if (targetResolveResult == null)
-					isStatic |= state.CurrentMember.IsStatic;
-			}
-			isStatic &= !(identifier is NamedExpression);
-
-	//			var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
-//			if (service != null && !service.IsValidName(propertyName, AffectedEntity.Property, Modifiers.Private, isStatic)) { 
-//				yield break;
-//			}
-
-			yield return new CodeAction(context.TranslateString("Create property"), script => {
-				var decl = new PropertyDeclaration() {
-					ReturnType = guessedType,
-					Name = propertyName,
-					Getter = new Accessor(),
-					Setter = new Accessor()
-				};
-				if (isStatic)
-					decl.Modifiers |= Modifiers.Static;
-				
-				if (createInOtherType) {
-					if (targetResolveResult.Type.Kind == TypeKind.Interface) {
-						decl.Modifiers = Modifiers.None;
-					} else {
-						decl.Modifiers |= Modifiers.Public;
-					}
-					script.InsertWithCursor(
-						context.TranslateString("Create property"),
-						targetResolveResult.Type.GetDefinition(),
-						decl);
-
-					return;
-				}
-
-				script.InsertWithCursor(context.TranslateString("Create property"), Script.InsertPosition.Before, decl);
-
-			}, identifier);
-		}
-
-		internal static string GetPropertyName(Expression expr)
-		{
-			if (expr is IdentifierExpression) 
-				return ((IdentifierExpression)expr).Identifier;
-			if (expr is MemberReferenceExpression) 
-				return ((MemberReferenceExpression)expr).MemberName;
-			if (expr is NamedExpression) 
-				return ((NamedExpression)expr).Name;
-
-			return null;
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/DeclareLocalVariableAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/DeclareLocalVariableAction.cs
deleted file mode 100644
index d38058a513..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/DeclareLocalVariableAction.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-// 
-// DeclareLocalVariableAction.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Threading;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.PatternMatching;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Declare local variable", Description = "Declare a local variable out of a selected expression.")]
-	public class DeclareLocalVariableAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			if (!context.IsSomethingSelected) {
-				yield break;
-			}
-			var selected = new List<AstNode>(context.GetSelectedNodes());
-			if (selected.Count != 1 || !(selected [0] is Expression)) {
-				yield break;
-			}
-			var expr = selected [0] as Expression;
-			var visitor = new SearchNodeVisitior(expr);
-			
-			var node = context.GetNode <BlockStatement>();
-			if (node != null) {
-				node.AcceptVisitor(visitor);
-			}
-
-			yield return new CodeAction(context.TranslateString("Declare local variable"), script => {
-				var resolveResult = context.Resolve(expr);
-				var guessedType = resolveResult.Type;
-				if (resolveResult is MethodGroupResolveResult) {
-					guessedType = GetDelegateType(context, ((MethodGroupResolveResult)resolveResult).Methods.First(), expr);
-				}
-				var name = CreateMethodDeclarationAction.CreateBaseName(expr, guessedType);
-				var type = context.UseExplicitTypes ? context.CreateShortType(guessedType) : new SimpleType("var");
-				var varDecl = new VariableDeclarationStatement(type, name, expr.Clone());
-				var replaceNode = visitor.Matches.First () as Expression;
-				if (replaceNode.Parent is ExpressionStatement) {
-					script.Replace(replaceNode.Parent, varDecl);
-					script.Select(varDecl.Variables.First().NameToken);
-				} else {
-					var containing = replaceNode.Parent;
-					while (!(containing.Parent is BlockStatement)) {
-						containing = containing.Parent;
-					}
-
-					script.InsertBefore(containing, varDecl);
-					var identifierExpression = new IdentifierExpression(name);
-					script.Replace(replaceNode, identifierExpression);
-					script.Link(varDecl.Variables.First().NameToken, identifierExpression);
-				}
-			}, expr);
-
-			if (visitor.Matches.Count > 1) {
-				yield return new CodeAction(string.Format(context.TranslateString("Declare local variable (replace '{0}' occurrences)"), visitor.Matches.Count), script => {
-					var resolveResult = context.Resolve(expr);
-					var guessedType = resolveResult.Type;
-					if (resolveResult is MethodGroupResolveResult) {
-						guessedType = GetDelegateType(context, ((MethodGroupResolveResult)resolveResult).Methods.First(), expr);
-					}
-					var linkedNodes = new List<AstNode>();
-					var name = CreateMethodDeclarationAction.CreateBaseName(expr, guessedType);
-					var type = context.UseExplicitTypes ? context.CreateShortType(guessedType) : new SimpleType("var");
-					var varDecl = new VariableDeclarationStatement(type, name, expr.Clone());
-					linkedNodes.Add(varDecl.Variables.First().NameToken);
-					var first = visitor.Matches [0];
-					if (first.Parent is ExpressionStatement) {
-						script.Replace(first.Parent, varDecl);
-					} else {
-						var containing = first.Parent;
-						while (!(containing.Parent is BlockStatement)) {
-							containing = containing.Parent;
-						}
-
-						script.InsertBefore(containing, varDecl);
-						var identifierExpression = new IdentifierExpression(name);
-						linkedNodes.Add(identifierExpression);
-						script.Replace(first, identifierExpression);
-					}
-					for (int i = 1; i < visitor.Matches.Count; i++) {
-						var identifierExpression = new IdentifierExpression(name);
-						linkedNodes.Add(identifierExpression);
-						script.Replace(visitor.Matches [i], identifierExpression);
-					}
-					script.Link(linkedNodes.ToArray ());
-				}, expr);
-			}
-		}
-
-		// Gets Action/Func delegate types for a given method.
-		IType GetDelegateType(RefactoringContext context, IMethod method, Expression expr)
-		{
-			var parameters = new List<IType>();
-			var invoke = expr.Parent as InvocationExpression;
-			if (invoke == null) {
-				return null;
-			}
-			foreach (var arg in invoke.Arguments) {
-				parameters.Add(context.Resolve(arg).Type);
-			}
-
-			ITypeDefinition genericType;
-			if (method.ReturnType.FullName == "System.Void") {
-				genericType = context.Compilation.GetAllTypeDefinitions().FirstOrDefault(t => t.FullName == "System.Action" && t.TypeParameterCount == parameters.Count);
-			} else {
-				parameters.Add(method.ReturnType);
-				genericType = context.Compilation.GetAllTypeDefinitions().FirstOrDefault(t => t.FullName == "System.Func" && t.TypeParameterCount == parameters.Count);
-			}
-			if (genericType == null) {
-				return null;
-			}
-			return new ParameterizedType(genericType, parameters);
-		}
-
-				
-		internal class SearchNodeVisitior : DepthFirstAstVisitor
-		{
-			readonly AstNode searchForNode;
-			public readonly List<AstNode> Matches = new List<AstNode> ();
-			
-			public SearchNodeVisitior (AstNode searchForNode)
-			{
-				this.searchForNode = searchForNode;
-				AddNode (searchForNode);
-			}
-
-			void AddNode(AstNode node)
-			{
-				if (node.Parent is ParenthesizedExpression) {
-					Matches.Add(node.Parent);
-				} else {
-					Matches.Add(node);
-				}
-			}
-			
-			protected override void VisitChildren(AstNode node)
-			{
-				if (node.StartLocation > searchForNode.StartLocation && node.IsMatch(searchForNode)) {
-					AddNode(node);
-					return;
-				} 
-				base.VisitChildren (node);
-			}
-		}
-
-
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtensionMethodInvocationToStaticMethodInvocationAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtensionMethodInvocationToStaticMethodInvocationAction.cs
deleted file mode 100644
index 569b3e508e..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtensionMethodInvocationToStaticMethodInvocationAction.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// ExtensionMethodInvocationToStaticMethodInvocationAction.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Invoke using static method syntax",
-	               Description = "Converts the call into static method call syntax.")]
-	public class ExtensionMethodInvocationToStaticMethodInvocationAction : ICodeActionProvider
-	{
-		#region ICodeActionProvider implementation
-
-		public IEnumerable<CodeAction> GetActions (RefactoringContext context)
-		{
-			var invocation = context.GetNode<InvocationExpression>();
-			if (invocation == null)
-				yield break;
-			var memberReference = invocation.Target as MemberReferenceExpression;
-			if (memberReference == null)
-				yield break;
-			var invocationRR = context.Resolve(invocation) as CSharpInvocationResolveResult;
-			if (invocationRR == null)
-				yield break;
-			if (invocationRR.IsExtensionMethodInvocation)
-				yield return new CodeAction(context.TranslateString("Convert to call to static method"), script => {
-					script.Replace(invocation, ToStaticMethodInvocation(invocation, memberReference, invocationRR));
-				}, invocation);
-		}
-
-		#endregion
-
-		AstNode ToStaticMethodInvocation(InvocationExpression invocation, MemberReferenceExpression memberReference,
-		                                 CSharpInvocationResolveResult invocationRR)
-		{
-			var newArgumentList = invocation.Arguments.Select(arg => arg.Clone()).ToList();
-			newArgumentList.Insert(0, memberReference.Target.Clone());
-			var newTarget = memberReference.Clone() as MemberReferenceExpression;
-			newTarget.Target = new IdentifierExpression(invocationRR.Member.DeclaringType.Name);
-			return new InvocationExpression(newTarget, newArgumentList);
-		}
-
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractAnonymousMethodAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractAnonymousMethodAction.cs
deleted file mode 100644
index 0d7f265ffa..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractAnonymousMethodAction.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-// 
-// ExtractAnonymousMethodAction.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction ("Extract anonymous method",
-					Description = "Extract anonymous method to method of the containing type")]
-	public class ExtractAnonymousMethodAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions (RefactoringContext context)
-		{
-			// lambda
-			var lambda = context.GetNode<LambdaExpression> ();
-			if (lambda != null && lambda.ArrowToken.Contains(context.Location)) {
-				if (ContainsLocalReferences (context, lambda, lambda.Body))
-					yield break;
-
-				bool noReturn = false;
-				BlockStatement body;
-				if (lambda.Body is BlockStatement) {
-					body = (BlockStatement)lambda.Body.Clone ();
-				} else {
-					body = new BlockStatement ();
-
-					var type = LambdaHelper.GetLambdaReturnType (context, lambda);
-					if (type == null || type.ReflectionName == "System.Void") {
-						noReturn = true;
-						body.Add (new ExpressionStatement ((Expression)lambda.Body.Clone ()));
-					} else {
-						body.Add (new ReturnStatement ((Expression)lambda.Body.Clone ()));
-					}
-				}
-				var method = GetMethod (context, (LambdaResolveResult)context.Resolve (lambda), body, noReturn);
-				yield return GetAction (context, lambda, method);
-			}
-
-			// anonymous method
-			var anonymousMethod = context.GetNode<AnonymousMethodExpression> ();
-			if (anonymousMethod != null && anonymousMethod.DelegateToken.Contains(context.Location)) {
-				if (ContainsLocalReferences (context, anonymousMethod, anonymousMethod.Body))
-					yield break;
-
-				var method = GetMethod (context, (LambdaResolveResult)context.Resolve (anonymousMethod), 
-										(BlockStatement)anonymousMethod.Body.Clone ());
-				yield return GetAction (context, anonymousMethod, method);
-			}
-		}
-
-		CodeAction GetAction (RefactoringContext context, AstNode node, MethodDeclaration method)
-		{
-			return new CodeAction (context.TranslateString ("Extract anonymous method"),
-				script =>
-				{
-					var identifier = new IdentifierExpression ("Method");
-					script.Replace (node, identifier);
-					script.InsertBefore (node.GetParent<EntityDeclaration> (), method);
-					script.Link (method.NameToken, identifier);
-				}, method.NameToken);
-		}
-
-		static MethodDeclaration GetMethod (RefactoringContext context, LambdaResolveResult lambda, BlockStatement body,
-			bool noReturnValue = false)
-		{
-			var method = new MethodDeclaration { Name = "Method" };
-
-			if (noReturnValue) {
-				method.ReturnType = new PrimitiveType ("void"); 
-			} else {
-				var type = lambda.GetInferredReturnType (lambda.Parameters.Select (p => p.Type).ToArray ());
-				method.ReturnType = type.Name == "?" ? new PrimitiveType ("void") : context.CreateShortType (type);
-			}
-
-			foreach (var param in lambda.Parameters)
-				method.Parameters.Add (new ParameterDeclaration (context.CreateShortType (param.Type), param.Name));
-
-			method.Body = body;
-			if (lambda.IsAsync)
-				method.Modifiers |= Modifiers.Async;
-
-			return method;
-		}
-
-		static bool ContainsLocalReferences (RefactoringContext context, AstNode expr, AstNode body)
-		{
-			var visitor = new ExtractMethod.VariableLookupVisitor (context);
-			body.AcceptVisitor (visitor);
-			return visitor.UsedVariables.Any (variable => !expr.Contains (variable.Region.Begin));
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractFieldAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractFieldAction.cs
deleted file mode 100755
index a2fbfbe2a4..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractFieldAction.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-// 
-// ExtractFieldAction.cs
-//  
-// Author:
-//       Nieve <>
-// 
-// Copyright (c) 2012 Nieve
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.PatternMatching;
-using Mono.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Extract field", Description = "Extracts a field from a local variable declaration.")]
-	public class ExtractFieldAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			//TODO: implement variable assignment & ctor param
-			var varInit = context.GetNode<VariableInitializer>();
-			if (varInit != null) {
-				AstType type = varInit.GetPrevNode() as AstType;
-				if (type == null) yield break;
-				if (varInit.Parent is FieldDeclaration) yield break;
-				if (CannotExtractField(context, varInit)) yield break;
-				
-				yield return new CodeAction(context.TranslateString("Assign to new field"), s=>{
-					var name = varInit.Name;
-
-					AstType extractedType;
-					if (type.IsVar()) {
-						IType resolvedType = context.Resolve(varInit.Initializer).Type;
-						extractedType = context.CreateShortType(resolvedType);
-					}
-					else {
-						extractedType = (AstType) type.Clone();
-					}
-
-					AstNode entityDeclarationNode = varInit.Parent;
-					while (!(entityDeclarationNode is EntityDeclaration) || (entityDeclarationNode is Accessor)) {
-						entityDeclarationNode = entityDeclarationNode.Parent;
-					}
-					var entity = (EntityDeclaration) entityDeclarationNode;
-					bool isStatic = entity.HasModifier(Modifiers.Static);
-
-					FieldDeclaration field = new FieldDeclaration(){
-						Modifiers = isStatic ? Modifiers.Static : Modifiers.None,
-						ReturnType = extractedType,
-						Variables = { new VariableInitializer(name) }
-					};
-					AstNode nodeToRemove = RemoveDeclaration(varInit) ? varInit.Parent : type;
-					s.Remove(nodeToRemove, true);
-					s.InsertWithCursor(context.TranslateString("Insert new field"),Script.InsertPosition.Before,field);
-					s.FormatText(varInit.Parent);
-				}, varInit);
-			}
-			
-			var idntf = context.GetNode<Identifier>();
-			if (idntf == null) yield break;
-			var paramDec = idntf.Parent as ParameterDeclaration;
-			if (paramDec != null) {
-				var ctor = paramDec.Parent as ConstructorDeclaration;
-				if (ctor == null) yield break;
-				MemberReferenceExpression thisField = new MemberReferenceExpression(new ThisReferenceExpression(), idntf.Name, new AstType[]{});
-				var assign = new AssignmentExpression(thisField, AssignmentOperatorType.Assign, new IdentifierExpression(idntf.Name));
-				var statement = new ExpressionStatement(assign);
-				var type = (idntf.GetPrevNode() as AstType).Clone();
-				FieldDeclaration field = new FieldDeclaration(){
-					ReturnType = type.Clone(),
-					Variables = { new VariableInitializer(idntf.Name) }
-				};
-				yield return new CodeAction(context.TranslateString("Assign to new field"), s=>{
-					s.InsertWithCursor(context.TranslateString("Insert new field"),Script.InsertPosition.Before,field);
-					s.AddTo(ctor.Body, statement);
-				}, paramDec);
-			}
-		}
-		
-		static bool RemoveDeclaration (VariableInitializer varInit){
-			var result = varInit.Parent as VariableDeclarationStatement;
-			return result.Variables.First ().Initializer.IsNull;
-		}
-		
-		static bool CannotExtractField (RefactoringContext context, VariableInitializer varInit)
-		{
-			var result = varInit.Parent as VariableDeclarationStatement;
-			return result == null || result.Variables.Count != 1 || ContainsAnonymousType(context.Resolve(varInit.Initializer).Type);
-		}
-
-		static bool ContainsAnonymousType (IType type)
-		{
-			if (type.Kind == TypeKind.Anonymous)
-				return true;
-
-			var arrayType = type as ArrayType;
-			return arrayType != null && ContainsAnonymousType (arrayType.ElementType);
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/ExtractMethodAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/ExtractMethodAction.cs
deleted file mode 100644
index a46ad59071..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/ExtractMethodAction.cs
+++ /dev/null
@@ -1,233 +0,0 @@
-// 
-// ExtractMethodAction.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.CSharp.Analysis;
-using System.Threading;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Threading.Tasks;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod
-{
-	[ContextAction("Extract method", Description = "Creates a new method out of selected text.")]
-	public class ExtractMethodAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			if (!context.IsSomethingSelected)
-				yield break;
-			var selected = new List<AstNode>(context.GetSelectedNodes());
-			if (selected.Count == 0)
-				yield break;
-			
-			if (selected.Count == 1 && selected [0] is Expression) {
-				var codeAction = CreateFromExpression(context, (Expression)selected [0]);
-				if (codeAction == null)
-					yield break;
-				yield return codeAction;
-			}
-
-			foreach (var node in selected) {
-				if (!(node is Statement) && !(node is Comment) && !(node is NewLineNode) && !(node is PreProcessorDirective))
-					yield break;
-			}
-			var action = CreateFromStatements (context, new List<AstNode> (selected));
-			if (action != null)
-				yield return action;
-		}
-		
-		CodeAction CreateFromExpression(RefactoringContext context, Expression expression)
-		{
-			var resolveResult = context.Resolve(expression);
-			if (resolveResult.IsError)
-				return null;
-			
-			return new CodeAction(context.TranslateString("Extract method"), script => {
-				string methodName = "NewMethod";
-				var method = new MethodDeclaration {
-					ReturnType = context.CreateShortType(resolveResult.Type),
-					Name = methodName,
-					Body = new BlockStatement {
-						new ReturnStatement(expression.Clone())
-					}
-				};
-				if (!StaticVisitor.UsesNotStaticMember(context, expression))
-					method.Modifiers |= Modifiers.Static;
-
-				var usedVariables = VariableLookupVisitor.Analyze(context, expression);
-				
-				var inExtractedRegion = new VariableUsageAnalyzation (context, usedVariables);
-
-				usedVariables.Sort ((l, r) => l.Region.Begin.CompareTo (r.Region.Begin));
-				var target = new IdentifierExpression(methodName);
-				var invocation = new InvocationExpression(target);
-				foreach (var variable in usedVariables) {
-					Expression argumentExpression = new IdentifierExpression(variable.Name); 
-					
-					var mod = ParameterModifier.None;
-					if (inExtractedRegion.GetStatus (variable) == VariableState.Changed) {
-						mod = ParameterModifier.Ref;
-						argumentExpression = new DirectionExpression(FieldDirection.Ref, argumentExpression);
-					}
-					
-					method.Parameters.Add(new ParameterDeclaration(context.CreateShortType(variable.Type), variable.Name, mod));
-					invocation.Arguments.Add(argumentExpression);
-				}
-
-				var task = script.InsertWithCursor(context.TranslateString("Extract method"), Script.InsertPosition.Before, method);
-
-				Action<Task> replaceStatements = delegate {
-					script.Replace(expression, invocation);
-					script.Link(target, method.NameToken);
-				};
-
-				if (task.IsCompleted) {
-					replaceStatements (null);
-				} else {
-					task.ContinueWith (replaceStatements, TaskScheduler.FromCurrentSynchronizationContext ());
-				}
-			}, expression);
-		}
-		
-		CodeAction CreateFromStatements(RefactoringContext context, List<AstNode> statements)
-		{
-			if (!(statements [0].Parent is Statement))
-				return null;
-			
-			return new CodeAction(context.TranslateString("Extract method"), script => {
-				string methodName = "NewMethod";
-				var method = new MethodDeclaration() {
-					ReturnType = new PrimitiveType("void"),
-					Name = methodName,
-					Body = new BlockStatement()
-				};
-				bool usesNonStaticMember = false;
-				foreach (var node in statements) {
-					usesNonStaticMember |= StaticVisitor.UsesNotStaticMember(context, node);
-					if (node is Statement) {
-						method.Body.Add((Statement)node.Clone());
-					} else {
-						method.Body.AddChildUnsafe (node.Clone (), node.Role);
-					}
-				}
-				if (!usesNonStaticMember)
-					method.Modifiers |= Modifiers.Static;
-				
-				var target = new IdentifierExpression(methodName);
-				var invocation = new InvocationExpression(target);
-				
-				var usedVariables = VariableLookupVisitor.Analyze(context, statements);
-				
-				var inExtractedRegion = new VariableUsageAnalyzation (context, usedVariables);
-				var lastStatement = statements [statements.Count - 1];
-				
-				var stmt = statements [0].GetParent<BlockStatement>();
-				while (stmt.GetParent<BlockStatement> () != null) {
-					stmt = stmt.GetParent<BlockStatement>();
-				}
-				
-				inExtractedRegion.SetAnalyzedRange(statements [0], lastStatement);
-				stmt.AcceptVisitor (inExtractedRegion);
-				
-				var beforeExtractedRegion = new VariableUsageAnalyzation (context, usedVariables);
-				beforeExtractedRegion.SetAnalyzedRange(statements [0].Parent, statements [0], true, false);
-				stmt.AcceptVisitor (beforeExtractedRegion);
-				
-				var afterExtractedRegion = new VariableUsageAnalyzation (context, usedVariables);
-				afterExtractedRegion.SetAnalyzedRange(lastStatement, stmt.Statements.Last(), false, true);
-				stmt.AcceptVisitor (afterExtractedRegion);
-				usedVariables.Sort ((l, r) => l.Region.Begin.CompareTo (r.Region.Begin));
-
-				IVariable generatedReturnVariable = null;
-				foreach (var variable in usedVariables) {
-					if ((variable is IParameter) || beforeExtractedRegion.Has (variable) || !afterExtractedRegion.Has (variable))
-						continue;
-					generatedReturnVariable = variable;
-					method.ReturnType = context.CreateShortType (variable.Type);
-					method.Body.Add (new ReturnStatement (new IdentifierExpression (variable.Name)));
-					break;
-				}
-
-				foreach (var variable in usedVariables) {
-					if (!(variable is IParameter) && !beforeExtractedRegion.Has (variable) && !afterExtractedRegion.Has (variable))
-						continue;
-					if (variable == generatedReturnVariable)
-						continue;
-					Expression argumentExpression = new IdentifierExpression(variable.Name); 
-					
-					ParameterModifier mod = ParameterModifier.None;
-					if (inExtractedRegion.GetStatus (variable) == VariableState.Changed) {
-						if (beforeExtractedRegion.GetStatus (variable) == VariableState.None) {
-							mod = ParameterModifier.Out;
-							argumentExpression = new DirectionExpression(FieldDirection.Out, argumentExpression);
-						} else {
-							mod = ParameterModifier.Ref;
-							argumentExpression = new DirectionExpression(FieldDirection.Ref, argumentExpression);
-						}
-					}
-					
-					method.Parameters.Add(new ParameterDeclaration(context.CreateShortType(variable.Type), variable.Name, mod));
-					invocation.Arguments.Add(argumentExpression);
-				}
-				var task = script.InsertWithCursor(context.TranslateString("Extract method"), Script.InsertPosition.Before, method);
-				Action<Task> replaceStatements = delegate {
-					foreach (var node in statements.Skip (1)) {
-						if (node is NewLineNode)
-							continue;
-						script.Remove(node);
-					}
-					foreach (var variable in usedVariables) {
-						if ((variable is IParameter) || beforeExtractedRegion.Has (variable) || !afterExtractedRegion.Has (variable))
-							continue;
-						if (variable == generatedReturnVariable)
-							continue;
-						script.InsertBefore (statements [0], new VariableDeclarationStatement (context.CreateShortType(variable.Type), variable.Name));
-					}
-					AstNode invocationStatement;
-
-					if (generatedReturnVariable != null) {
-						invocationStatement = new VariableDeclarationStatement (new SimpleType ("var"), generatedReturnVariable.Name, invocation);
-					} else {
-						invocationStatement = new ExpressionStatement(invocation);
-					}
-					script.Replace(statements [0], invocationStatement);
-
-
-					script.Link(target, method.NameToken);
-				};
-
-				if (task.IsCompleted) {
-					replaceStatements (null);
-				} else {
-					task.ContinueWith (replaceStatements, TaskScheduler.FromCurrentSynchronizationContext ());
-				}
-			}, statements.First ().StartLocation, statements.Last ().EndLocation);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/StaticVisitor.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/StaticVisitor.cs
deleted file mode 100644
index 168fe3e3df..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/StaticVisitor.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// 
-// StaticVisitor.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using ICSharpCode.NRefactory.Semantics;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod
-{
-	class StaticVisitor : DepthFirstAstVisitor
-	{
-		readonly RefactoringContext context;
-		public bool UsesNonStaticMember = false;
-
-		StaticVisitor(RefactoringContext context)
-		{
-			this.context = context;
-		}
-		
-		
-		public static bool UsesNotStaticMember(RefactoringContext context, AstNode node)
-		{
-			var visitor = new StaticVisitor(context);
-			node.AcceptVisitor(visitor);
-			return visitor.UsesNonStaticMember;
-		}
-
-		protected override void VisitChildren(AstNode node)
-		{
-			if (UsesNonStaticMember)
-				return;
-			base.VisitChildren(node);
-		}
-
-		public override void VisitThisReferenceExpression(ThisReferenceExpression thisReferenceExpression)
-		{
-			UsesNonStaticMember = true;
-			base.VisitThisReferenceExpression(thisReferenceExpression);
-		}
-
-		public override void VisitBaseReferenceExpression(BaseReferenceExpression baseReferenceExpression)
-		{
-			UsesNonStaticMember = true;
-			base.VisitBaseReferenceExpression(baseReferenceExpression);
-		}
-
-		public override void VisitIdentifierExpression(IdentifierExpression identifierExpression)
-		{
-			var resolveResult = context.Resolve(identifierExpression);
-			if (resolveResult is MemberResolveResult) {
-				var memberResult = (MemberResolveResult)resolveResult;
-				if (!memberResult.Member.IsStatic)
-					UsesNonStaticMember = true;
-			} else if (resolveResult is MethodGroupResolveResult) {
-				var methodGroupResolveResult = (MethodGroupResolveResult)resolveResult;
-				if (methodGroupResolveResult.Methods.Any(m => !m.IsStatic))
-					UsesNonStaticMember = true;
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/VariableLookupVisitor.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/VariableLookupVisitor.cs
deleted file mode 100644
index 99ba91f420..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/VariableLookupVisitor.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// 
-// VariableLookupVisitor.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod
-{
-	class VariableLookupVisitor : DepthFirstAstVisitor
-	{
-		readonly RefactoringContext context;
-		
-		public List<IVariable> UsedVariables = new List<IVariable> ();
-		
-		TextLocation startLocation = TextLocation.Empty;
-		TextLocation endLocation = TextLocation.Empty;
-		
-		public VariableLookupVisitor (RefactoringContext context)
-		{
-			this.context = context;
-		}
-		
-		public bool Has (IVariable item1)
-		{
-			return UsedVariables.Contains (item1);
-		}
-		
-		public void SetAnalyzedRange(AstNode start, AstNode end, bool startInclusive = true, bool endInclusive = true)
-		{
-			if (start == null)
-				throw new ArgumentNullException("start");
-			if (end == null)
-				throw new ArgumentNullException("end");
-			startLocation = startInclusive ? start.StartLocation : start.EndLocation;
-			endLocation = endInclusive ? end.EndLocation : end.StartLocation;
-		}
-		
-		public override void VisitIdentifierExpression(IdentifierExpression identifierExpression)
-		{
-			if (startLocation.IsEmpty || startLocation <= identifierExpression.StartLocation && identifierExpression.EndLocation <= endLocation) {
-				var result = context.Resolve(identifierExpression);
-				var local = result as LocalResolveResult;
-				if (local != null && !UsedVariables.Contains(local.Variable)) {
-					UsedVariables.Add(local.Variable);
-				}
-			}
-		}
-		
-		public override void VisitVariableDeclarationStatement(VariableDeclarationStatement variableDeclarationStatement)
-		{
-			base.VisitVariableDeclarationStatement(variableDeclarationStatement);
-			foreach (var varDecl in variableDeclarationStatement.Variables) {
-				if (startLocation.IsEmpty || startLocation <= varDecl.StartLocation && varDecl.EndLocation <= endLocation) {
-					var result = context.Resolve(varDecl);
-					var local = result as LocalResolveResult;
-					if (local != null && !UsedVariables.Contains(local.Variable))
-						UsedVariables.Add(local.Variable);
-				}
-			}
-		}
-		
-		
-		public static List<IVariable> Analyze(RefactoringContext context, Expression expression)
-		{
-			var visitor = new VariableLookupVisitor(context);
-			expression.AcceptVisitor(visitor);
-			return visitor.UsedVariables;
-		}
-		
-		public static List<IVariable> Analyze(RefactoringContext context, List<AstNode> statements)
-		{
-			var visitor = new VariableLookupVisitor(context);
-			statements.ForEach(stmt => stmt.AcceptVisitor(visitor));
-			return visitor.UsedVariables;
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/FlipOperatorArgumentsAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/FlipOperatorArgumentsAction.cs
deleted file mode 100644
index ba1806c194..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/FlipOperatorArgumentsAction.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// 
-// FlipOperatorArguments.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Threading;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Swaps left and right arguments.", Description = "Swaps left and right arguments.")]
-	public class FlipOperatorArgumentsAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var binop = GetBinaryOperatorExpression(context);
-			if (binop == null) {
-				yield break;
-			}
-
-
-			yield return new CodeAction(string.Format(context.TranslateString("Flip '{0}' operator arguments"), binop.OperatorToken.ToString()), script => {
-				script.Replace(binop.Left, binop.Right.Clone());
-				script.Replace(binop.Right, binop.Left.Clone());
-			}, binop.OperatorToken);
-		}
-		
-		public static BinaryOperatorExpression GetBinaryOperatorExpression (RefactoringContext context)
-		{
-			var node = context.GetNode<BinaryOperatorExpression> ();
-			
-			if (node == null || !node.OperatorToken.Contains (context.Location))
-				return null;
-			var result = node as BinaryOperatorExpression;
-			if (result == null || (result.Operator != BinaryOperatorType.Equality && result.Operator != BinaryOperatorType.InEquality))
-				return null;
-			return result;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/GenerateGetterAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/GenerateGetterAction.cs
deleted file mode 100644
index d726dc51a5..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/GenerateGetterAction.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// 
-// GenerateGetter.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using ICSharpCode.NRefactory.PatternMatching;
-using System.Linq;
-using System.Threading;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Generate getter", Description = "Generates a getter for a field.")]
-	public class GenerateGetterAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var initializer = GetVariableInitializer(context);
-			if (initializer == null || !initializer.NameToken.Contains(context.Location.Line, context.Location.Column)) {
-				yield break;
-			}
-			var type = initializer.Parent.Parent as TypeDeclaration;
-			if (type == null) {
-				yield break;
-			}
-			foreach (var member in type.Members) {
-				if (member is PropertyDeclaration && ContainsGetter((PropertyDeclaration)member, initializer)) {
-					yield break;
-				}
-			}
-			var field = initializer.Parent as FieldDeclaration;
-			if (field == null) {
-				yield break;
-			}
-			
-			yield return new CodeAction(context.TranslateString("Create getter"), script => {
-				script.InsertWithCursor(
-					context.TranslateString("Create getter"),
-					Script.InsertPosition.After,
-					GeneratePropertyDeclaration(context, field, initializer));
-			}, initializer);
-		}
-		
-		static PropertyDeclaration GeneratePropertyDeclaration (RefactoringContext context, FieldDeclaration field, VariableInitializer initializer)
-		{
-			var mod = ICSharpCode.NRefactory.CSharp.Modifiers.Public;
-			if (field.HasModifier (ICSharpCode.NRefactory.CSharp.Modifiers.Static))
-				mod |= ICSharpCode.NRefactory.CSharp.Modifiers.Static;
-			
-			return new PropertyDeclaration () {
-				Modifiers = mod,
-				Name = context.GetNameProposal (initializer.Name, false),
-				ReturnType = field.ReturnType.Clone (),
-				Getter = new Accessor () {
-					Body = new BlockStatement () {
-						new ReturnStatement (new IdentifierExpression (initializer.Name))
-					}
-				}
-			};
-		}
-		
-		bool ContainsGetter (PropertyDeclaration property, VariableInitializer initializer)
-		{
-			if (property.Getter.IsNull || property.Getter.Body.Statements.Count () != 1)
-				return false;
-			var ret = property.Getter.Body.Statements.Single () as ReturnStatement;
-			if (ret == null)
-				return false;
-			return ret.Expression.IsMatch (new IdentifierExpression (initializer.Name)) || 
-				ret.Expression.IsMatch (new MemberReferenceExpression (new ThisReferenceExpression (), initializer.Name));
-		}
-		
-		VariableInitializer GetVariableInitializer (RefactoringContext context)
-		{
-			return context.GetNode<VariableInitializer> ();
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/GeneratePropertyAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/GeneratePropertyAction.cs
deleted file mode 100644
index d81cd13b4d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/GeneratePropertyAction.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-// 
-// GenerateProperty.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.PatternMatching;
-using System.Linq;
-using System.Threading;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Generate property", Description = "Generates a getter and setter for a field.")]
-	public class GeneratePropertyAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var initializer = context.GetNode<VariableInitializer>();
-			if (initializer == null || !initializer.NameToken.Contains(context.Location.Line, context.Location.Column)) {
-				yield break;
-			}
-			var type = initializer.Parent.Parent as TypeDeclaration;
-			if (type == null) {
-				yield break;
-			}
-			foreach (var member in type.Members) {
-				if (member is PropertyDeclaration && ContainsGetter((PropertyDeclaration)member, initializer)) {
-					yield break;
-				}
-			}
-			var field = initializer.Parent as FieldDeclaration;
-			if (field == null || field.HasModifier(Modifiers.Readonly) || field.HasModifier(Modifiers.Const)) {
-				yield break;
-			}
-			var resolveResult = context.Resolve(initializer) as MemberResolveResult;
-			if (resolveResult == null)
-				yield break;
-			yield return new CodeAction(context.TranslateString("Create property"), script => {
-				var fieldName = context.GetNameProposal(initializer.Name, true);
-				if (initializer.Name == context.GetNameProposal(initializer.Name, false)) {
-					script.Rename(resolveResult.Member, fieldName);
-				}
-				script.InsertWithCursor(
-					context.TranslateString("Create property"),
-					Script.InsertPosition.After, GeneratePropertyDeclaration(context, field, fieldName));
-			}, initializer);
-		}
-		
-		static PropertyDeclaration GeneratePropertyDeclaration (RefactoringContext context, FieldDeclaration field, string fieldName)
-		{
-			var mod = ICSharpCode.NRefactory.CSharp.Modifiers.Public;
-			if (field.HasModifier (ICSharpCode.NRefactory.CSharp.Modifiers.Static))
-				mod |= ICSharpCode.NRefactory.CSharp.Modifiers.Static;
-			
-			return new PropertyDeclaration () {
-				Modifiers = mod,
-				Name = context.GetNameProposal (fieldName, false),
-				ReturnType = field.ReturnType.Clone (),
-				Getter = new Accessor () {
-					Body = new BlockStatement () {
-						new ReturnStatement (new IdentifierExpression (fieldName))
-					}
-				},
-				Setter = new Accessor () {
-					Body = new BlockStatement () {
-						new ExpressionStatement (new AssignmentExpression (new IdentifierExpression (fieldName), new IdentifierExpression ("value")))
-					}
-				}
-			};
-		}
-		
-		bool ContainsGetter (PropertyDeclaration property, VariableInitializer initializer)
-		{
-			if (property.Getter.IsNull || property.Getter.Body.Statements.Count () != 1)
-				return false;
-			var ret = property.Getter.Body.Statements.Single () as ReturnStatement;
-			if (ret == null)
-				return false;
-			return ret.Expression.IsMatch (new IdentifierExpression (initializer.Name)) || 
-				ret.Expression.IsMatch (new MemberReferenceExpression (new ThisReferenceExpression (), initializer.Name));
-		}
-		
-
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/GenerateSwitchLabelsAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/GenerateSwitchLabelsAction.cs
deleted file mode 100644
index c11177b814..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/GenerateSwitchLabelsAction.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// 
-// GenerateSwitchLabels.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Threading;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Generate switch labels", Description = "Creates switch lables for enumerations.")]
-	public class GenerateSwitchLabelsAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var switchStatement = GetSwitchStatement(context);
-			if (switchStatement == null) {
-				yield break;
-			}
-			var result = context.Resolve(switchStatement.Expression);
-			if (result.Type.Kind != TypeKind.Enum) {
-				yield break;
-			}
-			yield return new CodeAction (context.TranslateString("Create switch labels"), script => {
-				var type = result.Type;
-				var newSwitch = (SwitchStatement)switchStatement.Clone();
-				
-				var target = new TypeReferenceExpression (context.CreateShortType(result.Type));
-				foreach (var field in type.GetFields ()) {
-					if (field.IsSynthetic || !field.IsConst) {
-						continue;
-					}
-					newSwitch.SwitchSections.Add(new SwitchSection () {
-						CaseLabels = {
-							new CaseLabel (new MemberReferenceExpression (target.Clone(), field.Name))
-						},
-						Statements = {
-							new BreakStatement ()
-						}
-					});
-				}
-				
-				newSwitch.SwitchSections.Add(new SwitchSection () {
-					CaseLabels = {
-						new CaseLabel ()
-					},
-					Statements = {
-						new ThrowStatement (new ObjectCreateExpression (context.CreateShortType("System", "ArgumentOutOfRangeException")))
-					}
-				});
-				
-				script.Replace(switchStatement, newSwitch);
-			}, switchStatement);
-		}
-		
-		static SwitchStatement GetSwitchStatement (RefactoringContext context)
-		{
-			var switchStatment = context.GetNode<SwitchStatement> ();
-			if (switchStatment != null && switchStatment.SwitchSections.Count == 0)
-				return switchStatment;
-			return null;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ImplementAbstractMembersAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ImplementAbstractMembersAction.cs
deleted file mode 100644
index 0eac6f8906..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ImplementAbstractMembersAction.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-// 
-// ImplementAbstractMembersAction.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Threading;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Implement abstract members", Description = "Implements abstract members from an abstract class.")]
-	public class ImplementAbstractMembersAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var type = context.GetNode<AstType>();
-			if (type == null || type.Role != Roles.BaseType)
-				yield break;
-			var state = context.GetResolverStateBefore(type);
-			if (state.CurrentTypeDefinition == null)
-				yield break;
-
-			var resolveResult = context.Resolve(type);
-			if (resolveResult.Type.Kind != TypeKind.Class || resolveResult.Type.GetDefinition() == null || !resolveResult.Type.GetDefinition().IsAbstract)
-				yield break;
-
-			var toImplement = CollectMembersToImplement(state.CurrentTypeDefinition, resolveResult.Type);
-			if (toImplement.Count == 0)
-				yield break;
-
-			yield return new CodeAction(context.TranslateString("Implement abstract members"), script => {
-				script.InsertWithCursor(
-					context.TranslateString("Implement abstract members"),
-					state.CurrentTypeDefinition,
-					ImplementInterfaceAction.GenerateImplementation (context, toImplement.Select (m => Tuple.Create (m, false))).Select (entity => {
-						var decl = entity as EntityDeclaration;
-						if (decl != null)
-							decl.Modifiers |= Modifiers.Override;
-						return entity;
-					})
-				);
-			}, type);
-		}
-
-		public static List<IMember> CollectMembersToImplement(ITypeDefinition implementingType, IType abstractType)
-		{
-//			var def = abstractType.GetDefinition();
-			var toImplement = new List<IMember>();
-			bool alreadyImplemented;
-			
-			// Stub out non-implemented events defined by @iface
-			foreach (var ev in abstractType.GetEvents (e => !e.IsSynthetic && e.IsAbstract)) {
-				alreadyImplemented = implementingType.GetAllBaseTypeDefinitions().Any(
-					x => x.Kind != TypeKind.Interface && x.Events.Any (y => y.Name == ev.Name)
-					);
-				
-				if (!alreadyImplemented)
-					toImplement.Add(ev);
-			}
-			
-			// Stub out non-implemented methods defined by @iface
-			foreach (var method in abstractType.GetMethods (d => !d.IsSynthetic  && d.IsAbstract)) {
-				alreadyImplemented = false;
-
-				var allBaseTypes = method.DeclaringType.GetAllBaseTypes().ToList ();
-				foreach (var cmet in implementingType.GetMethods (d => !d.IsAbstract && d.Name == method.Name)) {
-					if (allBaseTypes.Contains(cmet.DeclaringType))
-						continue;
-					if (ImplementInterfaceAction.CompareMethods(method, cmet)) {
-						alreadyImplemented = true;
-						break;
-					}
-				}
-				if (!alreadyImplemented) 
-					toImplement.Add(method);
-			}
-			
-			// Stub out non-implemented properties defined by @iface
-			foreach (var prop in abstractType.GetProperties (p => !p.IsSynthetic && p.IsAbstract)) {
-				alreadyImplemented = false;
-				foreach (var t in implementingType.GetAllBaseTypeDefinitions ()) {
-					if (t.Kind == TypeKind.Interface)
-						continue;
-					foreach (IProperty cprop in t.Properties) {
-						if (!cprop.IsAbstract && cprop.Name == prop.Name) {
-							alreadyImplemented = true;
-						}
-					}
-				}
-				if (!alreadyImplemented)
-					toImplement.Add(prop);
-			}
-			return toImplement;
-		}
-
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ImplementInterfaceAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ImplementInterfaceAction.cs
deleted file mode 100644
index 69814217e3..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ImplementInterfaceAction.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-// 
-// ImplementInterfaceAction.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Threading;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Implement interface", Description = "Creates an interface implementation.")]
-	public class ImplementInterfaceAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var type = context.GetNode<AstType>();
-			if (type == null || type.Role != Roles.BaseType)
-				yield break;
-			
-			var state = context.GetResolverStateBefore(type);
-			if (state.CurrentTypeDefinition == null)
-				yield break;
-			
-			var resolveResult = context.Resolve(type);
-			if (resolveResult.Type.Kind != TypeKind.Interface)
-				yield break;
-			
-			var toImplement = CollectMembersToImplement(state.CurrentTypeDefinition, resolveResult.Type, false);
-			if (toImplement.Count == 0)
-				yield break;
-			
-			yield return new CodeAction(context.TranslateString("Implement interface"), script => {
-				script.InsertWithCursor(
-					context.TranslateString("Implement Interface"),
-					state.CurrentTypeDefinition,
-					GenerateImplementation(context, toImplement)
-				);
-			}, type);
-		}
-		
-		public static IEnumerable<AstNode> GenerateImplementation(RefactoringContext context, IEnumerable<Tuple<IMember, bool>> toImplement)
-		{
-			var nodes = new Dictionary<IType, List<AstNode>>();
-			
-			foreach (var member in toImplement) {
-				if (!nodes.ContainsKey(member.Item1.DeclaringType)) 
-					nodes [member.Item1.DeclaringType] = new List<AstNode>();
-				nodes [member.Item1.DeclaringType].Add(GenerateMemberImplementation(context, member.Item1, member.Item2));
-			}
-			
-			foreach (var kv in nodes) {
-				if (kv.Key.Kind == TypeKind.Interface) {
-					yield return new PreProcessorDirective(
-						PreProcessorDirectiveType.Region,
-						string.Format("{0} implementation", kv.Key.Name));
-				} else {
-					yield return new PreProcessorDirective(
-						PreProcessorDirectiveType.Region,
-						string.Format("implemented abstract members of {0}", kv.Key.Name));
-				}
-				foreach (var member in kv.Value)
-					yield return member;
-				yield return new PreProcessorDirective(
-					PreProcessorDirectiveType.Endregion
-				);
-			}
-		}
-		
-		static EntityDeclaration GenerateMemberImplementation(RefactoringContext context, IMember member, bool explicitImplementation)
-		{
-			var builder = context.CreateTypeSystemAstBuilder();
-			builder.GenerateBody = true;
-			builder.ShowModifiers = false;
-			builder.ShowAccessibility = true;
-			builder.ShowConstantValues = !explicitImplementation;
-			builder.ShowTypeParameterConstraints = !explicitImplementation;
-			builder.UseCustomEvents = explicitImplementation;
-			var decl = builder.ConvertEntity(member);
-			if (explicitImplementation) {
-				decl.Modifiers = Modifiers.None;
-				decl.AddChild(builder.ConvertType(member.DeclaringType), EntityDeclaration.PrivateImplementationTypeRole);
-			} else if (member.DeclaringType.Kind == TypeKind.Interface) {
-				decl.Modifiers |= Modifiers.Public;
-			} else {
-				// Remove 'internal' modifier from 'protected internal' members if the override is in a different assembly than the member
-				if (!member.ParentAssembly.InternalsVisibleTo(context.Compilation.MainAssembly)) {
-					decl.Modifiers &= ~Modifiers.Internal;
-				}
-			}
-			return decl;
-		}
-		
-		public static List<Tuple<IMember, bool>> CollectMembersToImplement(ITypeDefinition implementingType, IType interfaceType, bool explicitly)
-		{
-			var def = interfaceType.GetDefinition();
-			List<Tuple<IMember, bool>> toImplement = new List<Tuple<IMember, bool>>();
-			bool alreadyImplemented;
-			
-			// Stub out non-implemented events defined by @iface
-			foreach (var evGroup in interfaceType.GetEvents (e => !e.IsSynthetic).GroupBy (m => m.DeclaringType).Reverse ())
-				foreach (var ev in evGroup) {
-					bool needsExplicitly = explicitly;
-					alreadyImplemented = implementingType.GetAllBaseTypeDefinitions().Any(
-					x => x.Kind != TypeKind.Interface && x.Events.Any(y => y.Name == ev.Name)
-					);
-				
-					if (!alreadyImplemented)
-						toImplement.Add(new Tuple<IMember, bool>(ev, needsExplicitly));
-				}
-			
-			// Stub out non-implemented methods defined by @iface
-			foreach (var methodGroup in interfaceType.GetMethods (d => !d.IsSynthetic).GroupBy (m => m.DeclaringType).Reverse ())
-				foreach (var method in methodGroup) {
-				
-					bool needsExplicitly = explicitly;
-					alreadyImplemented = false;
-				
-					foreach (var cmet in implementingType.GetMethods ()) {
-						if (CompareMethods(method, cmet)) {
-							if (!needsExplicitly && !cmet.ReturnType.Equals(method.ReturnType))
-								needsExplicitly = true;
-							else
-								alreadyImplemented |= !needsExplicitly /*|| cmet.InterfaceImplementations.Any (impl => impl.InterfaceType.Equals (interfaceType))*/;
-						}
-					}
-					if (toImplement.Where(t => t.Item1 is IMethod).Any(t => CompareMethods(method, (IMethod)t.Item1)))
-						needsExplicitly = true;
-					if (!alreadyImplemented) 
-						toImplement.Add(new Tuple<IMember, bool>(method, needsExplicitly));
-				}
-			
-			// Stub out non-implemented properties defined by @iface
-			foreach (var propGroup in interfaceType.GetProperties (p => !p.IsSynthetic).GroupBy (m => m.DeclaringType).Reverse ())
-				foreach (var prop in propGroup) {
-					bool needsExplicitly = explicitly;
-					alreadyImplemented = false;
-					foreach (var t in implementingType.GetAllBaseTypeDefinitions ()) {
-						if (t.Kind == TypeKind.Interface) {
-							foreach (var cprop in t.Properties) {
-								if (cprop.Name == prop.Name && cprop.IsShadowing) {
-									if (!needsExplicitly && !cprop.ReturnType.Equals(prop.ReturnType))
-										needsExplicitly = true;
-								}
-							}
-							continue;
-						}
-						foreach (var cprop in t.Properties) {
-							if (cprop.Name == prop.Name) {
-								if (!needsExplicitly && !cprop.ReturnType.Equals(prop.ReturnType))
-									needsExplicitly = true;
-								else
-									alreadyImplemented |= !needsExplicitly/* || cprop.InterfaceImplementations.Any (impl => impl.InterfaceType.Resolve (ctx).Equals (interfaceType))*/;
-							}
-						}
-					}
-					if (!alreadyImplemented)
-						toImplement.Add(new Tuple<IMember, bool>(prop, needsExplicitly));
-				}
-			return toImplement;
-		}
-		
-		internal static bool CompareMethods(IMethod interfaceMethod, IMethod typeMethod)
-		{
-			if (typeMethod.IsExplicitInterfaceImplementation)
-				return typeMethod.ImplementedInterfaceMembers.Any(m => m.Equals(interfaceMethod));
-			return SignatureComparer.Ordinal.Equals(interfaceMethod, typeMethod);
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ImplementInterfaceExplicitAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ImplementInterfaceExplicitAction.cs
deleted file mode 100644
index e9248bbc0d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ImplementInterfaceExplicitAction.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// 
-// ImplementInterfaceExplicitAction.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Threading;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Implement interface explicit", Description = "Creates an interface implementation.")]
-	public class ImplementInterfaceExplicitAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var type = context.GetNode<AstType>();
-			if (type == null || type.Role != Roles.BaseType)
-				yield break;
-			var state = context.GetResolverStateBefore(type);
-			if (state.CurrentTypeDefinition == null)
-				yield break;
-
-			var resolveResult = context.Resolve(type);
-			if (resolveResult.Type.Kind != TypeKind.Interface)
-				yield break;
-
-			var toImplement = ImplementInterfaceAction.CollectMembersToImplement(
-				state.CurrentTypeDefinition,
-				resolveResult.Type,
-				false
-			);
-			if (toImplement.Count == 0)
-				yield break;
-
-			yield return new CodeAction(context.TranslateString("Implement interface explicit"), script => {
-				script.InsertWithCursor(
-					context.TranslateString("Implement Interface"),
-					state.CurrentTypeDefinition,
-					ImplementInterfaceAction.GenerateImplementation (context, toImplement.Select (t => Tuple.Create (t.Item1, true)))
-				);
-			}, type);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/InlineLocalVariableAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/InlineLocalVariableAction.cs
deleted file mode 100644
index de8e3476bf..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/InlineLocalVariableAction.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// 
-// InlineLocalVariableAction.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Threading;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Inline local variable", Description = "Inlines a local variable.")]
-	public class InlineLocalVariableAction : ICodeActionProvider
-	{
-		static FindReferences refFinder = new FindReferences();
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			if (context.IsSomethingSelected) {
-				yield break;
-			}
-			var node = context.GetNode<VariableDeclarationStatement>();
-			if (node == null || node.Variables.Count != 1) {
-				yield break;
-			}
-			var initializer = node.Variables.First();
-			if (!initializer.NameToken.Contains(context.Location) || initializer.Initializer.IsNull) {
-				yield break;
-			}
-			var resolveResult = context.Resolve(initializer) as LocalResolveResult;
-			if (resolveResult == null || resolveResult.IsError) {
-				yield break;
-			}
-			var unit = context.RootNode as SyntaxTree;
-			if (unit == null) {
-				yield break;
-			}
-			yield return new CodeAction(context.TranslateString("Inline local variable"), script => {
-				refFinder.FindLocalReferences(resolveResult.Variable, context.UnresolvedFile, unit, context.Compilation, (n, r) => script.Replace(n, AddParensIfRequired (n, initializer.Initializer.Clone())), default(CancellationToken));
-				script.Remove(node);
-			}, initializer);
-		}
-
-		public static bool RequiresParens(AstNode replaceNode, AstNode replaceWithNode)
-		{
-			if (!(replaceWithNode is BinaryOperatorExpression) &&
-			    !(replaceWithNode is AsExpression) &&
-			    !(replaceWithNode is IsExpression) &&
-				!(replaceWithNode is ConditionalExpression)) {
-				return false;
-			}
-
-			var cond = replaceNode.Parent as ConditionalExpression;
-			if (cond != null && cond.Condition == replaceNode)
-				return true;
-
-			var indexer = replaceNode.Parent as IndexerExpression;
-			if (indexer != null && indexer.Target == replaceNode)
-				return true;
-
-			return replaceNode.Parent is BinaryOperatorExpression || 
-				replaceNode.Parent is UnaryOperatorExpression || 
-				replaceNode.Parent is MemberReferenceExpression ||
-				replaceNode.Parent is AsExpression || 
-				replaceNode.Parent is IsExpression || 
-				replaceNode.Parent is CastExpression ||
-				replaceNode.Parent is PointerReferenceExpression;
-		}
-
-		static Expression AddParensIfRequired(AstNode replaceNode, Expression expression)
-		{
-			if (RequiresParens(replaceNode, expression))
-				return new ParenthesizedExpression(expression);
-			return expression;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/InsertAnonymousMethodSignatureAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/InsertAnonymousMethodSignatureAction.cs
deleted file mode 100644
index 3e1a984416..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/InsertAnonymousMethodSignatureAction.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// 
-// InsertAnonymousMethodSignature.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Insert anonymous method signature", Description = "Inserts a signature to parameterless anonymous methods.")]
-	public class InsertAnonymousMethodSignatureAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			IType type;
-			var anonymousMethodExpression = GetAnonymousMethodExpression(context, out type);
-			if (anonymousMethodExpression == null) {
-				yield break;
-			}
-			yield return new CodeAction (context.TranslateString("Insert anonymous method signature"), script => {
-				var delegateMethod = type.GetDelegateInvokeMethod();
-				
-				var sb = new StringBuilder ("(");
-				for (int k = 0; k < delegateMethod.Parameters.Count; k++) {
-					if (k > 0) {
-						sb.Append(", ");
-					}
-					
-					var paramType = delegateMethod.Parameters [k].Type;
-					
-					sb.Append(context.CreateShortType(paramType));
-					sb.Append(" ");
-					sb.Append(delegateMethod.Parameters [k].Name);
-				}
-				sb.Append(")");
-				
-				script.InsertText(context.GetOffset(anonymousMethodExpression.DelegateToken.EndLocation), sb.ToString());
-			}, anonymousMethodExpression);
-		}
-		
-		static AnonymousMethodExpression GetAnonymousMethodExpression (RefactoringContext context, out IType delegateType)
-		{
-			delegateType = null;
-			
-			var anonymousMethodExpression = context.GetNode<AnonymousMethodExpression> ();
-			if (anonymousMethodExpression == null || !anonymousMethodExpression.DelegateToken.Contains (context.Location) || anonymousMethodExpression.HasParameterList)
-				return null;
-			
-			IType resolvedType = null;
-			var parent = anonymousMethodExpression.Parent;
-			
-			if (parent is AssignmentExpression) {
-				resolvedType = context.Resolve (((AssignmentExpression)parent).Left).Type;
-			} else if (parent is VariableInitializer) {
-				resolvedType = context.Resolve (((VariableDeclarationStatement)parent.Parent).Type).Type;
-			} else if (parent is InvocationExpression) {
-				// TODO: handle invocations
-			}
-			if (resolvedType == null)
-				return null;
-			delegateType = resolvedType;
-			if (delegateType.Kind != TypeKind.Delegate) 
-				return null;
-			
-			return anonymousMethodExpression;
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IntroduceConstantAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IntroduceConstantAction.cs
deleted file mode 100644
index 0ccc34aa60..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IntroduceConstantAction.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-// 
-// IntroduceConstantAction.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Introduce constant", Description = "Creates a constant for a non constant primitive expression.")]
-	public class IntroduceConstantAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var pexpr = context.GetNode<PrimitiveExpression>();
-			if (pexpr == null)
-				yield break;
-			var statement = context.GetNode<Statement>();
-			if (statement == null) {
-				yield break;
-			}
-
-			var visitor = new DeclareLocalVariableAction.SearchNodeVisitior(pexpr);
-			
-			var node = context.GetNode <BlockStatement>();
-			if (node != null)
-				node.AcceptVisitor(visitor);
-
-			var resolveResult = context.Resolve(pexpr);
-
-			yield return new CodeAction(context.TranslateString("Create local constant"), script => {
-				string name = CreateMethodDeclarationAction.CreateBaseName(pexpr, resolveResult.Type);
-				var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
-				if (service != null)
-					name = service.CheckName(context, name, AffectedEntity.LocalConstant);
-				
-				var initializer = new VariableInitializer(name, pexpr.Clone());
-				var decl = new VariableDeclarationStatement() {
-					Type = context.CreateShortType(resolveResult.Type),
-					Modifiers = Modifiers.Const,
-					Variables = { initializer }
-				};
-				
-				script.InsertBefore(statement, decl);
-				var variableUsage = new IdentifierExpression(name);
-				script.Replace(pexpr, variableUsage);
-				script.Link(initializer.NameToken, variableUsage);
-			}, pexpr);
-			
-			yield return new CodeAction(context.TranslateString("Create constant field"), script => {
-				string name = CreateMethodDeclarationAction.CreateBaseName(pexpr, resolveResult.Type);
-				var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
-				if (service != null)
-					name = service.CheckName(context, name, AffectedEntity.ConstantField);
-				
-				var initializer = new VariableInitializer(name, pexpr.Clone());
-				
-				var decl = new FieldDeclaration() {
-					ReturnType = context.CreateShortType(resolveResult.Type),
-					Modifiers = Modifiers.Const,
-					Variables = { initializer }
-				};
-				
-				var variableUsage = new IdentifierExpression(name);
-				script.Replace(pexpr, variableUsage);
-				//				script.Link(initializer.NameToken, variableUsage);
-				script.InsertWithCursor(context.TranslateString("Create constant"), Script.InsertPosition.Before, decl);
-			}, pexpr);
-
-			if (visitor.Matches.Count > 1) {
-				yield return new CodeAction(string.Format(context.TranslateString("Create local constant (replace '{0}' occurrences)"), visitor.Matches.Count), script => {
-					string name = CreateMethodDeclarationAction.CreateBaseName(pexpr, resolveResult.Type);
-					var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
-					if (service != null)
-						name = service.CheckName(context, name, AffectedEntity.LocalConstant);
-					
-					var initializer = new VariableInitializer(name, pexpr.Clone());
-					var decl = new VariableDeclarationStatement() {
-						Type = context.CreateShortType(resolveResult.Type),
-						Modifiers = Modifiers.Const,
-						Variables = { initializer }
-					};
-					
-					script.InsertBefore(statement, decl);
-
-					var linkedNodes = new List<AstNode>();
-					linkedNodes.Add(initializer.NameToken);
-					for (int i = 0; i < visitor.Matches.Count; i++) {
-						var identifierExpression = new IdentifierExpression(name);
-						linkedNodes.Add(identifierExpression);
-						script.Replace(visitor.Matches [i], identifierExpression);
-					}
-					script.Link(linkedNodes.ToArray ());
-				}, pexpr);
-				
-				yield return new CodeAction(string.Format(context.TranslateString("Create constant field (replace '{0}' occurrences)"), visitor.Matches.Count), script => {
-					string name = CreateMethodDeclarationAction.CreateBaseName(pexpr, resolveResult.Type);
-					var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
-					if (service != null)
-						name = service.CheckName(context, name, AffectedEntity.ConstantField);
-					
-					var initializer = new VariableInitializer(name, pexpr.Clone());
-					
-					var decl = new FieldDeclaration() {
-						ReturnType = context.CreateShortType(resolveResult.Type),
-						Modifiers = Modifiers.Const,
-						Variables = { initializer }
-					};
-					
-					var linkedNodes = new List<AstNode>();
-					linkedNodes.Add(initializer.NameToken);
-					for (int i = 0; i < visitor.Matches.Count; i++) {
-						var identifierExpression = new IdentifierExpression(name);
-						linkedNodes.Add(identifierExpression);
-						script.Replace(visitor.Matches [i], identifierExpression);
-					}
-					script.InsertWithCursor(context.TranslateString("Create constant"), Script.InsertPosition.Before, decl);
-				}, pexpr);
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IntroduceFormatItemAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IntroduceFormatItemAction.cs
deleted file mode 100644
index 5ff2406646..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IntroduceFormatItemAction.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-// 
-// IntroduceFormatItem.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using ICSharpCode.NRefactory.PatternMatching;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// Introduce format item. Works on strings that contain selections.
-	/// "this is <some> string" => string.Format ("this is {0} string", <some>)
-	/// </summary>
-	[ContextAction("Introduce format item", Description = "Creates a string.format call with the selection as parameter.")]
-	public class IntroduceFormatItemAction : ICodeActionProvider
-	{
-		readonly static MemberReferenceExpression PrototypeFormatReference = new MemberReferenceExpression (new TypeReferenceExpression (new PrimitiveType ("string")), "Format");
-		
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			if (!context.IsSomethingSelected) {
-				yield break;
-			}
-			var pexpr = context.GetNode<PrimitiveExpression>();
-			if (pexpr == null || !(pexpr.Value is string)) {
-				yield break;
-			}
-			if (pexpr.LiteralValue.StartsWith("@", StringComparison.Ordinal)) {
-				if (!(pexpr.StartLocation < new TextLocation(context.Location.Line, context.Location.Column - 1) && new TextLocation(context.Location.Line, context.Location.Column + 1) < pexpr.EndLocation)) {
-					yield break;
-				}
-			} else {
-				if (!(pexpr.StartLocation < context.Location && context.Location < pexpr.EndLocation)) {
-					yield break;
-				}
-			}
-
-			yield return new CodeAction (context.TranslateString("Introduce format item"), script => {
-				var invocation = context.GetNode<InvocationExpression>();
-				if (invocation != null && invocation.Target.IsMatch(PrototypeFormatReference)) {
-					AddFormatCallToInvocation(context, script, pexpr, invocation);
-					return;
-				}
-			
-				var arg = CreateFormatArgument(context);
-				var newInvocation = new InvocationExpression (PrototypeFormatReference.Clone()) {
-					Arguments = { CreateFormatString(context, pexpr, 0), arg }
-				};
-			
-				script.Replace(pexpr, newInvocation);
-				script.Select(arg);
-			}, pexpr);
-
-		}
-		
-		void AddFormatCallToInvocation (RefactoringContext context, Script script, PrimitiveExpression pExpr, InvocationExpression invocation)
-		{
-			var newInvocation = (InvocationExpression)invocation.Clone ();
-			
-			newInvocation.Arguments.First ().ReplaceWith (CreateFormatString (context, pExpr, newInvocation.Arguments.Count () - 1));
-			newInvocation.Arguments.Add (CreateFormatArgument (context));
-			
-			script.Replace (invocation, newInvocation);
-		}
-		
-		static PrimitiveExpression CreateFormatArgument (RefactoringContext context)
-		{
-			return new PrimitiveExpression (context.SelectedText);
-		}
-		
-		static PrimitiveExpression CreateFormatString(RefactoringContext context, PrimitiveExpression pExpr, int argumentNumber)
-		{
-			var start = context.GetOffset(pExpr.StartLocation);
-			var end = context.GetOffset(pExpr.EndLocation);
-			var sStart = context.GetOffset(context.SelectionStart);
-			var sEnd = context.GetOffset(context.SelectionEnd);
-			return new PrimitiveExpression("", context.GetText(start, sStart - start) + "{" + argumentNumber + "}" + context.GetText(sEnd, end - sEnd));
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/InvertIfAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/InvertIfAction.cs
deleted file mode 100644
index 400d867225..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/InvertIfAction.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// 
-// InvertIf.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Threading;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Invert if", Description = "Inverts an 'if ... else' expression.")]
-	public class InvertIfAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			// TODO: Invert if without else
-			// ex. if (cond) DoSomething () == if (!cond) return; DoSomething ()
-			// beware of loop contexts return should be continue then.
-			
-			var ifStatement = GetIfElseStatement(context);
-			if (!(ifStatement != null && !ifStatement.TrueStatement.IsNull && !ifStatement.FalseStatement.IsNull)) {
-				yield break;
-
-			}
-			yield return new CodeAction (context.TranslateString("Invert if"), script => {
-				script.Replace(ifStatement.Condition, CSharpUtil.InvertCondition(ifStatement.Condition.Clone()));
-				script.Replace(ifStatement.TrueStatement, ifStatement.FalseStatement.Clone());
-				script.Replace(ifStatement.FalseStatement, ifStatement.TrueStatement.Clone());
-				script.FormatText(ifStatement);
-			}, ifStatement);
-		}
-		
-		static IfElseStatement GetIfElseStatement (RefactoringContext context)
-		{
-			var result = context.GetNode<IfElseStatement> ();
-			if (result != null && result.IfToken.Contains (context.Location))
-				return result;
-			return null;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/InvertIfAndSimplify.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/InvertIfAndSimplify.cs
deleted file mode 100644
index b1c5b42c1e..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/InvertIfAndSimplify.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// InvertIfAndSimplify.cs
-//
-// Author:
-//      Ciprian Khlud <ciprian.mustiata@yahoo.com>
-//
-// Copyright (c) 2013 Ciprian Khlud <ciprian.mustiata@yahoo.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Invert If and Simplify", Description = "Inverts if and simplify branching")]
-	public class InvertIfAndSimplify : ICodeActionProvider
-	{
-		readonly InsertParenthesesVisitor _insertParenthesesVisitor = new InsertParenthesesVisitor();
-
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			// if (condition) {CodeBlock();}else { return|break|continue;} 
-			// will be reduced to:
-			//if (!condition) return|break|continue;
-			//CodeBlock();
-
-			var ifStatement = GetIfElseStatement(context);
-			if (ifStatement == null)
-				yield break;
-			yield return new CodeAction(context.TranslateString("Simplify if in loops"), script => GenerateNewScript(
-				script, ifStatement), ifStatement);
-		}
-
-		static Statement GenerateNewTrueStatement(Statement falseStatement)
-		{
-			var blockStatement = falseStatement as BlockStatement;
-			if (blockStatement != null) {
-				if (blockStatement.Children.Count(n => n.Role != Roles.NewLine && n.Role != Roles.LBrace && n.Role != Roles.RBrace) == 1)
-					return blockStatement.Statements.First().Clone ();
-			}
-			return falseStatement.Clone();
-		}
-
-		void GenerateNewScript(Script script, IfElseStatement ifStatement)
-		{
-			var mergedIfStatement = new IfElseStatement
-			{
-				Condition = CSharpUtil.InvertCondition(ifStatement.Condition)
-			};
-			var falseStatement = ifStatement.FalseStatement;
-			mergedIfStatement.TrueStatement = GenerateNewTrueStatement(falseStatement);
-			mergedIfStatement.Condition.AcceptVisitor(_insertParenthesesVisitor);
-
-			script.Replace(ifStatement, mergedIfStatement);
-
-			SimplifyIfFlowAction.InsertBody(script, ifStatement);
-		}
-
-		static IfElseStatement GetIfElseStatement(RefactoringContext context)
-		{
-			var result = context.GetNode<IfElseStatement>();
-			if (result == null || !result.IfToken.Contains(context.Location))
-				return null;
-			var falseStatement = result.FalseStatement;
-			var isQuitingStatement = falseStatement;
-			var blockStatement = falseStatement as BlockStatement;
-			if (blockStatement != null)
-				isQuitingStatement = blockStatement.Statements.FirstOrDefault();
-			if (isQuitingStatement is ReturnStatement || isQuitingStatement is ContinueStatement || isQuitingStatement is BreakStatement)
-				return result;
-			return null;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IterateViaForeachAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IterateViaForeachAction.cs
deleted file mode 100644
index ea0a569f1a..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IterateViaForeachAction.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-// IterateViaForeachTests.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Iterate via foreach", Description = "Iterates an IEnumerable with a foreach loop.")]
-	public class IterateViaForeachAction : ICodeActionProvider
-	{
-		#region ICodeActionProvider implementation
-
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			CodeAction action;
-			action = ActionFromUsingStatement(context);
-			if (action != null)
-				yield return action;
-			action = ActionFromVariableInitializer(context);
-			if (action != null)
-				yield return action;
-			action = ActionFromExpressionStatement(context);
-			if (action != null)
-				yield return action;
-		}
-
-		CodeAction ActionFromUsingStatement(RefactoringContext context)
-		{
-			var initializer = context.GetNode<VariableInitializer>();
-			if (initializer == null)
-				return null;
-			var initializerRR = context.Resolve(initializer) as LocalResolveResult;
-			if (initializerRR == null)
-				return null;
-			var elementType = GetElementType(initializerRR, context);
-			if (elementType == null)
-				return null;
-			var usingStatement = initializer.Parent.Parent as UsingStatement;
-			if (usingStatement == null)
-				return null;
-			return new CodeAction(context.TranslateString("Iterate via foreach"), script => {
-				var iterator = MakeForeach(new IdentifierExpression(initializer.Name), elementType, context);
-				if (usingStatement.EmbeddedStatement is EmptyStatement) {
-					var blockStatement = new BlockStatement();
-					blockStatement.Statements.Add(iterator);
-					script.Replace(usingStatement.EmbeddedStatement, blockStatement);
-					script.FormatText((AstNode)blockStatement);
-				} else if (usingStatement.EmbeddedStatement is BlockStatement) {
-					var anchorNode = usingStatement.EmbeddedStatement.FirstChild;
-					script.InsertAfter(anchorNode, iterator);
-					script.FormatText(usingStatement.EmbeddedStatement);
-				}
-			}, initializer);
-		}
-
-		CodeAction ActionFromVariableInitializer(RefactoringContext context)
-		{
-			var initializer = context.GetNode<VariableInitializer>();
-			if (initializer == null || initializer.Parent.Parent is ForStatement)
-				return null;
-			var initializerRR = context.Resolve(initializer) as LocalResolveResult;
-			if (initializerRR == null)
-				return null;
-			var elementType = GetElementType(initializerRR, context);
-			if (elementType == null)
-				return null;
-
-			return new CodeAction(context.TranslateString("Iterate via foreach"), script => {
-				var iterator = MakeForeach(new IdentifierExpression(initializer.Name), elementType, context);
-				script.InsertAfter(context.GetNode<Statement>(), iterator);
-			}, initializer);
-		}
-
-		CodeAction ActionFromExpressionStatement(RefactoringContext context)
-		{
-			var expressionStatement = context.GetNode<ExpressionStatement>();
-			if (expressionStatement == null)
-				return null;
-			var expression = expressionStatement.Expression;
-			if (expression is AssignmentExpression)
-				expression = ((AssignmentExpression)expression).Left;
-			var expressionRR = context.Resolve(expression);
-			if (expressionRR == null)
-				return null;
-			var elementType = GetElementType(expressionRR, context);
-			if (elementType == null)
-				return null;
-			return new CodeAction(context.TranslateString("Iterate via foreach"), script => {
-				var iterator = MakeForeach(expression, elementType, context);
-				if (expression == expressionStatement.Expression)
-					script.Replace(expressionStatement, iterator);
-				else
-					script.InsertAfter(expressionStatement, iterator);
-			}, expression);
-		}
-
-		static ForeachStatement MakeForeach(Expression node, IType type, RefactoringContext context)
-		{
-			var namingHelper = new NamingHelper(context);
-			return new ForeachStatement {
-				VariableType = new SimpleType("var"),
-				VariableName = namingHelper.GenerateVariableName(type),
-				InExpression = node.Clone(),
-				EmbeddedStatement = new BlockStatement()
-			};
-		}
-
-		static IType GetElementType(ResolveResult rr, BaseRefactoringContext context)
-		{
-			if (rr.IsError || rr.Type.Kind == TypeKind.Unknown)
-				return null;
-			var type = GetCollectionType(rr.Type);
-			if (type == null)
-				return null;
-
-			var parameterizedType = type as ParameterizedType;
-			if (parameterizedType != null)
-				return parameterizedType.TypeArguments.First();
-			return context.Compilation.FindType(KnownTypeCode.Object);
-		}
-
-		static IType GetCollectionType(IType type)
-		{
-			IType collectionType = null;
-			foreach (var baseType in type.GetAllBaseTypes()) {
-				if (baseType.IsKnownType(KnownTypeCode.IEnumerableOfT)) {
-					collectionType = baseType;
-					break;
-				} else if (baseType.IsKnownType(KnownTypeCode.IEnumerable)) {
-					collectionType = baseType;
-					// Don't break, continue in case type implements IEnumerable<T>
-				}
-			}
-			return collectionType;
-		}
-
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/MoveToOuterScopeAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/MoveToOuterScopeAction.cs
deleted file mode 100644
index 8235607b71..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/MoveToOuterScopeAction.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// MoveToOuterScopeAction.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using System;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using System.Threading;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	
-	[ContextAction("Move to outer scope", Description = "Moves a declaration to the parent scope.")]
-	public class MoveToOuterScopeAction : ICodeActionProvider
-	{
-		#region ICodeActionProvider implementation
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var variableDeclaration = context.GetNode<VariableDeclarationStatement>();
-			if (variableDeclaration == null)
-				yield break;
-			var entryNode = FindCurrentScopeEntryNode(variableDeclaration);
-			if (entryNode == null)
-				yield break;
-			var selectedInitializer = context.GetNode<VariableInitializer>();
-			if (selectedInitializer != null) {
-				if (HasDependency(context, entryNode, selectedInitializer)) {
-					yield return MoveDeclarationAction(context, entryNode, variableDeclaration, selectedInitializer);
-				} else {
-					yield return MoveInitializerAction(context, entryNode, variableDeclaration, selectedInitializer);
-				}
-			} else {
-				yield return new CodeAction(context.TranslateString("Move declaration to outer scope"), script => {
-					script.Remove(variableDeclaration);
-					script.InsertBefore(entryNode, variableDeclaration.Clone());
-				}, variableDeclaration);
-			}
-		}
-
-		static CodeAction MoveInitializerAction(RefactoringContext context, AstNode insertAnchor,
-		                                        VariableDeclarationStatement declaration, VariableInitializer initializer)
-		{
-			var type = declaration.Type.Clone();
-			var name = initializer.Name;
-			return new CodeAction(context.TranslateString("Move initializer to outer scope"), script =>  {
-				if (declaration.Variables.Count != 1) {
-					var innerDeclaration = RemoveInitializer(declaration, initializer);
-					script.InsertBefore(declaration, innerDeclaration);
-				}
-				script.Remove(declaration);
-				var outerDeclaration = new VariableDeclarationStatement(type, name, initializer.Initializer.Clone());
-				script.InsertBefore(insertAnchor, outerDeclaration);
-			}, declaration);
-		}
-
-		static CodeAction MoveDeclarationAction(RefactoringContext context, AstNode insertAnchor,
-		                                        VariableDeclarationStatement declarationStatement, VariableInitializer initializer)
-		{
-			var type = declarationStatement.Type.Clone();
-			var name = initializer.Name;
-			
-			return new CodeAction(context.TranslateString("Move declaration to outer scope"), script =>  {
-				script.InsertBefore(declarationStatement, new ExpressionStatement() {
-					Expression = new AssignmentExpression(new IdentifierExpression(name), initializer.Initializer.Clone())
-				});
-				script.Remove(declarationStatement);
-				script.InsertBefore(insertAnchor, new VariableDeclarationStatement(type, name, Expression.Null));
-			}, declarationStatement);
-		}
-
-		bool HasDependency(RefactoringContext context, AstNode firstSearchNode, AstNode targetNode)
-		{
-			var referenceFinder = new FindReferences();
-			var identifiers = targetNode.Descendants
-				.Where(n => n is IdentifierExpression)
-					.Select<AstNode, IdentifierExpression>(node => (IdentifierExpression)node);
-			foreach (var identifier in identifiers) {
-				var resolveResult = context.Resolve(identifier);
-				var localResolveResult = resolveResult as LocalResolveResult;
-				if (localResolveResult == null)
-					continue;
-				bool referenceFound = false;
-//				var variable = localResolveResult.Variable;
-				var syntaxTree = context.RootNode as SyntaxTree;
-				referenceFinder.FindLocalReferences(localResolveResult.Variable, context.UnresolvedFile, syntaxTree,
-				                                    context.Compilation, (node, nodeResolveResult) => {
-					if (node.StartLocation > firstSearchNode.StartLocation && node.EndLocation < targetNode.StartLocation)
-						referenceFound = true;
-				}, CancellationToken.None);
-				if (referenceFound)
-					return true;
-			}
-			return false;
-		}
-
-		static VariableDeclarationStatement RemoveInitializer(VariableDeclarationStatement variableDeclarationStatement, VariableInitializer selectedVariableInitializer)
-		{
-			var newVariableDeclarationStatement = new VariableDeclarationStatement() {
-				Type = variableDeclarationStatement.Type.Clone()
-			};
-			foreach (var variableInitializer in variableDeclarationStatement.Variables) {
-				if (variableInitializer != selectedVariableInitializer) {
-					newVariableDeclarationStatement.AddChild((VariableInitializer)variableInitializer.Clone(), Roles.Variable);
-				}
-			}
-			return newVariableDeclarationStatement;
-		}
-
-		AstNode FindCurrentScopeEntryNode(Statement startNode)
-		{
-			// Start one node up in the tree, otherwise we may stop at the BlockStatement
-			// of the current scope instead of moving up to the enclosing scope
-			var currentNode = startNode.Parent;
-			AstNode lastNode;
-			do {
-				lastNode = currentNode;
-				currentNode = currentNode.Parent;
-				if (currentNode == null)
-					return null;
-			} while (!(currentNode is BlockStatement));
-			return lastNode;
-		}
-		#endregion
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/NegateRelationalExpressionAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/NegateRelationalExpressionAction.cs
deleted file mode 100644
index 1aa7b21308..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/NegateRelationalExpressionAction.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// 
-// NegateRelationalExpressionAction.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction ("Negate an relational expression", Description = "Negate an relational expression.")]
-	public class NegateRelationalExpressionAction : SpecializedCodeAction<BinaryOperatorExpression>
-	{
-
-		protected override CodeAction GetAction (RefactoringContext context, BinaryOperatorExpression node)
-		{
-			var newOp = CSharpUtil.NegateRelationalOperator (node.Operator);
-			if (newOp != BinaryOperatorType.Any && node.OperatorToken.Contains (context.Location)) {
-				var operatorToken = BinaryOperatorExpression.GetOperatorRole (node.Operator).Token;
-				return new CodeAction (string.Format (context.TranslateString ("Negate '{0}'"), operatorToken),
-					script => {
-						var expr = new BinaryOperatorExpression (node.Left.Clone (), newOp, node.Right.Clone ());
-						script.Replace (node, expr);
-					}, node.OperatorToken);
-			}
-			return null;
-		}
-
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveBackingStoreAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveBackingStoreAction.cs
deleted file mode 100644
index 4e1add9b5f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveBackingStoreAction.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-// 
-// RemoveBackingStore.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Threading;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Remove backing store for property", Description = "Removes the backing store of a property and creates an auto property.")]
-	public class RemoveBackingStoreAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var property = context.GetNode<PropertyDeclaration>();
-			var field = GetBackingField(context);
-			if (field == null) {
-				yield break;
-			}
-			// create new auto property
-			var newProperty = (PropertyDeclaration)property.Clone();
-			newProperty.Getter.Body = BlockStatement.Null;
-			newProperty.Setter.Body = BlockStatement.Null;
-			
-			yield return new CodeAction(context.TranslateString("Convert to auto property"), script => {
-				script.Rename((IEntity)field, newProperty.Name);
-				script.Remove (context.RootNode.GetNodeAt<FieldDeclaration> (field.Region.Begin));
-				script.Replace (property, newProperty);
-			}, property.NameToken);
-		}
-		
-//		void ReplaceBackingFieldReferences (MDRefactoringContext context, IField backingStore, PropertyDeclaration property)
-//		{
-//			using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
-//				foreach (var memberRef in MonoDevelop.Ide.FindInFiles.ReferenceFinder.FindReferences (backingStore, monitor)) {
-//					if (property.Contains (memberRef.Line, memberRef.Column))
-//						continue;
-//					if (backingStore.Location.Line == memberRef.Line && backingStore.Location.Column == memberRef.Column)
-//						continue;
-//					context.Do (new TextReplaceChange () {
-//						FileName = memberRef.FileName,
-//						Offset = memberRef.Position,
-//						RemovedChars = memberRef.Name.Length,
-//						InsertedText = property.Name
-//					});
-//				}
-//			}
-//		}
-//
-		static readonly Version csharp3 = new Version(3, 0);
-		
-		internal static IField GetBackingField (RefactoringContext context)
-		{
-			var propertyDeclaration = context.GetNode<PropertyDeclaration> ();
-			// automatic properties always need getter & setter
-			if (propertyDeclaration == null || propertyDeclaration.Getter.IsNull || propertyDeclaration.Setter.IsNull || propertyDeclaration.Getter.Body.IsNull || propertyDeclaration.Setter.Body.IsNull)
-				return null;
-			if (!context.Supports(csharp3) || propertyDeclaration.HasModifier (ICSharpCode.NRefactory.CSharp.Modifiers.Abstract) || ((TypeDeclaration)propertyDeclaration.Parent).ClassType == ClassType.Interface)
-				return null;
-			var getterField = ScanGetter (context, propertyDeclaration);
-			if (getterField == null)
-				return null;
-			var setterField = ScanSetter (context, propertyDeclaration);
-			if (setterField == null)
-				return null;
-			if (!getterField.Equals(setterField))
-				return null;
-			return getterField;
-		}
-		
-		internal static IField ScanGetter (RefactoringContext context, PropertyDeclaration propertyDeclaration)
-		{
-			if (propertyDeclaration.Getter.Body.Statements.Count != 1)
-				return null;
-			var returnStatement = propertyDeclaration.Getter.Body.Statements.First () as ReturnStatement;
-			if (returnStatement == null)
-				return null;
-			var result = context.Resolve (returnStatement.Expression);
-			if (result == null || !(result is MemberResolveResult))
-				return null;
-			return ((MemberResolveResult)result).Member as IField;
-		}
-		
-		internal static IField ScanSetter (RefactoringContext context, PropertyDeclaration propertyDeclaration)
-		{
-			if (propertyDeclaration.Setter.Body.Statements.Count != 1)
-				return null;
-			var setAssignment = propertyDeclaration.Setter.Body.Statements.First () as ExpressionStatement;
-			var assignment = setAssignment != null ? setAssignment.Expression as AssignmentExpression : null;
-			if (assignment == null || assignment.Operator != AssignmentOperatorType.Assign)
-				return null;
-			var result = context.Resolve (assignment.Left);
-			if (result == null || !(result is MemberResolveResult))
-				return null;
-			return ((MemberResolveResult)result).Member as IField;
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveBracesAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveBracesAction.cs
deleted file mode 100644
index fe5fb2014d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveBracesAction.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// 
-// RemoveBraces.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using System.Threading;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Remove braces", Description = "Removes redundant braces around a statement.")]
-	public class RemoveBracesAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var block = GetBlockStatement(context);
-			if (block == null) {
-				yield break;
-			}
-
-			yield return new CodeAction (context.TranslateString("Remove braces"), script => {
-				var start = script.GetCurrentOffset (block.LBraceToken.GetPrevNode ().EndLocation);
-				var end = script.GetCurrentOffset (block.LBraceToken.EndLocation);
-				if (end <= start)
-					return;
-				script.RemoveText (start, end - start);
-				script.Remove(block.LBraceToken);
-				script.Remove(block.RBraceToken);
-				script.FormatText(block.Parent);
-			}, block);
-		}
-		
-		static BlockStatement GetBlockStatement(RefactoringContext context)
-		{
-			var block = context.GetNode<BlockStatement>();
-			if (block == null || block.LBraceToken.IsNull || block.RBraceToken.IsNull)
-				return null;
-			if (!(block.LBraceToken.IsInside(context.Location) || block.RBraceToken.IsInside(context.Location)))
-				return null;
-			if (!(block.Parent is Statement) || block.Parent is TryCatchStatement) 
-				return null;
-			if (block.Statements.Count != 1 || block.Statements.First () is VariableDeclarationStatement) 
-				return null;
-			return block;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveRedundantCatchTypeAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveRedundantCatchTypeAction.cs
deleted file mode 100644
index fc3f605bc5..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveRedundantCatchTypeAction.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// RemoveRedundantCatchTypeAction.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.TypeSystem;
-using System;
-using ICSharpCode.NRefactory.Semantics;
-using System.Threading;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{	
-	[ContextAction("Remove redundant type",
-	               Description = "Removes a redundant exception type specifier from catch clauses.")]
-	public class RemoveRedundantCatchTypeAction : ICodeActionProvider
-	{
-		#region ICodeActionProvider implementation
-		public System.Collections.Generic.IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var catchClause = context.GetNode<CatchClause>();
-			if (catchClause == null)
-				yield break;
-			if (catchClause.Type.IsNull)
-				yield break;
-			var exceptionType = context.ResolveType(catchClause.Type);
-			if (exceptionType != context.Compilation.FindType(typeof(Exception)))
-				yield break;
-			var syntaxTree = context.RootNode as SyntaxTree;
-			if (syntaxTree == null)
-				yield break;
-			var exceptionIdentifierRR = context.Resolve(catchClause.VariableNameToken) as LocalResolveResult;
-			if (exceptionIdentifierRR != null &&
-				IsReferenced(exceptionIdentifierRR.Variable, catchClause.Body, syntaxTree, context))
-				yield break;
-			yield return new CodeAction(context.TranslateString("Remove type specifier"), script => {
-				script.Replace(catchClause, new CatchClause() {
-					Body = catchClause.Body.Clone() as BlockStatement
-				});
-			}, catchClause.Type);
-		}
-
-		bool IsReferenced(IVariable variable, AstNode node, SyntaxTree syntaxTree, RefactoringContext context)
-		{
-			int referencesFound = 0;
-			var findRef = new FindReferences();
-			findRef.FindLocalReferences(variable, context.UnresolvedFile, syntaxTree, context.Compilation, (n, entity) => {
-				referencesFound++;
-			}, CancellationToken.None);
-
-			// One reference is the declaration, and that does not count
-			return referencesFound > 1;
-		}
-
-		#endregion
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveRegionAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveRegionAction.cs
deleted file mode 100644
index 2484120b19..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveRegionAction.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-// 
-// RemoveRegion.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using System.Threading;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Remove region", Description = "Removes a pre processor #region/#endregion directive.")]
-	public class RemoveRegionAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var directive = GetDirective(context);
-			if (directive == null) {
-				yield break;
-			}
-			var endDirective = DirectiveSearcher.GetEndRegion(context.RootNode, directive);
-			if (endDirective == null) {
-				yield break;
-			}
-			yield return new CodeAction (context.TranslateString("Remove region"), script => {
-				script.Remove (directive);
-				script.Remove (endDirective);
-			}, directive);
-		}
-		
-		class DirectiveSearcher : DepthFirstAstVisitor
-		{
-			readonly PreProcessorDirective regionDirective;
-			bool searchDirectives = false;
-			int depth;
-			PreProcessorDirective endregion;
-			
-			DirectiveSearcher (PreProcessorDirective regionDirective)
-			{
-				if (regionDirective == null)
-					throw new ArgumentNullException ("regionDirective");
-				this.regionDirective = regionDirective;
-			}
-			
-			public static PreProcessorDirective GetEndRegion (AstNode rootNode, PreProcessorDirective regionDirective)
-			{
-				var visitor = new DirectiveSearcher (regionDirective);
-				rootNode.AcceptVisitor (visitor);
-				return visitor.endregion;
-			}
-			
-			protected override void VisitChildren (AstNode node)
-			{
-				if (endregion != null)
-					return;
-				if (!searchDirectives && !regionDirective.Ancestors.Any (a => a == node))
-					return;
-				base.VisitChildren (node);
-			}
-			
-			public override void VisitPreProcessorDirective (PreProcessorDirective preProcessorDirective)
-			{
-				if (searchDirectives) {
-					if (preProcessorDirective.Type == PreProcessorDirectiveType.Region) {
-						depth++;
-					} else if (preProcessorDirective.Type == PreProcessorDirectiveType.Endregion) {
-						depth--;
-						if (depth == 0) {
-							endregion = preProcessorDirective;
-							searchDirectives = false;
-						}
-					}
-				} else if (preProcessorDirective == regionDirective) {
-					searchDirectives = true;
-					depth = 1;
-				}
-				
-				base.VisitPreProcessorDirective (preProcessorDirective);
-			}
-		}
-		
-		static PreProcessorDirective GetDirective (RefactoringContext context)
-		{
-			var directive = context.GetNode<PreProcessorDirective> ();
-			if (directive == null || directive.Type != PreProcessorDirectiveType.Region)
-				return null;
-			return directive;
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ReplaceEmptyStringAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ReplaceEmptyStringAction.cs
deleted file mode 100644
index a7e1b5f5d1..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ReplaceEmptyStringAction.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// 
-// ReplaceEmptyString.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Threading;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Use string.Empty", Description = "Replaces \"\" with string.Empty")]
-	public class ReplaceEmptyStringAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var expr = GetEmptyString(context);
-			if (expr == null) {
-				yield break;
-			}
-			yield return new CodeAction(context.TranslateString("Use string.Empty"), script => {
-				script.Replace(expr, new MemberReferenceExpression (new TypeReferenceExpression (new PrimitiveType ("string")), "Empty"));
-			}, expr);
-		}
-		
-		static PrimitiveExpression GetEmptyString (RefactoringContext context)
-		{
-			var node = context.GetNode<PrimitiveExpression> ();
-			if (node == null || !(node.Value is string) || node.Value.ToString () != "")
-				return null;
-			return  node;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SimplifyIfFlowAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SimplifyIfFlowAction.cs
deleted file mode 100644
index 6286517c6f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SimplifyIfFlowAction.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// SimplifyIfFlowAction.cs
-//
-// Author:
-//      Ciprian Khlud <ciprian.mustiata@yahoo.com>
-//
-// Copyright (c) 2013 Ciprian Khlud <ciprian.mustiata@yahoo.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Simplify if flow", Description = "Inverts if and reduces branching ")]
-	public class SimplifyIfFlowAction : ICodeActionProvider
-	{
-		readonly InsertParenthesesVisitor _insertParenthesesVisitor = new InsertParenthesesVisitor();
-
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			// TODO: Invert if without else
-			// ex. if (cond) DoSomething () == if (!cond) return; DoSomething ()
-			// beware of loop contexts return should be continue then.
-			var ifStatement = GetIfElseStatement(context);
-			if (ifStatement == null)
-				yield break;
-			yield return new CodeAction(context.TranslateString("Invert if"), script =>
-			{
-				GenerateNewScript(script, ifStatement);
-			}, ifStatement);
-		}
-
-		internal static void InsertBody(Script script, IfElseStatement ifStatement)
-		{
-			var ifBody = ifStatement.TrueStatement.Clone();
-
-			if (ifBody is BlockStatement) {
-				AstNode last = ifStatement;
-				foreach (var stmt in ((BlockStatement)ifBody).Children) {
-					if (stmt.Role == Roles.LBrace || stmt.Role == Roles.RBrace || stmt.Role == Roles.NewLine)
-						continue;
-					script.InsertAfter(last, stmt);
-					last = stmt;
-				}
-			} else {
-				script.InsertAfter(ifStatement, ifBody);
-			}
-			script.FormatText(ifStatement.Parent);
-		}
-		
-		void GenerateNewScript(Script script, IfElseStatement ifStatement)
-		{
-			var mergedIfStatement = new IfElseStatement {
-				Condition = CSharpUtil.InvertCondition(ifStatement.Condition),
-				TrueStatement = new ReturnStatement()
-			};
-			mergedIfStatement.Condition.AcceptVisitor(_insertParenthesesVisitor);
-			
-			script.Replace(ifStatement, mergedIfStatement);
-
-			InsertBody(script, ifStatement);
-		}
-		
-		static IfElseStatement GetIfElseStatement(RefactoringContext context)
-		{
-			var result = context.GetNode<IfElseStatement>();
-			if (result == null)
-				return null;
-			if (!(result.IfToken.Contains(context.Location)
-				&& !result.TrueStatement.IsNull
-				&& result.FalseStatement.IsNull))
-				return null;
-			if (!(result.Parent is BlockStatement) || !(result.Parent.Parent is MethodDeclaration))
-				return null;
-			var parentMethod = (MethodDeclaration)result.Parent.Parent;
-			if (parentMethod.ReturnType.ToString() != "void")
-				return null;
-			var nextSibling = result.GetNextSibling(n => n is Statement);
-			if (nextSibling == null)
-				return result;
-			nextSibling = nextSibling.GetNextSibling (n => n is Statement);
-			if (nextSibling != null)
-				return null;
-			return result;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SimplifyIfInLoopsFlowAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SimplifyIfInLoopsFlowAction.cs
deleted file mode 100644
index 99d79f8570..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SimplifyIfInLoopsFlowAction.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// SimplifyIfInLoopsFlowAction.cs
-//
-// Author:
-//      Ciprian Khlud <ciprian.mustiata@yahoo.com>
-//
-// Copyright (c) 2013 Ciprian Khlud <ciprian.mustiata@yahoo.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Simplify if flow in loops", Description = "Inverts if and reduces branching ")]
-	public class SimplifyIfInLoopsFlowAction : ICodeActionProvider
-	{
-		readonly InsertParenthesesVisitor _insertParenthesesVisitor = new InsertParenthesesVisitor();
-
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			// TODO: Invert if without else
-			// ex. if (cond) DoSomething () == if (!cond) return; DoSomething ()
-			// beware of loop contexts return should be continue then.
-			
-			var ifStatement = GetIfElseStatement(context);
-			if (ifStatement == null)
-				yield break;
-			yield return new CodeAction(context.TranslateString("Simplify if in loops"), script => {
-				GenerateNewScript(script, ifStatement);
-			}, ifStatement);
-		}
-		
-		void GenerateNewScript(Script script, IfElseStatement ifStatement)
-		{
-			var mergedIfStatement = new IfElseStatement {
-				Condition = CSharpUtil.InvertCondition(ifStatement.Condition),
-				TrueStatement = new ContinueStatement()
-			};
-			mergedIfStatement.Condition.AcceptVisitor(_insertParenthesesVisitor);
-			
-			script.Replace(ifStatement, mergedIfStatement);
-			
-			SimplifyIfFlowAction.InsertBody(script, ifStatement);
-		}
-		
-		static IfElseStatement GetIfElseStatement(RefactoringContext context)
-		{
-			var result = context.GetNode<IfElseStatement>();
-			if (result == null)
-				return null;
-			if (!(result.IfToken.Contains(context.Location)
-				&& !result.TrueStatement.IsNull
-				&& result.FalseStatement.IsNull))
-				return null;
-			if (!(result.Parent is BlockStatement))
-				return null;
-			var condition = (result.Parent.Parent is WhileStatement) 
-				|| (result.Parent.Parent is ForeachStatement) 
-				|| (result.Parent.Parent is ForStatement);
-			if (!condition)
-				return null;
-			
-			var nextSibling = result.GetNextSibling(n => n is Statement);
-			if (nextSibling == null)
-				return result;
-			nextSibling = nextSibling.GetNextSibling (n => n is Statement);
-			if (nextSibling != null)
-				return null;
-			return result;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SortUsingsAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SortUsingsAction.cs
deleted file mode 100644
index c3444befed..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SortUsingsAction.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// SortUsingsAction.cs
-//
-// Author:
-//      Lopatkin Ilja
-//
-// Copyright (c) 2012 Lopatkin Ilja
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Sort usings", Description = "Sorts usings by their origin and then alphabetically.")]
-	public class SortUsingsAction: ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var usingNode = FindUsingNodeAtCursor(context);
-			if (usingNode == null)
-				yield break;
-
-			yield return new CodeAction(context.TranslateString("Sort usings"), script =>
-			{
-				var blocks = EnumerateUsingBlocks(context.RootNode);
-
-				foreach (var block in blocks)
-				{
-					var originalNodes = block.ToArray();
-					var sortedNodes = UsingHelper.SortUsingBlock(originalNodes, context).ToArray();
-
-					for (var i = 0; i < originalNodes.Length; ++i)
-						script.Replace(originalNodes[i], sortedNodes[i].Clone());
-				}
-			}, usingNode);
-		}
-
-		private static AstNode FindUsingNodeAtCursor(RefactoringContext context)
-		{
-			// If cursor is inside using declaration
-			var locationAsIs = context.Location;
-			// If cursor is at end of line with using declaration
-			var locationLeft = new TextLocation(locationAsIs.Line, locationAsIs.Column - 1);
-
-			var possibleNodes = new[] { locationAsIs, locationLeft }
-				.Select(_ => context.RootNode.GetNodeAt(_, IsUsingDeclaration));
-			var usingNode = possibleNodes.Where(_ => _ != null).Distinct().SingleOrDefault();
-
-			return usingNode;
-		}
-
-		private static bool IsUsingDeclaration(AstNode node)
-		{
-			return node is UsingDeclaration || node is UsingAliasDeclaration;
-		}
-
-		private static IEnumerable<IEnumerable<AstNode>> EnumerateUsingBlocks(AstNode root)
-		{
-			var alreadyAddedNodes = new HashSet<AstNode>();
-
-			foreach (var child in root.Descendants)
-				if (IsUsingDeclaration(child) && !alreadyAddedNodes.Contains(child)) {
-					var blockNodes = EnumerateUsingBlockNodes(child);
-
-					alreadyAddedNodes.UnionWith(blockNodes);
-					yield return blockNodes;
-				}
-		}
-
-		private static IEnumerable<AstNode> EnumerateUsingBlockNodes(AstNode firstNode)
-		{
-			for (var node = firstNode; IsUsingDeclaration(node); node = node.GetNextSibling (n => n.Role != Roles.NewLine))
-				yield return node;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SpecializedCodeAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SpecializedCodeAction.cs
deleted file mode 100644
index 2d204e1b1f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SpecializedCodeAction.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// A specialized code action creates a code action assoziated with one special type of ast nodes.
-	/// </summary>
-	public abstract class SpecializedCodeAction<T> : ICodeActionProvider where T : AstNode
-	{
-		/// <summary>
-		/// Gets the action for the specified ast node.
-		/// </summary>
-		/// <returns>
-		/// The code action. May return <c>null</c>, if no action can be provided.
-		/// </returns>
-		/// <param name='context'>
-		/// The refactoring conext.
-		/// </param>
-		/// <param name='node'>
-		/// The AstNode it's ensured that the node is always != null, if called.
-		/// </param>
-		protected abstract CodeAction GetAction(RefactoringContext context, T node);
-
-		#region ICodeActionProvider implementation
-		public System.Collections.Generic.IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var node = context.GetNode<T>();
-			if (node == null)
-				yield break;
-			var action = GetAction(context, node);
-			if (action == null)
-				yield break;
-			yield return action;
-		}
-		#endregion
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SplitDeclarationAndAssignmentAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SplitDeclarationAndAssignmentAction.cs
deleted file mode 100644
index cf195e7f78..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SplitDeclarationAndAssignmentAction.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-// 
-// SplitDeclarationAndAssignment.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using ICSharpCode.NRefactory.PatternMatching;
-using System.Threading;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Split local variable declaration and assignment", Description = "Splits local variable declaration and assignment.")]
-	public class SplitDeclarationAndAssignmentAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			if (context.IsSomethingSelected) {
-				yield break;
-			}
-			AstType type;
-			var varDecl = GetVariableDeclarationStatement(context, out type);
-			if (varDecl == null) {
-				yield break;
-			}
-			yield return new CodeAction(context.TranslateString("Split local variable declaration and assignment"), script => {
-				var assign = new AssignmentExpression (new IdentifierExpression (varDecl.Variables.First().Name), AssignmentOperatorType.Assign, varDecl.Variables.First().Initializer.Clone());
-				
-				var newVarDecl = (VariableDeclarationStatement)varDecl.Clone();
-				newVarDecl.Role = BlockStatement.StatementRole;
-				
-				if (newVarDecl.Type.IsVar()) {
-					newVarDecl.Type = type;
-				}
-				
-				newVarDecl.Variables.First().Initializer = Expression.Null;
-				
-				script.InsertBefore(varDecl, newVarDecl);
-				script.Replace(varDecl, varDecl.Parent is ForStatement ? (AstNode)assign : new ExpressionStatement (assign));
-			}, varDecl.Variables.First ().AssignToken);
-		}
-		
-		static VariableDeclarationStatement GetVariableDeclarationStatement (RefactoringContext context, out AstType resolvedType, CancellationToken cancellationToken = default(CancellationToken))
-		{
-			var result = context.GetNode<VariableDeclarationStatement> ();
-			if (result != null && result.Variables.Count == 1 && !result.Variables.First ().Initializer.IsNull && result.Variables.First ().NameToken.Contains (context.Location.Line, context.Location.Column)) {
-				var type = context.Resolve(result.Variables.First ().Initializer).Type;
-				if (type.Equals(SpecialType.NullType) || type.Equals(SpecialType.UnknownType)) {
-					resolvedType = new PrimitiveType ("object");
-				} else {
-					resolvedType = context.CreateShortType (type);
-				}
-				return result;
-			}
-			resolvedType = null;
-			return null;
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SplitDeclarationListAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SplitDeclarationListAction.cs
deleted file mode 100644
index e4ac87a2d3..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SplitDeclarationListAction.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-// 
-// SplitDeclarationListAction.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction ("Split declaration list", 
-		Description = "Split variable declaration with multiple variables into declarations with a single variable")] 
-	public class SplitDeclarationListAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions (RefactoringContext context)
-		{
-			// field, local var, event, fixed var, fixed field
-
-			// local variable
-			var variableDecl = context.GetNode<VariableDeclarationStatement> ();
-			if (variableDecl != null && variableDecl.Parent is BlockStatement) {
-				return GetAction (context, variableDecl, v => v.Variables);
-			}
-
-			// field
-			var fieldDecl = context.GetNode<FieldDeclaration> ();
-			if (fieldDecl != null)
-				return GetAction (context, fieldDecl, f => f.Variables);
-
-			// event
-			var eventDecl = context.GetNode<EventDeclaration> ();
-			if (eventDecl != null)
-				return GetAction (context, eventDecl, e => e.Variables);
-
-			// fixed field
-			var fixedFieldDecl = context.GetNode<FixedFieldDeclaration> ();
-			if (fixedFieldDecl != null)
-				return GetAction (context, fixedFieldDecl, f => f.Variables);
-
-			return Enumerable.Empty<CodeAction> ();
-		}
-
-		IEnumerable<CodeAction> GetAction<T, S> (RefactoringContext context, T decl, 
-												 Func<T, AstNodeCollection<S>> getInitializers)
-			where T : AstNode
-			where S : AstNode
-		{
-			var initializers = getInitializers(decl);
-			if (initializers.Count < 2)
-				yield break;
-
-			yield return new CodeAction (context.TranslateString ("Split declaration list"),
-				script =>
-				{
-					var emptyDecl = (T)decl.Clone ();
-					getInitializers (emptyDecl).Clear ();
-
-					var declList = initializers.Select (v =>
-					{
-						var singleDecl = (T)emptyDecl.Clone ();
-						getInitializers(singleDecl).Add ((S)v.Clone ());
-						return singleDecl;
-					});
-
-					foreach (var singleDecl in declList)
-						script.InsertBefore (decl, singleDecl);
-					script.Remove (decl);
-				}, decl);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SplitStringAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SplitStringAction.cs
deleted file mode 100644
index 2a23f832fe..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SplitStringAction.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// 
-// SplitString.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Threading;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Split string literal", Description = "Splits string literal into two.")]
-	public class SplitStringAction: ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			if (context.IsSomethingSelected) {
-				yield break;
-			}
-			var pexpr = context.GetNode<PrimitiveExpression>();
-			if (pexpr == null || !(pexpr.Value is string)) {
-				yield break;
-			}
-			if (pexpr.LiteralValue.StartsWith("@", StringComparison.Ordinal)) {
-				if (!(pexpr.StartLocation < new TextLocation(context.Location.Line, context.Location.Column - 2) &&
-					new TextLocation(context.Location.Line, context.Location.Column + 2) < pexpr.EndLocation)) {
-					yield break;
-				}
-			} else {
-				if (!(pexpr.StartLocation < new TextLocation(context.Location.Line, context.Location.Column - 1) && new TextLocation(context.Location.Line, context.Location.Column + 1) < pexpr.EndLocation)) {
-					yield break;
-				}
-			}
-
-			yield return new CodeAction(context.TranslateString("Split string literal"), script => {
-				int offset = context.GetOffset (context.Location);
-				script.InsertText (offset, pexpr.LiteralValue.StartsWith("@", StringComparison.Ordinal) ? "\" + @\"" : "\" + \"");
-			}, pexpr);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/StaticMethodInvocationToExtensionMethodInvocationAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/StaticMethodInvocationToExtensionMethodInvocationAction.cs
deleted file mode 100644
index 7eaf832c91..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/StaticMethodInvocationToExtensionMethodInvocationAction.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// StaticMethodInvocationToExtensionMethodInvocationAction.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using System.Linq;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	
-	[ContextAction("Invoke using extension method syntax",
-	               Description = "Converts the call into extension method call syntax.")]
-	public class StaticMethodInvocationToExtensionMethodInvocationAction : ICodeActionProvider
-	{
-		#region ICodeActionProvider implementation
-
-		public IEnumerable<CodeAction> GetActions (RefactoringContext context)
-		{
-			var invocation = context.GetNode<InvocationExpression>();
-			if (invocation == null)
-				yield break;
-			var memberReference = invocation.Target as MemberReferenceExpression;
-			if (memberReference == null)
-				yield break;
-			var firstArgument = invocation.Arguments.FirstOrDefault();
-			if (firstArgument is NullReferenceExpression)
-				yield break;
-			var invocationRR = context.Resolve(invocation) as CSharpInvocationResolveResult;
-			if (invocationRR == null)
-				yield break;
-			var method = invocationRR.Member as IMethod;
-			if (method == null || !method.IsExtensionMethod || invocationRR.IsExtensionMethodInvocation)
-				yield break;
-			yield return new CodeAction(context.TranslateString("Convert to extension method call"), script => {
-				var newArgumentList = invocation.Arguments.Skip(1).Select(arg => arg.Clone()).ToList();
-				var newTarget = memberReference.Clone() as MemberReferenceExpression;
-				newTarget.Target = firstArgument.Clone();
-				script.Replace(invocation, new InvocationExpression(newTarget, newArgumentList));
-			}, invocation);
-		}
-
-		#endregion
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseExplicitTypeAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseExplicitTypeAction.cs
deleted file mode 100644
index 9e3987a7ed..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseExplicitTypeAction.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-// 
-// UseExplicitType.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Threading;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Use explicit type", Description = "Converts local variable declaration to be explicit typed.")]
-	public class UseExplicitTypeAction: ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var varDecl = GetVariableDeclarationStatement(context);
-			AstNode node;
-			IType type;
-			if (varDecl != null) {
-				type = context.Resolve(varDecl.Variables.First().Initializer).Type;
-				node = varDecl;
-			} else {
-				var foreachStatement = GetForeachStatement(context);
-				if (foreachStatement == null) {
-					yield break;
-				}
-				type = context.Resolve(foreachStatement.VariableType).Type;
-				node = foreachStatement;
-			}
-
-			if (!(!type.Equals(SpecialType.NullType) && !type.Equals(SpecialType.UnknownType) && !ContainsAnonymousType(type))) {
-				yield break;
-			}
-			yield return new CodeAction (context.TranslateString("Use explicit type"), script => {
-				if (varDecl != null) {
-					script.Replace (varDecl.Type, context.CreateShortType (type));
-				} else {
-					var foreachStatement = GetForeachStatement (context);
-					script.Replace (foreachStatement.VariableType, context.CreateShortType (type));
-				}
-			}, node);
-		}
-
-		static bool ContainsAnonymousType (IType type)
-		{
-			if (type.Kind == TypeKind.Anonymous)
-				return true;
-
-			var arrayType = type as ArrayType;
-			return arrayType != null && ContainsAnonymousType (arrayType.ElementType);
-		}
-
-		static VariableDeclarationStatement GetVariableDeclarationStatement (RefactoringContext context)
-		{
-			var result = context.GetNode<VariableDeclarationStatement> ();
-			if (result != null && result.Variables.Count == 1 && !result.Variables.First ().Initializer.IsNull && result.Type.Contains (context.Location.Line, context.Location.Column) && result.Type.IsVar ()) {
-				if (context.Resolve (result.Variables.First ().Initializer) == null)
-					return null;
-				return result;
-			}
-			return null;
-		}
-		
-		static ForeachStatement GetForeachStatement (RefactoringContext context)
-		{
-			var result = context.GetNode<ForeachStatement> ();
-			if (result != null && result.VariableType.Contains (context.Location) && result.VariableType.IsVar ())
-				return result;
-			return null;
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseStringFormatAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseStringFormatAction.cs
deleted file mode 100644
index e65b4cdb5f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseStringFormatAction.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// 
-// UseStringFormatAction.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.PatternMatching;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction ("Use string.Format()",
-					Description = "Convert concatenation of strings and objects to string.Format()")]
-	public class UseStringFormatAction : ICodeActionProvider
-	{
-
-		public IEnumerable<CodeAction> GetActions (RefactoringContext context)
-		{
-			// NOTE: @, multiple occurance
-
-			var node = context.GetNode ();
-			while (node != null && !IsStringConcatenation(context, node as BinaryOperatorExpression))
-				node = node.Parent;
-
-			if (node == null)
-				yield break;
-
-			var expr = (BinaryOperatorExpression)node;
-			var parent = expr.Parent as BinaryOperatorExpression;
-			while (parent != null && parent.Operator == BinaryOperatorType.Add) {
-				expr = parent;
-				parent = expr.Parent as BinaryOperatorExpression;
-			}
-
-			yield return new CodeAction (context.TranslateString ("Use string.Format()"),
-				script =>
-				{
-					var format = new StringBuilder ();
-					var stringType = new PrimitiveType ("string");
-					var formatInvocation = new InvocationExpression (
-						new MemberReferenceExpression (new TypeReferenceExpression (stringType), "Format"));
-					var formatLiteral = new PrimitiveExpression ("");
-					var counter = 0;
-					var verbatim = false;
-					var arguments = new List<Expression> ();
-
-					format.Append ('"');
-					formatInvocation.Arguments.Add (formatLiteral);
-					foreach (var item in GetConcatItems (context, expr)) {
-						if (IsStringLiteral (item)) {
-							var stringLiteral = (PrimitiveExpression)item;
-
-							if (stringLiteral.LiteralValue [0] == '@') {
-								verbatim = true;
-								format.Append (stringLiteral.LiteralValue, 2, stringLiteral.LiteralValue.Length - 3);
-							} else {
-								format.Append (stringLiteral.LiteralValue, 1, stringLiteral.LiteralValue.Length - 2);
-							}
-						} else {
-							var index = IndexOf (arguments, item);
-							if (index == -1) {
-								// new item
-								formatInvocation.Arguments.Add (item.Clone ());
-								arguments.Add (item);
-								format.Append ("{" + counter++ + "}");
-							} else {
-								// existing item
-								format.Append ("{" + index + "}");
-							}
-						}
-					}
-					format.Append ('"');
-					if (verbatim)
-						format.Insert (0, '@');
-					formatLiteral.LiteralValue = format.ToString ();
-					script.Replace (expr, formatInvocation);
-				}, node);
-		}
-
-		static int IndexOf	(IList<Expression> arguments, Expression item)
-		{
-			for (int i = 0; i < arguments.Count; i++) {
-				if (item.Match (arguments [i]).Success)
-					return i;
-			}
-			return -1;
-		}
-
-		static IEnumerable<Expression> GetConcatItems (RefactoringContext context, BinaryOperatorExpression expr)
-		{
-			var leftExpr = expr.Left as BinaryOperatorExpression;
-			if (IsStringConcatenation(context, leftExpr)) {
-				foreach (var item in GetConcatItems (context, leftExpr))
-					yield return item;
-			} else {
-				yield return expr.Left;
-			}
-
-			var rightExpr = expr.Right as BinaryOperatorExpression;
-			if (IsStringConcatenation(context, rightExpr)) {
-				foreach (var item in GetConcatItems (context, rightExpr))
-					yield return item;
-			} else {
-				yield return expr.Right;
-			}
-		}
-
-		static bool IsStringConcatenation (RefactoringContext context, BinaryOperatorExpression expr)
-		{
-			if (expr == null || expr.Operator != BinaryOperatorType.Add)
-				return false;
-			var typeDef = context.Resolve (expr).Type.GetDefinition();
-			return typeDef != null && typeDef.KnownTypeCode == KnownTypeCode.String;
-		}
-
-		static bool IsStringLiteral (AstNode node)
-		{
-			var expr = node as PrimitiveExpression;
-			return expr != null && expr.Value is string;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseVarKeywordAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseVarKeywordAction.cs
deleted file mode 100644
index b47c312f64..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseVarKeywordAction.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-// 
-// UseVarKeyword.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using ICSharpCode.NRefactory.PatternMatching;
-using System.Threading;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Use 'var' keyword",
-	               Description = "Converts local variable declaration to be implicit typed.",
-	               BoundToIssue = typeof (ICSharpCode.NRefactory.CSharp.Refactoring.UseVarKeywordIssue))]
-	public class UseVarKeywordAction : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var varDecl = GetVariableDeclarationStatement(context);
-			var foreachStmt = GetForeachStatement(context);
-			if (varDecl == null && foreachStmt == null) {
-				yield break;
-			}
-			yield return new CodeAction(context.TranslateString("Use 'var' keyword"), script => {
-				if (varDecl != null) {
-					script.Replace(varDecl.Type, new SimpleType ("var"));
-				} else {
-					script.Replace(foreachStmt.VariableType, new SimpleType ("var"));
-				}
-			}, (AstNode)varDecl ?? foreachStmt);
-		}
-		
-		static VariableDeclarationStatement GetVariableDeclarationStatement (RefactoringContext context)
-		{
-			var result = context.GetNode<VariableDeclarationStatement> ();
-			if (result != null && result.Variables.Count == 1 && !result.Variables.First ().Initializer.IsNull && result.Type.Contains (context.Location) && !result.Type.IsVar ())
-				return result;
-			return null;
-		}
-		
-		static ForeachStatement GetForeachStatement (RefactoringContext context)
-		{
-			var result = context.GetNode<ForeachStatement> ();
-			if (result != null && result.VariableType.Contains (context.Location) && !result.VariableType.IsVar ())
-				return result;
-			return null;
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeGenerationService.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeGenerationService.cs
new file mode 100644
index 0000000000..81b0b39f43
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeGenerationService.cs
@@ -0,0 +1,64 @@
+//
+// CodeGenerationService.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	public abstract class CodeGenerationService
+	{
+		public abstract EntityDeclaration GenerateMemberImplementation(RefactoringContext context, IMember member, bool explicitImplementation);
+	}
+
+	public class DefaultCodeGenerationService : CodeGenerationService
+	{
+		public override EntityDeclaration GenerateMemberImplementation(RefactoringContext context, IMember member, bool explicitImplementation)
+		{
+			var builder = context.CreateTypeSystemAstBuilder();
+			builder.GenerateBody = true;
+			builder.ShowModifiers = false;
+			builder.ShowAccessibility = true;
+			builder.ShowConstantValues = !explicitImplementation;
+			builder.ShowTypeParameterConstraints = !explicitImplementation;
+			builder.UseCustomEvents = explicitImplementation;
+			var decl = builder.ConvertEntity(member);
+			if (explicitImplementation) {
+				decl.Modifiers = Modifiers.None;
+				decl.AddChild(builder.ConvertType(member.DeclaringType), EntityDeclaration.PrivateImplementationTypeRole);
+			} else if (member.DeclaringType.Kind == TypeKind.Interface) {
+				decl.Modifiers |= Modifiers.Public;
+			} else {
+				// Remove 'internal' modifier from 'protected internal' members if the override is in a different assembly than the member
+				if (!member.ParentAssembly.InternalsVisibleTo(context.Compilation.MainAssembly)) {
+					decl.Modifiers &= ~Modifiers.Internal;
+				}
+			}
+			return decl;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssue.cs
index 9394887a25..18b645de84 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssue.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssue.cs
@@ -26,6 +26,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using ICSharpCode.NRefactory.Refactoring;
 
 namespace ICSharpCode.NRefactory.CSharp.Refactoring
 {
@@ -66,50 +67,115 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			private set;
 		}
 
+		List<Type> actionProvider = new List<Type>();
+		public List<Type> ActionProvider {
+			get {
+				return actionProvider;
+			}
+			set {
+				actionProvider = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the Issue marker which should be used to mark this issue in the editor.
+		/// It's up to the editor implementation if and how this info is used.
+		/// </summary>
+		public IssueMarker IssueMarker {
+			get;
+			set;
+		}
+
 		/// <summary>
 		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue"/> class.
 		/// </summary>
-		/// <param name='description'>
-		/// The desription of the issue.
-		/// </param>
-		/// <param name='start'>
-		/// The issue start location.
-		/// </param>
-		/// <param name='end'>
-		/// the issue end location.
-		/// </param>
-		/// <param name='actions'>
-		/// A list of potential solutions for the issue.
-		/// </param>
-		public CodeIssue(string description, TextLocation start, TextLocation end, IEnumerable<CodeAction> actions = null)
+		public CodeIssue(TextLocation start, TextLocation end, string issueDescription)
 		{
-			Description = description;
+			if (issueDescription == null)
+				throw new ArgumentNullException("issueDescription");
+			Description = issueDescription;
 			Start = start;
 			End = end;
+			Actions = EmptyList<CodeAction>.Instance;
+			IssueMarker = IssueMarker.WavedLine;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue"/> class.
+		/// </summary>
+		public CodeIssue(TextLocation start, TextLocation end, string issueDescription, IEnumerable<CodeAction> actions) : this(start, end, issueDescription)
+		{
 			if (actions != null)
 				Actions = actions.ToArray();
-			else
-				Actions = EmptyList<CodeAction>.Instance;
 		}
-		
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue"/> class.
+		/// </summary>
+		public CodeIssue(TextLocation start, TextLocation end, string issueDescription, params CodeAction[] actions) : this(start, end, issueDescription)
+		{
+			if (actions != null)
+				Actions = actions;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue"/> class.
+		/// </summary>
+		public CodeIssue(TextLocation start, TextLocation end, string issueDescription, string actionDescription, Action<Script> fix) : this(start, end, issueDescription)
+		{
+			if (actionDescription == null)
+				throw new ArgumentNullException("actionDescription");
+			if (fix == null)
+				throw new ArgumentNullException("fix");
+			this.Actions = new [] { new CodeAction(actionDescription, fix, start, end) };
+		}
+
 		/// <summary>
 		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue"/> class.
 		/// </summary>
-		/// <param name='description'>
-		/// The desription of the issue.
-		/// </param>
-		/// <param name='start'>
-		/// The issue start location.
-		/// </param>
-		/// <param name='end'>
-		/// the issue end location.
-		/// </param>
-		/// <param name='action'>
-		/// A potential solution for the issue.
-		/// </param>
-		public CodeIssue(string description, TextLocation start, TextLocation end, CodeAction action) : this (description, start, end, action != null ? new [] { action } : null)
+		public CodeIssue(AstNode node, string issueDescription)
 		{
+			if (node == null)
+				throw new ArgumentNullException("node");
+			if (issueDescription == null)
+				throw new ArgumentNullException("issueDescription");
+			Description = issueDescription;
+			Start = node.StartLocation;
+			End = node.EndLocation;
+			Actions = EmptyList<CodeAction>.Instance;
+			IssueMarker = IssueMarker.WavedLine;
 		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue"/> class.
+		/// </summary>
+		public CodeIssue(AstNode node, string issueDescription, IEnumerable<CodeAction> actions) : this(node, issueDescription)
+		{
+			if (actions != null)
+				Actions = actions.ToArray();
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue"/> class.
+		/// </summary>
+		public CodeIssue(AstNode node, string issueDescription, params CodeAction[] actions) : this(node, issueDescription)
+		{
+			if (actions != null)
+				Actions = actions;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue"/> class.
+		/// </summary>
+		public CodeIssue(AstNode node, string issueDescription, string actionDescription, Action<Script> fix) : this(node, issueDescription)
+		{
+			if (actionDescription == null)
+				throw new ArgumentNullException("actionDescription");
+			if (fix == null)
+				throw new ArgumentNullException("fix");
+			this.Actions = new [] { new CodeAction(actionDescription, fix, node) };
+		}
+
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssueProvider.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssueProvider.cs
new file mode 100644
index 0000000000..4ca43d53dc
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssueProvider.cs
@@ -0,0 +1,76 @@
+// 
+// IInspector.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	/// <summary>
+	/// The code issue provider gets a list of all code issues in a syntax tree.
+	/// </summary>
+	public abstract class CodeIssueProvider
+	{
+		SubIssueAttribute[] subIssueAttributes;
+
+		public bool HasSubIssues {
+			get {
+				Initialize ();
+				return subIssueAttributes.Length > 0;
+			}
+		}
+
+		public IEnumerable<SubIssueAttribute> SubIssues {
+			get {
+				Initialize ();
+				return subIssueAttributes;
+			}
+		}
+
+		static readonly SubIssueAttribute[] emptyAttributes = new SubIssueAttribute[0];
+		void Initialize()
+		{
+			if (subIssueAttributes != null)
+				return;
+			subIssueAttributes = GetType().GetCustomAttributes(typeof(SubIssueAttribute), false).OfType<SubIssueAttribute>().ToArray() ?? emptyAttributes;
+		}
+
+		/// <summary>
+		/// Gets all code issues inside a syntax tree.
+		/// </summary>
+		/// <param name='context'>
+		/// The refactoring context of the issues to get.
+		/// </param>
+		/// <param name='subIssue'>
+		/// The name of the sub issue to run.
+		/// </param>
+		public virtual IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context, string subIssue = null)
+		{
+			return GetIssues(context);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AccessToClosureIssues/AccessToClosureIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AccessToClosureIssues/AccessToClosureIssue.cs
deleted file mode 100644
index 4bdcccb68c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AccessToClosureIssues/AccessToClosureIssue.cs
+++ /dev/null
@@ -1,319 +0,0 @@
-// 
-// AccessToClosureIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Analysis;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	public abstract class AccessToClosureIssue : ICodeIssueProvider
-	{
-		ControlFlowGraphBuilder cfgBuilder = new ControlFlowGraphBuilder ();
-
-		public string Title
-		{ get; private set; }
-
-		protected AccessToClosureIssue (string title)
-		{
-			Title = title;
-		}
-
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			var unit = context.RootNode as SyntaxTree;
-			if (unit == null)
-				return Enumerable.Empty<CodeIssue> ();
-			return new GatherVisitor (context, unit, this).GetIssues ();
-		}
-
-		protected virtual bool IsTargetVariable (IVariable variable)
-		{
-			return true;
-		}
-
-		protected abstract NodeKind GetNodeKind (AstNode node);
-
-		protected virtual bool CanReachModification (ControlFlowNode node, Statement start,
-												     IDictionary<Statement, IList<Node>> modifications)
-		{
-			return node.NextStatement != null && node.NextStatement != start &&
-				   modifications.ContainsKey (node.NextStatement);
-		}
-
-		protected abstract IEnumerable<CodeAction> GetFixes (BaseRefactoringContext context, Node env, 
-															 string variableName);
-
-		#region GatherVisitor
-
-		class GatherVisitor : GatherVisitorBase<AccessToClosureIssue>
-		{
-			string title;
-
-			public GatherVisitor (BaseRefactoringContext context, SyntaxTree unit,
-								  AccessToClosureIssue issueProvider)
-				: base (context, issueProvider)
-			{
-				this.title = context.TranslateString (issueProvider.Title);
-			}
-
-			public override void VisitVariableInitializer (VariableInitializer variableInitializer)
-			{
-				var variableDecl = variableInitializer.Parent as VariableDeclarationStatement;
-				if (variableDecl != null)
-					CheckVariable (((LocalResolveResult)ctx.Resolve (variableInitializer)).Variable, 
-								   variableDecl.GetParent<Statement> ());
-				base.VisitVariableInitializer (variableInitializer);
-			}
-
-			public override void VisitForeachStatement (ForeachStatement foreachStatement)
-			{
-				CheckVariable (((LocalResolveResult)ctx.Resolve (foreachStatement.VariableNameToken)).Variable,
-							   foreachStatement);
-				base.VisitForeachStatement (foreachStatement);
-			}
-
-			public override void VisitParameterDeclaration (ParameterDeclaration parameterDeclaration)
-			{
-				var parent = parameterDeclaration.Parent;
-				Statement body = null;
-				if (parent is MethodDeclaration) {
-					body = ((MethodDeclaration)parent).Body;
-				} else if (parent is AnonymousMethodExpression) {
-					body = ((AnonymousMethodExpression)parent).Body;
-				} else if (parent is LambdaExpression) {
-					body = ((LambdaExpression)parent).Body as Statement;
-				} else if (parent is ConstructorDeclaration) {
-					body = ((ConstructorDeclaration)parent).Body;
-				} else if (parent is OperatorDeclaration) {
-					body = ((OperatorDeclaration)parent).Body;
-				}
-				if (body != null) {
-					var lrr = ctx.Resolve (parameterDeclaration) as LocalResolveResult;
-					if (lrr != null)
-						CheckVariable (lrr.Variable, body);
-				}
-				base.VisitParameterDeclaration (parameterDeclaration);
-			}
-
-			void CheckVariable(IVariable variable, Statement env)
-			{
-				if (!IssueProvider.IsTargetVariable(variable))
-					return;
-
-				var root = new Environment (env, env);
-				var envLookup = new Dictionary<AstNode, Environment> ();
-				envLookup [env] = root;
-
-				foreach (var result in ctx.FindReferences(env, variable)) {
-					AddNode(envLookup, new Node(result.Node, IssueProvider.GetNodeKind(result.Node)));
-				}
-
-				root.SortChildren ();
-				CollectIssues (root, variable.Name);
-			}
-
-			void CollectIssues (Environment env, string variableName)
-			{
-				IList<ControlFlowNode> cfg = null;
-				IDictionary<Statement, IList<Node>> modifications = null;
-
-				if (env.Body != null) {
-					cfg = IssueProvider.cfgBuilder.BuildControlFlowGraph (env.Body);
-					modifications = new Dictionary<Statement, IList<Node>> ();
-					foreach (var node in env.Children) {
-						if (node.Kind == NodeKind.Modification || node.Kind == NodeKind.ReferenceAndModification) {
-							IList<Node> nodes;
-							if (!modifications.TryGetValue (node.ContainingStatement, out nodes))
-								modifications [node.ContainingStatement] = nodes = new List<Node> ();
-							nodes.Add (node);
-						}
-					}
-				}
-
-				foreach (var child in env.GetChildEnvironments ()) {
-					if (!child.IssueCollected && cfg != null && 
-						CanReachModification (cfg, child, modifications))
-						CollectAllIssues (child, variableName);
-
-					CollectIssues (child, variableName);
-				}
-			}
-
-			void CollectAllIssues (Environment env, string variableName)
-			{
-				var fixes = IssueProvider.GetFixes (ctx, env, variableName).ToArray ();
-				env.IssueCollected = true;
-
-				foreach (var child in env.Children) {
-					if (child is Environment) {
-						CollectAllIssues ((Environment)child, variableName);
-					} else {
-						if (child.Kind != NodeKind.Modification)
-							AddIssue (child.AstNode, title, fixes);
-						// stop marking references after the variable is modified in current environment
-						if (child.Kind != NodeKind.Reference)
-							break;
-					}
-				}
-			}
-
-			void AddNode (IDictionary<AstNode, Environment> envLookup, Node node)
-			{
-				var astParent = node.AstNode.Parent;
-				var path = new List<AstNode> ();
-				while (astParent != null) {
-					Environment parent;
-					if (envLookup.TryGetValue (astParent, out parent)) {
-						parent.Children.Add (node);
-						return;
-					}
-
-					if (astParent is LambdaExpression) {
-						parent = new Environment (astParent, ((LambdaExpression)astParent).Body as Statement);
-					} else if (astParent is AnonymousMethodExpression) {
-						parent = new Environment (astParent, ((AnonymousMethodExpression)astParent).Body);
-					}
-
-					path.Add (astParent);
-					if (parent != null) {
-						foreach (var astNode in path)
-							envLookup [astNode] = parent;
-						path.Clear ();
-
-						parent.Children.Add (node);
-						node = parent;
-					}
-					astParent = astParent.Parent;
-				}
-			}
-
-			bool CanReachModification (IEnumerable<ControlFlowNode> cfg, Environment env,
-									   IDictionary<Statement, IList<Node>> modifications)
-			{
-				if (modifications.Count == 0)
-					return false;
-
-				var start = env.ContainingStatement;
-				if (modifications.ContainsKey (start) &&
-					modifications [start].Any (v => v.AstNode.StartLocation > env.AstNode.EndLocation))
-					return true;
-
-				var stack = new Stack<ControlFlowNode> (cfg.Where (node => node.NextStatement == start));
-				var visitedNodes = new HashSet<ControlFlowNode> (stack);
-				while (stack.Count > 0) {
-					var node = stack.Pop ();
-					if (IssueProvider.CanReachModification (node, start, modifications))
-						return true;
-					foreach (var edge in node.Outgoing) {
-						if (visitedNodes.Add (edge.To))
-							stack.Push (edge.To);
-					}
-				}
-				return false;
-			}
-
-		}
-
-		#endregion
-
-		#region Node
-
-		protected enum NodeKind
-		{
-			Reference,
-			Modification,
-			ReferenceAndModification,
-			Environment,
-		}
-
-		protected class Node
-		{
-			public AstNode AstNode
-			{ get; private set; }
-
-			public NodeKind Kind
-			{ get; private set; }
-
-			public Statement ContainingStatement
-			{ get; private set; }
-
-			public Node (AstNode astNode, NodeKind kind)
-			{
-				AstNode = astNode;
-				Kind = kind;
-				ContainingStatement = astNode.GetParent<Statement> ();
-			}
-
-			public virtual IEnumerable<Node> GetAllReferences ()
-			{
-				yield return this;
-			}
-		}
-
-		protected class Environment : Node
-		{
-			public Statement Body
-			{ get; private set; }
-
-			public bool IssueCollected
-			{ get; set; }
-
-			public List<Node> Children
-			{ get; private set; }
-
-			public Environment (AstNode astNode, Statement body)
-				: base (astNode, NodeKind.Environment)
-			{
-				Body = body;
-				Children = new List<Node> ();
-			}
-
-			public override IEnumerable<Node> GetAllReferences ()
-			{
-				return Children.SelectMany (child => child.GetAllReferences ());
-			}
-
-			public IEnumerable<Environment> GetChildEnvironments ()
-			{
-				return from child in Children
-					   where child is Environment
-					   select (Environment)child;
-			}
-
-			public void SortChildren ()
-			{
-				Children.Sort ((x, y) => x.AstNode.StartLocation.CompareTo(y.AstNode.StartLocation));
-				foreach (var env in GetChildEnvironments ())
-					env.SortChildren ();
-			}
-		}
-
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AccessToClosureIssues/AccessToDisposedClosureIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AccessToClosureIssues/AccessToDisposedClosureIssue.cs
deleted file mode 100644
index 251b896a51..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AccessToClosureIssues/AccessToDisposedClosureIssue.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// 
-// AccessToDisposedClosureIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Analysis;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-
-    //[IssueDescription ("Access to disposed closure variable",
-    //                   Description = "Access to closure variable from anonymous method when the variable is" + 
-    //                                 " disposed externally",
-    //                   Category = IssueCategories.CodeQualityIssues,
-    //                   Severity = Severity.Warning,
-    //                   IssueMarker = IssueMarker.Underline,
-    //                   ResharperDisableKeyword = "AccessToDisposedClosure")]
-	public class AccessToDisposedClosureIssue : AccessToClosureIssue
-	{
-		public AccessToDisposedClosureIssue ()
-			: base ("Access to disposed closure")
-		{
-		}
-
-		protected override bool IsTargetVariable (IVariable variable)
-		{
-			return variable.Type.GetAllBaseTypeDefinitions ().Any (t => t.KnownTypeCode == KnownTypeCode.IDisposable);
-		}
-
-		protected override NodeKind GetNodeKind (AstNode node)
-		{
-			if (node.Parent is UsingStatement)
-				return NodeKind.ReferenceAndModification;
-
-			if (node.Parent is VariableDeclarationStatement && node.Parent.Parent is UsingStatement)
-				return NodeKind.Modification;
-
-			var memberRef = node.Parent as MemberReferenceExpression;
-			if (memberRef != null && memberRef.Parent is InvocationExpression && memberRef.MemberName == "Dispose")
-				return NodeKind.ReferenceAndModification;
-
-			return NodeKind.Reference;
-		}
-
-		protected override bool CanReachModification (ControlFlowNode node, Statement start,
-												   IDictionary<Statement, IList<Node>> modifications)
-		{
-			if (base.CanReachModification (node, start, modifications))
-				return true;
-
-			if (node.NextStatement != start) {
-				var usingStatement = node.PreviousStatement as UsingStatement;
-				if (usingStatement != null) {
-					if (modifications.ContainsKey(usingStatement))
-						return true;
-					if (usingStatement.ResourceAcquisition is Statement &&
-						modifications.ContainsKey ((Statement)usingStatement.ResourceAcquisition))
-						return true;
-				}
-			}
-			return false;
-		}
-
-		protected override IEnumerable<CodeAction> GetFixes (BaseRefactoringContext context, Node env,
-															 string variableName)
-		{
-			yield break;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AccessToClosureIssues/AccessToModifiedClosureIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AccessToClosureIssues/AccessToModifiedClosureIssue.cs
deleted file mode 100644
index a35e72f688..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AccessToClosureIssues/AccessToModifiedClosureIssue.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-// 
-// AccessToModifiedClosureIssue.cs
-//  
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-    //[IssueDescription("Access to modified closure variable",
-    //                   Description = "Access to closure variable from anonymous method when the variable is modified " +
-    //                                 "externally",
-    //                   Category = IssueCategories.CodeQualityIssues,
-    //                   Severity = Severity.Warning,
-    //                   IssueMarker = IssueMarker.Underline,
-    //                   ResharperDisableKeyword = "AccessToModifiedClosure")]	
-	public class AccessToModifiedClosureIssue : AccessToClosureIssue
-	{
-		public AccessToModifiedClosureIssue ()
-			: base ("Access to modified closure")
-		{
-		}
-
-		protected override NodeKind GetNodeKind (AstNode node)
-		{
-			var assignment = node.GetParent<AssignmentExpression> ();
-			if (assignment != null && assignment.Left == node) {
-				if (assignment.Operator == AssignmentOperatorType.Assign) 
-					return NodeKind.Modification;
-				return NodeKind.ReferenceAndModification;
-			}
-			var unaryExpr = node.GetParent<UnaryOperatorExpression> ();
-			if (unaryExpr != null && unaryExpr.Expression == node &&
-				(unaryExpr.Operator == UnaryOperatorType.Increment ||
-				 unaryExpr.Operator == UnaryOperatorType.PostIncrement ||
-				 unaryExpr.Operator == UnaryOperatorType.Decrement ||
-				 unaryExpr.Operator == UnaryOperatorType.PostDecrement)) {
-				return NodeKind.ReferenceAndModification;
-			}
-			if (node.Parent is ForeachStatement)
-				return NodeKind.Modification;
-
-			return NodeKind.Reference;
-		}
-
-		protected override IEnumerable<CodeAction> GetFixes (BaseRefactoringContext context, Node env,
-															 string variableName)
-		{
-			var containingStatement = env.ContainingStatement;
-
-			// we don't give a fix for these cases since the general fix may not work
-			// lambda in while/do-while/for condition
-			if (containingStatement is WhileStatement || containingStatement is DoWhileStatement ||
-				containingStatement is ForStatement)
-				yield break;
-			// lambda in for initializer/iterator
-			if (containingStatement.Parent is ForStatement &&
-				((ForStatement)containingStatement.Parent).EmbeddedStatement != containingStatement)
-				yield break;
-
-			Action<Script> action = script =>
-			{
-				var newName = LocalVariableNamePicker.PickSafeName (
-					containingStatement.GetParent<EntityDeclaration> (),
-					Enumerable.Range (1, 100).Select (i => variableName + i));
-
-				var variableDecl = new VariableDeclarationStatement (new SimpleType("var"), newName, 
-																	 new IdentifierExpression (variableName));
-				
-				if (containingStatement.Parent is BlockStatement || containingStatement.Parent is SwitchSection) {
-					script.InsertBefore (containingStatement, variableDecl);
-				} else {
-					var offset = script.GetCurrentOffset (containingStatement.StartLocation);
-					script.InsertBefore (containingStatement, variableDecl);
-					script.InsertText (offset, "{");
-					script.InsertText (script.GetCurrentOffset (containingStatement.EndLocation), "}");
-					script.FormatText (containingStatement.Parent);
-				}
-
-				var textNodes = new List<AstNode> ();
-				textNodes.Add (variableDecl.Variables.First ().NameToken);
-
-				foreach (var reference in env.GetAllReferences ()) {
-					var identifier = new IdentifierExpression (newName);
-					script.Replace (reference.AstNode, identifier);
-					textNodes.Add (identifier);
-				}
-				script.Link (textNodes.ToArray ());
-			};
-			yield return new CodeAction (context.TranslateString ("Copy to local variable"), action, env.AstNode);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AssignmentMadeToSameVariableIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AssignmentMadeToSameVariableIssue.cs
deleted file mode 100644
index 552b836b98..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/AssignmentMadeToSameVariableIssue.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// 
-// AssignmentMadeToSameVariableIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.Refactoring;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("CS1717:Assignment made to same variable",
-					   Description = "CS1717:Assignment made to same variable.",
-					   Category = IssueCategories.CompilerWarnings,
-					   Severity = Severity.Warning,
-					   IssueMarker = IssueMarker.GrayOut)]
-	public class AssignmentMadeToSameVariableIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<AssignmentMadeToSameVariableIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitAssignmentExpression (AssignmentExpression assignmentExpression)
-			{
-				base.VisitAssignmentExpression (assignmentExpression);
-
-				if (assignmentExpression.Operator != AssignmentOperatorType.Assign)
-					return;
-				if (!(assignmentExpression.Left is IdentifierExpression) && 
-					!(assignmentExpression.Left is MemberReferenceExpression))
-					return;
-
-				var resolveResult = ctx.Resolve (assignmentExpression.Left);
-				var memberResolveResult = resolveResult as MemberResolveResult;
-				if (memberResolveResult != null) {
-					var memberResolveResult2 = ctx.Resolve (assignmentExpression.Right) as MemberResolveResult;
-					if (memberResolveResult2 == null || !AreEquivalent(memberResolveResult, memberResolveResult2))
-						return;
-				} else if (resolveResult is LocalResolveResult) {
-					if (!assignmentExpression.Left.Match (assignmentExpression.Right).Success)
-						return;
-				} else {
-					return;
-				}
-
-				AstNode node;
-				Action<Script> action;
-				if (assignmentExpression.Parent is ExpressionStatement) {
-					node = assignmentExpression.Parent;
-					action = script => script.Remove (assignmentExpression.Parent);
-				} else {
-					node = assignmentExpression;
-					action = script => script.Replace (assignmentExpression, assignmentExpression.Left.Clone ());
-				}
-				AddIssue (node, ctx.TranslateString ("CS1717:Assignment made to same variable"),
-					new [] { new CodeAction (ctx.TranslateString ("Remove assignment"), action, node) });
-			}
-
-			static bool AreEquivalent(ResolveResult first, ResolveResult second)
-			{
-				var firstPath = AccessPath.FromResolveResult(first);
-				var secondPath = AccessPath.FromResolveResult(second);
-				return firstPath != null && firstPath.Equals(secondPath) && !firstPath.MemberPath.Any(m => !(m is IField));
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/BitwiseOperationOnNonFlagsEnumIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/BitwiseOperationOnNonFlagsEnumIssue.cs
deleted file mode 100644
index aa587d6811..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/BitwiseOperationOnNonFlagsEnumIssue.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-// 
-// BitwiseOperationOnNonFlagsEnumIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Bitwise Operations on enum without [Flags] attribute",
-					   Description = "Bitwise Operations on enum not marked with [Flags] attribute",
-					   Category = IssueCategories.CodeQualityIssues,
-					   Severity = Severity.Warning,
-					   IssueMarker = IssueMarker.Underline,
-                       ResharperDisableKeyword = "BitwiseOperatorOnEnumWihtoutFlags")]
-	public class BitwiseOperationOnNonFlagsEnumIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<BitwiseOperationOnNonFlagsEnumIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base(ctx)
-			{
-			}
-			
-			static bool IsBitwiseOperator (UnaryOperatorType op)
-			{
-				return op == UnaryOperatorType.BitNot;
-			}
-
-			static bool IsBitwiseOperator (AssignmentOperatorType op)
-			{
-				return op == AssignmentOperatorType.BitwiseAnd || op == AssignmentOperatorType.BitwiseOr ||
-					op == AssignmentOperatorType.ExclusiveOr;
-			}
-
-			static bool IsBitwiseOperator (BinaryOperatorType op)
-			{
-				return op == BinaryOperatorType.BitwiseAnd || op == BinaryOperatorType.BitwiseOr || 
-					op == BinaryOperatorType.ExclusiveOr;
-			}
-
-			bool IsNonFlagsEnum (Expression expr)
-			{
-				var resolveResult = ctx.Resolve (expr);
-				if (resolveResult == null || resolveResult.Type.Kind != TypeKind.Enum)
-					return false;
-
-				// check [Flags]
-				var typeDef = resolveResult.Type.GetDefinition ();
-				return typeDef != null &&
-					typeDef.Attributes.All (attr => attr.AttributeType.FullName != "System.FlagsAttribute");
-			}
-
-			private void AddIssue (CSharpTokenNode operatorToken)
-			{
-				AddIssue (operatorToken, 
-					ctx.TranslateString ("Bitwise Operations on enum not marked with Flags attribute"));
-			}
-
-			public override void VisitUnaryOperatorExpression (UnaryOperatorExpression unaryOperatorExpression)
-			{
-				base.VisitUnaryOperatorExpression (unaryOperatorExpression);
-
-				if (!IsBitwiseOperator (unaryOperatorExpression.Operator))
-					return;
-				if (IsNonFlagsEnum (unaryOperatorExpression.Expression))
-					AddIssue (unaryOperatorExpression.OperatorToken);
-			}
-
-			public override void VisitAssignmentExpression (AssignmentExpression assignmentExpression)
-			{
-				base.VisitAssignmentExpression (assignmentExpression);
-
-				if (!IsBitwiseOperator (assignmentExpression.Operator))
-					return;
-				if (IsNonFlagsEnum (assignmentExpression.Right))
-					AddIssue (assignmentExpression.OperatorToken);
-			}
-
-			public override void VisitBinaryOperatorExpression (BinaryOperatorExpression binaryOperatorExpression)
-			{
-				base.VisitBinaryOperatorExpression (binaryOperatorExpression);
-
-				if (!IsBitwiseOperator (binaryOperatorExpression.Operator))
-					return;
-				if (IsNonFlagsEnum (binaryOperatorExpression.Left) || IsNonFlagsEnum (binaryOperatorExpression.Right))
-					AddIssue (binaryOperatorExpression.OperatorToken);
-			}
-
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CallToObjectEqualsViaBaseIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CallToObjectEqualsViaBaseIssue.cs
deleted file mode 100644
index 6447e9a9d8..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CallToObjectEqualsViaBaseIssue.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// CallToObjectEqualsViaBaseIssue.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-using System.Linq;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Call to base.Equals resolves to Object.Equals, which is reference equality",
-	                  Description = "Finds potentially erroneous calls to Object.Equals.",
-	                  Category = IssueCategories.CodeQualityIssues,
-	                  Severity = Severity.Warning,
-                      ResharperDisableKeyword = "BaseObjectEqualsIsObjectEquals")]
-	public class CallToObjectEqualsViaBaseIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<CallToObjectEqualsViaBaseIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext context) : base (context)
-			{
-			}
-
-			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
-			{
-				base.VisitInvocationExpression(invocationExpression);
-
-				if (invocationExpression.Arguments.Count != 1) {
-					return;
-				}
-				var memberExpression = invocationExpression.Target as MemberReferenceExpression;
-				if (memberExpression == null || memberExpression.MemberName != "Equals" || !(memberExpression.Target is BaseReferenceExpression)) {
-					return;
-				}
-				var resolveResult = ctx.Resolve(invocationExpression) as InvocationResolveResult;
-				if (resolveResult == null || !resolveResult.Member.DeclaringTypeDefinition.IsKnownType(KnownTypeCode.Object)) {
-					return;
-				}
-				var title = ctx.TranslateString("Call to base.Equals resolves to Object.Equals, which is reference equality");
-				AddIssue(invocationExpression, title, GetActions(invocationExpression));
-			}
-
-			IEnumerable<CodeAction> GetActions(InvocationExpression invocationExpression)
-			{
-				yield return new CodeAction(ctx.TranslateString("Change invocation to call Object.ReferenceEquals"), script => {
-					var args = Enumerable.Concat(new [] { new ThisReferenceExpression() }, invocationExpression.Arguments.Select(arg => arg.Clone()));
-					var newInvocation = MakeInvocation("object.ReferenceEquals", args);
-					script.Replace(invocationExpression, newInvocation);
-				}, invocationExpression);
-				yield return new CodeAction(ctx.TranslateString("Remove 'base.'"), script => {
-					var newInvocation = MakeInvocation("Equals", invocationExpression.Arguments.Select(arg => arg.Clone()));
-					script.Replace(invocationExpression, newInvocation);
-				}, invocationExpression);
-			}
-
-			static InvocationExpression MakeInvocation(string memberName, IEnumerable<Expression> unClonedArguments)
-			{
-				return new InvocationExpression(new IdentifierExpression(memberName), unClonedArguments);
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CallToVirtualFunctionFromConstructorIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CallToVirtualFunctionFromConstructorIssue.cs
deleted file mode 100644
index 7decbce088..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CallToVirtualFunctionFromConstructorIssue.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-//
-// CallToVirtualFunctionFromConstructorIssue.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Constructors should not call virtual members",
-	                  Description = "Warns about calls to virtual member functions occuring in the constructor.",
-	                  Category = IssueCategories.CodeQualityIssues,
-	                  Severity = Severity.Warning,
-                      ResharperDisableKeyword = "DoNotCallOverridableMethodsInConstructor")]
-	public class CallToVirtualFunctionFromConstructorIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			var gv = new GatherVisitor(context);
-			context.RootNode.AcceptVisitor(gv);
-			return gv.CallFinder.FoundIssues;
-		}
-		
-		class GatherVisitor : GatherVisitorBase<CallToVirtualFunctionFromConstructorIssue>
-		{
-			internal readonly VirtualCallFinderVisitor CallFinder;
-
-			public GatherVisitor(BaseRefactoringContext context) : base (context)
-			{
-				CallFinder = new VirtualCallFinderVisitor(context);
-			}
-
-			bool isSealedType;
-
-			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
-			{
-				if (typeDeclaration.ClassType != ClassType.Class && typeDeclaration.ClassType != ClassType.Struct)
-					return;
-				bool oldIsSealedType = isSealedType;
-				isSealedType = typeDeclaration.Modifiers.HasFlag(Modifiers.Sealed);
-				base.VisitTypeDeclaration(typeDeclaration);
-				isSealedType = oldIsSealedType;
-			}
-
-			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
-			{
-				if (isSealedType)
-					return;
-				var body = constructorDeclaration.Body;
-				if (body == null || body.IsNull)
-					return;
-				body.AcceptVisitor(CallFinder);
-			}
-
-			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
-			{
-				// nothing
-			}
-
-			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
-			{
-				// nothing
-			}
-
-			public override void VisitIndexerExpression(IndexerExpression indexerExpression)
-			{
-				// nothing
-			}
-
-			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
-			{
-				// nothing
-			}
-
-			public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
-			{
-				// nothing
-			}
-
-			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
-			{
-				// nothing
-			}
-
-			public override void VisitFixedFieldDeclaration(FixedFieldDeclaration fixedFieldDeclaration)
-			{
-				// nothing
-			}
-		}
-
-		class VirtualCallFinderVisitor: GatherVisitorBase<CallToVirtualFunctionFromConstructorIssue>
-		{
-			readonly BaseRefactoringContext context;
-
-			public VirtualCallFinderVisitor(BaseRefactoringContext context) : base(context)
-			{
-				this.context = context;
-			}
-
-			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
-			{
-				base.VisitInvocationExpression(invocationExpression);
-				if (!IsCallDependentOnCurrentInstance(invocationExpression))
-					// Call within current class scope without 'this' or 'base'
-					return;
-				var targetMethod = context.Resolve(invocationExpression) as InvocationResolveResult;
-				if (targetMethod == null)
-					return;
-				if (targetMethod.IsVirtualCall) {
-					AddIssue(invocationExpression,
-					         context.TranslateString("Constructors should not call virtual members"));
-				}
-			}
-
-			bool IsCallDependentOnCurrentInstance(InvocationExpression invocationExpression)
-			{
-				if (invocationExpression.Target is IdentifierExpression)
-					// Call within current class scope without 'this' or 'base'
-					return true;
-				var expression = invocationExpression.Target as MemberReferenceExpression;
-				if (expression == null || expression.Target is ThisReferenceExpression)
-					// Call within current class scope using 'this' or 'base'
-					return true;
-				return false;
-			}
-			
-			public override void VisitLambdaExpression(LambdaExpression lambdaExpression)
-			{
-				// ignore lambdas
-			}
-			
-			public override void VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression)
-			{
-				// ignore anonymous methods
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CastExpressionOfIncompatibleTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CastExpressionOfIncompatibleTypeIssue.cs
deleted file mode 100644
index 3ba8cbc8c4..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CastExpressionOfIncompatibleTypeIssue.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// 
-// CastExpressionOfIncompatibleTypeIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Type cast expression of incompatible type",
-					   Description = "Type cast expression of incompatible type",
-					   Category = IssueCategories.CodeQualityIssues,
-					   Severity = Severity.Warning,
-					   IssueMarker = IssueMarker.Underline)]
-	public class CastExpressionOfIncompatibleTypeIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<CastExpressionOfIncompatibleTypeIssue>
-		{
-			readonly CSharpConversions conversion;
-
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-				conversion = new CSharpConversions(ctx.Compilation);
-			}
-
-			public override void VisitCastExpression (CastExpression castExpression)
-			{
-				base.VisitCastExpression (castExpression);
-
-				VisitTypeCastExpression (castExpression, ctx.Resolve (castExpression.Expression).Type,
-					ctx.ResolveType (castExpression.Type));
-			}
-
-			public override void VisitAsExpression (AsExpression asExpression)
-			{
-				base.VisitAsExpression (asExpression);
-
-				VisitTypeCastExpression (asExpression, ctx.Resolve (asExpression.Expression).Type,
-					ctx.ResolveType (asExpression.Type));
-			}
-
-			void VisitTypeCastExpression (Expression expression, IType exprType, IType castToType)
-			{
-				if (exprType.Kind == TypeKind.Unknown || castToType.Kind == TypeKind.Unknown)
-					return;
-				var foundConversion = conversion.ExplicitConversion(exprType, castToType);
-				if (foundConversion == Conversion.None)
-					AddIssue (expression, ctx.TranslateString ("Type cast expression of incompatible type"));
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompareBooleanWithTrueOrFalseIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompareBooleanWithTrueOrFalseIssue.cs
deleted file mode 100644
index a791069926..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompareBooleanWithTrueOrFalseIssue.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// 
-// CompareBooleanWithTrueOrFalseIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Comparison of boolean with 'true' or 'false'",
-					   Description = "Comparison of a boolean value with 'true' or 'false' constant.",
-					   Category = IssueCategories.Redundancies,
-					   Severity = Severity.Warning,
-					   IssueMarker = IssueMarker.Underline,
-                       ResharperDisableKeyword = "RedundantBoolCompare")]
-	public class CompareBooleanWithTrueOrFalseIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<CompareBooleanWithTrueOrFalseIssue>
-		{
-			static readonly Pattern pattern = new Choice {
-				PatternHelper.CommutativeOperator(
-					new NamedNode ("const", new Choice { new PrimitiveExpression(true), new PrimitiveExpression(false) }),
-					BinaryOperatorType.Equality, new AnyNode("expr")),
-				PatternHelper.CommutativeOperator(
-					new NamedNode ("const", new Choice { new PrimitiveExpression(true), new PrimitiveExpression(false) }),
-					BinaryOperatorType.InEquality, new AnyNode("expr")),
-			};
-
-			static InsertParenthesesVisitor insertParenthesesVisitor = new InsertParenthesesVisitor ();
-
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitBinaryOperatorExpression (BinaryOperatorExpression binaryOperatorExpression)
-			{
-				base.VisitBinaryOperatorExpression (binaryOperatorExpression);
-
-				var match = pattern.Match (binaryOperatorExpression);
-				if (!match.Success)
-					return;
-				var expr = match.Get<Expression> ("expr").First ();
-				// check if expr is of boolean type
-				var exprType = ctx.Resolve (expr).Type.GetDefinition ();
-				if (exprType == null || exprType.KnownTypeCode != KnownTypeCode.Boolean)
-					return;
-
-				AddIssue (binaryOperatorExpression, ctx.TranslateString ("Simplify boolean comparison"), scrpit => {
-					var boolConstant = (bool)match.Get<PrimitiveExpression> ("const").First ().Value;
-					if ((binaryOperatorExpression.Operator == BinaryOperatorType.InEquality && boolConstant) ||
-						(binaryOperatorExpression.Operator == BinaryOperatorType.Equality && !boolConstant)) {
-						expr = new UnaryOperatorExpression (UnaryOperatorType.Not, expr.Clone());
-						expr.AcceptVisitor (insertParenthesesVisitor);
-					}
-					scrpit.Replace (binaryOperatorExpression, expr);
-				});
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompareFloatWithEqualityOperatorIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompareFloatWithEqualityOperatorIssue.cs
deleted file mode 100644
index f05177b93a..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompareFloatWithEqualityOperatorIssue.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// 
-// CompareFloatWithEqualityOperatorIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Compare floating point numbers with equality operator",
-					   Description = "Comparison of floating point numbers with equality operator.",
-					   Category = IssueCategories.CodeQualityIssues,
-					   Severity = Severity.Warning,
-					   IssueMarker = IssueMarker.Underline,
-                       ResharperDisableKeyword = "CompareOfFloatsByEqualityOperator")]
-	public class CompareFloatWithEqualityOperatorIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<CompareFloatWithEqualityOperatorIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base(ctx)
-			{
-			}
-
-			static bool IsFloatingPointType (IType type)
-			{
-				var typeDef = type.GetDefinition ();
-				return typeDef != null &&
-					(typeDef.KnownTypeCode == KnownTypeCode.Single || typeDef.KnownTypeCode == KnownTypeCode.Double);
-			}
-
-			bool IsFloatingPoint(AstNode node)
-			{
-				return IsFloatingPointType (ctx.Resolve (node).Type);
-			}
-
-			bool IsConstantInfinity(AstNode node)
-			{
-				ResolveResult rr = ctx.Resolve(node);
-				if (!rr.IsCompileTimeConstant)
-					return false;
-				if (rr.ConstantValue is float)
-					return float.IsInfinity((float)rr.ConstantValue);
-				else if (rr.ConstantValue is double)
-					return double.IsInfinity((double)rr.ConstantValue);
-				else
-					return false;
-			}
-
-			bool IsNaN (AstNode node, out string floatType)
-			{
-				floatType = "";
-				var rr = ctx.Resolve (node);
-				if (!rr.IsCompileTimeConstant)
-					return false;
-
-				if (rr.ConstantValue is double && double.IsNaN ((double)rr.ConstantValue)) {
-					floatType = "double";
-					return true;
-				}
-				if (rr.ConstantValue is float && float.IsNaN ((float)rr.ConstantValue)) {
-					floatType = "float";
-					return true;
-				}
-				return false;
-			}
-
-			void AddIsNaNIssue(BinaryOperatorExpression binaryOperatorExpr, Expression argExpr, string floatType)
-			{
-				if (!ctx.Resolve(argExpr).Type.IsKnownType(KnownTypeCode.Single))
-					floatType = "double";
-				AddIssue(binaryOperatorExpr, string.Format(ctx.TranslateString ("Use {0}.IsNaN()"), floatType),
-					script => {
-						Expression expr = new PrimitiveType(floatType).Invoke("IsNaN", argExpr.Clone());
-						if (binaryOperatorExpr.Operator == BinaryOperatorType.InEquality)
-							expr = new UnaryOperatorExpression (UnaryOperatorType.Not, expr);
-						script.Replace (binaryOperatorExpr, expr);
-					});
-			}
-
-			public override void VisitBinaryOperatorExpression (BinaryOperatorExpression binaryOperatorExpression)
-			{
-				base.VisitBinaryOperatorExpression (binaryOperatorExpression);
-
-				if (binaryOperatorExpression.Operator != BinaryOperatorType.Equality &&
-					binaryOperatorExpression.Operator != BinaryOperatorType.InEquality)
-					return;
-
-				string floatType;
-				if (IsNaN(binaryOperatorExpression.Left, out floatType)) {
-					AddIsNaNIssue (binaryOperatorExpression, binaryOperatorExpression.Right, floatType);
-				} else if (IsNaN (binaryOperatorExpression.Right, out floatType)) {
-					AddIsNaNIssue (binaryOperatorExpression, binaryOperatorExpression.Left, floatType);
-				} else if (IsFloatingPoint(binaryOperatorExpression.Left) || IsFloatingPoint(binaryOperatorExpression.Right)) {
-					if (IsConstantInfinity(binaryOperatorExpression.Left) || IsConstantInfinity(binaryOperatorExpression.Right))
-						return;
-					AddIssue (binaryOperatorExpression, ctx.TranslateString ("Compare a difference with EPSILON"),
-						script => {
-							// Math.Abs(diff) op EPSILON
-							var builder = ctx.CreateTypeSystemAstBuilder(binaryOperatorExpression);
-							var diff = new BinaryOperatorExpression (binaryOperatorExpression.Left.Clone (),
-								BinaryOperatorType.Subtract, binaryOperatorExpression.Right.Clone ());
-							var abs = builder.ConvertType(new TopLevelTypeName("System", "Math")).Invoke("Abs", diff);
-							var op = binaryOperatorExpression.Operator == BinaryOperatorType.Equality ?
-								BinaryOperatorType.LessThan : BinaryOperatorType.GreaterThan;
-							var epsilon = new IdentifierExpression ("EPSILON");
-							var compare = new BinaryOperatorExpression (abs, op, epsilon);
-							script.Replace (binaryOperatorExpression, compare);
-							script.Link (epsilon);
-						});
-				}
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompilerErrors/CS0029InvalidConversionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompilerErrors/CS0029InvalidConversionIssue.cs
deleted file mode 100644
index 05fb40479f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompilerErrors/CS0029InvalidConversionIssue.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// 
-// CS0029InvalidConversionIssue.cs
-// 
-// Author:
-//      Daniel Grunwald <daniel.grunwald@gmail.com>
-// 
-// Copyright (c) 2013 Daniel Grunwald <daniel.grunwald@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("CS0029: Cannot implicitly convert type 'A' to 'B'.",
-	                  Description = "This error occurs when trying to assign a value of an incompatible type.",
-	                  Category = IssueCategories.CompilerErrors,
-	                  Severity = Severity.Error,
-	                  IssueMarker = IssueMarker.Underline)]
-	public class CS0029InvalidConversionIssue : ICodeIssueProvider
-	{
-		// This class handles both
-		// CS0029: Cannot implicitly convert type 'type' to 'type'
-		// and
-		// CS0266: Cannot implicitly convert type 'type1' to 'type2'. An explicit conversion exists (are you missing a cast?)
-		
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-
-		class GatherVisitor : GatherVisitorBase<CS0029InvalidConversionIssue>
-		{
-			readonly CSharpConversions conversion;
-
-			public GatherVisitor(BaseRefactoringContext ctx)
-				: base(ctx)
-			{
-				conversion = new CSharpConversions(ctx.Compilation);
-			}
-
-			// Currently, we only checks assignments
-			public override void VisitAssignmentExpression(AssignmentExpression assignmentExpression)
-			{
-				base.VisitAssignmentExpression(assignmentExpression);
-				if (assignmentExpression.Operator != AssignmentOperatorType.Assign)
-					return;
-				var variableType = ctx.Resolve(assignmentExpression.Left).Type;
-				VisitAssignment(variableType, assignmentExpression.Right);
-			}
-			
-			public override void VisitVariableInitializer(VariableInitializer variableInitializer)
-			{
-				base.VisitVariableInitializer(variableInitializer);
-				if (!variableInitializer.Initializer.IsNull) {
-					var variableType = ctx.Resolve(variableInitializer).Type;
-					VisitAssignment(variableType, variableInitializer.Initializer);
-				}
-			}
-			
-			void VisitAssignment(IType variableType, Expression expression)
-			{
-				if (variableType.Kind == TypeKind.Unknown)
-					return; // ignore error if the variable type is unknown
-				if (ctx.GetConversion(expression).IsValid)
-					return; // don't complain if the code is valid
-				
-				var rr = ctx.Resolve(expression);
-				if (rr.Type.Kind == TypeKind.Unknown)
-					return; // ignore error if expression type is unknown
-				
-				var foundConversion = conversion.ExplicitConversion(rr, variableType);
-				
-				var builder = ctx.CreateTypeSystemAstBuilder(expression);
-				AstType variableTypeNode = builder.ConvertType(variableType);
-				AstType expressionTypeNode = builder.ConvertType(rr.Type);
-				
-				if (foundConversion.IsValid) {
-					// CS0266: An explicit conversion exists -> suggested fix is to insert the cast
-					string title = string.Format(ctx.TranslateString("Cannot implicitly convert type `{0}' to `{1}'. An explicit conversion exists (are you missing a cast?)"),
-					                             expressionTypeNode, variableTypeNode);
-					string fixTitle = string.Format(ctx.TranslateString("Cast to '{0}'"), variableTypeNode);
-					Action<Script> fixAction = script => {
-						var right = expression.Clone();
-						var castRight = right.CastTo(variableTypeNode);
-						script.Replace(expression, castRight);
-					};
-					AddIssue(expression, title, new CodeAction(fixTitle, fixAction, expression));
-				} else {
-					// CS0029: No explicit conversion -> Issue without suggested fix
-					string title = string.Format(ctx.TranslateString("Cannot implicitly convert type `{0}' to `{1}'"),
-					                             expressionTypeNode, variableTypeNode);
-					AddIssue(expression, title);
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompilerErrors/CS0127ReturnMustNotBeFollowedByAnyExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompilerErrors/CS0127ReturnMustNotBeFollowedByAnyExpression.cs
deleted file mode 100644
index c90712157b..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CompilerErrors/CS0127ReturnMustNotBeFollowedByAnyExpression.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// CS0127ReturnMustNotBeFollowedByAnyExpression.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("CS0127: A method with a void return type cannot return a value.",
-	                  Description = "Since 'function' returns void, a return keyword must not be followed by an object expression",
-	                  Category = IssueCategories.CompilerErrors,
-	                  Severity = Severity.Error)]
-	public class CS0127ReturnMustNotBeFollowedByAnyExpression : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-
-		class GatherVisitor : GatherVisitorBase<CS0127ReturnMustNotBeFollowedByAnyExpression>
-		{
-			string currentMethodName;
-
-			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
-			{
-			}
-			
-			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
-			{
-				var primitiveType = methodDeclaration.ReturnType as PrimitiveType;
-				if (primitiveType == null || primitiveType.Keyword != "void")
-					return;
-				currentMethodName = methodDeclaration.Name;
-				base.VisitMethodDeclaration(methodDeclaration);
-			}
-
-			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
-			{
-				currentMethodName = constructorDeclaration.Name;
-				base.VisitConstructorDeclaration(constructorDeclaration);
-			}
-
-			public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
-			{
-				currentMethodName = "~" + destructorDeclaration.Name;
-				base.VisitDestructorDeclaration(destructorDeclaration);
-			}
-
-			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
-			{
-			}
-
-			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
-			{
-			}
-
-			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
-			{
-			}
-
-			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
-			{
-			}
-
-			public override void VisitLambdaExpression(LambdaExpression lambdaExpression)
-			{
-			}
-
-			public override void VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression)
-			{
-			}
-
-			public override void VisitReturnStatement(ReturnStatement returnStatement)
-			{
-				if (!returnStatement.Expression.IsNull) {
-					AddIssue(
-						returnStatement, 
-						string.Format (ctx.TranslateString("`{0}': A return keyword must not be followed by any expression when method returns void"), currentMethodName),
-						new CodeAction (
-							ctx.TranslateString("Remove returned expression"),
-							script => {
-								script.Remove(returnStatement.Expression); 
-							},
-							returnStatement
-						)
-					);
-				}
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConditionalToNullCoalescingIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConditionalToNullCoalescingIssue.cs
deleted file mode 100644
index ae26f10d96..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConditionalToNullCoalescingIssue.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// 
-// ConditionalToNullCoalescingInspector.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// Checks for "a != null ? a : other"<expr>
-	/// Converts to: "a ?? other"<expr>
-	/// </summary>
-	[IssueDescription("'?:' expression can be converted to '??' expression",
-	                  Description="'?:' expression can be converted to '??' expression.",
-	                  Category = IssueCategories.Opportunities,
-	                  Severity = Severity.Suggestion,
-                      ResharperDisableKeyword = "ConvertConditionalTernaryToNullCoalescing")]
-	public class ConditionalToNullCoalescingIssue : ICodeIssueProvider
-	{
-		static readonly Pattern pattern = new Choice {
-			// a != null ? a : other
-			new ConditionalExpression(
-				PatternHelper.CommutativeOperator(new AnyNode("a"), BinaryOperatorType.InEquality, new NullReferenceExpression()),
-				new Backreference("a"),
-				new AnyNode("other")
-			),
-			// a == null ? other : a
-			new ConditionalExpression(
-				PatternHelper.CommutativeOperator(new AnyNode("a"), BinaryOperatorType.Equality, new NullReferenceExpression()),
-				new AnyNode("other"),
-				new Backreference("a")
-			),
-		};
-		
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context, this).GetIssues();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<ConditionalToNullCoalescingIssue>
-		{
-//			readonly ConditionalToNullCoalescingIssue inspector;
-			
-			public GatherVisitor (BaseRefactoringContext ctx, ConditionalToNullCoalescingIssue inspector) : base (ctx)
-			{
-//				this.inspector = inspector;
-			}
-
-			public override void VisitConditionalExpression(ConditionalExpression conditionalExpression)
-			{
-				Match m = pattern.Match(conditionalExpression);
-				if (m.Success) {
-					var a = m.Get<Expression>("a").Single();
-					var other = m.Get<Expression>("other").Single();
-					AddIssue(conditionalExpression, ctx.TranslateString("Convert to '??' expression"), script => {
-						var expr = new BinaryOperatorExpression (a.Clone (), BinaryOperatorType.NullCoalescing, other.Clone ());
-						script.Replace (conditionalExpression, expr);
-					});
-				}
-				base.VisitConditionalExpression (conditionalExpression);
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstantConditionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstantConditionIssue.cs
deleted file mode 100644
index aac9409f8b..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstantConditionIssue.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-// 
-// ConstantConditionIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Condition is always 'true' or always 'false'",
-					   Description = "Condition is always 'true' or always 'false'.",
-					   Category = IssueCategories.CodeQualityIssues,
-					   Severity = Severity.Warning,
-					   IssueMarker = IssueMarker.Underline)]
-	public class ConstantConditionIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<ConstantConditionIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitConditionalExpression (ConditionalExpression conditionalExpression)
-			{
-				base.VisitConditionalExpression (conditionalExpression);
-
-				CheckCondition (conditionalExpression.Condition);
-			}
-
-			public override void VisitIfElseStatement (IfElseStatement ifElseStatement)
-			{
-				base.VisitIfElseStatement (ifElseStatement);
-
-				CheckCondition (ifElseStatement.Condition);
-			}
-
-			public override void VisitWhileStatement (WhileStatement whileStatement)
-			{
-				base.VisitWhileStatement (whileStatement);
-
-				CheckCondition (whileStatement.Condition);
-			}
-
-			public override void VisitDoWhileStatement (DoWhileStatement doWhileStatement)
-			{
-				base.VisitDoWhileStatement (doWhileStatement);
-
-				CheckCondition (doWhileStatement.Condition);
-			}
-
-			public override void VisitForStatement (ForStatement forStatement)
-			{
-				base.VisitForStatement (forStatement);
-
-				CheckCondition (forStatement.Condition);
-			}
-
-			void CheckCondition (Expression condition)
-			{
-				if (condition is PrimitiveExpression)
-					return;
-
-				var resolveResult = ctx.Resolve (condition);
-				if (!(resolveResult.IsCompileTimeConstant && resolveResult.ConstantValue is bool))
-					return;
-
-				var value = (bool)resolveResult.ConstantValue;
-				var conditionalExpr = condition.Parent as ConditionalExpression;
-				var ifElseStatement = condition.Parent as IfElseStatement;
-				var valueStr = value.ToString ().ToLowerInvariant ();
-
-				CodeAction action;
-				if (conditionalExpr != null) {
-					var replaceExpr = value ? conditionalExpr.TrueExpression : conditionalExpr.FalseExpression;
-					action = new CodeAction (
-						string.Format (ctx.TranslateString ("Replace '?:' with '{0}' branch"), valueStr),
-						script => script.Replace (conditionalExpr, replaceExpr.Clone ()),
-						condition);
-				} else if (ifElseStatement != null) {
-					action = new CodeAction (
-						string.Format (ctx.TranslateString ("Replace 'if' with '{0}' branch"), valueStr),
-						script => {
-							var statement = value ? ifElseStatement.TrueStatement : ifElseStatement.FalseStatement;
-							var blockStatement = statement as BlockStatement;
-							if (statement.IsNull || (blockStatement != null && blockStatement.Statements.Count == 0)) {
-								script.Remove (ifElseStatement);
-								return;
-							}
-
-							TextLocation start, end;
-							if (blockStatement != null) {
-								start = blockStatement.Statements.FirstOrNullObject ().StartLocation;
-								end = blockStatement.Statements.LastOrNullObject ().EndLocation;
-							} else {
-								start = statement.StartLocation;
-								end = statement.EndLocation;
-							}
-							RemoveText (script, ifElseStatement.StartLocation, start);
-							RemoveText (script, end, ifElseStatement.EndLocation);
-							script.FormatText (ifElseStatement.Parent);
-						}, condition);
-				} else {
-					action = new CodeAction (
-						string.Format (ctx.TranslateString ("Replace expression with '{0}'"), valueStr),
-						script => script.Replace (condition, new PrimitiveExpression (value)), 
-						condition
-					);
-				}
-				AddIssue (condition, string.Format (ctx.TranslateString ("Condition is always '{0}'"), valueStr), 
-					new [] { action });
-			}
-
-			void RemoveText (Script script, TextLocation start, TextLocation end)
-			{
-				var startOffset = script.GetCurrentOffset (start);
-				var endOffset = script.GetCurrentOffset (end);
-				if (startOffset < endOffset)
-					script.RemoveText (startOffset, endOffset - startOffset);
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstructorIssues/PublicConstructorInAbstractClass.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstructorIssues/PublicConstructorInAbstractClass.cs
deleted file mode 100644
index 995b94d195..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstructorIssues/PublicConstructorInAbstractClass.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// RedundantConstructorIssue.cs
-// 
-// Author:
-//      Ji Kun <jikun.nus@gmail.com>
-// 
-// Copyright (c) 2013 Ji Kun
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SaHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Constructor in Abstract Class should not be public",
-	                  Description = "Constructor in Abstract Class should not be public",
-	                  Category = IssueCategories.CompilerErrors,
-	                  Severity = Severity.Suggestion,
-	                  ResharperDisableKeyword = "PublicConstructorInAbstractClass",
-	                  IssueMarker = IssueMarker.Underline)]
-	public class PublicConstructorInAbstractClassIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			var unit = context.RootNode as SyntaxTree;
-			if (unit == null)
-				return Enumerable.Empty<CodeIssue>();
-			return new GatherVisitor(context).GetIssues();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<PublicConstructorInAbstractClassIssue>
-		{
-
-			public GatherVisitor(BaseRefactoringContext ctx)
-				: base(ctx)
-			{
-			}
-			
-			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
-			{
-				if (!typeDeclaration.HasModifier(Modifiers.Abstract)) {
-					return;
-				}
-				foreach (var constructor in typeDeclaration.Children.OfType<ConstructorDeclaration>()){
-					VisitConstructorDeclaration(constructor);
-				}
-			}
-
-			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
-			{
-				if (constructorDeclaration.HasModifier (Modifiers.Public)) {
-					AddIssue(constructorDeclaration.NameToken, ctx.TranslateString("Convert public to protected"), script =>
-                        script.Replace(constructorDeclaration.ModifierTokens.First (t => t.Modifier == Modifiers.Public), new CSharpModifierToken(TextLocation.Empty, Modifiers.Protected)));
-				}
-			}
-		}
-	}
-}
-
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstructorIssues/RedudantConstructorIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstructorIssues/RedudantConstructorIssue.cs
deleted file mode 100755
index 30004dddf5..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstructorIssues/RedudantConstructorIssue.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// 
-// RedundantConstructorIssue.cs
-// 
-// Author:
-//      Ji Kun <jikun.nus@gmail.com>
-// 
-// Copyright (c) 2013 Ji Kun
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SaHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("An empty constructor is not necessary",
-	                   Description = "An alone empty constructor is not necessary.",
-                       Category = IssueCategories.Redundancies,
-                       Severity = Severity.Suggestion,
-	     			   ResharperDisableKeyword = "RedundantConstructor",
-                       IssueMarker = IssueMarker.GrayOut)]
-	public class RedundantConstructorIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			var unit = context.RootNode as SyntaxTree;
-			if (unit == null)
-				return Enumerable.Empty<CodeIssue>();
-			return new GatherVisitor(context).GetIssues();
-		}
-
-		class GatherVisitor : GatherVisitorBase<RedundantConstructorIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext ctx)
-                : base(ctx)
-			{
-			}
-
-			public override void VisitTypeDeclaration(TypeDeclaration typedeclaration)
-			{
-				bool hasEmptyConstructor = false;
-				bool hasUnemptyConstructor = false;
-				ConstructorDeclaration emptyContructorNode = new ConstructorDeclaration();
-
-				foreach (var child in typedeclaration.Children.OfType<ConstructorDeclaration>()) {
-					if (child.HasModifier(Modifiers.Static)) 
-						continue;
-					if (child.Body.Count() > 0 || (child.Parameters.Count > 0)) {
-						hasUnemptyConstructor = true;
-					} else if (child.HasModifier(Modifiers.Public)) {
-						hasEmptyConstructor = true;
-						emptyContructorNode = child;
-					}
-				}
-
-				if (!hasUnemptyConstructor && hasEmptyConstructor) {
-					AddIssue(emptyContructorNode, ctx.TranslateString("Remove redundant constructor"), script =>
-					{
-						script.Remove(emptyContructorNode);
-					});   
-				}
-				return;   
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstructorIssues/StaticConstructorAccessModifierIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstructorIssues/StaticConstructorAccessModifierIssue.cs
deleted file mode 100755
index 195eafe335..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstructorIssues/StaticConstructorAccessModifierIssue.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// 
-// StaticConstructorModifierIssue.cs.cs
-// 
-// Author:
-//      Ji Kun <jikun.nus@gmail.com>
-// 
-// Copyright (c) 2013 Ji Kun
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Static constructor should be without access modifier",
-                       Description = "Static constructor should be without access modifier",
-                       Category = IssueCategories.CompilerErrors,
-                       Severity = Severity.Error,
-                       ResharperDisableKeyword = "StaticConstructorAccessModifier",
-                       IssueMarker = IssueMarker.Underline)]
-	public class StaticConstructorAccessModifierIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			var unit = context.RootNode as SyntaxTree;
-			if (unit == null)
-				return Enumerable.Empty<CodeIssue>();
-			return new GatherVisitor(context).GetIssues();
-		}
-
-		class GatherVisitor : GatherVisitorBase<StaticConstructorAccessModifierIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext ctx)
-                : base(ctx)
-			{
-			}
-
-			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
-			{
-				if (!constructorDeclaration.HasModifier(Modifiers.Static))
-					return;
-				if (constructorDeclaration.HasModifier(Modifiers.Public) ||
-					constructorDeclaration.HasModifier(Modifiers.Private) ||
-					constructorDeclaration.HasModifier(Modifiers.Protected)) {
-					AddIssue(constructorDeclaration, ctx.TranslateString("Static constructor cannot take access modifier"));
-				}
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstructorIssues/StaticConstructorParameterIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstructorIssues/StaticConstructorParameterIssue.cs
deleted file mode 100755
index d871ee8df8..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConstructorIssues/StaticConstructorParameterIssue.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// 
-// StaticConstructorParameterIssue.cs
-// 
-// Author:
-//      Ji Kun <jikun.nus@gmail.com>
-// 
-// Copyright (c) 2013 Ji Kun
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Static constructor should be parameterless",
-                       Description = "Static constructor should be parameterless",
-                       Category = IssueCategories.CompilerErrors,
-                       Severity = Severity.Error,
-                       ResharperDisableKeyword = "StaticConstructorParameterless",
-                       IssueMarker = IssueMarker.Underline)]
-	public class StaticConstructorParameterIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			var unit = context.RootNode as SyntaxTree;
-			if (unit == null)
-				return Enumerable.Empty<CodeIssue>();
-			return new GatherVisitor(context).GetIssues();
-		}
-
-		class GatherVisitor : GatherVisitorBase<StaticConstructorParameterIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext ctx)
-                : base(ctx)
-			{
-			}
-
-			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
-			{
-				if (!constructorDeclaration.HasModifier(Modifiers.Static))
-					return;
-				if (constructorDeclaration.Parameters.Count != 0) {
-					AddIssue(constructorDeclaration, ctx.TranslateString("Static constructor cannot take parameters"));
-				}
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConvertToStaticMethodIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConvertToStaticMethodIssue.cs
deleted file mode 100644
index dff0b63dcb..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConvertToStaticMethodIssue.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// ConvertToStaticMethodIssue.cs
-//
-// Author:
-//       Ciprian Khlud <ciprian.mustiata@yahoo.com>
-//
-// Copyright (c) 2013 Ciprian Khlud
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-//	[IssueDescription("Make this method static",
-//                      Description = "This method doesn't use any non static members so it can be made static",
-//                      Severity = Severity.Hint,
-//                      IssueMarker = IssueMarker.Underline)]
-    public class ConvertToStaticMethodIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-
-		private class GatherVisitor : GatherVisitorBase<ConvertToStaticMethodIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext context)
-                : base(context)
-			{
-			}
-
-			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
-			{
-				// TODO: Invert if without else
-				// ex. if (cond) DoSomething () == if (!cond) return; DoSomething ()
-				// beware of loop contexts return should be continue then.
-				var context = ctx;
-				if (methodDeclaration.HasModifier(Modifiers.Static) || 
-				    methodDeclaration.HasModifier(Modifiers.Virtual) || 
-				    methodDeclaration.HasModifier(Modifiers.Override) || 
-				    methodDeclaration.HasModifier(Modifiers.New) || 
-				    methodDeclaration.Attributes.Any())
-					return;
-
-				// skip empty methods
-				if (!methodDeclaration.Body.Statements.Any())
-					return;
-
-				if (methodDeclaration.Body.Statements.Count == 1) {
-					if (methodDeclaration.Body.Statements.First () is ThrowStatement)
-						return;
-				}
-					
-				var resolved = context.Resolve(methodDeclaration) as MemberResolveResult;
-				if (resolved == null)
-					return;
-
-				var isImplementingInterface = resolved.Member.ImplementedInterfaceMembers.Any();
-				if (isImplementingInterface)
-					return;
-
-				AddIssue(methodDeclaration.NameToken.StartLocation, methodDeclaration.NameToken.EndLocation,
-				                     context.TranslateString(string.Format("Make '{0}' static", methodDeclaration.Name)),
-				                     script => ExecuteScriptToFixStaticMethodIssue(script, context, methodDeclaration));
-			}
-
-			static void ExecuteScriptToFixStaticMethodIssue(Script script,
-			                                                                 BaseRefactoringContext context, 
-			                                                                 AstNode methodDeclaration)
-			{
-				var clonedDeclaration = (MethodDeclaration)methodDeclaration.Clone();
-				clonedDeclaration.Modifiers |= Modifiers.Static;
-				script.Replace(methodDeclaration, clonedDeclaration);
-				var rr = context.Resolve(methodDeclaration) as MemberResolveResult;
-				//var method = (IMethod)rr.Member;
-				//method.ImplementedInterfaceMembers.Any(m => methodGroupResolveResult.Methods.Contains((IMethod)m));
-
-				script.DoGlobalOperationOn(rr.Member,
-				                                       (fctx, fscript, fnode) => {
-					DoStaticMethodGlobalOperation(fnode, fctx, rr, fscript); });
-			}
-
-			static void DoStaticMethodGlobalOperation(AstNode fnode, RefactoringContext fctx, MemberResolveResult rr,
-			                                                           Script fscript)
-			{
-				if (fnode is MemberReferenceExpression) {
-					var memberReference = new MemberReferenceExpression(
-						new TypeReferenceExpression(fctx.CreateShortType(rr.Member.DeclaringType)),
-						rr.Member.Name
-					);
-					fscript.Replace(fnode, memberReference);
-				} else {
-					var invoke = fnode as InvocationExpression;
-					if (invoke == null)
-						return;
-					if ((invoke.Target is MemberReferenceExpression))
-						return;
-					var memberReference = new MemberReferenceExpression(
-						new TypeReferenceExpression(fctx.CreateShortType(rr.Member.DeclaringType)),
-						rr.Member.Name
-					);
-					fscript.Replace(invoke.Target, memberReference);
-				}
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/DoubleNegationIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/DoubleNegationIssue.cs
deleted file mode 100644
index 5d3c996950..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/DoubleNegationIssue.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// 
-// DoubleNegationIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Double negation is meaningless",
-						Description = "Double negation is meaningless.",
-						Category = IssueCategories.Redundancies,
-						Severity = Severity.Warning,
-						IssueMarker = IssueMarker.Underline,
-                        ResharperDisableKeyword = "DoubleNegationOperator")]
-	public class DoubleNegationIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<DoubleNegationIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			static Expression RemoveParentheses (Expression expr)
-			{
-				while (expr is ParenthesizedExpression)
-					expr = ((ParenthesizedExpression) expr).Expression;
-				return expr;
-			}
-
-			public override void VisitUnaryOperatorExpression (UnaryOperatorExpression unaryOperatorExpression)
-			{
-				base.VisitUnaryOperatorExpression (unaryOperatorExpression);
-
-				if (unaryOperatorExpression.Operator != UnaryOperatorType.Not)
-					return;
-
-				var innerUnaryOperatorExpr = 
-					RemoveParentheses (unaryOperatorExpression.Expression) as UnaryOperatorExpression;
-				if (innerUnaryOperatorExpr == null || innerUnaryOperatorExpr.Operator != UnaryOperatorType.Not)
-					return;
-
-				var expression = RemoveParentheses (innerUnaryOperatorExpr.Expression);
-				if (expression.IsNull)
-					return;
-
-				AddIssue (unaryOperatorExpression, ctx.TranslateString ("Remove double negation"),
-					script => script.Replace (unaryOperatorExpression, expression.Clone ()));
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/DuplicateBodyMethodIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/DuplicateBodyMethodIssue.cs
deleted file mode 100644
index 89df72bc56..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/DuplicateBodyMethodIssue.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-//
-// DuplicateBodyMethodIssue.cs
-//
-// Author:
-//       Ciprian Khlud <ciprian.mustiata@yahoo.com>
-//
-// Copyright (c) 2013 Ciprian Khlud
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.Semantics;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-//	[IssueDescription("Methods have duplicate body",
-//                      Description = "One method has the same body as other method",
-//                      Severity = Severity.Hint,
-//                      IssueMarker = IssueMarker.Underline)]
-	public class DuplicateBodyMethodIssue : ICodeIssueProvider
-	{
-		#region ICodeIssueProvider implementation
-
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			var visitor = new GatherVisitor(context);
-			visitor.GetMethods();
-			visitor.ComputeConflicts();
-			return visitor.GetIssues();
-		}
-		#endregion
-
-		private class GatherVisitor : GatherVisitorBase<DuplicateBodyMethodIssue>
-		{
-			public List<MethodDeclaration> DeclaredMethods;
-
-			public GatherVisitor(BaseRefactoringContext context)
-				: base(context)
-			{
-				DeclaredMethods = new List<MethodDeclaration>();
-			}
-
-			static string GetMethodDescriptor(MethodDeclaration methodDeclaration)
-			{
-				var sb = new StringBuilder();
-				sb.Append(methodDeclaration.ReturnType);
-				sb.Append(";");
-				foreach (var parameter in methodDeclaration.Parameters) {
-					sb.AppendFormat("{0}:{1};", parameter.Name, parameter.Type);
-				}
-				sb.Append(methodDeclaration.Modifiers);
-				return sb.ToString();
-			}
-
-			public void GetMethods()
-			{
-				ctx.RootNode.AcceptVisitor(this);
-			}
-
-			internal void ComputeConflicts()
-			{
-				var dict = new Dictionary<string, List<MethodDeclaration>>();
-				foreach (var declaredMethod in DeclaredMethods) {
-					var methodDescriptor = GetMethodDescriptor(declaredMethod);
-					List<MethodDeclaration> listMethods;
-					if (!dict.TryGetValue(methodDescriptor, out listMethods)) {
-						listMethods = new List<MethodDeclaration>();
-						dict [methodDescriptor] = listMethods;
-					}
-					listMethods.Add(declaredMethod);
-				}
-				DeclaredMethods.Clear();
-
-				foreach (var list in dict.Values.Where(list => list.Count >= 2)) {
-					for (var i = 0; i < list.Count - 1; i++) {
-						var firstMethod = list [i];
-						for (var j = i + 1; j < list.Count; j++) {
-							var secondMethod = list [j];
-							if (firstMethod.Body.IsMatch(secondMethod.Body)) {
-								AddIssue(secondMethod.NameToken,
-								                                 string.Format("Method '{0}' has the same with '{1}' ", secondMethod.Name,
-								                                               firstMethod.Name),
-								                                 script => {
-									InvokeMethod(script, firstMethod, secondMethod); }
-								);
-							}
-						}
-					}
-				}
-			}
-
-			readonly InsertParenthesesVisitor _insertParenthesesVisitor = new InsertParenthesesVisitor();
-			private TypeDeclaration _parentType;
-
-			private void InvokeMethod(Script script, MethodDeclaration firstMethod, MethodDeclaration secondMethod)
-			{
-				var statement =
-                    new ExpressionStatement(new InvocationExpression(new IdentifierExpression(firstMethod.Name),
-                                                                     firstMethod.Parameters.Select(
-                                                                         declaration =>
-                                                                         GetArgumentExpression(declaration).Clone())));
-				statement.AcceptVisitor(_insertParenthesesVisitor);
-				if (firstMethod.ReturnType.ToString() != "System.Void") {
-					var returnStatement = new ReturnStatement(statement.Expression.Clone());
-
-					script.Replace(secondMethod.Body, new BlockStatement { returnStatement });
-				} else {
-					script.Replace(secondMethod.Body, new BlockStatement { statement });
-				}
-			}
-
-			static Expression GetArgumentExpression(ParameterDeclaration parameter)
-			{
-				var identifierExpr = new IdentifierExpression(parameter.Name);
-				switch (parameter.ParameterModifier) {
-					case ParameterModifier.Out:
-						return new DirectionExpression(FieldDirection.Out, identifierExpr);
-					case ParameterModifier.Ref:
-						return new DirectionExpression(FieldDirection.Ref, identifierExpr);
-				}
-				return identifierExpr;
-			}
-
-			public override void VisitMethodDeclaration(MethodDeclaration declaration)
-			{
-				var context = ctx;
-				var methodDeclaration = declaration;
-
-				var resolved = context.Resolve(methodDeclaration) as MemberResolveResult;
-				if (resolved == null)
-					return;
-				var isImplementingInterface = resolved.Member.ImplementedInterfaceMembers.Any();
-
-				if (isImplementingInterface)
-					return;
-				if (declaration.Body.IsNull)
-					return;
-				var parentType = declaration.Parent as TypeDeclaration;
-				if (parentType == null)
-					return;
-				if (_parentType == null)
-					_parentType = parentType;
-				else {
-					//if we are here, it means that we switched from one class to another, so it means that we should compute 
-					//the duplicates up-to now, then reset the list of methods
-					if (parentType != _parentType) {
-						ComputeConflicts();
-						DeclaredMethods.Add(declaration); 
-						_parentType = parentType;
-						return;
-					}
-				}
-
-				DeclaredMethods.Add(declaration);
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/DuplicateExpressionsInConditionsIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/DuplicateExpressionsInConditionsIssue.cs
deleted file mode 100644
index f568adb198..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/DuplicateExpressionsInConditionsIssue.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-// DuplicateExpressionsInConditionsIssue.cs
-//
-// Author:
-//       Ciprian Khlud <ciprian.mustiata@yahoo.com>
-//
-// Copyright (c) 2013 Ciprian Khlud
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-    [IssueDescription("Expression has some redundant items",
-		                   Description = "Expression has some redundant items",
-		                   Category = IssueCategories.CodeQualityIssues,
-		                   Severity = Severity.Warning,
-		                   IssueMarker = IssueMarker.GrayOut,
-		                   ResharperDisableKeyword = "ConditionalTernaryEqualBranch")]
-	public class DuplicateExpressionsInConditionsIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-        static readonly List<BinaryOperatorType> SupportedOperators = new List<BinaryOperatorType>();
-        static DuplicateExpressionsInConditionsIssue()
-        {
-            SupportedOperators.Add(BinaryOperatorType.BitwiseAnd);
-            SupportedOperators.Add(BinaryOperatorType.BitwiseOr);
-            SupportedOperators.Add(BinaryOperatorType.ConditionalAnd);
-            SupportedOperators.Add(BinaryOperatorType.ConditionalOr);
-        }
-		
-		class GatherVisitor : GatherVisitorBase<DuplicateExpressionsInConditionsIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-            public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
-            {
-                var expression = binaryOperatorExpression;
-                base.VisitBinaryOperatorExpression(expression);
-                if(!SupportedOperators.Contains(expression.Operator) )
-                    return;
-                var parentExpression = expression.Parent as BinaryOperatorExpression;
-                if(parentExpression!=null && parentExpression.Operator==expression.Operator)
-                {
-                    //handle only parent sequence
-                    return;
-                }
-                var expressions = GetExpressions(binaryOperatorExpression, expression);
-                for(var i=0;i<expressions.Count-1;i++)
-                {
-                    for (var j = i+1; j < expressions.Count; j++)
-                    {
-                        var expressionLeft = expressions[i];
-                        var expressionRight = expressions[j];
-                        if (!expressionLeft.IsMatch(expressionRight))
-                            continue;
-                        var action = new CodeAction(ctx.TranslateString("Remove redundant expression"),
-                                                    script => RemoveRedundantExpression(script, expressionRight),
-                                                    expressionRight);
-                    
-	                    AddIssue(expressionRight,
-	                              ctx.TranslateString(string.Format("The expression '{0}' is identical in the left branch",
-	                                expressionRight)), action);
-
-
-                    }
-                }
-            }
-
-		    private static void RemoveRedundantExpression(Script script, AstNode expressionRight)
-		    {
-                var parent = expressionRight.Parent as BinaryOperatorExpression;
-                if(parent==null) //should never happen!
-                    return;
-                script.Replace(parent, parent.Left.Clone());
-		    }
-
-		    private static List<Expression> GetExpressions(BinaryOperatorExpression binaryOperatorExpression,
-		                                       BinaryOperatorExpression expression)
-		    {
-		        var baseExpression = expression;
-		        var leftExpression = baseExpression.FirstChild as BinaryOperatorExpression;
-		        var expressions = new List<Expression>();
-		        while (leftExpression != null && binaryOperatorExpression.Operator == leftExpression.Operator)
-		        {
-		            expressions.Add(baseExpression.Right);
-		            baseExpression = leftExpression;
-		            leftExpression = leftExpression.Left as BinaryOperatorExpression;
-		        }
-		        expressions.Add(baseExpression.Right);
-		        expressions.Add(baseExpression.Left);
-		        expressions.Reverse();
-		        return expressions;
-		    }
-		}
-	}	
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/DuplicateIfInIfChainIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/DuplicateIfInIfChainIssue.cs
deleted file mode 100644
index f87281f73d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/DuplicateIfInIfChainIssue.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// DuplicateIfInIfChainIssue.cs
-//
-// Author:
-//       Ciprian Khlud <ciprian.mustiata@yahoo.com>
-//
-// Copyright (c) 2013 Ciprian Khlud
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Else branch has some redundant if",
-	                  Description = "One Else-if was checked before so is not be true",
-	                  Category = IssueCategories.CodeQualityIssues,
-	                  Severity = Severity.Warning,
-	                  IssueMarker = IssueMarker.GrayOut,
-	                  ResharperDisableKeyword = "ConditionalTernaryEqualBranch")]
-	public class DuplicateIfInIfChainIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<DuplicateIfInIfChainIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-			
-			public override void VisitIfElseStatement(IfElseStatement ifStatement)
-			{
-				base.VisitIfElseStatement(ifStatement);
-				var parentExpression = ifStatement.Parent as IfElseStatement;
-				//handle only parent sequence
-				if (parentExpression != null)
-					return;
-				var expressions = GetExpressions(ifStatement);
-				for(var i=0;i<expressions.Count-1;i++) {
-					for (var j = i+1; j < expressions.Count; j++) {
-						var leftCondition = expressions[i].Condition;
-                        var rightIf = expressions[j];
-                        var rightCondition = rightIf.Condition;
-					    
-						if (!leftCondition.IsMatch(rightCondition))
-							continue;
-						var action = new CodeAction(ctx.TranslateString("Remove redundant expression"),
-                                                    script => RemoveRedundantIf(script, rightIf),
-						                            rightCondition);
-						
-						AddIssue(rightCondition,
-						         ctx.TranslateString(string.Format("The expression '{0}' is identical in the left branch",
-						                                  rightCondition)), action);
-						
-					}
-				}
-			}
-
-            private static void RemoveRedundantIf(Script script, IfElseStatement expressionRight)
-            {
-                var parent = expressionRight.Parent as IfElseStatement;
-                if(parent==null) { //should never happen!
-                    return;
-                }
-                if (expressionRight.FalseStatement.IsNull) {
-                    script.Remove(parent.ElseToken);
-                    script.Remove(parent.FalseStatement);
-                    script.FormatText(parent);
-				} else {
-					script.Replace(parent.FalseStatement, expressionRight.FalseStatement.Clone());
-				}
-            }
-
-		    private static List<IfElseStatement> GetExpressions(IfElseStatement expression)
-			{
-				var baseExpression = expression;
-				var falseExpression = baseExpression.FalseStatement as IfElseStatement;
-                var expressions = new List<IfElseStatement>();
-				while (falseExpression != null) {
-					expressions.Add(baseExpression);
-					baseExpression = falseExpression;
-					falseExpression = falseExpression.FalseStatement as IfElseStatement;
-				}
-				expressions.Add(baseExpression);
-				return expressions;
-			}
-		}
-	}
-	
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExceptionRethrowIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExceptionRethrowIssue.cs
deleted file mode 100644
index 4dc5a2492c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExceptionRethrowIssue.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-//
-// ExceptionRethrowIssue.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("A throw statement throws the caught exception by passing it explicitly",
-	                  Description = "Finds throws that throws the caught exception and therefore should be empty.",
-	                  Category = IssueCategories.CodeQualityIssues,
-	                  Severity = Severity.Warning,
-                      ResharperDisableKeyword = "PossibleIntendedRethrow")]
-	public class ExceptionRethrowIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<ExceptionRethrowIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext context) : base (context)
-			{
-			}
-			
-			public override void VisitCatchClause(CatchClause catchClause)
-			{
-				base.VisitCatchClause(catchClause);
-				var exceptionResolveResult = ctx.Resolve(catchClause.VariableNameToken) as LocalResolveResult;
-				if (exceptionResolveResult == null)
-					return;
-
-				var catchVisitor = new CatchClauseVisitor(ctx, exceptionResolveResult.Variable);
-				catchClause.Body.AcceptVisitor(catchVisitor);
-
-				foreach (var throwStatement in catchVisitor.OffendingThrows) {
-					var localThrowStatement = throwStatement;
-					var title = ctx.TranslateString("The exception is rethrown with explicit usage of the variable");
-					var action = new CodeAction(ctx.TranslateString("Change to 'throw;'"), script => {
-						script.Replace(localThrowStatement, new ThrowStatement());
-					}, catchClause);
-					AddIssue(localThrowStatement, title, action);
-				}
-			}
-		}
-		
-		class CatchClauseVisitor : DepthFirstAstVisitor
-		{
-			BaseRefactoringContext ctx;
-
-			IVariable parameter;
-
-			bool variableWritten = false;
-
-			public CatchClauseVisitor(BaseRefactoringContext context, IVariable parameter)
-			{
-				ctx = context;
-				this.parameter = parameter;
-				OffendingThrows = new List<ThrowStatement>();
-			}
-
-			public IList<ThrowStatement> OffendingThrows { get; private set; }
-
-			void HandlePotentialWrite (Expression expression)
-			{
-				var variableResolveResult = ctx.Resolve(expression) as LocalResolveResult;
-				if (variableResolveResult == null)
-					return;
-				variableWritten |= variableResolveResult.Equals(parameter);
-			}
-
-			public override void VisitAssignmentExpression(AssignmentExpression assignmentExpression)
-			{
-				base.VisitAssignmentExpression(assignmentExpression);
-
-				var variableResolveResult = ctx.Resolve(assignmentExpression.Left) as LocalResolveResult;
-				if (variableResolveResult == null)
-					return;
-				variableWritten |= variableResolveResult.Variable.Equals(parameter);
-			}
-
-			public override void VisitDirectionExpression(DirectionExpression directionExpression)
-			{
-				base.VisitDirectionExpression(directionExpression);
-
-				HandlePotentialWrite(directionExpression);
-			}
-
-			public override void VisitThrowStatement(ThrowStatement throwStatement)
-			{
-				base.VisitThrowStatement(throwStatement);
-
-				if (variableWritten)
-					return;
-
-				var argumentResolveResult = ctx.Resolve(throwStatement.Expression) as LocalResolveResult;
-				if (argumentResolveResult == null)
-					return;
-				if (parameter.Equals(argumentResolveResult.Variable))
-					OffendingThrows.Add(throwStatement);
-			}
-		}
-		
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExplicitConversionInForEachIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExplicitConversionInForEachIssue.cs
deleted file mode 100644
index be01bf3ffd..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExplicitConversionInForEachIssue.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this
-// software and associated documentation files (the "Software"), to deal in the Software
-// without restriction, including without limitation the rights to use, copy, modify, merge,
-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Incorrect element type in foreach over generic collection",
-	                  Description= "Detects hidden explicit conversions in foreach loops.",
-	                  Category = IssueCategories.CodeQualityIssues,
-	                  Severity = Severity.Warning)]
-	public class ExplicitConversionInForEachIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-
-		class GatherVisitor : GatherVisitorBase<ExplicitConversionInForEachIssue>
-		{
-			CSharpConversions conversions;
-			
-			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
-			{
-			}
-			
-			public override void VisitForeachStatement(ForeachStatement foreachStatement)
-			{
-				base.VisitForeachStatement(foreachStatement);
-				var rr = ctx.Resolve(foreachStatement) as ForEachResolveResult;
-				if (rr == null)
-					return;
-				if (rr.ElementType.Kind == TypeKind.Unknown)
-					return;
-				if (ReflectionHelper.GetTypeCode(rr.ElementType) == TypeCode.Object)
-					return;
-				if (conversions == null) {
-					conversions = CSharpConversions.Get(ctx.Compilation);
-				}
-				Conversion c = conversions.ImplicitConversion(rr.ElementType, rr.ElementVariable.Type);
-				if (c.IsValid)
-					return;
-				var csResolver = ctx.GetResolverStateBefore(foreachStatement);
-				var builder = new TypeSystemAstBuilder(csResolver);
-				AstType elementType = builder.ConvertType(rr.ElementType);
-				AstType variableType = foreachStatement.VariableType;
-				string issueText = ctx.TranslateString("Collection element type '{0}' is not implicitly convertible to '{1}'");
-				string fixText = ctx.TranslateString("Use type '{0}'");
-				AddIssue(variableType, string.Format(issueText, elementType.ToString(), variableType.ToString()),
-				         new CodeAction(
-								string.Format(fixText, elementType.ToString()),
-								script => script.Replace(variableType, elementType),
-								foreachStatement));
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExpressionIsAlwaysOfProvidedTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExpressionIsAlwaysOfProvidedTypeIssue.cs
deleted file mode 100644
index f826238e0d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExpressionIsAlwaysOfProvidedTypeIssue.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// 
-// ExpressionIsAlwaysOfProvidedTypeIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("CS0183:Given expression is always of the provided type",
-					   Description = "CS0183:Given expression is always of the provided type.",
-					   Category = IssueCategories.CompilerWarnings,
-					   Severity = Severity.Warning,
-					   IssueMarker = IssueMarker.Underline)]
-	public class ExpressionIsAlwaysOfProvidedTypeIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<ExpressionIsAlwaysOfProvidedTypeIssue>
-		{
-			readonly CSharpConversions conversions;
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-				conversions = CSharpConversions.Get(ctx.Compilation);
-			}
-
-			public override void VisitIsExpression (IsExpression isExpression)
-			{
-				base.VisitIsExpression (isExpression);
-
-				var type = ctx.Resolve (isExpression.Expression).Type;
-				var providedType = ctx.ResolveType (isExpression.Type);
-
-//				var foundConversion = conversions.ImplicitConversion(type, providedType);
-				if (!IsValidReferenceOrBoxingConversion(type, providedType))
-					return;
-
-				var action = new CodeAction (
-					ctx.TranslateString ("Compare with 'null'"), 
-					script => script.Replace (isExpression, new BinaryOperatorExpression (
-						isExpression.Expression.Clone (), BinaryOperatorType.InEquality, new PrimitiveExpression (null))),
-					isExpression
-				);
-				AddIssue (isExpression, ctx.TranslateString ("Given expression is always of the provided type. " +
-					"Consider comparing with 'null' instead"), new [] { action });
-			}
-			
-			bool IsValidReferenceOrBoxingConversion(IType fromType, IType toType)
-			{
-				Conversion c = conversions.ImplicitConversion(fromType, toType);
-				return c.IsValid && (c.IsIdentityConversion || c.IsReferenceConversion || c.IsBoxingConversion);
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExpressionIsNeverOfProvidedTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExpressionIsNeverOfProvidedTypeIssue.cs
deleted file mode 100644
index d2ecbe47f8..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExpressionIsNeverOfProvidedTypeIssue.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// 
-// ExpressionIsNeverOfProvidedTypeIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("CS0184:Given expression is never of the provided type",
-					   Description = "CS0184:Given expression is never of the provided type.",
-					   Category = IssueCategories.CompilerWarnings,
-					   Severity = Severity.Warning,
-					   IssueMarker = IssueMarker.Underline)]
-	public class ExpressionIsNeverOfProvidedTypeIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<ExpressionIsNeverOfProvidedTypeIssue>
-		{
-			readonly CSharpConversions conversions;
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-				conversions = CSharpConversions.Get(ctx.Compilation);
-			}
-
-			public override void VisitIsExpression (IsExpression isExpression)
-			{
-				base.VisitIsExpression (isExpression);
-
-//				var conversions = CSharpConversions.Get(ctx.Compilation);
-				var exprType = ctx.Resolve (isExpression.Expression).Type;
-				var providedType = ctx.ResolveType (isExpression.Type);
-
-				if (exprType.Kind == TypeKind.Unknown || providedType.Kind == TypeKind.Unknown)
-					return;
-				if (IsValidReferenceOrBoxingConversion(exprType, providedType))
-					return;
-				
-				var exprTP = exprType as ITypeParameter;
-				var providedTP = providedType as ITypeParameter;
-				if (exprTP != null) {
-					if (IsValidReferenceOrBoxingConversion(exprTP.EffectiveBaseClass, providedType)
-					    && exprTP.EffectiveInterfaceSet.All(i => IsValidReferenceOrBoxingConversion(i, providedType)))
-						return;
-				}
-				if (providedTP != null) {
-					if (IsValidReferenceOrBoxingConversion(exprType, providedTP.EffectiveBaseClass))
-						return;
-				}
-				
-				AddIssue (isExpression, ctx.TranslateString ("Given expression is never of the provided type"));
-			}
-			
-			bool IsValidReferenceOrBoxingConversion(IType fromType, IType toType)
-			{
-				Conversion c = conversions.ExplicitConversion(fromType, toType);
-				return c.IsValid && (c.IsIdentityConversion || c.IsReferenceConversion || c.IsBoxingConversion || c.IsUnboxingConversion);
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ForControlVariableNotModifiedIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ForControlVariableNotModifiedIssue.cs
deleted file mode 100644
index efa8e13bfa..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ForControlVariableNotModifiedIssue.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-// 
-// ForControlVariableNotModifiedIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("'for' loop control variable is never modified",
-					   Description = "'for' loop control variable is never modified.",
-					   Category = IssueCategories.CodeQualityIssues,
-					   Severity = Severity.Warning,
-					   IssueMarker = IssueMarker.Underline)]
-	public class ForControlVariableNotModifiedIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<ForControlVariableNotModifiedIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			static VariableInitializer GetControlVariable(VariableDeclarationStatement variableDecl, 
-														  BinaryOperatorExpression condition)
-			{
-				var controlVariables = variableDecl.Variables.Where (
-					v =>
-					{
-						var identifier = new IdentifierExpression (v.Name);
-						return condition.Left.Match (identifier).Success ||
-							condition.Right.Match (identifier).Success;
-					}).ToList ();
-				return controlVariables.Count == 1 ? controlVariables [0] : null;
-			}
-
-			static VariableInitializer GetControlVariable(VariableDeclarationStatement variableDecl,
-														  UnaryOperatorExpression condition)
-			{
-				var controlVariables = variableDecl.Variables.Where (
-					v =>
-					{
-						var identifier = new IdentifierExpression (v.Name);
-						return condition.Expression.Match (identifier).Success;
-					}).ToList ();
-				return controlVariables.Count == 1 ? controlVariables [0] : null;
-			}
-
-			public override void VisitForStatement (ForStatement forStatement)
-			{
-				base.VisitForStatement (forStatement);
-
-				if (forStatement.Initializers.Count != 1)
-					return;
-				var variableDecl = forStatement.Initializers.First () as VariableDeclarationStatement;
-				if (variableDecl == null)
-					return;
-
-				VariableInitializer controlVariable = null;
-				if (forStatement.Condition is BinaryOperatorExpression) {
-					controlVariable = GetControlVariable (variableDecl, (BinaryOperatorExpression)forStatement.Condition);
-				} else if (forStatement.Condition is UnaryOperatorExpression) {
-					controlVariable = GetControlVariable (variableDecl, (UnaryOperatorExpression)forStatement.Condition);
-				} else if (forStatement.Condition is IdentifierExpression) {
-					controlVariable = variableDecl.Variables.FirstOrDefault (
-						v => v.Name == ((IdentifierExpression)forStatement.Condition).Identifier);
-				}
-
-				if (controlVariable == null)
-					return;
-
-				var localResolveResult = ctx.Resolve (controlVariable) as LocalResolveResult;
-				if (localResolveResult == null)
-					return;
-
-				var results = ctx.FindReferences (forStatement, localResolveResult.Variable);
-				var modified = false;
-				foreach (var result in results) {
-					if (modified)
-						break;
-					var node = result.Node;
-					var unary = node.Parent as UnaryOperatorExpression;
-					if (unary != null && unary.Expression == node) {
-						modified = unary.Operator == UnaryOperatorType.Decrement ||
-							unary.Operator == UnaryOperatorType.PostDecrement ||
-							unary.Operator == UnaryOperatorType.Increment ||
-							unary.Operator == UnaryOperatorType.PostIncrement;
-						continue;
-					}
-
-					var assignment = node.Parent as AssignmentExpression;
-					modified = assignment != null && assignment.Left == node;
-				}
-
-				if (!modified)
-					AddIssue (controlVariable.NameToken,
-						ctx.TranslateString ("'for' loop control variable is never modified"));
-
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/FormatStringIssues/FormatStringHelper.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/FormatStringIssues/FormatStringHelper.cs
deleted file mode 100644
index 555582e605..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/FormatStringIssues/FormatStringHelper.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// FormatStringHelper.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp
-{
-	class FormatStringHelper
-	{
-		static string[] parameterNames = { "format", "frmt", "fmt" };
-		
-		public static bool TryGetFormattingParameters(CSharpInvocationResolveResult invocationResolveResult, InvocationExpression invocationExpression,
-		                                     		  out Expression formatArgument, out IList<Expression> arguments,
-		                                              Func<IParameter, Expression, bool> argumentFilter)
-		{
-			if (argumentFilter == null)
-				argumentFilter = (p, e) => true;
-
-			formatArgument = null;
-			arguments = new List<Expression>();
-			var argumentToParameterMap = invocationResolveResult.GetArgumentToParameterMap();
-			var resolvedParameters = invocationResolveResult.Member.Parameters;
-			var allArguments = invocationExpression.Arguments.ToArray();
-			for (int i = 0; i < allArguments.Length; i++) {
-				var parameterIndex = argumentToParameterMap[i];
-				if (parameterIndex < 0 || parameterIndex >= resolvedParameters.Count) {
-					// No valid mapping for this argument, skip it
-					continue;
-				}
-				var parameter = resolvedParameters[parameterIndex];
-				var argument = allArguments[i];
-				if (parameter.Type.IsKnownType(KnownTypeCode.String) && parameterNames.Contains(parameter.Name)) {
-					formatArgument = argument;
-				} else if (formatArgument != null && parameter.IsParams && !invocationResolveResult.IsExpandedForm) {
-					var ace = argument as ArrayCreateExpression;
-					if (ace == null || ace.Initializer.IsNull)
-						return false;
-					foreach (var element in ace.Initializer.Elements) {
-						if (argumentFilter(parameter, element))
-							arguments.Add(argument);
-					}
-				} else if (formatArgument != null && argumentFilter(parameter, argument)) {
-					arguments.Add(argument);
-				}
-			}
-			return formatArgument != null;
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/FormatStringIssues/FormatStringIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/FormatStringIssues/FormatStringIssue.cs
deleted file mode 100644
index 7017b02d42..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/FormatStringIssues/FormatStringIssue.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// FormatStringIssue.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using System.Linq;
-using ICSharpCode.NRefactory.Utils;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Format string syntax error",
-	                  Description = "Finds issues with format strings.",
-	                  Category = IssueCategories.ConstraintViolations,
-	                  Severity = Severity.Error)]
-	public class FormatStringIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<FormatStringIssue>
-		{
-			readonly BaseRefactoringContext context;
-			
-			public GatherVisitor(BaseRefactoringContext context) : base (context)
-			{
-				this.context = context;
-			}
-
-			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
-			{
-				base.VisitInvocationExpression(invocationExpression);
-
-				// Speed up the inspector by discarding some invocations early
-				var hasEligibleArgument = invocationExpression.Arguments.Any(argument => {
-					var primitiveArg = argument as PrimitiveExpression;
-					return primitiveArg != null && primitiveArg.Value is string;
-				});
-				if (!hasEligibleArgument)
-					return;
-
-				var invocationResolveResult = context.Resolve(invocationExpression) as CSharpInvocationResolveResult;
-				if (invocationResolveResult == null)
-					return;
-				Expression formatArgument;
-				IList<Expression> formatArguments;
-				if (!FormatStringHelper.TryGetFormattingParameters(invocationResolveResult, invocationExpression,
-				                                                   out formatArgument, out formatArguments, null)) {
-					return;
-				}
-				var primitiveArgument = formatArgument as PrimitiveExpression;
-				if (primitiveArgument == null || !(primitiveArgument.Value is string))
-					return;
-				var format = (string)primitiveArgument.Value;
-				var parsingResult = context.ParseFormatString(format);
-				CheckSegments(parsingResult.Segments, formatArgument.StartLocation, formatArguments, invocationExpression);
-			}
-
-			void CheckSegments(IList<IFormatStringSegment> segments, TextLocation formatStart, IList<Expression> formatArguments, AstNode anchor)
-			{
-				int argumentCount = formatArguments.Count;
-				foreach (var segment in segments) {
-					var errors = segment.Errors.ToList();
-					var formatItem = segment as FormatItem;
-					if (formatItem != null) {
-						var segmentEnd = new TextLocation(formatStart.Line, formatStart.Column + segment.EndLocation + 1);
-						var segmentStart = new TextLocation(formatStart.Line, formatStart.Column + segment.StartLocation + 1);
-						if (formatItem.Index >= argumentCount) {
-							var outOfBounds = context.TranslateString("The index '{0}' is out of bounds of the passed arguments");
-							AddIssue(segmentStart, segmentEnd, string.Format(outOfBounds, formatItem.Index));
-						}
-						if (formatItem.HasErrors) {
-							var errorMessage = string.Join(Environment.NewLine, errors.Select(error => error.Message).ToArray());
-							string messageFormat;
-							if (errors.Count > 1) {
-								messageFormat = context.TranslateString("Multiple:\n{0}");
-							} else {
-								messageFormat = context.TranslateString("{0}");
-							}
-							AddIssue(segmentStart, segmentEnd, string.Format(messageFormat, errorMessage));
-						}
-					} else if (segment.HasErrors) {
-						foreach (var error in errors) {
-							var errorStart = new TextLocation(formatStart.Line, formatStart.Column + error.StartLocation + 1);
-							var errorEnd = new TextLocation(formatStart.Line, formatStart.Column + error.EndLocation + 1);
-							AddIssue(errorStart, errorEnd, error.Message);
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/GatherVisitorBase.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/GatherVisitorBase.cs
deleted file mode 100644
index a9771d2912..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/GatherVisitorBase.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-// 
-// GatherVisitorBase.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp
-{
-	/// <summary>
-	/// A base class for writing issue provider visitor implementations.
-	/// </summary>
-	class GatherVisitorBase<T> : DepthFirstAstVisitor where T : ICodeIssueProvider
-	{
-		/// <summary>
-		/// The issue provider. May be <c>null</c> if none was specified.
-		/// </summary>
-		protected readonly T IssueProvider;
-
-		protected readonly BaseRefactoringContext ctx;
-		bool isDisabled;
-		bool isGloballySuppressed;
-		List<DomRegion> suppressedRegions =new List<DomRegion> ();
-
-		[SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
-		static string disableString;
-
-		[SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
-		static string restoreString;
-
-		[SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
-		static string suppressMessageCategory;
-
-		[SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
-		static string suppressMessageCheckId;
-
-		static void SetDisableKeyword(string disableKeyword)
-		{
-			disableString = "disable " + disableKeyword;
-			restoreString = "restore " + disableKeyword;
-		}
-
-		public readonly List<CodeIssue> FoundIssues = new List<CodeIssue> ();
-
-		static GatherVisitorBase()
-		{
-			var attr = (IssueDescriptionAttribute)typeof(T).GetCustomAttributes(false).FirstOrDefault(a => a is IssueDescriptionAttribute);
-			if (attr == null)
-				return;
-			if (attr.ResharperDisableKeyword != null) 
-				SetDisableKeyword(attr.ResharperDisableKeyword);
-			suppressMessageCheckId  = attr.SuppressMessageCheckId;
-			suppressMessageCategory = attr.SuppressMessageCategory;
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="GatherVisitorBase{T}"/> class.
-		/// </summary>
-		/// <param name='ctx'>
-		/// The refactoring context.
-		/// </param>
-		/// <param name='issueProvider'>
-		/// The issue provider.
-		/// </param>
-		public GatherVisitorBase (BaseRefactoringContext ctx, T issueProvider = default(T))
-		{
-			this.ctx = ctx;
-			this.IssueProvider = issueProvider;
-			if (suppressMessageCheckId != null) {
-				foreach (var attr in this.ctx.Compilation.MainAssembly.AssemblyAttributes) {
-					if (attr.AttributeType.Name == "SuppressMessageAttribute" && attr.AttributeType.Namespace == "System.Diagnostics.CodeAnalysis") {
-						if (attr.PositionalArguments.Count < 2)
-							return;
-						var category = attr.PositionalArguments [0].ConstantValue;
-						if (category == null || category.ToString() != suppressMessageCategory)
-							continue;
-						var checkId = attr.PositionalArguments [1].ConstantValue;
-						if (checkId == null || checkId.ToString() != suppressMessageCheckId) 
-							continue;
-						isGloballySuppressed = true;
-					}
-				}
-			}
-		}
-
-		/// <summary>
-		/// Gets all the issues using the context root node as base.
-		/// </summary>
-		/// <returns>
-		/// The issues.
-		/// </returns>
-		public IEnumerable<CodeIssue> GetIssues()
-		{
-			ctx.RootNode.AcceptVisitor(this);
-			return FoundIssues;
-		}
-
-		protected override void VisitChildren (AstNode node)
-		{
-			if (ctx.CancellationToken.IsCancellationRequested || isGloballySuppressed)
-				return;
-			base.VisitChildren (node);
-		}
-
-		public override void VisitComment(Comment comment)
-		{
-			if (comment.CommentType == CommentType.SingleLine && restoreString != null) {
-				var txt = comment.Content;
-				if (string.IsNullOrEmpty(txt))
-					return;
-				if (isDisabled) {
-					isDisabled &= txt.IndexOf(restoreString, StringComparison.InvariantCulture) < 0;
-				} else {
-					isDisabled |= txt.IndexOf(disableString, StringComparison.InvariantCulture) > 0;
-				}
-			}
-		}
-
-		public override void VisitAttribute(Attribute attribute)
-		{
-			base.VisitAttribute(attribute);
-			if (suppressMessageCheckId == null)
-				return;
-			var resolveResult = ctx.Resolve(attribute);
-			if (resolveResult.Type.Name == "SuppressMessageAttribute" && resolveResult.Type.Namespace == "System.Diagnostics.CodeAnalysis") {
-				if (attribute.Arguments.Count < 2)
-					return;
-				var category = attribute.Arguments.First () as PrimitiveExpression;
-				if (category == null || category.Value.ToString () != suppressMessageCategory)
-					return;
-				var checkId = attribute.Arguments.Skip (1).First () as PrimitiveExpression;
-				if (checkId == null || checkId.Value.ToString() != suppressMessageCheckId) 
-					return;
-				suppressedRegions.Add (attribute.Parent.Parent.Region);
-			}
-		}
-
-		protected bool IsSuppressed(TextLocation location)
-		{
-			return isDisabled || isGloballySuppressed || suppressedRegions.Any(r => r.IsInside(location));
-		}
-
-		protected void AddIssue(AstNode node, string title, System.Action<Script> fix = null)
-		{
-			if (IsSuppressed(node.StartLocation))
-				return;
-			FoundIssues.Add(new CodeIssue (title, node.StartLocation, node.EndLocation, fix != null ? new CodeAction (title, fix, node) : null));
-		}
-
-		protected void AddIssue(TextLocation start, TextLocation end, string title, System.Action<Script> fix = null)
-		{
-			if (IsSuppressed(start))
-				return;
-			FoundIssues.Add(new CodeIssue(title, start, end, fix != null ? new CodeAction(title, fix, start, end) : null));
-		}
-
-		protected void AddIssue(AstNode node, string title, CodeAction fix)
-		{
-			if (IsSuppressed(node.StartLocation))
-				return;
-			FoundIssues.Add(new CodeIssue(title, node.StartLocation, node.EndLocation, fix));
-		}
-
-		protected void AddIssue(TextLocation start, TextLocation end, string title, CodeAction fix)
-		{
-			if (IsSuppressed(start))
-				return;
-			FoundIssues.Add(new CodeIssue (title, start, end, fix));
-		}
-		
-		protected void AddIssue(AstNode node, string title, IEnumerable<CodeAction> fixes)
-		{
-			if (IsSuppressed(node.StartLocation))
-				return;
-			FoundIssues.Add(new CodeIssue(title, node.StartLocation, node.EndLocation, fixes));
-		}
-
-		protected void AddIssue(TextLocation start, TextLocation end, string title, IEnumerable<CodeAction> fixes)
-		{
-			if (IsSuppressed(start))
-				return;
-			FoundIssues.Add(new CodeIssue (title, start, end, fixes));
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IdenticalConditionalBranchIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IdenticalConditionalBranchIssue.cs
deleted file mode 100644
index 87504a01dc..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IdenticalConditionalBranchIssue.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// 
-// IdenticalConditionalBranchIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-
-	[IssueDescription ("'?:' expression has identical true and false branches",
-					   Description = "'?:' expression has identical true and false branches.",
-					   Category = IssueCategories.CodeQualityIssues,
-					   Severity = Severity.Warning,
-					   IssueMarker = IssueMarker.Underline,
-                       ResharperDisableKeyword = "ConditionalTernaryEqualBranch")]
-	public class IdenticalConditionalBranchIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<IdenticalConditionalBranchIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitConditionalExpression (ConditionalExpression conditionalExpression)
-			{
-				base.VisitConditionalExpression (conditionalExpression);
-
-				if (!conditionalExpression.TrueExpression.Match (conditionalExpression.FalseExpression).Success)
-					return;
-				var action = new CodeAction (ctx.TranslateString ("Replace '?:' with branch"),
-					script => script.Replace (conditionalExpression, conditionalExpression.TrueExpression.Clone ()), conditionalExpression.QuestionMarkToken);
-				AddIssue (conditionalExpression, 
-					ctx.TranslateString ("'?:' expression has identical true and false branches"), new [] { action });
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/InconsistentNamingIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/InconsistentNamingIssue.cs
deleted file mode 100644
index 8cf6944695..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/InconsistentNamingIssue.cs
+++ /dev/null
@@ -1,369 +0,0 @@
-// 
-// InconsistentNamingIssue.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Inconsistent Naming",
-	       Description = "Name doesn't match the defined style for this entity.",
-	       Category = IssueCategories.ConstraintViolations,
-	       Severity = Severity.Warning,
-           ResharperDisableKeyword = "CheckNamespace")]
-	public class InconsistentNamingIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			var visitor = new GatherVisitor(context);
-			context.RootNode.AcceptVisitor(visitor);
-			return visitor.FoundIssues;
-		}
-
-		class GatherVisitor : GatherVisitorBase<InconsistentNamingIssue>
-		{
-			readonly NamingConventionService service;
-
-			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
-			{
-				service = (NamingConventionService)ctx.GetService (typeof (NamingConventionService));
-			}
-
-			void CheckName(TypeDeclaration node, AffectedEntity entity, Identifier identifier, Modifiers accessibilty)
-			{
-				TypeResolveResult resolveResult = ctx.Resolve(node) as TypeResolveResult;
-				if (resolveResult == null)
-					return;
-				var type = resolveResult.Type;
-				if (type.DirectBaseTypes.Any(t => t.FullName == "System.Attribute")) {
-					if (CheckNamedResolveResult(resolveResult, node, AffectedEntity.CustomAttributes, identifier, accessibilty)) {
-						return;
-					}
-				} else if (type.DirectBaseTypes.Any(t => t.FullName == "System.EventArgs")) {
-					if (CheckNamedResolveResult(resolveResult, node, AffectedEntity.CustomEventArgs, identifier, accessibilty)) {
-						return;
-					}
-				} else if (type.DirectBaseTypes.Any(t => t.FullName == "System.Exception")) {
-					if (CheckNamedResolveResult(resolveResult, node, AffectedEntity.CustomExceptions, identifier, accessibilty)) {
-						return;
-					}
-				}
-
-				var typeDef = type.GetDefinition();
-				if (typeDef != null && typeDef.Attributes.Any(attr => attr.AttributeType.FullName == "NUnit.Framework.TestFixtureAttribute")) {
-					if (CheckNamedResolveResult(resolveResult, node, AffectedEntity.TestType, identifier, accessibilty)) {
-						return;
-					}
-				}
-
-				CheckNamedResolveResult(resolveResult, node, entity, identifier, accessibilty);
-			}
-
-			void CheckName(MethodDeclaration node, AffectedEntity entity, Identifier identifier, Modifiers accessibilty)
-			{
-				ResolveResult resolveResult = null;
-				if (node != null && node.Attributes.Any ())
-					resolveResult = ctx.Resolve(node);
-				
-				if (resolveResult is MemberResolveResult) {
-					var member = ((MemberResolveResult)resolveResult).Member;
-					if (member.SymbolKind == SymbolKind.Method && member.Attributes.Any(attr => attr.AttributeType.FullName == "NUnit.Framework.TestAttribute")) {
-						if (CheckNamedResolveResult(resolveResult, node, AffectedEntity.TestMethod, identifier, accessibilty)) {
-							return;
-						}
-					}
-				}
-
-				CheckNamedResolveResult(resolveResult, node, entity, identifier, accessibilty);
-			}
-
-			void CheckName(AstNode node, AffectedEntity entity, Identifier identifier, Modifiers accessibilty)
-			{
-				CheckNamedResolveResult(null, node, entity, identifier, accessibilty);
-			}
-
-			bool CheckNamedResolveResult(ResolveResult resolveResult, AstNode node, AffectedEntity entity, Identifier identifier, Modifiers accessibilty)
-			{
-				bool wasHandled = false;
-				foreach (var rule in service.Rules) {
-					if (!rule.AffectedEntity.HasFlag(entity)) {
-						continue;
-					}
-					if (!rule.VisibilityMask.HasFlag(accessibilty)) {
-						continue;
-					}
-					if (!rule.IncludeInstanceMembers || !rule.IncludeStaticEntities) {
-						EntityDeclaration typeSystemEntity;
-						if (node is VariableInitializer) {
-							typeSystemEntity = node.Parent as EntityDeclaration;
-						} else {
-							typeSystemEntity = node as EntityDeclaration;
-						}
-						if (!rule.IncludeInstanceMembers) {
-							if (typeSystemEntity == null || !typeSystemEntity.HasModifier (Modifiers.Static) || typeSystemEntity.HasModifier (Modifiers.Sealed)) {
-								continue;
-							}
-						}
-						if (!rule.IncludeStaticEntities) {
-							if (typeSystemEntity == null || typeSystemEntity.HasModifier (Modifiers.Static) || typeSystemEntity.HasModifier (Modifiers.Sealed)) {
-								continue;
-							}
-						}
-					}
-
-					wasHandled = true;
-					if (!rule.IsValid(identifier.Name)) {
-						IList<string> suggestedNames;
-						var msg = rule.GetErrorMessage(ctx, identifier.Name, out suggestedNames);
-						var actions = new List<CodeAction>(suggestedNames.Select(n => new CodeAction(string.Format(ctx.TranslateString("Rename to '{0}'"), n), (Script script) => {
-							if (resolveResult == null)
-								resolveResult = ctx.Resolve (node);
-							if (resolveResult is MemberResolveResult) {
-								script.Rename(((MemberResolveResult)resolveResult).Member, n);
-							} else if (resolveResult is TypeResolveResult) {
-								var def = resolveResult.Type.GetDefinition();
-								if (def != null) {
-									script.Rename(def, n);
-								} else if (resolveResult.Type.Kind == TypeKind.TypeParameter) {
-									script.Rename((ITypeParameter)resolveResult.Type, n);
-								}
-							} else if (resolveResult is LocalResolveResult) {
-								script.Rename(((LocalResolveResult)resolveResult).Variable, n);
-							} else if (resolveResult is NamespaceResolveResult) {
-								script.Rename(((NamespaceResolveResult)resolveResult).Namespace, n);
-							} else { 
-								script.Replace(identifier, Identifier.Create(n));
-							}
-						}, identifier)));
-
-						if (entity != AffectedEntity.Label) {
-							actions.Add(new CodeAction(string.Format(ctx.TranslateString("Rename '{0}'..."), identifier.Name), (Script script) => {
-								if (resolveResult == null)
-									resolveResult = ctx.Resolve (node);
-								if (resolveResult is MemberResolveResult) {
-									script.Rename(((MemberResolveResult)resolveResult).Member);
-								} else if (resolveResult is TypeResolveResult) {
-									var def = resolveResult.Type.GetDefinition();
-									if (def != null) {
-										script.Rename(def);
-									} else if (resolveResult.Type.Kind == TypeKind.TypeParameter) {
-										script.Rename((ITypeParameter)resolveResult.Type);
-									}
-								} else if (resolveResult is LocalResolveResult) {
-									script.Rename(((LocalResolveResult)resolveResult).Variable);
-								} else if (resolveResult is NamespaceResolveResult) {
-									script.Rename(((NamespaceResolveResult)resolveResult).Namespace);
-								}
-							}, identifier));
-						}
-
-						AddIssue(identifier, msg, actions);
-					}
-				}
-				return wasHandled;
-			}
-
-			public override void VisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration)
-			{
-				base.VisitNamespaceDeclaration(namespaceDeclaration);
-				foreach (var id in namespaceDeclaration.Identifiers) {
-					CheckNamedResolveResult(null, namespaceDeclaration, AffectedEntity.Namespace, id, Modifiers.None);
-				}
-			}
-
-			Modifiers GetAccessibiltiy(EntityDeclaration decl, Modifiers defaultModifier)
-			{
-				var accessibility = (decl.Modifiers & Modifiers.VisibilityMask);
-				if (accessibility == Modifiers.None) {
-					return defaultModifier;
-				}
-				return accessibility;
-			}
-
-			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
-			{
-				base.VisitTypeDeclaration(typeDeclaration);
-				AffectedEntity entity;
-				switch (typeDeclaration.ClassType) {
-					case ClassType.Class:
-						entity = AffectedEntity.Class;
-						break;
-					case ClassType.Struct:
-						entity = AffectedEntity.Struct;
-						break;
-					case ClassType.Interface:
-						entity = AffectedEntity.Interface;
-						break;
-					case ClassType.Enum:
-						entity = AffectedEntity.Enum;
-						break;
-					default:
-						throw new System.ArgumentOutOfRangeException();
-				}
-				CheckName(typeDeclaration, entity, typeDeclaration.NameToken, GetAccessibiltiy(typeDeclaration, typeDeclaration.Parent is TypeDeclaration ? Modifiers.Private : Modifiers.Internal));
-			}
-
-			public override void VisitDelegateDeclaration(DelegateDeclaration delegateDeclaration)
-			{
-				base.VisitDelegateDeclaration(delegateDeclaration);
-				CheckName(delegateDeclaration, AffectedEntity.Delegate, delegateDeclaration.NameToken, GetAccessibiltiy(delegateDeclaration, delegateDeclaration.Parent is TypeDeclaration ? Modifiers.Private : Modifiers.Internal));
-			}
-
-			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
-			{
-				if (propertyDeclaration.Modifiers.HasFlag (Modifiers.Override))
-					return;
-				base.VisitPropertyDeclaration(propertyDeclaration);
-				CheckName(propertyDeclaration, AffectedEntity.Property, propertyDeclaration.NameToken, GetAccessibiltiy(propertyDeclaration, Modifiers.Private));
-			}
-
-			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
-			{
-				if (indexerDeclaration.Modifiers.HasFlag(Modifiers.Override)) {
-					var rr = ctx.Resolve (indexerDeclaration) as MemberResolveResult;
-					if (rr == null)
-						return;
-					var baseType = rr.Member.DeclaringType.DirectBaseTypes.FirstOrDefault (t => t.Kind != TypeKind.Interface);
-					var method = baseType != null ? baseType.GetProperties (m => m.IsIndexer && m.IsOverridable && m.Parameters.Count == indexerDeclaration.Parameters.Count).FirstOrDefault () : null;
-					if (method == null)
-						return;
-					int i = 0;
-					foreach (var par in indexerDeclaration.Parameters) {
-						if (method.Parameters[i++].Name != par.Name) {
-							par.AcceptVisitor (this);
-						}
-					}
-					return;
-				}
-				base.VisitIndexerDeclaration(indexerDeclaration);
-			}
-
-			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
-			{
-				if (methodDeclaration.Modifiers.HasFlag(Modifiers.Override)) {
-					var rr = ctx.Resolve (methodDeclaration) as MemberResolveResult;
-					if (rr == null)
-						return;
-					var baseType = rr.Member.DeclaringType.DirectBaseTypes.FirstOrDefault (t => t.Kind != TypeKind.Interface);
-					var method = baseType != null ? baseType.GetMethods (m => m.Name == rr.Member.Name && m.IsOverridable && m.Parameters.Count == methodDeclaration.Parameters.Count).FirstOrDefault () : null;
-					if (method == null)
-						return;
-					int i = 0;
-					foreach (var par in methodDeclaration.Parameters) {
-						if (method.Parameters[i++].Name != par.Name) {
-							par.AcceptVisitor (this);
-						}
-					}
-
-					return;
-				}
-				base.VisitMethodDeclaration(methodDeclaration);
-
-				CheckName(methodDeclaration, methodDeclaration.Modifiers.HasFlag(Modifiers.Async) ? AffectedEntity.AsyncMethod : AffectedEntity.Method, methodDeclaration.NameToken, GetAccessibiltiy(methodDeclaration, Modifiers.Private));
-			}
-
-			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
-			{
-				base.VisitFieldDeclaration(fieldDeclaration);
-				var entity = AffectedEntity.Field;
-				if (fieldDeclaration.Modifiers.HasFlag(Modifiers.Const)) {
-					entity = AffectedEntity.ConstantField;
-				} else if (fieldDeclaration.Modifiers.HasFlag(Modifiers.Readonly)) {
-					entity = AffectedEntity.ReadonlyField;
-				}
-				foreach (var init in fieldDeclaration.Variables) {
-					CheckName(init, entity, init.NameToken, GetAccessibiltiy(fieldDeclaration, Modifiers.Private));
-				}
-			}
-
-			public override void VisitFixedFieldDeclaration(FixedFieldDeclaration fixedFieldDeclaration)
-			{
-				base.VisitFixedFieldDeclaration(fixedFieldDeclaration);
-				var entity = AffectedEntity.Field;
-				if (fixedFieldDeclaration.Modifiers.HasFlag(Modifiers.Const)) {
-					entity = AffectedEntity.ConstantField;
-				} else if (fixedFieldDeclaration.Modifiers.HasFlag(Modifiers.Readonly)) {
-					entity = AffectedEntity.ReadonlyField;
-				}
-				CheckName(fixedFieldDeclaration, entity, fixedFieldDeclaration.NameToken, GetAccessibiltiy(fixedFieldDeclaration, Modifiers.Private));
-			}
-
-			public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
-			{
-				base.VisitEventDeclaration(eventDeclaration);
-				foreach (var init in eventDeclaration.Variables) {
-					CheckName(init, AffectedEntity.Event, init.NameToken, GetAccessibiltiy(eventDeclaration, Modifiers.Private));
-				}
-			}
-
-			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
-			{
-				if (eventDeclaration.Modifiers.HasFlag (Modifiers.Override))
-					return;
-				base.VisitCustomEventDeclaration(eventDeclaration);
-				CheckName(eventDeclaration, AffectedEntity.Event, eventDeclaration.NameToken, GetAccessibiltiy(eventDeclaration, Modifiers.Private));
-			}
-
-			public override void VisitEnumMemberDeclaration(EnumMemberDeclaration enumMemberDeclaration)
-			{
-				base.VisitEnumMemberDeclaration(enumMemberDeclaration);
-				CheckName(enumMemberDeclaration, AffectedEntity.EnumMember, enumMemberDeclaration.NameToken, GetAccessibiltiy(enumMemberDeclaration, Modifiers.Private));
-			}
-
-			public override void VisitParameterDeclaration(ParameterDeclaration parameterDeclaration)
-			{
-				base.VisitParameterDeclaration(parameterDeclaration);
-				CheckNamedResolveResult(null, parameterDeclaration, parameterDeclaration.Parent is LambdaExpression ? AffectedEntity.LambdaParameter : AffectedEntity.Parameter, parameterDeclaration.NameToken, Modifiers.None);
-			}
-
-			public override void VisitTypeParameterDeclaration(TypeParameterDeclaration typeParameterDeclaration)
-			{
-				base.VisitTypeParameterDeclaration(typeParameterDeclaration);
-				CheckNamedResolveResult(null, typeParameterDeclaration, AffectedEntity.TypeParameter, typeParameterDeclaration.NameToken, Modifiers.None);
-			}
-
-			public override void VisitVariableDeclarationStatement(VariableDeclarationStatement variableDeclarationStatement)
-			{
-				base.VisitVariableDeclarationStatement(variableDeclarationStatement);
-				var entity = variableDeclarationStatement.Modifiers.HasFlag(Modifiers.Const) ? AffectedEntity.LocalConstant : AffectedEntity.LocalVariable;
-				foreach (var init in variableDeclarationStatement.Variables) {
-					CheckNamedResolveResult(null, init, entity, init.NameToken, Modifiers.None);
-				}
-			}
-
-			public override void VisitLabelStatement(LabelStatement labelStatement)
-			{
-				base.VisitLabelStatement(labelStatement);
-				CheckNamedResolveResult(null, labelStatement, AffectedEntity.Label, labelStatement.LabelToken, Modifiers.None);
-			}
-		}
-
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/NamingRule.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/NamingRule.cs
deleted file mode 100644
index 1f1122c5b3..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/NamingRule.cs
+++ /dev/null
@@ -1,397 +0,0 @@
-// 
-// NamingRule.cs
-//  
-// Author:
-//       Michael Hutchinson <mhutch@xamarin.com>
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using System.Text;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	public class NamingRule : IEquatable<NamingRule>
-	{
-		public string Name { get; set; }
-		/// <summary>
-		/// If set, identifiers are required to be prefixed with one of these values.
-		/// </summary>
-		public string[] RequiredPrefixes { get; set; }
-
-		/// <summary>
-		/// If set, identifiers are allowed to be prefixed with one of these values.
-		/// </summary>
-		public string[] AllowedPrefixes { get; set; }
-
-		/// <summary>
-		/// If set, identifiers are required to be suffixed with one of these values.
-		/// </summary>
-		public string[] RequiredSuffixes { get; set; }
-
-		/// <summary>
-		/// If set, identifiers cannot be prefixed by any of these values.
-		/// </summary>
-		public string[] ForbiddenPrefixes { get; set; }
-
-		/// <summary>
-		/// If set, identifiers cannot be suffixed by with any of these values.
-		/// </summary
-		public string[] ForbiddenSuffixes { get; set; }
-
-		/// <summary>
-		/// Gets or sets the affected entity.
-		/// </summary>
-		public AffectedEntity AffectedEntity { get; set; } 
-
-		/// <summary>
-		/// Gets or sets the modifiers mask
-		/// </summary>
-		public Modifiers VisibilityMask { get; set; } 
-
-		/// <summary>
-		/// The way that the identifier is cased and that words are separated.
-		/// </summary
-		public NamingStyle NamingStyle { get; set; }
-
-		public bool IncludeStaticEntities { get; set; }
-		public bool IncludeInstanceMembers { get; set; }
-
-		public bool IsValid(string name)
-		{
-			string id = name;
-			bool foundPrefix = false;
-			if (RequiredPrefixes != null && RequiredPrefixes.Length > 0) {
-				var prefix = RequiredPrefixes.FirstOrDefault(p => id.StartsWith(p, StringComparison.Ordinal));
-				if (prefix == null) {
-					return false;
-				}
-				id = id.Substring(prefix.Length);
-				foundPrefix = true;
-			}
-			
-			if (!foundPrefix && AllowedPrefixes != null && AllowedPrefixes.Length > 0) {
-				var prefix = AllowedPrefixes.FirstOrDefault(p => id.StartsWith(p, StringComparison.Ordinal));
-				if (prefix != null) {
-					id = id.Substring(prefix.Length);
-					foundPrefix = true;
-				}
-			}
-			
-			if (!foundPrefix && ForbiddenPrefixes != null && ForbiddenPrefixes.Length > 0) {
-				if (ForbiddenPrefixes.Any(p => id.StartsWith(p, StringComparison.Ordinal))) {
-					return false;
-				}
-			}
-			
-			if (RequiredSuffixes != null && RequiredSuffixes.Length > 0) {
-				var suffix = RequiredSuffixes.FirstOrDefault(s => id.EndsWith(s, StringComparison.Ordinal));
-				if (suffix == null) {
-					return false;
-				}
-				id = id.Substring(0, id.Length - suffix.Length);
-			} else if (ForbiddenSuffixes != null && ForbiddenSuffixes.Length > 0) {
-				if (ForbiddenSuffixes.Any(p => id.EndsWith(p, StringComparison.Ordinal))) {
-					return false;
-				}
-			}
-			
-			switch (NamingStyle) {
-				case NamingStyle.AllLower:
-					return !id.Any(ch => char.IsLetter(ch) && char.IsUpper(ch));
-				case NamingStyle.AllUpper:
-					return !id.Any(ch => char.IsLetter(ch) && char.IsLower(ch));
-				case NamingStyle.CamelCase:
-					return id.Length == 0 || (char.IsLower(id [0]) && NoUnderscore(id));
-				case NamingStyle.PascalCase:
-					return id.Length == 0 || (char.IsUpper(id [0]) && NoUnderscore(id));
-				case NamingStyle.FirstUpper:
-					return id.Length == 0 && char.IsUpper(id [0]) && !id.Skip(1).Any(ch => char.IsLetter(ch) && char.IsUpper(ch));
-			}
-			return true;
-		}
-
-		public NamingRule(AffectedEntity affectedEntity)
-		{
-			AffectedEntity = affectedEntity;
-			VisibilityMask = Modifiers.VisibilityMask;
-			IncludeStaticEntities = true;
-			IncludeInstanceMembers = true;
-		}
-
-		static bool NoUnderscore(string id)
-		{
-			return id.IndexOf('_') < 0;
-		}
-
-//		static bool NoUnderscoreWithoutNumber(string id)
-//		{
-//			int idx = id.IndexOf('_');
-//			while (idx >= 0 && idx < id.Length) {
-//				if ((idx + 2 >= id.Length || !char.IsDigit(id [idx + 1])) && (idx == 0 || !char.IsDigit(id [idx - 1]))) {
-//					return false;
-//				}
-//				idx = id.IndexOf('_', idx + 1);
-//			}
-//			return true;
-//		}
-
-
-		public string GetErrorMessage(BaseRefactoringContext ctx, string name, out IList<string> suggestedNames)
-		{
-			suggestedNames = new List<string>();
-			string id = name;
-			
-			string errorMessage = null;
-			
-			bool missingRequiredPrefix = false;
-			bool missingRequiredSuffix = false;
-			string requiredPrefix = null;
-			string allowedPrefix = null;
-			string suffix = null;
-			
-			if (AllowedPrefixes != null && AllowedPrefixes.Length > 0) {
-				allowedPrefix = AllowedPrefixes.FirstOrDefault(p => id.StartsWith(p, StringComparison.Ordinal));
-				if (allowedPrefix != null)
-					id = id.Substring(allowedPrefix.Length);
-
-			}
-
-			if (RequiredPrefixes != null && RequiredPrefixes.Length > 0) {
-				requiredPrefix = RequiredPrefixes.FirstOrDefault(p => id.StartsWith(p, StringComparison.Ordinal));
-				if (requiredPrefix == null) {
-					errorMessage = string.Format(ctx.TranslateString("Name should have prefix '{0}'."), RequiredPrefixes [0]);
-					missingRequiredPrefix = true;
-				} else {
-					id = id.Substring(requiredPrefix.Length);
-				}
-			} else if (ForbiddenPrefixes != null && ForbiddenPrefixes.Length > 0) {
-				requiredPrefix = ForbiddenPrefixes.FirstOrDefault(p => id.StartsWith(p, StringComparison.Ordinal));
-				if (requiredPrefix != null) {
-					errorMessage = string.Format(ctx.TranslateString("Name has forbidden prefix '{0}'."), requiredPrefix);
-					id = id.Substring(requiredPrefix.Length);
-				}
-			}
-			
-			if (RequiredSuffixes != null && RequiredSuffixes.Length > 0) {
-				suffix = RequiredSuffixes.FirstOrDefault(s => id.EndsWith(s, StringComparison.Ordinal));
-				if (suffix == null) {
-					errorMessage = string.Format(ctx.TranslateString("Name should have suffix '{0}'."), RequiredSuffixes [0]);
-					missingRequiredSuffix = true;
-				} else {
-					id = id.Substring(0, id.Length - suffix.Length);
-				}
-			} else if (ForbiddenSuffixes != null && ForbiddenSuffixes.Length > 0) {
-				suffix = ForbiddenSuffixes.FirstOrDefault(p => id.EndsWith(p, StringComparison.Ordinal));
-				if (suffix != null) {
-					errorMessage = string.Format(ctx.TranslateString("Name has forbidden suffix '{0}'."), suffix);
-					id = id.Substring(0, id.Length - suffix.Length);
-				}
-			}
-			
-			switch (NamingStyle) {
-				case NamingStyle.AllLower:
-					if (id.Any(ch => char.IsLetter(ch) && char.IsUpper(ch))) {
-						errorMessage = string.Format(ctx.TranslateString("'{0}' contains upper case letters."), name);
-						suggestedNames.Add(LowerCaseIdentifier(WordParser.BreakWords(id)));
-					} else {
-						suggestedNames.Add(id);
-					}
-					break;
-				case NamingStyle.AllUpper:
-					if (id.Any(ch => char.IsLetter(ch) && char.IsLower(ch))) {
-						errorMessage = string.Format(ctx.TranslateString("'{0}' contains lower case letters."), name);
-						suggestedNames.Add(UpperCaseIdentifier(WordParser.BreakWords(id)));
-					} else {
-						suggestedNames.Add(id);
-					}
-					break;
-				case NamingStyle.CamelCase:
-					if (id.Length > 0 && char.IsUpper(id [0])) {
-						errorMessage = string.Format(ctx.TranslateString("'{0}' should start with a lower case letter."), name);
-					} else if (!NoUnderscore(id)) {
-						errorMessage = string.Format(ctx.TranslateString("'{0}' should not separate words with an underscore."), name);
-					} else {
-						suggestedNames.Add(id);
-						break;
-					}
-					suggestedNames.Add(CamelCaseIdentifier(WordParser.BreakWords(id)));
-					break;
-				case NamingStyle.PascalCase:
-					if (id.Length > 0 && char.IsLower(id [0])) {
-						errorMessage = string.Format(ctx.TranslateString("'{0}' should start with an upper case letter."), name);
-					} else if (!NoUnderscore(id)) {
-						errorMessage = string.Format(ctx.TranslateString("'{0}' should not separate words with an underscore."), name);
-					} else {
-						suggestedNames.Add(id);
-						break;
-					}
-					suggestedNames.Add(PascalCaseIdentifier(WordParser.BreakWords(id)));
-					break;
-				case NamingStyle.FirstUpper:
-					if (id.Length > 0 && char.IsLower(id [0])) {
-						errorMessage = string.Format(ctx.TranslateString("'{0}' should start with an upper case letter."), name);
-					} else if (id.Take(1).Any(ch => char.IsLetter(ch) && char.IsUpper(ch))) {
-						errorMessage = string.Format(ctx.TranslateString("'{0}' contains an upper case letter after the first."), name);
-					} else {
-						suggestedNames.Add(id);
-						break;
-					}
-					suggestedNames.Add(FirstUpperIdentifier(WordParser.BreakWords(id)));
-					break;
-			}
-
-			if (requiredPrefix != null) {
-				for (int i = 0; i < suggestedNames.Count; i++) {
-					suggestedNames [i] = requiredPrefix + suggestedNames [i];
-				}
-			} else if (allowedPrefix != null) {
-				int count = suggestedNames.Count;
-				for (int i = 0; i < count; i++) {
-					suggestedNames.Add(suggestedNames [i]);
-					suggestedNames [i] = allowedPrefix + suggestedNames [i];
-				}
-			} else if (missingRequiredPrefix) {
-				for (int i = 0; i < suggestedNames.Count; i++) {
-					var n = suggestedNames [i];
-					bool first = true;
-					foreach (var p in RequiredPrefixes) {
-						if (first) {
-							first = false;
-							suggestedNames [i] = p + n;
-						} else {
-							suggestedNames.Add(p + n);
-						}
-					}
-				}
-			}
-			
-			if (suffix != null) {
-				for (int i = 0; i < suggestedNames.Count; i++) {
-					suggestedNames [i] = suggestedNames [i] + suffix;
-				}
-			} else if (missingRequiredSuffix) {
-				for (int i = 0; i < suggestedNames.Count; i++) {
-					var n = suggestedNames [i];
-					bool first = true;
-					foreach (var s in RequiredSuffixes) {
-						if (first) {
-							first = false;
-							suggestedNames [i] = n + s;
-						} else {
-							suggestedNames.Add(n + s);
-						}
-					}
-				}
-			}
-			
-			return errorMessage
-			// should never happen.
-				?? "no known errors.";
-		}
-
-		static string CamelCaseIdentifier (List<string> words)
-		{
-			var sb = new StringBuilder ();
-			sb.Append (words[0].ToLower ());
-			for (int i = 1; i < words.Count; i++) {
-//				if (sb.Length > 0 && (char.IsDigit (sb[sb.Length-1]) || char.IsDigit (words[i][0])))
-//					sb.Append ('_');
-				AppendCapitalized (words[i], sb);
-			}
-			return sb.ToString ();
-		}
-		
-		static string PascalCaseIdentifier (List<string> words)
-		{
-			var sb = new StringBuilder ();
-			for (int i = 0; i < words.Count; i++) {
-//				if (sb.Length > 0 && (char.IsDigit (sb[sb.Length-1]) || char.IsDigit (words[i][0])))
-//					sb.Append ('_');
-				AppendCapitalized (words[i], sb);
-			}
-			return sb.ToString ();
-		}
-		
-		static string LowerCaseIdentifier (List<string> words)
-		{
-			var sb = new StringBuilder ();
-			sb.Append (words[0].ToLower ());
-			for (int i = 1; i < words.Count; i++) {
-				sb.Append ('_');
-				sb.Append (words[i].ToLower ());
-			}
-			return sb.ToString ();
-		}
-		
-		static string UpperCaseIdentifier (List<string> words)
-		{
-			var sb = new StringBuilder ();
-			sb.Append (words[0].ToUpper ());
-			for (int i = 1; i < words.Count; i++) {
-				sb.Append ('_');
-				sb.Append (words[i].ToUpper ());
-			}
-			return sb.ToString ();
-		}
-		
-		static string FirstUpperIdentifier (List<string> words)
-		{
-			var sb = new StringBuilder ();
-			AppendCapitalized (words[0], sb);
-			for (int i = 1; i < words.Count; i++) {
-				sb.Append ('_');
-				sb.Append (words[i].ToLower ());
-			}
-			return sb.ToString ();
-		}
-		
-		static void AppendCapitalized(string word, StringBuilder sb)
-		{
-			sb.Append(word.ToLower());
-			sb [sb.Length - word.Length] = char.ToUpper(sb [sb.Length - word.Length]);
-		}
-
-		#region IEquatable implementation
-		public bool Equals (NamingRule other)
-		{
-			return Name == other.Name &&
-				AffectedEntity == other.AffectedEntity && 
-				VisibilityMask == other.VisibilityMask && 
-				NamingStyle == other.NamingStyle;
-		}
-		#endregion
-
-		public NamingRule Clone()
-		{
-			return (NamingRule)MemberwiseClone();
-		}
-
-		public override string ToString()
-		{
-			return string.Format("[NamingRule: Name={0}, AffectedEntity={1}, VisibilityMask={2}, NamingStyle={3}, IncludeStaticEntities={4}, IncludeInstanceMembers={5}]", Name, AffectedEntity, VisibilityMask, NamingStyle, IncludeStaticEntities, IncludeInstanceMembers);
-		}
-		
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/NamingStyle.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/NamingStyle.cs
deleted file mode 100644
index bf94270f13..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/NamingStyle.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// 
-// NamingStyle.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	public enum NamingStyle {
-		None,
-		
-		/// <summary>
-		/// PascalCase
-		/// </summary>
-		PascalCase,
-		
-		/// <summary>
-		/// camelCase
-		/// </summary>
-		CamelCase,
-
-		/// <summary>
-		/// ALLUPPER
-		/// </summary>
-		AllUpper,
-
-		/// <summary>
-		/// alllower
-		/// </summary>
-		AllLower,
-
-		/// <summary>
-		/// Firstupper
-		/// </summary>
-		FirstUpper
-	}
-
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IncorrectCallToObjectGetHashCodeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IncorrectCallToObjectGetHashCodeIssue.cs
deleted file mode 100644
index efb83e1c22..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IncorrectCallToObjectGetHashCodeIssue.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// IncorrectCallToObjectGetHashCodeIssue.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Call resolves to Object.GetHashCode, which is reference based",
-	                   Description = "Finds calls to Object.GetHashCode inside overridden GetHashCode.",
-	                   Category = IssueCategories.CodeQualityIssues,
-	                   Severity = Severity.Warning,
-                       ResharperDisableKeyword = "BaseObjectGetHashCodeCallInGetHashCode")]
-	public class IncorrectCallToObjectGetHashCodeIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<IncorrectCallToObjectGetHashCodeIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext context) : base (context)
-			{
-			}
-
-			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
-			{
-				// Check that this declaration is a GetHashCode override, _then_ continue traversing
-
-				if (methodDeclaration.Name != "GetHashCode") {
-					return;
-				}
-				if (!methodDeclaration.Modifiers.HasFlag(Modifiers.Override)) {
-					return;
-				}
-
-				base.VisitMethodDeclaration(methodDeclaration);
-			}
-
-			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
-			{
-				base.VisitInvocationExpression(invocationExpression);
-
-				var resolveResult = ctx.Resolve(invocationExpression) as InvocationResolveResult;
-				if (resolveResult == null || !(resolveResult.TargetResult is ThisResolveResult) || resolveResult.Member.Name != "GetHashCode" ||
-				    !resolveResult.Member.DeclaringTypeDefinition.IsKnownType(KnownTypeCode.Object)) {
-					return;
-				}
-				AddIssue(invocationExpression, ctx.TranslateString("Call resolves to Object.GetHashCode, which is reference based"));
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IncorrectExceptionParameterOrderingIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IncorrectExceptionParameterOrderingIssue.cs
deleted file mode 100644
index d86a788aad..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IncorrectExceptionParameterOrderingIssue.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// IncorrectExceptionParametersOrderingIssue.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-using System;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Incorrect ordering of exception constructor parameters",
-	       Description = "Warns about the constructor parameter ordering of some confusing exception types.",
-	       Category = IssueCategories.CodeQualityIssues,
-	       Severity = Severity.Warning)]
-	public class IncorrectExceptionParameterOrderingIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<IncorrectExceptionParameterOrderingIssue>
-		{
-			readonly BaseRefactoringContext context;
-			Dictionary<string, Func<int, int, bool>> rules;
-
-			public GatherVisitor(BaseRefactoringContext context) : base (context)
-			{
-				this.context = context;
-				rules = new Dictionary<string, Func<int, int, bool>>();
-				rules [typeof(ArgumentException).FullName] = (left, right) => left > right;
-				rules [typeof(ArgumentNullException).FullName] = (left, right) => left < right;
-				rules [typeof(ArgumentOutOfRangeException).FullName] = (left, right) => left < right;
-				rules [typeof(DuplicateWaitObjectException).FullName] = (left, right) => left < right;
-			}
-
-			public override void VisitObjectCreateExpression(ObjectCreateExpression objectCreateExpression)
-			{
-				var parameters = objectCreateExpression.Arguments;
-				if (parameters.Count != 2)
-					return;
-				var firstParam = parameters.FirstOrNullObject() as PrimitiveExpression;
-				var secondParam = parameters.LastOrNullObject() as PrimitiveExpression;
-				if (firstParam == null || !(firstParam.Value is string) ||
-					secondParam == null || !(secondParam.Value is string))
-					return;
-				var type = context.Resolve(objectCreateExpression.Type) as TypeResolveResult;
-				if (type == null)
-					return;
-				var leftLength = (firstParam.Value as string).Length;
-				var rightLength = (secondParam.Value as string).Length;
-
-				Func<int, int, bool> func;
-				if (!rules.TryGetValue(type.Type.FullName, out func))
-					return;
-				if (!func(leftLength, rightLength))
-					AddIssue(objectCreateExpression,
-					         context.TranslateString("The parameters are in the wrong order"),
-					         GetAction(objectCreateExpression, firstParam, secondParam));
-			}
-
-			CodeAction GetAction(ObjectCreateExpression objectCreateExpression,
-			                                   PrimitiveExpression firstParam, PrimitiveExpression secondParam)
-			{
-				return new CodeAction(context.TranslateString("Swap parameters"), script => {
-					var newOCE = objectCreateExpression.Clone() as ObjectCreateExpression;
-					newOCE.Arguments.Clear();
-					newOCE.Arguments.Add(secondParam.Clone());
-					newOCE.Arguments.Add(firstParam.Clone());
-					script.Replace(objectCreateExpression, newOCE);
-				}, objectCreateExpression);
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IssueCategories.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IssueCategories.cs
deleted file mode 100644
index 6ac8d9de94..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IssueCategories.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// 
-// IssueCategories.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-
-namespace ICSharpCode.NRefactory.CSharp
-{
-	public class IssueCategories
-	{
-		public const string Improvements      = "Code Improvements";
-		public const string CodeQualityIssues = "Code Quality Issues";
-		public const string ConstraintViolations = "Constraint Violations";
-		public const string Redundancies = "Redundancies";
-		public const string Opportunities = "Language Usage Opportunities";
-		public const string Notifications = "Code Notifications";
-		public const string CompilerWarnings = "Compiler Warnings";
-		public const string CompilerErrors = "Compiler Errors";
-	}
-}
-
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MethodNeverReturnsIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MethodNeverReturnsIssue.cs
deleted file mode 100644
index b115eab2f1..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MethodNeverReturnsIssue.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// 
-// MethodNeverReturnsIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp.Analysis;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Method never returns",
-		Description = "Method does not reach its end or a 'return' statement by any of possible execution paths.",
-		Category = IssueCategories.CodeQualityIssues,
-		Severity = Severity.Warning,
-		IssueMarker = IssueMarker.Underline)]
-	public class MethodNeverReturnsIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<MethodNeverReturnsIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitMethodDeclaration (MethodDeclaration methodDeclaration)
-			{
-				base.VisitMethodDeclaration (methodDeclaration);
-
-				// partial method
-				if (methodDeclaration.Body.IsNull)
-					return;
-
-				var reachability = ctx.CreateReachabilityAnalysis(methodDeclaration.Body);
-				bool hasReachableReturn = false;
-				foreach (var statement in reachability.ReachableStatements) {
-					if (statement is ReturnStatement || statement is ThrowStatement || statement is YieldBreakStatement) {
-						hasReachableReturn = true;
-						break;
-					}
-				}
-				if (!hasReachableReturn && !reachability.IsEndpointReachable(methodDeclaration.Body)) {
-					AddIssue (methodDeclaration.NameToken, 
-						ctx.TranslateString ("Method never reaches its end or a 'return' statement."));
-				}
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MethodOverloadHidesOptionalParameterIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MethodOverloadHidesOptionalParameterIssue.cs
deleted file mode 100644
index 2d1be22d0c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MethodOverloadHidesOptionalParameterIssue.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// 
-// MethodOverloadHidesOptionalParameterIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Method with optional parameter is hidden by overload",
-					   Description = "Method with optional parameter is hidden by overload",
-					   Category = IssueCategories.CodeQualityIssues,
-					   Severity = Severity.Warning,
-					   IssueMarker = IssueMarker.Underline,
-                       ResharperDisableKeyword = "MethodOverloadWithOptionalParameter")]
-	public class MethodOverloadHidesOptionalParameterIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<MethodOverloadHidesOptionalParameterIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitMethodDeclaration (MethodDeclaration methodDeclaration)
-			{
-				base.VisitMethodDeclaration (methodDeclaration);
-
-				var resolveResult = ctx.Resolve (methodDeclaration) as MemberResolveResult;
-				if (resolveResult == null)
-					return;
-				var method = resolveResult.Member as IMethod;
-				if (method == null)
-					return;
-
-				if (method.Parameters.Count == 0 || !method.Parameters.Last ().IsOptional)
-					return;
-
-				var overloads = method.DeclaringType.GetMethods(m => m.Name == method.Name && m.TypeParameters.Count == method.TypeParameters.Count)
-					.ToArray ();
-
-				var parameterNodes = methodDeclaration.Parameters.ToArray();
-				var parameters = new List<IParameter> ();
-				for (int i = 0; i < method.Parameters.Count; i++) {
-					if (method.Parameters [i].IsOptional && 
-						overloads.Any (m => ParameterListComparer.Instance.Equals (parameters, m.Parameters))) {
-						AddIssue (parameterNodes [i].StartLocation, parameterNodes.Last ().EndLocation,
-							ctx.TranslateString ("Method with optional parameter is hidden by overload"));
-						break;
-					}
-					parameters.Add (method.Parameters [i]);
-				}
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MissingStringComparisonIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MissingStringComparisonIssue.cs
deleted file mode 100644
index 77427ec47d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MissingStringComparisonIssue.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// MissingStringComparisonIssue.cs
-//
-// Author:
-//       Daniel Grunwald <daniel@danielgrunwald.de>
-//
-// Copyright (c) 2012 Daniel Grunwald
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Missing StringComparison argument",
-	                  Description = "Warns when a culture-aware comparison is used by default.",
-	                  Category = IssueCategories.CodeQualityIssues,
-	                  Severity = Severity.Warning)]
-	public class MissingStringComparisonIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<MissingStringComparisonIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext ctx) : base(ctx)
-			{
-			}
-			
-			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
-			{
-				base.VisitInvocationExpression(invocationExpression);
-				
-				MemberReferenceExpression mre = invocationExpression.Target as MemberReferenceExpression;
-				if (mre == null)
-					return;
-				switch (mre.MemberName) {
-					case "StartsWith":
-					case "EndsWith":
-						if (invocationExpression.Arguments.Count != 1)
-							return;
-						break;
-					case "IndexOf":
-					case "LastIndexOf":
-						break;
-					default:
-						return;
-				}
-				
-				var rr = ctx.Resolve(invocationExpression) as InvocationResolveResult;
-				if (rr == null || rr.IsError) {
-					// Not an invocation resolve result - e.g. could be a UnknownMemberResolveResult instead
-					return;
-				}
-				if (!(rr.Member.DeclaringTypeDefinition != null && rr.Member.DeclaringTypeDefinition.KnownTypeCode == KnownTypeCode.String)) {
-					// Not a string operation
-					return;
-				}
-				IParameter firstParameter = rr.Member.Parameters.FirstOrDefault();
-				if (firstParameter == null || !firstParameter.Type.IsKnownType(KnownTypeCode.String))
-					return; // First parameter not a string
-				IParameter lastParameter = rr.Member.Parameters.Last();
-				if (lastParameter.Type.Name == "StringComparison")
-					return; // already specifying a string comparison
-				AddIssue(invocationExpression.LParToken.StartLocation, invocationExpression.RParToken.EndLocation,
-				         mre.MemberName + "() call is missing StringComparison argument",
-				         new [] {
-							new CodeAction("Use ordinal comparison", script => AddArgument(script, invocationExpression, "Ordinal"), invocationExpression),
-							new CodeAction("Use culture-aware comparison", script => AddArgument(script, invocationExpression, "CurrentCulture"), invocationExpression)
-				         });
-			}
-			
-			void AddArgument(Script script, InvocationExpression invocationExpression, string stringComparison)
-			{
-				var astBuilder = ctx.CreateTypeSystemAstBuilder(invocationExpression);
-				var newArgument = astBuilder.ConvertType(new TopLevelTypeName("System", "StringComparison")).Member(stringComparison);
-				var copy = (InvocationExpression)invocationExpression.Clone();
-				copy.Arguments.Add(newArgument);
-				script.Replace(invocationExpression, copy);
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MultipleEnumerationIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MultipleEnumerationIssue.cs
deleted file mode 100644
index 5b7654e2cf..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/MultipleEnumerationIssue.cs
+++ /dev/null
@@ -1,366 +0,0 @@
-// 
-// MultipleEnumerationIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Possible multiple enumeration of IEnumerable",
-					   Description = "Possible multiple enumeration of IEnumerable.",
-					   Category = IssueCategories.CodeQualityIssues,
-					   Severity = Severity.Warning,
-					   IssueMarker = IssueMarker.Underline,
-                       ResharperDisableKeyword = "PossibleNullReferenceException")]
-	public class MultipleEnumerationIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class AnalysisStatementCollector : DepthFirstAstVisitor
-		{
-			List<Statement> statements;
-			AstNode variableDecl;
-
-			AnalysisStatementCollector (AstNode variableDecl)
-			{
-				this.variableDecl = variableDecl;
-			}
-
-			IList<Statement> GetStatements ()
-			{
-				if (statements != null)
-					return statements;
-
-				statements = new List<Statement> ();
-				var parent = variableDecl.Parent;
-				while (parent != null) {
-					if (parent is BlockStatement || parent is MethodDeclaration ||
-						parent is AnonymousMethodExpression || parent is LambdaExpression) {
-						parent.AcceptVisitor (this);
-						if (parent is BlockStatement)
-							statements.Add ((BlockStatement)parent);
-						break;
-					}
-					parent = parent.Parent;
-				}
-				return statements;
-			}
-
-			public override void VisitMethodDeclaration (MethodDeclaration methodDeclaration)
-			{
-				statements.Add (methodDeclaration.Body);
-
-				base.VisitMethodDeclaration (methodDeclaration);
-			}
-
-			public override void VisitAnonymousMethodExpression (AnonymousMethodExpression anonymousMethodExpression)
-			{
-				statements.Add (anonymousMethodExpression.Body);
-
-				base.VisitAnonymousMethodExpression (anonymousMethodExpression);
-			}
-
-			public override void VisitLambdaExpression (LambdaExpression lambdaExpression)
-			{
-				var body = lambdaExpression.Body as BlockStatement;
-				if (body != null)
-					statements.Add (body);
-
-				base.VisitLambdaExpression (lambdaExpression);
-			}
-
-			public static IList<Statement> Collect (AstNode variableDecl)
-			{
-				return new AnalysisStatementCollector (variableDecl).GetStatements ();
-			}
-		}
-
-		class GatherVisitor : GatherVisitorBase<MultipleEnumerationIssue>
-		{
-			HashSet<AstNode> collectedAstNodes;
-
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-				this.collectedAstNodes = new HashSet<AstNode> ();
-			}
-
-			void AddIssue (AstNode node)
-			{
-				if (collectedAstNodes.Add (node))
-					AddIssue (node, ctx.TranslateString ("Possible multiple enumeration of IEnumerable"));
-			}
-
-			void AddIssues (IEnumerable<AstNode> nodes)
-			{
-				foreach (var node in nodes)
-					AddIssue (node);
-			}
-
-			public override void VisitParameterDeclaration (ParameterDeclaration parameterDeclaration)
-			{
-				base.VisitParameterDeclaration (parameterDeclaration);
-
-				var resolveResult = ctx.Resolve (parameterDeclaration) as LocalResolveResult;
-				CollectIssues (parameterDeclaration, parameterDeclaration.Parent, resolveResult);
-			}
-
-			public override void VisitVariableInitializer (VariableInitializer variableInitializer)
-			{
-				base.VisitVariableInitializer (variableInitializer);
-
-				var resolveResult = ctx.Resolve (variableInitializer) as LocalResolveResult;
-				CollectIssues (variableInitializer, variableInitializer.Parent.Parent, resolveResult);
-			}
-
-			static bool IsAssignment (AstNode node)
-			{
-				var assignment = node.Parent as AssignmentExpression;
-				if (assignment != null)
-					return assignment.Left == node;
-
-				var direction = node.Parent as DirectionExpression;
-				if (direction != null)
-					return direction.FieldDirection == FieldDirection.Out && direction.Expression == node;
-
-				return false;
-			}
-
-			bool IsEnumeration (AstNode node)
-			{
-				var foreachStatement = node.Parent as ForeachStatement;
-				if (foreachStatement != null && foreachStatement.InExpression == node) {
-					return true;
-				}
-
-				var memberRef = node.Parent as MemberReferenceExpression;
-				if (memberRef != null && memberRef.Target == node) {
-					var invocation = memberRef.Parent as InvocationExpression;
-					if (invocation == null || invocation.Target != memberRef)
-						return false;
-
-					var methodGroup = ctx.Resolve (memberRef) as MethodGroupResolveResult;
-					if (methodGroup == null)
-						return false;
-
-					var method = methodGroup.Methods.FirstOrDefault ();
-					if (method != null) {
-						var declaringTypeDef = method.DeclaringTypeDefinition;
-						if (declaringTypeDef != null && declaringTypeDef.KnownTypeCode == KnownTypeCode.Object)
-							return false;
-					}
-					return true;
-				}
-
-				return false;
-			}
-
-			HashSet<AstNode> references;
-			HashSet<Statement> refStatements;
-			HashSet<LambdaExpression> lambdaExpressions;
-
-			HashSet<VariableReferenceNode> visitedNodes;
-			HashSet<VariableReferenceNode> collectedNodes;
-			Dictionary<VariableReferenceNode, int> nodeDegree; // number of enumerations a node can reach
-
-			void FindReferences (AstNode variableDecl, AstNode rootNode, IVariable variable)
-			{
-				references = new HashSet<AstNode> ();
-				refStatements = new HashSet<Statement> ();
-				lambdaExpressions = new HashSet<LambdaExpression> ();
-
-				foreach (var result in ctx.FindReferences (rootNode, variable)) {
-					var astNode = result.Node;
-					if (astNode == variableDecl)
-						continue;
-
-					var parent = astNode.Parent;
-					while (!(parent == null || parent is Statement || parent is LambdaExpression))
-						parent = parent.Parent;
-					if (parent == null)
-						continue;
-
-					// lambda expression with expression body, should be analyzed separately
-					var expr = parent as LambdaExpression;
-					if (expr != null) {
-						if (IsAssignment (astNode) || IsEnumeration (astNode)) {
-							references.Add (astNode);
-							lambdaExpressions.Add (expr);
-						}
-						continue;
-					}
-
-					if (IsAssignment (astNode) || IsEnumeration (astNode)) {
-						references.Add (astNode);
-						var statement = (Statement)parent;
-						refStatements.Add (statement);
-					}
-				}
-			}
-
-			void CollectIssues (AstNode variableDecl, AstNode rootNode, LocalResolveResult resolveResult)
-			{
-				if (resolveResult == null)
-					return;
-				var type = resolveResult.Type;
-				var typeDef = type.GetDefinition ();
-				if (typeDef == null ||
-				    (typeDef.KnownTypeCode != KnownTypeCode.IEnumerable &&
-				     typeDef.KnownTypeCode != KnownTypeCode.IEnumerableOfT))
-					return;
-
-				FindReferences (variableDecl, rootNode, resolveResult.Variable);
-
-				var statements = AnalysisStatementCollector.Collect (variableDecl);
-				var builder = new VariableReferenceGraphBuilder (ctx);
-				foreach (var statement in statements) {
-					var vrNode = builder.Build (statement, references, refStatements, ctx);
-					FindMultipleEnumeration (vrNode);
-				}
-				foreach (var lambda in lambdaExpressions) {
-					var vrNode = builder.Build (references, ctx.Resolver, (Expression)lambda.Body);
-					FindMultipleEnumeration (vrNode);
-				}
-			}
-
-			/// <summary>
-			/// split references in the specified node into sub nodes according to the value they uses
-			/// </summary>
-			/// <param name="node">node to split</param>
-			/// <returns>list of sub nodes</returns>
-			static IList<VariableReferenceNode> SplitNode (VariableReferenceNode node)
-			{
-				var subNodes = new List<VariableReferenceNode> ();
-				// find indices of all assignments in node and use them to split references
-				var assignmentIndices = new List<int> { -1 };
-				for (int i = 0; i < node.References.Count; i++) {
-					if (IsAssignment (node.References [i]))
-						assignmentIndices.Add (i);
-				}
-				assignmentIndices.Add (node.References.Count);
-				for (int i = 0; i < assignmentIndices.Count - 1; i++) {
-					var index1 = assignmentIndices [i];
-					var index2 = assignmentIndices [i + 1];
-					if (index1 + 1 >= index2)
-						continue;
-					var subNode = new VariableReferenceNode ();
-					for (int refIndex = index1 + 1; refIndex < index2; refIndex++)
-						subNode.References.Add (node.References [refIndex]);
-					subNodes.Add (subNode);
-				}
-				if (subNodes.Count == 0)
-					subNodes.Add (new VariableReferenceNode ());
-
-				var firstNode = subNodes [0];
-				foreach (var prevNode in node.PreviousNodes) {
-					prevNode.NextNodes.Remove (node);
-					// connect two nodes if the first ref is not an assignment
-					if (firstNode.References.FirstOrDefault () == node.References.FirstOrDefault ())
-						prevNode.NextNodes.Add (firstNode);
-				}
-
-				var lastNode = subNodes [subNodes.Count - 1];
-				foreach (var nextNode in node.NextNodes) {
-					nextNode.PreviousNodes.Remove (node);
-					lastNode.AddNextNode (nextNode);
-				}
-
-				return subNodes;
-			}
-
-			/// <summary>
-			/// convert a variable reference graph starting from the specified node to an assignment usage graph,
-			/// in which nodes are connect if and only if they contains references using the same assigned value
-			/// </summary>
-			/// <param name="startNode">starting node of the variable reference graph</param>
-			/// <returns>
-			/// list of VariableReferenceNode, each of which is a starting node of a sub-graph in which references all
-			/// use the same assigned value
-			/// </returns>
-			static IEnumerable<VariableReferenceNode> GetAssignmentUsageGraph (VariableReferenceNode startNode)
-			{
-				var graph = new List<VariableReferenceNode> ();
-				var visited = new HashSet<VariableReferenceNode> ();
-				var stack = new Stack<VariableReferenceNode> ();
-				stack.Push (startNode);
-				while (stack.Count > 0) {
-					var node = stack.Pop ();
-					if (!visited.Add (node))
-						continue;
-
-					var nodes = SplitNode (node);
-					graph.AddRange (nodes);
-					foreach (var addedNode in nodes)
-						visited.Add (addedNode);
-
-					foreach (var nextNode in nodes.Last ().NextNodes)
-						stack.Push (nextNode);
-				}
-				return graph;
-			}
-
-			void FindMultipleEnumeration (VariableReferenceNode startNode)
-			{
-				var vrg = GetAssignmentUsageGraph (startNode);
-				visitedNodes = new HashSet<VariableReferenceNode> ();
-				collectedNodes = new HashSet<VariableReferenceNode> ();
-
-				// degree of a node is the number of references that can be reached by the node
-				nodeDegree = new Dictionary<VariableReferenceNode, int> ();
-
-				foreach (var node in vrg) {
-					if (node.References.Count == 0 || !visitedNodes.Add (node))
-						continue;
-					ProcessNode (node);
-					if (nodeDegree [node] > 1)
-						collectedNodes.Add (node);
-				}
-				foreach (var node in collectedNodes)
-					AddIssues (node.References);
-			}
-
-			void ProcessNode (VariableReferenceNode node)
-			{
-				var degree = nodeDegree [node] = 0;
-				foreach (var nextNode in node.NextNodes) {
-					collectedNodes.Add (nextNode);
-					if (visitedNodes.Add (nextNode))
-						ProcessNode (nextNode);
-					degree = Math.Max (degree, nodeDegree [nextNode]);
-				}
-				nodeDegree [node] = degree + node.References.Count;
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NegativeRelationalExpressionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NegativeRelationalExpressionIssue.cs
deleted file mode 100644
index 20c4005e48..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NegativeRelationalExpressionIssue.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// 
-// NegativeRelationalExpressionIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Simplify negative relational expression",
-					   Description = "Simplify negative relational expression",
-					   Category = IssueCategories.Improvements,
-					   Severity = Severity.Suggestion,
-					   IssueMarker = IssueMarker.Underline)]
-	public class NegativeRelationalExpressionIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<NegativeRelationalExpressionIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			bool IsFloatingPoint (AstNode node)
-			{
-				var typeDef = ctx.Resolve (node).Type.GetDefinition ();
-				return typeDef != null &&
-					(typeDef.KnownTypeCode == KnownTypeCode.Single || typeDef.KnownTypeCode == KnownTypeCode.Double);
-			}
-
-			public override void VisitUnaryOperatorExpression (UnaryOperatorExpression unaryOperatorExpression)
-			{
-				base.VisitUnaryOperatorExpression (unaryOperatorExpression);
-
-				if (unaryOperatorExpression.Operator != UnaryOperatorType.Not)
-					return;
-
-				var expr = unaryOperatorExpression.Expression;
-				while (expr != null && expr is ParenthesizedExpression)
-					expr = ((ParenthesizedExpression)expr).Expression;
-
-				var binaryOperatorExpr = expr as BinaryOperatorExpression;
-				if (binaryOperatorExpr == null)
-					return;
-
-				var negatedOp = CSharpUtil.NegateRelationalOperator(binaryOperatorExpr.Operator);
-				if (negatedOp == BinaryOperatorType.Any)
-					return;
-
-				if (IsFloatingPoint (binaryOperatorExpr.Left) || IsFloatingPoint (binaryOperatorExpr.Right)) {
-					if (negatedOp != BinaryOperatorType.Equality && negatedOp != BinaryOperatorType.InEquality)
-						return;
-				}
-
-				AddIssue (unaryOperatorExpression, ctx.TranslateString ("Simplify negative relational expression"),
-					script => script.Replace (unaryOperatorExpression,
-						new BinaryOperatorExpression (binaryOperatorExpr.Left.Clone (), negatedOp,
-					          	binaryOperatorExpr.Right.Clone ())));
-			}
-			
-			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
-			{
-				if (operatorDeclaration.OperatorType.IsComparisonOperator()) {
-					// Ignore operator declaration; within them it's common to define one operator
-					// by negating another.
-					return;
-				}
-				base.VisitOperatorDeclaration(operatorDeclaration);
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NoDefaultConstructorIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NoDefaultConstructorIssue.cs
deleted file mode 100644
index fe84183830..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NoDefaultConstructorIssue.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("CS1729: Base class does not contain a 0 argument constructor",
-					   Description = "CS1729: Base class does not contain a 0 argument constructor",
-					   Category = IssueCategories.CompilerErrors,
-					   Severity = Severity.Error,
-					   IssueMarker = IssueMarker.Underline)]
-	public class NoDefaultConstructorIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-
-		private class GatherVisitor : GatherVisitorBase<NoDefaultConstructorIssue>
-		{
-			private bool initializerInvoked;
-			private ConstructorInitializer initializer;
-
-			public GatherVisitor(BaseRefactoringContext context)
-				: base(context)
-			{
-			}
-
-			public override void VisitTypeDeclaration(TypeDeclaration declaration)
-			{
-				base.VisitTypeDeclaration(declaration);
-				var result = ctx.Resolve(declaration) as TypeResolveResult;
-				if (result == null || result.IsError)
-					return;
-				var baseType = result.Type.DirectBaseTypes.FirstOrDefault(t => !t.IsKnownType(KnownTypeCode.Object) && t.Kind != TypeKind.Interface);
-
-				if (baseType != null) {
-					var baseConstructor = baseType.GetConstructors(c => c.Parameters.Count == 0).FirstOrDefault();
-					var memberLookup = new MemberLookup(result.Type.GetDefinition(), ctx.Compilation.MainAssembly, false);
-
-					if (baseConstructor == null || !memberLookup.IsAccessible(baseConstructor, true)) {
-						var constructor = result.Type.GetConstructors(f => !f.IsSynthetic).FirstOrDefault();
-
-						if (constructor == null) {
-							// If there are no constructors declared then the base constructor isn't being invoked
-							this.AddIssue(declaration, baseType);
-						}
-					}
-				}
-			}
-
-			public override void VisitConstructorDeclaration(ConstructorDeclaration declaration)
-			{
-				var result = ctx.Resolve(declaration) as MemberResolveResult;
-				if (result == null || result.IsError)
-					return;
-
-				var baseType = result.Member.DeclaringType.DirectBaseTypes.FirstOrDefault(t => !t.IsKnownType(KnownTypeCode.Object) && t.Kind != TypeKind.Interface);
-
-				if (baseType != null) {
-					var baseConstructor = baseType.GetConstructors(c => c.Parameters.Count == 0).FirstOrDefault();
-					var memberLookup = new MemberLookup(result.Member.DeclaringType.GetDefinition(), ctx.Compilation.MainAssembly, false);
-
-					if (baseConstructor == null || !memberLookup.IsAccessible(baseConstructor, true)) {
-						this.initializerInvoked = false;
-						this.initializer = null;
-				
-						base.VisitConstructorDeclaration(declaration);
-
-						if (!this.initializerInvoked) {
-							int argumentCount = initializer != null ? initializer.Arguments.Count : 0;
-							this.AddIssue(declaration, baseType, argumentCount);
-						}
-					}
-				}
-			}
-
-			public override void VisitConstructorInitializer(ConstructorInitializer initializer)
-			{
-				var result = ctx.Resolve(initializer);
-
-				if (!result.IsError) {
-					this.initializerInvoked = true;
-				} else {
-					this.initializer = initializer;
-				}
-			}
-
-			private void AddIssue(AstNode node, IType baseType, int argumentCount = 0)
-			{
-				var identifier = node.GetChildByRole(Roles.Identifier);
-				this.AddIssue(
-					identifier,
-					string.Format(ctx.TranslateString("CS1729: The type '{0}' does not contain a constructor that takes '{1}' arguments"), baseType.Name, argumentCount));
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NotImplementedExceptionIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NotImplementedExceptionIssue.cs
deleted file mode 100644
index ebd1a52bc5..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NotImplementedExceptionIssue.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// 
-// NotImplementedExceptionInspector.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.PatternMatching;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// This inspector just shows that there is a not implemented exception. It doesn't offer a fix.
-	/// Should only be shown in overview bar, no underlining.
-	/// </summary>
-	[IssueDescription("Show NotImplementedExceptions", Description="Shows NotImplementedException throws in the quick task bar.", Category = IssueCategories.Notifications, Severity = Severity.Suggestion, IssueMarker = IssueMarker.None)]
-	public class NotImplementedExceptionIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context, this).GetIssues();
-		}
-
-		class GatherVisitor : GatherVisitorBase<NotImplementedExceptionIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx, NotImplementedExceptionIssue issueProvider) : base (ctx, issueProvider)
-			{
-			}
-
-			public override void VisitThrowStatement(ThrowStatement throwStatement)
-			{
-				var result = ctx.Resolve(throwStatement.Expression);
-				if (result.Type.Equals(ctx.Compilation.FindType(typeof(System.NotImplementedException)))) {
-					AddIssue(throwStatement, ctx.TranslateString("NotImplemented exception thrown"));
-				}
-
-				base.VisitThrowStatement(throwStatement);
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/OptionalParameterCouldBeSkippedIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/OptionalParameterCouldBeSkippedIssue.cs
deleted file mode 100644
index 98a2c15bbf..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/OptionalParameterCouldBeSkippedIssue.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-//
-// OptionalParameterCouldBeSkippedIssue.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using System;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Optional argument has default value and can be skipped",
-	                  Description = "Finds calls to functions where optional parameters are used and the passed argument is the same as the default.",
-	                  Category = IssueCategories.Redundancies,
-	                  Severity = Severity.Hint,
-	                  IssueMarker = IssueMarker.GrayOut)]
-	public class OptionalParameterCouldBeSkippedIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<OptionalParameterCouldBeSkippedIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext context) : base (context)
-			{
-			}
-
-			public override void VisitObjectCreateExpression(ObjectCreateExpression objectCreateExpression)
-			{
-				base.VisitObjectCreateExpression(objectCreateExpression);
-				
-				CheckMethodCall(objectCreateExpression, objectCreateExpression.Arguments,
-				                (objectCreation, args) => new ObjectCreateExpression(objectCreation.Type.Clone(), args));
-			}
-
-			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
-			{
-				base.VisitInvocationExpression(invocationExpression);
-				
-				CheckMethodCall(invocationExpression, invocationExpression.Arguments,
-				                (invocation, args) => new InvocationExpression(invocation.Target.Clone(), args));
-			}
-
-			void CheckMethodCall<T> (T node, IEnumerable<Expression> args, Func<T, IEnumerable<Expression>, T> generateReplacement) where T: AstNode
-			{
-				// The first two checks are unnecessary, but eliminates the majority of calls early,
-				// improving performance.
-				var arguments = args.ToArray();
-				if (arguments.Length == 0)
-					return;
-				var lastArg = arguments[arguments.Length - 1];
-				if (!(lastArg is PrimitiveExpression || lastArg is NamedArgumentExpression))
-					return;
-
-				var invocationResolveResult = ctx.Resolve(node) as CSharpInvocationResolveResult;
-				if (invocationResolveResult == null)
-					return;
-				
-				string actionMessage = ctx.TranslateString("Remove redundant arguments");
-				
-				var redundantArguments = GetRedundantArguments(arguments, invocationResolveResult);
-				var action = new CodeAction(actionMessage, script => {
-					var newArgumentList = arguments
-						.Where(arg => !redundantArguments.Contains(arg))
-						.Select(arg => arg.Clone());
-					var newInvocation = generateReplacement(node, newArgumentList);
-					script.Replace(node, newInvocation);
-				}, node);
-				var issueMessage = ctx.TranslateString("Argument is identical to the default value");
-				var lastPositionalArgument = redundantArguments.FirstOrDefault(expression => !(expression is NamedArgumentExpression));
-
-				foreach (var argument in redundantArguments) {
-					var localArgument = argument;
-					var actions = new List<CodeAction>();
-					actions.Add(action);
-
-					if (localArgument is NamedArgumentExpression || localArgument == lastPositionalArgument) {
-						var title = ctx.TranslateString("Remove this argument");
-						actions.Add(new CodeAction(title, script => {
-							var newArgumentList = arguments
-								.Where(arg => arg != localArgument)
-								.Select(arg => arg.Clone());
-							var newInvocation = generateReplacement(node, newArgumentList);
-							script.Replace(node, newInvocation);
-						}, node));
-					} else {
-						var title = ctx.TranslateString("Remove this and the following positional arguments");
-						actions.Add(new CodeAction(title, script => {
-							var newArgumentList = arguments
-								.Where(arg => arg.StartLocation < localArgument.StartLocation && !(arg is NamedArgumentExpression))
-								.Select(arg => arg.Clone());
-							var newInvocation = generateReplacement(node, newArgumentList);
-							script.Replace(node, newInvocation);
-						}, node));
-					}
-
-					AddIssue(localArgument, issueMessage, actions);
-				}
-			}
-
-			IList<Expression> GetRedundantArguments(Expression[] arguments, CSharpInvocationResolveResult invocationResolveResult)
-			{
-				var argumentToParameterMap = invocationResolveResult.GetArgumentToParameterMap();
-				var resolvedParameters = invocationResolveResult.Member.Parameters;
-
-				IList<Expression> redundantArguments = new List<Expression>();
-
-				for (int i = arguments.Length - 1; i >= 0; i--) {
-					var parameterIndex = argumentToParameterMap[i];
-					if (parameterIndex == -1)
-						// This particular parameter is an error, but keep trying the other ones
-						continue;
-					var parameter = resolvedParameters[parameterIndex];
-					var argument = arguments[i];
-					if (argument is PrimitiveExpression) {
-						if (parameter.IsParams)
-							// before positional params arguments all optional arguments are needed, otherwise some of the
-							// param arguments will be shifted out of the params into the fixed parameters
-							break;
-						if (!parameter.IsOptional)
-							// There can be no optional parameters preceding a required one
-							break;
-						var argumentResolveResult = ctx.Resolve(argument) as ConstantResolveResult;
-						if (argumentResolveResult == null || parameter.ConstantValue != argumentResolveResult.ConstantValue)
-							// Stop here since any arguments before this one has to be there
-							// to enable the passing of this argument
-							break;
-						redundantArguments.Add(argument);
-					} else if (argument is NamedArgumentExpression) {
-						var expression = ((NamedArgumentExpression)argument).Expression as PrimitiveExpression;
-						if (expression == null)
-							continue;
-						var expressionResolveResult = ctx.Resolve(expression) as ConstantResolveResult;
-						if (expressionResolveResult == null || parameter.ConstantValue != expressionResolveResult.ConstantValue)
-							// continue, since there can still be more arguments that are redundant
-							continue;
-						redundantArguments.Add(argument);
-					} else {
-						// This is a non-constant positional argument => no more redundancies are possible
-						break;
-					}
-				}
-				return redundantArguments;
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/HasMemberCriterion.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/HasMemberCriterion.cs
deleted file mode 100644
index 399b762174..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/HasMemberCriterion.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// HasMemberCriterion.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Linq;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	public class HasMemberCriterion : ITypeCriterion
-	{
-//		IMember neededMember;
-		IList<IMember> acceptableMembers;
-
-		public HasMemberCriterion(IMember neededMember)
-		{
-//			this.neededMember = neededMember;
-
-			if (neededMember.ImplementedInterfaceMembers.Any()) {
-				acceptableMembers = neededMember.ImplementedInterfaceMembers.ToList();
-			} else if (neededMember.IsOverride) {
-				acceptableMembers = new List<IMember>();
-				foreach (var member in InheritanceHelper.GetBaseMembers(neededMember, true)) {
-					acceptableMembers.Add(member);
-					if (member.IsShadowing)
-						break;
-				}
-				acceptableMembers.Add(neededMember);
-			} else {
-				acceptableMembers = new List<IMember> { neededMember };
-			}
-		}
-
-		#region ITypeCriterion implementation
-		public bool SatisfiedBy (IType type)
-		{
-			if (type == null)
-				throw new ArgumentNullException("type");
-			
-			var typeMembers = type.GetMembers();
-			return typeMembers.Any(member => HasCommonMemberDeclaration(acceptableMembers, member));
-		}
-		#endregion
-		
-		static bool HasCommonMemberDeclaration(IEnumerable<IMember> acceptableMembers, IMember member)
-		{
-			var implementedInterfaceMembers = member.MemberDefinition.ImplementedInterfaceMembers;
-			if (implementedInterfaceMembers.Any()) {
-				return ContainsAny(acceptableMembers, implementedInterfaceMembers);
-			} else {
-				return acceptableMembers.Contains(member/*.MemberDefinition*/);
-			}
-		}
-
-		static bool ContainsAny<T>(IEnumerable<T> collection, IEnumerable<T> items)
-		{
-			foreach (var item in items) {
-				if (collection.Contains(item))
-					return true;
-			}
-			return false;
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/ITypeCriterion.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/ITypeCriterion.cs
deleted file mode 100644
index fcb631e531..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/ITypeCriterion.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// ITypeCriterion.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	public interface ITypeCriterion
-	{
-		/// <summary>
-		/// Checks if the given type satisfies the critrion.
-		/// </summary>
-		/// <returns>
-		/// <c>true</c>, if the type satisfies the criterion, <c>false</c> otherwise.
-		/// </returns>
-		/// <param name='type'>
-		/// The type to check.
-		/// </param>
-		bool SatisfiedBy(IType type);
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/IsArrayTypeCriterion.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/IsArrayTypeCriterion.cs
deleted file mode 100644
index db011b3560..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/IsArrayTypeCriterion.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// IsArrayTypeCriterion.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	public class IsArrayTypeCriterion : ITypeCriterion
-	{
-		#region ITypeCriterion implementation
-
-		public bool SatisfiedBy(IType type)
-		{
-			return type is ArrayType;
-		}
-
-		#endregion
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/IsTypeCriterion.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/IsTypeCriterion.cs
deleted file mode 100644
index a529d3c0b7..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/IsTypeCriterion.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// IsTypeCriterion.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	public class IsTypeCriterion : ITypeCriterion
-	{
-		IType isType;
-
-		public IsTypeCriterion(IType isType)
-		{
-			this.isType = isType;
-		}
-
-		#region ITypeCriterion implementation
-		public bool SatisfiedBy (IType type)
-		{
-			return isType == type ||
-				type.GetAllBaseTypes().Any(t => t == isType);
-		}
-		#endregion
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeDemotedIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeDemotedIssue.cs
deleted file mode 100644
index ad83779a09..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeDemotedIssue.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-//
-// ParameterCouldBeDeclaredWithBaseTypeIssue.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-using System.Linq;
-using System;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using System.Diagnostics;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("A parameter can be demoted to base class",
-	                   Description = "Finds parameters that can be demoted to a base class.",
-	                   Category = IssueCategories.Opportunities,
-	                   Severity = Severity.Suggestion,
-	                   SuppressMessageCategory="Microsoft.Design",
-	                   SuppressMessageCheckId="CA1011:ConsiderPassingBaseTypesAsParameters"
-	                  )]
-	public class ParameterCanBeDemotedIssue : ICodeIssueProvider
-	{
-		bool tryResolve;
-
-		public ParameterCanBeDemotedIssue() : this (true)
-		{
-		}
-
-		public ParameterCanBeDemotedIssue(bool tryResolve)
-		{
-			this.tryResolve = tryResolve;
-		}
-
-		#region ICodeIssueProvider implementation
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-//			var sw = new Stopwatch();
-//			sw.Start();
-			var gatherer = new GatherVisitor(context, tryResolve);
-			var issues = gatherer.GetIssues();
-//			sw.Stop();
-//			Console.WriteLine("Elapsed time in ParameterCanBeDemotedIssue: {0} (Checked types: {3, 4} Qualified for resolution check: {5, 4} Members with issues: {4, 4} Method bodies resolved: {2, 4} File: '{1}')",
-//			                  sw.Elapsed, context.UnresolvedFile.FileName, gatherer.MethodResolveCount, gatherer.TypesChecked, gatherer.MembersWithIssues, gatherer.TypeResolveCount);
-			return issues;
-		}
-		#endregion
-
-		class GatherVisitor : GatherVisitorBase<ParameterCanBeDemotedIssue>
-		{
-			bool tryResolve;
-			
-			public GatherVisitor(BaseRefactoringContext context, bool tryResolve) : base (context)
-			{
-				this.tryResolve = tryResolve;
-			}
-
-			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
-			{
-				methodDeclaration.Attributes.AcceptVisitor(this);
-				if (HasEntryPointSignature(methodDeclaration))
-					return;
-				var eligibleParameters = methodDeclaration.Parameters
-					.Where(p => p.ParameterModifier != ParameterModifier.Out && p.ParameterModifier != ParameterModifier.Ref)
-					.ToList();
-				if (eligibleParameters.Count == 0)
-					return;
-				var declarationResolveResult = ctx.Resolve(methodDeclaration) as MemberResolveResult;
-				if (declarationResolveResult == null)
-					return;
-				var member = declarationResolveResult.Member;
-				if (member.IsOverride || member.IsOverridable || member.ImplementedInterfaceMembers.Any())
-					return;
-
-				var collector = new TypeCriteriaCollector(ctx);
-				methodDeclaration.AcceptVisitor(collector);
-
-				foreach (var parameter in eligibleParameters) {
-					ProcessParameter(parameter, methodDeclaration.Body, collector);
-				}
-			}
-
-			bool HasEntryPointSignature(MethodDeclaration methodDeclaration)
-			{
-				if (!methodDeclaration.Modifiers.HasFlag(Modifiers.Static))
-					return false;
-				var returnType = ctx.Resolve(methodDeclaration.ReturnType).Type;
-				if (!returnType.IsKnownType(KnownTypeCode.Int32) && !returnType.IsKnownType(KnownTypeCode.Void))
-					return false;
-				var parameterCount = methodDeclaration.Parameters.Count;
-				if (parameterCount == 0)
-					return true;
-				if (parameterCount != 1)
-					return false;
-				var parameterType = ctx.Resolve(methodDeclaration.Parameters.First()).Type as ArrayType;
-				if (parameterType == null || !parameterType.ElementType.IsKnownType(KnownTypeCode.String))
-					return false;
-				return true;
-			}
-
-			void ProcessParameter(ParameterDeclaration parameter, AstNode rootResolutionNode, TypeCriteriaCollector collector)
-			{
-				var localResolveResult = ctx.Resolve(parameter) as LocalResolveResult;
-				if (localResolveResult == null)
-					return;
-				var variable = localResolveResult.Variable;
-				var typeKind = variable.Type.Kind;
-				if (!(typeKind == TypeKind.Class ||
-					  typeKind == TypeKind.Struct ||
-					  typeKind == TypeKind.Interface ||
-					  typeKind == TypeKind.Array) ||
-				    parameter.Type is PrimitiveType ||
-					!collector.UsedVariables.Contains(variable)) {
-					return;
-				}
-
-				var candidateTypes = localResolveResult.Type.GetAllBaseTypes().ToList();
-				TypesChecked += candidateTypes.Count;
-				var criterion = collector.GetCriterion(variable);
-
-				var possibleTypes = 
-					(from type in candidateTypes
-					 where !type.Equals(localResolveResult.Type) && criterion.SatisfiedBy(type)
-					 select type).ToList();
-
-				TypeResolveCount += possibleTypes.Count;
-				var validTypes = 
-					(from type in possibleTypes
-					 where !tryResolve || TypeChangeResolvesCorrectly(ctx, parameter, rootResolutionNode, type)
-					 select type).ToList();
-				if (validTypes.Any()) {
-					// don't demote an array to IList
-					if (variable.Type.Kind == TypeKind.Array && validTypes.Any (t => t.Namespace == "System.Collections" && t.Name == "IList")) {
-						return;
-					}
-					AddIssue(parameter, ctx.TranslateString("Parameter can be demoted to base class"), GetActions(parameter, validTypes));
-					MembersWithIssues++;
-				}
-			}
-
-			internal int TypeResolveCount = 0;
-			internal int TypesChecked = 0;
-			internal int MembersWithIssues = 0;
-			internal int MethodResolveCount = 0;
-
-			IEnumerable<CodeAction> GetActions(ParameterDeclaration parameter, IEnumerable<IType> possibleTypes)
-			{
-				var csResolver = ctx.Resolver.GetResolverStateBefore(parameter);
-				var astBuilder = new TypeSystemAstBuilder(csResolver);
-				foreach (var type in possibleTypes) {
-					var localType = type;
-					var message = String.Format(ctx.TranslateString("Demote parameter to '{0}'"), type.FullName);
-					yield return new CodeAction(message, script => {
-						script.Replace(parameter.Type, astBuilder.ConvertType(localType));
-					}, parameter.NameToken);
-				}
-			}
-		}
-
-	    public static bool TypeChangeResolvesCorrectly(BaseRefactoringContext ctx, ParameterDeclaration parameter, AstNode rootNode, IType type)
-	    {
-	        var resolver = ctx.GetResolverStateBefore(rootNode);
-	        resolver = resolver.AddVariable(new DefaultParameter(type, parameter.Name));
-	        var astResolver = new CSharpAstResolver(resolver, rootNode, ctx.UnresolvedFile);
-	        var validator = new TypeChangeValidationNavigator();
-	        astResolver.ApplyNavigator(validator, ctx.CancellationToken);
-	        return !validator.FoundErrors;
-	    }
-
-	    class TypeChangeValidationNavigator : IResolveVisitorNavigator
-		{
-			public bool FoundErrors { get; private set; }
-
-			#region IResolveVisitorNavigator implementation
-			public ResolveVisitorNavigationMode Scan(AstNode node)
-			{
-				if (FoundErrors)
-					return ResolveVisitorNavigationMode.Skip;
-				return ResolveVisitorNavigationMode.Resolve;
-			}
-
-			public void Resolved(AstNode node, ResolveResult result)
-			{
-//				bool errors = result.IsError;
-				FoundErrors |= result.IsError;
-			}
-
-			public void ProcessConversion(Expression expression, ResolveResult result, Conversion conversion, IType targetType)
-			{
-				// no-op
-			}
-			#endregion
-			
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeIEnumerableIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeIEnumerableIssue.cs
deleted file mode 100644
index 3539a5f01f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeIEnumerableIssue.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-//
-// ParameterCanBeIEnumerableIssue.cs
-//
-// Author:
-//       Ciprian Khlud <ciprian.mustiata@yahoo.com>
-//
-// Copyright (c) 2013 Ciprian Khlud
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-// Does this even make sense ? We've a parameter can be demoted issue which does mostly the same.
-//	[IssueDescription("A parameter can IEnumerable/ICollection/IList<T>",
-//	                  Description = "Finds parameters that can be demoted to a generic list.",
-//	                  Category = IssueCategories.Opportunities,
-//	                  Severity = Severity.Suggestion
-//	                  )]
-	public class ParameterCanBeIEnumerableIssue : ICodeIssueProvider
-	{
-	    readonly bool tryResolve;
-		
-		public ParameterCanBeIEnumerableIssue() : this (true)
-		{
-		}
-		
-		public ParameterCanBeIEnumerableIssue(bool tryResolve)
-		{
-			this.tryResolve = tryResolve;
-		}
-		
-		#region ICodeIssueProvider implementation
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			var gatherer = new GatherVisitor(context, tryResolve);
-			var issues = gatherer.GetIssues();
-			return issues;
-		}
-		#endregion
-		
-		class GatherVisitor : GatherVisitorBase<ParameterCanBeIEnumerableIssue>
-		{
-			bool tryResolve;
-			
-			public GatherVisitor(BaseRefactoringContext context, bool tryResolve) : base (context)
-			{
-				this.tryResolve = tryResolve;
-			}
-			
-			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
-			{
-				methodDeclaration.Attributes.AcceptVisitor(this);
-				if (HasEntryPointSignature(methodDeclaration))
-					return;
-				var eligibleParameters = methodDeclaration.Parameters
-					.Where(p => p.ParameterModifier != ParameterModifier.Out && p.ParameterModifier != ParameterModifier.Ref)
-						.ToList();
-				if (eligibleParameters.Count == 0)
-					return;
-				var declarationResolveResult = ctx.Resolve(methodDeclaration) as MemberResolveResult;
-				if (declarationResolveResult == null)
-					return;
-				var member = declarationResolveResult.Member;
-				if (member.IsOverride || member.IsOverridable || member.ImplementedInterfaceMembers.Any())
-					return;
-				
-				var collector = new TypeCriteriaCollector(ctx);
-				methodDeclaration.AcceptVisitor(collector);
-				
-				foreach (var parameter in eligibleParameters) {
-					ProcessParameter(parameter, methodDeclaration.Body, collector);
-				}
-			}
-			
-			bool HasEntryPointSignature(MethodDeclaration methodDeclaration)
-			{
-				if (!methodDeclaration.Modifiers.HasFlag(Modifiers.Static))
-					return false;
-				var returnType = ctx.Resolve(methodDeclaration.ReturnType).Type;
-				if (!returnType.IsKnownType(KnownTypeCode.Int32) && !returnType.IsKnownType(KnownTypeCode.Void))
-					return false;
-				var parameterCount = methodDeclaration.Parameters.Count;
-				if (parameterCount == 0)
-					return true;
-				if (parameterCount != 1)
-					return false;
-				var parameterType = ctx.Resolve(methodDeclaration.Parameters.First()).Type as ArrayType;
-				return parameterType != null && parameterType.ElementType.IsKnownType(KnownTypeCode.String);
-			}
-
-            void ProcessParameter(ParameterDeclaration parameter, AstNode rootResolutionNode, TypeCriteriaCollector collector)
-            {
-                var localResolveResult = ctx.Resolve(parameter) as LocalResolveResult;
-                if (localResolveResult == null)
-                    return;
-                var variable = localResolveResult.Variable;
-                var typeKind = variable.Type.Kind;
-                if (!(typeKind == TypeKind.Class ||
-                      typeKind == TypeKind.Struct ||
-                      typeKind == TypeKind.Interface ||
-                      typeKind == TypeKind.Array) ||
-                    !collector.UsedVariables.Contains(variable))
-                {
-                    return;
-                }
-
-                var candidateTypes = localResolveResult.Type.GetAllBaseTypes()
-                    .Where(t => t.IsParameterized)
-                    .ToList();
-
-                var validTypes =
-                    (from type in candidateTypes
-                     where !tryResolve || ParameterCanBeDemotedIssue.TypeChangeResolvesCorrectly(ctx, parameter, rootResolutionNode, type)
-                     select type).ToList();
-                if (!validTypes.Any()) return;
-
-                var foundType = validTypes.FirstOrDefault();
-                if (foundType == null)
-                    return;
-
-                AddIssue(parameter.NameToken, string.Format(ctx.TranslateString("Parameter can be {0}"),
-                                                            foundType.Name),
-                         script => script.Replace(parameter.Type, CreateShortType(ctx, foundType, parameter)));
-            }
-
-		    public static AstType CreateShortType(BaseRefactoringContext refactoringContext, IType expressionType, AstNode node)
-            {
-
-                var csResolver = refactoringContext.Resolver.GetResolverStateBefore(node);
-                var builder = new TypeSystemAstBuilder(csResolver);
-                return builder.ConvertType(expressionType);
-            }
-	}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/SupportsIndexingCriterion.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/SupportsIndexingCriterion.cs
deleted file mode 100644
index 6b0aeef44d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/SupportsIndexingCriterion.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// SupportsIndexingCriterion.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	public class SupportsIndexingCriterion : ITypeCriterion
-	{
-		IType returnType;
-
-		IList<IType> argumentTypes;
-		
-		CSharpConversions conversions;
-
-		bool isWriteAccess;
-
-		public SupportsIndexingCriterion(IType returnType, IEnumerable<IType> argumentTypes, CSharpConversions conversions, bool isWriteAccess = false)
-		{
-			if (returnType == null)
-				throw new ArgumentNullException("returnType");
-			if (argumentTypes == null)
-				throw new ArgumentNullException("argumentTypes");
-			if (conversions == null)
-				throw new ArgumentNullException("conversions");
-
-			this.returnType = returnType;
-			this.argumentTypes = argumentTypes.ToList();
-			this.conversions = conversions;
-			this.isWriteAccess = isWriteAccess;
-		}
-
-		#region ITypeCriterion implementation
-
-		public bool SatisfiedBy(IType type)
-		{
-			var accessors = type.GetAccessors().ToList();
-			return accessors.Any(member => {
-				var parameterizedMember = member as IParameterizedMember;
-				if (parameterizedMember == null)
-					return false;
-
-				if (isWriteAccess) {
-					var parameterCount = member.Parameters.Count;
-					if (member.Name != "set_Item" || parameterCount < 2)
-						return false;
-					var indexerElementType = parameterizedMember.Parameters.Last().Type;
-					var indexerParameterTypes = parameterizedMember.Parameters.Take(parameterCount - 1).Select(p => p.Type).ToList();
-					return IsSignatureMatch(indexerElementType, indexerParameterTypes);
-				} else {
-					if (member.Name != "get_Item" || member.Parameters.Count < 1)
-						return false;
-					var indexerElementType = parameterizedMember.ReturnType;
-					var indexerParameterTypes = parameterizedMember.Parameters.Select(p => p.Type).ToList();
-					return IsSignatureMatch(indexerElementType, indexerParameterTypes);
-				}
-			});
-		}
-
-		#endregion
-
-		bool IsSignatureMatch(IType indexerElementType, IList<IType> indexerParameterTypes)
-		{
-			indexerElementType.GetAllBaseTypes();
-			if (indexerParameterTypes.Count != argumentTypes.Count)
-				return false;
-			var returnConversion = conversions.ImplicitConversion(indexerElementType, returnType);
-			if (!returnConversion.IsValid)
-				return false;
-			for (int i = 0; i < argumentTypes.Count; i++) {
-				var conversion = conversions.ImplicitConversion(indexerParameterTypes[i], argumentTypes[i]);
-				if (!conversion.IsValid)
-					return false;
-			}
-			return true;
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/TypeCriteriaCollector.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/TypeCriteriaCollector.cs
deleted file mode 100644
index f42d55c675..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/TypeCriteriaCollector.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-//
-// CriteriaCollector.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	public class TypeCriteriaCollector : DepthFirstAstVisitor
-	{
-		BaseRefactoringContext context;
-		
-		public TypeCriteriaCollector(BaseRefactoringContext context)
-		{
-			this.context = context;
-			TypeCriteria = new Dictionary<IVariable, IList<ITypeCriterion>>();
-			UsedVariables = new HashSet<IVariable>();
-		}
-
-		IDictionary<IVariable, IList<ITypeCriterion>> TypeCriteria { get; set; }
-
-		public HashSet<IVariable> UsedVariables { get; private set; }
-
-		public ITypeCriterion GetCriterion(IVariable variable)
-		{
-			if (!TypeCriteria.ContainsKey(variable))
-				return new ConjunctionCriteria(new List<ITypeCriterion>());
-			return new ConjunctionCriteria(TypeCriteria[variable]);
-		}
-
-		void AddCriterion(IVariable variable, ITypeCriterion criterion)
-		{
-			if (!TypeCriteria.ContainsKey(variable))
-				TypeCriteria[variable] = new List<ITypeCriterion>();
-			TypeCriteria[variable].Add(criterion);
-		}
-
-		public override void VisitMemberReferenceExpression(MemberReferenceExpression memberReferenceExpression)
-		{
-			base.VisitMemberReferenceExpression(memberReferenceExpression);
-
-			var targetResolveResult = context.Resolve(memberReferenceExpression.Target) as LocalResolveResult;
-			if (targetResolveResult == null)
-				return;
-			var variable = targetResolveResult.Variable;
-			var conversion = context.GetConversion(memberReferenceExpression);
-			if (conversion.IsMethodGroupConversion) {
-				AddCriterion(variable, new HasMemberCriterion(conversion.Method));
-			} else {
-				var resolveResult = context.Resolve(memberReferenceExpression);
-				var memberResolveResult = resolveResult as MemberResolveResult;
-				if (memberResolveResult != null)
-					AddCriterion(variable, new HasMemberCriterion(memberResolveResult.Member));
-			}
-		}
-
-		public override void VisitIndexerExpression(IndexerExpression indexerExpression)
-		{
-			base.VisitIndexerExpression(indexerExpression);
-
-			var localResolveResult = context.Resolve(indexerExpression.Target) as LocalResolveResult;
-			if (localResolveResult == null)
-				return;
-			var resolveResult = context.Resolve(indexerExpression);
-			if (localResolveResult == null)
-				return;
-			var parent = indexerExpression.Parent;
-			while (parent is ParenthesizedExpression)
-				parent = parent.Parent;
-			if (parent is DirectionExpression) {
-				// The only types which are indexable and where the indexing expression
-				// results in a variable is an actual array type
-				AddCriterion(localResolveResult.Variable, new IsArrayTypeCriterion());
-			} else if (resolveResult is ArrayAccessResolveResult) {
-				var arrayResolveResult = (ArrayAccessResolveResult)resolveResult;
-				var arrayType = arrayResolveResult.Array.Type as ArrayType;
-				if (arrayType != null) {
-					var parameterTypes = arrayResolveResult.Indexes.Select(index => index.Type);
-					var criterion = new SupportsIndexingCriterion(arrayType.ElementType, parameterTypes, CSharpConversions.Get(context.Compilation));
-					AddCriterion(localResolveResult.Variable, criterion);
-				}
-			} else if (resolveResult is CSharpInvocationResolveResult) {
-				var invocationResolveResult = (CSharpInvocationResolveResult)resolveResult;
-				var parameterTypes = invocationResolveResult.Arguments.Select(arg => arg.Type);
-				var criterion = new SupportsIndexingCriterion(invocationResolveResult.Member.ReturnType, parameterTypes, CSharpConversions.Get(context.Compilation));
-				AddCriterion(localResolveResult.Variable, criterion);
-			}
-		}
-		
-		public override void VisitInvocationExpression(InvocationExpression invocationExpression)
-		{
-			base.VisitInvocationExpression(invocationExpression);
-			
-			var resolveResult = context.Resolve(invocationExpression);
-			var invocationResolveResult = resolveResult as InvocationResolveResult;
-			if (invocationResolveResult == null)
-				return;
-			
-			// invocationExpression.Target resolves to a method group and VisitMemberReferenceExpression
-			// only handles members, so handle method groups here
-			var targetResolveResult = invocationResolveResult.TargetResult as LocalResolveResult;
-			if (targetResolveResult != null) {
-				var variable = targetResolveResult.Variable;
-				AddCriterion(variable, new HasMemberCriterion(invocationResolveResult.Member));
-			}
-		}
-
-		public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
-		{
-			base.VisitMethodDeclaration(methodDeclaration);
-
-			var lastParameter = methodDeclaration.Parameters.LastOrNullObject();
-			if (lastParameter.IsNull || !lastParameter.ParameterModifier.HasFlag(ParameterModifier.Params))
-				return;
-			var localResolveResult = context.Resolve(lastParameter) as LocalResolveResult;
-			if (localResolveResult == null)
-				return;
-			AddCriterion(localResolveResult.Variable, new IsArrayTypeCriterion());
-		}
-
-		Role[] roles = new [] {
-			Roles.Expression,
-			Roles.Argument,
-			Roles.Condition,
-			BinaryOperatorExpression.RightRole,
-			BinaryOperatorExpression.LeftRole
-		};
-
-		public override void VisitIdentifierExpression(IdentifierExpression identifierExpression)
-		{
-			var resolveResult = context.Resolve(identifierExpression);
-			var localResolveResult = resolveResult as LocalResolveResult;
-			if (localResolveResult == null)
-				return;
-			
-			var variable = localResolveResult.Variable;
-			if (!UsedVariables.Contains(variable))
-				UsedVariables.Add(variable);
-
-			// Assignment expressions are checked separately, see VisitAssignmentExpression
-			if (!roles.Contains(identifierExpression.Role) || identifierExpression.Parent is AssignmentExpression)
-				return;
-
-			CheckForCriterion(identifierExpression, variable);
-		}
-		
-		public override void VisitAssignmentExpression(AssignmentExpression assignmentExpression)
-		{
-			base.VisitAssignmentExpression(assignmentExpression);
-			
-			// Only check the right side; The left side always has the type of
-			// the variable, which is not what we want to check
-
-			var rightResolveResult = context.Resolve(assignmentExpression.Right) as LocalResolveResult;
-			if (rightResolveResult != null) {
-				CheckForCriterion(assignmentExpression.Right, rightResolveResult.Variable);
-			}
-		}
-
-		void CheckForCriterion(Expression expression, IVariable variable)
-		{
-			AddCriterion(variable, new IsTypeCriterion(context.GetExpectedType(expression)));
-		}
-
-		class ConjunctionCriteria : ITypeCriterion
-		{
-			IList<ITypeCriterion> criteria;
-
-			public ConjunctionCriteria(IList<ITypeCriterion> criteria)
-			{
-				this.criteria = criteria;
-			}
-			
-			public bool SatisfiedBy(IType type)
-			{
-				foreach (var criterion in criteria) {
-					if (!criterion.SatisfiedBy(type)) {
-						return false;
-					}
-				}
-				return true;
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantArrayInitializerCommaIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantArrayInitializerCommaIssue.cs
deleted file mode 100644
index d6df754fec..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantArrayInitializerCommaIssue.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// 
-// RedundantArrayInitializerCommaIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Redundant comma in array initializer",
-						Description = "Redundant comma in array initializer.",
-						Category = IssueCategories.Redundancies,
-						Severity = Severity.Suggestion,
-						IssueMarker = IssueMarker.GrayOut)]
-	public class RedundantArrayInitializerCommaIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<RedundantArrayInitializerCommaIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitArrayInitializerExpression (ArrayInitializerExpression arrayInitializerExpression)
-			{
-				base.VisitArrayInitializerExpression (arrayInitializerExpression);
-
-				if (arrayInitializerExpression.IsSingleElement)
-					return;
-
-				var commaToken = arrayInitializerExpression.RBraceToken.PrevSibling as CSharpTokenNode;
-				if (commaToken == null || commaToken.ToString () != ",")
-					return;
-				string initializerType;
-				if (arrayInitializerExpression.Parent is ObjectCreateExpression) {
-					if (arrayInitializerExpression.Elements.FirstOrNullObject () is NamedExpression) {
-						initializerType = "object";
-					} else {
-						initializerType = "collection";
-					}
-				} else {
-					initializerType = "array";
-				}
-				AddIssue (commaToken, 
-					ctx.TranslateString (string.Format("Remove redundant comma in {0} initializer", initializerType)),
-					script => script.Remove (commaToken));
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantAssignmentIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantAssignmentIssue.cs
deleted file mode 100644
index 223471539b..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantAssignmentIssue.cs
+++ /dev/null
@@ -1,464 +0,0 @@
-// 
-// RedundantAssignmentIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Redundant assignment",
-	                  Description = "Value assigned to a variable or parameter is not used in all execution path.",
-	                  Category = IssueCategories.CodeQualityIssues,
-	                  Severity = Severity.Warning,
-	                  IssueMarker = IssueMarker.GrayOut)]
-	public class RedundantAssignmentIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			var unit = context.RootNode as SyntaxTree;
-			if (unit == null)
-				return Enumerable.Empty<CodeIssue>();
-			return new GatherVisitor(context).GetIssues();
-		}
-
-		class GatherVisitor : GatherVisitorBase<RedundantAssignmentIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext ctx)
-				: base(ctx)
-			{
-			}
-
-			public override void VisitParameterDeclaration(ParameterDeclaration parameterDeclaration)
-			{
-				base.VisitParameterDeclaration(parameterDeclaration);
-				if (parameterDeclaration.ParameterModifier == ParameterModifier.Out ||
-					parameterDeclaration.ParameterModifier == ParameterModifier.Ref)
-					return;
-
-				var resolveResult = ctx.Resolve(parameterDeclaration) as LocalResolveResult;
-				BlockStatement rootStatement = null;
-				if (parameterDeclaration.Parent is MethodDeclaration) {
-					rootStatement = ((MethodDeclaration)parameterDeclaration.Parent).Body;
-				} else if (parameterDeclaration.Parent is AnonymousMethodExpression) {
-					rootStatement = ((AnonymousMethodExpression)parameterDeclaration.Parent).Body;
-				} else if (parameterDeclaration.Parent is LambdaExpression) {
-					rootStatement = ((LambdaExpression)parameterDeclaration.Parent).Body as BlockStatement;
-				}
-				CollectIssues(parameterDeclaration, rootStatement, resolveResult);
-			}
-
-			public override void VisitVariableInitializer(VariableInitializer variableInitializer)
-			{
-				base.VisitVariableInitializer(variableInitializer);
-				if (!inUsingStatementResourceAcquisition) {
-					var resolveResult = ctx.Resolve(variableInitializer) as LocalResolveResult;
-					CollectIssues(variableInitializer, variableInitializer.GetParent<BlockStatement>(), resolveResult);
-				}
-			}
-
-			bool inUsingStatementResourceAcquisition;
-
-			public override void VisitUsingStatement(UsingStatement usingStatement)
-			{
-				inUsingStatementResourceAcquisition = true;
-				usingStatement.ResourceAcquisition.AcceptVisitor(this);
-				inUsingStatementResourceAcquisition = false;
-				usingStatement.EmbeddedStatement.AcceptVisitor(this);
-			}
-
-			void CollectIssues(AstNode variableDecl, BlockStatement rootStatement, LocalResolveResult resolveResult)
-			{
-				if (rootStatement == null || resolveResult == null)
-					return;
-
-				var references = new HashSet<AstNode>();
-				var refStatements = new HashSet<Statement>();
-				var usedInLambda = false;
-				var results = ctx.FindReferences(rootStatement, resolveResult.Variable);
-				foreach (var result in results) {
-					var node = result.Node;
-					if (node == variableDecl)
-						continue;
-
-					var parent = node.Parent;
-					while (!(parent == null || parent is Statement || parent is LambdaExpression || parent is QueryExpression))
-						parent = parent.Parent;
-					if (parent == null)
-						continue;
-
-					var statement = parent as Statement;
-					if (statement != null) {
-						references.Add(node);
-						refStatements.Add(statement);
-					}
-
-					while (parent != null && parent != rootStatement) {
-						if (parent is LambdaExpression || parent is AnonymousMethodExpression || parent is QueryExpression) {
-							usedInLambda = true;
-							break;
-						}
-						parent = parent.Parent;
-					}
-					if (usedInLambda) {
-						break;
-					}
-				}
-
-				// stop analyzing if the variable is used in any lambda expression or anonymous method
-				if (usedInLambda)
-					return;
-
-				var startNode = new VariableReferenceGraphBuilder(ctx).Build(rootStatement, references, refStatements, ctx);
-				var variableInitializer = variableDecl as VariableInitializer;
-				if (variableInitializer != null && !variableInitializer.Initializer.IsNull)
-					startNode.References.Insert(0, variableInitializer);
-
-				ProcessNodes(startNode);
-			}
-
-			class SearchInvocationsVisitor : DepthFirstAstVisitor
-			{
-				bool foundInvocations;
-
-				public bool ContainsInvocations(AstNode node)
-				{
-					foundInvocations = false;
-					node.AcceptVisitor(this);
-					return foundInvocations;
-				}
-
-				protected override void VisitChildren(AstNode node)
-				{
-					AstNode next;
-					for (var child = node.FirstChild; child != null && !foundInvocations; child = next) {
-						next = child.NextSibling;
-						child.AcceptVisitor(this);
-					}
-				}
-
-				public override void VisitInvocationExpression(InvocationExpression invocationExpression)
-				{
-					foundInvocations = true;
-				}
-			}
-
-			private class SearchRefOrOutVisitor : DepthFirstAstVisitor
-			{
-				private bool foundInvocations;
-				private string _varName;
-
-				public bool ContainsRefOrOut(VariableInitializer variableInitializer)
-				{
-					var node = variableInitializer.Parent.Parent;
-					foundInvocations = false;
-					_varName = variableInitializer.Name;
-					node.AcceptVisitor(this);
-					return foundInvocations;
-				}
-
-				protected override void VisitChildren(AstNode node)
-				{
-					AstNode next;
-					for (var child = node.FirstChild; child != null && !foundInvocations; child = next) {
-						next = child.NextSibling;
-						child.AcceptVisitor(this);
-					}
-				}
-
-				public override void VisitInvocationExpression(InvocationExpression methodDeclaration)
-				{
-					if (foundInvocations)
-						return;
-					if (methodDeclaration.Arguments.Count == 0)
-						return;
-					foreach (var argument in methodDeclaration.Arguments) {
-						var directionExpression = argument as DirectionExpression;
-						if (directionExpression == null)
-							continue;
-
-						if (directionExpression.FieldDirection != FieldDirection.Out && directionExpression.FieldDirection != FieldDirection.Ref)
-							continue;
-						var idExpression = (directionExpression.Expression) as IdentifierExpression;
-						if (idExpression == null)
-							continue;
-						foundInvocations = (idExpression.Identifier == _varName);
-
-						foundInvocations = true;
-					}
-				}
-			}
-
-			class SearchAssignmentForVarVisitor : DepthFirstAstVisitor
-			{
-				bool _foundInvocations;
-				private VariableInitializer _variableInitializer;
-
-				public bool ContainsLaterAssignments(VariableInitializer variableInitializer)
-				{
-					_foundInvocations = false;
-					_variableInitializer = variableInitializer;
-					variableInitializer.Parent.Parent.AcceptVisitor(this);
-					return _foundInvocations;
-				}
-
-				protected override void VisitChildren(AstNode node)
-				{
-					AstNode next;
-					for (var child = node.FirstChild; child != null && !_foundInvocations; child = next) {
-						next = child.NextSibling;
-						child.AcceptVisitor(this);
-					}
-				}
-
-				public override void VisitAssignmentExpression(AssignmentExpression assignmentExpression)
-				{
-					if (_foundInvocations)
-						return;
-					base.VisitAssignmentExpression(assignmentExpression);
-					if (assignmentExpression.Left.ToString() == _variableInitializer.Name
-						&& assignmentExpression.StartLocation > _variableInitializer.StartLocation) {
-						_foundInvocations = true;
-					}
-				}
-			}
-
-			void AddIssue(AstNode node)
-			{
-				var title = ctx.TranslateString("Remove redundant assignment");
-
-				var variableInitializer = node as VariableInitializer;
-				if (variableInitializer != null) {
-					var containsInvocations =
-						new SearchInvocationsVisitor().ContainsInvocations(variableInitializer.Initializer);
-
-					var varDecl = node.Parent as VariableDeclarationStatement;
-
-					var isDeclareStatement = varDecl != null;
-					var isUsingVar = isDeclareStatement && varDecl.Type.IsVar();
-
-					var expressionType = ctx.Resolve(node).Type;
-
-					var containsLaterAssignments = false;
-					if (isDeclareStatement) {
-						//if it is used later, the redundant removal should remove the assignment 
-						//but not the variable
-						containsLaterAssignments = 
-							new SearchAssignmentForVarVisitor().ContainsLaterAssignments(variableInitializer);
-					}
-
-					AstNode grayOutNode;
-					var containsRefOrOut = new SearchRefOrOutVisitor().ContainsRefOrOut(variableInitializer);
-					if (containsInvocations && isDeclareStatement) {
-						grayOutNode = variableInitializer.AssignToken;
-					} else {
-						if (isDeclareStatement && !containsRefOrOut && !containsLaterAssignments) {
-							grayOutNode = variableInitializer.Parent;
-						} else {
-							grayOutNode = variableInitializer.Initializer;
-						}
-					}
-
-					AddIssue(grayOutNode, title, script => {
-						var variableNode = (VariableInitializer)node;
-						if (containsInvocations && isDeclareStatement) {
-							//add the column ';' that will be removed after the next line replacement
-							var expression = (InvocationExpression)variableNode.Initializer.Clone();
-							var invocation = new ExpressionStatement(expression);
-							if (containsLaterAssignments && varDecl != null) {
-								var clonedDefinition = (VariableDeclarationStatement)varDecl.Clone();
-
-								var shortExpressionType = CreateShortType(ctx, expressionType, node);
-								clonedDefinition.Type = shortExpressionType;
-								var variableNodeClone = clonedDefinition.GetVariable(variableNode.Name);
-								variableNodeClone.Initializer = null;
-								script.InsertBefore(node.Parent, clonedDefinition);
-							}
-							script.Replace(node.Parent, invocation);
-							return;
-						}
-						if (isDeclareStatement && !containsRefOrOut && !containsLaterAssignments) {
-							script.Remove(node.Parent);
-							return;
-						}
-						var replacement = (VariableInitializer)variableNode.Clone();
-						replacement.Initializer = Expression.Null;
-						if (isUsingVar) {
-							var shortExpressionType = CreateShortType(ctx, expressionType, node);
-							script.Replace(varDecl.Type, shortExpressionType);
-						}
-						script.Replace(node, replacement);
-					});
-				}
-
-				var assignmentExpr = node.Parent as AssignmentExpression;
-				if (assignmentExpr == null)
-					return;
-				if (assignmentExpr.Parent is ExpressionStatement) {
-					AddIssue(assignmentExpr.Parent, title, script => script.Remove(assignmentExpr.Parent));
-				} else {
-					AddIssue(assignmentExpr.Left.StartLocation, assignmentExpr.OperatorToken.EndLocation, title,
-					         script => script.Replace(assignmentExpr, assignmentExpr.Right.Clone()));
-				}
-			}
-
-			private static AstType CreateShortType(BaseRefactoringContext refactoringContext, IType expressionType, AstNode node)
-			{
-
-				var csResolver = refactoringContext.Resolver.GetResolverStateBefore(node);
-				var builder = new TypeSystemAstBuilder(csResolver);
-				return builder.ConvertType(expressionType);
-			}
-
-			static bool IsAssignment(AstNode node)
-			{
-				if (node is VariableInitializer)
-					return true;
-
-				var assignmentExpr = node.Parent as AssignmentExpression;
-				if (assignmentExpr != null)
-					return assignmentExpr.Left == node && assignmentExpr.Operator == AssignmentOperatorType.Assign;
-
-				var direction = node.Parent as DirectionExpression;
-				if (direction != null)
-					return direction.FieldDirection == FieldDirection.Out && direction.Expression == node;
-
-				return false;
-			}
-
-			static bool IsInsideTryBlock(AstNode node)
-			{
-				var tryCatchStatement = node.GetParent<TryCatchStatement>();
-				if (tryCatchStatement == null)
-					return false;
-				return tryCatchStatement.TryBlock.Contains(node.StartLocation.Line, node.StartLocation.Column);
-			}
-
-			enum NodeState
-			{
-				None,
-				UsageReachable,
-				UsageUnreachable,
-				Processing,
-			}
-
-			void ProcessNodes(VariableReferenceNode startNode)
-			{
-				// node state of a node indicates whether it is possible for an upstream node to reach any usage via
-				// the node
-				var nodeStates = new Dictionary<VariableReferenceNode, NodeState>();
-				var assignments = new List<VariableReferenceNode>();
-
-				// dfs to preprocess all nodes and find nodes which end with assignment
-				var stack = new Stack<VariableReferenceNode>();
-				stack.Push(startNode);
-				while (stack.Count > 0) {
-					var node = stack.Pop();
-					if (node.References.Count > 0) {
-						nodeStates [node] = IsAssignment(node.References [0]) ?
-							NodeState.UsageUnreachable : NodeState.UsageReachable;
-					} else {
-						nodeStates [node] = NodeState.None;
-					}
-
-					// find indices of all assignments in node.References
-					var assignmentIndices = new List<int>();
-					for (int i = 0; i < node.References.Count; i++) {
-						if (IsAssignment(node.References [i]))
-							assignmentIndices.Add(i);
-					}
-					// for two consecutive assignments, the first one is redundant
-					for (int i = 0; i < assignmentIndices.Count - 1; i++) {
-						var index1 = assignmentIndices [i];
-						var index2 = assignmentIndices [i + 1];
-						if (index1 + 1 == index2)
-							AddIssue(node.References [index1]);
-					}
-					// if the node ends with an assignment, add it to assignments so as to check if it is redundant
-					// later
-					if (assignmentIndices.Count > 0 &&
-						assignmentIndices [assignmentIndices.Count - 1] == node.References.Count - 1)
-						assignments.Add(node);
-
-					foreach (var nextNode in node.NextNodes) {
-						if (!nodeStates.ContainsKey(nextNode))
-							stack.Push(nextNode);
-					}
-				}
-
-				foreach (var node in assignments) {
-					// we do not analyze an assignment inside a try block as it can jump to any catch block or finally block
-					if (IsInsideTryBlock(node.References [0]))
-						continue;
-					ProcessNode(node, true, nodeStates);
-				}
-			}
-
-			void ProcessNode(VariableReferenceNode node, bool addIssue,
-			                 IDictionary<VariableReferenceNode, NodeState> nodeStates)
-			{
-				if (nodeStates [node] == NodeState.None)
-					nodeStates [node] = NodeState.Processing;
-
-				bool? reachable = false;
-				foreach (var nextNode in node.NextNodes) {
-					if (nodeStates [nextNode] == NodeState.None)
-						ProcessNode(nextNode, false, nodeStates);
-
-					if (nodeStates [nextNode] == NodeState.UsageReachable) {
-						reachable = true;
-						break;
-					}
-					// downstream nodes are not fully processed (e.g. due to loop), there is no enough info to
-					// determine the node state
-					if (nodeStates [nextNode] != NodeState.UsageUnreachable)
-						reachable = null;
-				}
-
-				// add issue if it is not possible to reach any usage via NextNodes
-				if (addIssue && reachable == false)
-					AddIssue(node.References [node.References.Count - 1]);
-
-				if (nodeStates [node] != NodeState.Processing)
-					return;
-
-				switch (reachable) {
-					case null:
-						nodeStates [node] = NodeState.None;
-						break;
-					case true:
-						nodeStates [node] = NodeState.UsageReachable;
-						break;
-					case false:
-						nodeStates [node] = NodeState.UsageUnreachable;
-						break;
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantAttributeParenthesesIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantAttributeParenthesesIssue.cs
deleted file mode 100644
index f0a36afade..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantAttributeParenthesesIssue.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// 
-// RedundantAttributeParenthesesIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Parentheses are redundant if attribute has no arguments",
-						Description = "Parentheses are redundant if attribute has no arguments.",
-						Category = IssueCategories.Redundancies,
-						Severity = Severity.Suggestion,
-						IssueMarker = IssueMarker.GrayOut)]
-	public class RedundantAttributeParenthesesIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<RedundantAttributeParenthesesIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitAttribute (Attribute attribute)
-			{
-				base.VisitAttribute (attribute);
-
-				if (attribute.Arguments.Count > 0 || !attribute.HasArgumentList)
-					return;
-
-				var start = attribute.Type.EndLocation;
-				var end = attribute.EndLocation;
-				AddIssue (start, end, ctx.TranslateString ("Remove redundant attribute parentheses"), script =>
-					script.Replace (attribute, new Attribute { Type = attribute.Type.Clone () }));
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantBaseConstructorIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantBaseConstructorIssue.cs
deleted file mode 100644
index 0e013c1c08..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantBaseConstructorIssue.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// 
-// RedundantBaseConstructorIssue.cs
-// 
-// Author:
-//      Ciprian Khlud <ciprian.mustiata@yahoo.com>
-// 
-// Copyright (c) 2013 Ciprian Khlud <ciprian.mustiata@yahoo.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Remove redundant base call",
-	                   Description = "Remove base constructor call that is redundant",
-	                   Category = IssueCategories.Redundancies,
-	                   Severity = Severity.Suggestion,
-	                   IssueMarker = IssueMarker.GrayOut, 
-	                   ResharperDisableKeyword = "RedundantBaseConstructorCall")]
-	public class RedundantBaseConstructorIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-
-		class GatherVisitor : GatherVisitorBase<RedundantBaseConstructorIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
-			{
-				base.VisitConstructorDeclaration(constructorDeclaration);
-
-				if (constructorDeclaration.Initializer.ConstructorInitializerType != ConstructorInitializerType.Base)
-					return;
-				if (constructorDeclaration.Initializer.IsNull)
-					return;
-				if (constructorDeclaration.Initializer.Arguments.Count != 0)
-					return;
-				AddIssue(constructorDeclaration.Initializer.StartLocation, constructorDeclaration.Initializer.EndLocation,
-				         ctx.TranslateString("Remove redundant base constructor"),
-				         script => {
-					var clone = (ConstructorDeclaration)constructorDeclaration.Clone();
-					script.Replace(clone.ColonToken, CSharpTokenNode.Null.Clone());
-					script.Replace(constructorDeclaration.Initializer, ConstructorInitializer.Null.Clone());
-				});
-			}
-
-			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
-			{
-				//ignore properties
-			}
-
-			public override void  VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
-			{
-				//ignore fields
-			}
-
-			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
-			{
-				//ignore method declarations
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantCaseLabelIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantCaseLabelIssue.cs
deleted file mode 100644
index 12457e18d9..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantCaseLabelIssue.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-// 
-// RedundantCaseLabelIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Redundant 'case' label",
-						Description = "Redundant 'case' label",
-						Category = IssueCategories.Redundancies,
-						Severity = Severity.Warning,
-						IssueMarker = IssueMarker.GrayOut,
-                        ResharperDisableKeyword = "RedundantCaseLabel")]
-	public class RedundantCaseLabelIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<RedundantCaseLabelIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitSwitchSection (SwitchSection switchSection)
-			{
-				base.VisitSwitchSection (switchSection);
-
-				if (switchSection.CaseLabels.Count <2)
-					return;
-
-				var lastLabel = switchSection.CaseLabels.LastOrNullObject ();
-				if (!lastLabel.Expression.IsNull)
-					return;
-				AddIssue (switchSection.FirstChild.StartLocation, lastLabel.StartLocation,
-					ctx.TranslateString ("Remove redundant 'case' label"), scipt => {
-						foreach (var label in switchSection.CaseLabels) {
-							if (label != lastLabel)
-								scipt.Remove (label);
-						}
-					});
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantCatchIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantCatchIssue.cs
deleted file mode 100644
index c7f9bbfb3e..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantCatchIssue.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-//
-// RedundantCatchIssue.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("A catch clause containing a single empty throw is redundant",
-	                  Description = "Warns about catch clauses that only rethrows the exception.",
-	                  Category = IssueCategories.Redundancies,
-	                  Severity = Severity.Hint,
-	                  IssueMarker = IssueMarker.GrayOut,
-                      ResharperDisableKeyword = "RedundantCatchClause")]
-	public class RedundantCatchIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<RedundantCatchIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext context) : base (context)
-			{
-			}
-
-			public override void VisitTryCatchStatement(TryCatchStatement tryCatchStatement)
-			{
-				var redundantCatchClauses = new List<CatchClause>();
-				bool hasNonRedundantCatch = false;
-				foreach (var catchClause in tryCatchStatement.CatchClauses) {
-					if (IsRedundant(catchClause)) {
-						redundantCatchClauses.Add(catchClause);
-					} else {
-						hasNonRedundantCatch = true;
-					}
-				}
-
-				if (hasNonRedundantCatch || !tryCatchStatement.FinallyBlock.IsNull) {
-					AddIssuesForClauses(tryCatchStatement, redundantCatchClauses);
-				} else {
-					AddIssueForTryCatchStatement(tryCatchStatement);
-				}
-			}
-
-			void AddIssuesForClauses(AstNode node, List<CatchClause> redundantCatchClauses)
-			{
-				var allCatchClausesMessage = ctx.TranslateString("Remove all '{0}' redundant catches");
-				var removeAllRedundantClausesAction = new CodeAction(allCatchClausesMessage, script => {
-					foreach (var redundantCatchClause in redundantCatchClauses) {
-						script.Remove(redundantCatchClause);
-					}
-				}, node);
-				var singleCatchClauseMessage = ctx.TranslateString("Remove redundant catch clause");
-				var redundantCatchClauseMessage = ctx.TranslateString("A catch clause containing a single empty throw statement is redundant.");
-				foreach (var redundantCatchClause in redundantCatchClauses) {
-					var closureLocalCatchClause = redundantCatchClause;
-					var removeRedundantClauseAction = new CodeAction(singleCatchClauseMessage, script => {
-						script.Remove(closureLocalCatchClause);
-					}, node);
-					var actions = new List<CodeAction>();
-					actions.Add(removeRedundantClauseAction);
-					if (redundantCatchClauses.Count > 1) {
-						actions.Add(removeAllRedundantClausesAction);
-					}
-					AddIssue(closureLocalCatchClause, redundantCatchClauseMessage, actions);
-				}
-			}
-
-			void AddIssueForTryCatchStatement(TryCatchStatement tryCatchStatement)
-			{
-				var lastCatch = tryCatchStatement.CatchClauses.LastOrNullObject();
-				if (lastCatch.IsNull)
-					return;
-
-				var removeTryCatchMessage = ctx.TranslateString("Remove try statement");
-
-				var removeTryStatementAction = new CodeAction(removeTryCatchMessage, script => {
-					var statements = tryCatchStatement.TryBlock.Statements;
-					if (statements.Count == 1 || tryCatchStatement.Parent is BlockStatement) {
-						foreach (var statement in statements) {
-							script.InsertAfter(tryCatchStatement.GetPrevSibling (s => !(s is NewLineNode)), statement.Clone());
-						}
-						script.Remove(tryCatchStatement);
-					} else {
-						var blockStatement = new BlockStatement();
-						foreach (var statement in statements) {
-							blockStatement.Statements.Add(statement.Clone());
-						}
-						script.Replace(tryCatchStatement, blockStatement);
-					}
-					// The replace and insert script functions does not format these things well on their own
-					script.FormatText(tryCatchStatement.Parent);
-				}, tryCatchStatement);
-
-				var fixes = new [] {
-					removeTryStatementAction
-				};
-				AddIssue(tryCatchStatement.TryBlock.EndLocation, lastCatch.EndLocation, removeTryCatchMessage, fixes);
-			}
-
-			static bool IsThrowsClause (CatchClause catchClause)
-			{
-				var firstStatement = catchClause.Body.Statements.FirstOrNullObject();
-				if (firstStatement.IsNull)
-					return false;
-				var throwStatement = firstStatement as ThrowStatement;
-				if (throwStatement == null)
-					return false;
-				return true;
-			}
-
-			bool IsRedundant(CatchClause catchClause)
-			{
-				if (!IsThrowsClause (catchClause))
-					return false;
-
-				var type = ctx.Resolve (catchClause.Type).Type;
-				var n = catchClause.NextSibling;
-				while (n != null) {
-					var nextClause = n as CatchClause;
-					if (nextClause != null) {
-						if (nextClause.Type.IsNull && !IsThrowsClause(nextClause))
-							return false;
-						if (!IsThrowsClause(nextClause) && type.GetDefinition ().IsDerivedFrom (ctx.Resolve (nextClause.Type).Type.GetDefinition ()))
-							return false;
-					}
-					n = n.NextSibling;
-				}
-				return true;
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantElseIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantElseIssue.cs
deleted file mode 100644
index d7324f2c7a..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantElseIssue.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-// 
-// RedundantElseIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Redundant 'else' keyword",
-						Description = "Redundant 'else' keyword.",
-						Category = IssueCategories.Redundancies,
-						Severity = Severity.Warning,
-						IssueMarker = IssueMarker.GrayOut,
-                        ResharperDisableKeyword = "RedundantIfElseBlock")]
-	public class RedundantElseIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<RedundantElseIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base(ctx)
-			{
-			}
-
-			bool HasRundundantElse(IfElseStatement ifElseStatement)
-			{
-				if (ifElseStatement.FalseStatement.IsNull || ifElseStatement.Parent is IfElseStatement)
-					return false;
-				var blockStatement = ifElseStatement.FalseStatement as BlockStatement;
-				if (blockStatement != null && blockStatement.Statements.Count == 0)
-					return true;
-				var reachability = ctx.CreateReachabilityAnalysis (ifElseStatement.TrueStatement);
-				return !reachability.IsEndpointReachable (ifElseStatement.TrueStatement);
-			}
-
-			public override void VisitIfElseStatement (IfElseStatement ifElseStatement)
-			{
-				base.VisitIfElseStatement (ifElseStatement);
-
-				if (HasRundundantElse(ifElseStatement)) {
-					AddIssue (ifElseStatement.ElseToken, ctx.TranslateString ("Remove redundant 'else'"),
-						script =>
-						{
-							int start = script.GetCurrentOffset(ifElseStatement.ElseToken.GetPrevNode (n => !(n is NewLineNode)).EndLocation);
-							int end;
-
-							var blockStatement = ifElseStatement.FalseStatement as BlockStatement;
-							if (blockStatement != null) {
-								if (blockStatement.Statements.Count == 0) {
-									// remove empty block
-									end = script.GetCurrentOffset (blockStatement.LBraceToken.StartLocation);
-									script.Remove (blockStatement);
-								} else {
-									// remove block braces
-									end = script.GetCurrentOffset (blockStatement.LBraceToken.EndLocation);
-									script.Remove (blockStatement.RBraceToken);
-								}
-							} else {
-								end = script.GetCurrentOffset(ifElseStatement.ElseToken.EndLocation);
-							}
-							if (end > start)
-								script.RemoveText (start, end - start);
-
-							script.FormatText (ifElseStatement.Parent);
-						});
-				}
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantFieldInitializerIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantFieldInitializerIssue.cs
deleted file mode 100644
index da390f1720..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantFieldInitializerIssue.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-// 
-// RedundantFieldInitializerIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Initializing field with default value is redundant",
-						Description = "Initializing field with default value is redundant.",
-						Category = IssueCategories.Redundancies,
-						Severity = Severity.Hint,
-						IssueMarker = IssueMarker.GrayOut,
-                        ResharperDisableKeyword = "RedundantDefaultFieldInitializer")]
-	public class RedundantFieldInitializerIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<RedundantFieldInitializerIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext ctx)
-				: base(ctx)
-			{
-			}
-
-			public override void VisitFieldDeclaration (FieldDeclaration fieldDeclaration)
-			{
-				base.VisitFieldDeclaration (fieldDeclaration);
-				if (fieldDeclaration.HasModifier (Modifiers.Const))
-					return;
-				var defaultValueExpr = GetDefaultValueExpression (fieldDeclaration.ReturnType);
-				if (defaultValueExpr == null)
-					return;
-
-				foreach (var variable1 in fieldDeclaration.Variables) {
-					var variable = variable1;
-					if (!defaultValueExpr.Match (variable.Initializer).Success)
-						continue;
-
-					AddIssue (variable.Initializer, ctx.TranslateString ("Remove redundant field initializer"),
-						script => script.Replace (variable, new VariableInitializer (variable.Name)));
-				}
-			}
-
-			Expression GetDefaultValueExpression (AstType astType)
-			{
-				var type = ctx.ResolveType (astType);
-
-				if ((type.IsReferenceType ?? false) || type.Kind == TypeKind.Dynamic)
-					return new NullReferenceExpression ();
-
-				var typeDefinition = type.GetDefinition ();
-				if (typeDefinition != null) {
-					switch (typeDefinition.KnownTypeCode) {
-						case KnownTypeCode.Boolean:
-							return new PrimitiveExpression (false);
-
-						case KnownTypeCode.Char:
-							return new PrimitiveExpression ('\0');
-
-						case KnownTypeCode.SByte:
-						case KnownTypeCode.Byte:
-						case KnownTypeCode.Int16:
-						case KnownTypeCode.UInt16:
-						case KnownTypeCode.Int32:
-							return new PrimitiveExpression (0);
-
-						case KnownTypeCode.Int64:
-							return new Choice { new PrimitiveExpression (0), new PrimitiveExpression (0L) };
-						case KnownTypeCode.UInt32:
-							return new Choice { new PrimitiveExpression (0), new PrimitiveExpression (0U) };
-						case KnownTypeCode.UInt64:
-							return new Choice {
-								new PrimitiveExpression (0), new PrimitiveExpression (0U), new PrimitiveExpression (0UL)
-							};
-						case KnownTypeCode.Single:
-							return new Choice { new PrimitiveExpression (0), new PrimitiveExpression (0F) };
-						case KnownTypeCode.Double:
-							return new Choice {
-								new PrimitiveExpression (0), new PrimitiveExpression (0F), new PrimitiveExpression (0D)
-							};
-						case KnownTypeCode.Decimal:
-							return new Choice { new PrimitiveExpression (0), new PrimitiveExpression (0M) };
-
-						case KnownTypeCode.NullableOfT:
-							return new NullReferenceExpression ();
-					}
-					if (type.Kind == TypeKind.Struct)
-						return new ObjectCreateExpression (astType.Clone ());
-				}
-				return new DefaultValueExpression (astType.Clone ());
-			} 
-			
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantInternalIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantInternalIssue.cs
deleted file mode 100644
index 48292ded03..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantInternalIssue.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-// 
-// RedundantInternalInspector.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using ICSharpCode.NRefactory.PatternMatching;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// Finds redundant internal modifiers.
-	/// </summary>
-	[IssueDescription("Remove redundant 'internal' modifier",
-	       Description="Removes 'internal' modifiers that are not required.", 
-	       Category = IssueCategories.Redundancies,
-	       Severity = Severity.Hint,
-	       IssueMarker = IssueMarker.GrayOut)]
-	public class RedundantInternalIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context, this).GetIssues();
-		}
-
-		class GatherVisitor : GatherVisitorBase<RedundantInternalIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx, RedundantInternalIssue issueProvider) : base (ctx, issueProvider)
-			{
-			}
-
-			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
-			{
-				foreach (var token_ in typeDeclaration.ModifierTokens) {
-					var token = token_;
-					if (token.Modifier == Modifiers.Internal) {
-						AddIssue(token, ctx.TranslateString("Remove 'internal' modifier"), script => {
-							int offset = script.GetCurrentOffset(token.StartLocation);
-							int endOffset = script.GetCurrentOffset(token.GetNextNode().StartLocation);
-							script.RemoveText(offset, endOffset - offset);
-						});
-					}
-				}
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantNamespaceUsageIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantNamespaceUsageIssue.cs
deleted file mode 100644
index 280faee50f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantNamespaceUsageIssue.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// 
-// RedundantNamespaceUsageInspector.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// Finds redundant namespace usages.
-	/// </summary>
-	[IssueDescription("Remove redundant namespace usages",
-	                  Description = "Removes namespace usages that are obsolete.",
-	                  Category = IssueCategories.Redundancies,
-	                  Severity = Severity.Hint,
-	                  IssueMarker = IssueMarker.GrayOut)]
-	public class RedundantNamespaceUsageIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context, this).GetIssues();
-		}
-
-		class GatherVisitor : GatherVisitorBase<RedundantNamespaceUsageIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx, RedundantNamespaceUsageIssue issueProvider) : base (ctx, issueProvider)
-			{
-			}
-
-			public override void VisitMemberReferenceExpression(MemberReferenceExpression memberReferenceExpression)
-			{
-				base.VisitMemberReferenceExpression(memberReferenceExpression);
-				HandleMemberReference(
-					memberReferenceExpression, memberReferenceExpression.Target, memberReferenceExpression.MemberNameToken, memberReferenceExpression.TypeArguments, NameLookupMode.Expression,
-					script => {
-						script.Replace(memberReferenceExpression, RefactoringAstHelper.RemoveTarget(memberReferenceExpression));
-					});
-			}
-			
-			public override void VisitMemberType(MemberType memberType)
-			{
-				base.VisitMemberType(memberType);
-				HandleMemberReference(
-					memberType, memberType.Target, memberType.MemberNameToken, memberType.TypeArguments, memberType.GetNameLookupMode(),
-					script => {
-						script.Replace(memberType, RefactoringAstHelper.RemoveTarget(memberType));
-					});
-			}
-			
-			void HandleMemberReference(AstNode wholeNode, AstNode targetNode, Identifier memberName, IEnumerable<AstType> typeArguments, NameLookupMode mode, Action<Script> action)
-			{
-				var result = ctx.Resolve(targetNode);
-				if (!(result is NamespaceResolveResult)) {
-					return;
-				}
-				var wholeResult = ctx.Resolve(wholeNode);
-				if (!(wholeResult is TypeResolveResult)) {
-					return;
-				}
-
-				var state = ctx.GetResolverStateBefore(wholeNode);
-				var resolvedTypeArguments = typeArguments.Select(ctx.ResolveType).ToList();
-				var lookupName = state.LookupSimpleNameOrTypeName(memberName.Name, resolvedTypeArguments, mode);
-				
-				if (lookupName is TypeResolveResult && !lookupName.IsError && wholeResult.Type.Equals(lookupName.Type)) {
-					AddIssue(wholeNode.StartLocation, memberName.StartLocation, ctx.TranslateString("Remove redundant namespace usage"), action);
-				}
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantNullCheckIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantNullCheckIssue.cs
deleted file mode 100755
index 2755bb075f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantNullCheckIssue.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// RedundantNullCheckIssue.cs
-//
-// Author:
-//	   Ji Kun <jikun.nus@gmail.com>
-//
-// Copyright (c) 2013 Ji Kun
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Redundant null check",
-	                  Description = "When 'is' keyword is used, which implicitly check null.",
-	                  Category = IssueCategories.Redundancies,
-	                  Severity = Severity.Suggestion,
-	                  ResharperDisableKeyword = "RedundantNullCheck",
-	                  IssueMarker = IssueMarker.GrayOut)]
-	public class RedundantNullCheckIssue : ICodeIssueProvider
-	{
-		private static readonly Pattern pattern1
-			= new Choice {
-			//  a is Record && a != null
-			new BinaryOperatorExpression(
-				PatternHelper.OptionalParentheses(
-					new IsExpression {
-						Expression = new AnyNode("a"),
-						Type = new AnyNode("t")
-					}),
-				BinaryOperatorType.ConditionalAnd,
-				PatternHelper.OptionalParentheses(
-					PatternHelper.CommutativeOperator(new Backreference("a"),
-					                                  BinaryOperatorType.InEquality,
-					                                  new NullReferenceExpression())
-				)
-			),
-			//  a != null && a is Record
-			new BinaryOperatorExpression (
-				PatternHelper.OptionalParentheses(
-					PatternHelper.CommutativeOperator(new AnyNode("a"),
-					                                  BinaryOperatorType.InEquality,
-					                                  new NullReferenceExpression())
-				),
-				BinaryOperatorType.ConditionalAnd,
-				PatternHelper.OptionalParentheses(
-					new IsExpression {
-						Expression = new Backreference("a"),
-						Type = new AnyNode("t")
-					})
-			)
-		};
-
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-
-		class GatherVisitor : GatherVisitorBase<RedundantNullCheckIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext ctx)
-				: base(ctx)
-			{
-			}
-
-			public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
-			{
-				base.VisitBinaryOperatorExpression(binaryOperatorExpression);
-				Match m1 = pattern1.Match(binaryOperatorExpression);
-				if (m1.Success) {
-					AddIssue(binaryOperatorExpression, ctx.TranslateString("Remove redundant IsNULL check"), script => {
-					         	var isExpr = m1.Get<AstType>("t").Single().Parent;
-					         	script.Replace(binaryOperatorExpression, isExpr);
-					         });
-					return;
-				}
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantObjectCreationArgumentListIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantObjectCreationArgumentListIssue.cs
deleted file mode 100644
index 0a81d09592..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantObjectCreationArgumentListIssue.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// 
-// RedundantObjectCreationArgumentListIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Redundant empty argument list on object creation expression",
-					   Description = "When object creation uses object or collection initializer, empty argument list is redundant.",
-					   Category = IssueCategories.Redundancies,
-					   Severity = Severity.Suggestion,
-					   IssueMarker = IssueMarker.GrayOut,
-                       ResharperDisableKeyword = "RedundantEmptyObjectCreationArgumentList")]
-	public class RedundantObjectCreationArgumentListIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<RedundantObjectCreationArgumentListIssue>
-		{
-			public GatherVisitor( BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitObjectCreateExpression (ObjectCreateExpression objectCreateExpression)
-			{
-				base.VisitObjectCreateExpression (objectCreateExpression);
-
-				if (objectCreateExpression.Initializer.IsNull ||
-					objectCreateExpression.Arguments.Count > 0 ||
-					objectCreateExpression.LParToken.IsNull)
-					return;
-
-				AddIssue (objectCreateExpression.LParToken.StartLocation, objectCreateExpression.RParToken.EndLocation,
-					ctx.TranslateString ("Remove redundant empty argument list"), script => {
-						var l1 = objectCreateExpression.LParToken.GetPrevNode ().EndLocation;
-						var l2 = objectCreateExpression.RParToken.GetNextNode ().StartLocation;
-						var o1 = script.GetCurrentOffset (l1);
-						var o2 = script.GetCurrentOffset (l2);
-
-						script.Replace (o1, o2 - o1, " ");
-					});
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantObjectOrCollectionInitializerIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantObjectOrCollectionInitializerIssue.cs
deleted file mode 100644
index 06fff66b1c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantObjectOrCollectionInitializerIssue.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// 
-// RedundantObjectOrCollectionInitializerIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Redundant empty object or collection initializer",
-					   Description = "Redundant empty object or collection initializer.",
-					   Category = IssueCategories.Redundancies,
-					   Severity = Severity.Suggestion,
-					   IssueMarker = IssueMarker.GrayOut,
-                       ResharperDisableKeyword = "RedundantEmptyObjectOrCollectionInitializer")]
-	public class RedundantObjectOrCollectionInitializerIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<RedundantObjectOrCollectionInitializerIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitObjectCreateExpression (ObjectCreateExpression objectCreateExpression)
-			{
-				base.VisitObjectCreateExpression (objectCreateExpression);
-				if (objectCreateExpression.Initializer.IsNull || objectCreateExpression.Initializer.Elements.Count > 0)
-					return;
-
-				AddIssue (objectCreateExpression.Initializer, ctx.TranslateString ("Remove redundant empty initializer"),
-					script => {
-						var expr = (ObjectCreateExpression)objectCreateExpression.Clone ();
-						expr.Initializer = ArrayInitializerExpression.Null;
-						script.Replace (objectCreateExpression, expr);
-					});
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantPrivateIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantPrivateIssue.cs
deleted file mode 100644
index 3d37c5b177..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantPrivateIssue.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-// 
-// RedundantPrivateInspector.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using ICSharpCode.NRefactory.PatternMatching;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// Finds redundant internal modifiers.
-	/// </summary>
-	[IssueDescription("Remove redundant 'private' modifier",
-	       Description = "Removes 'private' modifiers that are not required.",
-	       Category = IssueCategories.Redundancies,
-	       Severity = Severity.Hint,
-	       IssueMarker = IssueMarker.GrayOut)]
-	public class RedundantPrivateIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context, this).GetIssues();
-		}
-
-		class GatherVisitor : GatherVisitorBase<RedundantPrivateIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx, RedundantPrivateIssue issueProvider) : base (ctx, issueProvider)
-			{
-			}
-
-			void CheckNode(EntityDeclaration node)
-			{
-				foreach (var token_ in node.ModifierTokens) {
-					var token = token_;
-					if (token.Modifier == Modifiers.Private) {
-						AddIssue(token, ctx.TranslateString("Remove redundant 'private' modifier"), script => {
-							int offset = script.GetCurrentOffset(token.StartLocation);
-							int endOffset = script.GetCurrentOffset(token.GetNextNode().StartLocation);
-							script.RemoveText(offset, endOffset - offset);
-						});
-					}
-				}
-			}
-
-			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
-			{
-				base.VisitMethodDeclaration(methodDeclaration);
-				CheckNode(methodDeclaration);
-			}
-			
-			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
-			{
-				base.VisitFieldDeclaration(fieldDeclaration);
-				CheckNode(fieldDeclaration);
-			}
-			
-			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
-			{
-				base.VisitPropertyDeclaration(propertyDeclaration);
-				CheckNode(propertyDeclaration);
-			}
-
-			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
-			{
-				base.VisitIndexerDeclaration(indexerDeclaration);
-				CheckNode(indexerDeclaration);
-			}
-
-			public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
-			{
-				base.VisitEventDeclaration(eventDeclaration);
-				CheckNode(eventDeclaration);
-			}
-			
-			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
-			{
-				base.VisitCustomEventDeclaration(eventDeclaration);
-				CheckNode(eventDeclaration);
-			}
-			
-			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
-			{
-				base.VisitConstructorDeclaration(constructorDeclaration);
-				CheckNode(constructorDeclaration);
-			}
-
-			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
-			{
-				base.VisitOperatorDeclaration(operatorDeclaration);
-				CheckNode(operatorDeclaration);
-			}
-
-			public override void VisitFixedFieldDeclaration(FixedFieldDeclaration fixedFieldDeclaration)
-			{
-				base.VisitFixedFieldDeclaration(fixedFieldDeclaration);
-				CheckNode(fixedFieldDeclaration);
-			}
-
-			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
-			{
-				if (!(typeDeclaration.Parent is TypeDeclaration)) {
-					CheckNode(typeDeclaration);
-				}
-				base.VisitTypeDeclaration(typeDeclaration);
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantThisIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantThisIssue.cs
deleted file mode 100644
index 2c47405186..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantThisIssue.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-// 
-// RedundantThisInspector.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using ICSharpCode.NRefactory.PatternMatching;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using System.Linq;
-using ICSharpCode.NRefactory.Refactoring;
-
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// Finds redundant namespace usages.
-	/// </summary>
-	[IssueDescription("Remove redundant 'this.'",
-	       Description= "Removes 'this.' references that are not required.",
-	       Category = IssueCategories.Redundancies,
-	       Severity = Severity.Hint,
-	       IssueMarker = IssueMarker.GrayOut,
-	       ResharperDisableKeyword = "RedundantThisQualifier")]
-	public class RedundantThisIssue : ICodeIssueProvider
-	{
-		bool ignoreConstructors = true;
-
-		/// <summary>
-		/// Specifies whether to ignore redundant 'this' in constructors.
-		/// "this.Name = name;"
-		/// </summary>
-		public bool IgnoreConstructors {
-			get {
-				return ignoreConstructors;
-			}
-			set {
-				ignoreConstructors = value;
-			}
-		}
-		
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context, this).GetIssues();
-		}
-
-		class GatherVisitor : GatherVisitorBase<RedundantThisIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx, RedundantThisIssue issueProvider) : base (ctx, issueProvider)
-			{
-			}
-
-			static IMember GetMember (ResolveResult result)
-			{
-				if (result is MemberResolveResult) {
-					return ((MemberResolveResult)result).Member;
-				} else if (result is MethodGroupResolveResult) {
-					return ((MethodGroupResolveResult)result).Methods.FirstOrDefault ();
-				}
-
-				return null;
-			}
-			
-			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
-			{
-				if (IssueProvider.IgnoreConstructors)
-					return;
-				base.VisitConstructorDeclaration(constructorDeclaration);
-			}
-
-			public override void VisitThisReferenceExpression(ThisReferenceExpression thisReferenceExpression)
-			{
-				base.VisitThisReferenceExpression(thisReferenceExpression);
-				var memberReference = thisReferenceExpression.Parent as MemberReferenceExpression;
-				if (memberReference == null) {
-					return;
-				}
-
-				var state = ctx.GetResolverStateAfter(thisReferenceExpression);
-				var wholeResult = ctx.Resolve(memberReference);
-			
-				IMember member = GetMember(wholeResult);
-				if (member == null) { 
-					return;
-				}
-
-				var result = state.LookupSimpleNameOrTypeName(memberReference.MemberName, EmptyList<IType>.Instance, NameLookupMode.Expression);
-			
-				bool isRedundant;
-				if (result is MemberResolveResult) {
-					isRedundant = ((MemberResolveResult)result).Member.Region.Equals(member.Region);
-				} else if (result is MethodGroupResolveResult) {
-					isRedundant = ((MethodGroupResolveResult)result).Methods.Any(m => m.Region.Equals(member.Region));
-				} else {
-					return;
-				}
-
-				if (isRedundant) {
-					AddIssue(thisReferenceExpression.StartLocation, memberReference.MemberNameToken.StartLocation, ctx.TranslateString("Remove redundant 'this.'"), script => {
-						script.Replace(memberReference, RefactoringAstHelper.RemoveTarget(memberReference));
-					}
-					);
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantToStringIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantToStringIssue.cs
deleted file mode 100644
index eee0a69387..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantToStringIssue.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-//
-// RedundantToStringIssue.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Redundant call to ToString()",
-	                  Description = "Finds calls to ToString() which would occur anyway.",
-	                  Category = IssueCategories.Redundancies,
-	                  Severity = Severity.Suggestion,
-	                  IssueMarker = IssueMarker.GrayOut)]
-	public class RedundantToStringIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<RedundantToStringIssue>
-		{
-			static Tuple<int, int> onlyFirst = Tuple.Create (0, 0);
-
-			static IDictionary<Tuple<string, int>, Tuple<int, int>> membersCallingToString = new Dictionary<Tuple<string, int>, Tuple<int, int>> {
-				{ Tuple.Create("System.IO.TextWriter.Write", 1), onlyFirst },
-				{ Tuple.Create("System.IO.TextWriter.WriteLine", 1), onlyFirst },
-				{ Tuple.Create("System.Console.Write", 1), onlyFirst },
-				{ Tuple.Create("System.Console.WriteLine", 1), onlyFirst }
-			};
-						
-			public GatherVisitor (BaseRefactoringContext context) : base (context)
-			{
-				binOpVisitor = new BinaryExpressionVisitor (this);
-			}
-			
-			HashSet<AstNode> processedNodes = new HashSet<AstNode>();
-
-			void CheckExpressionInAutoCallContext(Expression expression)
-			{
-				if (expression is InvocationExpression && !processedNodes.Contains(expression)) {
-					CheckInvocationInAutoCallContext((InvocationExpression)expression);
-				}
-			}
-
-			void CheckInvocationInAutoCallContext(InvocationExpression invocationExpression)
-			{
-				var memberExpression = invocationExpression.Target as MemberReferenceExpression;
-				if (memberExpression == null) {
-					return;
-				}
-				if (memberExpression.MemberName != "ToString" || invocationExpression.Arguments.Any ()) {
-					return;
-				}
-
-				var resolveResult = ctx.Resolve(invocationExpression) as CSharpInvocationResolveResult;
-				if (resolveResult == null) {
-					return;
-				}
-				AddRedundantToStringIssue(memberExpression, invocationExpression);
-			}
-			
-			void AddRedundantToStringIssue(MemberReferenceExpression memberExpression, InvocationExpression invocationExpression)
-			{
-				// Simon Lindgren 2012-09-14: Previously there was a check here to see if the node had already been processed
-				// This has been moved out to the callers, to check it earlier for a 30-40% run time reduction
-				processedNodes.Add(invocationExpression);
-				
-				AddIssue(memberExpression.DotToken.StartLocation, invocationExpression.RParToken.EndLocation,
-				         ctx.TranslateString("Remove redundant call to ToString()"), script =>  {
-					script.Replace(invocationExpression, memberExpression.Target.Clone());
-				});
-			}
-
-			#region Binary operator
-			public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
-			{
-				base.VisitBinaryOperatorExpression(binaryOperatorExpression);
-
-				if (binaryOperatorExpression.Operator != BinaryOperatorType.Add)
-					return;
-				binOpVisitor.Reset();
-				binaryOperatorExpression.AcceptVisitor(binOpVisitor);
-			}
-
-			BinaryExpressionVisitor binOpVisitor;
-			class BinaryExpressionVisitor : DepthFirstAstVisitor
-			{
-				GatherVisitor issue;
-				int stringExpressionCount;
-				Expression firstStringExpression;
-
-				public BinaryExpressionVisitor(GatherVisitor issue)
-				{
-					this.issue = issue;
-				}
-
-				public void Reset()
-				{
-					stringExpressionCount = 0;
-					firstStringExpression = null;
-				}
-
-				void Check (Expression expression)
-				{
-					if (expression is BinaryOperatorExpression) {
-						expression.AcceptVisitor(this);
-						return;
-					}
-					if (stringExpressionCount <= 1) {
-						var resolveResult = issue.ctx.Resolve(expression);
-						if (resolveResult.Type.IsKnownType(KnownTypeCode.String)) {
-							stringExpressionCount++;
-							if (stringExpressionCount == 1) {
-								firstStringExpression = expression;
-							} else {
-								issue.CheckExpressionInAutoCallContext(firstStringExpression);
-								issue.CheckExpressionInAutoCallContext(expression);
-							}
-						}
-					} else {
-						issue.CheckExpressionInAutoCallContext(expression);
-					}
-				}
-				
-				public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
-				{
-					Check(binaryOperatorExpression.Left);
-					Check(binaryOperatorExpression.Right);
-				}
-			}
-
-			#endregion
-
-			#region Invocation expression
-			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
-			{
-				base.VisitInvocationExpression(invocationExpression);
-
-				var target = invocationExpression.Target as MemberReferenceExpression;
-
-				var invocationResolveResult = ctx.Resolve(invocationExpression) as CSharpInvocationResolveResult;
-				if (invocationResolveResult == null) {
-					return;
-				}
-				IMember member = invocationResolveResult.Member;
-
-				// "".ToString()
-				CheckTargetedObject(invocationExpression, invocationResolveResult.TargetResult.Type, member);
-
-				// Check list of members that call ToString() automatically
-				CheckAutomaticToStringCallers(invocationExpression, member);
-
-				// Check formatting calls
-				CheckFormattingCall(invocationExpression, invocationResolveResult);
-			}
-
-			void CheckTargetedObject(InvocationExpression invocationExpression, IType type, IMember member)
-			{
-				var memberExpression = invocationExpression.Target as MemberReferenceExpression;
-				if (memberExpression != null && !processedNodes.Contains(invocationExpression)) {
-					if (type.IsKnownType(KnownTypeCode.String) && member.Name == "ToString") {
-						AddRedundantToStringIssue(memberExpression, invocationExpression);
-					}
-				}
-			}
-			
-			void CheckAutomaticToStringCallers(InvocationExpression invocationExpression, IMember member)
-			{
-				if (member.IsOverride) {
-					member = InheritanceHelper.GetBaseMember(member);
-					if (member == null) {
-						return;
-					}
-				}
-				var key = new Tuple<string, int>(member.ReflectionName, invocationExpression.Arguments.Count);
-				Tuple<int, int> checkInfo;
-				if (membersCallingToString.TryGetValue(key, out checkInfo)) {
-					var arguments = invocationExpression.Arguments.ToList();
-					for (int i = checkInfo.Item1; i < Math.Min(invocationExpression.Arguments.Count, checkInfo.Item2 + 1); ++i) {
-						CheckExpressionInAutoCallContext(arguments[i]);
-					}
-				}
-			}
-
-			void CheckFormattingCall(InvocationExpression invocationExpression, CSharpInvocationResolveResult invocationResolveResult)
-			{
-				Expression formatArgument;
-				IList<Expression> formatArguments;
-				// Only check parameters that are of type object: String means it is neccessary, others
-				// means that there is another problem (ie no matching overload of the method).
-				Func<IParameter, Expression, bool> predicate = (parameter, argument) => {
-					var type = parameter.Type;
-					if (type is TypeWithElementType && parameter.IsParams) {
-						type = ((TypeWithElementType)type).ElementType;
-					}
-					var typeDefinition = type.GetDefinition();
-					if (typeDefinition == null)
-						return false;
-					return typeDefinition.IsKnownType(KnownTypeCode.Object);
-				};
-				if (FormatStringHelper.TryGetFormattingParameters(invocationResolveResult, invocationExpression,
-				                                                  out formatArgument, out formatArguments, predicate)) {
-					foreach (var argument in formatArguments) {
-						CheckExpressionInAutoCallContext(argument);
-					}
-				}
-			}
-			#endregion
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantTypeCastIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantTypeCastIssue.cs
deleted file mode 100644
index 31ed10f2b0..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantTypeCastIssue.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-// 
-// RedundantTypeCastIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Redundant type cast",
-						Description = "Redundant type cast.",
-						Category = IssueCategories.Redundancies,
-						Severity = Severity.Warning,
-						IssueMarker = IssueMarker.GrayOut,
-                        ResharperDisableKeyword = "RedundantCast")]
-	public class RedundantTypeCastIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<RedundantTypeCastIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitCastExpression (CastExpression castExpression)
-			{
-				base.VisitCastExpression (castExpression);
-
-				CheckTypeCast (castExpression, castExpression.Expression, castExpression.StartLocation, 
-					castExpression.Expression.StartLocation);
-			}
-
-			public override void VisitAsExpression (AsExpression asExpression)
-			{
-				base.VisitAsExpression (asExpression);
-
-				CheckTypeCast (asExpression, asExpression.Expression, asExpression.Expression.EndLocation,
-					asExpression.EndLocation);
-			}
-
-			IType GetExpectedType (Expression typeCastNode)
-			{
-				var memberRefExpr = typeCastNode.Parent as MemberReferenceExpression;
-				if (memberRefExpr != null) {
-					var invocationExpr = memberRefExpr.Parent as InvocationExpression;
-					if (invocationExpr != null && invocationExpr.Target == memberRefExpr) {
-						var invocationResolveResult = ctx.Resolve (invocationExpr) as InvocationResolveResult;
-						if (invocationResolveResult != null) {
-							return invocationResolveResult.Member.DeclaringType;
-						}
-					} else {
-						var memberResolveResult = ctx.Resolve (memberRefExpr) as MemberResolveResult;
-						if (memberResolveResult != null) {
-							return memberResolveResult.Member.DeclaringType;
-						}
-					}
-				}
-				return ctx.GetExpectedType (typeCastNode);
-			}
-
-			bool IsExplicitImplementation(IType exprType, IType interfaceType, Expression typeCastNode)
-			{
-				var memberRefExpr = typeCastNode.Parent as MemberReferenceExpression;
-				if (memberRefExpr != null) {
-					var rr = ctx.Resolve(memberRefExpr);
-					var memberResolveResult = rr as MemberResolveResult;
-					if (memberResolveResult != null) {
-						foreach (var member in exprType.GetMembers (m => m.SymbolKind == memberResolveResult.Member.SymbolKind)) {
-							if (member.IsExplicitInterfaceImplementation && member.ImplementedInterfaceMembers.Contains (memberResolveResult.Member)) {
-								return true;
-							}
-						}
-					}
-
-					var methodGroupResolveResult = rr as MethodGroupResolveResult;
-					if (methodGroupResolveResult != null) {
-						foreach (var member in exprType.GetMethods ()) {
-							if (member.IsExplicitInterfaceImplementation && member.ImplementedInterfaceMembers.Any (m => methodGroupResolveResult.Methods.Contains ((IMethod)m))) {
-								return true;
-							}
-						}
-					}
-				}
-				return false;
-			}
-
-			void AddIssue (Expression typeCastNode, Expression expr, TextLocation start, TextLocation end)
-			{
-				AddIssue (start, end, ctx.TranslateString ("Remove redundant type cast"),
-					script => script.Replace (typeCastNode, expr.Clone ()));
-			}
-
-			void CheckTypeCast (Expression typeCastNode, Expression expr, TextLocation castStart, TextLocation castEnd)
-			{
-				while (typeCastNode.Parent != null && typeCastNode.Parent is ParenthesizedExpression)
-					typeCastNode = (Expression)typeCastNode.Parent;
-				var expectedType = GetExpectedType (typeCastNode);
-				var exprType = ctx.Resolve (expr).Type;
-				if (expectedType.Kind == TypeKind.Interface && IsExplicitImplementation (exprType, expectedType, typeCastNode))
-					return;
-				if (exprType.GetAllBaseTypes ().Any (t => t.Equals(expectedType)))
-					AddIssue (typeCastNode, expr, castStart, castEnd);
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantUsingIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantUsingIssue.cs
deleted file mode 100644
index fb9de2361b..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantUsingIssue.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-// 
-// RedundantUsingInspector.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using ICSharpCode.NRefactory.PatternMatching;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using System.Linq;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// Finds redundant using declarations.
-	/// </summary>
-	[IssueDescription("Remove unused usings",
-	                  Description = "Removes used declarations that are not required.",
-	                  Category = IssueCategories.Redundancies,
-	                  Severity = Severity.Hint,
-	                  IssueMarker = IssueMarker.GrayOut,
-	                  ResharperDisableKeyword = "RedundantUsingDirective"
-	)]
-	public class RedundantUsingIssue : ICodeIssueProvider
-	{
-		List<string> namespacesToKeep = new List<string>();
-		
-		/// <summary>
-		/// The list of namespaces that should be kept even if they are not being used.
-		/// Used in SharpDevelop to always keep the "System" namespace around.
-		/// </summary>
-		public IList<string> NamespacesToKeep {
-			get { return namespacesToKeep; }
-		}
-		
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			var visitor = new GatherVisitor (context, this);
-			context.RootNode.AcceptVisitor (visitor);
-			visitor.Collect ();
-			return visitor.FoundIssues;
-		}
-
-		class GatherVisitor : GatherVisitorBase<RedundantUsingIssue>
-		{
-			Dictionary<UsingDeclaration, bool> isInUse = new Dictionary<UsingDeclaration, bool>();
-			Dictionary<string, UsingDeclaration> namespaceToUsingDecl = new Dictionary<string, UsingDeclaration>();
-			
-			public GatherVisitor (BaseRefactoringContext ctx, RedundantUsingIssue issueProvider) : base (ctx, issueProvider)
-			{
-			}
-
-			public void Collect()
-			{
-				foreach (var u in isInUse.Where (u => !u.Value)) {
-					var decl = u.Key;
-					AddIssue(decl, ctx.TranslateString("Remove redundant usings"), script => {
-						foreach (var u2 in isInUse.Where (a => !a.Value)) {
-							script.Remove (u2.Key);
-						}
-					}
-					);
-				}
-			}
-
-			public override void VisitUsingDeclaration(UsingDeclaration usingDeclaration)
-			{
-				base.VisitUsingDeclaration(usingDeclaration);
-				if (IsSuppressed(usingDeclaration.StartLocation))
-					return;
-				var nrr = ctx.Resolve(usingDeclaration.Import) as NamespaceResolveResult;
-				if (nrr != null) {
-					isInUse[usingDeclaration] = IssueProvider.namespacesToKeep.Contains(nrr.NamespaceName);
-					namespaceToUsingDecl[nrr.NamespaceName] = usingDeclaration;
-				}
-			}
-			
-			public override void VisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration)
-			{
-				var oldNamespaceToUsingDecl = new Dictionary<string, UsingDeclaration>(namespaceToUsingDecl);
-				base.VisitNamespaceDeclaration(namespaceDeclaration);
-				namespaceToUsingDecl = oldNamespaceToUsingDecl;
-			}
-			
-			void UseNamespace(string ns)
-			{
-				UsingDeclaration decl;
-				if (namespaceToUsingDecl.TryGetValue(ns, out decl)) {
-					isInUse[decl] = true;
-				}
-			}
-
-			public override void VisitIdentifierExpression(IdentifierExpression identifierExpression)
-			{
-				base.VisitIdentifierExpression(identifierExpression);
-				var trr = ctx.Resolve(identifierExpression) as TypeResolveResult;
-				if (trr != null) {
-					UseNamespace(trr.Type.Namespace);
-				}
-			}
-
-			public override void VisitSimpleType(SimpleType simpleType)
-			{
-				base.VisitSimpleType(simpleType);
-				UseNamespace(ctx.Resolve(simpleType).Type.Namespace);
-			}
-
-			public override void VisitInvocationExpression (InvocationExpression invocationExpression)
-			{
-				base.VisitInvocationExpression (invocationExpression);
-				UseExtensionMethod(ctx.Resolve(invocationExpression));
-			}
-			
-			void UseExtensionMethod(ResolveResult rr)
-			{
-				var mg = rr as CSharpInvocationResolveResult;
-				if (mg != null && mg.IsExtensionMethodInvocation) {
-					UseNamespace (mg.Member.DeclaringType.Namespace);
-				}
-			}
-			
-			public override void VisitQueryExpression(QueryExpression queryExpression)
-			{
-				base.VisitQueryExpression(queryExpression);
-				foreach (var clause in queryExpression.Clauses) {
-					UseExtensionMethod(ctx.Resolve(clause));
-				}
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantWhereWithPredicateIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantWhereWithPredicateIssue.cs
deleted file mode 100644
index c87bfb065d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantWhereWithPredicateIssue.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Any()/First()/etc. should be used with predicate and Where() removed",
-	                  Description= "Detects redundant Where() with predicate calls followed by Any().",
-	                  Category = IssueCategories.CodeQualityIssues,
-	                  Severity = Severity.Hint,
-                      ResharperDisableKeyword = "ReplaceWithSingleCallToAny")]
-	public class RedundantWhereWithPredicateIssue : ICodeIssueProvider
-	{
-		static readonly AstNode pattern =
-			new InvocationExpression (
-				new MemberReferenceExpression (
-					new NamedNode ("whereInvoke",
-					               new InvocationExpression (
-					               	new MemberReferenceExpression (new AnyNode ("target"), "Where"),
-					               	new AnyNode ())),
-					Pattern.AnyString));
-		
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<RedundantWhereWithPredicateIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
-			{
-			}
-			
-			public override void VisitInvocationExpression (InvocationExpression anyInvoke)
-			{
-				base.VisitInvocationExpression (anyInvoke);
-				
-				var match = pattern.Match (anyInvoke);
-				if (!match.Success)
-					return;
-				
-				var anyResolve = ctx.Resolve (anyInvoke) as InvocationResolveResult;
-				if (anyResolve == null || !HasPredicateVersion(anyResolve.Member))
-					return;
-				var whereInvoke = match.Get<InvocationExpression> ("whereInvoke").Single ();
-				var whereResolve = ctx.Resolve (whereInvoke) as InvocationResolveResult;
-				if (whereResolve == null || whereResolve.Member.Name != "Where" || !IsQueryExtensionClass(whereResolve.Member.DeclaringTypeDefinition))
-					return;
-				if (whereResolve.Member.Parameters.Count != 2)
-					return;
-				var predResolve = whereResolve.Member.Parameters [1];
-				if (predResolve.Type.TypeParameterCount != 2)
-					return;
-				
-				AddIssue (
-					anyInvoke, string.Format("Redundant Where() call with predicate followed by {0}()", anyResolve.Member.Name),
-				    script => {
-						var arg = whereInvoke.Arguments.Single ().Clone ();
-						var target = match.Get<Expression> ("target").Single ().Clone ();
-						script.Replace (anyInvoke, new InvocationExpression (new MemberReferenceExpression (target, anyResolve.Member.Name), arg));
-					});
-			}
-			
-			bool IsQueryExtensionClass(ITypeDefinition typeDef)
-			{
-				if (typeDef == null || typeDef.Namespace != "System.Linq")
-					return false;
-				switch (typeDef.Name) {
-					case "Enumerable":
-					case "ParallelEnumerable":
-					case "Queryable":
-						return true;
-					default:
-						return false;
-				}
-			}
-			
-			bool HasPredicateVersion(IParameterizedMember member)
-			{
-				if (!IsQueryExtensionClass(member.DeclaringTypeDefinition))
-					return false;
-				switch (member.Name) {
-					case "Any":
-					case "Count":
-					case "First":
-					case "FirstOrDefault":
-					case "Last":
-					case "LastOrDefault":
-					case "LongCount":
-					case "Single":
-					case "SingleOrDefault":
-						return true;
-					default:
-						return false;
-				}
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ReferenceEqualsCalledWithValueTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ReferenceEqualsCalledWithValueTypeIssue.cs
deleted file mode 100644
index 2f1d1ea950..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ReferenceEqualsCalledWithValueTypeIssue.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// 
-// ReferenceEqualsCalledWithValueTypeIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("'Object.ReferenceEquals' is always false because it is called with value type",
-					   Description = "'Object.ReferenceEquals' is always false because it is called with value type.",
-					   Category = IssueCategories.CodeQualityIssues,
-					   Severity = Severity.Warning,
-					   IssueMarker = IssueMarker.Underline)]
-	public class ReferenceEqualsCalledWithValueTypeIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<ReferenceEqualsCalledWithValueTypeIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitInvocationExpression (InvocationExpression invocationExpression)
-			{
-				base.VisitInvocationExpression (invocationExpression);
-
-				// Quickly determine if this invocation is eligible to speed up the inspector
-				var nameToken = invocationExpression.Target.GetChildByRole(Roles.Identifier);
-				if (nameToken.Name != "ReferenceEquals")
-					return;
-
-				var resolveResult = ctx.Resolve (invocationExpression) as InvocationResolveResult;
-				if (resolveResult == null || 
-					resolveResult.Member.DeclaringTypeDefinition == null ||
-					resolveResult.Member.DeclaringTypeDefinition.KnownTypeCode != KnownTypeCode.Object ||
-					resolveResult.Member.Name != "ReferenceEquals" ||
-					invocationExpression.Arguments.All(arg => ctx.Resolve(arg).Type.IsReferenceType ?? true))
-					return;
-
-				var action = new CodeAction (ctx.TranslateString ("Use Equals()"),
-					script => script.Replace (invocationExpression.Target, new MemberReferenceExpression (
-						new TypeReferenceExpression (new PrimitiveType ("object")), "Equals")), invocationExpression);
-				AddIssue (invocationExpression,
-					ctx.TranslateString ("'Object.ReferenceEquals' is always false because it is called with value type"),
-					new [] { action });
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ReferenceToStaticMemberViaDerivedTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ReferenceToStaticMemberViaDerivedTypeIssue.cs
deleted file mode 100644
index a73c903eed..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ReferenceToStaticMemberViaDerivedTypeIssue.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-//
-// CallToStaticMemberViaDerivedTypeIssue.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Call to static member via a derived class",
-	                   Description = "Suggests using the class declaring a static function when calling it.",
-	                   Category = IssueCategories.CodeQualityIssues,
-	                   Severity = Severity.Suggestion,
-                       ResharperDisableKeyword = "AccessToStaticMemberViaDerivedType")]
-	public class ReferenceToStaticMemberViaDerivedTypeIssue : ICodeIssueProvider
-	{
-		#region ICodeIssueProvider implementation
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-
-		class GatherVisitor : GatherVisitorBase<ReferenceToStaticMemberViaDerivedTypeIssue>
-		{
-			readonly BaseRefactoringContext context;
-			
-			public GatherVisitor(BaseRefactoringContext context) : base (context)
-			{
-				this.context = context;
-			}
-
-			public override void VisitMemberReferenceExpression(MemberReferenceExpression memberReferenceExpression)
-			{
-				base.VisitMemberReferenceExpression(memberReferenceExpression);
-				if (memberReferenceExpression == null || memberReferenceExpression.Target is ThisReferenceExpression)
-					// Call within current class scope using 'this' or 'base'
-					return;
-				var memberResolveResult = context.Resolve(memberReferenceExpression) as MemberResolveResult;
-				if (memberResolveResult == null)
-					return;
-				if (!memberResolveResult.Member.IsStatic)
-					return;
-				HandleMember(memberReferenceExpression, memberReferenceExpression.Target, memberResolveResult.Member, memberResolveResult.TargetResult);
-			}
-			
-			public override void VisitInvocationExpression(InvocationExpression invocationExpression)
-			{
-				base.VisitInvocationExpression(invocationExpression);
-				if (invocationExpression.Target is IdentifierExpression)
-					// Call within current class scope without 'this' or 'base'
-					return;
-				var memberReference = invocationExpression.Target as MemberReferenceExpression;
-				if (memberReference == null || memberReference.Target is ThisReferenceExpression)
-					// Call within current class scope using 'this' or 'base'
-					return;
-				var invocationResolveResult = context.Resolve(invocationExpression) as InvocationResolveResult;
-				if (invocationResolveResult == null)
-					return;
-				HandleMember(invocationExpression, memberReference.Target, invocationResolveResult.Member, invocationResolveResult.TargetResult);
-			}
-
-			void HandleMember(Expression issueAnchor, Expression targetExpression, IMember member, ResolveResult targetResolveResult)
-			{
-				var typeResolveResult = targetResolveResult as TypeResolveResult;
-				if (typeResolveResult == null)
-					return;
-				if (!member.IsStatic)
-					return;
-				if (typeResolveResult.Type.Equals(member.DeclaringType))
-					return;
-				// check whether member.DeclaringType contains the original type
-				// (curiously recurring template pattern)
-				var v = new ContainsTypeVisitor(typeResolveResult.Type.GetDefinition());
-				member.DeclaringType.AcceptVisitor(v);
-				if (v.IsContained)
-					return;
-				AddIssue(issueAnchor, context.TranslateString("Static method invoked via derived type"),
-				         GetAction(context, targetExpression, member));
-			}
-
-			CodeAction GetAction(BaseRefactoringContext context, Expression targetExpression,
-			                                   IMember member)
-			{
-				var builder = context.CreateTypeSystemAstBuilder(targetExpression);
-				var newType = builder.ConvertType(member.DeclaringType);
-				string description = string.Format("{0} '{1}'", context.TranslateString("Use base class"), newType.ToString());
-				return new CodeAction(description, script => {
-					script.Replace(targetExpression, newType);
-				}, targetExpression);
-			}
-			
-			sealed class ContainsTypeVisitor : TypeVisitor
-			{
-				readonly ITypeDefinition searchedType;
-				internal bool IsContained;
-				
-				public ContainsTypeVisitor(ITypeDefinition searchedType)
-				{
-					this.searchedType = searchedType;
-				}
-				
-				public override IType VisitTypeDefinition(ITypeDefinition type)
-				{
-					if (type.Equals(searchedType))
-						IsContained = true;
-					return base.VisitTypeDefinition(type);
-				}
-			}
-		}
-		#endregion
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ResultOfAsyncCallShouldNotBeIgnoredIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ResultOfAsyncCallShouldNotBeIgnoredIssue.cs
deleted file mode 100644
index 8cdc781b24..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ResultOfAsyncCallShouldNotBeIgnoredIssue.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this
-// software and associated documentation files (the "Software"), to deal in the Software
-// without restriction, including without limitation the rights to use, copy, modify, merge,
-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Result of async call is ignored",
-	                  Description = "Warns when the task returned by an async call is ignored, which causes exceptions" +
-	                  " thrown by the call to be silently ignored.",
-	                  Category = IssueCategories.CodeQualityIssues,
-	                  Severity = Severity.Warning)]
-	public class ResultOfAsyncCallShouldNotBeIgnoredIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-		
-		sealed class GatherVisitor : GatherVisitorBase<ResultOfAsyncCallShouldNotBeIgnoredIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext ctx)
-				: base(ctx)
-			{
-			}
-
-			AstNode GetNodeToUnderline(Expression target)
-			{
-				if (target is IdentifierExpression)
-					return target;
-				if (target is MemberReferenceExpression)
-					return ((MemberReferenceExpression)target).MemberNameToken;
-				return target;
-			}
-			
-			public override void VisitExpressionStatement(ExpressionStatement expressionStatement)
-			{
-				base.VisitExpressionStatement(expressionStatement);
-				var invocation = expressionStatement.Expression as InvocationExpression;
-				if (invocation == null)
-					return;
-				var rr = ctx.Resolve(invocation) as InvocationResolveResult;
-				if (rr != null && (rr.Type.IsKnownType(KnownTypeCode.Task) || rr.Type.IsKnownType(KnownTypeCode.TaskOfT))) {
-					AddIssue(GetNodeToUnderline (invocation.Target), ctx.TranslateString("Exceptions in async call will be silently ignored because the returned task is unused"));
-				}
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/SimplifyAnonymousMethodToDelegateIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/SimplifyAnonymousMethodToDelegateIssue.cs
deleted file mode 100644
index 92a7ed6e23..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/SimplifyAnonymousMethodToDelegateIssue.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-//
-// SimplifyAnonymousMethodToDelegateIssue.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Simplify anonymous method to delegate",
-	                  Description = "Shows anonymous methods that can be simplified.",
-	                  Category = IssueCategories.CodeQualityIssues,
-	                  Severity = Severity.Warning,
-                      ResharperDisableKeyword = "ConvertClosureToMethodGroup")]
-	public class SimplifyAnonymousMethodToDelegateIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-
-		class GatherVisitor : GatherVisitorBase<SimplifyAnonymousMethodToDelegateIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
-			{
-			}
-			
-			static Pattern pattern = new Choice {
-				new BlockStatement {
-					new ReturnStatement (new AnyNode ("invoke")) 
-				},
-				new AnyNode ("invoke")
-			};
-
-			static InvocationExpression AnalyzeBody(AstNode body)
-			{
-				var m = pattern.Match(body);
-				if (m.Success)
-					return m.Get("invoke").Single () as InvocationExpression;
-				return null;
-			}
-
-			static bool IsSimpleTarget(Expression target)
-			{
-				if (target is IdentifierExpression)
-					return true;
-				var mref = target as MemberReferenceExpression;
-				if (mref != null)
-					return IsSimpleTarget (mref.Target);
-				var pref = target as PointerReferenceExpression;
-				if (pref != null)
-					return IsSimpleTarget (pref.Target);
-				return false;
-			}
-
-			void AnalyzeExpression(AstNode expression, AstNode body, AstNodeCollection<ParameterDeclaration> parameters)
-			{
-				var invocation = AnalyzeBody(body);
-				if (invocation == null)
-					return;
-				if (!IsSimpleTarget (invocation.Target))
-					return;
-				var rr = ctx.Resolve (invocation) as CSharpInvocationResolveResult;
-				if (rr == null)
-					return;
-				var lambdaParameters = parameters.ToList();
-				var arguments = rr.GetArgumentsForCall();
-				if (lambdaParameters.Count != arguments.Count)
-					return;
-				for (int i = 0; i < arguments.Count; i++) {
-					var arg = UnpackImplicitIdentityOrReferenceConversion(arguments[i]) as LocalResolveResult;
-					if (arg == null || arg.Variable.Name != lambdaParameters[i].Name)
-						return;
-				}
-				var returnConv = ctx.GetConversion(invocation);
-				if (returnConv.IsExplicit || !(returnConv.IsIdentityConversion || returnConv.IsReferenceConversion))
-					return;
-				AddIssue(expression, ctx.TranslateString("Expression can be reduced to delegate"), script =>  {
-					var validTypes = CreateFieldAction.GetValidTypes (ctx.Resolver, expression).ToList ();
-					if (validTypes.Any (t => t.FullName == "System.Func" && t.TypeParameterCount == 1 + parameters.Count) && validTypes.Any (t => t.FullName == "System.Action")) {
-						if (rr != null && rr.Member.ReturnType.Kind != TypeKind.Void) {
-							var builder = ctx.CreateTypeSystemAstBuilder (expression);
-							var type = builder.ConvertType(new TopLevelTypeName("System", "Func", 1));
-							var args = type.GetChildrenByRole(Roles.TypeArgument);
-							args.Clear ();
-							foreach (var pde in parameters) {
-								args.Add (builder.ConvertType (ctx.Resolve (pde).Type));
-							}
-							args.Add (builder.ConvertType (rr.Member.ReturnType));
-							script.Replace(expression, new CastExpression (type, invocation.Target.Clone()));
-							return;
-						}
-					}
-					script.Replace(expression, invocation.Target.Clone());
-				});
-			}
-			
-			static ResolveResult UnpackImplicitIdentityOrReferenceConversion(ResolveResult rr)
-			{
-				var crr = rr as ConversionResolveResult;
-				if (crr != null && crr.Conversion.IsImplicit && (crr.Conversion.IsIdentityConversion || crr.Conversion.IsReferenceConversion))
-					return crr.Input;
-				return rr;
-			}
-
-			public override void VisitLambdaExpression(LambdaExpression lambdaExpression)
-			{
-				base.VisitLambdaExpression(lambdaExpression);
-				AnalyzeExpression(lambdaExpression, lambdaExpression.Body, lambdaExpression.Parameters);
-			}
-
-			public override void VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression)
-			{
-				base.VisitAnonymousMethodExpression(anonymousMethodExpression);
-				AnalyzeExpression(anonymousMethodExpression, anonymousMethodExpression.Body, anonymousMethodExpression.Parameters);
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/StaticFieldInGenericTypeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/StaticFieldInGenericTypeIssue.cs
deleted file mode 100644
index 3299442ebf..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/StaticFieldInGenericTypeIssue.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// StaticFieldInGenericTypeIssue.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Linq;
-using ICSharpCode.NRefactory.Refactoring;
-using System.Diagnostics.CodeAnalysis;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("Static field in generic type",
-	                   Description = "Warns about static fields in generic types.",
-	                   Category = IssueCategories.Notifications,
-	                   Severity = Severity.Warning,
-	                  SuppressMessageCategory = "Microsoft.Design",
-	                  SuppressMessageCheckId  = "CA1000:DoNotDeclareStaticMembersOnGenericTypes"
-	                  )]
-	public class StaticFieldInGenericTypeIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<StaticFieldInGenericTypeIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext context) : base (context)
-			{
-			}
-
-			IList<ITypeParameter> availableTypeParameters = new List<ITypeParameter>();
-
-			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
-			{
-				var typeResolveResult = ctx.Resolve(typeDeclaration);
-				var typeDefinition = typeResolveResult.Type.GetDefinition();
-				if (typeDefinition == null)
-					return;
-				var newTypeParameters = typeDefinition.TypeParameters;
-
-				var oldTypeParameters = availableTypeParameters; 
-				availableTypeParameters = Concat(availableTypeParameters, newTypeParameters);
-
-				base.VisitTypeDeclaration(typeDeclaration);
-
-				availableTypeParameters = oldTypeParameters;
-			}
-
-			static IList<ITypeParameter> Concat(params IList<ITypeParameter>[] lists)
-			{
-				return lists.SelectMany(l => l).ToList();
-			}
-
-			bool UsesAllTypeParameters(FieldDeclaration fieldDeclaration)
-			{
-				if (availableTypeParameters.Count == 0)
-					return true;
-
-				var fieldType = ctx.Resolve(fieldDeclaration.ReturnType).Type as ParameterizedType;
-				if (fieldType == null)
-					return false;
-
-				// Check that all current type parameters are used in the field type
-				var fieldTypeParameters = fieldType.TypeArguments;
-				foreach (var typeParameter in availableTypeParameters) {
-					if (!fieldTypeParameters.Contains(typeParameter))
-						return false;
-				}
-				return true;
-			}
-
-			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
-			{
-				base.VisitFieldDeclaration(fieldDeclaration);
-				if (fieldDeclaration.Modifiers.HasFlag(Modifiers.Static) && !UsesAllTypeParameters(fieldDeclaration)) {
-					AddIssue(fieldDeclaration, ctx.TranslateString("Static field in generic type"));
-				}
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/StringIsNullOrEmptyIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/StringIsNullOrEmptyIssue.cs
deleted file mode 100644
index 9ae3453f0b..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/StringIsNullOrEmptyIssue.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-// 
-// StringIsNullOrEmptyInspector.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// Checks for str == null &amp;&amp; str == " "
-	/// Converts to: string.IsNullOrEmpty (str)
-	/// </summary>
-	[IssueDescription("Use string.IsNullOrEmpty",
-	       Description = "Uses shorter string.IsNullOrEmpty call instead of a longer condition.",
-	       Category = IssueCategories.Improvements,
-	       Severity = Severity.Suggestion,
-           ResharperDisableKeyword = "ReplaceWithStringIsNullOrEmpty")]
-	public class StringIsNullOrEmptyIssue : ICodeIssueProvider
-	{
-		static readonly Pattern pattern = new Choice {
-			// str == null || str == ""
-			// str == null || str.Length == 0
-			new BinaryOperatorExpression (
-				PatternHelper.CommutativeOperator (new AnyNode ("str"), BinaryOperatorType.Equality, new NullReferenceExpression ()),
-				BinaryOperatorType.ConditionalOr,
-				new Choice {
-					PatternHelper.CommutativeOperator (new Backreference ("str"), BinaryOperatorType.Equality, new PrimitiveExpression ("")),
-					PatternHelper.CommutativeOperator (
-						new MemberReferenceExpression (new Backreference ("str"), "Length"),
-						BinaryOperatorType.Equality,
-						new PrimitiveExpression (0)
-					)
-				}
-			),
-			// str == "" || str == null
-			new BinaryOperatorExpression (
-				PatternHelper.CommutativeOperator (new AnyNode ("str"), BinaryOperatorType.Equality, new PrimitiveExpression ("")),
-				BinaryOperatorType.ConditionalOr,
-				PatternHelper.CommutativeOperator(new Backreference ("str"), BinaryOperatorType.Equality, new NullReferenceExpression ())
-			)
-		};
-
-		static readonly Pattern negPattern = new Choice {
-			// str != null && str != ""
-			// str != null && str.Length != 0
-			// str != null && str.Length > 0
-			new BinaryOperatorExpression (
-				PatternHelper.CommutativeOperator(new AnyNode ("str"), BinaryOperatorType.InEquality, new NullReferenceExpression ()),
-				BinaryOperatorType.ConditionalAnd,
-				new Choice {
-					PatternHelper.CommutativeOperator (new Backreference ("str"), BinaryOperatorType.InEquality, new PrimitiveExpression ("")),
-					PatternHelper.CommutativeOperator (
-						new MemberReferenceExpression (new Backreference ("str"), "Length"),
-						BinaryOperatorType.InEquality,
-						new PrimitiveExpression (0)
-					),
-					new BinaryOperatorExpression (
-						new MemberReferenceExpression (new Backreference ("str"), "Length"),
-						BinaryOperatorType.GreaterThan,
-						new PrimitiveExpression (0)
-					)
-				}
-			),
-			// str != "" && str != null
-			new BinaryOperatorExpression (
-				PatternHelper.CommutativeOperator (new AnyNode ("str"), BinaryOperatorType.InEquality, new PrimitiveExpression ("")),
-				BinaryOperatorType.ConditionalAnd,
-				PatternHelper.CommutativeOperator(new Backreference ("str"), BinaryOperatorType.InEquality, new NullReferenceExpression ())
-			)
-		};
-
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<StringIsNullOrEmptyIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx) : base (ctx)
-			{
-			}
-
-			public override void VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression)
-			{
-				base.VisitBinaryOperatorExpression(binaryOperatorExpression);
-				Match m = pattern.Match(binaryOperatorExpression);
-				bool isNegated = false;
-				if (!m.Success) {
-					m = negPattern.Match(binaryOperatorExpression);
-					isNegated = true;
-				}
-				if (m.Success) {
-					var str = m.Get<Expression>("str").Single();
-					var def = ctx.Resolve (str).Type.GetDefinition ();
-					if (def == null || def.KnownTypeCode != ICSharpCode.NRefactory.TypeSystem.KnownTypeCode.String)
-						return;
-					AddIssue(binaryOperatorExpression, ctx.TranslateString("Use string.IsNullOrEmpty"), script => {
-						Expression expr = new PrimitiveType ("string").Invoke("IsNullOrEmpty", str.Clone());
-						if (isNegated)
-							expr = new UnaryOperatorExpression (UnaryOperatorType.Not, expr);
-						script.Replace(binaryOperatorExpression, expr);
-					});
-					return;
-				}
-			}
-
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ThreadStaticOnInstanceFieldIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ThreadStaticOnInstanceFieldIssue.cs
deleted file mode 100644
index 63403a0fad..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ThreadStaticOnInstanceFieldIssue.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// ThreadStaticOnInstanceFieldIssue.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using System;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("The ThreadStatic attribute does nothing on instance fields",
-	                  Description = "Finds usages of ThreadStatic on instance fields.",
-	                  Category = IssueCategories.Notifications,
-	                  Severity = Severity.Warning,
-                      ResharperDisableKeyword = "ThreadStaticAtInstanceField")]
-	public class ThreadStaticOnInstanceFieldIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<ThreadStaticOnInstanceFieldIssue>
-		{
-			ITypeDefinition threadStaticDefinition;
-
-			public GatherVisitor(BaseRefactoringContext context) : base (context)
-			{
-				var type = typeof(ThreadStaticAttribute).ToTypeReference().Resolve(ctx.Compilation.TypeResolveContext);
-				threadStaticDefinition = type.GetDefinition();
-			}
-
-			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
-			{
-				if (fieldDeclaration.Modifiers.HasFlag(Modifiers.Static))
-					return;
-
-				foreach (var attributeSection in fieldDeclaration.Attributes) {
-					int attributeCount = attributeSection.Attributes.Count;
-					foreach (var attribute in attributeSection.Attributes) {
-						var resolvedAttribute = ctx.Resolve(attribute.Type) as TypeResolveResult;
-						if (resolvedAttribute == null)
-							continue;
-						if (threadStaticDefinition.Equals(resolvedAttribute.Type.GetDefinition())) {
-							string title = ctx.TranslateString("ThreadStatic does nothing on instance fields");
-							if (attributeCount == 1)
-								AddIssue(attributeSection, title, GetActions(attribute, attributeSection, fieldDeclaration));
-							else
-								AddIssue(attribute, title, GetActions(attribute, attributeSection, fieldDeclaration));
-						}
-					}
-				}
-			}
-
-			IEnumerable<CodeAction> GetActions(Attribute attribute, AttributeSection attributeSection, FieldDeclaration fieldDeclaration)
-			{
-				string removeAttributeMessage = ctx.TranslateString("Remove attribute");
-				yield return new CodeAction(removeAttributeMessage, script => {
-					if (attributeSection.Attributes.Count > 1) {
-						var newSection = new AttributeSection();
-						newSection.AttributeTarget = attributeSection.AttributeTarget;
-						foreach (var attr in attributeSection.Attributes) {
-							if (attr != attribute)
-								newSection.Attributes.Add((Attribute)attr.Clone());
-						}
-						script.Replace(attributeSection, newSection);
-					} else {
-						script.Remove(attributeSection);
-					}
-				}, attribute);
-
-				var makeStaticMessage = ctx.TranslateString("Make the field static");
-				yield return new CodeAction(makeStaticMessage, script => {
-					var newDeclaration = (FieldDeclaration)fieldDeclaration.Clone();
-					newDeclaration.Modifiers |= Modifiers.Static;
-					script.Replace(fieldDeclaration, newDeclaration);
-				}, fieldDeclaration.NameToken);
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/TypeParameterNotUsedIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/TypeParameterNotUsedIssue.cs
deleted file mode 100644
index ee980ddd92..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/TypeParameterNotUsedIssue.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// 
-// TypeParameterNotUsedIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Unused type parameter",
-					   Description = "Type parameter is never used.",
-					   Category = IssueCategories.Redundancies,
-					   Severity = Severity.Warning,
-					   IssueMarker = IssueMarker.GrayOut,
-                       ResharperDisableKeyword = "UnusedTypeParameter")]
-	public class TypeParameterNotUsedIssue : ICodeIssueProvider
-	{
-		static FindReferences refFinder = new FindReferences ();
-
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			var unit = context.RootNode as SyntaxTree;
-			if (unit == null)
-				return Enumerable.Empty<CodeIssue> ();
-			return new GatherVisitor (context, unit).GetIssues ();
-		}
-
-		protected static bool FindUsage (BaseRefactoringContext context, SyntaxTree unit,
-										 ITypeParameter typeParameter, AstNode declaration)
-		{
-			var found = false;
-			var searchScopes = refFinder.GetSearchScopes(typeParameter);
-			refFinder.FindReferencesInFile(searchScopes, context.Resolver,
-				(node, resolveResult) =>
-				{
-					if (node != declaration)
-						found = true;
-				}, context.CancellationToken);
-			return found;
-		}
-
-		class GatherVisitor : GatherVisitorBase<TypeParameterNotUsedIssue>
-		{
-			SyntaxTree unit;
-
-			public GatherVisitor (BaseRefactoringContext ctx, SyntaxTree unit)
-				: base (ctx)
-			{
-				this.unit = unit;
-			}
-
-			public override void VisitTypeParameterDeclaration (TypeParameterDeclaration decl)
-			{
-				base.VisitTypeParameterDeclaration (decl);
-
-				var resolveResult = ctx.Resolve (decl) as TypeResolveResult;
-				if (resolveResult == null)
-					return;
-				var typeParameter = resolveResult.Type as ITypeParameter;
-				if (typeParameter == null)
-					return;
-				var methodDecl = decl.Parent as MethodDeclaration;
-				if (methodDecl == null)
-					return;
-
-				if (FindUsage (ctx, unit, typeParameter, decl))
-					return;
-
-				AddIssue (decl.NameToken, ctx.TranslateString ("Type parameter is never used"));
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/Uncategorized/.DS_Store b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/Uncategorized/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UnreachableCodeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UnreachableCodeIssue.cs
deleted file mode 100644
index c9e7bfc46b..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UnreachableCodeIssue.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-// 
-// UnreachableCodeIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp.Analysis;
-using System.Linq;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Code is unreachable",
-						Description = "Code is unreachable.",
-						Category = IssueCategories.Redundancies,
-						Severity = Severity.Warning,
-						IssueMarker = IssueMarker.GrayOut)]
-	public class UnreachableCodeIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<UnreachableCodeIssue>
-		{
-			HashSet<AstNode> unreachableNodes;
-
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-				unreachableNodes = new HashSet<AstNode> ();
-			}
-
-			public override void VisitMethodDeclaration (MethodDeclaration methodDeclaration)
-			{
-				StatementIssueCollector.Collect (this, methodDeclaration.Body);
-
-				base.VisitMethodDeclaration (methodDeclaration);
-			}
-
-			public override void VisitLambdaExpression (LambdaExpression lambdaExpression)
-			{
-				var blockStatement = lambdaExpression.Body as BlockStatement;
-				if (blockStatement != null)
-					StatementIssueCollector.Collect (this, blockStatement);
-
-				base.VisitLambdaExpression (lambdaExpression);
-			}
-
-			public override void VisitAnonymousMethodExpression (AnonymousMethodExpression anonymousMethodExpression)
-			{
-				StatementIssueCollector.Collect (this, anonymousMethodExpression.Body);
-
-				base.VisitAnonymousMethodExpression (anonymousMethodExpression);
-			}
-
-			public override void VisitConditionalExpression (ConditionalExpression conditionalExpression)
-			{
-				var resolveResult = ctx.Resolve (conditionalExpression.Condition);
-				if (resolveResult.ConstantValue is bool) {
-					var condition = (bool)resolveResult.ConstantValue;
-					Expression resultExpr, unreachableExpr;
-					if (condition) {
-						resultExpr = conditionalExpression.TrueExpression;
-						unreachableExpr = conditionalExpression.FalseExpression;
-					} else {
-						resultExpr = conditionalExpression.FalseExpression;
-						unreachableExpr = conditionalExpression.TrueExpression;
-					}
-					unreachableNodes.Add (unreachableExpr);
-
-					AddIssue (unreachableExpr, ctx.TranslateString ("Remove unreachable code"),
-						script => script.Replace (conditionalExpression, resultExpr.Clone ()));
-				}
-				base.VisitConditionalExpression (conditionalExpression);
-			}
-
-			protected override void VisitChildren (AstNode node)
-			{
-				// skip unreachable nodes
-				if (!unreachableNodes.Contains (node))
-					base.VisitChildren (node);
-			}
-
-			class StatementIssueCollector : DepthFirstAstVisitor
-			{
-				GatherVisitor visitor;
-				ReachabilityAnalysis reachability;
-				HashSet<Statement> collectedStatements;
-
-				private StatementIssueCollector (GatherVisitor visitor, ReachabilityAnalysis reachability)
-				{
-					collectedStatements = new HashSet<Statement> ();
-					this.visitor = visitor;
-					this.reachability = reachability;
-				}
-
-				public static void Collect (GatherVisitor visitor, BlockStatement body)
-				{
-					if (body.IsNull)
-						return;
-					var reachability = visitor.ctx.CreateReachabilityAnalysis (body);
-
-					var collector = new StatementIssueCollector (visitor, reachability);
-					collector.VisitBlockStatement (body);
-				}
-
-				protected override void VisitChildren (AstNode node)
-				{
-					var statement = node as Statement;
-					if (statement == null || !AddStatement (statement))
-						base.VisitChildren (node);
-				}
-
-				bool AddStatement(Statement statement)
-				{
-					if (reachability.IsReachable (statement))
-						return false;
-					if (collectedStatements.Contains (statement))
-						return true;
-					var prevEnd = statement.GetPrevNode (n => !(n is NewLineNode)).EndLocation;
-
-					// group multiple continuous statements into one issue
-					var start = statement.StartLocation;
-					collectedStatements.Add (statement);
-					visitor.unreachableNodes.Add (statement);
-					while (statement.GetNextSibling (s => s is Statement) != null) {
-						statement = (Statement)statement.GetNextSibling (s => s is Statement);
-						collectedStatements.Add (statement);
-						visitor.unreachableNodes.Add (statement);
-					}
-					var end = statement.EndLocation;
-
-					var removeAction = new CodeAction (visitor.ctx.TranslateString ("Remove unreachable code"),
-						script =>
-						{
-							var startOffset = script.GetCurrentOffset (prevEnd);
-							var endOffset = script.GetCurrentOffset (end);
-							script.RemoveText (startOffset, endOffset - startOffset);
-						}, collectedStatements.First().StartLocation, collectedStatements.Last().EndLocation);
-					var commentAction = new CodeAction(visitor.ctx.TranslateString("Comment unreachable code"),
-						script =>
-					{
-						var startOffset = script.GetCurrentOffset(prevEnd);
-						script.InsertText(startOffset, Environment.NewLine + "/*");
-						var endOffset = script.GetCurrentOffset(end);
-						script.InsertText(endOffset, Environment.NewLine + "*/");
-					}, collectedStatements.First().StartLocation, collectedStatements.Last().EndLocation);
-					var actions = new [] { removeAction, commentAction };
-					visitor.AddIssue (start, end, visitor.ctx.TranslateString ("Code is unreachable"), actions);
-					return true;
-				}
-
-				// skip lambda and anonymous method
-				public override void VisitLambdaExpression (LambdaExpression lambdaExpression)
-				{
-				}
-
-				public override void VisitAnonymousMethodExpression (
-					AnonymousMethodExpression anonymousMethodExpression)
-				{
-				}
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseBlockInsteadColonIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseBlockInsteadColonIssue.cs
deleted file mode 100644
index 7a03474c48..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseBlockInsteadColonIssue.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Issue.cs
-//
-// Author:
-//       Ciprian Khlud <ciprian.mustiata@yahoo.com>
-//
-// Copyright (c) 2013 Ciprian Khlud
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	
-	[IssueDescription ("';' should be avoided",
-	                   Description = "';' should be avoided. Use '{}' instead",
-	                   Category = IssueCategories.CodeQualityIssues,
-	                   Severity = Severity.Warning,
-	                   IssueMarker = IssueMarker.Underline)]
-	public class UseBlockInsteadColonIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<UseBlockInsteadColonIssue>
-		{
-		    private readonly string _commandTitle;
-
-		    public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-            {
-                _commandTitle = ctx.TranslateString("';' should be avoided. Use '{}' instead");
-			}
-
-            public override void VisitWhileStatement(WhileStatement whileStatement)
-            {
-                base.VisitWhileStatement(whileStatement);
-                var statement = whileStatement.EmbeddedStatement as EmptyStatement;
-                if (statement == null)
-                    return;
-
-                AddIssue(whileStatement.EmbeddedStatement,
-                    _commandTitle,
-                    script => script.Replace(whileStatement.EmbeddedStatement, new BlockStatement()));
-            
-            }
-
-            public override void VisitForeachStatement(ForeachStatement foreachStatement)
-            {
-                base.VisitForeachStatement(foreachStatement);
-                var statement = foreachStatement.EmbeddedStatement as EmptyStatement;
-                if (statement == null)
-                    return;
-
-                AddIssue(foreachStatement.EmbeddedStatement,
-                    _commandTitle,
-                    script => script.Replace(foreachStatement.EmbeddedStatement, new BlockStatement()));
-            }
-
-            public override void VisitIfElseStatement(IfElseStatement ifElseStatement)
-            {
-                base.VisitIfElseStatement(ifElseStatement);
-                var statement = ifElseStatement.TrueStatement as EmptyStatement;
-                if(statement==null)
-                    return;
-                AddIssue(ifElseStatement.TrueStatement, 
-                    _commandTitle, 
-                    script => script.Replace(ifElseStatement.TrueStatement, new BlockStatement()));
-            }
-
-            public override void VisitForStatement(ForStatement forStatement)
-            {
-                base.VisitForStatement(forStatement);
-
-                var statement = forStatement.EmbeddedStatement as EmptyStatement;
-                if (statement == null)
-                    return;
-
-                AddIssue(forStatement.EmbeddedStatement,
-                    _commandTitle,
-                    script => script.Replace(forStatement.EmbeddedStatement, new BlockStatement()));
-            }
-		}
-	}
-	
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseVarKeywordIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseVarKeywordIssue.cs
deleted file mode 100644
index 718f805366..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseVarKeywordIssue.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-// 
-// UseVarKeywordInspector.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.PatternMatching;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.Refactoring;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// Checks for places where the 'var' keyword can be used. Note that the action is actually done with a context
-	/// action.
-	/// </summary>
-	[IssueDescription("Use 'var' keyword",
-	       Description = "Use implicitly typed local variable decaration",
-	       Category = IssueCategories.Opportunities,
-	       Severity = Severity.Hint,
-	       IssueMarker = IssueMarker.None,
-           ResharperDisableKeyword = "SuggestUseVarKeywordEvident")]
-	public class UseVarKeywordIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context, this).GetIssues();
-		}
-
-		class GatherVisitor : GatherVisitorBase<UseVarKeywordIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx, UseVarKeywordIssue issueProvider) : base (ctx, issueProvider)
-			{
-			}
-
-			public override void VisitVariableDeclarationStatement(VariableDeclarationStatement variableDeclarationStatement)
-			{
-				base.VisitVariableDeclarationStatement(variableDeclarationStatement);
-				if (variableDeclarationStatement.Type is PrimitiveType) {
-					return;
-				}
-				if (variableDeclarationStatement.Type.IsVar()) {
-					return;
-				}
-				if (variableDeclarationStatement.Variables.Count != 1) {
-					return;
-				}
-				
-				//only checks for cases where the type would be obvious - assignment of new, cast, etc.
-				//also check the type actually matches else the user might want to assign different subclasses later
-				var v = variableDeclarationStatement.Variables.Single();
-				
-				var arrCreate = v.Initializer as ArrayCreateExpression;
-				if (arrCreate != null) {
-					var n = variableDeclarationStatement.Type as ComposedType;
-					//FIXME: check the specifier compatibility
-					if (n != null && n.ArraySpecifiers.Any() && n.BaseType.IsMatch(arrCreate.Type)) {
-						AddIssue(variableDeclarationStatement);
-					}
-				}
-				var objCreate = v.Initializer as ObjectCreateExpression;
-				if (objCreate != null && objCreate.Type.IsMatch(variableDeclarationStatement.Type)) {
-					AddIssue(variableDeclarationStatement);
-				}
-				var asCast = v.Initializer as AsExpression;
-				if (asCast != null && asCast.Type.IsMatch(variableDeclarationStatement.Type)) {
-					AddIssue(variableDeclarationStatement);
-				}
-				var cast = v.Initializer as CastExpression;
-				if (cast != null && cast.Type.IsMatch(variableDeclarationStatement.Type)) {
-					AddIssue(variableDeclarationStatement);
-				}
-			}
-			
-			void AddIssue(VariableDeclarationStatement variableDeclarationStatement)
-			{
-				AddIssue(variableDeclarationStatement.Type, ctx.TranslateString("Use 'var' keyword"));
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ValueParameterUnusedIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ValueParameterUnusedIssue.cs
deleted file mode 100644
index e2f647f987..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ValueParameterUnusedIssue.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// SetterDoesNotUseValueParameterTests.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using System.Threading;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription("The value parameter is not used in a context where is should be",
-	       Description = "Warns about property or indexer setters and event adders or removers that do not use the value parameter.",
-	       Category = IssueCategories.CodeQualityIssues,
-	       Severity = Severity.Warning)]
-	public class ValueParameterUnusedIssue : ICodeIssueProvider
-	{
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context, this).GetIssues();
-		}
-		
-		class GatherVisitor : GatherVisitorBase<ValueParameterUnusedIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext context, ValueParameterUnusedIssue inspector) : base (context)
-			{
-			}
-
-			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
-			{
-				FindIssuesInAccessor(indexerDeclaration.Setter);
-			}
-
-			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
-			{
-				FindIssuesInAccessor(propertyDeclaration.Setter);
-			}
-
-			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
-			{
-				var addAccessor = eventDeclaration.AddAccessor;
-				var removeAccessor = eventDeclaration.RemoveAccessor;
-				// don't warn on empty custom events
-				if (addAccessor.Body.Statements.Count == 0 && removeAccessor.Body.Statements.Count == 0)
-					return;
-				FindIssuesInAccessor(addAccessor, "add accessor");
-				FindIssuesInAccessor(removeAccessor, "remove accessor");
-			}
-
-			void FindIssuesInAccessor(Accessor accessor, string accessorName = "setter")
-			{
-				var body = accessor.Body;
-				if (!IsEligible(body))
-					return;
-
-				var localResolveResult = ctx.GetResolverStateBefore(body)
-					.LookupSimpleNameOrTypeName("value", new List<IType>(), NameLookupMode.Expression) as LocalResolveResult; 
-				if (localResolveResult == null)
-					return;
-
-				bool referenceFound = false;
-				foreach (var result in ctx.FindReferences (body, localResolveResult.Variable)) {
-					var node = result.Node;
-					if (node.StartLocation >= body.StartLocation && node.EndLocation <= body.EndLocation) {
-						referenceFound = true;
-						break;
-					}
-				}
-
-				if(!referenceFound)
-					AddIssue(accessor.Keyword, ctx.TranslateString("The " + accessorName + " does not use the 'value' parameter"));
-			}
-
-			static bool IsEligible(BlockStatement body)
-			{
-				if (body == null || body.IsNull)
-					return false;
-				if (body.Statements.FirstOrNullObject() is ThrowStatement)
-					return false;
-				return true;
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableDeclaredInWideScopeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableDeclaredInWideScopeIssue.cs
deleted file mode 100644
index a32a8d0d2e..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableDeclaredInWideScopeIssue.cs
+++ /dev/null
@@ -1,383 +0,0 @@
-//
-// VariableDeclaredWideScopeIssue.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using System.Linq;
-using System;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-//	[IssueDescription("The variable can be declared in a nested scope",
-//	                   Description = "Highlights variables that can be declared in a nested scope.",
-//	                   Category = IssueCategories.Opportunities,
-//	                   Severity = Severity.Suggestion)]
-	public class VariableDeclaredInWideScopeIssue : ICodeIssueProvider
-	{
-		#region ICodeIssueProvider implementation
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context, this).GetIssues();
-		}
-		#endregion
-
-		class GatherVisitor : GatherVisitorBase<VariableDeclaredInWideScopeIssue>
-		{
-			readonly BaseRefactoringContext context;
-			
-			public GatherVisitor(BaseRefactoringContext context, VariableDeclaredInWideScopeIssue issueProvider) : base (context, issueProvider)
-			{
-				this.context = context;
-			}
-
-			static readonly IList<Type> moveTargetBlacklist = new List<Type> {
-				typeof(WhileStatement),
-				typeof(ForeachStatement),
-				typeof(ForStatement),
-				typeof(DoWhileStatement),
-				typeof(TryCatchStatement),
-				typeof(AnonymousMethodExpression),
-				typeof(LambdaExpression),
-				typeof(LockStatement)
-			};
-
-			class CheckInitializer : DepthFirstAstVisitor
-			{
-				public bool IsValid {
-					get;
-					private set;
-				}
-
-				public CheckInitializer()
-				{
-					IsValid = true;
-				}
-
-				public override void VisitInvocationExpression(InvocationExpression invocationExpression)
-				{
-					base.VisitInvocationExpression(invocationExpression);
-					IsValid = false;
-				}
-			}
-			
-			bool CheckForInvocations(Expression initializer)
-			{
-				var visitor = new CheckInitializer();
-				initializer.AcceptVisitor(visitor);
-				return visitor.IsValid;
-			}
-
-			public override void VisitVariableDeclarationStatement(VariableDeclarationStatement variableDeclarationStatement)
-			{
-				base.VisitVariableDeclarationStatement(variableDeclarationStatement);
-
-				var rootNode = variableDeclarationStatement.Parent as BlockStatement;
-				if (rootNode == null)
-					// We are somewhere weird, like a the ResourceAquisition of a using statement
-					return;
-
-				// TODO: Handle declarations with more than one variable?
-				if (variableDeclarationStatement.Variables.Count > 1)
-					return;
-
-				var variableInitializer = variableDeclarationStatement.Variables.First();
-				var identifiers = GetIdentifiers(rootNode.Descendants, variableInitializer.Name).ToList();
-
-				if (identifiers.Count == 0)
-					// variable is not used
-					return;
-
-				if (!CheckForInvocations(variableInitializer.Initializer))
-					return;
-
-				AstNode deepestCommonAncestor = GetDeepestCommonAncestor(rootNode, identifiers);
-				var path = GetPath(rootNode, deepestCommonAncestor);
-
-				// The node that will follow the moved declaration statement
-				AstNode anchorNode = GetInitialAnchorNode(rootNode, identifiers, path);
-
-				// Restrict path to only those where the initializer has not changed
-				var pathToCheck = path.Skip(1).ToList();
-				var firstInitializerChangeNode = GetFirstInitializerChange(variableDeclarationStatement, pathToCheck, variableInitializer.Initializer);
-				if (firstInitializerChangeNode != null) {
-					// The node changing the initializer expression may not be on the path
-					// to the actual usages of the variable, so we need to merge the paths
-					// so we get the part of the paths that are common between them
-					var pathToChange = GetPath(rootNode, firstInitializerChangeNode);
-					var deepestCommonIndex = GetLowestCommonAncestorIndex(path, pathToChange);
-					anchorNode = pathToChange [deepestCommonIndex + 1];
-					path = pathToChange.Take(deepestCommonIndex).ToList();
-				}
-
-				// Restrict to locations outside of blacklisted node types
-				var firstBlackListedNode = path.Where(node => moveTargetBlacklist.Contains(node.GetType())).FirstOrDefault();
-				if (firstBlackListedNode != null) {
-					path = GetPath(rootNode, firstBlackListedNode.Parent);
-					anchorNode = firstBlackListedNode;
-				}
-
-				anchorNode = GetInsertionPoint(anchorNode);
-
-				if (anchorNode != null && anchorNode != rootNode && anchorNode.Parent != rootNode) {
-					AddIssue(variableDeclarationStatement, context.TranslateString("Variable could be moved to a nested scope"),
-					         GetActions(variableDeclarationStatement, (Statement)anchorNode));
-				}
-			}
-
-			static bool IsBannedInsertionPoint(AstNode anchorNode)
-			{
-				var parent = anchorNode.Parent;
-
-				// Don't split 'else if ...' into else { if ... }
-				if (parent is IfElseStatement && anchorNode is IfElseStatement)
-					return true;
-				// Don't allow moving the declaration into the resource aquisition of a using statement
-				if (parent is UsingStatement)
-					return true;
-				// Don't allow moving things into arbitrary positions of for statements
-				if (parent is ForStatement && anchorNode.Role != Roles.EmbeddedStatement)
-					return true;
-				return false;
-			}
-
-			static AstNode GetInsertionPoint(AstNode node)
-			{
-				while (true) {
-					if (node == null)
-						break;
-					if (node is Statement && !IsBannedInsertionPoint(node))
-						break;
-					node = node.Parent;
-				}
-				return node;
-			}
-
-			AstNode GetInitialAnchorNode (BlockStatement rootNode, List<IdentifierExpression> identifiers, IList<AstNode> path)
-			{
-				if (identifiers.Count > 1) {
-					// Assume the first identifier is the first in the execution flow
-					// firstPath will always be longer than path since path is the
-					// combination of a least two (different) paths.
-					var firstPath = GetPath(rootNode, identifiers [0]);
-					if (firstPath [path.Count].Role == IfElseStatement.TrueRole) {
-						// IfElseStatement has a slightly weird structure; Don't
-						// consider the true role eligible for anchor node in this case
-						return firstPath [path.Count - 1];
-					}
-					return firstPath [path.Count];
-				}
-				// We only have one path, and a statement in itself cannot be an identifier
-				// so we're safe
-				return path [path.Count - 1];
-			}
-
-			static IEnumerable<IdentifierExpression> GetIdentifiers(IEnumerable<AstNode> candidates, string name = null)
-			{
-				return 
-					from node in candidates
-					let identifier = node as IdentifierExpression
-					where identifier != null && (name == null || identifier.Identifier == name)
-					select identifier;
-			}
-
-			AstNode GetFirstInitializerChange(AstNode variableDeclarationStatement, IList<AstNode> path, Expression initializer)
-			{
-				var identifiers = GetIdentifiers(initializer.DescendantsAndSelf).ToList();
-				var mayChangeInitializer = GetChecker (initializer, identifiers);
-				AstNode lastChange = null;
-				for (int i = path.Count - 1; i >= 0; i--) {
-					for (AstNode node = path[i].PrevSibling; node != null && node != variableDeclarationStatement; node = node.PrevSibling) {
-						// Special case for IfElseStatement: The AST nesting does not match the scope nesting, so
-						// don't handle branches here: The correct one has already been checked anyway.
-						// This also works to our advantage: No special checking is needed for the condition since
-						// it is a the same level in the tree as the false branch
-						if (node.Role == IfElseStatement.TrueRole || node.Role == IfElseStatement.FalseRole)
-							continue;
-						foreach (var expression in node.DescendantsAndSelf.Where(n => n is Expression).Cast<Expression>()) {
-							if (mayChangeInitializer(expression)) {
-								lastChange = expression;
-							}
-						}
-					}
-				}
-				return lastChange;
-			}
-
-			Func<Expression, bool> GetChecker(Expression expression, IList<IdentifierExpression> identifiers)
-			{
-				// TODO: This only works for simple cases.
-				IList<IMember> members;
-				IList<IVariable> locals;
-				var identifierResolveResults = identifiers.Select(identifier => context.Resolve(identifier)).ToList();
-				SplitResolveResults(identifierResolveResults, out members, out locals);
-				
-				if (expression is InvocationExpression || expression is ObjectCreateExpression) {
-					return node => {
-						if (node is InvocationExpression || node is ObjectCreateExpression)
-							// We don't know what these might do, so assume it will change the initializer
-							return true;
-						var binaryOperator = node as BinaryOperatorExpression;
-						if (binaryOperator != null) {
-							var resolveResult = context.Resolve(binaryOperator) as OperatorResolveResult;
-							if (resolveResult == null)
-								return false;
-							// Built-in operators are ok, user defined ones not so much
-							return resolveResult.UserDefinedOperatorMethod != null;
-						}
-						return IsConflictingAssignment(node, identifiers, members, locals);
-					};
-				} else if (expression is IdentifierExpression) {
-					var initializerDependsOnMembers = identifierResolveResults.Any(result => result is MemberResolveResult);
-					var initializerDependsOnReferenceType = identifierResolveResults.Any(result => result.Type.IsReferenceType == true);
-					return node => {
-						if ((node is InvocationExpression || node is ObjectCreateExpression) &&
-						    (initializerDependsOnMembers || initializerDependsOnReferenceType))
-							// Anything can happen...
-							return true;
-						var binaryOperator = node as BinaryOperatorExpression;
-						if (binaryOperator != null) {
-							var resolveResult = context.Resolve(binaryOperator) as OperatorResolveResult;
-							if (resolveResult == null)
-								return false;
-							return resolveResult.UserDefinedOperatorMethod != null;
-						}
-						return IsConflictingAssignment(node, identifiers, members, locals);
-					};
-				}
-
-				return node => false;
-			}
-
-			bool IsConflictingAssignment (Expression node, IList<IdentifierExpression> identifiers, IList<IMember> members, IList<IVariable> locals)
-			{
-				var assignmentExpression = node as AssignmentExpression;
-				if (assignmentExpression != null) {
-					IList<IMember> targetMembers;
-					IList<IVariable> targetLocals;
-					var identifierResolveResults = identifiers.Select(identifier => context.Resolve(identifier)).ToList();
-					SplitResolveResults(identifierResolveResults, out targetMembers, out targetLocals);
-
-					return members.Any(member => targetMembers.Contains(member)) ||
-						locals.Any(local => targetLocals.Contains(local));
-				}
-				return false;
-			}
-
-			static void SplitResolveResults(List<ResolveResult> identifierResolveResults, out IList<IMember> members, out IList<IVariable> locals)
-			{
-				members = new List<IMember>();
-				locals = new List<IVariable>();
-				foreach (var resolveResult in identifierResolveResults) {
-					var memberResolveResult = resolveResult as MemberResolveResult;
-					if (memberResolveResult != null) {
-						members.Add(memberResolveResult.Member);
-					}
-					var localResolveResult = resolveResult as LocalResolveResult;
-					if (localResolveResult != null) {
-						locals.Add(localResolveResult.Variable);
-					}
-				}
-			}
-
-			bool IsScopeContainer(AstNode node)
-			{
-				if (node == null)
-					return false;
-
-				var blockStatement = node as BlockStatement;
-				if (blockStatement != null)
-					return true;
-
-				var statement = node as Statement;
-				if (statement == null)
-					return false;
-
-				var role = node.Role;
-				if (role == Roles.EmbeddedStatement ||
-					role == IfElseStatement.TrueRole ||
-					role == IfElseStatement.FalseRole) {
-					return true;
-				}
-				return false;
-			}
-
-			IEnumerable<CodeAction> GetActions(Statement oldStatement, Statement followingStatement)
-			{
-				yield return new CodeAction(context.TranslateString("Move to nested scope"), script => {
-					var parent = followingStatement.Parent;
-					if (parent is SwitchSection || parent is BlockStatement) {
-						script.InsertBefore(followingStatement, oldStatement.Clone());
-					} else {
-						var newBlockStatement = new BlockStatement {
-							Statements = {
-								oldStatement.Clone(),
-								followingStatement.Clone()
-							}
-						};
-						script.Replace(followingStatement, newBlockStatement);
-						script.FormatText(parent);
-					}
-					script.Remove(oldStatement);
-				}, oldStatement);
-			}
-
-			AstNode GetDeepestCommonAncestor(AstNode assumedRoot, IEnumerable<AstNode> leaves)
-			{
-				var previousPath = GetPath(assumedRoot, leaves.First());
-				int lowestIndex = previousPath.Count - 1;
-				foreach (var leaf in leaves.Skip(1)) {
-					var currentPath = GetPath(assumedRoot, leaf);
-					lowestIndex = GetLowestCommonAncestorIndex(previousPath, currentPath, lowestIndex);
-					previousPath = currentPath;
-				}
-				return previousPath [lowestIndex];
-			}
-			
-			int GetLowestCommonAncestorIndex(IList<AstNode> path1, IList<AstNode> path2, int maxIndex = int.MaxValue)
-			{
-				var max = Math.Min(Math.Min(path1.Count, path2.Count), maxIndex);
-				for (int i = 0; i <= max; i++) {
-					if (path1 [i] != path2 [i])
-						return i - 1;
-				}
-				return max;
-			}
-
-			IList<AstNode> GetPath(AstNode from, AstNode to)
-			{
-				var reversePath = new List<AstNode>();
-				do {
-					reversePath.Add(to);
-					to = to.Parent;
-				} while (to != from.Parent);
-				reversePath.Reverse();
-				return reversePath;
-			}
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableHidesMemberIssue/LocalVariableHidesMemberIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableHidesMemberIssue/LocalVariableHidesMemberIssue.cs
deleted file mode 100644
index b43156b2c1..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableHidesMemberIssue/LocalVariableHidesMemberIssue.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// 
-// LocalVariableHideFieldIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Local variable hides a member",
-					   Description = "Local variable has the same name as a member and hides it.",
-					   Category = IssueCategories.CodeQualityIssues,
-					   Severity = Severity.Suggestion,
-					   IssueMarker = IssueMarker.Underline,
-                       ResharperDisableKeyword = "LocalVariableHidesMember")]
-	public class LocalVariableHidesMemberIssue : VariableHidesMemberIssue
-	{
-		public override System.Collections.Generic.IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<LocalVariableHidesMemberIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitVariableInitializer (VariableInitializer variableInitializer)
-			{
-				base.VisitVariableInitializer (variableInitializer);
-
-				if (!(ctx.Resolve (variableInitializer) is LocalResolveResult))
-					return;
-				if (HidesMember (ctx, variableInitializer, variableInitializer.Name))
-					AddIssue (variableInitializer.NameToken,
-						ctx.TranslateString ("Local variable has the same name as a member and hides it"));
-			}
-
-			public override void VisitForeachStatement (ForeachStatement foreachStatement)
-			{
-				base.VisitForeachStatement (foreachStatement);
-
-				if (HidesMember (ctx, foreachStatement, foreachStatement.VariableName))
-					AddIssue (foreachStatement.VariableNameToken,
-						ctx.TranslateString ("Local variable has the same name as a member and hides it"));
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableHidesMemberIssue/ParameterHidesMemberIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableHidesMemberIssue/ParameterHidesMemberIssue.cs
deleted file mode 100644
index 76560a2102..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableHidesMemberIssue/ParameterHidesMemberIssue.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// 
-// ParameterHidesMemberIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Parameter hides a member",
-					   Description = "Parameter has the same name as a member and hides it.",
-					   Category = IssueCategories.CodeQualityIssues,
-					   Severity = Severity.Suggestion,
-					   IssueMarker = IssueMarker.Underline)]
-	public class ParameterHidesMemberIssue : VariableHidesMemberIssue
-	{
-		public override System.Collections.Generic.IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		class GatherVisitor : GatherVisitorBase<ParameterHidesMemberIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitParameterDeclaration (ParameterDeclaration parameterDeclaration)
-			{
-				base.VisitParameterDeclaration (parameterDeclaration);
-
-				if (parameterDeclaration.Parent is ConstructorDeclaration)
-					return;
-				if (HidesMember (ctx, parameterDeclaration, parameterDeclaration.Name))
-					AddIssue (parameterDeclaration.NameToken,
-						ctx.TranslateString ("Parameter has the same name as a member and hides it"));
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableHidesMemberIssue/VariableHidesMemberIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableHidesMemberIssue/VariableHidesMemberIssue.cs
deleted file mode 100644
index 4dc4f89eb5..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableHidesMemberIssue/VariableHidesMemberIssue.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// 
-// VariableHidesMemberIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using System;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	public abstract class VariableHidesMemberIssue : ICodeIssueProvider
-	{
-		public abstract IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context);
-		
-		protected static bool HidesMember(BaseRefactoringContext ctx, AstNode node, string variableName)
-		{
-			var typeDecl = node.GetParent<TypeDeclaration>();
-			if (typeDecl == null)
-				return false;
-			var entityDecl = node.GetParent<EntityDeclaration>();
-			var memberResolveResult = ctx.Resolve(entityDecl) as MemberResolveResult;
-			if (memberResolveResult == null)
-				return false;
-			var typeResolveResult = ctx.Resolve(typeDecl) as TypeResolveResult;
-			if (typeResolveResult == null)
-				return false;
-
-			var sourceMember = memberResolveResult.Member;
-
-			return typeResolveResult.Type.GetMembers(m => m.Name == variableName).Any(m2 => IsAccessible(sourceMember, m2));
-		}
-
-		static bool IsAccessible(IMember sourceMember, IMember targetMember)
-		{
-			if (sourceMember.IsStatic != targetMember.IsStatic)
-				return false;
-
-			var sourceType = sourceMember.DeclaringType;
-			var targetType = targetMember.DeclaringType;
-			switch (targetMember.Accessibility) {
-				case Accessibility.None:
-					return false;
-				case Accessibility.Private:
-					// check for members of outer classes (private members of outer classes can be accessed)
-					var targetTypeDefinition = targetType.GetDefinition();
-					for (var t = sourceType.GetDefinition(); t != null; t = t.DeclaringTypeDefinition) {
-						if (t.Equals(targetTypeDefinition))
-							return true;
-					}
-					return false;
-				case Accessibility.Public:
-					return true;
-				case Accessibility.Protected:
-					return IsProtectedAccessible(sourceType, targetType);
-				case Accessibility.Internal:
-					return IsInternalAccessible(sourceMember.ParentAssembly, targetMember.ParentAssembly);
-				case Accessibility.ProtectedOrInternal:
-					return IsInternalAccessible(sourceMember.ParentAssembly, targetMember.ParentAssembly) || IsProtectedAccessible(sourceType, targetType);
-				case Accessibility.ProtectedAndInternal:
-					return IsInternalAccessible(sourceMember.ParentAssembly, targetMember.ParentAssembly) && IsProtectedAccessible(sourceType, targetType);
-				default:
-					throw new Exception("Invalid value for Accessibility");
-			}
-		}
-
-		static bool IsProtectedAccessible(IType sourceType, IType targetType)
-		{
-			return sourceType.GetAllBaseTypes().Any(type => targetType.Equals(type));
-		}
-
-		static bool IsInternalAccessible(IAssembly sourceAssembly, IAssembly targetAssembly)
-		{
-			return sourceAssembly.InternalsVisibleTo(targetAssembly);
-		}
-
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableNotUsedIssues/LocalVariableNotUsedIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableNotUsedIssues/LocalVariableNotUsedIssue.cs
deleted file mode 100644
index cb9f07acf1..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableNotUsedIssues/LocalVariableNotUsedIssue.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-// 
-// LocalVariableNotUsedIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.Semantics;
-using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Unused local variable",
-					   Description = "Local variable is never used.",
-					   Category = IssueCategories.Redundancies,
-					   Severity = Severity.Warning,
-					   IssueMarker = IssueMarker.GrayOut)]
-	public class LocalVariableNotUsedIssue : ICodeIssueProvider
-	{
-		#region ICodeIssueProvider implementation
-
-		public System.Collections.Generic.IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor (context).GetIssues ();
-		}
-
-		#endregion
-		
-		class GatherVisitor : GatherVisitorBase<LocalVariableNotUsedIssue>
-		{
-			public GatherVisitor (BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitVariableInitializer (VariableInitializer variableInitializer)
-			{
-				base.VisitVariableInitializer (variableInitializer);
-
-				// check if variable is assigned
-				if (!variableInitializer.Initializer.IsNull)
-					return;
-				var decl = variableInitializer.Parent as VariableDeclarationStatement;
-				if (decl == null)
-					return;
-
-				var resolveResult = ctx.Resolve (variableInitializer) as LocalResolveResult;
-				if (resolveResult == null)
-					return;
-
-				if (IsUsed (decl.Parent, resolveResult.Variable, variableInitializer))
-					return;
-
-				AddIssue (variableInitializer.NameToken, ctx.TranslateString ("Remove unused local variable"),
-					script =>
-					{
-						if (decl.Variables.Count == 1) {
-							script.Remove (decl);
-						} else {
-							var newDeclaration = (VariableDeclarationStatement)decl.Clone ();
-							newDeclaration.Variables.Remove (
-								newDeclaration.Variables.FirstOrNullObject (v => v.Name == variableInitializer.Name));
-							script.Replace (decl, newDeclaration);
-						}
-					});
-			}
-
-			public override void VisitForeachStatement (ForeachStatement foreachStatement)
-			{
-				base.VisitForeachStatement (foreachStatement);
-
-				var resolveResult = ctx.Resolve (foreachStatement.VariableNameToken) as LocalResolveResult;
-				if (resolveResult == null)
-					return;
-
-				if (IsUsed (foreachStatement, resolveResult.Variable, foreachStatement.VariableNameToken))
-					return;
-
-				AddIssue (foreachStatement.VariableNameToken, ctx.TranslateString ("Local variable is never used"));
-			}
-
-			bool IsUsed(AstNode rootNode, IVariable variable, AstNode variableNode)
-			{
-				return ctx.FindReferences(rootNode, variable).Any(result => result.Node != variableNode);
-			}
-		}
-
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableNotUsedIssues/ParameterNotUsedIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableNotUsedIssues/ParameterNotUsedIssue.cs
deleted file mode 100644
index c822bc19b7..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableNotUsedIssues/ParameterNotUsedIssue.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-// 
-// ParameterNotUsedIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.Semantics;
-using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using System;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Unused parameter",
-	                   Description = "Parameter is never used.",
-	                   Category = IssueCategories.Redundancies,
-	                   Severity = Severity.Warning,
-	                   IssueMarker = IssueMarker.GrayOut)]
-	public class ParameterNotUsedIssue : ICodeIssueProvider
-	{
-		#region ICodeIssueProvider implementation
-		public IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			var delegateVisitor = new GetDelgateUsagesVisitor (context);
-			context.RootNode.AcceptVisitor (delegateVisitor);
-
-			return new GatherVisitor (context, delegateVisitor).GetIssues ();
-		}
-		#endregion
-
-		// Collect all methods that are used as delegate
-		class GetDelgateUsagesVisitor : DepthFirstAstVisitor
-		{
-			BaseRefactoringContext ctx;
-			public readonly List<IMethod> UsedMethods = new List<IMethod> ();
-
-			public GetDelgateUsagesVisitor(BaseRefactoringContext ctx)
-			{
-				this.ctx = ctx;
-			}
-			
-			public override void VisitIdentifierExpression(IdentifierExpression identifierExpression)
-			{
-				if (!IsTargetOfInvocation(identifierExpression)) {
-					var mgr = ctx.Resolve (identifierExpression) as MethodGroupResolveResult;
-					if (mgr != null)
-						UsedMethods.AddRange (mgr.Methods);
-				}
-				base.VisitIdentifierExpression(identifierExpression);
-			}
-
-			public override void VisitMemberReferenceExpression(MemberReferenceExpression memberReferenceExpression)
-			{
-				if (!IsTargetOfInvocation(memberReferenceExpression)) {
-					var mgr = ctx.Resolve (memberReferenceExpression) as MethodGroupResolveResult;
-					if (mgr != null)
-						UsedMethods.AddRange (mgr.Methods);
-				}
-				base.VisitMemberReferenceExpression(memberReferenceExpression);
-			}
-			
-			static bool IsTargetOfInvocation(AstNode node)
-			{
-				return node.Role == Roles.TargetExpression && node.Parent is InvocationExpression;
-			}
-		}
-
-		class GatherVisitor : GatherVisitorBase<ParameterNotUsedIssue>
-		{
-			GetDelgateUsagesVisitor usedDelegates;
-			bool currentTypeIsPartial;
-			
-			public GatherVisitor (BaseRefactoringContext ctx, GetDelgateUsagesVisitor usedDelegates)
-				: base (ctx)
-			{
-				this.usedDelegates = usedDelegates;
-			}
-			
-			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
-			{
-				bool outerTypeIsPartial = currentTypeIsPartial;
-				currentTypeIsPartial = typeDeclaration.HasModifier(Modifiers.Partial);
-				base.VisitTypeDeclaration(typeDeclaration);
-				currentTypeIsPartial = outerTypeIsPartial;
-			}
-
-			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
-			{
-				// Only some methods are candidates for the warning
-
-				if (methodDeclaration.Body.IsNull)
-					return;
-				if (methodDeclaration.Modifiers.HasFlag (Modifiers.Virtual) || 
-				    methodDeclaration.Modifiers.HasFlag (Modifiers.New) ||
-				    methodDeclaration.Modifiers.HasFlag (Modifiers.Partial))
-					return;
-				var methodResolveResult = ctx.Resolve(methodDeclaration) as MemberResolveResult;
-				if (methodResolveResult == null)
-					return;
-				var member = methodResolveResult.Member;
-				if (member.IsOverride)
-					return;
-				if (member.ImplementedInterfaceMembers.Any ())
-					return;
-				if (usedDelegates.UsedMethods.Any (m => m.MemberDefinition == member))
-					return;
-				if (currentTypeIsPartial && methodDeclaration.Parameters.Count == 2) {
-					if (methodDeclaration.Parameters.First().Name == "sender") {
-						// Looks like an event handler; the registration might be in the designer part
-						return;
-					}
-				}
-				foreach (var parameter in methodDeclaration.Parameters)
-					parameter.AcceptVisitor (this);
-			}
-
-			public override void VisitParameterDeclaration (ParameterDeclaration parameterDeclaration)
-			{
-				base.VisitParameterDeclaration (parameterDeclaration);
-
-				if (!(parameterDeclaration.Parent is MethodDeclaration || parameterDeclaration.Parent is ConstructorDeclaration))
-					return;
-
-				var resolveResult = ctx.Resolve (parameterDeclaration) as LocalResolveResult;
-				if (resolveResult == null)
-					return;
-
-				if (ctx.FindReferences (parameterDeclaration.Parent, resolveResult.Variable).Any(r => r.Node != parameterDeclaration))
-					return;
-
-				AddIssue (parameterDeclaration.NameToken, ctx.TranslateString ("Parameter is never used"));
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableOnlyAssignedIssues/ParameterOnlyAssignedIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableOnlyAssignedIssues/ParameterOnlyAssignedIssue.cs
deleted file mode 100644
index 98579d1037..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableOnlyAssignedIssues/ParameterOnlyAssignedIssue.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// 
-// ParameterOnlyAssignedIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[IssueDescription ("Parameter is only assigned",
-					   Description = "Parameter is assigned but its value is never used.",
-					   Category = IssueCategories.CodeQualityIssues,
-					   Severity = Severity.Warning,
-					   IssueMarker = IssueMarker.Underline)]
-	public class ParameterOnlyAssignedIssue : VariableOnlyAssignedIssue
-	{
-		public override System.Collections.Generic.IEnumerable<CodeIssue> GetIssues(BaseRefactoringContext context)
-		{
-			return new GatherVisitor(context).GetIssues ();
-		}
-
-		private class GatherVisitor : GatherVisitorBase<ParameterOnlyAssignedIssue>
-		{
-			public GatherVisitor(BaseRefactoringContext ctx)
-				: base (ctx)
-			{
-			}
-
-			public override void VisitParameterDeclaration(ParameterDeclaration parameterDeclaration)
-			{
-				base.VisitParameterDeclaration(parameterDeclaration);
-
-				var resolveResult = ctx.Resolve(parameterDeclaration) as LocalResolveResult;
-				if (resolveResult == null)
-					return;
-
-				var parameterModifier = parameterDeclaration.ParameterModifier;
-				if (parameterModifier == ParameterModifier.Out || parameterModifier == ParameterModifier.Ref ||
-					!TestOnlyAssigned(ctx, parameterDeclaration.Parent, resolveResult.Variable)) {
-					return;
-				}
-				AddIssue(parameterDeclaration.NameToken, 
-					ctx.TranslateString("Parameter is assigned but its value is never used"));
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableOnlyAssignedIssues/VariableOnlyAssignedIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableOnlyAssignedIssues/VariableOnlyAssignedIssue.cs
deleted file mode 100644
index c0827b301c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableOnlyAssignedIssues/VariableOnlyAssignedIssue.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// 
-// VariableOnlyAssignedIssue.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	public abstract class VariableOnlyAssignedIssue : ICodeIssueProvider
-	{
-		public abstract IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context);
-
-		protected static bool TestOnlyAssigned(BaseRefactoringContext ctx, AstNode rootNode, IVariable variable)
-		{
-			var assignment = false;
-			var nonAssignment = false;
-			foreach (var result in ctx.FindReferences(rootNode, variable)) {
-				var node = result.Node;
-				if (node is ParameterDeclaration)
-					continue;
-
-				if (node is VariableInitializer) {
-					if (!(node as VariableInitializer).Initializer.IsNull)
-						assignment = true;
-					continue;
-				}
-
-				if (node is IdentifierExpression) {
-					var parent = node.Parent;
-					if (parent is AssignmentExpression) {
-						if (((AssignmentExpression)parent).Left == node) {
-							assignment = true;
-							continue;
-						}
-					} else if (parent is UnaryOperatorExpression) {
-						var op = ((UnaryOperatorExpression)parent).Operator;
-						switch (op) {
-							case UnaryOperatorType.Increment:
-							case UnaryOperatorType.PostIncrement:
-							case UnaryOperatorType.Decrement:
-							case UnaryOperatorType.PostDecrement:
-								assignment = true;
-								if (!(parent.Parent is ExpressionStatement))
-									nonAssignment = true;
-								continue;
-						}
-					} else if (parent is DirectionExpression) {
-						if (((DirectionExpression)parent).FieldDirection == FieldDirection.Out) {
-							assignment = true;
-							// Using dummy variables is necessary for ignoring
-							// out-arguments, so we don't want to warn for those.
-							nonAssignment = true;
-							continue;
-						}
-					}
-				}
-				nonAssignment = true;
-			}
-			return assignment && !nonAssignment;
-		}
-
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CommonSubIssues.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CommonSubIssues.cs
new file mode 100644
index 0000000000..ebfabe32b4
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CommonSubIssues.cs
@@ -0,0 +1,37 @@
+//
+// ConvertToStaticMethodIssue.cs
+//
+// Author:
+//       Ciprian Khlud <ciprian.mustiata@yahoo.com>
+//
+// Copyright (c) 2013 Ciprian Khlud
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	public class CommonSubIssues
+	{
+		public const string PrivateMember    = "Private accessibility";
+		public const string NonPrivateMember = "Non-private accessibility";
+
+	}
+
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/ContextActionAttribute.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/ContextActionAttribute.cs
index 195af924ec..d6072e9955 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/ContextActionAttribute.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/ContextActionAttribute.cs
@@ -34,13 +34,6 @@ namespace ICSharpCode.NRefactory.CSharp
 		public string Description { get; set; }
 		public string Category { get; set; }
 
-		/// <summary>
-		/// When this action pops up show code issue options for this issue as well. This is used for code actions
-		/// that are useful on their own without issues. But the user may choose to disable the issue but may want the action.
-		/// Use case: 'var <--> explicit type' action
-		/// </summary>
-		public Type BoundToIssue { get; set; }
-
 		public ContextActionAttribute (string title)
 		{
 			Title = title;
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CreateChangedEvent.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CreateChangedEvent.cs
deleted file mode 100644
index 8b7731f3b3..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CreateChangedEvent.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// CreateChangedEvent.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Threading;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	[ContextAction("Create changed event for property", Description = "Creates a changed event for an property.")]
-	public class CreateChangedEvent : ICodeActionProvider
-	{
-		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
-		{
-			var property = context.GetNode<PropertyDeclaration>();
-			var field = RemoveBackingStoreAction.GetBackingField(context);
-			if (field == null)
-				yield break;
-			var resolvedType = ReflectionHelper.ParseReflectionName ("System.EventHandler").Resolve (context.Compilation);
-			if (resolvedType == null)
-				yield break;
-			var type = (TypeDeclaration)property.Parent;
-
-			yield return new CodeAction(context.TranslateString("Create changed event"), script => {
-				var eventDeclaration = CreateChangedEventDeclaration (context, property);
-				var methodDeclaration = CreateEventInvocatorAction.CreateEventInvocator (context, type, eventDeclaration, eventDeclaration.Variables.First (), resolvedType.GetDelegateInvokeMethod (), false);
-				var stmt = new ExpressionStatement (new InvocationExpression (
-					new IdentifierExpression (methodDeclaration.Name),
-					new MemberReferenceExpression (new TypeReferenceExpression (context.CreateShortType("System", "EventArgs")), "Empty")
-				));
-				var task = script.InsertWithCursor(
-					context.TranslateString("Create event invocator"),
-					Script.InsertPosition.After,
-					new AstNode[] { eventDeclaration, methodDeclaration }
-				);
-
-				Action<Task> insertInvocation = delegate {
-					script.InsertBefore (property.Setter.Body.RBraceToken, stmt);
-					script.FormatText (stmt);
-				};
-
-				if (task.IsCompleted) {
-					insertInvocation (null);
-				} else {
-					task.ContinueWith (insertInvocation, TaskScheduler.FromCurrentSynchronizationContext ());
-				}
-
-			}, property.NameToken);
-		}
-
-		EventDeclaration CreateChangedEventDeclaration (RefactoringContext context, PropertyDeclaration propertyDeclaration)
-		{
-			return new EventDeclaration {
-				Modifiers = propertyDeclaration.HasModifier (Modifiers.Static) ? Modifiers.Public | Modifiers.Static : Modifiers.Public,
-				ReturnType = context.CreateShortType("System", "EventHandler"),
-				Variables = {
-					new VariableInitializer {
-						Name = propertyDeclaration.Name + "Changed"
-					}
-				}
-			};
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/FormatStringHelper.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/FormatStringHelper.cs
new file mode 100644
index 0000000000..ccb3c71652
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/FormatStringHelper.cs
@@ -0,0 +1,76 @@
+//
+// FormatStringHelper.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	static class FormatStringHelper
+	{
+		static readonly string[] parameterNames = { "format", "frmt", "fmt" };
+		
+		public static bool TryGetFormattingParameters(CSharpInvocationResolveResult invocationResolveResult, InvocationExpression invocationExpression,
+		                                     		  out Expression formatArgument, out IList<Expression> arguments,
+		                                              Func<IParameter, Expression, bool> argumentFilter)
+		{
+			if (argumentFilter == null)
+				argumentFilter = (p, e) => true;
+
+			formatArgument = null;
+			arguments = new List<Expression>();
+			var argumentToParameterMap = invocationResolveResult.GetArgumentToParameterMap();
+			var resolvedParameters = invocationResolveResult.Member.Parameters;
+			var allArguments = invocationExpression.Arguments.ToArray();
+			for (int i = 0; i < allArguments.Length; i++) {
+				var parameterIndex = argumentToParameterMap[i];
+				if (parameterIndex < 0 || parameterIndex >= resolvedParameters.Count) {
+					// No valid mapping for this argument, skip it
+					continue;
+				}
+				var parameter = resolvedParameters[parameterIndex];
+				var argument = allArguments[i];
+				if (i == 0 && parameter.Type.IsKnownType(KnownTypeCode.String) && parameterNames.Contains(parameter.Name)) {
+					formatArgument = argument;
+				} else if (formatArgument != null && parameter.IsParams && !invocationResolveResult.IsExpandedForm) {
+					var ace = argument as ArrayCreateExpression;
+					if (ace == null || ace.Initializer.IsNull)
+						return false;
+					foreach (var element in ace.Initializer.Elements) {
+						if (argumentFilter(parameter, element))
+							arguments.Add(argument);
+					}
+				} else if (formatArgument != null && argumentFilter(parameter, argument)) {
+					arguments.Add(argument);
+				}
+			}
+			return formatArgument != null;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/ICodeActionProvider.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/ICodeActionProvider.cs
deleted file mode 100644
index 018278b15f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/ICodeActionProvider.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// 
-// ContextAction.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Threading;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	public interface ICodeActionProvider
-	{
-		IEnumerable<CodeAction> GetActions (RefactoringContext context);
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/ICodeIssueProvider.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/ICodeIssueProvider.cs
deleted file mode 100644
index b16e677c03..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/ICodeIssueProvider.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// 
-// IInspector.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.CSharp.Refactoring
-{
-	/// <summary>
-	/// The code issue provider gets a list of all code issues in a syntax tree.
-	/// </summary>
-	public interface ICodeIssueProvider
-	{
-		/// <summary>
-		/// Gets all code issues inside a syntax tree.
-		/// </summary>
-		/// <param name='context'>
-		/// The refactoring context of the issues to get.
-		/// </param>
-		IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context);
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/IssueAttribute.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/IssueAttribute.cs
index da157dd59e..2d97900196 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/IssueAttribute.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/IssueAttribute.cs
@@ -1,7 +1,4 @@
 // 
-using System.Diagnostics.CodeAnalysis;
-
-
 // IssueAttribute.cs
 //  
 // Author:
@@ -27,6 +24,7 @@ using System.Diagnostics.CodeAnalysis;
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using System.Collections.Generic;
 using ICSharpCode.NRefactory.Refactoring;
 
 namespace ICSharpCode.NRefactory.CSharp
@@ -35,25 +33,58 @@ namespace ICSharpCode.NRefactory.CSharp
 	public class IssueDescriptionAttribute : System.Attribute
 	{
 		public string Title { get; private set;}
-		
 		public string Description { get; set; }
-		
 		public string Category { get; set; }
 
-		public string ResharperDisableKeyword { get; set; }
+		public string AnalysisDisableKeyword { get; set; }
 		public string SuppressMessageCategory { get; set; }
 		public string SuppressMessageCheckId { get; set; }
+		public int PragmaWarning { get; set; }
+		public bool IsEnabledByDefault { get; set; }
 
 		public Severity Severity { get; set; }
 
-		public IssueMarker IssueMarker { get; set; }
-
 		public IssueDescriptionAttribute (string title)
 		{
 			Title = title;
 			Severity = Severity.Suggestion;
-			IssueMarker = IssueMarker.Underline;
+			IsEnabledByDefault = true;
+		}
+	}
+
+	[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+	public class SubIssueAttribute : System.Attribute
+	{
+		public string Title { get; private set;}
+		public string Description { get; set; }
+
+		public bool? IsEnabledByDefault { get; set; }
+		public Severity? Severity { get; set; }
+
+		public SubIssueAttribute (string title)
+		{
+			Title = title;
 		}
+
+		public SubIssueAttribute (string title, Severity severity)
+		{
+			Title = title;
+			this.Severity = severity;
+		}
+
+		public SubIssueAttribute (string title, bool isEnabledByDefault)
+		{
+			Title = title;
+			this.IsEnabledByDefault = isEnabledByDefault;
+		}
+
+		public SubIssueAttribute (string title, Severity severity, bool isEnabledByDefault)
+		{
+			Title = title;
+			this.Severity = severity;
+			this.IsEnabledByDefault = isEnabledByDefault;
+		}
+
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/LambdaHelper.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/LambdaHelper.cs
index cfc96c539f..b99ddb6bd6 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/LambdaHelper.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/LambdaHelper.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 
 using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.CSharp.Resolver;
 using ICSharpCode.NRefactory.TypeSystem;
 
@@ -34,25 +35,17 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 	{
 		public static IType GetLambdaReturnType(RefactoringContext context, LambdaExpression lambda)
 		{
-			var parent = lambda.Parent;
-			while (parent is ParenthesizedExpression)
-				parent = parent.Parent;
-
-			ITypeDefinition delegateTypeDef;
-			if (parent is InvocationExpression) {
-				var invocation = (InvocationExpression)parent;
-				var argIndex = invocation.Arguments.TakeWhile (arg => !arg.Contains (lambda.StartLocation)).Count ();
-				var resolveResult = (CSharpInvocationResolveResult)context.Resolve (invocation);
-				delegateTypeDef = resolveResult.Arguments [argIndex].Type.GetDefinition ();
-			} else {
-				delegateTypeDef = context.Resolve (parent).Type.GetDefinition ();
+			LambdaResolveResult rr = context.Resolve(lambda) as LambdaResolveResult;
+			if (rr == null)
+				return SpecialType.UnknownType;
+			if (rr.IsAsync) {
+				// Unpack Task<T>
+				if (rr.ReturnType.IsKnownType(KnownTypeCode.Task))
+					return context.Compilation.FindType(KnownTypeCode.Void);
+				else if (rr.ReturnType.IsKnownType(KnownTypeCode.TaskOfT) && rr.ReturnType.IsParameterized)
+					return rr.ReturnType.TypeArguments[0];
 			}
-			if (delegateTypeDef == null)
-				return null;
-			var invokeMethod = delegateTypeDef.GetMethods (m => m.Name == "Invoke").FirstOrDefault ();
-			if (invokeMethod == null)
-				return null;
-			return invokeMethod.ReturnType;
+			return rr.ReturnType;
 		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/LocalReferenceFinder.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/LocalReferenceFinder.cs
index 5ecdb91b55..685e1f926a 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/LocalReferenceFinder.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/LocalReferenceFinder.cs
@@ -120,6 +120,11 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 				referenceFinder.visitedRoots.Add(rootNode);
 			}
 
+			public override void VisitCSharpTokenNode(CSharpTokenNode token)
+			{
+				// Nothing
+			}
+
 			protected override void VisitChildren(AstNode node)
 			{
 				if (referenceFinder.visitedRoots.Contains(node))
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/PatternHelper.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/PatternHelper.cs
index ac11889f21..b1aac54080 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/PatternHelper.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/PatternHelper.cs
@@ -18,6 +18,7 @@
 
 using System;
 using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.NRefactory.TypeSystem;
 
 namespace ICSharpCode.NRefactory.CSharp.Refactoring
 {
@@ -36,6 +37,11 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 				new BinaryOperatorExpression(expr2.Clone(), op, expr1.Clone())
 			};
 		}
+
+		public static Expression CommutativeOperatorWithOptionalParentheses(Expression expr1, BinaryOperatorType op, Expression expr2)
+		{
+			return OptionalParentheses(CommutativeOperator(OptionalParentheses(expr1), op, OptionalParentheses(expr2)));
+		}
 		
 		/// <summary>
 		/// Optionally allows parentheses around the given expression.
@@ -60,5 +66,107 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 				return child.DoMatch(unpacked, match);
 			}
 		}
+
+		/// <summary>
+		/// Optionally allow a block around the given statement;
+		/// </summary>
+		/// <returns>The statement.</returns>
+		public static Statement EmbeddedStatement(Statement statement)
+		{
+			return new OptionalBlockPattern(statement);
+		}
+
+		sealed class OptionalBlockPattern : Pattern
+		{
+			readonly INode child;
+
+			public OptionalBlockPattern(INode child)
+			{
+				this.child = child;
+			}
+
+			public override bool DoMatch(INode other, Match match)
+			{
+				INode unpacked = UnpackBlockStatement(other as Statement);
+				return child.DoMatch(unpacked, match);
+			}
+
+			
+			/// <summary>
+			/// Unpacks the given expression if it is a ParenthesizedExpression, CheckedExpression or UncheckedExpression.
+			/// </summary>
+			public static Statement UnpackBlockStatement(Statement stmt)
+			{
+				while (stmt is BlockStatement) {
+					stmt = stmt.GetChildByRole(BlockStatement.StatementRole);
+					if (stmt.GetNextSibling(s => s.Role == BlockStatement.StatementRole) != null)
+						return null;
+				}
+				return stmt;
+			}
+		}
+
+	
+		/// <summary>
+		/// Allows to give parameter declaration group names.
+		/// </summary>
+		public static ParameterDeclaration NamedParameter(string groupName)
+		{
+			return new NamedParameterDeclaration (groupName);
+		}
+
+		/// <summary>
+		/// Allows to give parameter declaration group names.
+		/// </summary>
+		public static ParameterDeclaration NamedParameter(string groupName, AstType type, string name, ParameterModifier modifier = ParameterModifier.None)
+		{
+			return new NamedParameterDeclaration (groupName, type, name, modifier);
+		}
+
+		sealed class NamedParameterDeclaration : ParameterDeclaration
+		{
+			readonly string groupName;
+			public string GroupName {
+				get { return groupName; }
+			}
+
+			public NamedParameterDeclaration(string groupName = null)
+			{
+				this.groupName = groupName;
+			}
+
+			public NamedParameterDeclaration(string groupName, AstType type, string name, ParameterModifier modifier = ParameterModifier.None) : base (type, name, modifier)
+			{
+				this.groupName = groupName;
+			}
+
+			protected internal override bool DoMatch(AstNode other, Match match)
+			{
+				match.Add(this.groupName, other);
+				return base.DoMatch(other, match);
+			}
+		}
+
+		/// <summary>
+		/// Matches any type
+		/// </summary>
+		public static AstType AnyType (bool doesMatchNullTypes = false)
+		{
+			if (doesMatchNullTypes)
+				return new OptionalNode(new AnyNode());
+			else
+				return new AnyNode();
+		}
+
+		/// <summary>
+		/// Matches any type
+		/// </summary>
+		public static AstType AnyType (string groupName, bool doesMatchNullTypes = false)
+		{
+			if (doesMatchNullTypes)
+				return new OptionalNode(new AnyNode(groupName));
+			else
+				return new AnyNode(groupName);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/RefactoringContext.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/RefactoringContext.cs
index 4668715750..004932667b 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/RefactoringContext.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/RefactoringContext.cs
@@ -39,15 +39,17 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 {
 	public abstract class RefactoringContext : BaseRefactoringContext
 	{
-		public RefactoringContext(CSharpAstResolver resolver, CancellationToken cancellationToken) : base  (resolver, cancellationToken)
+		public RefactoringContext(CSharpAstResolver resolver, CancellationToken cancellationToken) : base (resolver, cancellationToken)
 		{
+
 		}
 
 		public abstract TextLocation Location { get; }
 		
 		public TypeSystemAstBuilder CreateTypeSystemAstBuilder()
 		{
-			var csResolver = Resolver.GetResolverStateBefore(GetNode());
+			var astNode = GetNode() ?? RootNode.GetNodeAt(Location) ?? RootNode;
+			var csResolver = Resolver.GetResolverStateBefore(astNode);
 			return new TypeSystemAstBuilder(csResolver);
 		}
 		
@@ -94,72 +96,11 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			else
 				return null;
 		}
-		
-		#region Text stuff
-		public virtual TextEditorOptions TextEditorOptions {
-			get {
-				return TextEditorOptions.Default;
-			}
-		}
-		
-		public virtual bool IsSomethingSelected {
-			get {
-				return SelectionStart != TextLocation.Empty;
-			}
-		}
-		
-		public virtual string SelectedText {
-			get { return string.Empty; }
-		}
-		
-		public virtual TextLocation SelectionStart {
-			get {
-				return TextLocation.Empty;
-			}
-		}
-		
-		public virtual TextLocation SelectionEnd {
-			get {
-				return TextLocation.Empty;
-			}
-		}
-
-		public abstract int GetOffset (TextLocation location);
-
-		public abstract IDocumentLine GetLineByOffset (int offset);
-		
-		public int GetOffset (int line, int col)
-		{
-			return GetOffset (new TextLocation (line, col));
-		}
-
-		public abstract TextLocation GetLocation (int offset);
-
-		public abstract string GetText (int offset, int length);
-
-		public abstract string GetText (ISegment segment);
-		#endregion
 
 		#region Naming
 		public virtual string GetNameProposal (string name, bool camelCase = true)
 		{
-			string baseName = (camelCase ? char.ToLower (name [0]) : char.ToUpper (name [0])) + name.Substring (1);
-			
-			var type = GetNode<TypeDeclaration> ();
-			if (type == null)
-				return baseName;
-			
-			int number = -1;
-			string proposedName;
-			do {
-				proposedName = AppendNumberToName (baseName, number++);
-			} while (type.Members.Select (m => m.GetChildByRole (Roles.Identifier)).Any (n => n.Name == proposedName));
-			return proposedName;
-		}
-		
-		static string AppendNumberToName (string baseName, int number)
-		{
-			return baseName + (number > 0 ? (number + 1).ToString () : "");
+			return GetNameProposal(name, Location, camelCase);
 		}
 		#endregion
 	}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/Script.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/Script.cs
index b133b22287..bf298d0817 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/Script.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/Script.cs
@@ -29,6 +29,8 @@ using System.IO;
 using ICSharpCode.NRefactory.Editor;
 using ICSharpCode.NRefactory.TypeSystem;
 using System.Threading.Tasks;
+using System.Linq;
+using System.Text;
 
 namespace ICSharpCode.NRefactory.CSharp.Refactoring
 {
@@ -70,7 +72,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		
 		readonly CSharpFormattingOptions formattingOptions;
 		readonly TextEditorOptions options;
-		Dictionary<AstNode, ISegment> segmentsForInsertedNodes = new Dictionary<AstNode, ISegment>();
+		readonly Dictionary<AstNode, ISegment> segmentsForInsertedNodes = new Dictionary<AstNode, ISegment>();
 		
 		protected Script(CSharpFormattingOptions formattingOptions, TextEditorOptions options)
 		{
@@ -103,8 +105,12 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		/// on every <see cref="Replace(int,int,string)"/> call.
 		/// </returns>
 		protected abstract ISegment CreateTrackedSegment(int offset, int length);
-		
-		protected ISegment GetSegment(AstNode node)
+
+		/// <summary>
+		/// Gets the current text segment of the specified AstNode.
+		/// </summary>
+		/// <param name="node">The node to get the segment for.</param>
+		public ISegment GetSegment(AstNode node)
 		{
 			ISegment segment;
 			if (segmentsForInsertedNodes.TryGetValue(node, out segment))
@@ -176,7 +182,131 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			output.RegisterTrackedSegments(this, startOffset);
 			CorrectFormatting (null, newNode);
 		}
-		
+
+		/// <summary>
+		/// Changes the modifier of a given entity declaration.
+		/// </summary>
+		/// <param name="entity">The entity.</param>
+		/// <param name="modifiers">The new modifiers.</param>
+		public void ChangeModifier(EntityDeclaration entity, Modifiers modifiers)
+		{
+			var dummyEntity = new MethodDeclaration ();
+			dummyEntity.Modifiers = modifiers;
+
+			int offset;
+			int endOffset;
+
+			if (entity.ModifierTokens.Any ()) {
+				offset = GetCurrentOffset(entity.ModifierTokens.First ().StartLocation);
+				endOffset = GetCurrentOffset(entity.ModifierTokens.Last ().GetNextSibling (s => s.Role != Roles.NewLine && s.Role != Roles.Whitespace).StartLocation);
+			} else {
+				var child = entity.FirstChild;
+				while (child.NodeType == NodeType.Whitespace ||
+				       child.Role == EntityDeclaration.AttributeRole ||
+				       child.Role == Roles.NewLine) {
+					child = child.NextSibling;
+				}
+				offset = endOffset = GetCurrentOffset(child.StartLocation);
+			}
+
+			var sb = new StringBuilder();
+			foreach (var modifier in dummyEntity.ModifierTokens) {
+				sb.Append(modifier.ToString());
+				sb.Append(' ');
+			}
+
+			Replace(offset, endOffset - offset, sb.ToString());
+		}
+
+		public void ChangeModifier(ParameterDeclaration param, ParameterModifier modifier)
+		{
+			var child = param.FirstChild;
+			Func<AstNode, bool> pred = s => s.Role == ParameterDeclaration.RefModifierRole || s.Role == ParameterDeclaration.OutModifierRole || s.Role == ParameterDeclaration.ParamsModifierRole || s.Role == ParameterDeclaration.ThisModifierRole;
+			if (!pred(child))
+				child = child.GetNextSibling(pred); 
+
+			int offset;
+			int endOffset;
+
+			if (child != null) {
+				offset = GetCurrentOffset(child.StartLocation);
+				endOffset = GetCurrentOffset(child.GetNextSibling (s => s.Role != Roles.NewLine && s.Role != Roles.Whitespace).StartLocation);
+			} else {
+				offset = endOffset = GetCurrentOffset(param.Type.StartLocation);
+			}
+			string modString;
+			switch (modifier) {
+				case ParameterModifier.None:
+					modString = "";
+					break;
+				case ParameterModifier.Ref:
+					modString = "ref ";
+					break;
+				case ParameterModifier.Out:
+					modString = "out ";
+					break;
+				case ParameterModifier.Params:
+					modString = "params ";
+					break;
+				case ParameterModifier.This:
+					modString = "this ";
+					break;
+				default:
+					throw new ArgumentOutOfRangeException();
+			}
+			Replace(offset, endOffset - offset, modString);
+		}
+
+		/// <summary>
+		/// Changes the base types of a type declaration.
+		/// </summary>
+		/// <param name="type">The type declaration to modify.</param>
+		/// <param name="baseTypes">The new base types.</param>
+		public void ChangeBaseTypes(TypeDeclaration type, IEnumerable<AstType> baseTypes)
+		{
+			var dummyType = new TypeDeclaration();
+			dummyType.BaseTypes.AddRange(baseTypes);
+
+			int offset;
+			int endOffset;
+			var sb = new StringBuilder();
+
+			if (type.BaseTypes.Any ()) {
+				offset = GetCurrentOffset(type.ColonToken.StartLocation);
+				endOffset = GetCurrentOffset(type.BaseTypes.Last ().EndLocation);
+			} else {
+				sb.Append(' ');
+				if (type.TypeParameters.Any()) {
+					offset = endOffset = GetCurrentOffset(type.RChevronToken.EndLocation);
+				} else {
+					offset = endOffset = GetCurrentOffset(type.NameToken.EndLocation);
+				}
+			}
+
+			if (dummyType.BaseTypes.Any()) {
+				sb.Append(": ");
+				sb.Append(string.Join(", ", dummyType.BaseTypes));
+			}
+
+			Replace(offset, endOffset - offset, sb.ToString());
+			FormatText(type);
+		}
+
+
+		/// <summary>
+		/// Adds an attribute section to a given entity.
+		/// </summary>
+		/// <param name="entity">The entity to add the attribute to.</param>
+		/// <param name="attr">The attribute to add.</param>
+		public void AddAttribute(EntityDeclaration entity, AttributeSection attr)
+		{
+			var node = entity.FirstChild;
+			while (node.NodeType == NodeType.Whitespace || node.Role == Roles.Attribute) {
+				node = node.NextSibling;
+			}
+			InsertBefore(node, attr);
+		}
+
 		public virtual Task Link (params AstNode[] nodes)
 		{
 			// Default implementation: do nothing
@@ -187,6 +317,11 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			tcs.SetResult(null);
 			return tcs.Task;
 		}
+
+		public virtual Task Link (IEnumerable<AstNode> nodes)
+		{
+			return Link(nodes.ToArray());
+		}
 		
 		public void Replace (AstNode node, AstNode replaceWith)
 		{
@@ -216,12 +351,35 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		}
 		
 		public abstract void Remove (AstNode node, bool removeEmptyLine = true);
+
+		/// <summary>
+		/// Safely removes an attribue from it's section (removes empty sections).
+		/// </summary>
+		/// <param name="attr">The attribute to be removed.</param>
+		public void RemoveAttribute(Attribute attr)
+		{
+			AttributeSection section = (AttributeSection)attr.Parent;
+			if (section.Attributes.Count == 1) {
+				Remove(section);
+				return;
+			}
+
+			var newSection = (AttributeSection)section.Clone();
+			int i = 0;
+			foreach (var a in section.Attributes) {
+				if (a == attr)
+					break;
+				i++;
+			}
+			newSection.Attributes.Remove (newSection.Attributes.ElementAt (i));
+			Replace(section, newSection);
+		}
 		
 		public abstract void FormatText (IEnumerable<AstNode> nodes);
 
-		public void FormatText (params AstNode[] node)
+		public void FormatText (params AstNode[] nodes)
 		{
-			FormatText ((IEnumerable<AstNode>)node);
+			FormatText ((IEnumerable<AstNode>)nodes);
 		}
 
 		public virtual void Select (AstNode node)
@@ -229,6 +387,19 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			// default implementation: do nothing
 			// Derived classes are supposed to set the text editor's selection
 		}
+
+		public virtual void Select (TextLocation start, TextLocation end)
+		{
+			// default implementation: do nothing
+			// Derived classes are supposed to set the text editor's selection
+		}
+
+		public virtual void Select (int startOffset, int endOffset)
+		{
+			// default implementation: do nothing
+			// Derived classes are supposed to set the text editor's selection
+		}
+
 		
 		public enum InsertPosition
 		{
@@ -238,24 +409,26 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			End
 		}
 		
-		public virtual Task InsertWithCursor(string operation, InsertPosition defaultPosition, IEnumerable<AstNode> node)
+		public virtual Task<Script> InsertWithCursor(string operation, InsertPosition defaultPosition, IList<AstNode> nodes)
 		{
 			throw new NotImplementedException();
 		}
 		
-		public virtual Task InsertWithCursor(string operation, ITypeDefinition parentType, IEnumerable<AstNode> node)
+		public virtual Task<Script> InsertWithCursor(string operation, ITypeDefinition parentType, Func<Script, RefactoringContext, IList<AstNode>> nodeCallback)
 		{
 			throw new NotImplementedException();
 		}
 		
-		public Task InsertWithCursor(string operation, InsertPosition defaultPosition, params AstNode[] nodes)
+		public Task<Script> InsertWithCursor(string operation, InsertPosition defaultPosition, params AstNode[] nodes)
 		{
-			return InsertWithCursor(operation, defaultPosition, (IEnumerable<AstNode>)nodes);
+			return InsertWithCursor(operation, defaultPosition, (IList<AstNode>)nodes);
 		}
-		
-		public Task InsertWithCursor(string operation, ITypeDefinition parentType, params AstNode[] nodes)
+
+		public Task<Script> InsertWithCursor(string operation, ITypeDefinition parentType, Func<Script, RefactoringContext, AstNode> nodeCallback)
 		{
-			return InsertWithCursor(operation, parentType, (IEnumerable<AstNode>)nodes);
+			return InsertWithCursor(operation, parentType, (Func<Script, RefactoringContext, IList<AstNode>>)delegate (Script s, RefactoringContext ctx) {
+				return new AstNode[] { nodeCallback(s, ctx) };
+			});
 		}
 		
 		protected virtual int GetIndentLevelAt (int offset)
@@ -266,7 +439,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		sealed class SegmentTrackingOutputFormatter : TextWriterOutputFormatter
 		{
 			internal List<KeyValuePair<AstNode, Segment>> NewSegments = new List<KeyValuePair<AstNode, Segment>>();
-			Stack<int> startOffsets = new Stack<int>();
+			readonly Stack<int> startOffsets = new Stack<int>();
 			readonly StringWriter stringWriter;
 			
 			public SegmentTrackingOutputFormatter (StringWriter stringWriter)
@@ -308,7 +481,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		protected class NodeOutput
 		{
 			string text;
-			List<KeyValuePair<AstNode, Segment>> newSegments;
+			readonly List<KeyValuePair<AstNode, Segment>> newSegments;
 			int trimmedLength;
 			
 			internal NodeOutput(string text, List<KeyValuePair<AstNode, Segment>> newSegments)
@@ -358,7 +531,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		{
 		}
 		
-		public virtual void DoGlobalOperationOn(IEntity entity, Action<RefactoringContext, Script, AstNode> callback, string operationDescripton = null)
+		public virtual void DoGlobalOperationOn(IEnumerable<IEntity> entities, Action<RefactoringContext, Script, IEnumerable<AstNode>> callback, string operationDescription = null)
 		{
 		}
 
@@ -393,5 +566,29 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		{
 		}
 	}
-}
 
+	static class ExtMethods
+	{
+		public static void ContinueScript (this Task task, Action act)
+		{
+			if (task.IsCompleted) {
+				act();
+			} else {
+				task.ContinueWith(delegate {
+					act();
+				}, TaskScheduler.FromCurrentSynchronizationContext());
+			}
+		}
+
+		public static void ContinueScript (this Task<Script> task, Action<Script> act)
+		{
+			if (task.IsCompleted) {
+				act(task.Result);
+			} else {
+				task.ContinueWith(delegate {
+					act(task.Result);
+				}, TaskScheduler.FromCurrentSynchronizationContext());
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/TypeGuessing.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/TypeGuessing.cs
new file mode 100644
index 0000000000..6a08cc5d29
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/TypeGuessing.cs
@@ -0,0 +1,323 @@
+//
+// TypeGuessing.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	public static class TypeGuessing
+	{
+		static int GetArgumentIndex(IEnumerable<Expression> arguments, AstNode parameter)
+		{
+			int argumentNumber = 0;
+			foreach (var arg in arguments) {
+				if (arg == parameter) {
+					return argumentNumber;
+				}
+				argumentNumber++;
+			}
+			return -1;
+		}
+
+		static IEnumerable<IType> GetAllValidTypesFromInvocation(CSharpAstResolver resolver, InvocationExpression invoke, AstNode parameter)
+		{
+			int index = GetArgumentIndex(invoke.Arguments, parameter);
+			if (index < 0)
+				yield break;
+
+			var targetResult = resolver.Resolve(invoke.Target) as MethodGroupResolveResult;
+			if (targetResult != null) {
+				foreach (var method in targetResult.Methods) {
+					if (index < method.Parameters.Count) {
+						if (method.Parameters [index].IsParams) {
+							var arrayType = method.Parameters [index].Type as ArrayType;
+							if (arrayType != null)
+								yield return arrayType.ElementType;
+						}
+
+						yield return method.Parameters [index].Type;
+					}
+				}
+				foreach (var extMethods in targetResult.GetExtensionMethods ()) {
+					foreach (var extMethod in extMethods) {
+						if (index + 1 < extMethod.Parameters.Count) {
+							if (extMethod.Parameters [index + 1].IsParams) {
+								var arrayType = extMethod.Parameters [index + 1].Type as ArrayType;
+								if (arrayType != null)
+									yield return arrayType.ElementType;
+							}
+
+							yield return extMethod.Parameters [index + 1].Type;
+						}
+					}
+				}
+			}
+		}
+
+		static IEnumerable<IType> GetAllValidTypesFromObjectCreation(CSharpAstResolver resolver, ObjectCreateExpression invoke, AstNode parameter)
+		{
+			int index = GetArgumentIndex(invoke.Arguments, parameter);
+			if (index < 0)
+				yield break;
+
+			var targetResult = resolver.Resolve(invoke.Type);
+			if (targetResult is TypeResolveResult) {
+				var type = ((TypeResolveResult)targetResult).Type;
+				if (type.Kind == TypeKind.Delegate && index == 0) {
+					yield return type;
+					yield break;
+				}
+				foreach (var constructor in type.GetConstructors ()) {
+					if (index < constructor.Parameters.Count)
+						yield return constructor.Parameters [index].Type;
+				}
+			}
+		}
+
+		public static IType GetElementType(CSharpAstResolver resolver, IType type)
+		{
+			// TODO: A better get element type method.
+			if (type.Kind == TypeKind.Array || type.Kind == TypeKind.Dynamic) {
+				if (type.Kind == TypeKind.Array)
+					return ((ArrayType)type).ElementType;
+				return resolver.Compilation.FindType(KnownTypeCode.Object);
+			}
+
+
+			foreach (var method in type.GetMethods (m => m.Name == "GetEnumerator")) {
+				IType returnType = null;
+				foreach (var prop in method.ReturnType.GetProperties(p => p.Name == "Current")) {
+					if (returnType != null && prop.ReturnType.IsKnownType (KnownTypeCode.Object))
+						continue;
+					returnType = prop.ReturnType;
+				}
+				if (returnType != null)
+					return returnType;
+			}
+
+			return resolver.Compilation.FindType(KnownTypeCode.Object);
+		}
+
+		static IEnumerable<IType> GuessFromConstructorInitializer(CSharpAstResolver resolver, AstNode expr)
+		{
+			var init = expr.Parent as ConstructorInitializer;
+			var rr = resolver.Resolve(expr.Parent);
+			int index = GetArgumentIndex(init.Arguments, expr);
+			if (index >= 0) {
+				foreach (var constructor in rr.Type.GetConstructors()) {
+					if (index < constructor.Parameters.Count) {
+						yield return constructor.Parameters[index].Type;
+					}
+				}
+			}
+		}
+
+		public static IEnumerable<IType> GetValidTypes(CSharpAstResolver resolver, AstNode expr)
+		{
+			if (expr.Role == Roles.Condition) {
+				return new [] { resolver.Compilation.FindType (KnownTypeCode.Boolean) };
+			}
+
+			if (expr.Parent is ParenthesizedExpression || expr.Parent is NamedArgumentExpression) {
+				return GetValidTypes(resolver, expr.Parent);
+			}
+			if (expr.Parent is DirectionExpression) {
+				var parent = expr.Parent.Parent;
+				if (parent is InvocationExpression) {
+					var invoke = (InvocationExpression)parent;
+					return GetAllValidTypesFromInvocation(resolver, invoke, expr.Parent);
+				}
+			}
+
+			if (expr.Parent is ArrayInitializerExpression) {
+				if (expr is NamedExpression)
+					return new [] { resolver.Resolve(((NamedExpression)expr).Expression).Type };
+
+				var aex = expr.Parent as ArrayInitializerExpression;
+				if (aex.IsSingleElement)
+					aex = aex.Parent as ArrayInitializerExpression;
+				var type = GetElementType(resolver, resolver.Resolve(aex.Parent).Type);
+				if (type.Kind != TypeKind.Unknown)
+					return new [] { type };
+			}
+
+			if (expr.Parent is ObjectCreateExpression) {
+				var invoke = (ObjectCreateExpression)expr.Parent;
+				return GetAllValidTypesFromObjectCreation(resolver, invoke, expr);
+			}
+
+			if (expr.Parent is ArrayCreateExpression) {
+				var ace = (ArrayCreateExpression)expr.Parent;
+				if (!ace.Type.IsNull) {
+					return new [] { resolver.Resolve(ace.Type).Type };
+				}
+			}
+
+			if (expr.Parent is InvocationExpression) {
+				var parent = expr.Parent;
+				if (parent is InvocationExpression) {
+					var invoke = (InvocationExpression)parent;
+					return GetAllValidTypesFromInvocation(resolver, invoke, expr);
+				}
+			}
+
+			if (expr.Parent is VariableInitializer) {
+				var initializer = (VariableInitializer)expr.Parent;
+				var field = initializer.GetParent<FieldDeclaration>();
+				if (field != null) {
+					var rr = resolver.Resolve(field.ReturnType);
+					if (!rr.IsError)
+						return new [] { rr.Type };
+				}
+				var varStmt = initializer.GetParent<VariableDeclarationStatement>();
+				if (varStmt != null) {
+					var rr = resolver.Resolve(varStmt.Type);
+					if (!rr.IsError)
+						return new [] { rr.Type };
+				}
+				return new [] { resolver.Resolve(initializer).Type };
+			}
+
+			if (expr.Parent is CastExpression) {
+				var cast = (CastExpression)expr.Parent;
+				return new [] { resolver.Resolve(cast.Type).Type };
+			}
+
+			if (expr.Parent is AsExpression) {
+				var cast = (AsExpression)expr.Parent;
+				return new [] { resolver.Resolve(cast.Type).Type };
+			}
+
+			if (expr.Parent is AssignmentExpression) {
+				var assign = (AssignmentExpression)expr.Parent;
+				var other = assign.Left == expr ? assign.Right : assign.Left;
+				return new [] { resolver.Resolve(other).Type };
+			}
+
+			if (expr.Parent is BinaryOperatorExpression) {
+				var assign = (BinaryOperatorExpression)expr.Parent;
+				var other = assign.Left == expr ? assign.Right : assign.Left;
+				return new [] { resolver.Resolve(other).Type };
+			}
+
+			if (expr.Parent is ReturnStatement) {
+				var parent = expr.Ancestors.FirstOrDefault(n => n is EntityDeclaration || n is AnonymousMethodExpression|| n is LambdaExpression);
+				if (parent != null) {
+					var rr = resolver.Resolve(parent);
+					if (!rr.IsError)
+						return new [] { rr.Type };
+				}
+				var e = parent as EntityDeclaration;
+				if (e != null) {
+					var rt = resolver.Resolve(e.ReturnType);
+					if (!rt.IsError)
+						return new [] { rt.Type };
+				}
+			}
+
+			if (expr.Parent is YieldReturnStatement) {
+				var state = resolver.GetResolverStateBefore(expr);
+				if (state != null && (state.CurrentMember.ReturnType is ParameterizedType)) {
+					var pt = (ParameterizedType)state.CurrentMember.ReturnType;
+					if (pt.FullName == "System.Collections.Generic.IEnumerable") {
+						return new [] { pt.TypeArguments.First() };
+					}
+				}
+			}
+
+			if (expr.Parent is UnaryOperatorExpression) {
+				var uop = (UnaryOperatorExpression)expr.Parent;
+				switch (uop.Operator) {
+					case UnaryOperatorType.Not:
+						return new [] { resolver.Compilation.FindType(KnownTypeCode.Boolean) };
+						case UnaryOperatorType.Minus:
+						case UnaryOperatorType.Plus:
+						case UnaryOperatorType.Increment:
+						case UnaryOperatorType.Decrement:
+						case UnaryOperatorType.PostIncrement:
+						case UnaryOperatorType.PostDecrement:
+						return new [] { resolver.Compilation.FindType(KnownTypeCode.Int32) };
+				}
+			}
+
+			if (expr.Parent is ConstructorInitializer)
+				return GuessFromConstructorInitializer(resolver, expr);
+
+			if (expr.Parent is NamedExpression) {
+				var rr = resolver.Resolve(expr.Parent);
+				if (!rr.IsError) {
+					return new [] { rr.Type };
+				}
+			}
+
+			return Enumerable.Empty<IType>();
+		}
+		static readonly IType[] emptyTypes = new IType[0];
+		public static AstType GuessAstType(RefactoringContext context, AstNode expr)
+		{
+			var type = GetValidTypes(context.Resolver, expr).ToArray();
+			var typeInference = new TypeInference(context.Compilation);
+			typeInference.Algorithm = TypeInferenceAlgorithm.Improved;
+			var inferedType = typeInference.FindTypeInBounds(type, emptyTypes);
+			if (inferedType.Kind == TypeKind.Unknown)
+				return new PrimitiveType("object");
+			return context.CreateShortType(inferedType);
+		}
+
+		public static IType GuessType(BaseRefactoringContext context, AstNode expr)
+		{
+			if (expr is SimpleType && expr.Role == Roles.TypeArgument) {
+				if (expr.Parent is MemberReferenceExpression || expr.Parent is IdentifierExpression) {
+					var rr = context.Resolve (expr.Parent);
+					var argumentNumber = expr.Parent.GetChildrenByRole (Roles.TypeArgument).TakeWhile (c => c != expr).Count ();
+
+					var mgrr = rr as MethodGroupResolveResult;
+					if (mgrr != null && mgrr.Methods.Any () && mgrr.Methods.First ().TypeArguments.Count > argumentNumber)
+						return mgrr.Methods.First ().TypeParameters[argumentNumber]; 
+				} else if (expr.Parent is MemberType || expr.Parent is SimpleType) {
+					var rr = context.Resolve (expr.Parent);
+					var argumentNumber = expr.Parent.GetChildrenByRole (Roles.TypeArgument).TakeWhile (c => c != expr).Count ();
+					var mgrr = rr as TypeResolveResult;
+					if (mgrr != null &&  mgrr.Type.TypeParameterCount > argumentNumber) {
+						return mgrr.Type.GetDefinition ().TypeParameters[argumentNumber]; 
+					}
+				}
+			}
+
+			var type = GetValidTypes(context.Resolver, expr).ToArray();
+			var typeInference = new TypeInference(context.Compilation);
+			typeInference.Algorithm = TypeInferenceAlgorithm.Improved;
+			var inferedType = typeInference.FindTypeInBounds(type, emptyTypes);
+			return inferedType;
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/VariableReferenceGraph.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/VariableReferenceGraph.cs
index 236ebbd8c0..d26bb5a5b1 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/VariableReferenceGraph.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/VariableReferenceGraph.cs
@@ -58,6 +58,8 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 
 		public void AddNextNode (VariableReferenceNode node)
 		{
+			if (node == null)
+				return;
 			NextNodes.Add (node);
 			node.PreviousNodes.Add (this);
 		}
@@ -294,9 +296,11 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			{
 				startNode = startNode ?? new VariableReferenceNode ();
 				endNode = startNode;
-				foreach (var expr in expressions) {
-					var visitor = CreateVisitor (references, resolver, expr, endNode);
-					endNode = visitor.endNode;
+				if (expressions != null) {
+					foreach (var expr in expressions) {
+						var visitor = CreateVisitor(references, resolver, expr, endNode);
+						endNode = visitor.endNode;
+					}
 				}
 				return startNode;
 			}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/WordParser.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/WordParser.cs
similarity index 100%
rename from src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/WordParser.cs
rename to src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/WordParser.cs
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/CSharpAstResolver.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/CSharpAstResolver.cs
index 390eb766df..0893b18fda 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/CSharpAstResolver.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/CSharpAstResolver.cs
@@ -231,7 +231,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		ResolveVisitor.ConversionWithTargetType GetConversionWithTargetType(Expression expr, CancellationToken cancellationToken)
 		{
 			if (expr == null || expr.IsNull)
-				throw new ArgumentNullException("expr");
+				return new ResolveVisitor.ConversionWithTargetType(Conversion.None, SpecialType.UnknownType);
 			lock (resolveVisitor) {
 				InitResolver();
 				resolveVisitor.cancellationToken = cancellationToken;
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/CSharpConversions.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/CSharpConversions.cs
index f40b8a7f2c..666e420e7c 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/CSharpConversions.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/CSharpConversions.cs
@@ -1007,7 +1007,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 						IParameter pF = f.Parameters[i];
 						if (pD.IsRef != pF.IsRef || pD.IsOut != pF.IsOut)
 							return Conversion.None;
-						if (!dParamTypes[i].Equals(pF.Type))
+						if (!IdentityConversion(dParamTypes[i], pF.Type))
 							return Conversion.None;
 					}
 				}
@@ -1072,6 +1072,24 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			}
 		}
 		
+		/// <summary>
+		/// Gets whether a <paramref name="method"/> is compatible with a delegate type.
+		/// §15.2 Delegate compatibility
+		/// </summary>
+		/// <param name="method">The method to test for compatibility</param>
+		/// <param name="delegateType">The delegate type</param>
+		public bool IsDelegateCompatible(IMethod method, IType delegateType)
+		{
+			if (method == null)
+				throw new ArgumentNullException("method");
+			if (delegateType == null)
+				throw new ArgumentNullException("delegateType");
+			IMethod invoke = delegateType.GetDelegateInvokeMethod();
+			if (invoke == null)
+				return false;
+			return IsDelegateCompatible(method, invoke, false);
+		}
+		
 		/// <summary>
 		/// Gets whether a method <paramref name="m"/> is compatible with a delegate type.
 		/// §15.2 Delegate compatibility
@@ -1128,9 +1146,6 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				IMethod m2 = t2.GetDelegateInvokeMethod();
 				if (m1 == null || m2 == null)
 					return 0;
-				int r = BetterConversionTarget(t1, t2);
-				if (r != 0)
-					return r;
 				if (m1.Parameters.Count != m2.Parameters.Count)
 					return 0;
 				IType[] parameterTypes = new IType[m1.Parameters.Count];
@@ -1150,7 +1165,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 					return 1;
 				
 				IType inferredRet = lambda.GetInferredReturnType(parameterTypes);
-				r = BetterConversion(inferredRet, ret1, ret2);
+				int r = BetterConversion(inferredRet, ret1, ret2);
 				if (r == 0 && lambda.IsAsync) {
 					ret1 = UnpackTask(ret1);
 					ret2 = UnpackTask(ret2);
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/CSharpResolver.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/CSharpResolver.cs
index 34fd5c2ada..898196ffae 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/CSharpResolver.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/CSharpResolver.cs
@@ -659,14 +659,14 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 						if (lhsType.Kind == TypeKind.Enum) {
 							// E operator +(E x, U y);
 							IType underlyingType = MakeNullable(GetEnumUnderlyingType(lhsType), isNullable);
-							if (TryConvert(ref rhs, underlyingType)) {
+							if (TryConvertEnum(ref rhs, underlyingType, ref isNullable, ref lhs)) {
 								return HandleEnumOperator(isNullable, lhsType, op, lhs, rhs);
 							}
 						}
 						if (rhsType.Kind == TypeKind.Enum) {
 							// E operator +(U x, E y);
 							IType underlyingType = MakeNullable(GetEnumUnderlyingType(rhsType), isNullable);
-							if (TryConvert(ref lhs, underlyingType)) {
+							if (TryConvertEnum(ref lhs, underlyingType, ref isNullable, ref rhs)) {
 								return HandleEnumOperator(isNullable, rhsType, op, lhs, rhs);
 							}
 						}
@@ -700,21 +700,28 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 					methodGroup = operators.SubtractionOperators;
 					{
 						if (lhsType.Kind == TypeKind.Enum) {
+							// U operator –(E x, E y);
+							if (TryConvertEnum(ref rhs, lhs.Type, ref isNullable, ref lhs, allowConversionFromConstantZero: false)) {
+								return HandleEnumSubtraction(isNullable, lhsType, lhs, rhs);
+							}
+
 							// E operator –(E x, U y);
 							IType underlyingType = MakeNullable(GetEnumUnderlyingType(lhsType), isNullable);
-							if (TryConvert(ref rhs, underlyingType)) {
+							if (TryConvertEnum(ref rhs, underlyingType, ref isNullable, ref lhs)) {
 								return HandleEnumOperator(isNullable, lhsType, op, lhs, rhs);
 							}
-							// U operator –(E x, E y);
-							if (TryConvert(ref rhs, lhs.Type)) {
-								return HandleEnumSubtraction(isNullable, lhsType, lhs, rhs);
-							}
 						}
 						if (rhsType.Kind == TypeKind.Enum) {
 							// U operator –(E x, E y);
-							if (TryConvert(ref lhs, rhs.Type)) {
+							if (TryConvertEnum(ref lhs, rhs.Type, ref isNullable, ref rhs, allowConversionFromConstantZero: false)) {
 								return HandleEnumSubtraction(isNullable, rhsType, lhs, rhs);
 							}
+
+							// E operator -(U x, E y);
+							IType underlyingType = MakeNullable(GetEnumUnderlyingType(rhsType), isNullable);
+							if (TryConvertEnum(ref lhs, underlyingType, ref isNullable, ref rhs)) {
+								return HandleEnumOperator(isNullable, rhsType, op, lhs, rhs);
+							}
 						}
 						
 						if (lhsType.Kind == TypeKind.Delegate && TryConvert(ref rhs, lhsType)) {
@@ -808,12 +815,18 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				case BinaryOperatorType.BitwiseOr:
 				case BinaryOperatorType.ExclusiveOr:
 					{
-						if (lhsType.Kind == TypeKind.Enum && TryConvert(ref rhs, lhs.Type)) {
+						if (lhsType.Kind == TypeKind.Enum) {
 							// bool operator op(E x, E y);
-							return HandleEnumOperator(isNullable, lhsType, op, lhs, rhs);
-						} else if (rhsType.Kind == TypeKind.Enum && TryConvert(ref lhs, rhs.Type)) {
+							if (TryConvertEnum(ref rhs, lhs.Type, ref isNullable, ref lhs)) {
+								return HandleEnumOperator(isNullable, lhsType, op, lhs, rhs);
+							}
+						}
+
+						if (rhsType.Kind == TypeKind.Enum) {
 							// bool operator op(E x, E y);
-							return HandleEnumOperator(isNullable, rhsType, op, lhs, rhs);
+							if (TryConvertEnum (ref lhs, rhs.Type, ref isNullable, ref rhs)) {
+								return HandleEnumOperator(isNullable, rhsType, op, lhs, rhs);
+							}
 						}
 						
 						switch (op) {
@@ -1196,10 +1209,10 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			internal readonly IParameterizedMember nonLiftedOperator;
 			
 			public LiftedUserDefinedOperator(IMethod nonLiftedMethod)
-				: base(nonLiftedMethod, TypeParameterSubstitution.Identity)
+				: base((IMethod)nonLiftedMethod.MemberDefinition, nonLiftedMethod.Substitution)
 			{
 				this.nonLiftedOperator = nonLiftedMethod;
-				var substitution = new MakeNullableVisitor(nonLiftedMethod.Compilation);
+				var substitution = new MakeNullableVisitor(nonLiftedMethod.Compilation, nonLiftedMethod.Substitution);
 				this.Parameters = base.CreateParameters(substitution);
 				// Comparison operators keep the 'bool' return type even when lifted.
 				if (IsComparisonOperator(nonLiftedMethod))
@@ -1227,30 +1240,32 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		sealed class MakeNullableVisitor : TypeVisitor
 		{
 			readonly ICompilation compilation;
+			readonly TypeParameterSubstitution typeParameterSubstitution;
 			
-			public MakeNullableVisitor(ICompilation compilation)
+			public MakeNullableVisitor(ICompilation compilation, TypeParameterSubstitution typeParameterSubstitution)
 			{
 				this.compilation = compilation;
+				this.typeParameterSubstitution = typeParameterSubstitution;
 			}
 			
 			public override IType VisitTypeDefinition(ITypeDefinition type)
 			{
-				return NullableType.Create(compilation, type);
+				return NullableType.Create(compilation, type.AcceptVisitor(typeParameterSubstitution));
 			}
 			
 			public override IType VisitTypeParameter(ITypeParameter type)
 			{
-				return NullableType.Create(compilation, type);
+				return NullableType.Create(compilation, type.AcceptVisitor(typeParameterSubstitution));
 			}
 			
 			public override IType VisitParameterizedType(ParameterizedType type)
 			{
-				return NullableType.Create(compilation, type);
+				return NullableType.Create(compilation, type.AcceptVisitor(typeParameterSubstitution));
 			}
 			
 			public override IType VisitOtherType(IType type)
 			{
-				return NullableType.Create(compilation, type);
+				return NullableType.Create(compilation, type.AcceptVisitor(typeParameterSubstitution));
 			}
 		}
 		
@@ -1276,6 +1291,49 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				return false;
 			}
 		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="rr">The input resolve result that should be converted.
+		/// If a conversion exists, it is applied to the resolve result</param>
+		/// <param name="targetType">The target type that we should convert to</param>
+		/// <param name="isNullable">Whether we are dealing with a lifted operator</param>
+		/// <param name="enumRR">The resolve result that is enum-typed.
+		/// If necessary, a nullable conversion is applied.</param>
+		/// <param name="allowConversionFromConstantZero">
+		/// Whether the conversion from the constant zero is allowed.
+		/// </param>
+		/// <returns>True if the conversion is successful; false otherwise.
+		/// If the conversion is not successful, the ref parameters will not be modified.</returns>
+		bool TryConvertEnum(ref ResolveResult rr, IType targetType, ref bool isNullable, ref ResolveResult enumRR, bool allowConversionFromConstantZero = true)
+		{
+			Conversion c;
+			if (!isNullable) {
+				// Try non-nullable
+				c = conversions.ImplicitConversion(rr, targetType);
+				if (c.IsValid && (allowConversionFromConstantZero || !c.IsEnumerationConversion)) {
+					rr = Convert(rr, targetType, c);
+					return true;
+				}
+			}
+			// make targetType nullable if it isn't already:
+			if (!targetType.IsKnownType(KnownTypeCode.NullableOfT))
+				targetType = NullableType.Create(compilation, targetType);
+			
+			c = conversions.ImplicitConversion(rr, targetType);
+			if (c.IsValid && (allowConversionFromConstantZero || !c.IsEnumerationConversion)) {
+				rr = Convert(rr, targetType, c);
+				isNullable = true;
+				// Also convert the enum-typed RR to nullable, if it isn't already
+				if (!enumRR.Type.IsKnownType(KnownTypeCode.NullableOfT)) {
+					var nullableType = NullableType.Create(compilation, enumRR.Type);
+					enumRR = new ConversionResolveResult(nullableType, enumRR, Conversion.ImplicitNullableConversion);
+				}
+				return true;
+			}
+			return false;
+		}
 		
 		ResolveResult Convert(ResolveResult rr, IType targetType)
 		{
@@ -1775,13 +1833,15 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		/// </remarks>
 		public List<List<IMethod>> GetExtensionMethods(IType targetType, string name = null, IList<IType> typeArguments = null, bool substituteInferredTypes = false)
 		{
+			var lookup = CreateMemberLookup();
 			List<List<IMethod>> extensionMethodGroups = new List<List<IMethod>>();
 			foreach (var inputGroup in GetAllExtensionMethods()) {
 				List<IMethod> outputGroup = new List<IMethod>();
 				foreach (var method in inputGroup) {
 					if (name != null && method.Name != name)
 						continue;
-					
+					if (!lookup.IsAccessible(method, false))
+						continue;
 					IType[] inferredTypes;
 					if (typeArguments != null && typeArguments.Count > 0) {
 						if (method.TypeParameters.Count != typeArguments.Count)
@@ -1867,7 +1927,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		
 		/// <summary>
 		/// Gets all extension methods available in the current using scope.
-		/// This list includes unaccessible
+		/// This list includes inaccessible methods.
 		/// </summary>
 		IList<List<IMethod>> GetAllExtensionMethods()
 		{
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/CastResolveResult.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/CastResolveResult.cs
new file mode 100644
index 0000000000..a65a90bfbd
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/CastResolveResult.cs
@@ -0,0 +1,63 @@
+// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Resolver
+{
+	/// <summary>
+	/// Represents an explicitly applied conversion (CastExpression or AsExpression)
+	/// (a result belonging to an AST node; not implicitly inserted 'between' nodes).
+	/// </summary>
+	class CastResolveResult : ConversionResolveResult
+	{
+		// The reason this class exists is that for code like this:
+		//    int i = ...;
+		//    long n = 0;
+		//    n = n + (long)i;
+		// The resolver will produce (and process) an CastResolveResult for the cast,
+		// (with Conversion = implicit numeric conversion)
+		// and then pass it into CSharpResolver.ResolveBinaryOperator().
+		// That method normally wraps input arguments into another conversion
+		// (the implicit conversion applied by the operator).
+		// However, identity conversions do not cause the creation ConversionResolveResult instances,
+		// so the OperatorResolveResult's argument will be the CastResolveResult
+		// of the cast.
+		// Without this class (and instead using ConversionResolveResult for both purposes),
+		// it would be hard for the conversion-processing code
+		// in the ResolveVisitor to distinguish the existing conversion from the CastExpression
+		// from an implicit conversion introduced by the binary operator.
+		// This would cause the conversion to be processed yet again.
+		// The following unit tests would fail without this class:
+		//  * CastTests.ExplicitConversion_In_Assignment
+		//  * FindReferencesTest.FindReferencesForOpImplicitInAssignment_ExplicitCast
+		//  * CS0029InvalidConversionIssueTests.ExplicitConversionFromUnknownType
+		
+		public CastResolveResult(ConversionResolveResult rr)
+			: base(rr.Type, rr.Input, rr.Conversion, rr.CheckForOverflow)
+		{
+		}
+		
+		public CastResolveResult(IType targetType, ResolveResult input, Conversion conversion, bool checkForOverflow)
+			: base(targetType, input, conversion, checkForOverflow)
+		{
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/FindReferences.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/FindReferences.cs
index e892641910..5a99f122ee 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/FindReferences.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/FindReferences.cs
@@ -230,66 +230,74 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 					return new[] { GetSearchScopeForNamespace((INamespace)symbol) };
 				case SymbolKind.TypeParameter:
 					return new[] { GetSearchScopeForTypeParameter((ITypeParameter)symbol) };
-					// TODO: IVariable etc.
 			}
-			IEntity entity = symbol as IEntity;
-			if (entity == null)
-				throw new NotSupportedException("Unsupported symbol type");
-			if (entity is IMember)
-				entity = NormalizeMember((IMember)entity);
-			Accessibility effectiveAccessibility = GetEffectiveAccessibility(entity);
-			var topLevelTypeDefinition = GetTopLevelTypeDefinition(entity);
 			SearchScope scope;
 			SearchScope additionalScope = null;
-			switch (entity.SymbolKind) {
-				case SymbolKind.TypeDefinition:
-					scope = FindTypeDefinitionReferences((ITypeDefinition)entity, this.FindTypeReferencesEvenIfAliased, out additionalScope);
-					break;
-				case SymbolKind.Field:
-					if (entity.DeclaringTypeDefinition != null && entity.DeclaringTypeDefinition.Kind == TypeKind.Enum)
-						scope = FindMemberReferences(entity, m => new FindEnumMemberReferences((IField)m));
-					else
-						scope = FindMemberReferences(entity, m => new FindFieldReferences((IField)m));
-					break;
-				case SymbolKind.Property:
-					scope = FindMemberReferences(entity, m => new FindPropertyReferences((IProperty)m));
-					if (entity.Name == "Current")
-						additionalScope = FindEnumeratorCurrentReferences((IProperty)entity);
-					else if (entity.Name == "IsCompleted")
-						additionalScope = FindAwaiterIsCompletedReferences((IProperty)entity);
-					break;
-				case SymbolKind.Event:
-					scope = FindMemberReferences(entity, m => new FindEventReferences((IEvent)m));
-					break;
-				case SymbolKind.Method:
-					scope = GetSearchScopeForMethod((IMethod)entity);
-					break;
-				case SymbolKind.Indexer:
-					scope = FindIndexerReferences((IProperty)entity);
-					break;
-				case SymbolKind.Operator:
-					scope = GetSearchScopeForOperator((IMethod)entity);
-					break;
-				case SymbolKind.Constructor:
-					IMethod ctor = (IMethod)entity;
-					scope = FindObjectCreateReferences(ctor);
-					additionalScope = FindChainedConstructorReferences(ctor);
-					break;
-				case SymbolKind.Destructor:
-					scope = GetSearchScopeForDestructor((IMethod)entity);
-					break;
-				default:
-					throw new ArgumentException("Unknown entity type " + entity.SymbolKind);
+			IEntity entity;
+
+			if (symbol.SymbolKind == SymbolKind.Parameter) {
+				var par = (IParameter)symbol;
+				scope = GetSearchScopeForParameter(par);
+				entity = par.Owner;
+			} else {
+				entity = symbol as IEntity;
+				if (entity == null)
+					throw new NotSupportedException("Unsupported symbol type");
+				if (entity is IMember)
+					entity = NormalizeMember((IMember)entity);
+				switch (entity.SymbolKind) {
+					case SymbolKind.TypeDefinition:
+						scope = FindTypeDefinitionReferences((ITypeDefinition)entity, this.FindTypeReferencesEvenIfAliased, out additionalScope);
+						break;
+					case SymbolKind.Field:
+						if (entity.DeclaringTypeDefinition != null && entity.DeclaringTypeDefinition.Kind == TypeKind.Enum)
+							scope = FindMemberReferences(entity, m => new FindEnumMemberReferences((IField)m));
+						else
+							scope = FindMemberReferences(entity, m => new FindFieldReferences((IField)m));
+						break;
+					case SymbolKind.Property:
+						scope = FindMemberReferences(entity, m => new FindPropertyReferences((IProperty)m));
+						if (entity.Name == "Current")
+							additionalScope = FindEnumeratorCurrentReferences((IProperty)entity);
+						else if (entity.Name == "IsCompleted")
+							additionalScope = FindAwaiterIsCompletedReferences((IProperty)entity);
+						break;
+					case SymbolKind.Event:
+						scope = FindMemberReferences(entity, m => new FindEventReferences((IEvent)m));
+						break;
+					case SymbolKind.Method:
+						scope = GetSearchScopeForMethod((IMethod)entity);
+						break;
+					case SymbolKind.Indexer:
+						scope = FindIndexerReferences((IProperty)entity);
+						break;
+					case SymbolKind.Operator:
+						scope = GetSearchScopeForOperator((IMethod)entity);
+						break;
+					case SymbolKind.Constructor:
+						IMethod ctor = (IMethod)entity;
+						scope = FindObjectCreateReferences(ctor);
+						additionalScope = FindChainedConstructorReferences(ctor);
+						break;
+					case SymbolKind.Destructor:
+						scope = GetSearchScopeForDestructor((IMethod)entity);
+						break;
+					default:
+						throw new ArgumentException("Unknown entity type " + entity.SymbolKind);
+				}
 			}
+			var effectiveAccessibility = entity != null ? GetEffectiveAccessibility(entity) : Accessibility.Private;
+			var topLevelTypeDefinition = GetTopLevelTypeDefinition(entity);
+
 			if (scope.accessibility == Accessibility.None)
 				scope.accessibility = effectiveAccessibility;
-			scope.declarationCompilation = entity.Compilation;
+			scope.declarationCompilation = entity != null ? entity.Compilation : null;
 			scope.topLevelTypeDefinition = topLevelTypeDefinition;
 			scope.findReferences = this;
 			if (additionalScope != null) {
 				if (additionalScope.accessibility == Accessibility.None)
 					additionalScope.accessibility = effectiveAccessibility;
-				additionalScope.declarationCompilation = entity.Compilation;
+				additionalScope.declarationCompilation = scope.declarationCompilation;
 				additionalScope.topLevelTypeDefinition = topLevelTypeDefinition;
 				additionalScope.findReferences = this;
 				return new[] { scope, additionalScope };
@@ -692,6 +700,13 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			referencedMember = NormalizeMember(referencedMember);
 			if (member.Equals(referencedMember))
 				return true;
+			if (FindCallsThroughInterface && member.DeclaringTypeDefinition != null && member.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
+				if (FindOnlySpecializedReferences) {
+					return referencedMember.ImplementedInterfaceMembers.Contains(member);
+				} else {
+					return referencedMember.ImplementedInterfaceMembers.Any(m => m.MemberDefinition.Equals(member));
+				}
+			}
 			if (!isVirtualCall)
 				return false;
 			bool isInterfaceCall = referencedMember.DeclaringTypeDefinition != null && referencedMember.DeclaringTypeDefinition.Kind == TypeKind.Interface;
@@ -1487,12 +1502,12 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 					return true;
 
 				var st = node as SimpleType;
-				if (st != null && st.Identifier == ns.Name)
-					return true;
+				if (st != null && st.Identifier == ns.Name) 
+					return !st.AncestorsAndSelf.TakeWhile (n => n is AstType).Any (m => m.Role == NamespaceDeclaration.NamespaceNameRole);
 
 				var mt = node as MemberType;
 				if (mt != null && mt.MemberName == ns.Name)
-					return true;
+					return !mt.AncestorsAndSelf.TakeWhile (n => n is AstType).Any (m => m.Role == NamespaceDeclaration.NamespaceNameRole);
 
 				var identifer = node as IdentifierExpression;
 				if (identifer != null && identifer.Identifier == ns.Name)
@@ -1513,5 +1528,58 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			}
 		}
 		#endregion
+	
+		#region Find Parameter References
+
+		SearchScope GetSearchScopeForParameter(IParameter parameter)
+		{
+			var scope = new SearchScope (
+				delegate {
+					return new FindParameterReferencesNavigator (parameter);
+				}
+			);
+			return scope;
+		}
+
+		class FindParameterReferencesNavigator : FindReferenceNavigator
+		{
+			readonly IParameter parameter;
+
+			public FindParameterReferencesNavigator(IParameter parameter)
+			{
+				this.parameter = parameter;
+			}
+
+			internal override bool CanMatch(AstNode node)
+			{
+				var expr = node as IdentifierExpression;
+				if (expr != null)
+					return expr.TypeArguments.Count == 0 && parameter.Name == expr.Identifier;
+				var vi = node as VariableInitializer;
+				if (vi != null)
+					return vi.Name == parameter.Name;
+				var pd = node as ParameterDeclaration;
+				if (pd != null)
+					return pd.Name == parameter.Name;
+				var id = node as Identifier;
+				if (id != null)
+					return id.Name == parameter.Name;
+				var nae = node as NamedArgumentExpression;
+				if (nae != null)
+					return nae.Name == parameter.Name;
+				return false;
+			}
+
+			internal override bool IsMatch(ResolveResult rr)
+			{
+				var lrr = rr as LocalResolveResult;
+				if (lrr != null)
+					return lrr.Variable.Name == parameter.Name && lrr.Variable.Region == parameter.Region;
+
+				var nar = rr as NamedArgumentResolveResult;
+				return nar != null && nar.Parameter.Name == parameter.Name && nar.Parameter.Region == parameter.Region;
+			}
+		}
+		#endregion
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/IResolveVisitorNavigator.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/IResolveVisitorNavigator.cs
index 59fac8ff54..75c9603fc6 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/IResolveVisitorNavigator.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/IResolveVisitorNavigator.cs
@@ -41,7 +41,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		void Resolved(AstNode node, ResolveResult result);
 		
 		/// <summary>
-		/// Notifies the navigator that a conversion was applied.
+		/// Notifies the navigator that an implicit conversion was applied.
 		/// </summary>
 		/// <param name="expression">The expression that was resolved.</param>
 		/// <param name="result">The resolve result of the expression.</param>
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/LambdaResolveResult.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/LambdaResolveResult.cs
index 2641fbf957..850fc65143 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/LambdaResolveResult.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/LambdaResolveResult.cs
@@ -60,6 +60,10 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		/// <summary>
 		/// Gets the return type inferred when the parameter types are inferred to be <paramref name="parameterTypes"/>
 		/// </summary>
+		/// <remarks>
+		/// This method determines the return type inferred from the lambda body, which is used as part of C# type inference.
+		/// Use the <see cref="ReturnType"/> property to retrieve the actual return type as determined by the target delegate type.
+		/// </remarks>
 		public abstract IType GetInferredReturnType(IType[] parameterTypes);
 		
 		/// <summary>
@@ -67,6 +71,13 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		/// </summary>
 		public abstract IList<IParameter> Parameters { get; }
 		
+		/// <summary>
+		/// Gets the return type of the lambda.
+		/// 
+		/// If the lambda is async, the return type includes <code>Task&lt;T&gt;</code>
+		/// </summary>
+		public abstract IType ReturnType { get; }
+		
 		/// <summary>
 		/// Gets whether the lambda body is valid for the given parameter types and return type.
 		/// </summary>
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/OverloadResolution.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/OverloadResolution.cs
index f08c679e72..42773f7548 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/OverloadResolution.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/OverloadResolution.cs
@@ -466,12 +466,11 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			if ((candidate.Errors & OverloadResolutionErrors.TypeInferenceFailed) != 0)
 				return OverloadResolutionErrors.None;
 			
-			IMethod method = candidate.Member as IMethod;
-			if (method == null || method.TypeParameters.Count == 0)
+			if (candidate.TypeParameters == null || candidate.TypeParameters.Count == 0)
 				return OverloadResolutionErrors.None; // the method isn't generic
 			var substitution = GetSubstitution(candidate);
-			for (int i = 0; i < method.TypeParameters.Count; i++) {
-				if (!ValidateConstraints(method.TypeParameters[i], substitution.MethodTypeArguments[i], substitution))
+			for (int i = 0; i < candidate.TypeParameters.Count; i++) {
+				if (!ValidateConstraints(candidate.TypeParameters[i], substitution.MethodTypeArguments[i], substitution))
 					return OverloadResolutionErrors.MethodConstraintsNotSatisfied;
 			}
 			return OverloadResolutionErrors.None;
@@ -938,7 +937,6 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		/// <param name="returnTypeOverride">
 		/// If not null, use this instead of the ReturnType of the member as the type of the created resolve result.
 		/// </param>
-		/// </param>
 		public CSharpInvocationResolveResult CreateResolveResult(ResolveResult targetResolveResult, IList<ResolveResult> initializerStatements = null, IType returnTypeOverride = null)
 		{
 			IParameterizedMember member = GetBestCandidateWithSubstitutedTypeArguments();
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/ResolveAtLocation.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/ResolveAtLocation.cs
index a36aca4198..1eee350a88 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/ResolveAtLocation.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/ResolveAtLocation.cs
@@ -61,11 +61,14 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				if (node is Identifier) {
 					node = node.Parent;
 				} else if (node.NodeType == NodeType.Token) {
-					if (node.Parent is IndexerExpression || node.Parent is ConstructorInitializer) {
+					if (node.Parent is IndexerExpression || node.Parent is ConstructorInitializer || node.Role == IndexerDeclaration.ThisKeywordRole) {
 						// There's no other place where one could hover to see the indexer's tooltip,
 						// so we need to resolve it when hovering over the '[' or ']'.
 						// For constructor initializer, the same applies to the 'base'/'this' token.
 						node = node.Parent;
+					} else if (node.Parent is BinaryOperatorExpression || node.Parent is UnaryOperatorExpression) {
+						// Resolve user-defined operator
+						node = node.Parent;
 					} else {
 						return null;
 					}
@@ -88,7 +91,6 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 
 			if (node == null)
 				return null;
-			
 			if (node.Parent is ObjectCreateExpression && node.Role == Roles.Type) {
 				node = node.Parent;
 			}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/ResolveVisitor.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/ResolveVisitor.cs
index faa17e9be1..b4ce9d98cf 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/ResolveVisitor.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/ResolveVisitor.cs
@@ -259,6 +259,9 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			Debug.Assert(resolverBeforeDict.ContainsKey(node));
 			// Don't store results twice.
 			Debug.Assert(!resolveResultCache.ContainsKey(node));
+			// Don't use ConversionResolveResult as a result, because it can get
+			// confused with an implicit conversion.
+			Debug.Assert(!(result is ConversionResolveResult) || result is CastResolveResult);
 			resolveResultCache[node] = result;
 			if (navigator != null)
 				navigator.Resolved(node, result);
@@ -366,7 +369,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		
 		void ProcessConversionResult(Expression expr, ConversionResolveResult rr)
 		{
-			if (rr != null)
+			if (rr != null && !(rr is CastResolveResult))
 				ProcessConversion(expr, rr.Input, rr.Conversion, rr.Type);
 		}
 		
@@ -464,9 +467,12 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			parent = node;
 			CSharpResolver storedResolver;
 			while (!resolverBeforeDict.TryGetValue(parent, out storedResolver)) {
-				parent = parent.Parent;
-				if (parent == null)
+				AstNode tmp = parent.Parent;
+				if (tmp == null)
 					throw new InvalidOperationException("Could not find a resolver state for any parent of the specified node. Are you trying to resolve a node that is not a descendant of the CSharpAstResolver's root node?");
+				if (tmp.NodeType == NodeType.Whitespace)
+					return resolver; // special case: resolve expression within preprocessor directive
+				parent = tmp;
 			}
 			return storedResolver;
 		}
@@ -582,12 +588,12 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 					// For all but the last identifier:
 					UsingScope usingScope;
 					for (int i = 0; i < identifiers.Count - 1; i++) {
-						usingScope = new UsingScope(resolver.CurrentUsingScope.UnresolvedUsingScope, identifiers[i].Name);
+						usingScope = new UsingScope(resolver.CurrentUsingScope.UnresolvedUsingScope, identifiers[i]);
 						usingScope.Region = region;
 						PushUsingScope(usingScope);
 					}
 					// Last using scope:
-					usingScope = new UsingScope(resolver.CurrentUsingScope.UnresolvedUsingScope, identifiers.Last().Name);
+					usingScope = new UsingScope(resolver.CurrentUsingScope.UnresolvedUsingScope, identifiers.Last());
 					usingScope.Region = region;
 					var cv = new TypeSystemConvertVisitor(new CSharpUnresolvedFile(), usingScope);
 					ApplyVisitorToUsings(cv, namespaceDeclaration.Children);
@@ -671,7 +677,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			//int initializerCount = fieldOrEventDeclaration.GetChildrenByRole(Roles.Variable).Count;
 			CSharpResolver oldResolver = resolver;
 			for (AstNode node = fieldOrEventDeclaration.FirstChild; node != null; node = node.NextSibling) {
-				if (node.Role == Roles.Variable) {
+				if (node.Role == Roles.Variable || node.Role == FixedFieldDeclaration.VariableRole) {
 					IMember member;
 					if (unresolvedFile != null) {
 						member = GetMemberFromLocation(node);
@@ -1313,7 +1319,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			if (resolverEnabled) {
 				ResolveResult input = Resolve(asExpression.Expression);
 				var targetType = ResolveType(asExpression.Type);
-				return new ConversionResolveResult(targetType, input, Conversion.TryCast, resolver.CheckForOverflow);
+				return new CastResolveResult(targetType, input, Conversion.TryCast, resolver.CheckForOverflow);
 			} else {
 				ScanChildren(asExpression);
 				return null;
@@ -1381,10 +1387,15 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		ResolveResult IAstVisitor<ResolveResult>.VisitCastExpression(CastExpression castExpression)
 		{
 			if (resolverEnabled) {
-				IType targetType = ResolveType(castExpression.Type);
-				Expression expr = castExpression.Expression;
-				ResolveResult rr = resolver.ResolveCast(targetType, Resolve(expr));
-				ProcessConversionResult(expr, rr as ConversionResolveResult);
+				var targetType = ResolveType(castExpression.Type);
+				var expr = castExpression.Expression;
+				var rr = resolver.ResolveCast(targetType, Resolve(expr));
+				var crr = rr as ConversionResolveResult;
+				if (crr != null) {
+					Debug.Assert(!(crr is CastResolveResult));
+					ProcessConversion(expr, crr.Input, crr.Conversion, targetType);
+					rr = new CastResolveResult(crr);
+				}
 				return rr;
 			} else {
 				ScanChildren(castExpression);
@@ -1544,13 +1555,14 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				// (but not when creating a delegate from a delegate, as then there would be a MGRR for .Invoke in between)
 				// This is necessary for lambda type inference.
 				var crr = rr as ConversionResolveResult;
-				if (crr != null && crr.Input == arguments[0]) {
-					ProcessConversionResult(objectCreateExpression.Arguments.Single(), crr);
+				if (crr != null) {
+					if (objectCreateExpression.Arguments.Count == 1)
+						ProcessConversionResult(objectCreateExpression.Arguments.Single(), crr);
 					
 					// wrap the result so that the delegate creation is not handled as a reference
 					// to the target method - otherwise FindReferencedEntities would produce two results for
 					// the same delegate creation.
-					return WrapResult(rr);
+					return new CastResolveResult(crr);
 				} else {
 					return rr;
 				}
@@ -1958,7 +1970,8 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				if (pd.ParameterModifier == ParameterModifier.Ref || pd.ParameterModifier == ParameterModifier.Out)
 					type = new ByReferenceType(type);
 				
-				IParameter p = new DefaultParameter(type, pd.Name, MakeRegion(pd),
+				IParameter p = new DefaultParameter(type, pd.Name,
+				                                    region: MakeRegion(pd),
 				                                    isRef: pd.ParameterModifier == ParameterModifier.Ref,
 				                                    isOut: pd.ParameterModifier == ParameterModifier.Out);
 				// The parameter declaration must be scanned in the current context (without the new parameter)
@@ -2005,7 +2018,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			bool isEndpointUnreachable;
 			
 			// The actual return type is set when the lambda is applied by the conversion.
-			// For async lambdas, this is the unpacked task type
+			// For async lambdas, this includes the task type
 			IType actualReturnType;
 			
 			internal override bool IsUndecided {
@@ -2029,10 +2042,13 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 						Analyze();
 						if (returnValues.Count == 1) {
 							bodyRR = returnValues[0];
-							if (actualReturnType.Kind != TypeKind.Void) {
-								var conv = storedContext.conversions.ImplicitConversion(bodyRR, actualReturnType);
-								if (!conv.IsIdentityConversion)
-									bodyRR = new ConversionResolveResult(actualReturnType, bodyRR, conv, storedContext.CheckForOverflow);
+							if (actualReturnType != null) {
+								IType unpackedActualReturnType = isAsync ? visitor.UnpackTask(actualReturnType) : actualReturnType;
+								if (unpackedActualReturnType.Kind != TypeKind.Void) {
+									var conv = storedContext.conversions.ImplicitConversion(bodyRR, unpackedActualReturnType);
+									if (!conv.IsIdentityConversion)
+										bodyRR = new ConversionResolveResult(unpackedActualReturnType, bodyRR, conv, storedContext.CheckForOverflow);
+								}
 							}
 							return bodyRR;
 						}
@@ -2102,6 +2118,12 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				return inferredReturnType;
 			}
 			
+			public override IType ReturnType {
+				get {
+					return actualReturnType ?? SpecialType.UnknownType;
+				}
+			}
+			
 			public override bool IsImplicitlyTyped {
 				get { return false; }
 			}
@@ -2131,8 +2153,6 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 					// Explicitly typed lambdas do not use a nested visitor
 					throw new InvalidOperationException();
 				}
-				if (isAsync)
-					returnType = parentVisitor.UnpackTask(returnType);
 				if (actualReturnType != null) {
 					if (actualReturnType.Equals(returnType))
 						return; // return type already set
@@ -2141,10 +2161,11 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				actualReturnType = returnType;
 				visitor.undecidedLambdas.Remove(this);
 				Analyze();
-				Log.WriteLine("Applying return type {0} to explicitly-typed lambda {1}", returnType, this.LambdaExpression);
-				if (returnType.Kind != TypeKind.Void) {
+				IType unpackedReturnType = isAsync ? visitor.UnpackTask(returnType) : returnType;
+				Log.WriteLine("Applying return type {0} to explicitly-typed lambda {1}", unpackedReturnType, this.LambdaExpression);
+				if (unpackedReturnType.Kind != TypeKind.Void) {
 					for (int i = 0; i < returnExpressions.Count; i++) {
-						visitor.ProcessConversion(returnExpressions[i], returnValues[i], returnType);
+						visitor.ProcessConversion(returnExpressions[i], returnValues[i], unpackedReturnType);
 					}
 				}
 			}
@@ -2187,6 +2208,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			readonly List<LambdaTypeHypothesis> hypotheses = new List<LambdaTypeHypothesis>();
 			internal IList<IParameter> parameters = new List<IParameter>();
 			
+			internal IType actualReturnType;
 			internal LambdaTypeHypothesis winningHypothesis;
 			internal ResolveResult bodyResult;
 			internal readonly ResolveVisitor parentVisitor;
@@ -2230,7 +2252,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			{
 				this.lambda = lambda;
 				foreach (var pd in lambda.Parameters) {
-					parameters.Add(new DefaultParameter(SpecialType.UnknownType, pd.Name, parentVisitor.MakeRegion(pd)));
+					parameters.Add(new DefaultParameter(SpecialType.UnknownType, pd.Name, region: parentVisitor.MakeRegion(pd)));
 				}
 				RegisterUndecidedLambda();
 			}
@@ -2332,6 +2354,10 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				GetAnyHypothesis().MergeInto(parentVisitor, SpecialType.UnknownType);
 			}
 			
+			public override IType ReturnType {
+				get { return actualReturnType ?? SpecialType.UnknownType; }
+			}
+			
 			public override bool IsImplicitlyTyped {
 				get { return true; }
 			}
@@ -2396,7 +2422,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				if (parameterDeclarations != null) {
 					int i = 0;
 					foreach (var pd in parameterDeclarations) {
-						lambdaParameters[i] = new DefaultParameter(parameterTypes[i], pd.Name, visitor.MakeRegion(pd));
+						lambdaParameters[i] = new DefaultParameter(parameterTypes[i], pd.Name, region: visitor.MakeRegion(pd));
 						visitor.resolver = visitor.resolver.AddVariable(lambdaParameters[i]);
 						i++;
 						visitor.Scan(pd);
@@ -2404,7 +2430,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				} else {
 					for (int i = 0; i < parameterTypes.Length; i++) {
 						var p = lambda.Parameters[i];
-						lambdaParameters[i] = new DefaultParameter(parameterTypes[i], p.Name, p.Region);
+						lambdaParameters[i] = new DefaultParameter(parameterTypes[i], p.Name, region: p.Region);
 						visitor.resolver = visitor.resolver.AddVariable(lambdaParameters[i]);
 					}
 				}
@@ -2460,6 +2486,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				else if (lambda.winningHypothesis != null)
 					throw new InvalidOperationException("Trying to merge conflicting hypotheses");
 				
+				lambda.actualReturnType = returnType;
 				if (lambda.IsAsync)
 					returnType = parentVisitor.UnpackTask(returnType);
 				
@@ -2467,7 +2494,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				lambda.parameters = lambdaParameters; // replace untyped parameters with typed parameters
 				if (lambda.BodyExpression is Expression && returnValues.Count == 1) {
 					lambda.bodyResult = returnValues[0];
-					if (!returnType.IsKnownType(KnownTypeCode.Void)) {
+					if (returnType.Kind != TypeKind.Void) {
 						var conv = storedContext.conversions.ImplicitConversion(lambda.bodyResult, returnType);
 						if (!conv.IsIdentityConversion)
 							lambda.bodyResult = new ConversionResolveResult(returnType, lambda.bodyResult, conv, storedContext.CheckForOverflow);
@@ -2623,7 +2650,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 						inferredReturnType = resolver.Compilation.FindType(KnownTypeCode.Task);
 						Log.WriteLine("Lambda return type was inferred to: " + inferredReturnType);
 						return;
-					} 
+					}
 
 					TypeInference ti = new TypeInference(resolver.Compilation, resolver.conversions);
 					bool tiSuccess;
@@ -3470,6 +3497,12 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				return bodyExpression.Type;
 			}
 			
+			public override IType ReturnType {
+				get {
+					return bodyExpression.Type;
+				}
+			}
+			
 			public override string ToString()
 			{
 				return string.Format("[QueryExpressionLambda ({0}) => {1}]", string.Join(",", parameters.Select(p => p.Name)), bodyExpression);
@@ -3545,7 +3578,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		/// </summary>
 		ResolveResult WrapResult(ResolveResult result)
 		{
-			return new ConversionResolveResult(result.Type, result, Conversion.IdentityConversion, resolver.CheckForOverflow);
+			return new CastResolveResult(result.Type, result, Conversion.IdentityConversion, resolver.CheckForOverflow);
 		}
 		
 		ResolveResult IAstVisitor<ResolveResult>.VisitQueryContinuationClause(QueryContinuationClause queryContinuationClause)
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/TypeInference.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/TypeInference.cs
index abea6edc01..acbdbbf323 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/TypeInference.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Resolver/TypeInference.cs
@@ -207,6 +207,8 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		{
 			public readonly HashSet<IType> LowerBounds = new HashSet<IType>();
 			public readonly HashSet<IType> UpperBounds = new HashSet<IType>();
+			public IType ExactBound;
+			public bool MultipleDifferentExactBounds;
 			public readonly ITypeParameter TypeParameter;
 			public IType FixedTo;
 			
@@ -215,7 +217,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			}
 			
 			public bool HasBounds {
-				get { return LowerBounds.Count > 0 || UpperBounds.Count > 0; }
+				get { return LowerBounds.Count > 0 || UpperBounds.Count > 0 || ExactBound != null; }
 			}
 			
 			public TP(ITypeParameter typeParameter)
@@ -225,6 +227,16 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				this.TypeParameter = typeParameter;
 			}
 			
+			public void AddExactBound(IType type)
+			{
+				// Exact bounds need to stored separately, not just as Lower+Upper bounds,
+				// due to TypeInferenceTests.GenericArgumentImplicitlyConvertibleToAndFromAnotherTypeList (see #281)
+				if (ExactBound == null)
+					ExactBound = type;
+				else if (!ExactBound.Equals(type))
+					MultipleDifferentExactBounds = true;
+			}
+			
 			public override string ToString()
 			{
 				return TypeParameter.Name;
@@ -563,8 +575,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			TP tp = GetTPForType(V);
 			if (tp != null && tp.IsFixed == false) {
 				Log.WriteLine(" Add exact bound '" + U + "' to " + tp);
-				tp.LowerBounds.Add(U);
-				tp.UpperBounds.Add(U);
+				tp.AddExactBound(U);
 				return;
 			}
 			// Handle by reference types:
@@ -686,11 +697,12 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		{
 			if (rt == null || rt.TypeParameterCount != 1)
 				return false;
-			switch (rt.GetDefinition().FullName) {
-				case "System.Collections.Generic.IEnumerable":
-				case "System.Collections.Generic.ICollection":
-				case "System.Collections.Generic.IList":
-				case "System.Collections.Generic.IReadOnlyList":
+			switch (rt.GetDefinition().KnownTypeCode) {
+				case KnownTypeCode.IEnumerableOfT:
+				case KnownTypeCode.ICollectionOfT:
+				case KnownTypeCode.IListOfT:
+				case KnownTypeCode.IReadOnlyCollectionOfT:
+				case KnownTypeCode.IReadOnlyListOfT:
 					return true;
 				default:
 					return false;
@@ -725,7 +737,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			} else if (arrV != null && IsGenericInterfaceImplementedByArray(pU) && arrV.Dimensions == 1) {
 				MakeUpperBoundInference(pU.GetTypeArgument(0), arrV.ElementType);
 				return;
- 			}
+			}
 			// Handle parameterized types:
 			if (pU != null) {
 				ParameterizedType uniqueBaseType = null;
@@ -773,6 +785,15 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		{
 			Log.WriteLine(" Trying to fix " + tp);
 			Debug.Assert(!tp.IsFixed);
+			if (tp.ExactBound != null) {
+				// the exact bound will always be the result
+				tp.FixedTo = tp.ExactBound;
+				// check validity
+				if (tp.MultipleDifferentExactBounds)
+					return false;
+				return tp.LowerBounds.All(b => conversions.ImplicitConversion(b, tp.FixedTo).IsValid)
+					&& tp.UpperBounds.All(b => conversions.ImplicitConversion(tp.FixedTo, b).IsValid);
+			}
 			Log.Indent();
 			var types = CreateNestedInstance().FindTypesInBounds(tp.LowerBounds.ToArray(), tp.UpperBounds.ToArray());
 			Log.Unindent();
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/TypeSystem/ConstantValues.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/TypeSystem/ConstantValues.cs
index 51f4637abc..d9f1ca65c4 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/TypeSystem/ConstantValues.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/TypeSystem/ConstantValues.cs
@@ -241,8 +241,9 @@ namespace ICSharpCode.NRefactory.CSharp.TypeSystem.ConstantValues
 	{
 		readonly ITypeReference targetType;
 		readonly ConstantExpression expression;
+		readonly bool allowNullableConstants;
 		
-		public ConstantCast(ITypeReference targetType, ConstantExpression expression)
+		public ConstantCast(ITypeReference targetType, ConstantExpression expression, bool allowNullableConstants)
 		{
 			if (targetType == null)
 				throw new ArgumentNullException("targetType");
@@ -250,11 +251,19 @@ namespace ICSharpCode.NRefactory.CSharp.TypeSystem.ConstantValues
 				throw new ArgumentNullException("expression");
 			this.targetType = targetType;
 			this.expression = expression;
+			this.allowNullableConstants = allowNullableConstants;
 		}
 		
 		public override ResolveResult Resolve(CSharpResolver resolver)
 		{
-			return resolver.ResolveCast(targetType.Resolve(resolver.CurrentTypeResolveContext), expression.Resolve(resolver));
+			var type = targetType.Resolve(resolver.CurrentTypeResolveContext);
+			var resolveResult = expression.Resolve(resolver);
+			if (allowNullableConstants && NullableType.IsNullable(type)) {
+				resolveResult = resolver.ResolveCast(NullableType.GetUnderlyingType(type), resolveResult);
+				if (resolveResult.IsCompileTimeConstant)
+					return new ConstantResolveResult(type, resolveResult.ConstantValue);
+			}
+			return resolver.ResolveCast(type, resolveResult);
 		}
 		
 		int ISupportsInterning.GetHashCodeForInterning()
@@ -268,7 +277,7 @@ namespace ICSharpCode.NRefactory.CSharp.TypeSystem.ConstantValues
 		{
 			ConstantCast cast = other as ConstantCast;
 			return cast != null
-				&& this.targetType == cast.targetType && this.expression == cast.expression;
+				&& this.targetType == cast.targetType && this.expression == cast.expression && this.allowNullableConstants == cast.allowNullableConstants;
 		}
 	}
 	
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/TypeSystem/MemberTypeOrNamespaceReference.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/TypeSystem/MemberTypeOrNamespaceReference.cs
index ab510428cc..4315e8d292 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/TypeSystem/MemberTypeOrNamespaceReference.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/TypeSystem/MemberTypeOrNamespaceReference.cs
@@ -81,14 +81,7 @@ namespace ICSharpCode.NRefactory.CSharp.TypeSystem
 			if (targetRR.IsError)
 				return targetRR;
 			IList<IType> typeArgs = typeArguments.Resolve(resolver.CurrentTypeResolveContext);
-			using (var busyLock = BusyManager.Enter(this)) {
-				if (busyLock.Success) {
-					return resolver.ResolveMemberAccess(targetRR, identifier, typeArgs, lookupMode);
-				} else {
-					// This can happen for "class Test : $Test.Base$ { public class Base {} }":
-					return ErrorResolveResult.UnknownError; // don't cache this error
-				}
-			}
+			return resolver.ResolveMemberAccess(targetRR, identifier, typeArgs, lookupMode);
 		}
 		
 		public override IType ResolveType(CSharpResolver resolver)
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/TypeSystem/TypeSystemConvertVisitor.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/TypeSystem/TypeSystemConvertVisitor.cs
index b82a3888d5..9fb920bfef 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/TypeSystem/TypeSystemConvertVisitor.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/TypeSystem/TypeSystemConvertVisitor.cs
@@ -39,7 +39,7 @@ namespace ICSharpCode.NRefactory.CSharp.TypeSystem
 		/// Should be incremented when fixing bugs so that project contents cached on disk
 		/// (which might be incorrect due to the bug) are re-created.
 		/// </summary>
-		internal const int version = 1;
+		internal const int version = 2;
 		
 		readonly CSharpUnresolvedFile unresolvedFile;
 		UsingScope usingScope;
@@ -170,8 +170,8 @@ namespace ICSharpCode.NRefactory.CSharp.TypeSystem
 		{
 			DomRegion region = MakeRegion(namespaceDeclaration);
 			UsingScope previousUsingScope = usingScope;
-			foreach (Identifier ident in namespaceDeclaration.Identifiers) {
-				usingScope = new UsingScope(usingScope, ident.Name);
+			foreach (var ident in namespaceDeclaration.Identifiers) {
+				usingScope = new UsingScope(usingScope, ident);
 				usingScope.Region = region;
 			}
 			base.VisitNamespaceDeclaration(namespaceDeclaration);
@@ -376,8 +376,27 @@ namespace ICSharpCode.NRefactory.CSharp.TypeSystem
 		
 		public override IUnresolvedEntity VisitFixedFieldDeclaration(FixedFieldDeclaration fixedFieldDeclaration)
 		{
-			// TODO: add support for fixed fields
-			return base.VisitFixedFieldDeclaration(fixedFieldDeclaration);
+			bool isSingleField = fixedFieldDeclaration.Variables.Count == 1;
+			Modifiers modifiers = fixedFieldDeclaration.Modifiers;
+			DefaultUnresolvedField field = null;
+			foreach (var vi in fixedFieldDeclaration.Variables) {
+				field = new DefaultUnresolvedField(currentTypeDefinition, vi.Name);
+
+				field.Region = isSingleField ? MakeRegion(fixedFieldDeclaration) : MakeRegion(vi);
+				field.BodyRegion = MakeRegion(vi);
+				ConvertAttributes(field.Attributes, fixedFieldDeclaration.Attributes);
+				AddXmlDocumentation(field, fixedFieldDeclaration);
+
+				ApplyModifiers(field, modifiers);
+
+				field.ReturnType = ConvertTypeReference(fixedFieldDeclaration.ReturnType);
+				field.IsFixed = true;
+				field.ConstantValue = ConvertConstantValue(field.ReturnType, vi.CountExpression);
+
+				currentTypeDefinition.Members.Add(field);
+				field.ApplyInterningProvider(interningProvider);
+			}
+			return isSingleField ? field : null;
 		}
 		
 		public override IUnresolvedEntity VisitEnumMemberDeclaration(EnumMemberDeclaration enumMemberDeclaration)
@@ -760,7 +779,7 @@ namespace ICSharpCode.NRefactory.CSharp.TypeSystem
 			a.SymbolKind = SymbolKind.Accessor;
 			a.AccessorOwner = ev;
 			a.Region = ev.BodyRegion;
-			a.BodyRegion = ev.BodyRegion;
+			a.BodyRegion = DomRegion.Empty;
 			a.Accessibility = ev.Accessibility;
 			a.IsAbstract = ev.IsAbstract;
 			a.IsOverride = ev.IsOverride;
@@ -768,7 +787,7 @@ namespace ICSharpCode.NRefactory.CSharp.TypeSystem
 			a.IsStatic = ev.IsStatic;
 			a.IsSynthetic = ev.IsSynthetic;
 			a.IsVirtual = ev.IsVirtual;
-			a.HasBody = true;
+			a.HasBody = true; // even if it's compiler-generated; the body still exists
 			a.ReturnType = KnownTypeReference.Void;
 			a.Parameters.Add(valueParameter);
 			return a;
@@ -949,7 +968,7 @@ namespace ICSharpCode.NRefactory.CSharp.TypeSystem
 				return interningProvider.Intern(new SimpleConstantValue(targetType, pc.Value));
 			}
 			// cast to the desired type
-			return interningProvider.Intern(new ConstantCast(targetType, c));
+			return interningProvider.Intern(new ConstantCast(targetType, c, true));
 		}
 		
 		IConstantValue ConvertAttributeArgument(Expression expression)
@@ -1045,7 +1064,8 @@ namespace ICSharpCode.NRefactory.CSharp.TypeSystem
 				ConstantExpression v = castExpression.Expression.AcceptVisitor(this);
 				if (v == null)
 					return null;
-				return interningProvider.Intern(new ConstantCast(ConvertTypeReference(castExpression.Type), v));
+				var typeReference = ConvertTypeReference(castExpression.Type);
+				return interningProvider.Intern(new ConstantCast(typeReference, v, false));
 			}
 			
 			public override ConstantExpression VisitCheckedExpression(CheckedExpression checkedExpression)
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Cecil/CecilLoader.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Cecil/CecilLoader.cs
new file mode 100644
index 0000000000..68e2b8e023
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Cecil/CecilLoader.cs
@@ -0,0 +1,1765 @@
+// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+using ICSharpCode.NRefactory.Documentation;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using ICSharpCode.NRefactory.Utils;
+using Mono.Cecil;
+
+
+namespace ICSharpCode.NRefactory.TypeSystem
+{
+	/// <summary>
+	/// Allows loading an IProjectContent from an already compiled assembly.
+	/// </summary>
+	/// <remarks>Instance methods are not thread-safe; you need to create multiple instances of CecilLoader
+	/// if you want to load multiple project contents in parallel.</remarks>
+	public sealed class CecilLoader : AssemblyLoader
+	{
+		/// <summary>
+		/// Version number of the cecil loader.
+		/// Should be incremented when fixing bugs in the cecil loader so that project contents cached on disk
+		/// (which might be incorrect due to the bug) are re-created.
+		/// </summary>
+		const int cecilLoaderVersion = 1;
+		
+		#region Options
+		// Most options are defined in the AssemblyLoader base class
+		
+		/// <summary>
+		/// Specifies whether to use lazy loading. The default is false.
+		/// If this property is set to true, the CecilLoader will not copy all the relevant information
+		/// out of the Cecil object model, but will maintain references to the Cecil objects.
+		/// This speeds up the loading process and avoids loading unnecessary information, but it causes
+		/// the Cecil objects to stay in memory (which can significantly increase memory usage).
+		/// It also prevents serialization of the Cecil-loaded type system.
+		/// </summary>
+		/// <remarks>
+		/// Because the type system can be used on multiple threads, but Cecil is not
+		/// thread-safe for concurrent read access, the CecilLoader will lock on the <see cref="ModuleDefinition"/> instance
+		/// for every delay-loading operation.
+		/// If you access the Cecil objects directly in your application, you may need to take the same lock.
+		/// </remarks>
+		public bool LazyLoad { get; set; }
+		
+		/// <summary>
+		/// This delegate gets executed whenever an entity was loaded.
+		/// </summary>
+		/// <remarks>
+		/// This callback may be to build a dictionary that maps between
+		/// entities and cecil objects.
+		/// Warning: if delay-loading is used and the type system is accessed by multiple threads,
+		/// the callback may be invoked concurrently on multiple threads.
+		/// </remarks>
+		public Action<IUnresolvedEntity, MemberReference> OnEntityLoaded { get; set; }
+		
+		/// <summary>
+		/// Gets a value indicating whether this instance stores references to the cecil objects.
+		/// </summary>
+		/// <value>
+		/// <c>true</c> if this instance has references to the cecil objects; otherwise, <c>false</c>.
+		/// </value>
+		public bool HasCecilReferences { get { return typeSystemTranslationTable != null; } }
+		#endregion
+		
+		ModuleDefinition currentModule;
+		CecilUnresolvedAssembly currentAssembly;
+		
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.TypeSystem.CecilLoader"/> class.
+		/// </summary>
+		public CecilLoader()
+		{
+		}
+		
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.TypeSystem.CecilLoader"/> class.
+		/// </summary>
+		/// <param name='createCecilReferences'>
+		/// If true references to the cecil objects are hold. In this case the cecil loader can do a type system -> cecil mapping.
+		/// </param>
+		[Obsolete("The built-in entity<->cecil mapping is obsolete. Use the OnEntityLoaded callback instead!")]
+		public CecilLoader(bool createCecilReferences) : this()
+		{
+			if (createCecilReferences)
+				typeSystemTranslationTable = new Dictionary<object, object> ();
+		}
+		
+		/// <summary>
+		/// Creates a nested CecilLoader for lazy-loading.
+		/// </summary>
+		private CecilLoader(CecilLoader loader)
+		{
+			// use a shared typeSystemTranslationTable
+			this.typeSystemTranslationTable = loader.typeSystemTranslationTable;
+			this.IncludeInternalMembers = loader.IncludeInternalMembers;
+			this.LazyLoad = loader.LazyLoad;
+			this.OnEntityLoaded = loader.OnEntityLoaded;
+			this.currentModule = loader.currentModule;
+			this.currentAssembly = loader.currentAssembly;
+			// don't use interning - the interning provider is most likely not thread-safe
+			this.interningProvider = InterningProvider.Dummy;
+			// don't use cancellation for delay-loaded members
+		}
+
+		#region Load From AssemblyDefinition
+		/// <summary>
+		/// Loads the assembly definition into a project content.
+		/// </summary>
+		/// <returns>Unresolved type system representing the assembly</returns>
+		[CLSCompliant(false)]
+		public IUnresolvedAssembly LoadAssembly(AssemblyDefinition assemblyDefinition)
+		{
+			if (assemblyDefinition == null)
+				throw new ArgumentNullException("assemblyDefinition");
+			return LoadModule(assemblyDefinition.MainModule);
+		}
+		
+		/// <summary>
+		/// Loads the module definition into a project content.
+		/// </summary>
+		/// <returns>Unresolved type system representing the assembly</returns>
+		[CLSCompliant(false)]
+		public IUnresolvedAssembly LoadModule(ModuleDefinition moduleDefinition)
+		{
+			if (moduleDefinition == null)
+				throw new ArgumentNullException("moduleDefinition");
+			
+			this.currentModule = moduleDefinition;
+			
+			// Read assembly and module attributes
+			IList<IUnresolvedAttribute> assemblyAttributes = new List<IUnresolvedAttribute>();
+			IList<IUnresolvedAttribute> moduleAttributes = new List<IUnresolvedAttribute>();
+			AssemblyDefinition assemblyDefinition = moduleDefinition.Assembly;
+			if (assemblyDefinition != null) {
+				AddAttributes(assemblyDefinition, assemblyAttributes);
+			}
+			AddAttributes(moduleDefinition, moduleAttributes);
+			
+			assemblyAttributes = interningProvider.InternList(assemblyAttributes);
+			moduleAttributes = interningProvider.InternList(moduleAttributes);
+			
+			this.currentAssembly = new CecilUnresolvedAssembly(assemblyDefinition != null ? assemblyDefinition.Name.FullName : moduleDefinition.Name, this.DocumentationProvider);
+			currentAssembly.Location = moduleDefinition.FullyQualifiedName;
+			currentAssembly.AssemblyAttributes.AddRange(assemblyAttributes);
+			currentAssembly.ModuleAttributes.AddRange(assemblyAttributes);
+			
+			// Register type forwarders:
+			foreach (ExportedType type in moduleDefinition.ExportedTypes) {
+				if (type.IsForwarder) {
+					int typeParameterCount;
+					string ns = type.Namespace;
+					string name = ReflectionHelper.SplitTypeParameterCountFromReflectionName(type.Name, out typeParameterCount);
+					ns = interningProvider.Intern(ns);
+					name = interningProvider.Intern(name);
+					var typeRef = new GetClassTypeReference(GetAssemblyReference(type.Scope), ns, name, typeParameterCount);
+					typeRef = interningProvider.Intern(typeRef);
+					var key = new TopLevelTypeName(ns, name, typeParameterCount);
+					currentAssembly.AddTypeForwarder(key, typeRef);
+				}
+			}
+			
+			// Create and register all types:
+			CecilLoader cecilLoaderCloneForLazyLoading = LazyLoad ? new CecilLoader(this) : null;
+			List<TypeDefinition> cecilTypeDefs = new List<TypeDefinition>();
+			List<DefaultUnresolvedTypeDefinition> typeDefs = new List<DefaultUnresolvedTypeDefinition>();
+			foreach (TypeDefinition td in moduleDefinition.Types) {
+				this.CancellationToken.ThrowIfCancellationRequested();
+				if (this.IncludeInternalMembers || (td.Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.Public) {
+					string name = td.Name;
+					if (name.Length == 0)
+						continue;
+					
+					if (this.LazyLoad) {
+						var t = new LazyCecilTypeDefinition(cecilLoaderCloneForLazyLoading, td);
+						currentAssembly.AddTypeDefinition(t);
+						RegisterCecilObject(t, td);
+					} else {
+						var t = CreateTopLevelTypeDefinition(td);
+						cecilTypeDefs.Add(td);
+						typeDefs.Add(t);
+						currentAssembly.AddTypeDefinition(t);
+						// The registration will happen after the members are initialized
+					}
+				}
+			}
+			// Initialize the type's members:
+			for (int i = 0; i < typeDefs.Count; i++) {
+				InitTypeDefinition(cecilTypeDefs[i], typeDefs[i]);
+			}
+			
+			AddToTypeSystemTranslationTable(this.currentAssembly, assemblyDefinition);
+			// Freezing the assembly here is important:
+			// otherwise it will be frozen when a compilation is first created
+			// from it. But freezing has the effect of changing some collection instances
+			// (to ReadOnlyCollection). This hidden mutation was causing a crash
+			// when the FastSerializer was saving the assembly at the same time as
+			// the first compilation was created from it.
+			// By freezing the assembly now, we ensure it is usable on multiple
+			// threads without issues.
+			currentAssembly.Freeze();
+			
+			var result = this.currentAssembly;
+			this.currentAssembly = null;
+			this.currentModule = null;
+			return result;
+		}
+		
+		/// <summary>
+		/// Sets the current module.
+		/// This causes ReadTypeReference() to use <see cref="DefaultAssemblyReference.CurrentAssembly"/> for references
+		/// in that module.
+		/// </summary>
+		[CLSCompliant(false)]
+		public void SetCurrentModule(ModuleDefinition module)
+		{
+			this.currentModule = module;
+		}
+		
+		/// <summary>
+		/// Loads a type from Cecil.
+		/// </summary>
+		/// <param name="typeDefinition">The Cecil TypeDefinition.</param>
+		/// <returns>ITypeDefinition representing the Cecil type.</returns>
+		[CLSCompliant(false)]
+		public IUnresolvedTypeDefinition LoadType(TypeDefinition typeDefinition)
+		{
+			if (typeDefinition == null)
+				throw new ArgumentNullException("typeDefinition");
+			var td = CreateTopLevelTypeDefinition(typeDefinition);
+			InitTypeDefinition(typeDefinition, td);
+			return td;
+		}
+		#endregion
+		
+		#region IUnresolvedAssembly implementation
+		[Serializable, FastSerializerVersion(cecilLoaderVersion)]
+		sealed class CecilUnresolvedAssembly : DefaultUnresolvedAssembly, IDocumentationProvider
+		{
+			readonly IDocumentationProvider documentationProvider;
+			
+			public CecilUnresolvedAssembly(string fullAssemblyName, IDocumentationProvider documentationProvider)
+				: base(fullAssemblyName)
+			{
+				this.documentationProvider = documentationProvider;
+			}
+			
+			DocumentationComment IDocumentationProvider.GetDocumentation(IEntity entity)
+			{
+				if (documentationProvider != null)
+					return documentationProvider.GetDocumentation(entity);
+				else
+					return null;
+			}
+		}
+		#endregion
+		
+		#region Load Assembly From Disk
+		public override IUnresolvedAssembly LoadAssemblyFile(string fileName)
+		{
+			if (fileName == null)
+				throw new ArgumentNullException("fileName");
+			var param = new ReaderParameters { AssemblyResolver = new DummyAssemblyResolver() };
+			ModuleDefinition module = ModuleDefinition.ReadModule(fileName, param);
+			return LoadModule(module);
+		}
+		
+		// used to prevent Cecil from loading referenced assemblies
+		sealed class DummyAssemblyResolver : IAssemblyResolver
+		{
+			public AssemblyDefinition Resolve(AssemblyNameReference name)
+			{
+				return null;
+			}
+			
+			public AssemblyDefinition Resolve(string fullName)
+			{
+				return null;
+			}
+			
+			public AssemblyDefinition Resolve(AssemblyNameReference name, ReaderParameters parameters)
+			{
+				return null;
+			}
+			
+			public AssemblyDefinition Resolve(string fullName, ReaderParameters parameters)
+			{
+				return null;
+			}
+		}
+		#endregion
+		
+		#region Read Type Reference
+		/// <summary>
+		/// Reads a type reference.
+		/// </summary>
+		/// <param name="type">The Cecil type reference that should be converted into
+		/// a type system type reference.</param>
+		/// <param name="typeAttributes">Attributes associated with the Cecil type reference.
+		/// This is used to support the 'dynamic' type.</param>
+		[CLSCompliant(false)]
+		public ITypeReference ReadTypeReference(TypeReference type, ICustomAttributeProvider typeAttributes = null)
+		{
+			int typeIndex = 0;
+			return CreateType(type, typeAttributes, ref typeIndex);
+		}
+		
+		ITypeReference CreateType(TypeReference type, ICustomAttributeProvider typeAttributes, ref int typeIndex)
+		{
+			while (type is OptionalModifierType || type is RequiredModifierType) {
+				type = ((TypeSpecification)type).ElementType;
+			}
+			if (type == null) {
+				return SpecialType.UnknownType;
+			}
+			
+			if (type is Mono.Cecil.ByReferenceType) {
+				typeIndex++;
+				return interningProvider.Intern(
+					new ByReferenceTypeReference(
+						CreateType(
+							(type as Mono.Cecil.ByReferenceType).ElementType,
+							typeAttributes, ref typeIndex)));
+			} else if (type is Mono.Cecil.PointerType) {
+				typeIndex++;
+				return interningProvider.Intern(
+					new PointerTypeReference(
+						CreateType(
+							(type as Mono.Cecil.PointerType).ElementType,
+							typeAttributes, ref typeIndex)));
+			} else if (type is Mono.Cecil.ArrayType) {
+				typeIndex++;
+				return interningProvider.Intern(
+					new ArrayTypeReference(
+						CreateType(
+							(type as Mono.Cecil.ArrayType).ElementType,
+							typeAttributes, ref typeIndex),
+						(type as Mono.Cecil.ArrayType).Rank));
+			} else if (type is GenericInstanceType) {
+				GenericInstanceType gType = (GenericInstanceType)type;
+				ITypeReference baseType = CreateType(gType.ElementType, typeAttributes, ref typeIndex);
+				ITypeReference[] para = new ITypeReference[gType.GenericArguments.Count];
+				for (int i = 0; i < para.Length; ++i) {
+					typeIndex++;
+					para[i] = CreateType(gType.GenericArguments[i], typeAttributes, ref typeIndex);
+				}
+				return interningProvider.Intern(new ParameterizedTypeReference(baseType, para));
+			} else if (type is GenericParameter) {
+				GenericParameter typeGP = (GenericParameter)type;
+				return TypeParameterReference.Create(typeGP.Owner is MethodDefinition ? SymbolKind.Method : SymbolKind.TypeDefinition, typeGP.Position);
+			} else if (type.IsNested) {
+				ITypeReference typeRef = CreateType(type.DeclaringType, typeAttributes, ref typeIndex);
+				int partTypeParameterCount;
+				string namepart = ReflectionHelper.SplitTypeParameterCountFromReflectionName(type.Name, out partTypeParameterCount);
+				namepart = interningProvider.Intern(namepart);
+				return interningProvider.Intern(new NestedTypeReference(typeRef, namepart, partTypeParameterCount));
+			} else {
+				string ns = interningProvider.Intern(type.Namespace ?? string.Empty);
+				string name = type.Name;
+				if (name == null)
+					throw new InvalidOperationException("type.Name returned null. Type: " + type.ToString());
+				
+				if (name == "Object" && ns == "System" && HasDynamicAttribute(typeAttributes, typeIndex)) {
+					return SpecialType.Dynamic;
+				} else {
+					int typeParameterCount;
+					name = ReflectionHelper.SplitTypeParameterCountFromReflectionName(name, out typeParameterCount);
+					name = interningProvider.Intern(name);
+					if (currentAssembly != null) {
+						IUnresolvedTypeDefinition c = currentAssembly.GetTypeDefinition(ns, name, typeParameterCount);
+						if (c != null)
+							return c;
+					}
+					return interningProvider.Intern(new GetClassTypeReference(GetAssemblyReference(type.Scope), ns, name, typeParameterCount));
+				}
+			}
+		}
+		
+		IAssemblyReference GetAssemblyReference(IMetadataScope scope)
+		{
+			if (scope == null || scope == currentModule)
+				return DefaultAssemblyReference.CurrentAssembly;
+			else
+				return interningProvider.Intern(new DefaultAssemblyReference(scope.Name));
+		}
+		
+		static bool HasDynamicAttribute(ICustomAttributeProvider attributeProvider, int typeIndex)
+		{
+			if (attributeProvider == null || !attributeProvider.HasCustomAttributes)
+				return false;
+			foreach (CustomAttribute a in attributeProvider.CustomAttributes) {
+				TypeReference type = a.AttributeType;
+				if (type.Name == "DynamicAttribute" && type.Namespace == "System.Runtime.CompilerServices") {
+					if (a.ConstructorArguments.Count == 1) {
+						CustomAttributeArgument[] values = a.ConstructorArguments[0].Value as CustomAttributeArgument[];
+						if (values != null && typeIndex < values.Length && values[typeIndex].Value is bool)
+							return (bool)values[typeIndex].Value;
+					}
+					return true;
+				}
+			}
+			return false;
+		}
+		#endregion
+		
+		#region Read Attributes
+		#region Assembly Attributes
+		static readonly ITypeReference assemblyVersionAttributeTypeRef = typeof(System.Reflection.AssemblyVersionAttribute).ToTypeReference();
+		
+		void AddAttributes(AssemblyDefinition assembly, IList<IUnresolvedAttribute> outputList)
+		{
+			if (assembly.HasCustomAttributes) {
+				AddCustomAttributes(assembly.CustomAttributes, outputList);
+			}
+			if (assembly.HasSecurityDeclarations) {
+				AddSecurityAttributes(assembly.SecurityDeclarations, outputList);
+			}
+			
+			// AssemblyVersionAttribute
+			if (assembly.Name.Version != null) {
+				var assemblyVersion = new DefaultUnresolvedAttribute(assemblyVersionAttributeTypeRef, new[] { KnownTypeReference.String });
+				assemblyVersion.PositionalArguments.Add(CreateSimpleConstantValue(KnownTypeReference.String, assembly.Name.Version.ToString()));
+				outputList.Add(interningProvider.Intern(assemblyVersion));
+			}
+		}
+		
+		IConstantValue CreateSimpleConstantValue(ITypeReference type, object value)
+		{
+			return interningProvider.Intern(new SimpleConstantValue(type, interningProvider.InternValue(value)));
+		}
+		#endregion
+		
+		#region Module Attributes
+		void AddAttributes(ModuleDefinition module, IList<IUnresolvedAttribute> outputList)
+		{
+			if (module.HasCustomAttributes) {
+				AddCustomAttributes(module.CustomAttributes, outputList);
+			}
+		}
+		#endregion
+		
+		#region Parameter Attributes
+		static readonly IUnresolvedAttribute inAttribute = new DefaultUnresolvedAttribute(typeof(InAttribute).ToTypeReference());
+		static readonly IUnresolvedAttribute outAttribute = new DefaultUnresolvedAttribute(typeof(OutAttribute).ToTypeReference());
+		
+		void AddAttributes(ParameterDefinition parameter, DefaultUnresolvedParameter targetParameter)
+		{
+			if (!targetParameter.IsOut) {
+				if (parameter.IsIn)
+					targetParameter.Attributes.Add(inAttribute);
+				if (parameter.IsOut)
+					targetParameter.Attributes.Add(outAttribute);
+			}
+			if (parameter.HasCustomAttributes) {
+				AddCustomAttributes(parameter.CustomAttributes, targetParameter.Attributes);
+			}
+			if (parameter.HasMarshalInfo) {
+				targetParameter.Attributes.Add(ConvertMarshalInfo(parameter.MarshalInfo));
+			}
+		}
+		#endregion
+		
+		#region Method Attributes
+		static readonly ITypeReference dllImportAttributeTypeRef = typeof(DllImportAttribute).ToTypeReference();
+		static readonly SimpleConstantValue trueValue = new SimpleConstantValue(KnownTypeReference.Boolean, true);
+		static readonly SimpleConstantValue falseValue = new SimpleConstantValue(KnownTypeReference.Boolean, false);
+		static readonly ITypeReference callingConventionTypeRef = typeof(CallingConvention).ToTypeReference();
+		static readonly IUnresolvedAttribute preserveSigAttribute = new DefaultUnresolvedAttribute(typeof(PreserveSigAttribute).ToTypeReference());
+		static readonly ITypeReference methodImplAttributeTypeRef = typeof(MethodImplAttribute).ToTypeReference();
+		static readonly ITypeReference methodImplOptionsTypeRef = typeof(MethodImplOptions).ToTypeReference();
+		
+		static bool HasAnyAttributes(MethodDefinition methodDefinition)
+		{
+			if (methodDefinition.HasPInvokeInfo)
+				return true;
+			if ((methodDefinition.ImplAttributes & ~MethodImplAttributes.CodeTypeMask) != 0)
+				return true;
+			if (methodDefinition.MethodReturnType.HasFieldMarshal)
+				return true;
+			return methodDefinition.HasCustomAttributes || methodDefinition.MethodReturnType.HasCustomAttributes;
+		}
+		
+		void AddAttributes(MethodDefinition methodDefinition, IList<IUnresolvedAttribute> attributes, IList<IUnresolvedAttribute> returnTypeAttributes)
+		{
+			MethodImplAttributes implAttributes = methodDefinition.ImplAttributes & ~MethodImplAttributes.CodeTypeMask;
+			
+			#region DllImportAttribute
+			if (methodDefinition.HasPInvokeInfo && methodDefinition.PInvokeInfo != null) {
+				PInvokeInfo info = methodDefinition.PInvokeInfo;
+				var dllImport = new DefaultUnresolvedAttribute(dllImportAttributeTypeRef, new[] { KnownTypeReference.String });
+				dllImport.PositionalArguments.Add(CreateSimpleConstantValue(KnownTypeReference.String, info.Module.Name));
+				
+				if (info.IsBestFitDisabled)
+					dllImport.AddNamedFieldArgument("BestFitMapping", falseValue);
+				if (info.IsBestFitEnabled)
+					dllImport.AddNamedFieldArgument("BestFitMapping", trueValue);
+				
+				CallingConvention callingConvention;
+				switch (info.Attributes & PInvokeAttributes.CallConvMask) {
+					case (PInvokeAttributes)0:
+						Debug.WriteLine ("P/Invoke calling convention not set on:" + methodDefinition.FullName);
+						callingConvention = 0;
+						break;
+					case PInvokeAttributes.CallConvCdecl:
+						callingConvention = CallingConvention.Cdecl;
+						break;
+					case PInvokeAttributes.CallConvFastcall:
+						callingConvention = CallingConvention.FastCall;
+						break;
+					case PInvokeAttributes.CallConvStdCall:
+						callingConvention = CallingConvention.StdCall;
+						break;
+					case PInvokeAttributes.CallConvThiscall:
+						callingConvention = CallingConvention.ThisCall;
+						break;
+					case PInvokeAttributes.CallConvWinapi:
+						callingConvention = CallingConvention.Winapi;
+						break;
+					default:
+						throw new NotSupportedException("unknown calling convention");
+				}
+				if (callingConvention != CallingConvention.Winapi)
+					dllImport.AddNamedFieldArgument("CallingConvention", CreateSimpleConstantValue(callingConventionTypeRef, (int)callingConvention));
+				
+				CharSet charSet = CharSet.None;
+				switch (info.Attributes & PInvokeAttributes.CharSetMask) {
+					case PInvokeAttributes.CharSetAnsi:
+						charSet = CharSet.Ansi;
+						break;
+					case PInvokeAttributes.CharSetAuto:
+						charSet = CharSet.Auto;
+						break;
+					case PInvokeAttributes.CharSetUnicode:
+						charSet = CharSet.Unicode;
+						break;
+				}
+				if (charSet != CharSet.None)
+					dllImport.AddNamedFieldArgument("CharSet", CreateSimpleConstantValue(charSetTypeRef, (int)charSet));
+				
+				if (!string.IsNullOrEmpty(info.EntryPoint) && info.EntryPoint != methodDefinition.Name)
+					dllImport.AddNamedFieldArgument("EntryPoint", CreateSimpleConstantValue(KnownTypeReference.String, info.EntryPoint));
+				
+				if (info.IsNoMangle)
+					dllImport.AddNamedFieldArgument("ExactSpelling", trueValue);
+				
+				if ((implAttributes & MethodImplAttributes.PreserveSig) == MethodImplAttributes.PreserveSig)
+					implAttributes &= ~MethodImplAttributes.PreserveSig;
+				else
+					dllImport.AddNamedFieldArgument("PreserveSig", falseValue);
+				
+				if (info.SupportsLastError)
+					dllImport.AddNamedFieldArgument("SetLastError", trueValue);
+				
+				if (info.IsThrowOnUnmappableCharDisabled)
+					dllImport.AddNamedFieldArgument("ThrowOnUnmappableChar", falseValue);
+				if (info.IsThrowOnUnmappableCharEnabled)
+					dllImport.AddNamedFieldArgument("ThrowOnUnmappableChar", trueValue);
+				
+				attributes.Add(interningProvider.Intern(dllImport));
+			}
+			#endregion
+			
+			#region PreserveSigAttribute
+			if (implAttributes == MethodImplAttributes.PreserveSig) {
+				attributes.Add(preserveSigAttribute);
+				implAttributes = 0;
+			}
+			#endregion
+			
+			#region MethodImplAttribute
+			if (implAttributes != 0) {
+				var methodImpl = new DefaultUnresolvedAttribute(methodImplAttributeTypeRef, new[] { methodImplOptionsTypeRef });
+				methodImpl.PositionalArguments.Add(CreateSimpleConstantValue(methodImplOptionsTypeRef, (int)implAttributes));
+				attributes.Add(interningProvider.Intern(methodImpl));
+			}
+			#endregion
+			
+			if (methodDefinition.HasCustomAttributes) {
+				AddCustomAttributes(methodDefinition.CustomAttributes, attributes);
+			}
+			if (methodDefinition.HasSecurityDeclarations) {
+				AddSecurityAttributes(methodDefinition.SecurityDeclarations, attributes);
+			}
+			if (methodDefinition.MethodReturnType.HasMarshalInfo) {
+				returnTypeAttributes.Add(ConvertMarshalInfo(methodDefinition.MethodReturnType.MarshalInfo));
+			}
+			if (methodDefinition.MethodReturnType.HasCustomAttributes) {
+				AddCustomAttributes(methodDefinition.MethodReturnType.CustomAttributes, returnTypeAttributes);
+			}
+		}
+		#endregion
+		
+		#region Type Attributes
+		static readonly DefaultUnresolvedAttribute serializableAttribute = new DefaultUnresolvedAttribute(typeof(SerializableAttribute).ToTypeReference());
+		static readonly DefaultUnresolvedAttribute comImportAttribute = new DefaultUnresolvedAttribute(typeof(ComImportAttribute).ToTypeReference());
+		static readonly ITypeReference structLayoutAttributeTypeRef = typeof(StructLayoutAttribute).ToTypeReference();
+		static readonly ITypeReference layoutKindTypeRef = typeof(LayoutKind).ToTypeReference();
+		static readonly ITypeReference charSetTypeRef = typeof(CharSet).ToTypeReference();
+		
+		void AddAttributes(TypeDefinition typeDefinition, IUnresolvedTypeDefinition targetEntity)
+		{
+			// SerializableAttribute
+			if (typeDefinition.IsSerializable)
+				targetEntity.Attributes.Add(serializableAttribute);
+			
+			// ComImportAttribute
+			if (typeDefinition.IsImport)
+				targetEntity.Attributes.Add(comImportAttribute);
+			
+			#region StructLayoutAttribute
+			LayoutKind layoutKind = LayoutKind.Auto;
+			switch (typeDefinition.Attributes & TypeAttributes.LayoutMask) {
+				case TypeAttributes.SequentialLayout:
+					layoutKind = LayoutKind.Sequential;
+					break;
+				case TypeAttributes.ExplicitLayout:
+					layoutKind = LayoutKind.Explicit;
+					break;
+			}
+			CharSet charSet = CharSet.None;
+			switch (typeDefinition.Attributes & TypeAttributes.StringFormatMask) {
+				case TypeAttributes.AnsiClass:
+					charSet = CharSet.Ansi;
+					break;
+				case TypeAttributes.AutoClass:
+					charSet = CharSet.Auto;
+					break;
+				case TypeAttributes.UnicodeClass:
+					charSet = CharSet.Unicode;
+					break;
+			}
+			LayoutKind defaultLayoutKind = (typeDefinition.IsValueType && !typeDefinition.IsEnum) ? LayoutKind.Sequential: LayoutKind.Auto;
+			if (layoutKind != defaultLayoutKind || charSet != CharSet.Ansi || typeDefinition.PackingSize > 0 || typeDefinition.ClassSize > 0) {
+				DefaultUnresolvedAttribute structLayout = new DefaultUnresolvedAttribute(structLayoutAttributeTypeRef, new[] { layoutKindTypeRef });
+				structLayout.PositionalArguments.Add(CreateSimpleConstantValue(layoutKindTypeRef, (int)layoutKind));
+				if (charSet != CharSet.Ansi) {
+					structLayout.AddNamedFieldArgument("CharSet", CreateSimpleConstantValue(charSetTypeRef, (int)charSet));
+				}
+				if (typeDefinition.PackingSize > 0) {
+					structLayout.AddNamedFieldArgument("Pack", CreateSimpleConstantValue(KnownTypeReference.Int32, (int)typeDefinition.PackingSize));
+				}
+				if (typeDefinition.ClassSize > 0) {
+					structLayout.AddNamedFieldArgument("Size", CreateSimpleConstantValue(KnownTypeReference.Int32, (int)typeDefinition.ClassSize));
+				}
+				targetEntity.Attributes.Add(interningProvider.Intern(structLayout));
+			}
+			#endregion
+			
+			if (typeDefinition.HasCustomAttributes) {
+				AddCustomAttributes(typeDefinition.CustomAttributes, targetEntity.Attributes);
+			}
+			if (typeDefinition.HasSecurityDeclarations) {
+				AddSecurityAttributes(typeDefinition.SecurityDeclarations, targetEntity.Attributes);
+			}
+		}
+		#endregion
+		
+		#region Field Attributes
+		static readonly ITypeReference fieldOffsetAttributeTypeRef = typeof(FieldOffsetAttribute).ToTypeReference();
+		static readonly IUnresolvedAttribute nonSerializedAttribute = new DefaultUnresolvedAttribute(typeof(NonSerializedAttribute).ToTypeReference());
+		
+		void AddAttributes(FieldDefinition fieldDefinition, IUnresolvedEntity targetEntity)
+		{
+			// FieldOffsetAttribute
+			if (fieldDefinition.HasLayoutInfo) {
+				DefaultUnresolvedAttribute fieldOffset = new DefaultUnresolvedAttribute(fieldOffsetAttributeTypeRef, new[] { KnownTypeReference.Int32 });
+				fieldOffset.PositionalArguments.Add(CreateSimpleConstantValue(KnownTypeReference.Int32, fieldDefinition.Offset));
+				targetEntity.Attributes.Add(interningProvider.Intern(fieldOffset));
+			}
+			
+			// NonSerializedAttribute
+			if (fieldDefinition.IsNotSerialized) {
+				targetEntity.Attributes.Add(nonSerializedAttribute);
+			}
+			
+			if (fieldDefinition.HasMarshalInfo) {
+				targetEntity.Attributes.Add(ConvertMarshalInfo(fieldDefinition.MarshalInfo));
+			}
+			
+			if (fieldDefinition.HasCustomAttributes) {
+				AddCustomAttributes(fieldDefinition.CustomAttributes, targetEntity.Attributes);
+			}
+		}
+		#endregion
+		
+		#region Event Attributes
+		void AddAttributes(EventDefinition eventDefinition, IUnresolvedEntity targetEntity)
+		{
+			if (eventDefinition.HasCustomAttributes) {
+				AddCustomAttributes(eventDefinition.CustomAttributes, targetEntity.Attributes);
+			}
+		}
+		#endregion
+		
+		#region Property Attributes
+		void AddAttributes(PropertyDefinition propertyDefinition, IUnresolvedEntity targetEntity)
+		{
+			if (propertyDefinition.HasCustomAttributes) {
+				AddCustomAttributes(propertyDefinition.CustomAttributes, targetEntity.Attributes);
+			}
+		}
+		#endregion
+		
+		#region MarshalAsAttribute (ConvertMarshalInfo)
+		static readonly ITypeReference marshalAsAttributeTypeRef = typeof(MarshalAsAttribute).ToTypeReference();
+		static readonly ITypeReference unmanagedTypeTypeRef = typeof(UnmanagedType).ToTypeReference();
+		
+		IUnresolvedAttribute ConvertMarshalInfo(MarshalInfo marshalInfo)
+		{
+			DefaultUnresolvedAttribute attr = new DefaultUnresolvedAttribute(marshalAsAttributeTypeRef, new[] { unmanagedTypeTypeRef });
+			attr.PositionalArguments.Add(CreateSimpleConstantValue(unmanagedTypeTypeRef, (int)marshalInfo.NativeType));
+			
+			FixedArrayMarshalInfo fami = marshalInfo as FixedArrayMarshalInfo;
+			if (fami != null) {
+				attr.AddNamedFieldArgument("SizeConst", CreateSimpleConstantValue(KnownTypeReference.Int32, (int)fami.Size));
+				if (fami.ElementType != NativeType.None)
+					attr.AddNamedFieldArgument("ArraySubType", CreateSimpleConstantValue(unmanagedTypeTypeRef, (int)fami.ElementType));
+			}
+			SafeArrayMarshalInfo sami = marshalInfo as SafeArrayMarshalInfo;
+			if (sami != null && sami.ElementType != VariantType.None) {
+				attr.AddNamedFieldArgument("SafeArraySubType", CreateSimpleConstantValue(typeof(VarEnum).ToTypeReference(), (int)sami.ElementType));
+			}
+			ArrayMarshalInfo ami = marshalInfo as ArrayMarshalInfo;
+			if (ami != null) {
+				if (ami.ElementType != NativeType.Max)
+					attr.AddNamedFieldArgument("ArraySubType", CreateSimpleConstantValue(unmanagedTypeTypeRef, (int)ami.ElementType));
+				if (ami.Size >= 0)
+					attr.AddNamedFieldArgument("SizeConst", CreateSimpleConstantValue(KnownTypeReference.Int32, (int)ami.Size));
+				if (ami.SizeParameterMultiplier != 0 && ami.SizeParameterIndex >= 0)
+					attr.AddNamedFieldArgument("SizeParamIndex", CreateSimpleConstantValue(KnownTypeReference.Int16, (short)ami.SizeParameterIndex));
+			}
+			CustomMarshalInfo cmi = marshalInfo as CustomMarshalInfo;
+			if (cmi != null) {
+				if (cmi.ManagedType != null)
+					attr.AddNamedFieldArgument("MarshalType", CreateSimpleConstantValue(KnownTypeReference.String, cmi.ManagedType.FullName));
+				if (!string.IsNullOrEmpty(cmi.Cookie))
+					attr.AddNamedFieldArgument("MarshalCookie", CreateSimpleConstantValue(KnownTypeReference.String, cmi.Cookie));
+			}
+			FixedSysStringMarshalInfo fssmi = marshalInfo as FixedSysStringMarshalInfo;
+			if (fssmi != null) {
+				attr.AddNamedFieldArgument("SizeConst", CreateSimpleConstantValue(KnownTypeReference.Int32, (int)fssmi.Size));
+			}
+			
+			return InterningProvider.Intern(attr);
+		}
+		#endregion
+		
+		#region Custom Attributes (ReadAttribute)
+		void AddCustomAttributes(Mono.Collections.Generic.Collection<CustomAttribute> attributes, IList<IUnresolvedAttribute> targetCollection)
+		{
+			foreach (var cecilAttribute in attributes) {
+				TypeReference type = cecilAttribute.AttributeType;
+				if (type.Namespace == "System.Runtime.CompilerServices") {
+					if (type.Name == "DynamicAttribute" || type.Name == "ExtensionAttribute" || type.Name == "DecimalConstantAttribute")
+						continue;
+				} else if (type.Name == "ParamArrayAttribute" && type.Namespace == "System") {
+					continue;
+				}
+				targetCollection.Add(ReadAttribute(cecilAttribute));
+			}
+		}
+		
+		[CLSCompliant(false)]
+		public IUnresolvedAttribute ReadAttribute(CustomAttribute attribute)
+		{
+			if (attribute == null)
+				throw new ArgumentNullException("attribute");
+			MethodReference ctor = attribute.Constructor;
+			ITypeReference attributeType = ReadTypeReference(attribute.AttributeType);
+			IList<ITypeReference> ctorParameterTypes = EmptyList<ITypeReference>.Instance;
+			if (ctor.HasParameters) {
+				ctorParameterTypes = new ITypeReference[ctor.Parameters.Count];
+				for (int i = 0; i < ctorParameterTypes.Count; i++) {
+					ctorParameterTypes[i] = ReadTypeReference(ctor.Parameters[i].ParameterType);
+				}
+				ctorParameterTypes = interningProvider.InternList(ctorParameterTypes);
+			}
+			return interningProvider.Intern(new UnresolvedAttributeBlob(attributeType, ctorParameterTypes, attribute.GetBlob()));
+		}
+		#endregion
+		
+		#region Security Attributes
+		/// <summary>
+		/// Reads a security declaration.
+		/// </summary>
+		[CLSCompliant(false)]
+		public IList<IUnresolvedAttribute> ReadSecurityDeclaration(SecurityDeclaration secDecl)
+		{
+			if (secDecl == null)
+				throw new ArgumentNullException("secDecl");
+			var result = new List<IUnresolvedAttribute>();
+			AddSecurityAttributes(secDecl, result);
+			return result;
+		}
+		
+		void AddSecurityAttributes(Mono.Collections.Generic.Collection<SecurityDeclaration> securityDeclarations, IList<IUnresolvedAttribute> targetCollection)
+		{
+			foreach (var secDecl in securityDeclarations) {
+				AddSecurityAttributes(secDecl, targetCollection);
+			}
+		}
+		
+		void AddSecurityAttributes(SecurityDeclaration secDecl, IList<IUnresolvedAttribute> targetCollection)
+		{
+			var blobSecDecl = new UnresolvedSecurityDeclarationBlob((int)secDecl.Action, secDecl.GetBlob());
+			targetCollection.AddRange(blobSecDecl.UnresolvedAttributes);
+		}
+		#endregion
+		#endregion
+		
+		#region Read Type Definition
+		DefaultUnresolvedTypeDefinition CreateTopLevelTypeDefinition(TypeDefinition typeDefinition)
+		{
+			string name = ReflectionHelper.SplitTypeParameterCountFromReflectionName(typeDefinition.Name);
+			var td = new DefaultUnresolvedTypeDefinition(typeDefinition.Namespace, name);
+			if (typeDefinition.HasGenericParameters)
+				InitTypeParameters(typeDefinition, td.TypeParameters);
+			return td;
+		}
+		
+		static void InitTypeParameters(TypeDefinition typeDefinition, IList<IUnresolvedTypeParameter> typeParameters)
+		{
+			// Type parameters are initialized within the constructor so that the class can be put into the type storage
+			// before the rest of the initialization runs - this allows it to be available for early binding as soon as possible.
+			for (int i = 0; i < typeDefinition.GenericParameters.Count; i++) {
+				if (typeDefinition.GenericParameters[i].Position != i)
+					throw new InvalidOperationException("g.Position != i");
+				typeParameters.Add(new DefaultUnresolvedTypeParameter(
+					SymbolKind.TypeDefinition, i, typeDefinition.GenericParameters[i].Name));
+			}
+		}
+		
+		void InitTypeParameterConstraints(TypeDefinition typeDefinition, IList<IUnresolvedTypeParameter> typeParameters)
+		{
+			for (int i = 0; i < typeParameters.Count; i++) {
+				var tp = (DefaultUnresolvedTypeParameter)typeParameters[i];
+				AddConstraints(tp, typeDefinition.GenericParameters[i]);
+				tp.ApplyInterningProvider(interningProvider);
+			}
+		}
+		
+		void InitTypeDefinition(TypeDefinition typeDefinition, DefaultUnresolvedTypeDefinition td)
+		{
+			td.Kind = GetTypeKind(typeDefinition);
+			InitTypeModifiers(typeDefinition, td);
+			InitTypeParameterConstraints(typeDefinition, td.TypeParameters);
+			
+			// nested types can be initialized only after generic parameters were created
+			InitNestedTypes(typeDefinition, td, td.NestedTypes);
+			AddAttributes(typeDefinition, td);
+			td.HasExtensionMethods = HasExtensionAttribute(typeDefinition);
+			
+			InitBaseTypes(typeDefinition, td.BaseTypes);
+			
+			td.AddDefaultConstructorIfRequired = (td.Kind == TypeKind.Struct || td.Kind == TypeKind.Enum);
+			InitMembers(typeDefinition, td, td.Members);
+			td.ApplyInterningProvider(interningProvider);
+			td.Freeze();
+			RegisterCecilObject(td, typeDefinition);
+		}
+		
+		void InitBaseTypes(TypeDefinition typeDefinition, IList<ITypeReference> baseTypes)
+		{
+			// set base classes
+			if (typeDefinition.IsEnum) {
+				foreach (FieldDefinition enumField in typeDefinition.Fields) {
+					if (!enumField.IsStatic) {
+						baseTypes.Add(ReadTypeReference(enumField.FieldType));
+						break;
+					}
+				}
+			} else {
+				if (typeDefinition.BaseType != null) {
+					baseTypes.Add(ReadTypeReference(typeDefinition.BaseType));
+				}
+				if (typeDefinition.HasInterfaces) {
+					foreach (TypeReference iface in typeDefinition.Interfaces) {
+						baseTypes.Add(ReadTypeReference(iface));
+					}
+				}
+			}
+		}
+		
+		void InitNestedTypes(TypeDefinition typeDefinition, IUnresolvedTypeDefinition declaringTypeDefinition, IList<IUnresolvedTypeDefinition> nestedTypes)
+		{
+			if (!typeDefinition.HasNestedTypes)
+				return;
+			foreach (TypeDefinition nestedTypeDef in typeDefinition.NestedTypes) {
+				TypeAttributes visibility = nestedTypeDef.Attributes & TypeAttributes.VisibilityMask;
+				if (this.IncludeInternalMembers
+				    || visibility == TypeAttributes.NestedPublic
+				    || visibility == TypeAttributes.NestedFamily
+				    || visibility == TypeAttributes.NestedFamORAssem)
+				{
+					string name = nestedTypeDef.Name;
+					int pos = name.LastIndexOf('/');
+					if (pos > 0)
+						name = name.Substring(pos + 1);
+					name = ReflectionHelper.SplitTypeParameterCountFromReflectionName(name);
+					var nestedType = new DefaultUnresolvedTypeDefinition(declaringTypeDefinition, name);
+					InitTypeParameters(nestedTypeDef, nestedType.TypeParameters);
+					nestedTypes.Add(nestedType);
+					InitTypeDefinition(nestedTypeDef, nestedType);
+				}
+			}
+		}
+		
+		static TypeKind GetTypeKind(TypeDefinition typeDefinition)
+		{
+			// set classtype
+			if (typeDefinition.IsInterface) {
+				return TypeKind.Interface;
+			} else if (typeDefinition.IsEnum) {
+				return TypeKind.Enum;
+			} else if (typeDefinition.IsValueType) {
+				return TypeKind.Struct;
+			} else if (IsDelegate(typeDefinition)) {
+				return TypeKind.Delegate;
+			} else if (IsModule(typeDefinition)) {
+				return TypeKind.Module;
+			} else {
+				return TypeKind.Class;
+			}
+		}
+		
+		static void InitTypeModifiers(TypeDefinition typeDefinition, AbstractUnresolvedEntity td)
+		{
+			td.IsSealed = typeDefinition.IsSealed;
+			td.IsAbstract = typeDefinition.IsAbstract;
+			switch (typeDefinition.Attributes & TypeAttributes.VisibilityMask) {
+				case TypeAttributes.NotPublic:
+				case TypeAttributes.NestedAssembly:
+					td.Accessibility = Accessibility.Internal;
+					break;
+				case TypeAttributes.Public:
+				case TypeAttributes.NestedPublic:
+					td.Accessibility = Accessibility.Public;
+					break;
+				case TypeAttributes.NestedPrivate:
+					td.Accessibility = Accessibility.Private;
+					break;
+				case TypeAttributes.NestedFamily:
+					td.Accessibility = Accessibility.Protected;
+					break;
+				case TypeAttributes.NestedFamANDAssem:
+					td.Accessibility = Accessibility.ProtectedAndInternal;
+					break;
+				case TypeAttributes.NestedFamORAssem:
+					td.Accessibility = Accessibility.ProtectedOrInternal;
+					break;
+			}
+		}
+		
+		static bool IsDelegate(TypeDefinition type)
+		{
+			if (type.BaseType != null && type.BaseType.Namespace == "System") {
+				if (type.BaseType.Name == "MulticastDelegate")
+					return true;
+				if (type.BaseType.Name == "Delegate" && type.Name != "MulticastDelegate")
+					return true;
+			}
+			return false;
+		}
+		
+		static bool IsModule(TypeDefinition type)
+		{
+			if (!type.HasCustomAttributes)
+				return false;
+			foreach (var att in type.CustomAttributes) {
+				if (att.AttributeType.FullName == "Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute"
+				    || att.AttributeType.FullName == "System.Runtime.CompilerServices.CompilerGlobalScopeAttribute")
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+		
+		void InitMembers(TypeDefinition typeDefinition, IUnresolvedTypeDefinition td, IList<IUnresolvedMember> members)
+		{
+			if (typeDefinition.HasMethods) {
+				foreach (MethodDefinition method in typeDefinition.Methods) {
+					if (IsVisible(method.Attributes) && !IsAccessor(method.SemanticsAttributes)) {
+						SymbolKind type = SymbolKind.Method;
+						if (method.IsSpecialName) {
+							if (method.IsConstructor)
+								type = SymbolKind.Constructor;
+							else if (method.Name.StartsWith("op_", StringComparison.Ordinal))
+								type = SymbolKind.Operator;
+						}
+						members.Add(ReadMethod(method, td, type));
+					}
+				}
+			}
+			if (typeDefinition.HasFields) {
+				foreach (FieldDefinition field in typeDefinition.Fields) {
+					if (IsVisible(field.Attributes) && !field.IsSpecialName) {
+						members.Add(ReadField(field, td));
+					}
+				}
+			}
+			if (typeDefinition.HasProperties) {
+				string defaultMemberName = null;
+				var defaultMemberAttribute = typeDefinition.CustomAttributes.FirstOrDefault(
+					a => a.AttributeType.FullName == typeof(System.Reflection.DefaultMemberAttribute).FullName);
+				if (defaultMemberAttribute != null && defaultMemberAttribute.ConstructorArguments.Count == 1) {
+					defaultMemberName = defaultMemberAttribute.ConstructorArguments[0].Value as string;
+				}
+				foreach (PropertyDefinition property in typeDefinition.Properties) {
+					bool getterVisible = property.GetMethod != null && IsVisible(property.GetMethod.Attributes);
+					bool setterVisible = property.SetMethod != null && IsVisible(property.SetMethod.Attributes);
+					if (getterVisible || setterVisible) {
+						SymbolKind type = SymbolKind.Property;
+						if (property.HasParameters) {
+							// Try to detect indexer:
+							if (property.Name == defaultMemberName) {
+								type = SymbolKind.Indexer; // normal indexer
+							} else if (property.Name.EndsWith(".Item", StringComparison.Ordinal) && (property.GetMethod ?? property.SetMethod).HasOverrides) {
+								// explicit interface implementation of indexer
+								type = SymbolKind.Indexer;
+								// We can't really tell parameterized properties and indexers apart in this case without
+								// resolving the interface, so we rely on the "Item" naming convention instead.
+							}
+						}
+						members.Add(ReadProperty(property, td, type));
+					}
+				}
+			}
+			if (typeDefinition.HasEvents) {
+				foreach (EventDefinition ev in typeDefinition.Events) {
+					if (ev.AddMethod != null && IsVisible(ev.AddMethod.Attributes)) {
+						members.Add(ReadEvent(ev, td));
+					}
+				}
+			}
+		}
+		
+		static bool IsAccessor(MethodSemanticsAttributes semantics)
+		{
+			return !(semantics == MethodSemanticsAttributes.None || semantics == MethodSemanticsAttributes.Other);
+		}
+		#endregion
+		
+		#region Lazy-Loaded Type Definition
+		/// <summary>
+		/// Given an assembly that was created by the CecilLoader with lazy-loading enabled,
+		/// this method will eagerly load all classes, and free any references to the source Cecil objects.
+		/// 
+		/// The intended usage pattern for this method is:
+		/// 1. use lazy-loading to improve the latency when new assemblies have to be loaded
+		/// 2. later, when the CPU is idle, call FinishLazyLoading() to free up the memory consumed by the Cecil objects
+		/// </summary>
+		public static void FinishLazyLoading(IUnresolvedAssembly assembly)
+		{
+			if (assembly == null)
+				throw new ArgumentNullException("assembly");
+			foreach (var type in assembly.TopLevelTypeDefinitions) {
+				var lctd = type as LazyCecilTypeDefinition;
+				if (lctd != null)
+					lctd.InitAndReleaseReferences();
+			}
+		}
+		
+		sealed class LazyCecilTypeDefinition : AbstractUnresolvedEntity, IUnresolvedTypeDefinition
+		{
+			// loader + cecilTypeDef, used for lazy-loading; and set to null after lazy loading is complete
+			CecilLoader loader;
+			TypeDefinition cecilTypeDef;
+			
+			readonly string namespaceName;
+			readonly TypeKind kind;
+			readonly IList<IUnresolvedTypeParameter> typeParameters;
+			
+			// lazy-loaded fields
+			IList<ITypeReference> baseTypes;
+			IList<IUnresolvedTypeDefinition> nestedTypes;
+			IList<IUnresolvedMember> members;
+			
+			public LazyCecilTypeDefinition(CecilLoader loader, TypeDefinition typeDefinition)
+			{
+				this.loader = loader;
+				this.cecilTypeDef = typeDefinition;
+				this.SymbolKind = SymbolKind.TypeDefinition;
+				this.namespaceName = typeDefinition.Namespace;
+				this.Name = ReflectionHelper.SplitTypeParameterCountFromReflectionName(typeDefinition.Name);
+				var tps = new List<IUnresolvedTypeParameter>();
+				InitTypeParameters(typeDefinition, tps);
+				this.typeParameters = FreezableHelper.FreezeList(tps);
+				
+				this.kind = GetTypeKind(typeDefinition);
+				InitTypeModifiers(typeDefinition, this);
+				loader.InitTypeParameterConstraints(typeDefinition, typeParameters);
+				
+				loader.AddAttributes(typeDefinition, this);
+				flags[FlagHasExtensionMethods] = HasExtensionAttribute(typeDefinition);
+				
+				this.ApplyInterningProvider(loader.interningProvider);
+				this.Freeze();
+			}
+			
+			public override string Namespace {
+				get { return namespaceName; }
+				set { throw new NotSupportedException(); }
+			}
+			
+			public override string ReflectionName {
+				get { return this.FullTypeName.ReflectionName; }
+			}
+			
+			public FullTypeName FullTypeName {
+				get {
+					return new TopLevelTypeName(namespaceName, this.Name, typeParameters.Count);
+				}
+			}
+			
+			public TypeKind Kind {
+				get { return kind; }
+			}
+			
+			public IList<IUnresolvedTypeParameter> TypeParameters {
+				get { return typeParameters; }
+			}
+			
+			public IList<ITypeReference> BaseTypes {
+				get {
+					var result = LazyInit.VolatileRead(ref this.baseTypes);
+					if (result != null) {
+						return result;
+					} else {
+						return LazyInit.GetOrSet(ref this.baseTypes, TryInitBaseTypes());
+					}
+				}
+			}
+			
+			IList<ITypeReference> TryInitBaseTypes()
+			{
+				var loader = LazyInit.VolatileRead(ref this.loader);
+				var cecilTypeDef = LazyInit.VolatileRead(ref this.cecilTypeDef);
+				if (loader == null || cecilTypeDef == null) {
+					// Cannot initialize because the references to loader/cecilTypeDef
+					// have already been cleared.
+					// This can only happen if the class was loaded by another thread concurrently to the TryInitBaseTypes() call,
+					// so the GetOrSet() call in the property will retrieve the value set by the other thread.
+					return null;
+				}
+				lock (loader.currentModule) {
+					var result = new List<ITypeReference>();
+					loader.InitBaseTypes(cecilTypeDef, result);
+					return FreezableHelper.FreezeList(result);
+				}
+			}
+			
+			public IList<IUnresolvedTypeDefinition> NestedTypes {
+				get {
+					var result = LazyInit.VolatileRead(ref this.nestedTypes);
+					if (result != null) {
+						return result;
+					} else {
+						return LazyInit.GetOrSet(ref this.nestedTypes, TryInitNestedTypes());
+					}
+				}
+			}
+			
+			IList<IUnresolvedTypeDefinition> TryInitNestedTypes()
+			{
+				var loader = LazyInit.VolatileRead(ref this.loader);
+				var cecilTypeDef = LazyInit.VolatileRead(ref this.cecilTypeDef);
+				if (loader == null || cecilTypeDef == null) {
+					// Cannot initialize because the references to loader/cecilTypeDef
+					// have already been cleared.
+					// This can only happen if the class was loaded by another thread concurrently to the TryInitNestedTypes() call,
+					// so the GetOrSet() call in the property will retrieve the value set by the other thread.
+					return null;
+				}
+				lock (loader.currentModule) {
+					var result = new List<IUnresolvedTypeDefinition>();
+					loader.InitNestedTypes(cecilTypeDef, this, result);
+					return FreezableHelper.FreezeList(result);
+				}
+			}
+			
+			public IList<IUnresolvedMember> Members {
+				get {
+					var result = LazyInit.VolatileRead(ref this.members);
+					if (result != null) {
+						return result;
+					} else {
+						return LazyInit.GetOrSet(ref this.members, TryInitMembers());
+					}
+				}
+			}
+			
+			IList<IUnresolvedMember> TryInitMembers()
+			{
+				var loader = LazyInit.VolatileRead(ref this.loader);
+				var cecilTypeDef = LazyInit.VolatileRead(ref this.cecilTypeDef);
+				if (loader == null || cecilTypeDef == null) {
+					// Cannot initialize because the references to loader/cecilTypeDef
+					// have already been cleared.
+					// This can only happen if the class was loaded by another thread concurrently to the TryInitMembers() call,
+					// so the GetOrSet() call in the property will retrieve the value set by the other thread.
+					return null;
+				}
+				lock (loader.currentModule) {
+					if (this.members != null)
+						return this.members;
+					var result = new List<IUnresolvedMember>();
+					loader.InitMembers(cecilTypeDef, this, result);
+					return FreezableHelper.FreezeList(result);
+				}
+			}
+			
+			public void InitAndReleaseReferences()
+			{
+				if (LazyInit.VolatileRead(ref this.baseTypes) == null)
+					LazyInit.GetOrSet(ref this.baseTypes, TryInitBaseTypes());
+				if (LazyInit.VolatileRead(ref this.nestedTypes) == null)
+					LazyInit.GetOrSet(ref this.nestedTypes, TryInitNestedTypes());
+				if (LazyInit.VolatileRead(ref this.members) == null)
+					LazyInit.GetOrSet(ref this.members, TryInitMembers());
+				Thread.MemoryBarrier(); // commit lazily-initialized fields to memory before nulling out the references
+				// Allow the GC to collect the cecil type definition
+				loader = null;
+				cecilTypeDef = null;
+			}
+			
+			public IEnumerable<IUnresolvedMethod> Methods {
+				get { return Members.OfType<IUnresolvedMethod>(); }
+			}
+			
+			public IEnumerable<IUnresolvedProperty> Properties {
+				get { return Members.OfType<IUnresolvedProperty>(); }
+			}
+			
+			public IEnumerable<IUnresolvedField> Fields {
+				get { return Members.OfType<IUnresolvedField>(); }
+			}
+			
+			public IEnumerable<IUnresolvedEvent> Events {
+				get { return Members.OfType<IUnresolvedEvent>(); }
+			}
+			
+			public bool AddDefaultConstructorIfRequired {
+				get { return kind == TypeKind.Struct || kind == TypeKind.Enum; }
+			}
+			
+			public bool? HasExtensionMethods {
+				get { return flags[FlagHasExtensionMethods]; }
+				// we always return true or false, never null.
+				// FlagHasNoExtensionMethods is unused in LazyCecilTypeDefinition
+			}
+			
+			public override object Clone()
+			{
+				throw new NotSupportedException();
+			}
+			
+			public IType Resolve(ITypeResolveContext context)
+			{
+				if (context == null)
+					throw new ArgumentNullException("context");
+				if (context.CurrentAssembly == null)
+					throw new ArgumentException("An ITypeDefinition cannot be resolved in a context without a current assembly.");
+				return context.CurrentAssembly.GetTypeDefinition(this.FullTypeName)
+					?? (IType)new UnknownType(this.Namespace, this.Name, this.TypeParameters.Count);
+			}
+			
+			public ITypeResolveContext CreateResolveContext(ITypeResolveContext parentContext)
+			{
+				return parentContext;
+			}
+		}
+		#endregion
+		
+		#region Read Method
+		[CLSCompliant(false)]
+		public IUnresolvedMethod ReadMethod(MethodDefinition method, IUnresolvedTypeDefinition parentType, SymbolKind methodType = SymbolKind.Method)
+		{
+			return ReadMethod(method, parentType, methodType, null);
+		}
+		
+		IUnresolvedMethod ReadMethod(MethodDefinition method, IUnresolvedTypeDefinition parentType, SymbolKind methodType, IUnresolvedMember accessorOwner)
+		{
+			if (method == null)
+				return null;
+			DefaultUnresolvedMethod m = new DefaultUnresolvedMethod(parentType, method.Name);
+			m.SymbolKind = methodType;
+			m.AccessorOwner = accessorOwner;
+			m.HasBody = method.HasBody;
+			if (method.HasGenericParameters) {
+				for (int i = 0; i < method.GenericParameters.Count; i++) {
+					if (method.GenericParameters[i].Position != i)
+						throw new InvalidOperationException("g.Position != i");
+					m.TypeParameters.Add(new DefaultUnresolvedTypeParameter(
+						SymbolKind.Method, i, method.GenericParameters[i].Name));
+				}
+				for (int i = 0; i < method.GenericParameters.Count; i++) {
+					var tp = (DefaultUnresolvedTypeParameter)m.TypeParameters[i];
+					AddConstraints(tp, method.GenericParameters[i]);
+					tp.ApplyInterningProvider(interningProvider);
+				}
+			}
+			
+			m.ReturnType = ReadTypeReference(method.ReturnType, typeAttributes: method.MethodReturnType);
+			
+			if (HasAnyAttributes(method))
+				AddAttributes(method, m.Attributes, m.ReturnTypeAttributes);
+			TranslateModifiers(method, m);
+			
+			if (method.HasParameters) {
+				foreach (ParameterDefinition p in method.Parameters) {
+					m.Parameters.Add(ReadParameter(p));
+				}
+			}
+			
+			// mark as extension method if the attribute is set
+			if (method.IsStatic && HasExtensionAttribute(method)) {
+				m.IsExtensionMethod = true;
+			}
+
+			int lastDot = method.Name.LastIndexOf('.');
+			if (lastDot >= 0 && method.HasOverrides) {
+				// To be consistent with the parser-initialized type system, shorten the method name:
+				m.Name = method.Name.Substring(lastDot + 1);
+				m.IsExplicitInterfaceImplementation = true;
+				foreach (var or in method.Overrides) {
+					m.ExplicitInterfaceImplementations.Add(new DefaultMemberReference(
+						accessorOwner != null ? SymbolKind.Accessor : SymbolKind.Method,
+						ReadTypeReference(or.DeclaringType),
+						or.Name, or.GenericParameters.Count, m.Parameters.Select(p => p.Type).ToList()));
+				}
+			}
+
+			FinishReadMember(m, method);
+			return m;
+		}
+		
+		static bool HasExtensionAttribute(ICustomAttributeProvider provider)
+		{
+			if (provider.HasCustomAttributes) {
+				foreach (var attr in provider.CustomAttributes) {
+					if (attr.AttributeType.Name == "ExtensionAttribute" && attr.AttributeType.Namespace == "System.Runtime.CompilerServices")
+						return true;
+				}
+			}
+			return false;
+		}
+		
+		bool IsVisible(MethodAttributes att)
+		{
+			att &= MethodAttributes.MemberAccessMask;
+			return IncludeInternalMembers
+				|| att == MethodAttributes.Public
+				|| att == MethodAttributes.Family
+				|| att == MethodAttributes.FamORAssem;
+		}
+		
+		static Accessibility GetAccessibility(MethodAttributes attr)
+		{
+			switch (attr & MethodAttributes.MemberAccessMask) {
+				case MethodAttributes.Public:
+					return Accessibility.Public;
+				case MethodAttributes.FamANDAssem:
+					return Accessibility.ProtectedAndInternal;
+				case MethodAttributes.Assembly:
+					return Accessibility.Internal;
+				case MethodAttributes.Family:
+					return Accessibility.Protected;
+				case MethodAttributes.FamORAssem:
+					return Accessibility.ProtectedOrInternal;
+				default:
+					return Accessibility.Private;
+			}
+		}
+		
+		void TranslateModifiers(MethodDefinition method, AbstractUnresolvedMember m)
+		{
+			if (m.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
+				// interface members don't have modifiers, but we want to handle them as "public abstract"
+				m.Accessibility = Accessibility.Public;
+				m.IsAbstract = true;
+			} else {
+				m.Accessibility = GetAccessibility(method.Attributes);
+				if (method.IsAbstract) {
+					m.IsAbstract = true;
+					m.IsOverride = !method.IsNewSlot;
+				} else if (method.IsFinal) {
+					if (!method.IsNewSlot) {
+						m.IsSealed = true;
+						m.IsOverride = true;
+					}
+				} else if (method.IsVirtual) {
+					if (method.IsNewSlot)
+						m.IsVirtual = true;
+					else
+						m.IsOverride = true;
+				}
+				m.IsStatic = method.IsStatic;
+			}
+		}
+		#endregion
+		
+		#region Read Parameter
+		[CLSCompliant(false)]
+		public IUnresolvedParameter ReadParameter(ParameterDefinition parameter)
+		{
+			if (parameter == null)
+				throw new ArgumentNullException("parameter");
+			var type = ReadTypeReference(parameter.ParameterType, typeAttributes: parameter);
+			var p = new DefaultUnresolvedParameter(type, interningProvider.Intern(parameter.Name));
+			
+			if (parameter.ParameterType is Mono.Cecil.ByReferenceType) {
+				if (!parameter.IsIn && parameter.IsOut)
+					p.IsOut = true;
+				else
+					p.IsRef = true;
+			}
+			AddAttributes(parameter, p);
+			
+			if (parameter.IsOptional) {
+				p.DefaultValue = CreateSimpleConstantValue(type, parameter.Constant);
+			}
+			
+			if (parameter.ParameterType is Mono.Cecil.ArrayType) {
+				foreach (CustomAttribute att in parameter.CustomAttributes) {
+					if (att.AttributeType.FullName == typeof(ParamArrayAttribute).FullName) {
+						p.IsParams = true;
+						break;
+					}
+				}
+			}
+			
+			return interningProvider.Intern(p);
+		}
+		#endregion
+		
+		#region Read Field
+		bool IsVisible(FieldAttributes att)
+		{
+			att &= FieldAttributes.FieldAccessMask;
+			return IncludeInternalMembers
+				|| att == FieldAttributes.Public
+				|| att == FieldAttributes.Family
+				|| att == FieldAttributes.FamORAssem;
+		}
+
+		decimal? TryDecodeDecimalConstantAttribute(CustomAttribute attribute)
+		{
+			if (attribute.ConstructorArguments.Count != 5)
+				return null;
+
+			BlobReader reader = new BlobReader(attribute.GetBlob(), null);
+			if (reader.ReadUInt16() != 0x0001) {
+				Debug.WriteLine("Unknown blob prolog");
+				return null;
+			}
+
+			// DecimalConstantAttribute has the arguments (byte scale, byte sign, uint hi, uint mid, uint low) or (byte scale, byte sign, int hi, int mid, int low)
+			// Both of these invoke the Decimal constructor (int lo, int mid, int hi, bool isNegative, byte scale) with explicit argument conversions if required.
+			var ctorArgs = new object[attribute.ConstructorArguments.Count];
+			for (int i = 0; i < ctorArgs.Length; i++) {
+				switch (attribute.ConstructorArguments[i].Type.FullName) {
+					case "System.Byte":
+						ctorArgs[i] = reader.ReadByte();
+						break;
+					case "System.Int32":
+						ctorArgs[i] = reader.ReadInt32();
+						break;
+					case "System.UInt32":
+						ctorArgs[i] = unchecked((int)reader.ReadUInt32());
+						break;
+					default:
+						return null;
+				}
+			}
+
+			if (!ctorArgs.Select(a => a.GetType()).SequenceEqual(new[] { typeof(byte), typeof(byte), typeof(int), typeof(int), typeof(int) }))
+				return null;
+
+			return new decimal((int)ctorArgs[4], (int)ctorArgs[3], (int)ctorArgs[2], (byte)ctorArgs[1] != 0, (byte)ctorArgs[0]);
+		}
+		
+		[CLSCompliant(false)]
+		public IUnresolvedField ReadField(FieldDefinition field, IUnresolvedTypeDefinition parentType)
+		{
+			if (field == null)
+				throw new ArgumentNullException("field");
+			if (parentType == null)
+				throw new ArgumentNullException("parentType");
+			
+			DefaultUnresolvedField f = new DefaultUnresolvedField(parentType, field.Name);
+			f.Accessibility = GetAccessibility(field.Attributes);
+			f.IsReadOnly = field.IsInitOnly;
+			f.IsStatic = field.IsStatic;
+			f.ReturnType = ReadTypeReference(field.FieldType, typeAttributes: field);
+			if (field.HasConstant) {
+				f.ConstantValue = CreateSimpleConstantValue(f.ReturnType, field.Constant);
+			}
+			else {
+				var decConstant = field.CustomAttributes.FirstOrDefault(a => a.AttributeType.FullName == "System.Runtime.CompilerServices.DecimalConstantAttribute");
+				if (decConstant != null) {
+					var constValue = TryDecodeDecimalConstantAttribute(decConstant);
+					if (constValue != null)
+						f.ConstantValue = CreateSimpleConstantValue(f.ReturnType, constValue);
+				}
+			}
+			AddAttributes(field, f);
+			
+			RequiredModifierType modreq = field.FieldType as RequiredModifierType;
+			if (modreq != null && modreq.ModifierType.FullName == typeof(IsVolatile).FullName) {
+				f.IsVolatile = true;
+			}
+			
+			FinishReadMember(f, field);
+			return f;
+		}
+		
+		static Accessibility GetAccessibility(FieldAttributes attr)
+		{
+			switch (attr & FieldAttributes.FieldAccessMask) {
+				case FieldAttributes.Public:
+					return Accessibility.Public;
+				case FieldAttributes.FamANDAssem:
+					return Accessibility.ProtectedAndInternal;
+				case FieldAttributes.Assembly:
+					return Accessibility.Internal;
+				case FieldAttributes.Family:
+					return Accessibility.Protected;
+				case FieldAttributes.FamORAssem:
+					return Accessibility.ProtectedOrInternal;
+				default:
+					return Accessibility.Private;
+			}
+		}
+		#endregion
+		
+		#region Type Parameter Constraints
+		void AddConstraints(DefaultUnresolvedTypeParameter tp, GenericParameter g)
+		{
+			switch (g.Attributes & GenericParameterAttributes.VarianceMask) {
+				case GenericParameterAttributes.Contravariant:
+					tp.Variance = VarianceModifier.Contravariant;
+					break;
+				case GenericParameterAttributes.Covariant:
+					tp.Variance = VarianceModifier.Covariant;
+					break;
+			}
+			
+			tp.HasReferenceTypeConstraint = g.HasReferenceTypeConstraint;
+			tp.HasValueTypeConstraint = g.HasNotNullableValueTypeConstraint;
+			tp.HasDefaultConstructorConstraint = g.HasDefaultConstructorConstraint;
+			
+			if (g.HasConstraints) {
+				foreach (TypeReference constraint in g.Constraints) {
+					tp.Constraints.Add(ReadTypeReference(constraint));
+				}
+			}
+		}
+		#endregion
+		
+		#region Read Property
+
+		Accessibility MergePropertyAccessibility (Accessibility left, Accessibility right)
+		{
+			if (left == Accessibility.Public || right == Accessibility.Public)
+				return Accessibility.Public;
+
+			if (left == Accessibility.ProtectedOrInternal || right == Accessibility.ProtectedOrInternal)
+				return Accessibility.ProtectedOrInternal;
+
+			if (left == Accessibility.Protected && right == Accessibility.Internal ||
+			    left == Accessibility.Internal && right == Accessibility.Protected)
+				return Accessibility.ProtectedOrInternal;
+
+			if (left == Accessibility.Protected || right == Accessibility.Protected)
+				return Accessibility.Protected;
+
+			if (left == Accessibility.Internal || right == Accessibility.Internal)
+				return Accessibility.Internal;
+
+			if (left == Accessibility.ProtectedAndInternal || right == Accessibility.ProtectedAndInternal)
+				return Accessibility.ProtectedAndInternal;
+
+			return left;
+		}
+
+		[CLSCompliant(false)]
+		public IUnresolvedProperty ReadProperty(PropertyDefinition property, IUnresolvedTypeDefinition parentType, SymbolKind propertyType = SymbolKind.Property)
+		{
+			if (property == null)
+				throw new ArgumentNullException("property");
+			if (parentType == null)
+				throw new ArgumentNullException("parentType");
+			DefaultUnresolvedProperty p = new DefaultUnresolvedProperty(parentType, property.Name);
+			p.SymbolKind = propertyType;
+			TranslateModifiers(property.GetMethod ?? property.SetMethod, p);
+			if (property.GetMethod != null && property.SetMethod != null)
+				p.Accessibility = MergePropertyAccessibility (GetAccessibility (property.GetMethod.Attributes), GetAccessibility (property.SetMethod.Attributes));
+
+			p.ReturnType = ReadTypeReference(property.PropertyType, typeAttributes: property);
+			
+			p.Getter = ReadMethod(property.GetMethod, parentType, SymbolKind.Accessor, p);
+			p.Setter = ReadMethod(property.SetMethod, parentType, SymbolKind.Accessor, p);
+			
+			if (property.HasParameters) {
+				foreach (ParameterDefinition par in property.Parameters) {
+					p.Parameters.Add(ReadParameter(par));
+				}
+			}
+			AddAttributes(property, p);
+
+			var accessor = p.Getter ?? p.Setter;
+			if (accessor != null && accessor.IsExplicitInterfaceImplementation) {
+				p.Name = property.Name.Substring(property.Name.LastIndexOf('.') + 1);
+				p.IsExplicitInterfaceImplementation = true;
+				foreach (var mr in accessor.ExplicitInterfaceImplementations) {
+					p.ExplicitInterfaceImplementations.Add(new AccessorOwnerMemberReference(mr));
+				}
+			}
+
+			FinishReadMember(p, property);
+			return p;
+		}
+		#endregion
+		
+		#region Read Event
+		[CLSCompliant(false)]
+		public IUnresolvedEvent ReadEvent(EventDefinition ev, IUnresolvedTypeDefinition parentType)
+		{
+			if (ev == null)
+				throw new ArgumentNullException("ev");
+			if (parentType == null)
+				throw new ArgumentNullException("parentType");
+			
+			DefaultUnresolvedEvent e = new DefaultUnresolvedEvent(parentType, ev.Name);
+			TranslateModifiers(ev.AddMethod, e);
+			e.ReturnType = ReadTypeReference(ev.EventType, typeAttributes: ev);
+			
+			e.AddAccessor    = ReadMethod(ev.AddMethod,    parentType, SymbolKind.Accessor, e);
+			e.RemoveAccessor = ReadMethod(ev.RemoveMethod, parentType, SymbolKind.Accessor, e);
+			e.InvokeAccessor = ReadMethod(ev.InvokeMethod, parentType, SymbolKind.Accessor, e);
+			
+			AddAttributes(ev, e);
+			
+			var accessor = e.AddAccessor ?? e.RemoveAccessor ?? e.InvokeAccessor;
+			if (accessor != null && accessor.IsExplicitInterfaceImplementation) {
+				e.Name = ev.Name.Substring(ev.Name.LastIndexOf('.') + 1);
+				e.IsExplicitInterfaceImplementation = true;
+				foreach (var mr in accessor.ExplicitInterfaceImplementations) {
+					e.ExplicitInterfaceImplementations.Add(new AccessorOwnerMemberReference(mr));
+				}
+			}
+
+			FinishReadMember(e, ev);
+			
+			return e;
+		}
+		#endregion
+		
+		#region FinishReadMember / Interning
+		void FinishReadMember(AbstractUnresolvedMember member, MemberReference cecilDefinition)
+		{
+			member.ApplyInterningProvider(interningProvider);
+			member.Freeze();
+			RegisterCecilObject(member, cecilDefinition);
+		}
+		#endregion
+		
+		#region Type system translation table
+		readonly Dictionary<object, object> typeSystemTranslationTable;
+		
+		void RegisterCecilObject(IUnresolvedEntity typeSystemObject, MemberReference cecilObject)
+		{
+			if (OnEntityLoaded != null)
+				OnEntityLoaded(typeSystemObject, cecilObject);
+			
+			AddToTypeSystemTranslationTable(typeSystemObject, cecilObject);
+		}
+		
+		void AddToTypeSystemTranslationTable(object typeSystemObject, object cecilObject)
+		{
+			if (typeSystemTranslationTable != null) {
+				// When lazy-loading, the dictionary might be shared between multiple cecil-loaders that are used concurrently
+				lock (typeSystemTranslationTable) {
+					typeSystemTranslationTable[typeSystemObject] = cecilObject;
+				}
+			}
+		}
+		
+		T InternalGetCecilObject<T> (object typeSystemObject) where T : class
+		{
+			if (typeSystemObject == null)
+				throw new ArgumentNullException ("typeSystemObject");
+			if (!HasCecilReferences)
+				throw new NotSupportedException ("This instance contains no cecil references.");
+			object result;
+			lock (typeSystemTranslationTable) {
+				if (!typeSystemTranslationTable.TryGetValue (typeSystemObject, out result))
+					return null;
+			}
+			return result as T;
+		}
+		
+		[CLSCompliant(false)]
+		public AssemblyDefinition GetCecilObject (IUnresolvedAssembly content)
+		{
+			return InternalGetCecilObject<AssemblyDefinition> (content);
+		}
+		
+		[CLSCompliant(false)]
+		public TypeDefinition GetCecilObject (IUnresolvedTypeDefinition type)
+		{
+			if (type == null)
+				throw new ArgumentNullException ("type");
+			return InternalGetCecilObject<TypeDefinition> (type);
+		}
+		
+		[CLSCompliant(false)]
+		public MethodDefinition GetCecilObject (IUnresolvedMethod method)
+		{
+			return InternalGetCecilObject<MethodDefinition> (method);
+		}
+		
+		[CLSCompliant(false)]
+		public FieldDefinition GetCecilObject (IUnresolvedField field)
+		{
+			return InternalGetCecilObject<FieldDefinition> (field);
+		}
+		
+		[CLSCompliant(false)]
+		public EventDefinition GetCecilObject (IUnresolvedEvent evt)
+		{
+			return InternalGetCecilObject<EventDefinition> (evt);
+		}
+		
+		[CLSCompliant(false)]
+		public PropertyDefinition GetCecilObject (IUnresolvedProperty property)
+		{
+			return InternalGetCecilObject<PropertyDefinition> (property);
+		}
+		#endregion
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
new file mode 100644
index 0000000000..c9ca4bb4b7
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>ICSharpCode.NRefactory.Cecil</RootNamespace>
+    <AssemblyName>ICSharpCode.NRefactory.Cecil</AssemblyName>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\ICSharpCode.NRefactory.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
+      <Link>Properties\GlobalAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="CecilLoader.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
+      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
+      <Name>ICSharpCode.NRefactory</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\cecil\Mono.Cecil.csproj">
+      <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
+      <Name>Mono.Cecil</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Cecil/Properties/AssemblyInfo.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Cecil/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..ccb27b40bf
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Cecil/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+//
+// AssemblyInfo.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Reflection;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("ICSharpCode.NRefactory.Cecil")]
+[assembly: AssemblyDescription("Cecil Assembly Loader for NRefactory")]
+
+[assembly: CLSCompliant(true)]
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/ICSharpCode.NRefactory.ConsistencyCheck.csproj b/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/ICSharpCode.NRefactory.ConsistencyCheck.csproj
index 8036b4adfb..c26c292526 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/ICSharpCode.NRefactory.ConsistencyCheck.csproj
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/ICSharpCode.NRefactory.ConsistencyCheck.csproj
@@ -1,137 +1,141 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <PropertyGroup>
-    <ProjectGuid>{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>ICSharpCode.NRefactory.ConsistencyCheck</RootNamespace>
-    <AssemblyName>ICSharpCode.NRefactory.ConsistencyCheck</AssemblyName>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <NoStdLib>False</NoStdLib>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <Optimize>False</Optimize>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugType>PdbOnly</DebugType>
-    <Optimize>True</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Debug' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <Optimize>False</Optimize>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Release' ">
-    <DebugType>PdbOnly</DebugType>
-    <Optimize>True</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>TRACE</DefineConstants>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|x86' ">
-    <OutputPath>bin\net_4_5_Debug\</OutputPath>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|x86' ">
-    <OutputPath>bin\net_4_5_Release\</OutputPath>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Build" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="CSharpFile.cs" />
-    <Compile Include="CSharpProject.cs" />
-    <Compile Include="FindReferencesConsistencyCheck.cs" />
-    <Compile Include="PatternMatchingTest.cs" />
-    <Compile Include="TypeSystemTests.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RandomizedOrderResolverTest.cs" />
-    <Compile Include="ResolverTest.cs" />
-    <Compile Include="RoundtripTest.cs" />
-    <Compile Include="Solution.cs" />
-    <Compile Include="VisitorBenchmark.cs" />
-    <Compile Include="Xml\IncrementalXmlParserTests.cs" />
-    <Compile Include="Xml\XmlReaderTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="Readme.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
-      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
-      <Name>ICSharpCode.NRefactory.CSharp</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\ICSharpCode.NRefactory.Xml\ICSharpCode.NRefactory.Xml.csproj">
-      <Project>{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}</Project>
-      <Name>ICSharpCode.NRefactory.Xml</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <PropertyGroup>
+    <ProjectGuid>{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ICSharpCode.NRefactory.ConsistencyCheck</RootNamespace>
+    <AssemblyName>ICSharpCode.NRefactory.ConsistencyCheck</AssemblyName>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <NoStdLib>False</NoStdLib>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>Full</DebugType>
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Debug' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>Full</DebugType>
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Release' ">
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE</DefineConstants>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|x86' ">
+    <OutputPath>bin\net_4_5_Debug\</OutputPath>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|x86' ">
+    <OutputPath>bin\net_4_5_Release\</OutputPath>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Build" />
+    <Reference Include="Microsoft.Build.Framework" />
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
+      <Link>Properties\GlobalAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="CSharpFile.cs" />
+    <Compile Include="CSharpProject.cs" />
+    <Compile Include="FindReferencesConsistencyCheck.cs" />
+    <Compile Include="PatternMatchingTest.cs" />
+    <Compile Include="TypeSystemTests.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RandomizedOrderResolverTest.cs" />
+    <Compile Include="ResolverTest.cs" />
+    <Compile Include="RoundtripTest.cs" />
+    <Compile Include="Solution.cs" />
+    <Compile Include="VisitorBenchmark.cs" />
+    <Compile Include="Xml\IncrementalXmlParserTests.cs" />
+    <Compile Include="Xml\XmlReaderTest.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="Readme.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
+      <Project>{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}</Project>
+      <Name>ICSharpCode.NRefactory.Cecil</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
+      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
+      <Name>ICSharpCode.NRefactory.CSharp</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.NRefactory.Xml\ICSharpCode.NRefactory.Xml.csproj">
+      <Project>{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}</Project>
+      <Name>ICSharpCode.NRefactory.Xml</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
+      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
+      <Name>ICSharpCode.NRefactory</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/PatternMatchingTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/PatternMatchingTest.cs
index 5ffa12521a..ea3653563e 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/PatternMatchingTest.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/PatternMatchingTest.cs
@@ -54,6 +54,8 @@ namespace ICSharpCode.NRefactory.ConsistencyCheck
 			}
 			// Mutate primitive values:
 			foreach (var pe in copy.Descendants.OfType<PrimitiveExpression>()) {
+				if (pe.Ancestors.Any(a => a is PreProcessorDirective))
+					continue;
 				object oldVal = pe.Value;
 				pe.Value = "Mutated " + "Value";
 				if (copy.IsMatch(file.SyntaxTree))
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/ResolverTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/ResolverTest.cs
index 19fe6a36b5..1c6f16c619 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/ResolverTest.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/ResolverTest.cs
@@ -92,7 +92,9 @@ namespace ICSharpCode.NRefactory.ConsistencyCheck
 			{
 				foreach (AstNode node in syntaxTree.DescendantsAndSelf.Except(resolvedNodes.Keys)) {
 					if (!CSharpAstResolver.IsUnresolvableNode(node)) {
-						Console.WriteLine("Forgot to resolve " + node);
+						if (!node.Ancestors.Any(a => a is PreProcessorDirective)) {
+							Console.WriteLine("Forgot to resolve " + node);
+						}
 					}
 				}
 				foreach (var pair in resolvedNodes) {
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/Solution.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/Solution.cs
index 633a696694..ef249dd602 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/Solution.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/Solution.cs
@@ -82,7 +82,7 @@ namespace ICSharpCode.NRefactory.ConsistencyCheck
 		/// </summary>
 		public IUnresolvedAssembly LoadAssembly(string assemblyFileName)
 		{
-			return assemblyDict.GetOrAdd(assemblyFileName, file => new CecilLoader().LoadAssemblyFile(file));
+			return assemblyDict.GetOrAdd(assemblyFileName, file => AssemblyLoader.Create().LoadAssemblyFile(file));
 		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/Xml/IncrementalXmlParserTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/Xml/IncrementalXmlParserTests.cs
index dcd7367ec9..a30d00b21b 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/Xml/IncrementalXmlParserTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.ConsistencyCheck/Xml/IncrementalXmlParserTests.cs
@@ -75,7 +75,7 @@ namespace ICSharpCode.NRefactory.ConsistencyCheck
 				
 				// Randomly mutate the file:
 				
-				List<TextChangeEventArgs> changes = new List<TextChangeEventArgs>();
+//				List<TextChangeEventArgs> changes = new List<TextChangeEventArgs>();
 				int modifications = rnd.Next(0, 25);
 				int offset = 0;
 				for (int i = 0; i < modifications; i++) {
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Demo/CSDemo.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Demo/CSDemo.cs
index 08f3d62bde..bf9fd95d22 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Demo/CSDemo.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Demo/CSDemo.cs
@@ -195,7 +195,7 @@ namespace ICSharpCode.NRefactory.Demo
 					0, assemblies.Length,
 					delegate (int i) {
 						Stopwatch w = Stopwatch.StartNew();
-						CecilLoader loader = new CecilLoader();
+						AssemblyLoader loader = AssemblyLoader.Create();
 						projectContents[i] = loader.LoadAssemblyFile(assemblies[i].Location);
 						Debug.WriteLine(Path.GetFileName(assemblies[i].Location) + ": " + w.Elapsed);
 					});
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Demo/ICSharpCode.NRefactory.Demo.csproj b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Demo/ICSharpCode.NRefactory.Demo.csproj
index 8383039157..59e165619c 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Demo/ICSharpCode.NRefactory.Demo.csproj
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Demo/ICSharpCode.NRefactory.Demo.csproj
@@ -1,129 +1,133 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <PropertyGroup>
-    <ProjectGuid>{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>ICSharpCode.NRefactory.Demo</RootNamespace>
-    <AssemblyName>ICSharpCode.NRefactory.Demo</AssemblyName>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <OutputPath>..\bin\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <Optimize>False</Optimize>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugType>PdbOnly</DebugType>
-    <Optimize>True</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Debug' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <Optimize>False</Optimize>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|x86' ">
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Release' ">
-    <DebugType>PdbOnly</DebugType>
-    <Optimize>True</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>TRACE</DefineConstants>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|x86' ">
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="CSDemo.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="CSDemo.Designer.cs">
-      <DependentUpon>CSDemo.cs</DependentUpon>
-    </Compile>
-    <Compile Include="MainForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MainForm.Designer.cs">
-      <DependentUpon>MainForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SemanticTreeDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SemanticTreeDialog.Designer.cs">
-      <DependentUpon>SemanticTreeDialog.cs</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
-      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
-      <Name>ICSharpCode.NRefactory.CSharp</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="CSDemo.resx">
-      <DependentUpon>CSDemo.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MainForm.resx">
-      <DependentUpon>MainForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SemanticTreeDialog.resx">
-      <DependentUpon>SemanticTreeDialog.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <PropertyGroup>
+    <ProjectGuid>{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>ICSharpCode.NRefactory.Demo</RootNamespace>
+    <AssemblyName>ICSharpCode.NRefactory.Demo</AssemblyName>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputPath>..\bin\$(Configuration)\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>Full</DebugType>
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Debug' ">
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>Full</DebugType>
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|x86' ">
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Release' ">
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE</DefineConstants>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|x86' ">
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
+      <Link>Properties\GlobalAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="CSDemo.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="CSDemo.Designer.cs">
+      <DependentUpon>CSDemo.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MainForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MainForm.Designer.cs">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SemanticTreeDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SemanticTreeDialog.Designer.cs">
+      <DependentUpon>SemanticTreeDialog.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
+      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
+      <Name>ICSharpCode.NRefactory.CSharp</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
+      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
+      <Name>ICSharpCode.NRefactory</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="CSDemo.resx">
+      <DependentUpon>CSDemo.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MainForm.resx">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SemanticTreeDialog.resx">
+      <DependentUpon>SemanticTreeDialog.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.GtkDemo/ICSharpCode.NRefactory.GtkDemo.csproj b/src/Libraries/NRefactory/ICSharpCode.NRefactory.GtkDemo/ICSharpCode.NRefactory.GtkDemo.csproj
index 6e576fa169..255831256d 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.GtkDemo/ICSharpCode.NRefactory.GtkDemo.csproj
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.GtkDemo/ICSharpCode.NRefactory.GtkDemo.csproj
@@ -1,123 +1,119 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A7EEF7F8-238F-459D-95A9-96467539641D}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>ICSharpCode.NRefactory.GtkDemo</RootNamespace>
-    <AssemblyName>ICSharpCode.NRefactory.GtkDemo</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-	<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-	<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>glib-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>glade-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="Mono.Posix" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="gtk-gui\gui.stetic">
-      <LogicalName>gui.stetic</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="pixbuf\comment.png">
-      <LogicalName>comment.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="pixbuf\element-class-16.png">
-      <LogicalName>class.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="pixbuf\element-field-16.png">
-      <LogicalName>expression.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="pixbuf\element-literal-16.png">
-      <LogicalName>token.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="pixbuf\element-method-16.png">
-      <LogicalName>statement.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="pixbuf\element-namespace-16.png">
-      <LogicalName>namespace.png</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="gtk-gui\generated.cs" />
-    <Compile Include="Main.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="MainWindow.cs" />
-    <Compile Include="gtk-gui\ICSharpCode.NRefactory.GtkDemo.MainWindow.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
-      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
-      <Name>ICSharpCode.NRefactory.CSharp</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CSharpDemo.cs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="pixbuf\" />
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A7EEF7F8-238F-459D-95A9-96467539641D}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>ICSharpCode.NRefactory.GtkDemo</RootNamespace>
+    <AssemblyName>ICSharpCode.NRefactory.GtkDemo</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="Mono.Posix" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="gtk-gui\gui.stetic">
+      <LogicalName>gui.stetic</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="pixbuf\comment.png">
+      <LogicalName>comment.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="pixbuf\element-class-16.png">
+      <LogicalName>class.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="pixbuf\element-field-16.png">
+      <LogicalName>expression.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="pixbuf\element-literal-16.png">
+      <LogicalName>token.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="pixbuf\element-method-16.png">
+      <LogicalName>statement.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="pixbuf\element-namespace-16.png">
+      <LogicalName>namespace.png</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="gtk-gui\generated.cs" />
+    <Compile Include="Main.cs" />
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="MainWindow.cs" />
+    <Compile Include="gtk-gui\ICSharpCode.NRefactory.GtkDemo.MainWindow.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
+      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
+      <Name>ICSharpCode.NRefactory</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
+      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
+      <Name>ICSharpCode.NRefactory.CSharp</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
+      <Project>{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}</Project>
+      <Name>ICSharpCode.NRefactory.Cecil</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\cecil\Mono.Cecil.csproj">
+      <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
+      <Name>Mono.Cecil</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="CSharpDemo.cs">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="pixbuf\" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.GtkDemo/MainWindow.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.GtkDemo/MainWindow.cs
index 43ab541256..366a95590b 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.GtkDemo/MainWindow.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.GtkDemo/MainWindow.cs
@@ -252,8 +252,8 @@ namespace ICSharpCode.NRefactory.GtkDemo
 				Parallel.For(
 					0, assemblies.Length,
 					delegate (int i) {
-						Stopwatch w = Stopwatch.StartNew();
-						CecilLoader loader = new CecilLoader();
+//						Stopwatch w = Stopwatch.StartNew();
+						AssemblyLoader loader = AssemblyLoader.Create();
 						projectContents[i] = loader.LoadAssemblyFile(assemblies[i].Location);
 					});
 				return projectContents;
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/ICSharpCode.NRefactory.IKVM.csproj b/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/ICSharpCode.NRefactory.IKVM.csproj
new file mode 100644
index 0000000000..f76d2f6faf
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/ICSharpCode.NRefactory.IKVM.csproj
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A727169F-D94F-443F-B305-B057D7F3B420}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>ICSharpCode.NRefactory.IKVM</RootNamespace>
+    <AssemblyName>ICSharpCode.NRefactory.IKVM</AssemblyName>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\ICSharpCode.NRefactory.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
+      <Link>Properties\GlobalAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="IkvmLoader.cs" />
+    <Compile Include="StringConstantValue.cs" />
+    <Compile Include="IntConstantValue.cs" />
+    <Compile Include="StructConstantValue.cs" />
+    <Compile Include="ShortConstantValue.cs" />
+    <Compile Include="NonFrozenInterningProvider.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\ikvm\reflect\IKVM.Reflection.csproj">
+      <Project>{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}</Project>
+      <Name>IKVM.Reflection</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
+      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
+      <Name>ICSharpCode.NRefactory</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/IkvmLoader.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/IkvmLoader.cs
new file mode 100644
index 0000000000..4c2dfe98cb
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/IkvmLoader.cs
@@ -0,0 +1,1507 @@
+//
+// IkvmLoader.cs
+//
+// Author:
+//       Daniel Grunwald <daniel@danielgrunwald.de>
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using ICSharpCode.NRefactory.Documentation;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using ICSharpCode.NRefactory.Utils;
+using IKVM.Reflection;
+
+namespace ICSharpCode.NRefactory.TypeSystem
+{
+	/// <summary>
+	/// Allows loading an IProjectContent from an already compiled assembly.
+	/// </summary>
+	/// <remarks>Instance methods are not thread-safe; you need to create multiple instances of CecilLoader
+	/// if you want to load multiple project contents in parallel.</remarks>
+	public sealed class IkvmLoader : AssemblyLoader
+	{
+		/// <summary>
+		/// Version number of the ikvm loader.
+		/// Should be incremented when fixing bugs in the ikvm loader so that project contents cached on disk
+		/// (which might be incorrect due to the bug) are re-created.
+		/// </summary>
+		const int ikvmLoaderVersion = 1;
+
+		#region Options
+		// Most options are defined in the AssemblyLoader base class
+		
+		/// <summary>
+		/// This delegate gets executed whenever an entity was loaded.
+		/// </summary>
+		/// <remarks>
+		/// This callback may be to build a dictionary that maps between
+		/// entities and cecil objects.
+		/// Warning: if delay-loading is used and the type system is accessed by multiple threads,
+		/// the callback may be invoked concurrently on multiple threads.
+		/// </remarks>
+		public Action<IUnresolvedEntity, MemberInfo> OnEntityLoaded { get; set; }
+		#endregion
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.TypeSystem.IkvmLoader"/> class.
+		/// </summary>
+		public IkvmLoader()
+		{
+			interningProvider = new NonFrozenInterningProvider ();
+		}
+
+		#region Load Assembly From Disk
+
+		public override IUnresolvedAssembly LoadAssemblyFile(string fileName)
+		{
+			if (fileName == null)
+				throw new ArgumentNullException("fileName");
+
+			using (var universe = new Universe (UniverseOptions.DisablePseudoCustomAttributeRetrieval | UniverseOptions.SupressReferenceTypeIdentityConversion | UniverseOptions.ResolveMissingMembers)) {
+				universe.AssemblyResolve += delegate(object sender, IKVM.Reflection.ResolveEventArgs args) {
+					return universe.CreateMissingAssembly(args.Name);
+				};
+
+				return LoadAssembly (universe.LoadFile (fileName));
+			}
+		}
+
+		public IUnresolvedAssembly LoadAssemblyFile(string fileName, Stream stream)
+		{
+			if (fileName == null)
+				throw new ArgumentNullException("fileName");
+
+			using (var universe = new Universe (UniverseOptions.DisablePseudoCustomAttributeRetrieval | UniverseOptions.SupressReferenceTypeIdentityConversion)) {
+				universe.AssemblyResolve += delegate(object sender, IKVM.Reflection.ResolveEventArgs args) {
+					return universe.CreateMissingAssembly(args.Name);
+				};
+				using (RawModule module = universe.OpenRawModule (stream, fileName)) {
+					return LoadAssembly (universe.LoadAssembly (module));
+				}
+
+			}
+		}
+		#endregion
+
+		IkvmUnresolvedAssembly currentAssembly;
+		Assembly currentAssemblyDefinition;
+
+		/// <summary>
+		/// Loads the assembly definition into a project content.
+		/// </summary>
+		/// <returns>Unresolved type system representing the assembly</returns>
+
+		[CLSCompliant(false)]
+		public IUnresolvedAssembly LoadAssembly(Assembly assembly)
+		{
+			if (assembly == null)
+				throw new ArgumentNullException ("assembly");
+
+			currentAssemblyDefinition = assembly;
+			currentAssembly = new IkvmUnresolvedAssembly (assembly.FullName, DocumentationProvider);
+
+			// Read assembly and module attributes
+			IList<IUnresolvedAttribute> assemblyAttributes = new List<IUnresolvedAttribute>();
+			IList<IUnresolvedAttribute> moduleAttributes = new List<IUnresolvedAttribute>();
+			AddAttributes(assembly, assemblyAttributes);
+			AddAttributes(assembly.ManifestModule, moduleAttributes);
+
+			assemblyAttributes = interningProvider.InternList(assemblyAttributes);
+			moduleAttributes = interningProvider.InternList(moduleAttributes);
+
+			currentAssembly.Location = assembly.Location;
+			currentAssembly.AssemblyAttributes.AddRange(assemblyAttributes);
+			currentAssembly.ModuleAttributes.AddRange(moduleAttributes);
+			// Register type forwarders:
+			foreach (var type in assembly.ManifestModule.__GetExportedTypes ()) {
+				if (type.Assembly != assembly) {
+					int typeParameterCount;
+					string ns = type.Namespace;
+					string name = ReflectionHelper.SplitTypeParameterCountFromReflectionName(type.Name, out typeParameterCount);
+					ns = interningProvider.Intern(ns);
+					name = interningProvider.Intern(name);
+					var typeRef = new GetClassTypeReference(GetAssemblyReference(type.Assembly), ns, name, typeParameterCount);
+					typeRef = interningProvider.Intern(typeRef);
+					var key = new TopLevelTypeName(ns, name, typeParameterCount);
+					currentAssembly.AddTypeForwarder(key, typeRef);
+				}
+			}
+
+			// Create and register all types:
+			var ikvmTypeDefs = new List<IKVM.Reflection.Type>();
+			var typeDefs = new List<DefaultUnresolvedTypeDefinition>();
+
+			foreach (var td in assembly.GetTypes ()) {
+				if (td.DeclaringType != null)
+					continue;
+				CancellationToken.ThrowIfCancellationRequested();
+
+				if (IncludeInternalMembers || td.IsPublic) {
+					string name = td.Name;
+					if (name.Length == 0)
+						continue;
+
+					var t = CreateTopLevelTypeDefinition(td);
+					ikvmTypeDefs.Add(td);
+					typeDefs.Add(t);
+					currentAssembly.AddTypeDefinition(t);
+					// The registration will happen after the members are initialized
+				}
+			}
+
+			// Initialize the type's members:
+			for (int i = 0; i < typeDefs.Count; i++) {
+				InitTypeDefinition(ikvmTypeDefs[i], typeDefs[i]);
+			}
+
+			// Freezing the assembly here is important:
+			// otherwise it will be frozen when a compilation is first created
+			// from it. But freezing has the effect of changing some collection instances
+			// (to ReadOnlyCollection). This hidden mutation was causing a crash
+			// when the FastSerializer was saving the assembly at the same time as
+			// the first compilation was created from it.
+			// By freezing the assembly now, we ensure it is usable on multiple
+			// threads without issues.
+			currentAssembly.Freeze();
+
+			var result = currentAssembly;
+			currentAssembly = null;
+			return result;
+		}
+
+		#region IUnresolvedAssembly implementation
+		[Serializable, FastSerializerVersion(ikvmLoaderVersion)]
+		sealed class IkvmUnresolvedAssembly : DefaultUnresolvedAssembly, IDocumentationProvider
+		{
+			readonly IDocumentationProvider documentationProvider;
+
+			public IkvmUnresolvedAssembly(string fullAssemblyName, IDocumentationProvider documentationProvider)
+				: base(fullAssemblyName)
+			{
+				this.documentationProvider = documentationProvider;
+			}
+
+			DocumentationComment IDocumentationProvider.GetDocumentation(IEntity entity)
+			{
+				if (documentationProvider != null)
+					return documentationProvider.GetDocumentation (entity);
+				return null;
+			}
+		}
+		#endregion
+
+		#region Read Type Reference
+		/// <summary>
+		/// Reads a type reference.
+		/// </summary>
+		/// <param name="type">The Cecil type reference that should be converted into
+		/// a type system type reference.</param>
+		/// <param name="typeAttributes">Attributes associated with the Cecil type reference.
+		/// This is used to support the 'dynamic' type.</param>
+		[CLSCompliant(false)]
+		public ITypeReference ReadTypeReference(IKVM.Reflection.Type type, IEnumerable<CustomAttributeData> typeAttributes = null)
+		{
+			int typeIndex = 0;
+			return CreateTypeReference(type, typeAttributes, ref typeIndex);
+		}
+
+		ITypeReference CreateTypeReference(IKVM.Reflection.Type type, IEnumerable<CustomAttributeData> typeAttributes, ref int typeIndex)
+		{
+			// TODO:
+			//			while (type is OptionalModifierType || type is RequiredModifierType) {
+			//				type = ((TypeSpecification)type).ElementType;
+			//			}
+
+			if (type == null) {
+				return SpecialType.UnknownType;
+			}
+			if (type.IsByRef) {
+				typeIndex++;
+				return interningProvider.Intern (
+					new ByReferenceTypeReference (
+						CreateTypeReference (type.GetElementType (),typeAttributes, ref typeIndex))
+					);
+			}
+			if (type.IsPointer) {
+				typeIndex++;
+				return interningProvider.Intern (
+					new PointerTypeReference (
+						CreateTypeReference (type.GetElementType (), typeAttributes, ref typeIndex))
+					);
+			}
+			if (type.IsArray) {
+				typeIndex++;
+				return interningProvider.Intern (
+					new ArrayTypeReference (
+						CreateTypeReference (type.GetElementType (), typeAttributes, ref typeIndex),
+						type.GetArrayRank ()
+					)
+				);
+			}
+			if (type.IsConstructedGenericType) {
+				ITypeReference baseType = CreateTypeReference (type.GetGenericTypeDefinition (), typeAttributes, ref typeIndex);
+				var args = type.GetGenericArguments ();
+				var para = new ITypeReference[args.Length];
+				for (int i = 0; i < para.Length; ++i) {
+					typeIndex++;
+					para [i] = CreateTypeReference (args [i], typeAttributes, ref typeIndex);
+				}
+				return interningProvider.Intern (new ParameterizedTypeReference (baseType, para));
+			}
+			if (type.IsGenericParameter) {
+				return TypeParameterReference.Create (type.DeclaringMethod != null ? SymbolKind.Method : SymbolKind.TypeDefinition, type.GenericParameterPosition);
+			}
+			if (type.IsNested) {
+				ITypeReference typeRef = CreateTypeReference (type.DeclaringType, typeAttributes, ref typeIndex);
+				int partTypeParameterCount;
+				string namepart = ReflectionHelper.SplitTypeParameterCountFromReflectionName (type.Name, out partTypeParameterCount);
+				namepart = interningProvider.Intern (namepart);
+				return interningProvider.Intern (new NestedTypeReference (typeRef, namepart, partTypeParameterCount));
+			}
+
+			string ns = interningProvider.Intern (type.Namespace ?? string.Empty);
+			string name = type.Name;
+			if (name == null)
+				throw new InvalidOperationException ("type.Name returned null. Type: " + type);
+
+			if (name == "Object" && ns == "System" && HasDynamicAttribute (typeAttributes, typeIndex)) {
+				return SpecialType.Dynamic;
+			}
+			int typeParameterCount;
+			name = ReflectionHelper.SplitTypeParameterCountFromReflectionName (name, out typeParameterCount);
+			name = interningProvider.Intern (name);
+			if (currentAssembly != null) {
+				var c = currentAssembly.GetTypeDefinition (ns, name, typeParameterCount);
+				if (c != null)
+					return c;
+			}
+			return interningProvider.Intern (new GetClassTypeReference (GetAssemblyReference (type.Assembly), ns, name, typeParameterCount));
+		}
+
+		IAssemblyReference GetAssemblyReference(Assembly scope)
+		{
+			if (scope == null || scope == currentAssemblyDefinition)
+				return DefaultAssemblyReference.CurrentAssembly;
+			return interningProvider.Intern (new DefaultAssemblyReference (scope.FullName));
+		}
+
+		static bool HasDynamicAttribute(IEnumerable<CustomAttributeData> attributeProvider, int typeIndex)
+		{
+			if (attributeProvider == null)
+				return false;
+			foreach (var a in attributeProvider) {
+				var declaringType = a.Constructor.DeclaringType;
+				if (declaringType.__Name == "DynamicAttribute" && declaringType.__Namespace == "System.Runtime.CompilerServices") {
+					if (a.ConstructorArguments.Count == 1) {
+						var values = a.ConstructorArguments[0].Value as CustomAttributeTypedArgument[];
+						if (values != null && typeIndex < values.Length && values[typeIndex].Value is bool) {
+							return (bool)values [typeIndex].Value;
+						}
+					}
+					return true;
+				}
+			}
+			return false;
+		}
+		#endregion
+
+		#region Read Attributes
+		#region Assembly Attributes
+		static readonly ITypeReference assemblyVersionAttributeTypeRef = typeof(System.Reflection.AssemblyVersionAttribute).ToTypeReference();
+
+		void AddAttributes(Assembly assembly, IList<IUnresolvedAttribute> outputList)
+		{
+			AddCustomAttributes(assembly.CustomAttributes, outputList);
+			AddSecurityAttributes(CustomAttributeData.__GetDeclarativeSecurity (assembly), outputList);
+
+			// AssemblyVersionAttribute
+			if (assembly.GetName ().Version != null) {
+				var assemblyVersion = new DefaultUnresolvedAttribute(assemblyVersionAttributeTypeRef, new[] { KnownTypeReference.String });
+				assemblyVersion.PositionalArguments.Add(CreateSimpleConstantValue(assembly.GetName ().Version.ToString()));
+				outputList.Add(interningProvider.Intern(assemblyVersion));
+			}
+		}
+
+		IConstantValue CreateSimpleConstantValue(string value)
+		{
+			return interningProvider.Intern(new StringConstantValue(value));
+		}
+
+		IConstantValue CreateSimpleConstantValue(int value)
+		{
+			return interningProvider.Intern(new IntConstantValue(value));
+		}
+
+		IConstantValue CreateSimpleConstantValue(short value)
+		{
+			return interningProvider.Intern(new ShortConstantValue(value));
+		}		
+
+		IConstantValue CreateSimpleConstantValue<T>(ITypeReference type, T value) where T : struct
+		{
+			return interningProvider.Intern(new StructConstantValue<T>(type, value));
+		}
+
+		IConstantValue CreateSimpleConstantValue<T>(ITypeReference type, T? value) where T : struct
+		{
+			return interningProvider.Intern(new SimpleConstantValue(type, value));
+		}
+
+		IConstantValue CreateSimpleConstantValue(ITypeReference type, object value)
+		{
+			if (ReferenceEquals(value, Missing.Value))
+				return CreateSimpleConstantValue(type, null);
+			return interningProvider.Intern(new SimpleConstantValue(type, interningProvider.InternValue(value)));
+		}		
+		#endregion
+
+		#region Module Attributes
+		void AddAttributes(Module module, IList<IUnresolvedAttribute> outputList)
+		{
+			AddCustomAttributes(module.CustomAttributes, outputList);
+		}
+		#endregion
+
+		#region Parameter Attributes
+		static readonly IUnresolvedAttribute inAttribute = new DefaultUnresolvedAttribute(typeof(InAttribute).ToTypeReference());
+		static readonly IUnresolvedAttribute outAttribute = new DefaultUnresolvedAttribute(typeof(OutAttribute).ToTypeReference());
+
+		void AddAttributes(ParameterInfo parameter, DefaultUnresolvedParameter targetParameter, IEnumerable<CustomAttributeData> customAttributes)
+		{
+			if (!targetParameter.IsOut) {
+				if (parameter.IsIn)
+					targetParameter.Attributes.Add(inAttribute);
+				if (parameter.IsOut)
+					targetParameter.Attributes.Add(outAttribute);
+			}
+			AddCustomAttributes(customAttributes, targetParameter.Attributes);
+
+			FieldMarshal marshalInfo;
+			if (parameter.__TryGetFieldMarshal (out marshalInfo)) {
+				targetParameter.Attributes.Add(ConvertMarshalInfo(marshalInfo));
+			}
+		}
+		#endregion
+
+		#region Method Attributes
+		static readonly ITypeReference dllImportAttributeTypeRef = typeof(DllImportAttribute).ToTypeReference();
+		static readonly SimpleConstantValue trueValue = new SimpleConstantValue(KnownTypeReference.Boolean, true);
+		static readonly SimpleConstantValue falseValue = new SimpleConstantValue(KnownTypeReference.Boolean, false);
+		static readonly ITypeReference callingConventionTypeRef = typeof(CallingConvention).ToTypeReference();
+		static readonly IUnresolvedAttribute preserveSigAttribute = new DefaultUnresolvedAttribute(typeof(PreserveSigAttribute).ToTypeReference());
+		static readonly ITypeReference methodImplAttributeTypeRef = typeof(MethodImplAttribute).ToTypeReference();
+		static readonly ITypeReference methodImplOptionsTypeRef = typeof(MethodImplOptions).ToTypeReference();
+
+		static bool HasAnyAttributes(MethodInfo methodDefinition)
+		{
+			if ((methodDefinition.Attributes & MethodAttributes.PinvokeImpl) != 0)
+				return true;
+
+			if ((methodDefinition.MethodImplementationFlags & MethodImplAttributes.CodeTypeMask) != 0)
+				return true;
+			if ((methodDefinition.ReturnParameter.Attributes & ParameterAttributes.HasFieldMarshal) != 0)
+				return true;
+			return methodDefinition.CustomAttributes.Any () || methodDefinition.ReturnParameter.CustomAttributes.Any ();
+		}
+
+		static bool HasAnyAttributes(ConstructorInfo methodDefinition)
+		{
+			if ((methodDefinition.Attributes & MethodAttributes.PinvokeImpl) != 0)
+				return true;
+
+			if ((methodDefinition.MethodImplementationFlags & MethodImplAttributes.CodeTypeMask) != 0)
+				return true;
+			return methodDefinition.CustomAttributes.Any ();
+		}
+
+		void AddAttributes(MethodInfo methodDefinition, IList<IUnresolvedAttribute> attributes, ICollection<IUnresolvedAttribute> returnTypeAttributes)
+		{
+			var implAttributes = methodDefinition.MethodImplementationFlags;
+
+			#region DllImportAttribute
+			if ((methodDefinition.Attributes & MethodAttributes.PinvokeImpl) != 0) {
+
+				ImplMapFlags flags;
+				string importName;
+				string importScope;
+				if (methodDefinition.__TryGetImplMap(out flags, out importName, out importScope)) {
+					var dllImport = new DefaultUnresolvedAttribute(dllImportAttributeTypeRef, new[] { KnownTypeReference.String });
+					dllImport.PositionalArguments.Add(CreateSimpleConstantValue(importScope));
+
+					
+					if ((flags & ImplMapFlags.BestFitOff) != 0)
+						dllImport.AddNamedFieldArgument("BestFitMapping", falseValue);
+					if ((flags & ImplMapFlags.BestFitOn) != 0)
+						dllImport.AddNamedFieldArgument("BestFitMapping", trueValue);
+
+					CallingConvention callingConvention;
+					switch (flags & ImplMapFlags.CallConvMask) {
+						case (ImplMapFlags)0:
+							Debug.WriteLine ("P/Invoke calling convention not set on:" + methodDefinition.Name);
+							callingConvention = 0;
+							break;
+						case ImplMapFlags.CallConvCdecl:
+							callingConvention = CallingConvention.Cdecl;
+							break;
+						case ImplMapFlags.CallConvFastcall:
+							callingConvention = CallingConvention.FastCall;
+							break;
+						case ImplMapFlags.CallConvStdcall:
+							callingConvention = CallingConvention.StdCall;
+							break;
+						case ImplMapFlags.CallConvThiscall:
+							callingConvention = CallingConvention.ThisCall;
+							break;
+						case ImplMapFlags.CallConvWinapi:
+							callingConvention = CallingConvention.Winapi;
+							break;
+						default:
+							throw new NotSupportedException("unknown calling convention");
+					}
+					if (callingConvention != CallingConvention.Winapi)
+						dllImport.AddNamedFieldArgument("CallingConvention", CreateSimpleConstantValue(callingConventionTypeRef, (int)callingConvention));
+
+					CharSet charSet = CharSet.None;
+					switch (flags & ImplMapFlags.CharSetMask) {
+						case ImplMapFlags.CharSetAnsi:
+							charSet = CharSet.Ansi;
+							break;
+						case ImplMapFlags.CharSetAuto:
+							charSet = CharSet.Auto;
+							break;
+						case ImplMapFlags.CharSetUnicode:
+							charSet = CharSet.Unicode;
+							break;
+					}
+					if (charSet != CharSet.None)
+						dllImport.AddNamedFieldArgument("CharSet", CreateSimpleConstantValue(charSetTypeRef, (int)charSet));
+
+					if (!string.IsNullOrEmpty(importName) && importName != methodDefinition.Name)
+						dllImport.AddNamedFieldArgument("EntryPoint", CreateSimpleConstantValue(importName));
+
+					if ((flags & ImplMapFlags.NoMangle) != 0)
+						dllImport.AddNamedFieldArgument("ExactSpelling", trueValue);
+
+					if ((implAttributes & MethodImplAttributes.PreserveSig) == MethodImplAttributes.PreserveSig)
+						implAttributes &= ~MethodImplAttributes.PreserveSig;
+					else
+						dllImport.AddNamedFieldArgument("PreserveSig", falseValue);
+
+					if ((flags & ImplMapFlags.SupportsLastError) != 0)
+						dllImport.AddNamedFieldArgument("SetLastError", trueValue);
+
+					if ((flags & ImplMapFlags.CharMapErrorOff) != 0)
+						dllImport.AddNamedFieldArgument("ThrowOnUnmappableChar", falseValue);
+					if ((flags & ImplMapFlags.CharMapErrorOn) != 0)
+						dllImport.AddNamedFieldArgument("ThrowOnUnmappableChar", trueValue);
+
+					attributes.Add(interningProvider.Intern(dllImport));
+				}
+			}
+			#endregion
+
+			#region PreserveSigAttribute
+			if (implAttributes == MethodImplAttributes.PreserveSig) {
+				attributes.Add(preserveSigAttribute);
+				implAttributes = (MethodImplAttributes)0;
+			}
+			#endregion
+
+			#region MethodImplAttribute
+			if (implAttributes != MethodImplAttributes.IL) {
+				var methodImpl = new DefaultUnresolvedAttribute(methodImplAttributeTypeRef, new[] { methodImplOptionsTypeRef });
+				methodImpl.PositionalArguments.Add(CreateSimpleConstantValue(methodImplOptionsTypeRef, (int)implAttributes));
+				attributes.Add(interningProvider.Intern(methodImpl));
+			}
+			#endregion
+
+			var customAttributes = methodDefinition.CustomAttributes;
+			AddCustomAttributes (customAttributes, attributes);
+
+			if ((methodDefinition.Attributes & MethodAttributes.HasSecurity) != 0) {
+				AddSecurityAttributes(CustomAttributeData.__GetDeclarativeSecurity (methodDefinition), attributes);
+			}
+
+			FieldMarshal marshalInfo;
+			if (methodDefinition.ReturnParameter.__TryGetFieldMarshal (out marshalInfo)) {
+				returnTypeAttributes.Add(ConvertMarshalInfo(marshalInfo));
+			}
+
+			AddCustomAttributes(methodDefinition.ReturnParameter.CustomAttributes, returnTypeAttributes);
+		}
+
+		void AddAttributes(ConstructorInfo methodDefinition, IList<IUnresolvedAttribute> attributes, IList<IUnresolvedAttribute> returnTypeAttributes)
+		{
+			var implAttributes = methodDefinition.MethodImplementationFlags;
+
+			#region PreserveSigAttribute
+			if (implAttributes == MethodImplAttributes.PreserveSig) {
+				attributes.Add(preserveSigAttribute);
+				implAttributes = 0;
+			}
+			#endregion
+
+			#region MethodImplAttribute
+			if (implAttributes != MethodImplAttributes.IL) {
+				var methodImpl = new DefaultUnresolvedAttribute(methodImplAttributeTypeRef, new[] { methodImplOptionsTypeRef });
+				methodImpl.PositionalArguments.Add(CreateSimpleConstantValue(methodImplOptionsTypeRef, (int)implAttributes));
+				attributes.Add(interningProvider.Intern(methodImpl));
+			}
+			#endregion
+
+			AddCustomAttributes(methodDefinition.CustomAttributes, attributes);
+
+			if ((methodDefinition.Attributes & MethodAttributes.HasSecurity) != 0) {
+				AddSecurityAttributes(CustomAttributeData.__GetDeclarativeSecurity (methodDefinition), attributes);
+			}
+		}
+		#endregion
+
+		#region Type Attributes
+		static readonly DefaultUnresolvedAttribute serializableAttribute = new DefaultUnresolvedAttribute(typeof(SerializableAttribute).ToTypeReference());
+		static readonly DefaultUnresolvedAttribute comImportAttribute = new DefaultUnresolvedAttribute(typeof(ComImportAttribute).ToTypeReference());
+		static readonly ITypeReference structLayoutAttributeTypeRef = typeof(StructLayoutAttribute).ToTypeReference();
+		static readonly ITypeReference layoutKindTypeRef = typeof(LayoutKind).ToTypeReference();
+		static readonly ITypeReference charSetTypeRef = typeof(CharSet).ToTypeReference();
+
+		void AddAttributes(IKVM.Reflection.Type typeDefinition, IUnresolvedTypeDefinition targetEntity)
+		{
+			// SerializableAttribute
+			if (typeDefinition.IsSerializable)
+				targetEntity.Attributes.Add(serializableAttribute);
+
+			// ComImportAttribute
+			if (typeDefinition.IsImport)
+				targetEntity.Attributes.Add(comImportAttribute);
+
+			#region StructLayoutAttribute
+			LayoutKind layoutKind = LayoutKind.Auto;
+			switch (typeDefinition.Attributes & TypeAttributes.LayoutMask) {
+				case TypeAttributes.SequentialLayout:
+				layoutKind = LayoutKind.Sequential;
+				break;
+				case TypeAttributes.ExplicitLayout:
+				layoutKind = LayoutKind.Explicit;
+				break;
+			}
+			CharSet charSet = CharSet.None;
+			switch (typeDefinition.Attributes & TypeAttributes.StringFormatMask) {
+				case TypeAttributes.AnsiClass:
+				charSet = CharSet.Ansi;
+				break;
+				case TypeAttributes.AutoClass:
+				charSet = CharSet.Auto;
+				break;
+				case TypeAttributes.UnicodeClass:
+				charSet = CharSet.Unicode;
+				break;
+			}
+
+
+			int packingSize;
+			int typeSize;
+			if (typeDefinition.__GetLayout (out packingSize, out typeSize)) {
+				LayoutKind defaultLayoutKind = (typeDefinition.IsValueType && !typeDefinition.IsEnum) ? LayoutKind.Sequential: LayoutKind.Auto;
+				if (layoutKind != defaultLayoutKind || charSet != CharSet.Ansi || packingSize > 0 || typeSize > 0) {
+					var structLayout = new DefaultUnresolvedAttribute(structLayoutAttributeTypeRef, new[] { layoutKindTypeRef });
+					structLayout.PositionalArguments.Add(CreateSimpleConstantValue(layoutKindTypeRef, (int)layoutKind));
+					if (charSet != CharSet.Ansi) {
+						structLayout.AddNamedFieldArgument("CharSet", CreateSimpleConstantValue(charSetTypeRef, (int)charSet));
+					}
+					if (packingSize > 0) {
+						structLayout.AddNamedFieldArgument("Pack", CreateSimpleConstantValue(packingSize));
+					}
+					if (typeSize > 0) {
+						structLayout.AddNamedFieldArgument("Size", CreateSimpleConstantValue(typeSize));
+					}
+					targetEntity.Attributes.Add(interningProvider.Intern(structLayout));
+				}
+			}
+			#endregion
+
+			AddCustomAttributes(typeDefinition.CustomAttributes, targetEntity.Attributes);
+
+			if ((typeDefinition.Attributes & TypeAttributes.HasSecurity) != 0) {
+				AddSecurityAttributes(CustomAttributeData.__GetDeclarativeSecurity(typeDefinition), targetEntity.Attributes);
+			}
+		}
+		#endregion
+
+		#region Field Attributes
+		static readonly ITypeReference fieldOffsetAttributeTypeRef = typeof(FieldOffsetAttribute).ToTypeReference();
+		static readonly IUnresolvedAttribute nonSerializedAttribute = new DefaultUnresolvedAttribute(typeof(NonSerializedAttribute).ToTypeReference());
+
+		void AddAttributes(FieldInfo fieldDefinition, IUnresolvedEntity targetEntity)
+		{
+			// FieldOffsetAttribute
+			int fOffset;
+			if (fieldDefinition.__TryGetFieldOffset(out fOffset)) {
+				var fieldOffset = new DefaultUnresolvedAttribute(fieldOffsetAttributeTypeRef, new[] { KnownTypeReference.Int32 });
+				fieldOffset.PositionalArguments.Add(CreateSimpleConstantValue(fOffset));
+				targetEntity.Attributes.Add(interningProvider.Intern(fieldOffset));
+			}
+
+			// NonSerializedAttribute
+			if (fieldDefinition.IsNotSerialized) {
+				targetEntity.Attributes.Add(nonSerializedAttribute);
+			}
+			FieldMarshal marshal;
+			if (fieldDefinition.__TryGetFieldMarshal (out marshal))
+				targetEntity.Attributes.Add(ConvertMarshalInfo(marshal));
+
+			AddCustomAttributes(fieldDefinition.CustomAttributes, targetEntity.Attributes);
+		}
+		#endregion
+
+		#region Event Attributes
+		void AddAttributes(EventInfo eventDefinition, IUnresolvedEntity targetEntity)
+		{
+			AddCustomAttributes(eventDefinition.CustomAttributes, targetEntity.Attributes);
+		}
+		#endregion
+
+		#region Property Attributes
+		void AddAttributes(PropertyInfo propertyDefinition, IUnresolvedEntity targetEntity)
+		{
+			AddCustomAttributes(propertyDefinition.CustomAttributes, targetEntity.Attributes);
+		}
+		#endregion
+
+		#region MarshalAsAttribute (ConvertMarshalInfo)
+		static readonly ITypeReference marshalAsAttributeTypeRef = typeof(MarshalAsAttribute).ToTypeReference();
+		static readonly ITypeReference unmanagedTypeTypeRef = typeof(UnmanagedType).ToTypeReference();
+
+
+		IUnresolvedAttribute ConvertMarshalInfo(FieldMarshal marshalInfo)
+		{
+			DefaultUnresolvedAttribute attr = new DefaultUnresolvedAttribute(marshalAsAttributeTypeRef, new[] { unmanagedTypeTypeRef });
+			attr.PositionalArguments.Add(CreateSimpleConstantValue(unmanagedTypeTypeRef, (int)marshalInfo.UnmanagedType));
+
+
+			if (marshalInfo.UnmanagedType ==UnmanagedType.ByValArray) {
+				attr.AddNamedFieldArgument("SizeConst", CreateSimpleConstantValue((int)marshalInfo.SizeConst));
+				if (marshalInfo.ArraySubType.HasValue)
+					attr.AddNamedFieldArgument("ArraySubType", CreateSimpleConstantValue(unmanagedTypeTypeRef, (int)marshalInfo.ArraySubType.Value));
+			}
+
+			if (marshalInfo.UnmanagedType == UnmanagedType.SafeArray && marshalInfo.SafeArraySubType.HasValue) {
+				attr.AddNamedFieldArgument("SafeArraySubType", CreateSimpleConstantValue(typeof(VarEnum).ToTypeReference(), (int)marshalInfo.SafeArraySubType));
+			}
+
+			if (marshalInfo.UnmanagedType == UnmanagedType.LPArray) {
+				if (marshalInfo.ArraySubType != null)
+					attr.AddNamedFieldArgument("ArraySubType", CreateSimpleConstantValue(unmanagedTypeTypeRef, (int)marshalInfo.ArraySubType));
+				if (marshalInfo.SizeConst >= 0)
+					attr.AddNamedFieldArgument("SizeConst", CreateSimpleConstantValue((int)marshalInfo.SizeConst));
+				if (marshalInfo.SizeParamIndex >= 0)
+					attr.AddNamedFieldArgument("SizeParamIndex", CreateSimpleConstantValue((short)marshalInfo.SizeParamIndex));
+			}
+
+			if (marshalInfo.UnmanagedType == UnmanagedType.CustomMarshaler) {
+				attr.AddNamedFieldArgument("MarshalType", CreateSimpleConstantValue(marshalInfo.MarshalType));
+				if (!string.IsNullOrEmpty(marshalInfo.MarshalCookie))
+					attr.AddNamedFieldArgument("MarshalCookie", CreateSimpleConstantValue(marshalInfo.MarshalCookie));
+			}
+
+			if (marshalInfo.UnmanagedType == UnmanagedType.ByValTStr) {
+				attr.AddNamedFieldArgument("SizeConst", CreateSimpleConstantValue((int)marshalInfo.SizeConst));
+			}
+
+			return InterningProvider.Intern(attr);
+		}
+		#endregion
+
+		#region Custom Attributes (ReadAttribute)
+		void AddCustomAttributes(IEnumerable<CustomAttributeData> attributes, ICollection<IUnresolvedAttribute> targetCollection)
+		{
+			foreach (var cecilAttribute in attributes) {
+				var type = cecilAttribute.Constructor.DeclaringType;
+				if (type.__Namespace == "System.Runtime.CompilerServices") {
+					if (type.__Name == "DynamicAttribute" || type.__Name == "ExtensionAttribute" || type.__Name == "DecimalConstantAttribute")
+						continue;
+				} else if (type.__Name == "ParamArrayAttribute" && type.__Namespace == "System") {
+					continue;
+				}
+				targetCollection.Add(ReadAttribute(cecilAttribute));
+			}
+		}
+
+		[CLSCompliant(false)]
+		public IUnresolvedAttribute ReadAttribute(CustomAttributeData attribute)
+		{
+			if (attribute == null)
+				throw new ArgumentNullException("attribute");
+			var ctor = attribute.Constructor;
+			ITypeReference attributeType = ReadTypeReference(attribute.AttributeType);
+			IList<ITypeReference> ctorParameterTypes = EmptyList<ITypeReference>.Instance;
+			var parameters = ctor.GetParameters ();
+			if (parameters.Length > 0) {
+				ctorParameterTypes = new ITypeReference[parameters.Length];
+				for (int i = 0; i < ctorParameterTypes.Count; i++) {
+					ctorParameterTypes[i] = ReadTypeReference(parameters[i].ParameterType);
+				}
+				ctorParameterTypes = interningProvider.InternList(ctorParameterTypes);
+			}
+			byte[] blob;
+			try {
+				blob = attribute.__GetBlob ();
+			} catch (IKVM.Reflection.MissingMemberException) {
+				blob = new byte[0];
+			} catch (Exception e) {
+				blob = new byte[0];
+				Console.Error.WriteLine ("IKVM error while getting blob:" + e);
+			}
+			return interningProvider.Intern(new UnresolvedAttributeBlob(attributeType, ctorParameterTypes, blob));
+		}
+		#endregion
+
+		#region Security Attributes
+		static readonly ITypeReference securityActionTypeReference = typeof(System.Security.Permissions.SecurityAction).ToTypeReference();
+		static readonly ITypeReference permissionSetAttributeTypeReference = typeof(System.Security.Permissions.PermissionSetAttribute).ToTypeReference();
+
+//		/// <summary>
+//		/// Reads a security declaration.
+//		/// </summary>
+//		[CLSCompliant(false)]
+//		public IList<IUnresolvedAttribute> ReadSecurityDeclaration(SecurityDeclaration secDecl)
+//		{
+//			if (secDecl == null)
+//				throw new ArgumentNullException("secDecl");
+//			var result = new List<IUnresolvedAttribute>();
+//			AddSecurityAttributes(secDecl, result);
+//			return result;
+//		}
+//
+//		void AddSecurityAttributes(Mono.Collections.Generic.Collection<SecurityDeclaration> securityDeclarations, IList<IUnresolvedAttribute> targetCollection)
+//		{
+//			foreach (var secDecl in securityDeclarations) {
+//				AddSecurityAttributes(secDecl, targetCollection);
+//			}
+//		}
+
+		void AddSecurityAttributes(IEnumerable<CustomAttributeData> securityAttributes, IList<IUnresolvedAttribute> targetCollection)
+		{
+			AddCustomAttributes (securityAttributes, targetCollection);
+		}
+
+		#endregion
+		#endregion
+
+		#region Read Type Definition
+		DefaultUnresolvedTypeDefinition CreateTopLevelTypeDefinition(IKVM.Reflection.Type typeDefinition)
+		{
+			var td = new DefaultUnresolvedTypeDefinition(typeDefinition.Namespace ?? "", ReflectionHelper.SplitTypeParameterCountFromReflectionName (typeDefinition.Name));
+			if (typeDefinition.IsGenericTypeDefinition)
+				InitTypeParameters(typeDefinition, td.TypeParameters);
+			return td;
+		}
+
+		static void InitTypeParameters(IKVM.Reflection.Type typeDefinition, ICollection<IUnresolvedTypeParameter> typeParameters)
+		{
+			// Type parameters are initialized within the constructor so that the class can be put into the type storage
+			// before the rest of the initialization runs - this allows it to be available for early binding as soon as possible.
+			var genericArguments = typeDefinition.GetGenericArguments ();
+			for (int i = 0; i < genericArguments.Length; i++) {
+				if (genericArguments[i].GenericParameterPosition != i)
+					throw new InvalidOperationException("g.GenericParameterPosition != i");
+				typeParameters.Add(new DefaultUnresolvedTypeParameter(
+					SymbolKind.TypeDefinition, i, genericArguments [i].Name));
+			}
+		}
+
+		void InitTypeParameterConstraints(IKVM.Reflection.Type typeDefinition, IList<IUnresolvedTypeParameter> typeParameters)
+		{
+			var args = typeDefinition.GetGenericArguments ();
+			for (int i = 0; i < typeParameters.Count; i++) {
+				var tp = (DefaultUnresolvedTypeParameter)typeParameters[i];
+				AddConstraints(tp, args[i]);
+				tp.ApplyInterningProvider(interningProvider);
+			}
+		}
+
+		void InitTypeDefinition(IKVM.Reflection.Type typeDefinition, DefaultUnresolvedTypeDefinition td)
+		{
+			td.Kind = GetTypeKind(typeDefinition);
+			InitTypeModifiers(typeDefinition, td);
+			InitTypeParameterConstraints(typeDefinition, td.TypeParameters);
+
+			// nested types can be initialized only after generic parameters were created
+			InitNestedTypes(typeDefinition, td, td.NestedTypes);
+			AddAttributes(typeDefinition, td);
+			td.HasExtensionMethods = HasExtensionAttribute(typeDefinition);
+
+			InitBaseTypes(typeDefinition, td.BaseTypes);
+
+			td.AddDefaultConstructorIfRequired = (td.Kind == TypeKind.Struct || td.Kind == TypeKind.Enum);
+			InitMembers(typeDefinition, td, td.Members);
+			td.ApplyInterningProvider(interningProvider);
+			RegisterCecilObject(td, typeDefinition);
+		}
+
+		void InitBaseTypes(IKVM.Reflection.Type typeDefinition, ICollection<ITypeReference> baseTypes)
+		{
+			// set base classes
+			if (typeDefinition.IsEnum) {
+				foreach (var enumField in typeDefinition.__GetDeclaredFields ()) {
+					if (!enumField.IsStatic) {
+						baseTypes.Add(ReadTypeReference(enumField.FieldType));
+						break;
+					}
+				}
+			} else {
+				if (typeDefinition.BaseType != null) {
+					baseTypes.Add(ReadTypeReference(typeDefinition.BaseType));
+				}
+				foreach (var iface in typeDefinition.__GetDeclaredInterfaces ()) {
+					baseTypes.Add(ReadTypeReference(iface));
+				}
+			}
+		}
+
+		void InitNestedTypes(IKVM.Reflection.Type typeDefinition, IUnresolvedTypeDefinition declaringTypeDefinition, ICollection<IUnresolvedTypeDefinition> nestedTypes)
+		{
+			foreach (var nestedTypeDef in typeDefinition.__GetDeclaredTypes()) {
+				if (IncludeInternalMembers
+					|| nestedTypeDef.IsNestedPublic
+				    || nestedTypeDef.IsNestedFamily
+				    || nestedTypeDef.IsNestedFamORAssem)
+				{
+					string name = nestedTypeDef.Name;
+					int pos = name.LastIndexOf('/');
+					if (pos > 0)
+						name = name.Substring(pos + 1);
+					name = ReflectionHelper.SplitTypeParameterCountFromReflectionName(name);
+					var nestedType = new DefaultUnresolvedTypeDefinition(declaringTypeDefinition, name);
+					InitTypeParameters(nestedTypeDef, nestedType.TypeParameters);
+					nestedTypes.Add(nestedType);
+					InitTypeDefinition(nestedTypeDef, nestedType);
+				}
+			}
+		}
+
+		static TypeKind GetTypeKind(IKVM.Reflection.Type typeDefinition)
+		{
+			// set classtype
+			if (typeDefinition.IsInterface)
+				return TypeKind.Interface;
+			if (typeDefinition.IsEnum)
+				return TypeKind.Enum;
+			if (typeDefinition.IsValueType)
+				return TypeKind.Struct;
+			if (IsDelegate (typeDefinition))
+				return TypeKind.Delegate;
+			if (IsModule (typeDefinition))
+				return TypeKind.Module;
+			return TypeKind.Class;
+		}
+
+		static void InitTypeModifiers(IKVM.Reflection.Type typeDefinition, AbstractUnresolvedEntity td)
+		{
+			td.IsSealed = typeDefinition.IsSealed;
+			td.IsAbstract = typeDefinition.IsAbstract;
+			switch (typeDefinition.Attributes & TypeAttributes.VisibilityMask) {
+				case TypeAttributes.NotPublic:
+				case TypeAttributes.NestedAssembly:
+					td.Accessibility = Accessibility.Internal;
+					break;
+				case TypeAttributes.Public:
+				case TypeAttributes.NestedPublic:
+					td.Accessibility = Accessibility.Public;
+					break;
+				case TypeAttributes.NestedPrivate:
+					td.Accessibility = Accessibility.Private;
+					break;
+				case TypeAttributes.NestedFamily:
+					td.Accessibility = Accessibility.Protected;
+					break;
+				case TypeAttributes.NestedFamANDAssem:
+					td.Accessibility = Accessibility.ProtectedAndInternal;
+					break;
+				case TypeAttributes.NestedFamORAssem:
+					td.Accessibility = Accessibility.ProtectedOrInternal;
+					break;
+			}
+		}
+
+		static bool IsDelegate(IKVM.Reflection.Type type)
+		{
+			if (type.BaseType != null && type.BaseType.Namespace == "System") {
+				if (type.BaseType.Name == "MulticastDelegate")
+					return true;
+				if (type.BaseType.Name == "Delegate" && type.Name != "MulticastDelegate")
+					return true;
+			}
+			return false;
+		}
+
+		static bool IsModule(IKVM.Reflection.Type type)
+		{
+			foreach (var att in type.CustomAttributes) {
+				var dt = att.Constructor.DeclaringType;
+				if (dt.__Name == "StandardModuleAttribute" && dt.__Namespace == "Microsoft.VisualBasic.CompilerServices" 
+				    || dt.__Name == "CompilerGlobalScopeAttribute" && dt.__Namespace == "System.Runtime.CompilerServices")
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+
+		void InitMembers(IKVM.Reflection.Type typeDefinition, IUnresolvedTypeDefinition td, IList<IUnresolvedMember> members)
+		{
+			foreach (var method in typeDefinition.__GetDeclaredMethods ()) {
+				if (method.IsConstructor) {
+					if (IsVisible(method.Attributes)) {
+						SymbolKind type = SymbolKind.Constructor;
+						members.Add(ReadConstructor(method, td, type));
+					}
+					continue;
+				}
+				if (IsVisible(method.Attributes) && !IsAccessor(method)) {
+					SymbolKind type = SymbolKind.Method;
+					if (method.IsSpecialName) {
+						if (method.Name.StartsWith("op_", StringComparison.Ordinal))
+							type = SymbolKind.Operator;
+					}
+					members.Add(ReadMethod(method, td, type));
+				}
+			}
+
+			foreach (var field in typeDefinition.__GetDeclaredFields ()) {
+				if (IsVisible(field.Attributes) && !field.IsSpecialName) {
+					members.Add(ReadField(field, td));
+				}
+			}
+
+			string defaultMemberName = null;
+			var defaultMemberAttribute = typeDefinition.CustomAttributes.FirstOrDefault(
+				a => {
+					var dt = a.Constructor.DeclaringType;
+					return dt.__Name == "DefaultMemberAttribute" && dt.Namespace == "System.Reflection";
+				});
+			if (defaultMemberAttribute != null && defaultMemberAttribute.ConstructorArguments.Count == 1) {
+				defaultMemberName = defaultMemberAttribute.ConstructorArguments[0].Value as string;
+			}
+
+			foreach (var property in typeDefinition.__GetDeclaredProperties ()) {
+				bool getterVisible = property.GetMethod != null && IsVisible(property.GetMethod.Attributes);
+				bool setterVisible = property.SetMethod != null && IsVisible(property.SetMethod.Attributes);
+				if (getterVisible || setterVisible) {
+					SymbolKind type = SymbolKind.Property;
+					if (property.GetIndexParameters () != null) {
+						// Try to detect indexer:
+						if (property.Name == defaultMemberName) {
+							type = SymbolKind.Indexer; // normal indexer
+						}
+						// TODO: HasOverrides ?
+						else if (property.Name.EndsWith(".Item", StringComparison.Ordinal) /*&& (property.GetMethod ?? property.SetMethod).HasOverrides*/) {
+							// explicit interface implementation of indexer
+							type = SymbolKind.Indexer;
+							// We can't really tell parameterized properties and indexers apart in this case without
+							// resolving the interface, so we rely on the "Item" naming convention instead.
+						}
+					}
+					members.Add(ReadProperty(property, td, type));
+				}
+			}
+
+			foreach (var ev in typeDefinition.__GetDeclaredEvents ()) {
+				if (ev.AddMethod != null && IsVisible(ev.AddMethod.Attributes)) {
+					members.Add(ReadEvent(ev, td));
+				}
+			}
+		}
+
+		static bool IsAccessor(MethodBase methodInfo)
+		{
+			if (!methodInfo.IsSpecialName)
+				return false;
+
+			var name = methodInfo.Name;
+			return 
+				name.StartsWith("get_", StringComparison.Ordinal) ||
+				name.StartsWith("set_", StringComparison.Ordinal) ||
+				name.StartsWith("add_", StringComparison.Ordinal) ||
+				name.StartsWith("remove_", StringComparison.Ordinal) ||
+				name.StartsWith("raise_", StringComparison.Ordinal);
+		}
+		#endregion
+
+		#region Read Method
+		[CLSCompliant(false)]
+		public IUnresolvedMethod ReadMethod(MethodBase method, IUnresolvedTypeDefinition parentType, SymbolKind methodType = SymbolKind.Method)
+		{
+			return ReadMethod((MethodInfo)method, parentType, methodType, null);
+		}
+
+		const MethodAttributes nonBodyAttr = MethodAttributes.Abstract | MethodAttributes.PinvokeImpl;
+		const MethodImplAttributes nonBodyImplAttr = MethodImplAttributes.InternalCall | MethodImplAttributes.Native | MethodImplAttributes.Unmanaged;
+
+		IUnresolvedMethod ReadMethod(MethodInfo method, IUnresolvedTypeDefinition parentType, SymbolKind methodType, IUnresolvedMember accessorOwner)
+		{
+			if (method == null)
+				return null;
+			var m = new DefaultUnresolvedMethod(parentType, method.Name);
+			m.SymbolKind = methodType;
+			m.AccessorOwner = accessorOwner;
+			m.HasBody = (method.Attributes & nonBodyAttr) == 0 && (method.GetMethodImplementationFlags () & nonBodyImplAttr) == 0;
+			if (method.IsGenericMethodDefinition) {
+				var genericArguments = method.GetGenericArguments ();
+				if (genericArguments != null) {
+					for (int i = 0; i < genericArguments.Length; i++) {
+						if (genericArguments[i].GenericParameterPosition != i)
+							throw new InvalidOperationException("g.Position != i");
+						m.TypeParameters.Add(new DefaultUnresolvedTypeParameter(
+							SymbolKind.Method, i, genericArguments[i].Name));
+					}
+					for (int i = 0; i < genericArguments.Length; i++) {
+						var tp = (DefaultUnresolvedTypeParameter)m.TypeParameters[i];
+						AddConstraints(tp, genericArguments[i]);
+						tp.ApplyInterningProvider(interningProvider);
+					}
+				}
+			}
+
+			m.ReturnType = ReadTypeReference(method.ReturnType, typeAttributes: method.ReturnParameter.CustomAttributes);
+			if (HasAnyAttributes(method))
+				AddAttributes(method, m.Attributes, m.ReturnTypeAttributes);
+			TranslateModifiers(method, m);
+
+			foreach (var p in method.GetParameters ()) {
+				m.Parameters.Add(ReadParameter(p));
+			}
+
+			// mark as extension method if the attribute is set
+			if (method.IsStatic && HasExtensionAttribute(method)) {
+				m.IsExtensionMethod = true;
+			}
+
+			int lastDot = method.Name.LastIndexOf('.');
+			if (lastDot >= 0 /*&& method.HasOverrides*/) {
+				// To be consistent with the parser-initialized type system, shorten the method name:
+				m.Name = method.Name.Substring(lastDot + 1);
+				m.IsExplicitInterfaceImplementation = true;
+				
+				foreach (var or in method.__GetMethodImpls ()) {
+					m.ExplicitInterfaceImplementations.Add(new DefaultMemberReference(
+						accessorOwner != null ? SymbolKind.Accessor : SymbolKind.Method,
+						ReadTypeReference(or.DeclaringType),
+						or.Name, or.GetGenericArguments ().Length, m.Parameters.Select(p => p.Type).ToList()));
+				}
+			}
+
+			FinishReadMember(m, method);
+			return m;
+		}
+
+		static bool HasExtensionAttribute(MemberInfo provider)
+		{
+			foreach (var attr in provider.CustomAttributes) {
+				var attributeType = attr.Constructor.DeclaringType;
+				if (attributeType.__Name == "ExtensionAttribute" && attributeType.__Namespace == "System.Runtime.CompilerServices")
+					return true;
+			}
+			return false;
+		}
+
+		bool IsVisible(MethodAttributes att)
+		{
+			att &= MethodAttributes.MemberAccessMask;
+			return IncludeInternalMembers
+				|| att == MethodAttributes.Public
+				|| att == MethodAttributes.Family
+				|| att == MethodAttributes.FamORAssem;
+		}
+
+		static Accessibility GetAccessibility(MethodAttributes attr)
+		{
+			switch (attr & MethodAttributes.MemberAccessMask) {
+				case MethodAttributes.Public:
+				return Accessibility.Public;
+				case MethodAttributes.FamANDAssem:
+				return Accessibility.ProtectedAndInternal;
+				case MethodAttributes.Assembly:
+				return Accessibility.Internal;
+				case MethodAttributes.Family:
+				return Accessibility.Protected;
+				case MethodAttributes.FamORAssem:
+				return Accessibility.ProtectedOrInternal;
+				default:
+				return Accessibility.Private;
+			}
+		}
+
+		void TranslateModifiers(MethodBase method, AbstractUnresolvedMember m)
+		{
+			if (m.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
+				// interface members don't have modifiers, but we want to handle them as "public abstract"
+				m.Accessibility = Accessibility.Public;
+				m.IsAbstract = true;
+			} else {
+				m.Accessibility = GetAccessibility(method.Attributes);
+				if (method.IsAbstract) {
+					m.IsAbstract = true;
+					m.IsOverride = (method.Attributes & MethodAttributes.NewSlot) == 0;
+				} else if (method.IsFinal) {
+					if ((method.Attributes & MethodAttributes.NewSlot) == 0) {
+						m.IsSealed = true;
+						m.IsOverride = true;
+					}
+				} else if (method.IsVirtual) {
+					if ((method.Attributes & MethodAttributes.NewSlot) != 0)
+						m.IsVirtual = true;
+					else
+						m.IsOverride = true;
+				}
+				m.IsStatic = method.IsStatic;
+			}
+		}
+		#endregion
+
+		#region Read Constructor
+		[CLSCompliant(false)]
+		public IUnresolvedMethod ReadConstructor(MethodBase method, IUnresolvedTypeDefinition parentType, SymbolKind methodType = SymbolKind.Method)
+		{
+			return ReadConstructor((ConstructorInfo)method, parentType, methodType, null);
+		}
+
+		IUnresolvedMethod ReadConstructor(ConstructorInfo method, IUnresolvedTypeDefinition parentType, SymbolKind methodType, IUnresolvedMember accessorOwner)
+		{
+			if (method == null)
+				return null;
+			var m = new DefaultUnresolvedMethod(parentType, method.Name);
+			m.SymbolKind = methodType;
+			m.AccessorOwner = accessorOwner;
+			m.HasBody = !method.DeclaringType.IsInterface && (method.GetMethodImplementationFlags () & MethodImplAttributes.CodeTypeMask) == MethodImplAttributes.IL;
+			var genericArguments = method.GetGenericArguments ();
+			if (genericArguments != null) {
+				for (int i = 0; i < genericArguments.Length; i++) {
+					if (genericArguments[i].GenericParameterPosition != i)
+						throw new InvalidOperationException("g.Position != i");
+					m.TypeParameters.Add(new DefaultUnresolvedTypeParameter(
+						SymbolKind.Method, i, genericArguments[i].Name));
+				}
+				for (int i = 0; i < genericArguments.Length; i++) {
+					var tp = (DefaultUnresolvedTypeParameter)m.TypeParameters[i];
+					AddConstraints(tp, genericArguments[i]);
+					tp.ApplyInterningProvider(interningProvider);
+				}
+			}
+			m.ReturnType = KnownTypeReference.Void;
+
+
+			if (HasAnyAttributes(method))
+				AddAttributes(method, m.Attributes, m.ReturnTypeAttributes);
+			TranslateModifiers(method, m);
+
+			foreach (var p in method.GetParameters ()) {
+				m.Parameters.Add(ReadParameter(p));
+			}
+
+			FinishReadMember(m, method);
+			return m;
+		}
+
+		#endregion
+
+		#region Read Parameter
+		[CLSCompliant(false)]
+		public IUnresolvedParameter ReadParameter(ParameterInfo parameter)
+		{
+			if (parameter == null)
+				throw new ArgumentNullException("parameter");
+			var customAttributes = parameter.CustomAttributes;
+			var parameterType = parameter.ParameterType;
+			var type = ReadTypeReference(parameterType, typeAttributes: customAttributes);
+			var p = new DefaultUnresolvedParameter(type, interningProvider.Intern(parameter.Name ?? "index"));
+
+			if (parameterType.IsByRef) {
+				if (!parameter.IsIn && parameter.IsOut)
+					p.IsOut = true;
+				else
+					p.IsRef = true;
+			}
+			AddAttributes(parameter, p, customAttributes);
+
+			if (parameter.IsOptional) {
+				p.DefaultValue = CreateSimpleConstantValue(type, parameter.RawDefaultValue);
+			}
+
+			if (parameterType.IsArray) {
+				foreach (var att in customAttributes) {
+					var dt = att.Constructor.DeclaringType;
+					if (dt.__Name == "ParamArrayAttribute" && dt.Namespace == "System") {
+						p.IsParams = true;
+						break;
+					}
+				}
+			}
+
+			return interningProvider.Intern(p);
+		}
+		#endregion
+
+		#region Read Field
+		bool IsVisible(FieldAttributes att)
+		{
+			att &= FieldAttributes.FieldAccessMask;
+			return IncludeInternalMembers
+				|| att == FieldAttributes.Public
+					|| att == FieldAttributes.Family
+					|| att == FieldAttributes.FamORAssem;
+		}
+
+		decimal? TryDecodeDecimalConstantAttribute(CustomAttributeData attribute)
+		{
+			if (attribute.ConstructorArguments.Count != 5)
+				return null;
+
+			var reader = new BlobReader(attribute.__GetBlob(), null);
+			if (reader.ReadUInt16() != 0x0001) {
+				Debug.WriteLine("Unknown blob prolog");
+				return null;
+			}
+
+			// DecimalConstantAttribute has the arguments (byte scale, byte sign, uint hi, uint mid, uint low) or (byte scale, byte sign, int hi, int mid, int low)
+			// Both of these invoke the Decimal constructor (int lo, int mid, int hi, bool isNegative, byte scale) with explicit argument conversions if required.
+			var ctorArgs = new object[attribute.ConstructorArguments.Count];
+			for (int i = 0; i < ctorArgs.Length; i++) {
+				switch (attribute.ConstructorArguments[i].ArgumentType.FullName) {
+					case "System.Byte":
+					ctorArgs[i] = reader.ReadByte();
+					break;
+					case "System.Int32":
+					ctorArgs[i] = reader.ReadInt32();
+					break;
+					case "System.UInt32":
+					ctorArgs[i] = unchecked((int)reader.ReadUInt32());
+					break;
+					default:
+					return null;
+				}
+			}
+
+			if (!ctorArgs.Select(a => a.GetType()).SequenceEqual(new[] { typeof(byte), typeof(byte), typeof(int), typeof(int), typeof(int) }))
+				return null;
+
+			return new decimal((int)ctorArgs[4], (int)ctorArgs[3], (int)ctorArgs[2], (byte)ctorArgs[1] != 0, (byte)ctorArgs[0]);
+		}
+
+		[CLSCompliant(false)]
+		public IUnresolvedField ReadField(FieldInfo field, IUnresolvedTypeDefinition parentType)
+		{
+			if (field == null)
+				throw new ArgumentNullException("field");
+			if (parentType == null)
+				throw new ArgumentNullException("parentType");
+			var f = new DefaultUnresolvedField(parentType, field.Name);
+			f.Accessibility = GetAccessibility(field.Attributes);
+			f.IsReadOnly = field.IsInitOnly;
+			f.IsStatic = field.IsStatic;
+			f.ReturnType = ReadTypeReference(field.FieldType, typeAttributes: field.CustomAttributes);
+
+			if ((field.Attributes & FieldAttributes.HasDefault) != 0) {
+				f.ConstantValue = CreateSimpleConstantValue(f.ReturnType, field.GetRawConstantValue ());
+			}
+			else {
+				var decConstant = field.CustomAttributes.FirstOrDefault(a => {
+					var dt = a.Constructor.DeclaringType;
+					return dt.__Name == "DecimalConstantAttribute" && dt.__Namespace == "System.Runtime.CompilerServices";
+				});
+				if (decConstant != null) {
+					var constValue = TryDecodeDecimalConstantAttribute(decConstant);
+					if (constValue != null)
+						f.ConstantValue = CreateSimpleConstantValue(f.ReturnType, constValue);
+				}
+			}
+			AddAttributes(field, f);
+
+			if (field.GetRequiredCustomModifiers ().Any (mt => mt.FullName == typeof(IsVolatile).FullName)) {
+				f.IsVolatile = true;
+			}
+
+			FinishReadMember(f, field);
+			return f;
+		}
+
+		static Accessibility GetAccessibility(FieldAttributes attr)
+		{
+			switch (attr & FieldAttributes.FieldAccessMask) {
+				case FieldAttributes.Public:
+					return Accessibility.Public;
+				case FieldAttributes.FamANDAssem:
+					return Accessibility.ProtectedAndInternal;
+				case FieldAttributes.Assembly:
+					return Accessibility.Internal;
+				case FieldAttributes.Family:
+					return Accessibility.Protected;
+				case FieldAttributes.FamORAssem:
+					return Accessibility.ProtectedOrInternal;
+				default:
+					return Accessibility.Private;
+			}
+		}
+		#endregion
+
+		#region Type Parameter Constraints
+		void AddConstraints(DefaultUnresolvedTypeParameter tp, IKVM.Reflection.Type g)
+		{
+			var attr = g.GenericParameterAttributes;
+			if ((attr & GenericParameterAttributes.Contravariant) != 0) {
+				tp.Variance = VarianceModifier.Contravariant;
+			} else if ((attr & GenericParameterAttributes.Covariant) != 0) {
+				tp.Variance = VarianceModifier.Covariant;
+			}
+
+			tp.HasReferenceTypeConstraint = (attr & GenericParameterAttributes.ReferenceTypeConstraint) != 0;
+			tp.HasValueTypeConstraint = (attr & GenericParameterAttributes.NotNullableValueTypeConstraint) != 0;
+			tp.HasDefaultConstructorConstraint = (attr & GenericParameterAttributes.DefaultConstructorConstraint) != 0;
+
+			foreach (var constraint in g.GetGenericParameterConstraints ()) {
+				tp.Constraints.Add(ReadTypeReference(constraint));
+			}
+		}
+		#endregion
+
+		#region Read Property
+
+		Accessibility MergePropertyAccessibility (Accessibility left, Accessibility right)
+		{
+			if (left == Accessibility.Public || right == Accessibility.Public)
+				return Accessibility.Public;
+
+			if (left == Accessibility.ProtectedOrInternal || right == Accessibility.ProtectedOrInternal)
+				return Accessibility.ProtectedOrInternal;
+
+			if (left == Accessibility.Protected && right == Accessibility.Internal || 
+			    left == Accessibility.Internal && right == Accessibility.Protected)
+				return Accessibility.ProtectedOrInternal;
+
+			if (left == Accessibility.Protected || right == Accessibility.Protected)
+				return Accessibility.Protected;
+
+			if (left == Accessibility.Internal || right == Accessibility.Internal)
+				return Accessibility.Internal;
+
+			if (left == Accessibility.ProtectedAndInternal || right == Accessibility.ProtectedAndInternal)
+				return Accessibility.ProtectedAndInternal;
+
+			return left;
+		}
+
+		[CLSCompliant(false)]
+		public IUnresolvedProperty ReadProperty(PropertyInfo property, IUnresolvedTypeDefinition parentType, SymbolKind propertyType = SymbolKind.Property)
+		{
+			if (property == null)
+				throw new ArgumentNullException("property");
+			if (parentType == null)
+				throw new ArgumentNullException("parentType");
+
+			var p = new DefaultUnresolvedProperty(parentType, property.Name);
+			p.SymbolKind = propertyType;
+			TranslateModifiers(property.GetMethod ?? property.SetMethod, p);
+			if (property.GetMethod != null && property.SetMethod != null)
+				p.Accessibility = MergePropertyAccessibility (GetAccessibility (property.GetMethod.Attributes), GetAccessibility (property.SetMethod.Attributes));
+			p.ReturnType = ReadTypeReference(property.PropertyType, typeAttributes: property.CustomAttributes);
+
+			p.Getter = ReadMethod(property.GetMethod, parentType, SymbolKind.Accessor, p);
+			p.Setter = ReadMethod(property.SetMethod, parentType, SymbolKind.Accessor, p);
+
+			foreach (var par in property.GetIndexParameters ()) {
+				p.Parameters.Add(ReadParameter(par));
+			}
+
+			AddAttributes(property, p);
+
+			var accessor = p.Getter ?? p.Setter;
+			if (accessor != null && accessor.IsExplicitInterfaceImplementation) {
+				p.Name = property.Name.Substring(property.Name.LastIndexOf('.') + 1);
+				p.IsExplicitInterfaceImplementation = true;
+				foreach (var mr in accessor.ExplicitInterfaceImplementations) {
+					p.ExplicitInterfaceImplementations.Add(new AccessorOwnerMemberReference(mr));
+				}
+			}
+
+			FinishReadMember(p, property);
+			return p;
+		}
+		#endregion
+
+		#region Read Event
+		[CLSCompliant(false)]
+		public IUnresolvedEvent ReadEvent(EventInfo ev, IUnresolvedTypeDefinition parentType)
+		{
+			if (ev == null)
+				throw new ArgumentNullException("ev");
+			if (parentType == null)
+				throw new ArgumentNullException("parentType");
+
+			DefaultUnresolvedEvent e = new DefaultUnresolvedEvent(parentType, ev.Name);
+			TranslateModifiers(ev.AddMethod, e);
+			e.ReturnType = ReadTypeReference(ev.EventHandlerType, typeAttributes: ev.CustomAttributes);
+
+			e.AddAccessor    = ReadMethod(ev.AddMethod,    parentType, SymbolKind.Accessor, e);
+			e.RemoveAccessor = ReadMethod(ev.RemoveMethod, parentType, SymbolKind.Accessor, e);
+			e.InvokeAccessor = ReadMethod(ev.RaiseMethod, parentType, SymbolKind.Accessor, e);
+
+			AddAttributes(ev, e);
+
+			var accessor = e.AddAccessor ?? e.RemoveAccessor ?? e.InvokeAccessor;
+			if (accessor != null && accessor.IsExplicitInterfaceImplementation) {
+				e.Name = ev.Name.Substring(ev.Name.LastIndexOf('.') + 1);
+				e.IsExplicitInterfaceImplementation = true;
+				foreach (var mr in accessor.ExplicitInterfaceImplementations) {
+					e.ExplicitInterfaceImplementations.Add(new AccessorOwnerMemberReference(mr));
+				}
+			}
+
+			FinishReadMember(e, ev);
+
+			return e;
+		}
+		#endregion
+
+		#region FinishReadMember / Interning
+		void FinishReadMember(AbstractUnresolvedMember member, MemberInfo ikvmDefinition)
+		{
+			member.ApplyInterningProvider(interningProvider);
+			RegisterCecilObject(member, ikvmDefinition);
+		}
+		#endregion
+
+		#region Type system translation table
+		void RegisterCecilObject(IUnresolvedEntity typeSystemObject, MemberInfo cecilObject)
+		{
+			if (OnEntityLoaded != null)
+				OnEntityLoaded(typeSystemObject, cecilObject);
+		}
+		#endregion
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/IntConstantValue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/IntConstantValue.cs
new file mode 100644
index 0000000000..dc760c4f86
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/IntConstantValue.cs
@@ -0,0 +1,65 @@
+//
+// IntConstantValue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory
+{
+	[Serializable]
+	sealed class IntConstantValue : IConstantValue, ISupportsInterning 
+	{
+		readonly int value;
+
+		public IntConstantValue (int value)
+		{
+			this.value = value;
+		}
+
+		public ResolveResult Resolve(ITypeResolveContext context)
+		{
+			return new ConstantResolveResult(KnownTypeReference.Int32.Resolve (context), value);
+		}
+
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase",
+			Justification = "The C# keyword is lower case")]
+		public override string ToString()
+		{
+			return value.ToString ();
+		}
+
+		int ISupportsInterning.GetHashCodeForInterning()
+		{
+			return value.GetHashCode ();
+		}
+
+		bool ISupportsInterning.EqualsForInterning(ISupportsInterning other)
+		{
+			var scv = other as IntConstantValue;
+			return scv != null && value == scv.value;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/NonFrozenInterningProvider.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/NonFrozenInterningProvider.cs
new file mode 100644
index 0000000000..c2d969e696
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/NonFrozenInterningProvider.cs
@@ -0,0 +1,136 @@
+// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+
+using ICSharpCode.NRefactory.Utils;
+
+namespace ICSharpCode.NRefactory.TypeSystem.Implementation
+{
+	sealed class NonFrozenInterningProvider : InterningProvider
+	{
+		sealed class InterningComparer : IEqualityComparer<ISupportsInterning>
+		{
+			public bool Equals(ISupportsInterning x, ISupportsInterning y)
+			{
+				return x.EqualsForInterning(y);
+			}
+
+			public int GetHashCode(ISupportsInterning obj)
+			{
+				return obj.GetHashCodeForInterning();
+			}
+		}
+
+		sealed class ListComparer : IEqualityComparer<IEnumerable>
+		{
+			public bool Equals(IEnumerable a, IEnumerable b)
+			{
+				if (a.GetType() != b.GetType())
+					return false;
+				IEnumerator e1 = a.GetEnumerator();
+				IEnumerator e2 = b.GetEnumerator();
+				while (e1.MoveNext()) {
+					// e1 has more elements than e2; or elements are different
+					if (!e2.MoveNext() || e1.Current != e2.Current)
+						return false;
+				}
+				if (e2.MoveNext()) // e2 has more elements than e1
+					return false;
+				// No need to dispose e1/e2: non-generic IEnumerator doesn't implement IDisposable,
+				// and the underlying enumerator will likely be a List<T>.Enumerator which has an empty Dispose() method.
+				return true;
+			}
+
+			public int GetHashCode(IEnumerable obj)
+			{
+				int hashCode = obj.GetType().GetHashCode();
+				unchecked {
+					foreach (object o in obj) {
+						hashCode *= 27;
+						hashCode += RuntimeHelpers.GetHashCode(o);
+					}
+				}
+				return hashCode;
+			}
+		}
+
+		Dictionary<object, object> byValueDict = new Dictionary<object, object>();
+		Dictionary<ISupportsInterning, ISupportsInterning> supportsInternDict = new Dictionary<ISupportsInterning, ISupportsInterning>(new InterningComparer());
+		Dictionary<IEnumerable, IEnumerable> listDict = new Dictionary<IEnumerable, IEnumerable>(new ListComparer());
+
+		public override ISupportsInterning Intern(ISupportsInterning obj)
+		{
+			if (obj == null)
+				return null;
+
+			ISupportsInterning output;
+			if (supportsInternDict.TryGetValue(obj, out output)) {
+				return output;
+			} else {
+				supportsInternDict.Add(obj, obj);
+				return obj;
+			}
+		}
+
+		public override string Intern(string text)
+		{
+			if (text == null)
+				return null;
+
+			object output;
+			if (byValueDict.TryGetValue(text, out output))
+				return (string)output;
+			else
+				return text;
+		}
+
+		public override object InternValue(object obj)
+		{
+			if (obj == null)
+				return null;
+
+			object output;
+			if (byValueDict.TryGetValue(obj, out output))
+				return output;
+			else
+				return obj;
+		}
+
+		public override IList<T> InternList<T>(IList<T> list)
+		{
+			if (list == null)
+				return null;
+			if (list.Count == 0)
+				return EmptyList<T>.Instance;
+			if (!list.IsReadOnly)
+				list = new ReadOnlyCollection<T>(list);
+			IEnumerable output;
+			if (listDict.TryGetValue(list, out output))
+				list = (IList<T>)output;
+			else
+				listDict.Add(list, list);
+			return list;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/Properties/AssemblyInfo.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..f3919fc3ae
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/Properties/AssemblyInfo.cs
@@ -0,0 +1,37 @@
+//
+// AssemblyInfo.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+using System;
+using System.Reflection;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("ICSharpCode.NRefactory.IKVM")]
+[assembly: AssemblyDescription("IKVM.Reflection-based Assembly Loader for NRefactory")]
+
+[assembly: CLSCompliant(true)]
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/ShortConstantValue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/ShortConstantValue.cs
new file mode 100644
index 0000000000..788691a4e7
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/ShortConstantValue.cs
@@ -0,0 +1,65 @@
+//
+// ShortConstantValue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory
+{
+	[Serializable]
+	sealed class ShortConstantValue : IConstantValue, ISupportsInterning 
+	{
+		readonly short value;
+
+		public ShortConstantValue (short value)
+		{
+			this.value = value;
+		}
+
+		public ResolveResult Resolve(ITypeResolveContext context)
+		{
+			return new ConstantResolveResult(KnownTypeReference.Int16.Resolve (context), value);
+		}
+
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase",
+			Justification = "The C# keyword is lower case")]
+		public override string ToString()
+		{
+			return value.ToString ();
+		}
+
+		int ISupportsInterning.GetHashCodeForInterning()
+		{
+			return value.GetHashCode ();
+		}
+
+		bool ISupportsInterning.EqualsForInterning(ISupportsInterning other)
+		{
+			var scv = other as ShortConstantValue;
+			return scv != null && value == scv.value;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/StringConstantValue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/StringConstantValue.cs
new file mode 100644
index 0000000000..db75c1a000
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/StringConstantValue.cs
@@ -0,0 +1,65 @@
+//
+// StringConstantValue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory
+{
+	[Serializable]
+	sealed class StringConstantValue : IConstantValue, ISupportsInterning 
+	{
+		readonly string value;
+
+		public StringConstantValue (string value)
+		{
+			this.value = value;
+		}
+
+		public ResolveResult Resolve(ITypeResolveContext context)
+		{
+			return new ConstantResolveResult(KnownTypeReference.String.Resolve (context), value);
+		}
+
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase",
+			Justification = "The C# keyword is lower case")]
+		public override string ToString()
+		{
+			return value;
+		}
+
+		int ISupportsInterning.GetHashCodeForInterning()
+		{
+			return (value ?? "").GetHashCode ();
+		}
+
+		bool ISupportsInterning.EqualsForInterning(ISupportsInterning other)
+		{
+			var scv = other as StringConstantValue;
+			return scv != null && value == scv.value;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/StructConstantValue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/StructConstantValue.cs
new file mode 100644
index 0000000000..25db4b56fb
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.IKVM/StructConstantValue.cs
@@ -0,0 +1,73 @@
+//
+// StructConstantValue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory
+{
+	[Serializable]
+	sealed class StructConstantValue<T> : IConstantValue, ISupportsInterning where T : struct
+	{
+		readonly ITypeReference type;
+		readonly T value;
+
+		public StructConstantValue(ITypeReference type, T value)
+		{
+			if (type == null)
+				throw new ArgumentNullException("type");
+			this.type = type;
+			this.value = value;
+		}
+
+		public ResolveResult Resolve(ITypeResolveContext context)
+		{
+			return new ConstantResolveResult(type.Resolve(context), value);
+		}
+
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase",
+			Justification = "The C# keyword is lower case")]
+		public override string ToString()
+		{
+			if (value is bool)
+				return value.ToString().ToLowerInvariant();
+			else
+				return value.ToString();
+		}
+
+		int ISupportsInterning.GetHashCodeForInterning()
+		{
+			return type.GetHashCode() ^ value.GetHashCode ();
+		}
+
+		bool ISupportsInterning.EqualsForInterning(ISupportsInterning other)
+		{
+			var scv = other as StructConstantValue<T>;
+			return scv != null && type == scv.type && Equals (value, scv.value);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/Analysis/SymbolCollectorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/Analysis/SymbolCollectorTests.cs
index 74a3bb9e84..8bf4338ff8 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/Analysis/SymbolCollectorTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/Analysis/SymbolCollectorTests.cs
@@ -180,7 +180,7 @@ class $A
 ";
 			CollectMembers(code, "A");
 		}
-
+		
 		[Test]
 		public void TestShadowedMember ()
 		{
@@ -201,6 +201,32 @@ class B : A
 
 
 
+		
+		[Test]
+		public void TestShadowedMemberCase2 ()
+		{
+			var code = @"interface IA 
+{
+	int $Prop { get; set; } 
+}
+
+class A : IA
+{
+	public int $Prop
+	{ get; set; }
+}
+
+class B : A, IA
+{
+	public int $Prop
+	{ get; set; }
+}
+";
+			CollectMembers(code, "A.Prop");
+		}
+
+
+
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceTests.cs
new file mode 100644
index 0000000000..cbd5254399
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceTests.cs
@@ -0,0 +1,170 @@
+//
+// LocalDeclarationSpaceTests.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2013 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using System;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.Analysis
+{
+	[TestFixture]
+	public class LocalDeclarationSpaceTests
+	{
+		LocalDeclarationSpace parent;
+
+		LocalDeclarationSpace child;
+
+		[SetUp]
+		public void SetUp()
+		{
+			parent = new LocalDeclarationSpace();
+			child = new LocalDeclarationSpace();
+		}
+
+		[Test]
+		public void AddChildSpace()
+		{
+			parent.AddChildSpace(child);
+			Assert.AreEqual(child.Parent, parent, "The parent was not set.");
+			Assert.That(parent.Children.Contains(child), "The child was not added to the parents children.");
+		}
+
+		[Test]
+		public void AddChildThrowsOnDuplicateChild ()
+		{
+			parent.AddChildSpace(child);
+			Assert.Throws<InvalidOperationException>(delegate {
+				parent.AddChildSpace(child);
+			});
+		}
+
+		[Test]
+		public void ContainsNameSimpleVariableDeclaration()
+		{
+			parent.AddChildSpace(child);
+
+			var input = @"
+class Foo
+{
+	void Bar()
+	{
+		int $i;
+	}
+}";
+			var context = TestRefactoringContext.Create(input);
+			child.AddDeclaration("i", context.GetNode<VariableInitializer>());
+			
+			Assert.That(child.ContainsName("i", false), "The declaration was not added to child correctly.");
+			Assert.That(!parent.ContainsName("i", false), "parent incorrectly contained the declaration.");
+			Assert.That(parent.ContainsName("i", true), "parent did not contain the declaration, event though it should have.");
+		}
+
+		[Test]
+		public void IsNameTakenSimpleVariableDeclarationInParent()
+		{
+			parent.AddChildSpace(child);
+
+			var input = @"
+class Foo
+{
+	void Bar()
+	{
+		int $i;
+	}
+}";
+			var context = TestRefactoringContext.Create(input);
+			parent.AddDeclaration("i", context.GetNode<VariableInitializer>());
+
+			Assert.That(parent.IsNameUsed("i"), "The declaration was not added to parent correctly.");
+			Assert.That(child.IsNameUsed("i"), "child did not contain the declaration, event though it should have.");
+
+			Assert.That(!parent.IsNameUsed("j"), "parent contained a non-existent declaration.");
+			Assert.That(!child.IsNameUsed("j"), "parent contained a non-existent declaration.");
+		}
+
+		[Test]
+		public void IsNameTakenMultipleChildSpaces()
+		{
+			parent.AddChildSpace(child);
+			var child2 = new LocalDeclarationSpace();
+			parent.AddChildSpace(child2);
+
+			var input = @"
+class Foo
+{
+	void Bar()
+	{
+		{
+			int $i;
+		}
+	}
+}";
+			var context = TestRefactoringContext.Create(input);
+			child2.AddDeclaration("i", context.GetNode<VariableInitializer>());
+
+			Assert.That(parent.IsNameUsed("i"), "The declaration was not added to parent correctly.");
+			Assert.That(!child.IsNameUsed("i"), "child contained the declaration, event though it shouldn't.");
+			Assert.That(child2.IsNameUsed("i"), "child2 did not contain the declaration, event though it should have.");
+
+			Assert.That(!parent.IsNameUsed("j"), "parent contained a non-existent declaration.");
+			Assert.That(!child.IsNameUsed("j"), "parent contained a non-existent declaration.");
+			Assert.That(!child2.IsNameUsed("j"), "parent contained a non-existent declaration.");
+		}
+
+		[Test]
+		public void GetNameDeclarationsNoDeclarations()
+		{
+			var node = new IdentifierExpression();
+			child.AddDeclaration("blah", node);
+
+			var declarations = child.GetNameDeclarations("notBlah");
+			Assert.NotNull(declarations, "declarations");
+			Assert.AreEqual(0, declarations.Count(), "Wrong declaration count");
+		}
+
+		[Test]
+		public void GetNameDeclarationsInChildSpace()
+		{
+			var child2 = new LocalDeclarationSpace();
+			parent.AddChildSpace(child);
+			parent.AddChildSpace(child2);
+
+			var node1 = new IdentifierExpression();
+			child.AddDeclaration("blah", node1);
+
+			var node2 = new IdentifierExpression();
+			child.AddDeclaration("blah", node2);
+
+			var declarations = parent.GetNameDeclarations("blah").ToList();
+			Assert.NotNull(declarations, "declarations");
+			Assert.AreEqual(2, declarations.Count, "Wrong declaration count");
+			Assert.That(declarations.Contains(node1), "node1 was not one of the declarations");
+			Assert.That(declarations.Contains(node2), "node2 was not one of the declarations");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceVisitorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceVisitorTests.cs
new file mode 100644
index 0000000000..1ae18ef7fa
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceVisitorTests.cs
@@ -0,0 +1,118 @@
+//
+// LocalVariableLocalDeclarationSpaceVisitor.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2013 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.Analysis
+{
+	[TestFixture]
+	public class LocalDeclarationSpaceVisitorTests
+	{
+		static LocalDeclarationSpaceVisitor GetVisitor(out TestRefactoringContext context, string input)
+		{
+			context = TestRefactoringContext.Create(input);
+			var visitor = new LocalDeclarationSpaceVisitor();
+			context.RootNode.AcceptVisitor(visitor);
+			return visitor;
+		}
+
+		[Test]
+		public void SimpleDeclaration()
+		{
+			TestRefactoringContext context;
+			var visitor = GetVisitor(out context, @"
+class A
+{
+	void B()
+	{
+		int $c = 1;
+	}
+}");
+			var declarationSpace = visitor.GetDeclarationSpace(context.GetNode<VariableInitializer>());
+			Assert.That(declarationSpace.ContainsName("c", false), "The variable name was missing in the declaration space.");
+		}
+
+		[Test]
+		public void FieldDeclaration()
+		{
+			TestRefactoringContext context;
+			var visitor = GetVisitor(out context, @"
+class A
+{
+	int $c = 1;
+	void B()
+	{
+	}
+}");
+			var declarationSpace = visitor.GetDeclarationSpace(context.GetNode<VariableInitializer>());
+			Assert.IsNull(declarationSpace);
+		}
+
+		[Test]
+		public void MethodWithParameters()
+		{
+			TestRefactoringContext context;
+			var visitor = GetVisitor(out context, @"
+class A
+{
+	void B(int c)
+	{
+		int $d = 0;
+	}
+}");
+			var bodyDeclarationSpace = visitor.GetDeclarationSpace(context.GetNode<VariableInitializer>());
+			Assert.That(bodyDeclarationSpace.ContainsName("d", false), "The variable 'd' was not in the declaration space.");
+			Assert.That(!bodyDeclarationSpace.ContainsName("c", false), "The variable 'c' was in the wrong declaration space.");
+
+			var methodDeclarationSpace = bodyDeclarationSpace.Parent;
+			Assert.NotNull(methodDeclarationSpace, "The declaration space did not have a parent.");
+			Assert.That(methodDeclarationSpace.ContainsName("c", false), "The variable 'c' was not in the declaration space.");
+		}
+
+		[Test]
+		public void CustomEventDeclaration()
+		{
+			TestRefactoringContext context;
+			var visitor = GetVisitor(out context, @"
+class A
+{
+	event Action SomethingHappened
+	{
+		add {
+			int $i = 1;
+		}
+		remove {
+			int i = 2;
+		}
+	}
+}");
+			var bodyDeclarationSpace = visitor.GetDeclarationSpace(context.GetNode<VariableInitializer>());
+			Assert.That(bodyDeclarationSpace.ContainsName("i", false), "The variable 'i' was not in the declaration space.");
+			Assert.AreEqual(2, bodyDeclarationSpace.Parent.Children.Count, "Wrong number of child declaration spaces in the event declaration");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Analysis/NullValueAnalysisTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Analysis/NullValueAnalysisTests.cs
new file mode 100644
index 0000000000..e15cad4a8e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Analysis/NullValueAnalysisTests.cs
@@ -0,0 +1,2190 @@
+//
+// NullValueAnalysisTests.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com
+//
+// Copyright (c) 2013 Luís Reis
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Threading;
+using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using System.Diagnostics;
+
+namespace ICSharpCode.NRefactory.CSharp.Analysis
+{
+	[TestFixture]
+	public class NullValueAnalysisTests
+	{
+		class StubbedRefactoringContext : BaseRefactoringContext
+		{
+			bool supportsVersion5;
+
+			public override string DefaultNamespace {
+				get {
+					return string.Empty;
+				}
+			}
+
+			StubbedRefactoringContext(CSharpAstResolver resolver, bool supportsVersion5) :
+				base(resolver, CancellationToken.None) {
+				this.supportsVersion5 = supportsVersion5;
+			}
+
+			internal static StubbedRefactoringContext Create(SyntaxTree tree, bool supportsVersion5 = true)
+			{
+				IProjectContent pc = new CSharpProjectContent();
+				pc = pc.AddAssemblyReferences(CecilLoaderTests.Mscorlib);
+				pc = pc.AddOrUpdateFiles(new[] {
+					tree.ToTypeSystem()
+				});
+				var compilation = pc.CreateCompilation();
+				var resolver = new CSharpAstResolver(compilation, tree);
+
+				return new StubbedRefactoringContext(resolver, supportsVersion5);
+			}
+
+			#region implemented abstract members of BaseRefactoringContext
+			public override int GetOffset(TextLocation location)
+			{
+				throw new NotImplementedException();
+			}
+			public override ICSharpCode.NRefactory.Editor.IDocumentLine GetLineByOffset(int offset)
+			{
+				throw new NotImplementedException();
+			}
+			public override TextLocation GetLocation(int offset)
+			{
+				throw new NotImplementedException();
+			}
+			public override string GetText(int offset, int length)
+			{
+				throw new NotImplementedException();
+			}
+			public override string GetText(ICSharpCode.NRefactory.Editor.ISegment segment)
+			{
+				throw new NotImplementedException();
+			}
+			#endregion
+
+
+			public override bool Supports(Version version)
+			{
+				if (supportsVersion5)
+					return version.Major <= 5;
+				return version.Major <= 4;
+			}
+		}
+
+		static NullValueAnalysis CreateNullValueAnalysis(SyntaxTree tree, MethodDeclaration methodDeclaration, bool supportsCSharp5 = true)
+		{
+			var ctx = StubbedRefactoringContext.Create(tree, supportsCSharp5);
+			var analysis =  new NullValueAnalysis(ctx, methodDeclaration, CancellationToken.None) {
+				IsParametersAreUninitialized = true
+			};
+			analysis.Analyze();
+			return analysis;
+		}
+
+		static NullValueAnalysis CreateNullValueAnalysis(MethodDeclaration methodDeclaration)
+		{
+			var type = new TypeDeclaration {
+				Name = "DummyClass",
+				ClassType = ClassType.Class
+			};
+			type.Members.Add(methodDeclaration);
+			var tree = new SyntaxTree { FileName = "test.cs" };
+			tree.Members.Add(type);
+
+			return CreateNullValueAnalysis(tree, methodDeclaration);
+		}
+
+		static ParameterDeclaration CreatePrimitiveParameter(string typeKeyword, string parameterName)
+		{
+			return new ParameterDeclaration(new PrimitiveType(typeKeyword), parameterName);
+		}
+
+		static ParameterDeclaration CreateStringParameter(string parameterName = "p")
+		{
+			return CreatePrimitiveParameter("string", parameterName);
+		}
+
+		[Test]
+		public void TestSimple()
+		{
+			var method = new MethodDeclaration {
+				Body = new BlockStatement {
+					new ExpressionStatement(new AssignmentExpression(
+						new IdentifierExpression("p"), new NullReferenceExpression())),
+					new ExpressionStatement(new AssignmentExpression(
+						new IdentifierExpression("p"), new PrimitiveExpression("Hello"))),
+					new ReturnStatement()
+				}
+			};
+			method.Parameters.Add(CreateStringParameter());
+
+			var analysis = CreateNullValueAnalysis(method);
+			var stmt1 = method.Body.Statements.First();
+			var stmt2 = method.Body.Statements.ElementAt(1);
+			
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(stmt1, "p"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusBeforeStatement(stmt2, "p"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(stmt2, "p"));
+		}
+
+		[Test]
+		public void TestIfStatement()
+		{
+			var method = new MethodDeclaration {
+				Body = new BlockStatement {
+					new IfElseStatement {
+						Condition = new BinaryOperatorExpression(new IdentifierExpression("p"),
+						                                         BinaryOperatorType.Equality,
+						                                         new NullReferenceExpression()),
+						TrueStatement = new ExpressionStatement(new AssignmentExpression(
+							new IdentifierExpression("p"),
+							new PrimitiveExpression("Hello")))
+					},
+					new ReturnStatement()
+				}
+			};
+			method.Parameters.Add(CreateStringParameter());
+
+			var analysis = CreateNullValueAnalysis(method);
+			var stmt1 = (IfElseStatement)method.Body.Statements.First();
+			var stmt2 = (ExpressionStatement)stmt1.TrueStatement;
+			var stmt3 = (ReturnStatement)method.Body.Statements.ElementAt(1);
+
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(stmt1, "p"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusBeforeStatement(stmt2, "p"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(stmt2, "p"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusBeforeStatement(stmt3, "p"));
+		}
+
+		[Test]
+		public void TestEndlessLoop()
+		{
+			var method = new MethodDeclaration {
+				Body = new BlockStatement {
+					new VariableDeclarationStatement(new PrimitiveType("string"),
+					                                 "p2", new NullReferenceExpression()),
+					new WhileStatement {
+						Condition = new BinaryOperatorExpression(new IdentifierExpression("p1"),
+						                                 BinaryOperatorType.Equality,
+						                                 new NullReferenceExpression()),
+						EmbeddedStatement = new ExpressionStatement(
+							new AssignmentExpression(new IdentifierExpression("p2"),
+						                         AssignmentOperatorType.Assign,
+						                         new PrimitiveExpression("")))
+					},
+					new ReturnStatement()
+				}
+			};
+			method.Parameters.Add(CreateStringParameter("p1"));
+
+			var analysis = CreateNullValueAnalysis(method);
+			var stmt1 = (WhileStatement)method.Body.Statements.ElementAt(1);
+			var stmt2 = (ExpressionStatement)stmt1.EmbeddedStatement;
+			var stmt3 = (ReturnStatement)method.Body.Statements.ElementAt(2);
+
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(stmt1, "p1"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusBeforeStatement(stmt1, "p2"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusBeforeStatement(stmt2, "p1"));
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(stmt2, "p2"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusAfterStatement(stmt2, "p1"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(stmt2, "p2"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusBeforeStatement(stmt3, "p1"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusBeforeStatement(stmt3, "p2"));
+		}
+
+		[Test]
+		public void TestLoop()
+		{
+			var method = new MethodDeclaration {
+				Body = new BlockStatement {
+					new VariableDeclarationStatement(new PrimitiveType("string"),
+					                                 "p2", new NullReferenceExpression()),
+					new WhileStatement {
+						Condition = new BinaryOperatorExpression(new IdentifierExpression("p1"),
+						                                         BinaryOperatorType.Equality,
+						                                         new NullReferenceExpression()),
+						EmbeddedStatement = new BlockStatement {
+							new ExpressionStatement(
+								new AssignmentExpression(new IdentifierExpression("p2"),
+						                         AssignmentOperatorType.Assign,
+						                         new PrimitiveExpression(""))),
+							new ExpressionStatement(
+								new AssignmentExpression(new IdentifierExpression("p1"),
+							                         AssignmentOperatorType.Assign,
+							                         new PrimitiveExpression("")))
+						}
+					},
+					new ReturnStatement()
+				}
+			};
+			method.Parameters.Add(CreateStringParameter("p1"));
+
+			var analysis = CreateNullValueAnalysis(method);
+			var stmt1 = (WhileStatement)method.Body.Statements.ElementAt(1);
+			var stmt2 = (ExpressionStatement)((BlockStatement)stmt1.EmbeddedStatement).Statements.Last();
+			var stmt3 = (ReturnStatement)method.Body.Statements.ElementAt(2);
+
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(stmt1, "p1"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusBeforeStatement(stmt1, "p2"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusBeforeStatement(stmt2, "p1"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusBeforeStatement(stmt2, "p2"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(stmt2, "p1"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(stmt2, "p2"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusBeforeStatement(stmt3, "p1"));
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(stmt3, "p2"));
+		}
+
+		ExpressionStatement MakeStatement(Expression expr)
+		{
+			return new ExpressionStatement(expr);
+		}
+
+		[Test]
+		public void TestForLoop()
+		{
+			var forStatement = new ForStatement();
+			forStatement.Initializers.Add(MakeStatement(new AssignmentExpression(new IdentifierExpression("p2"),
+			                                                                     new PrimitiveExpression(""))));
+			forStatement.Condition = new BinaryOperatorExpression(new IdentifierExpression("p1"),
+			                                                      BinaryOperatorType.Equality,
+			                                                      new NullReferenceExpression());
+			forStatement.Iterators.Add(MakeStatement(new AssignmentExpression(new IdentifierExpression("p2"),
+			                                                                  AssignmentOperatorType.Assign,
+			                                                                  new NullReferenceExpression())));
+			forStatement.EmbeddedStatement = MakeStatement(new AssignmentExpression(new IdentifierExpression("p1"),
+			                                                                        AssignmentOperatorType.Assign,
+			                                                                        new PrimitiveExpression("")));
+			var method = new MethodDeclaration {
+				Body = new BlockStatement {
+					forStatement,
+					new ReturnStatement()
+				}
+			};
+			method.Parameters.Add(CreateStringParameter("p1"));
+			method.Parameters.Add(CreateStringParameter("p2"));
+
+			var returnStatement = (ReturnStatement)method.Body.Statements.Last();
+			var content = forStatement.EmbeddedStatement;
+
+			var analysis = CreateNullValueAnalysis(method);
+
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(forStatement, "p1"));
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(forStatement, "p2"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusBeforeStatement(content, "p1"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusBeforeStatement(content, "p2"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(content, "p2"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusBeforeStatement(returnStatement, "p1"));
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(returnStatement, "p2"));
+		}
+
+		[Test]
+		public void TestNullCoallescing()
+		{
+			var method = new MethodDeclaration {
+				Body = new BlockStatement {
+					new ExpressionStatement(new AssignmentExpression(new IdentifierExpression("p1"),
+					                                                 new BinaryOperatorExpression(new IdentifierExpression("p1"),
+					                             BinaryOperatorType.NullCoalescing,
+					                             new PrimitiveExpression(""))))
+				}
+			};
+
+			method.Parameters.Add(CreateStringParameter("p1"));
+
+			var analysis = CreateNullValueAnalysis(method);
+			var stmt = method.Body.Statements.Single();
+
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(stmt, "p1"));
+		}
+
+		[Test]
+		public void TestCapturedLambdaVariables()
+		{
+			var method = new MethodDeclaration {
+				Body = new BlockStatement {
+					new VariableDeclarationStatement(AstType.Create("System.Action"),
+					                                 "action",
+					                                 new LambdaExpression {
+						Body = new BlockStatement {
+							MakeStatement(new AssignmentExpression(new IdentifierExpression("p1"),
+							                                       new NullReferenceExpression()))
+						}
+					}),
+					MakeStatement(new AssignmentExpression(new IdentifierExpression("p1"),
+					                                       new NullReferenceExpression())),
+					new ExpressionStatement(new InvocationExpression(new IdentifierExpression("action"))),
+					MakeStatement(new AssignmentExpression(new IdentifierExpression("p3"),
+					                                       new IdentifierExpression("p1")))
+				}
+			};
+
+			method.Parameters.Add(CreateStringParameter("p1"));
+			method.Parameters.Add(CreateStringParameter("p2"));
+			method.Parameters.Add(CreateStringParameter("p3"));
+
+			var analysis = CreateNullValueAnalysis(method);
+			var declareLambda = (VariableDeclarationStatement)method.Body.Statements.First();
+			var lastStatement = (ExpressionStatement)method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(declareLambda, "p1"));
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(declareLambda, "p2"));
+			Assert.AreEqual(NullValueStatus.CapturedUnknown, analysis.GetVariableStatusBeforeStatement(lastStatement, "p1"));
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(lastStatement, "p2"));
+			Assert.AreEqual(NullValueStatus.Unknown, analysis.GetVariableStatusAfterStatement(lastStatement, "p3"));
+		}
+
+		[Test]
+		public void TestVariableVisitsCount()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+class TestClass
+{
+	void TestMethod()
+	{
+		string s = null;
+		while (s == null) {
+			string s2 = null;
+		}
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			Assert.AreEqual(8, analysis.NodeVisits);
+		}
+
+
+		[Test]
+		public void TestInvocation()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+delegate void MyDelegate(string p1, out string p2);
+class TestClass
+{
+	void TestMethod()
+	{
+		string p1 = null;
+		string p2 = null;
+		MyDelegate del = (string a, out string b) => { b = a; };
+		del(p1 = """", out p2);
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var lastStatement = (ExpressionStatement)method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "p1"));
+			Assert.AreEqual(NullValueStatus.Unknown, analysis.GetVariableStatusAfterStatement(lastStatement, "p2"));
+		}
+
+		[Test]
+		public void TestLock()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+class TestClass
+{
+	void TestMethod()
+	{
+		object o = null;
+		lock (o) {
+			//Impossible
+			int x1 = 1;
+		}
+		//Impossible
+		int x2 = 1;
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var lockStatement = (LockStatement)method.Body.Statements.ElementAt(1);
+			var lockBlock = (BlockStatement)lockStatement.EmbeddedStatement;
+			var lastStatement = method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.UnreachableOrInexistent, analysis.GetVariableStatusAfterStatement(lockBlock.Statements.Single(), "x1"));
+			Assert.AreEqual(NullValueStatus.UnreachableOrInexistent, analysis.GetVariableStatusAfterStatement(lastStatement, "x2"));
+		}
+
+		[Test]
+		public void TestComparisonWithNonNull()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+class TestClass
+{
+	string SomeValue () { return null; }
+	bool PathMatches ()
+	{
+		string handlerPath = SomeValue();
+		if (handlerPath == ""*"")
+			return false;
+		return true;
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var end = method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.Unknown, analysis.GetVariableStatusBeforeStatement(end, "handlerPath"));
+		}
+
+		[Test]
+		public void TestLock2()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+class TestClass
+{
+	object MaybeNull() { return null; }
+	void TestMethod()
+	{
+		object o = MaybeNull();
+		try {
+			lock (o) {
+			}
+		} catch (NullReferenceException e) {
+
+		}
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var tryStatement = (TryCatchStatement) method.Body.Statements.Last();
+			var tryBlock = tryStatement.TryBlock;
+			var catchBlock = tryStatement.CatchClauses.Single().Body;
+
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(tryBlock, "o"));
+			Assert.AreEqual(NullValueStatus.Unknown, analysis.GetVariableStatusAfterStatement(catchBlock, "o"));
+		}
+
+		[Test]
+		public void TestMemberAccess()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+class TestClass
+{
+	void TestMethod()
+	{
+		object o = null;
+		string s = o.ToString();
+		int x2 = 1;
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var lastStatement = method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.UnreachableOrInexistent, analysis.GetVariableStatusAfterStatement(lastStatement, "o"));
+			Assert.AreEqual(NullValueStatus.UnreachableOrInexistent, analysis.GetVariableStatusAfterStatement(lastStatement, "x2"));
+		}
+
+		[Test]
+		public void TestMemberAccess2()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+class TestClass
+{
+	object MaybeNull()
+	{
+		return null;
+	}
+	void TestMethod()
+	{
+		object o = MaybeNull();
+		string s = o.ToString();
+		int x2 = 1;
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var lastStatement = method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "o"));
+		}
+
+		[Test]
+		public void TestNullableHasValue()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+class TestClass
+{
+	void TestMethod()
+	{
+		int? x = null;
+		bool y = x.HasValue;
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var lastStatement = method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusAfterStatement(lastStatement, "x"));
+		}
+
+		[Test]
+		public void TestMemberAccessExtensionMethod()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+static class ObjectExtensions {
+	static internal string Extension(this object obj) {
+		return """";
+	}
+}
+class TestClass
+{
+	void TestMethod()
+	{
+		object o = null;
+		string s = o.Extension();
+		int x2 = 1;
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var lastStatement = method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusAfterStatement(lastStatement, "o"));
+		}
+
+		[Test]
+		public void TestAs()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+delegate void MyDelegate(string p1, out string p2);
+class TestClass
+{
+	void TestMethod(object o)
+	{
+		string p1 = o as string;
+		o = new object();
+		string p2 = o as string;
+		string p3 = typeof(string) as string;
+		o = null;
+		string p4 = o as string;
+		string p5 = """" as string;
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var p5Statement = method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusAfterStatement(p5Statement, "p1"));
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusAfterStatement(p5Statement, "p2"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusAfterStatement(p5Statement, "p3"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusAfterStatement(p5Statement, "p4"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(p5Statement, "p5"));
+		}
+
+		[Test]
+		public void TestUncaptureVariable()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	void TestMethod()
+	{
+		while (true) {
+			string p1 = null;
+			Action action = () => { p1 = """"; };
+		}
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var whileStatement = (WhileStatement)method.Body.Statements.Single();
+			var whileBlock = (BlockStatement)whileStatement.EmbeddedStatement;
+			var actionStatement = whileBlock.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusBeforeStatement(actionStatement, "p1"));
+			Assert.AreEqual(NullValueStatus.CapturedUnknown, analysis.GetVariableStatusAfterStatement(actionStatement, "p1"));
+		}
+
+		[Test]
+		public void TestSimpleForeach()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	void TestMethod()
+	{
+		int? accum = 0;
+		foreach (var x in new int[] { 1, 2, 3}) {
+			accum += x;
+		}
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var lastStatement = (ForeachStatement)method.Body.Statements.Last();
+			var content = (BlockStatement)lastStatement.EmbeddedStatement;
+
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusBeforeStatement(content, "x"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusBeforeStatement(lastStatement, "accum"));
+		}
+
+		[Test]
+		public void TestNonNullEnumeratedValue()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	void TestMethod()
+	{
+		int? accum = 0;
+		foreach (var x in new int?[] { 1, 2, 3}) {
+			accum += x;
+		}
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var lastStatement = (ForeachStatement)method.Body.Statements.Last();
+			var content = (BlockStatement)lastStatement.EmbeddedStatement;
+
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusBeforeStatement(content, "x"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusBeforeStatement(lastStatement, "accum"));
+		}
+
+		[Test]
+		public void TestCapturedForeachInCSharp5()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	void TestMethod()
+	{
+		int? accum = 0;
+		foreach (var x in new int?[] { 1, 2, 3 }) {
+			Action action = () => { x = null; };
+			accum += x;
+		}
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method, true);
+
+			var foreachStatement = (ForeachStatement)method.Body.Statements.ElementAt(1);
+			var foreachBody = (BlockStatement)foreachStatement.EmbeddedStatement;
+			var action = foreachBody.Statements.First();
+			var lastStatement = method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusBeforeStatement(action, "x"));
+			Assert.AreEqual(NullValueStatus.CapturedUnknown, analysis.GetVariableStatusAfterStatement(action, "x"));
+			Assert.AreEqual(NullValueStatus.Unknown, analysis.GetVariableStatusAfterStatement(lastStatement, "accum"));
+		}
+
+		[Test]
+		public void TestCapturedForeachInCSharp4()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	void TestMethod()
+	{
+		int? accum = 0;
+		foreach (var x in new int?[] { 1, 2, 3}) {
+			Action action = () => { x = null; };
+			accum += x;
+		}
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method, false);
+
+			var foreachStatement = (ForeachStatement)method.Body.Statements.ElementAt(1);
+			var foreachBody = (BlockStatement)foreachStatement.EmbeddedStatement;
+			var action = foreachBody.Statements.First();
+			var lastStatement = method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.CapturedUnknown, analysis.GetVariableStatusBeforeStatement(action, "x"));
+			Assert.AreEqual(NullValueStatus.CapturedUnknown, analysis.GetVariableStatusAfterStatement(action, "x"));
+			Assert.AreEqual(NullValueStatus.Unknown, analysis.GetVariableStatusAfterStatement(lastStatement, "accum"));
+		}
+
+		[Test]
+		public void TestForCapture()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	string TestMethod(string p)
+	{
+		for (int? i = 0; i < 10; ++i) {
+			int? inI = i;
+			Action action = () => { i = null; inI = null; };
+		}
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			var forStatement = (ForStatement)method.Body.Statements.Single();
+			var forBody = (BlockStatement)forStatement.EmbeddedStatement;
+			var actionStatement = forBody.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.CapturedUnknown, analysis.GetVariableStatusBeforeStatement(actionStatement, "i"));
+			Assert.AreEqual(NullValueStatus.CapturedUnknown, analysis.GetVariableStatusAfterStatement(actionStatement, "i"));
+			Assert.AreEqual(NullValueStatus.Unknown, analysis.GetVariableStatusBeforeStatement(actionStatement, "inI"));
+			Assert.AreEqual(NullValueStatus.CapturedUnknown, analysis.GetVariableStatusAfterStatement(actionStatement, "inI"));
+		}
+
+		[Test]
+		public void TestExpressionState()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+delegate void MyDelegate(string p1, out string p2);
+class TestClass
+{
+	string TestMethod(string p)
+	{
+		if (p != null) p = """";
+		return p;
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var lastStatement = (ReturnStatement)method.Body.Statements.Last();
+			var expr = lastStatement.Expression;
+
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetExpressionResult(expr));
+		}
+
+		[Test]
+		public void TestField()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+class TestClass
+{
+	static object o;
+	string TestMethod()
+	{
+		o = null;
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var lastStatement = method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.UnreachableOrInexistent, analysis.GetVariableStatusAfterStatement(lastStatement, "o"));
+		}
+
+		[Test]
+		public void TestNullableCast()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+class TestClass
+{
+	int? maybeNull;
+	string TestMethod()
+	{
+		int? x = maybeNull;
+		int y = (int)x;
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "x"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "y"));
+		}
+
+		[Test]
+		public void TestNonNullableCapture()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+class TestClass
+{
+	string TestMethod()
+	{
+		int a = 0;
+		Action action = () => { a = 1; };
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "a"));
+		}
+
+		[Test]
+		public void TestAssignmentFromNonNullableTypes()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+class TestClass
+{
+	int this[int idx] { get { return 0; } }
+	int i;
+	int M() { return 0; }
+	string TestMethod()
+	{
+		object o = TestClass.i;
+		object p = i;
+		object q = M();
+		object m = this[0];
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "o"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "p"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "q"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "m"));
+		}
+
+		[Test]
+		public void TestNonNullReference()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+class TestClass
+{
+	void M(ref int i) {}
+
+	string TestMethod()
+	{
+		int i = 1;
+		M(ref i);
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "i"));
+		}
+
+		[Test]
+		public void TestCompileConstants()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+class TestClass
+{
+	const int? value1 = null;
+	const bool value2 = true;
+	void TestMethod()
+	{
+		int? p1 = value2 ? value1 : 0;
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var lastStatement = (VariableDeclarationStatement)method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusAfterStatement(lastStatement, "p1"));
+		}
+
+		[Test]
+		public void TestConditionalAnd()
+		{
+			var method = new MethodDeclaration {
+				Body = new BlockStatement {
+					new IfElseStatement {
+						Condition = new BinaryOperatorExpression(
+								new BinaryOperatorExpression(new IdentifierExpression("p1"),
+						                                         BinaryOperatorType.Equality,
+						                                         new NullReferenceExpression()),
+								BinaryOperatorType.ConditionalAnd,
+								new BinaryOperatorExpression(new IdentifierExpression("p2"),
+						                                     BinaryOperatorType.Equality,
+						                                     new NullReferenceExpression())),
+						TrueStatement = new ExpressionStatement(new AssignmentExpression(
+							new IdentifierExpression("p1"),
+							new PrimitiveExpression("Hello")))
+					},
+					new ReturnStatement()
+				}
+			};
+			method.Parameters.Add(CreateStringParameter("p1"));
+			method.Parameters.Add(CreateStringParameter("p2"));
+
+			var analysis = CreateNullValueAnalysis(method);
+			var stmt1 = (IfElseStatement)method.Body.Statements.First();
+			var stmt2 = (ExpressionStatement)stmt1.TrueStatement;
+			var stmt3 = (ReturnStatement)method.Body.Statements.ElementAt(1);
+
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(stmt1, "p1"));
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(stmt1, "p2"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusBeforeStatement(stmt2, "p1"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusBeforeStatement(stmt2, "p2"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(stmt2, "p1"));
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(stmt3, "p2"));
+		}
+
+		[Test]
+		public void TestConditionalOr()
+		{
+			var method = new MethodDeclaration {
+				Body = new BlockStatement {
+					new IfElseStatement {
+						Condition = new UnaryOperatorExpression(UnaryOperatorType.Not,
+						                                        new BinaryOperatorExpression(
+							new BinaryOperatorExpression(new IdentifierExpression("p1"),
+						                             BinaryOperatorType.Equality,
+						                             new NullReferenceExpression()),
+							BinaryOperatorType.ConditionalOr,
+							new BinaryOperatorExpression(new IdentifierExpression("p2"),
+						                             BinaryOperatorType.Equality,
+						                             new NullReferenceExpression()))),
+						TrueStatement = new ExpressionStatement(new AssignmentExpression(
+							new IdentifierExpression("p1"),
+							new NullReferenceExpression()))
+					},
+					new ReturnStatement()
+				}
+			};
+			method.Parameters.Add(CreateStringParameter("p1"));
+			method.Parameters.Add(CreateStringParameter("p2"));
+
+			var analysis = CreateNullValueAnalysis(method);
+			var stmt1 = (IfElseStatement)method.Body.Statements.First();
+			var stmt2 = (ExpressionStatement)stmt1.TrueStatement;
+			var stmt3 = (ReturnStatement)method.Body.Statements.ElementAt(1);
+
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(stmt1, "p1"));
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(stmt1, "p2"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusBeforeStatement(stmt2, "p1"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusBeforeStatement(stmt2, "p2"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusAfterStatement(stmt2, "p1"));
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(stmt3, "p2"));
+		}
+
+		[Test]
+		public void TestFinally()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+class TestClass
+{
+	void TestMethod()
+	{
+		int? x = 1;
+		int? y = 1;
+		try {
+			x = 2;
+			x = null;
+		} finally {
+			y = null;
+		}
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var tryFinally = (TryCatchStatement) method.Body.Statements.Last();
+			var finallyStatement = tryFinally.FinallyBlock.Statements.Single();
+
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusBeforeStatement(finallyStatement, "x"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusBeforeStatement(finallyStatement, "y"));
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusAfterStatement(finallyStatement, "x"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusAfterStatement(finallyStatement, "y"));
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusAfterStatement(tryFinally, "x"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusAfterStatement(tryFinally, "y"));
+		}
+
+		[Test]
+		public void TestFinallyCapture()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	void TestMethod()
+	{
+		int? x = 1;
+		try {
+			Action a = () => { x = null; };
+		} finally {
+			Console.WriteLine(x);
+		}
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var tryFinally = (TryCatchStatement) method.Body.Statements.Last();
+			var finallyStatement = tryFinally.FinallyBlock.Statements.Single();
+
+			Assert.AreEqual(NullValueStatus.CapturedUnknown, analysis.GetVariableStatusBeforeStatement(finallyStatement, "x"));
+		}
+
+
+		[Test]
+		public void TestReturnInFinally()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+class TestClass
+{
+	void TestMethod()
+	{
+		int? x = 1;
+		int? y = 1;
+		try {
+			x = null;
+			return;
+		} finally {
+			y = null;
+		}
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var tryFinally = (TryCatchStatement) method.Body.Statements.Last();
+			var finallyStatement = tryFinally.FinallyBlock.Statements.Single();
+
+			//Make sure it's not unreachable
+			Assert.AreEqual(NullValueStatus.Unknown, analysis.GetVariableStatusAfterStatement(finallyStatement, "x"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusAfterStatement(finallyStatement, "y"));
+		}
+
+		[Test]
+		public void TestTryCatch()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	void TestMethod()
+	{
+		int? x = 1;
+		int? y = 2;
+		int? z = 3;
+		try {
+			x = null;
+		} catch (Exception e) {
+			x = null;
+			y = 3;
+			z = null;
+		}
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var tryCatch = (TryCatchStatement) method.Body.Statements.Last();
+			var catchStatement = tryCatch.CatchClauses.First().Body.Statements.First();
+
+			Assert.AreEqual(NullValueStatus.Unknown, analysis.GetVariableStatusBeforeStatement(catchStatement, "x"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusBeforeStatement(catchStatement, "e"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusAfterStatement(tryCatch, "x"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(tryCatch, "y"));
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusAfterStatement(tryCatch, "z"));
+		}
+
+		[Test]
+		public void TestIndexer()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	int[] MaybeNull() { return null; }
+	void TestMethod()
+	{
+		int[] x = MaybeNull();
+		x[(x = null) != null ? 0 : 1] = 2;
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var lastStatement = (ExpressionStatement) method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusAfterStatement(lastStatement, "x"));
+		}
+
+		[Test]
+		public void TestIndexer2()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	int[] MaybeNull() { return null; }
+	void TestMethod()
+	{
+		int[] x = MaybeNull();
+		object o = null;
+		x[(x == null ? o = null : o = 1) != null ? 1 : 2] = 2;
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var lastStatement = (ExpressionStatement) method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusAfterStatement(lastStatement, "o"));
+		}
+
+		[Test]
+		public void TestLocalInvocation()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	void TestMethod()
+	{
+		Action<int> x = i => {};
+		x((x = null) != null ? 1 : 0);
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var lastStatement = method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusAfterStatement(lastStatement, "x"));
+		}
+
+		[Test]
+		public void TestLocalInvocation2()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	Action<int> MaybeNull()
+	{
+		Action<int> x = i => {};
+		return x;
+	}
+	void TestMethod()
+	{
+		Action<int> x = MaybeNull();
+		object o = null;
+		x((x == null ? o = null : o = 1) == null ? 1 : 2);
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var lastStatement = method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusAfterStatement(lastStatement, "o"));
+		}
+
+		[Test]
+		public void TestLinq()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	void TestMethod()
+	{
+		int?[] collection = new int?[10];
+		var x = from item in collection
+				where item != null
+				select item
+				into item2
+				let item3 = item2
+				select item3;
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var linqStatement = (VariableDeclarationStatement) method.Body.Statements.Last();
+			var linqExpression = (QueryExpression)linqStatement.Variables.Single().Initializer;
+			var continuation = (QueryContinuationClause)linqExpression.Clauses.First();
+			var itemInWhere = ((BinaryOperatorExpression)((QueryWhereClause)continuation.PrecedingQuery.Clauses.ElementAt(1)).Condition).Left;
+			var itemInSelect = ((QuerySelectClause)continuation.PrecedingQuery.Clauses.ElementAt(2)).Expression;
+			var item2InLet = ((QueryLetClause)linqExpression.Clauses.ElementAt(1)).Expression;
+			var item3InSelect = ((QuerySelectClause)linqExpression.Clauses.Last()).Expression;
+			
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(linqStatement, "x"));
+			Assert.AreEqual(NullValueStatus.Unknown, analysis.GetExpressionResult(itemInWhere));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetExpressionResult(itemInSelect));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetExpressionResult(item2InLet));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetExpressionResult(item3InSelect));
+		}
+
+		[Test]
+		public void TestLinqMember()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	void TestMethod()
+	{
+		int?[] collection = new int?[10];
+		foreach (var x in from item in collection
+                 where item.Value > 1
+				 select item) {
+			/* x is not null, or else item.Value would trigger an exception */
+		}
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var foreachStatement = (ForeachStatement) method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(foreachStatement.EmbeddedStatement, "x"));
+		}
+
+		[Test]
+		public void TestLinqGroupBy()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	void TestMethod()
+	{
+		int?[] collection = new int?[10];
+		foreach (var x in from item in collection
+		                  group new { x = item } by item != null) {
+		}
+	}
+}
+", "test.cs");
+
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var foreachStatement = (ForeachStatement)method.Body.Statements.Last();
+			var foreachBody = foreachStatement.EmbeddedStatement;
+			
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(foreachBody, "x"));
+		}
+
+		[Test]
+		public void TestNoExecutionLinq()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	void TestMethod()
+	{
+		int?[] collection = new int?[0];
+		var x = from item in collection
+				where (collection = null) != null
+				select item;
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var linqStatement = (VariableDeclarationStatement) method.Body.Statements.Last();
+
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusAfterStatement(linqStatement, "collection"));
+		}
+
+		[Test]
+		public void TestLinqMemberNoExecution()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+abstract class TestClass
+{
+	abstract int?[] Collection { get; }
+	void TestMethod()
+	{
+		object o = null;
+		int?[] collection = Collection;
+		var x = from item in collection
+                where o.ToString() == """"
+				select item;
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Single();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var lastStatement = method.Body.Statements.Last();
+
+			//o.ToString always throws an exception, but the query might not be executed at all
+			Assert.AreEqual(NullValueStatus.DefinitelyNull, analysis.GetVariableStatusAfterStatement(lastStatement, "o"));
+		}
+
+		[Test]
+		public void TestUsing()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	System.IDisposable Foo() {
+		throw new NotImplementedException();
+	}
+
+	void TestMethod()
+	{
+		using (var x = Foo()) {
+			;
+		}
+		using (Foo()) {
+			//Ensure the analysis doesn't throw an exception for a non-declaration using
+		}
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var usingStatement = (UsingStatement)method.Body.Statements.First();
+			var content = usingStatement.EmbeddedStatement;
+
+			Assert.AreEqual(NullValueStatus.Unknown, analysis.GetVariableStatusAfterStatement(content, "x"));
+		}
+
+		[Test]
+		public void TestFixed()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+using System;
+class TestClass
+{
+	unsafe void TestMethod()
+	{
+		int y = 0;
+		fixed (int* x = &y)
+		{
+			*x = 1;
+		}
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+
+			var fixedStatement = (FixedStatement)method.Body.Statements.Last();
+			var content = fixedStatement.EmbeddedStatement;
+
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(content, "x"));
+		}
+
+		[Test]
+		public void TestNotNullInvocation()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Method)]
+	class NotNullAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	[JetBrains.Annotations.NotNull]
+	object NotNull() {
+		return 1;
+	}
+
+	void TestMethod()
+	{
+		string p1 = NotNull();
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "p1"));
+		}
+
+		[Test]
+		public void TestNotNullDelegateInvocation()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Delegate)]
+	class NotNullAttribute : System.Attribute
+	{
+	}
+}
+[JetBrains.Annotations.NotNull]
+delegate object NotNullDelegate();
+class TestClass
+{
+	NotNullDelegate myDelegate;
+	void TestMethod()
+	{
+		string p1 = myDelegate();
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "p1"));
+		}
+
+		[Test]
+		public void TestNotNullField()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Field)]
+	class NotNullAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	[JetBrains.Annotations.NotNull]
+	string x = """";
+	void TestMethod()
+	{
+		string p1 = this.x;
+		string p2 = x;
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "p1"));
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "p2"));
+		}
+
+		[Test]
+		public void TestConstructorOut()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Parameter)]
+	class CanBeNullAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	public TestClass([JetBrains.Annotations.CanBeNull] out string o) {
+		o = null;
+	}
+	
+	void TestMethod()
+	{
+		string p1;
+		new TestClass(out p1);
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusAfterStatement(lastStatement, "p1"));
+		}
+
+		[Test]
+		public void TestConstructorNamedOut()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Parameter)]
+	class CanBeNullAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	public TestClass([JetBrains.Annotations.CanBeNull] out string o) {
+		o = null;
+	}
+	
+	void TestMethod()
+	{
+		string p1;
+		new TestClass(o: out p1);
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusAfterStatement(lastStatement, "p1"));
+		}
+
+		[Test]
+		public void TestMethodOut()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Parameter)]
+	class CanBeNullAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	void TestMethod([JetBrains.Annotations.CanBeNull] out string o) {
+		o = null;
+	}
+	
+	void TestMethod()
+	{
+		string p1;
+		TestMethod(out p1);
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreEqual(NullValueStatus.PotentiallyNull, analysis.GetVariableStatusAfterStatement(lastStatement, "p1"));
+		}
+
+		[Test]
+		public void TestAssertion()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+namespace JetBrains.Annotations
+{
+	enum AssertionConditionType
+	{
+		IS_FALSE,
+		IS_TRUE,
+		IS_NULL,
+		IS_NOT_NULL
+	}
+
+	[System.AttributeUsage(System.AttributeTargets.Parameter)]
+	class AssertionConditionAttribute : System.Attribute
+	{
+		public AssertionConditionAttribute(AssertionConditionType conditionType) {}
+	}
+	[System.AttributeUsage(System.AttributeTargets.Method)]
+	class AssertionMethodAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	[JetBrains.Annotations.AssertionMethod]
+	void Assert([JetBrains.Annotations.AssertionCondition(JetBrains.Annotations.AssertionConditionType.IS_TRUE)] bool condition, string message) {
+	}
+	
+	void TestMethod(string x)
+	{
+		Assert(x != null, ""x is null"");
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "x"));
+		}
+
+		[Test]
+		public void TestAssertion2()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+namespace JetBrains.Annotations
+{
+	enum AssertionConditionType
+	{
+		IS_FALSE,
+		IS_TRUE,
+		IS_NULL,
+		IS_NOT_NULL
+	}
+
+	[System.AttributeUsage(System.AttributeTargets.Parameter)]
+	class AssertionConditionAttribute : System.Attribute
+	{
+		public AssertionConditionAttribute(AssertionConditionType conditionType) {}
+	}
+	[System.AttributeUsage(System.AttributeTargets.Method)]
+	class AssertionMethodAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	[JetBrains.Annotations.AssertionMethod]
+	void Assert([JetBrains.Annotations.AssertionCondition(JetBrains.Annotations.AssertionConditionType.IS_TRUE)] bool condition, string message) {
+	}
+	
+	void TestMethod(string x)
+	{
+		Assert(message: ""x is null"", condition: x != null);
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "x"));
+		}
+
+		[Test]
+		public void TestAssertion3()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+namespace JetBrains.Annotations
+{
+	enum AssertionConditionType
+	{
+		IS_FALSE,
+		IS_TRUE,
+		IS_NULL,
+		IS_NOT_NULL
+	}
+
+	[System.AttributeUsage(System.AttributeTargets.Parameter)]
+	class AssertionConditionAttribute : System.Attribute
+	{
+		public AssertionConditionAttribute(AssertionConditionType conditionType) {}
+	}
+	[System.AttributeUsage(System.AttributeTargets.Method)]
+	class AssertionMethodAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	[JetBrains.Annotations.AssertionMethod]
+	void Assert([JetBrains.Annotations.AssertionCondition(JetBrains.Annotations.AssertionConditionType.IS_TRUE)] bool condition = false) {
+	}
+	
+	void TestMethod(string x)
+	{
+		Assert();
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreEqual(NullValueStatus.UnreachableOrInexistent, analysis.GetVariableStatusAfterStatement(lastStatement, "x"));
+		}
+
+		[Test]
+		public void TestAssertion4()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+namespace JetBrains.Annotations
+{
+	enum AssertionConditionType
+	{
+		IS_FALSE,
+		IS_TRUE,
+		IS_NULL,
+		IS_NOT_NULL
+	}
+
+	[System.AttributeUsage(System.AttributeTargets.Parameter)]
+	class AssertionConditionAttribute : System.Attribute
+	{
+		public AssertionConditionAttribute(AssertionConditionType conditionType) {}
+	}
+	[System.AttributeUsage(System.AttributeTargets.Method)]
+	class AssertionMethodAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	[JetBrains.Annotations.AssertionMethod]
+	void Assert([JetBrains.Annotations.AssertionCondition(JetBrains.Annotations.AssertionConditionType.IS_FALSE)] bool condition = true) {
+	}
+	
+	void TestMethod(string x)
+	{
+		Assert();
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreEqual(NullValueStatus.UnreachableOrInexistent, analysis.GetVariableStatusAfterStatement(lastStatement, "x"));
+		}
+
+		[Test]
+		public void TestAssertion5()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+namespace JetBrains.Annotations
+{
+	enum AssertionConditionType
+	{
+		IS_FALSE,
+		IS_TRUE,
+		IS_NULL,
+		IS_NOT_NULL
+	}
+
+	[System.AttributeUsage(System.AttributeTargets.Parameter)]
+	class AssertionConditionAttribute : System.Attribute
+	{
+		public AssertionConditionAttribute(AssertionConditionType conditionType) {}
+	}
+	[System.AttributeUsage(System.AttributeTargets.Method)]
+	class AssertionMethodAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	[JetBrains.Annotations.AssertionMethod]
+	void Assert([JetBrains.Annotations.AssertionCondition(JetBrains.Annotations.AssertionConditionType.IS_FALSE)] bool condition = false) {
+	}
+	
+	void TestMethod(string x)
+	{
+		Assert();
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreNotEqual(NullValueStatus.UnreachableOrInexistent, analysis.GetVariableStatusAfterStatement(lastStatement, "x"));
+		}
+
+		[Test]
+		public void TestAssertion6()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+namespace JetBrains.Annotations
+{
+	enum AssertionConditionType
+	{
+		IS_FALSE,
+		IS_TRUE,
+		IS_NULL,
+		IS_NOT_NULL
+	}
+
+	[System.AttributeUsage(System.AttributeTargets.Parameter)]
+	class AssertionConditionAttribute : System.Attribute
+	{
+		public AssertionConditionAttribute(AssertionConditionType conditionType) {}
+	}
+	[System.AttributeUsage(System.AttributeTargets.Method)]
+	class AssertionMethodAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	[JetBrains.Annotations.AssertionMethod]
+	void AssertNotNull([JetBrains.Annotations.AssertionCondition(JetBrains.Annotations.AssertionConditionType.IS_NOT_NULL)] object condition) {
+	}
+	
+	void TestMethod(string x)
+	{
+		AssertNotNull(x);
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "x"));
+		}
+
+		[Test]
+		public void TestAssertion7()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+namespace JetBrains.Annotations
+{
+	enum AssertionConditionType
+	{
+		IS_FALSE,
+		IS_TRUE,
+		IS_NULL,
+		IS_NOT_NULL
+	}
+
+	[System.AttributeUsage(System.AttributeTargets.Parameter)]
+	class AssertionConditionAttribute : System.Attribute
+	{
+		public AssertionConditionAttribute(AssertionConditionType conditionType) {}
+	}
+	[System.AttributeUsage(System.AttributeTargets.Method)]
+	class AssertionMethodAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	[JetBrains.Annotations.AssertionMethod]
+	void Assert([JetBrains.Annotations.AssertionCondition(JetBrains.Annotations.AssertionConditionType.IS_FALSE)] bool condition) {
+	}
+	
+	void TestMethod(string x)
+	{
+		Assert(x == null);
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreEqual(NullValueStatus.DefinitelyNotNull, analysis.GetVariableStatusAfterStatement(lastStatement, "x"));
+		}
+
+		[Test]
+		public void TestAssertion8()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+namespace JetBrains.Annotations
+{
+	enum AssertionConditionType
+	{
+		IS_FALSE,
+		IS_TRUE,
+		IS_NULL,
+		IS_NOT_NULL
+	}
+
+	[System.AttributeUsage(System.AttributeTargets.Parameter)]
+	class AssertionConditionAttribute : System.Attribute
+	{
+		public AssertionConditionAttribute(AssertionConditionType conditionType) {}
+	}
+	[System.AttributeUsage(System.AttributeTargets.Method)]
+	class AssertionMethodAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	[JetBrains.Annotations.AssertionMethod]
+	void AssertNotNull([JetBrains.Annotations.AssertionCondition(JetBrains.Annotations.AssertionConditionType.IS_NOT_NULL)] string condition = ""x"") {
+	}
+	
+	void TestMethod(string x)
+	{
+		AssertNotNull();
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreNotEqual(NullValueStatus.UnreachableOrInexistent, analysis.GetVariableStatusAfterStatement(lastStatement, "x"));
+		}
+
+		[Test]
+		public void TestAssertion9()
+		{
+			var parser = new CSharpParser();
+			var tree = parser.Parse(@"
+namespace JetBrains.Annotations
+{
+	enum AssertionConditionType
+	{
+		IS_FALSE,
+		IS_TRUE,
+		IS_NULL,
+		IS_NOT_NULL
+	}
+
+	[System.AttributeUsage(System.AttributeTargets.Parameter)]
+	class AssertionConditionAttribute : System.Attribute
+	{
+		public AssertionConditionAttribute(AssertionConditionType conditionType) {}
+	}
+	[System.AttributeUsage(System.AttributeTargets.Method)]
+	class AssertionMethodAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	[JetBrains.Annotations.AssertionMethod]
+	void AssertNotNull([JetBrains.Annotations.AssertionCondition(JetBrains.Annotations.AssertionConditionType.IS_NOT_NULL)] object condition) {
+	}
+	
+	void TestMethod(string x)
+	{
+		AssertNotNull(null);
+	}
+}
+", "test.cs");
+			Assert.AreEqual(0, tree.Errors.Count);
+			
+			var method = tree.Descendants.OfType<MethodDeclaration>().Last();
+			var analysis = CreateNullValueAnalysis(tree, method);
+			
+			var lastStatement = method.Body.Statements.Last();
+			
+			Assert.AreEqual(NullValueStatus.UnreachableOrInexistent, analysis.GetVariableStatusAfterStatement(lastStatement, "x"));
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Analysis/SemanticHighlightingTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Analysis/SemanticHighlightingTests.cs
index 6be04b10af..ba5a7c6c86 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Analysis/SemanticHighlightingTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Analysis/SemanticHighlightingTests.cs
@@ -1,4 +1,4 @@
-//
+//
 // SemanticHighlightingTests.cs
 //
 // Author:
@@ -119,7 +119,7 @@ namespace ICSharpCode.NRefactory.CSharp.Analysis
 
 			foreach (var offset in offsets) {
 				var loc = doc.GetLocation (offset);
-				var color = visitor.GetColor (loc);
+				var color = visitor.GetColor (loc) ?? "defaultTextColor";
 				Assert.AreEqual (keywordColor.Name, color, "Color at " + loc + " is wrong:" + color);
 			}
 		}
@@ -347,6 +347,79 @@ class Class {
 		}
 ", varKeywordTypeColor);
 		}
+
+
+		[Test]
+		public void TestStringFormatItemColor()
+		{
+			TestColor (@"using System;
+class MyClass {
+			public static void Main ()
+			{
+				string str = string.Format ("" ${0} ${1} ${2} "", 1, 2, 3);
+			}
+		}
+", stringFormatItemColor);
+		}
+
+		[Test]
+		public void TestStringFormatItemInVerbatimStringColor()
+		{
+			TestColor ("using System;\nclass MyClass {\n\npublic static void Main () { Console.WriteLine (@\" ${0}\n ${1} \n\n ${2} \", 1, 2, 3); } }", stringFormatItemColor);
+		}
+
+		[Test]
+		public void TestFormatItemBug()
+		{
+			TestColor (@"using System;
+class MyClass {
+			public static void Main ()
+			{
+				string str = string.Format ("" ${{ {0} {1} {2} $}} "", 1, 2, 3);
+			}
+		}
+", defaultTextColor);
+		}
+
+		[Test]
+		public void TestInactiveConditionalCall()
+		{
+			TestColor (@"using System.Diagnostics;
+
+class Test
+{
+	[Conditional(""FOO"")]
+	public void Test22()
+	{
+	}
+
+	public void Foo()
+	{
+		$Test22();
+	}
+}
+", inactiveCodeColor);
+		}
+
+		[Test]
+		public void TestInactivePartialCall()
+		{
+			TestColor (@"using System.Diagnostics;
+
+partial class Test
+{
+	partial void FooBar();
+}
+
+partial class Test
+{
+	public void Foo()
+	{
+		$FooBar();
+	}
+}
+", inactiveCodeColor);
+		}
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/AstStructureTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/AstStructureTests.cs
index f22c9ac470..ab86a6a406 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/AstStructureTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/AstStructureTests.cs
@@ -31,13 +31,12 @@ namespace ICSharpCode.NRefactory.CSharp
 			foreach (Type type in typeof(AstNode).Assembly.GetExportedTypes()) {
 				if (type.IsSubclassOf (typeof(AstNode))) {
 					foreach (FieldInfo field in type.GetFields()) {
-						Console.WriteLine (field);
 						if (field.FieldType.IsSubclassOf(typeof(Role))) {
-							Assert.IsTrue(field.IsPublic);
-							Assert.IsTrue(field.IsStatic);
-							Assert.IsTrue(field.IsInitOnly);
-							Assert.IsTrue(field.Name.EndsWith("Role", StringComparison.Ordinal));
-							Assert.IsNotNull(field.GetValue(null));
+							Assert.IsTrue(field.IsPublic, field + " should be public");
+							Assert.IsTrue(field.IsStatic, field + " should be static");
+							Assert.IsTrue(field.IsInitOnly, field + " should be readonly");
+							Assert.That(field.Name, Is.StringEnding("Role"));
+							Assert.IsNotNull(field.GetValue(null), field + " should not have null value");
 						}
 					}
 				}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CSharpOutputVisitorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CSharpOutputVisitorTests.cs
index e858c26339..218a84bb09 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CSharpOutputVisitorTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CSharpOutputVisitorTests.cs
@@ -147,5 +147,49 @@ namespace ICSharpCode.NRefactory.CSharp
 			AssertOutput("0f", new PrimitiveExpression(0f));
 			AssertOutput("-0f", new PrimitiveExpression(-0f));
 		}
+
+		[Test]
+		public void BlankLinesBetweenMembers()
+		{
+			var code = @"class Test
+{
+	Test() {}
+	void Foo() {}
+	int P { get; set; }
+}
+";
+			var unit = SyntaxTree.Parse(code);
+			var options = FormattingOptionsFactory.CreateMono();
+			options.BlankLinesBetweenMembers = 2;
+			AssertOutput("class Test\n{\n$Test ()\n${\n$}\n\n\n$void Foo ()\n${\n$}\n\n\n$int P {\n$$get;\n$$set;\n$}\n}\n", unit, options);
+		}
+
+		[Test]
+		public void BlankLinesAfterUsings() {
+			var code = @"using System;
+using System.Collections;
+using List = System.Collections.List;
+namespace NS
+{
+	using System.Collections.Generic;
+	using Collection = System.Collections.Collection;
+	using System.Xml;
+	class C {}
+}
+";
+			var unit = SyntaxTree.Parse(code);
+			var options = FormattingOptionsFactory.CreateMono();
+			options.BlankLinesAfterUsings = 2;
+			AssertOutput("using System;\nusing System.Collections;\nusing List = System.Collections.List;\n\n\nnamespace NS\n{\n$using System.Collections.Generic;\n$using Collection = System.Collections.Collection;\n$using System.Xml;\n\n\n$class C\n${\n$}\n}\n", unit, options);
+		}
+		
+		[Test, Ignore("#pragma warning not implemented in output visitor - issue #188")]
+		public void PragmaWarning()
+		{
+			var code = @"#pragma warning disable 414";
+			var unit = SyntaxTree.Parse(code);
+			var options = FormattingOptionsFactory.CreateMono();
+			AssertOutput("#pragma warning disable 414\n", unit, options);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AbstractAndVirtualConversionActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AbstractAndVirtualConversionActionTests.cs
new file mode 100644
index 0000000000..22bc928534
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AbstractAndVirtualConversionActionTests.cs
@@ -0,0 +1,289 @@
+//
+// AbstractAndVirtualConversionActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class AbstractAndVirtualConversionActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void VirtualToNonVirtualTest()
+		{
+			Test<AbstractAndVirtualConversionAction>(
+				@"class Test
+{
+	public $virtual void Foo ()
+	{
+	}
+}", @"class Test
+{
+	public void Foo ()
+	{
+	}
+}");
+		}
+
+		[Test]
+		public void VirtualToAbstractTest()
+		{
+			Test<AbstractAndVirtualConversionAction>(
+				@"abstract class Test
+{
+	public $virtual void Foo ()
+	{
+	}
+}", @"abstract class Test
+{
+	public abstract void Foo ();
+}");
+		}
+
+
+		[Test]
+		public void VirtualIndexerToAbstractTest()
+		{
+			Test<AbstractAndVirtualConversionAction>(
+				@"abstract class MainClass
+{
+	public virtual int $this [int i] {
+		get {
+			;
+		}
+	}
+}", @"abstract class MainClass
+{
+	public abstract int this [int i] {
+		get;
+	}
+}");
+		}
+
+
+		[Test]
+		public void NonVirtualStaticToVirtualTest()
+		{
+			Test<AbstractAndVirtualConversionAction>(
+				@"class Test
+{
+	public static void $Foo ()
+	{
+	}
+}", @"class Test
+{
+	public virtual void Foo ()
+	{
+	}
+}");
+		}
+
+
+		[Test]
+		public void NonVirtualToVirtualTest()
+		{
+			Test<AbstractAndVirtualConversionAction>(
+				@"class Test
+{
+	public void $Foo ()
+	{
+	}
+}", @"class Test
+{
+	public virtual void Foo ()
+	{
+	}
+}");
+		}
+
+		[Test]
+		public void InvalidPrivateImplementationTypeTest()
+		{
+			TestWrongContext<AbstractAndVirtualConversionAction>(
+				@"using System;
+class Test : IDisposable
+{
+	void IDisposable.$Dispose ()
+	{
+	}
+}");
+		}
+
+		[Test]
+		public void AbstractToNonAbstractTest()
+		{
+			Test<AbstractAndVirtualConversionAction>(
+				@"abstract class Test
+{
+	public $abstract void Foo ();
+}", @"abstract class Test
+{
+	public void Foo ()
+	{
+		throw new System.NotImplementedException ();
+	}
+}");
+		}
+
+		[Test]
+		public void AbstractToVirtualTest()
+		{
+			Test<AbstractAndVirtualConversionAction>(
+				@"abstract class Test
+{
+	public $abstract void Foo ();
+}", @"abstract class Test
+{
+	public virtual void Foo ()
+	{
+		throw new System.NotImplementedException ();
+	}
+}", 1);
+		}
+
+		[Test]
+		public void AbstractPropertyToNonAbstractTest()
+		{
+			Test<AbstractAndVirtualConversionAction>(
+				@"abstract class Test
+{
+	public abstract int $Foo {
+		get;
+		set;
+	}
+}", @"abstract class Test
+{
+	public int Foo {
+		get {
+			throw new System.NotImplementedException ();
+		}
+		set {
+			throw new System.NotImplementedException ();
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void AbstractEventToNonAbstractTest()
+		{
+			Test<AbstractAndVirtualConversionAction>(
+				@"using System;
+abstract class Test
+{
+	public abstract event EventHandler $Foo;
+}", @"using System;
+abstract class Test
+{
+	public event EventHandler Foo;
+}");
+		}
+
+		[Test]
+		public void NonAbstractToAbstractTest()
+		{
+			Test<AbstractAndVirtualConversionAction>(
+				@"abstract class Test
+{
+	public void $Foo ()
+	{
+		throw new System.NotImplementedException ();
+	}
+}", @"abstract class Test
+{
+	public abstract void Foo ();
+}");
+		}
+
+		[Test]
+		public void NonAbstractEventToAbstractTest()
+		{
+			Test<AbstractAndVirtualConversionAction>(
+				@"abstract class Test
+{
+	public event EventHandler $Foo  {
+		add {
+			throw new System.NotImplementedException ();
+		}
+		remove {
+			throw new System.NotImplementedException ();
+		}
+	}
+}", @"abstract class Test
+{
+	public abstract event EventHandler Foo;
+}");
+		}
+
+
+		[Test]
+		public void InvalidLocalContext()
+		{
+			TestWrongContext<AbstractAndVirtualConversionAction>(
+				@"using System;
+class Test
+{
+	public static void Main (string[] args)
+	{
+		int $fooBar = 1;
+	}
+}");
+		}
+
+
+		[Test]
+		public void InvalidOverrideTest()
+		{
+			TestWrongContext<AbstractAndVirtualConversionAction>(
+				@"using System;
+class Test
+{
+	public override string $ToString()
+	{
+	}
+}");
+		}
+
+		[Test]
+		public void InvalidMethodTest()
+		{
+			var actions = GetActions<AbstractAndVirtualConversionAction>(
+				@"using System;
+abstract class Test
+{
+	public virtual string $ToString()
+	{
+		Console.WriteLine (""Hello World"");
+	}
+}");
+			// only virtual -> non virtual should be provided - no abstract conversion
+			Assert.AreEqual(1, actions.Count); 
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddAnotherAccessorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddAnotherAccessorTests.cs
index 5e0bd1ae9d..f623949cb7 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddAnotherAccessorTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddAnotherAccessorTests.cs
@@ -131,10 +131,15 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 		{
 			Test<AddAnotherAccessorAction> (@"class TestClass
 {
-	string $Test { get; }
+	string $Test {
+		get;
+	}
 }", @"class TestClass
 {
-	string Test { get; set; }
+	string Test {
+		get;
+		set;
+	}
 }");
 		}
 	}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddArgumentNameTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddArgumentNameTests.cs
new file mode 100644
index 0000000000..eec6ad3cf5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddArgumentNameTests.cs
@@ -0,0 +1,218 @@
+// 
+// AddArgumentNameTests.cs
+// 
+// Author:
+//      Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class AddArgumentNameTests : ContextActionTestBase
+	{
+		[Test]
+		public void MethodInvocation1()
+		{
+			Test<AddArgumentNameAction>(@"
+class TestClass
+{
+	public void Foo(int a, int b, float c = 0.1){}
+	public void F()
+	{
+		Foo($1,b: 2);
+	}
+}", @"
+class TestClass
+{
+	public void Foo(int a, int b, float c = 0.1){}
+	public void F()
+	{
+		Foo (a: 1, b: 2);
+	}
+}");
+		}
+
+		[Test]
+		public void MethodInvocation2()
+		{
+			Test<AddArgumentNameAction>(@"
+class TestClass
+{
+	public void Foo(int a, int b, float c = 0.1){}
+	public void F()
+	{
+		Foo($1, 2);
+	}
+}", @"
+class TestClass
+{
+	public void Foo(int a, int b, float c = 0.1){}
+	public void F()
+	{
+		Foo (a: 1, b: 2);
+	}
+}");
+		}
+
+		[Test]
+		public void AttributeUsage()
+		{
+			Test<AddArgumentNameAction>(@"
+using System;
+public class AnyClass
+{
+	[Obsolete($"" "", error: true)]
+	static void Old() { }
+}", @"
+using System;
+public class AnyClass
+{
+	[Obsolete(message: "" "", error: true)]
+	static void Old() { }
+}");
+		}
+
+		[Test]
+		public void AttributeNamedArgument()
+		{
+			Test<AddArgumentNameAction>(@"
+class MyAttribute : System.Attribute
+{
+	public string Name1 { get; set; }
+	public string Name2 { get; set; }
+	public string Name3 { get; set; }
+	private int foo;
+
+	public MyAttribute(int foo)
+	{
+		this.foo = foo;
+	}
+}
+
+
+[My($1, Name1 = """", Name2 = """")]
+public class Test
+{
+}
+", @"
+class MyAttribute : System.Attribute
+{
+	public string Name1 { get; set; }
+	public string Name2 { get; set; }
+	public string Name3 { get; set; }
+	private int foo;
+
+	public MyAttribute(int foo)
+	{
+		this.foo = foo;
+	}
+}
+
+
+[My(foo: 1, Name1 = """", Name2 = """")]
+public class Test
+{
+}
+");
+		}
+
+		[Test]
+		public void AttributeNamedArgumentInvalidCase()
+		{
+			TestWrongContext<AddArgumentNameAction>(@"
+class MyAttribute : System.Attribute
+{
+	public string Name1 { get; set; }
+	public string Name2 { get; set; }
+	public string Name3 { get; set; }
+	private int foo;
+
+	public MyAttribute(int foo)
+	{
+		this.foo = foo;
+	}
+}
+
+
+[My(1, $Name1 = """", Name2 = """")]
+public class Test
+{
+}
+");
+		}
+
+		[Test]
+		public void IndexerInvocation()
+		{
+			Test<AddArgumentNameAction>(@"
+public class TestClass
+{
+	public int this[int i, int j]
+	{
+		set { }
+		get { return 0; }
+	}
+}
+internal class Test
+{
+	private void Foo()
+	{
+		var TestBases = new TestClass();
+		int a = TestBases[ $1, 2];
+	}
+}", @"
+public class TestClass
+{
+	public int this[int i, int j]
+	{
+		set { }
+		get { return 0; }
+	}
+}
+internal class Test
+{
+	private void Foo()
+	{
+		var TestBases = new TestClass();
+		int a = TestBases [i: 1, j: 2];
+	}
+}");
+		}
+	
+		[Test]
+		public void TestParamsInvalidContext()
+		{
+
+			TestWrongContext<AddArgumentNameAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		System.Console.WriteLine (""foo"", 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, $12);
+	}
+}");
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddBracesActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddBracesActionTests.cs
new file mode 100644
index 0000000000..35ca26824e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddBracesActionTests.cs
@@ -0,0 +1,240 @@
+//
+// AddBracesActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class AddBracesActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestAddBracesToIf()
+		{
+			Test<AddBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		$if (true)
+			Console.WriteLine (""Hello"");
+	}
+}",@"class TestClass
+{
+	void Test ()
+	{
+		if (true) {
+			Console.WriteLine (""Hello"");
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestAddBracesToElse()
+		{
+			Test<AddBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		if (true) {
+			Console.WriteLine (""Hello"");
+		} $else
+			Console.WriteLine (""World"");
+	}
+}", @"class TestClass
+{
+	void Test ()
+	{
+		if (true) {
+			Console.WriteLine (""Hello"");
+		} else {
+			Console.WriteLine (""World"");
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestAddBracesToDoWhile()
+		{
+			Test<AddBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		$do
+			Console.WriteLine (""Hello""); 
+		while (true);
+	}
+}", @"class TestClass
+{
+	void Test ()
+	{
+		do {
+			Console.WriteLine (""Hello"");
+		} while (true);
+	}
+}");
+		}
+
+		[Test]
+		public void TestAddBracesToForeach()
+		{
+			Test<AddBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		$foreach (var a in b)
+			Console.WriteLine (""Hello"");
+	}
+}", @"class TestClass
+{
+	void Test ()
+	{
+		foreach (var a in b) {
+			Console.WriteLine (""Hello"");
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestAddBracesToFor()
+		{
+			Test<AddBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		$for (;;)
+			Console.WriteLine (""Hello"");
+	}
+}", @"class TestClass
+{
+	void Test ()
+	{
+		for (;;) {
+			Console.WriteLine (""Hello"");
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestAddBracesToLock()
+		{
+			Test<AddBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		$lock (this)
+			Console.WriteLine (""Hello"");
+	}
+}", @"class TestClass
+{
+	void Test ()
+	{
+		lock (this) {
+			Console.WriteLine (""Hello"");
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestAddBracesToUsing()
+		{
+			Test<AddBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		$using (var a = new A ())
+			Console.WriteLine (""Hello"");
+	}
+}", @"class TestClass
+{
+	void Test ()
+	{
+		using (var a = new A ()) {
+			Console.WriteLine (""Hello"");
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestAddBracesToWhile()
+		{
+			Test<AddBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		$while (true)
+			Console.WriteLine (""Hello"");
+	}
+}", @"class TestClass
+{
+	void Test ()
+	{
+		while (true) {
+			Console.WriteLine (""Hello"");
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestBlockAlreadyInserted()
+		{
+			TestWrongContext<AddBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		$if (true) {
+			Console.WriteLine (""Hello"");
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestNullNode()
+		{
+			TestWrongContext<AddBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		if (true) {
+			Console.WriteLine (""Hello"");
+		}
+	}
+}
+
+        $          
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddExceptionDescriptionActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddExceptionDescriptionActionTests.cs
new file mode 100644
index 0000000000..0b213237f2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddExceptionDescriptionActionTests.cs
@@ -0,0 +1,101 @@
+//
+// AddExceptionDescriptionActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class AddExceptionDescriptionActionTests : ContextActionTestBase
+	{
+
+		[Test]
+		public void TestPlainEntity()
+		{
+			TestWrongContext<AddExceptionDescriptionAction>(@"using System;
+public class Test
+{
+	public void Bar(Test test)
+	{
+		if (test == null) 
+			$throw new ArgumentNullException(""test"");
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestAddToExistingDocumentation()
+		{
+			Test<AddExceptionDescriptionAction>(@"using System;
+public class Test
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	/// <param name=""test""></param>
+	public void Bar(Test test)
+	{
+		if (test == null) 
+			$throw new ArgumentNullException(""test"");
+	}
+}
+", @"using System;
+public class Test
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	/// <param name=""test""></param>
+	/// <exception cref=""T:System.ArgumentNullException""></exception>
+	public void Bar(Test test)
+	{
+		if (test == null) 
+			throw new ArgumentNullException(""test"");
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestAlreadyAdded()
+		{
+			TestWrongContext<AddExceptionDescriptionAction>(@"
+using System;
+public class Test
+{
+	/// <exception cref=""T:System.ArgumentNullException""></exception>
+	public void Bar(Test test)
+	{
+		if (test == null) 
+			$throw new ArgumentNullException(""test"");
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddOptionalParameterToInvocationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddOptionalParameterToInvocationTests.cs
new file mode 100644
index 0000000000..e6a5af50cf
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddOptionalParameterToInvocationTests.cs
@@ -0,0 +1,169 @@
+// 
+// AddOptionalParameterToInvocationTests.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class AddOptionalParameterToInvocationTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestSimple ()
+		{
+			Test<AddOptionalParameterToInvocationAction> (@"
+class TestClass
+{
+	public void Foo(string msg = ""Hello"") {}
+	public void Bar() {
+		$Foo ();
+	}
+}", @"
+class TestClass
+{
+	public void Foo(string msg = ""Hello"") {}
+	public void Bar() {
+		Foo (""Hello"");
+	}
+}");
+		}
+
+		[Test]
+		public void TestMultiple1 ()
+		{
+			Test<AddOptionalParameterToInvocationAction> (@"
+class TestClass
+{
+	public void Foo(string msg = ""Hello"", string msg2 = ""Bar"") {}
+	public void Bar() {
+		$Foo ();
+	}
+}", @"
+class TestClass
+{
+	public void Foo(string msg = ""Hello"", string msg2 = ""Bar"") {}
+	public void Bar() {
+		Foo (""Hello"");
+	}
+}");
+		}
+
+		[Test]
+		public void TestExtensionMethod ()
+		{
+			Test<AddOptionalParameterToInvocationAction> (@"
+static class Extensions
+{
+	public static void Foo(this string self, string msg = ""Hello"") {}
+}
+class TestClass
+{
+	public void Bar() {
+		string.$Foo ();
+	}
+}", @"
+static class Extensions
+{
+	public static void Foo(this string self, string msg = ""Hello"") {}
+}
+class TestClass
+{
+	public void Bar() {
+		string.Foo (""Hello"");
+	}
+}");
+		}
+
+		[Test]
+		public void TestMultiple2 ()
+		{
+			Test<AddOptionalParameterToInvocationAction> (@"
+class TestClass
+{
+	public void Foo(string msg = ""Hello"", string msg2 = ""Bar"") {}
+	public void Bar() {
+		$Foo ();
+	}
+}", @"
+class TestClass
+{
+	public void Foo(string msg = ""Hello"", string msg2 = ""Bar"") {}
+	public void Bar() {
+		Foo (msg2: ""Bar"");
+	}
+}", 1);
+		}
+
+		[Test]
+		public void TestMultiple3 ()
+		{
+			Test<AddOptionalParameterToInvocationAction> (@"
+class TestClass
+{
+	public void Foo(string msg = ""Hello"", string msg2 = ""Bar"") {}
+	public void Bar() {
+		$Foo ();
+	}
+}", @"
+class TestClass
+{
+	public void Foo(string msg = ""Hello"", string msg2 = ""Bar"") {}
+	public void Bar() {
+		Foo (""Hello"", ""Bar"");
+	}
+}", 2);
+		}
+
+		[Test]
+		public void TestNoMoreParameters ()
+		{
+			TestWrongContext<AddOptionalParameterToInvocationAction>(@"
+class TestClass
+{
+	public void Foo(string msg = ""Hello"", string msg2 = ""Bar"") {}
+	public void Bar() {
+		$Foo (string.Empty, string.Empty);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestParams ()
+		{
+			TestWrongContext<AddOptionalParameterToInvocationAction>(@"
+class TestClass
+{
+	public void Foo(params string[] p) {}
+	public void Bar() {
+		$Foo ();
+	}
+}
+");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AutoLinqSumTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AutoLinqSumTests.cs
new file mode 100644
index 0000000000..c2ec985ba2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AutoLinqSumTests.cs
@@ -0,0 +1,775 @@
+// AutoLinqTests.cs
+//  
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class AutoLinqSumActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestSimpleIntegerLoop() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		$foreach (var x in list)
+			result += x;
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		result += list.Sum ();
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestMergedIntegerLoop() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		var list = new int[] { 1, 2, 3 };
+		int result = 0;
+		$foreach (var x in list)
+			result += x;
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		var list = new int[] { 1, 2, 3 };
+		int result = list.Sum ();
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestNonZeroMergedIntegerLoop() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		var list = new int[] { 1, 2, 3 };
+		int result = 1;
+		$foreach (var x in list)
+			result += x;
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		var list = new int[] { 1, 2, 3 };
+		int result = 1 + list.Sum ();
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestMergedAssignmentIntegerLoop() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		var list = new int[] { 1, 2, 3 };
+		int result;
+		result = 1;
+		$foreach (var x in list)
+			result += x;
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		var list = new int[] { 1, 2, 3 };
+		int result;
+		result = 1 + list.Sum ();
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestMergedDecimal() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		var list = new int[] { 1, 2, 3 };
+		decimal result = 0.0m;
+		$foreach (var x in list)
+			result += x;
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		var list = new int[] { 1, 2, 3 };
+		decimal result = list.Sum ();
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestIntegerLoopInBlock() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		$foreach (var x in list) {
+			result += x;
+		}
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		result += list.Sum ();
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestExpression() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		$foreach (var x in list) {
+			result += x * 2;
+		}
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		result += list.Sum (x => x * 2);
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestDisabledForStrings() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		string result = string.Empty;
+		var list = new string[] { ""a"", ""b"" };
+		$foreach (var x in list) {
+			result += x;
+		}
+	}
+}";
+			TestWrongContext<AutoLinqSumAction>(source);
+		}
+
+		[Test]
+		public void TestShort() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		short result = 0;
+		var list = new short[] { 1, 2, 3 };
+		$foreach (var x in list)
+			result += x;
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		short result = 0;
+		var list = new short[] { 1, 2, 3 };
+		result += list.Sum ();
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestLong() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		long result = 0;
+		var list = new long[] { 1, 2, 3 };
+		$foreach (var x in list)
+			result += x;
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		long result = 0;
+		var list = new long[] { 1, 2, 3 };
+		result += list.Sum ();
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestUnsignedLong() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		ulong result = 0;
+		var list = new ulong[] { 1, 2, 3 };
+		$foreach (var x in list)
+			result += x;
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		ulong result = 0;
+		var list = new ulong[] { 1, 2, 3 };
+		result += list.Sum ();
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestFloat() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		float result = 0;
+		var list = new float[] { 1, 2, 3 };
+		$foreach (var x in list)
+			result += x;
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		float result = 0;
+		var list = new float[] { 1, 2, 3 };
+		result += list.Sum ();
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestDouble() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		double result = 0;
+		var list = new double[] { 1, 2, 3 };
+		$foreach (var x in list)
+			result += x;
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		double result = 0;
+		var list = new double[] { 1, 2, 3 };
+		result += list.Sum ();
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestDecimal() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		decimal result = 0;
+		var list = new decimal[] { 1, 2, 3 };
+		$foreach (var x in list)
+			result += x;
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		decimal result = 0;
+		var list = new decimal[] { 1, 2, 3 };
+		result += list.Sum ();
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestMinus() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		$foreach (var x in list) {
+			result -= x;
+		}
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		result += list.Sum (x => -x);
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestCombined() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		$foreach (var x in list) {
+			result += x;
+			result += 2 * x;
+		}
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		result += list.Sum (x => x + 2 * x);
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestCombinedPrecedence() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		$foreach (var x in list) {
+			result += x;
+			result += x << 1;
+		}
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		result += list.Sum (x => x + (x << 1));
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestEmptyStatements() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		$foreach (var x in list) {
+			result += x;
+			;
+		}
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		result += list.Sum ();
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestSimpleConditional() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		$foreach (var x in list) {
+			if (x > 0)
+				result += x;
+		}
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		result += list.Where (x => x > 0).Sum ();
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestInvertedConditional() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		$foreach (var x in list) {
+			if (x > 0)
+				;
+			else
+				result += x;
+		}
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		result += list.Where (x => x <= 0).Sum ();
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestIncrement() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		$foreach (var x in list) {
+			result++;
+		}
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		result += list.Count ();
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestCompleteConditional() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		$foreach (var x in list) {
+			if (x > 0)
+				result += x * 2;
+			else
+				result += x;
+		}
+	}
+}";
+
+			string result = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2, 3 };
+		result += list.Sum (x => x > 0 ? x * 2 : x);
+	}
+}";
+
+			Assert.AreEqual(result, RunContextAction(new AutoLinqSumAction(), source));
+		}
+
+		[Test]
+		public void TestDisabledForSideEffects() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		string result = string.Empty;
+		var list = new string[] { ""a"", ""b"" };
+		$foreach (var x in list) {
+			TestMethod();
+			result += x;
+		}
+	}
+}";
+			TestWrongContext<AutoLinqSumAction>(source);
+		}
+
+		[Test]
+		public void TestDisabledForInnerAssignments() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2 };
+		int p = 0;
+		$foreach (var x in list) {
+			result += (p = x);
+		}
+	}
+}";
+			TestWrongContext<AutoLinqSumAction>(source);
+		}
+
+		[Test]
+		public void TestDisabledForInnerIncrements() {
+			string source = @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2 };
+		int p = 0;
+		$foreach (var x in list) {
+			result += (p++);
+		}
+	}
+}";
+			TestWrongContext<AutoLinqSumAction>(source);
+		}
+
+		[Test]
+		public void TestDisabledForNoLinq() {
+			string source = @"
+class TestClass
+{
+	void TestMethod() {
+		int result = 0;
+		var list = new int[] { 1, 2 };
+		$foreach (var x in list) {
+			result += x;
+		}
+	}
+}";
+			TestWrongContext<AutoLinqSumAction>(source);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CS1520MethodMustHaveAReturnTypeTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CS1520MethodMustHaveAReturnTypeTests.cs
new file mode 100644
index 0000000000..ac1d584f48
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CS1520MethodMustHaveAReturnTypeTests.cs
@@ -0,0 +1,91 @@
+//
+// CS1520MethodMustHaveAReturnTypeTests.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+//
+// Copyright (c) 2013 Luís Reis
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class CS1520MethodMustHaveAReturnTypeTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestMethod()
+		{
+			Test<CS1520MethodMustHaveAReturnTypeAction> (
+				@"class Foo
+{
+	static $Fa (string str)
+	{
+	}
+}",
+				@"class Foo
+{
+	static void Fa (string str)
+	{
+	}
+}", 1, true);
+		}
+
+		[Test]
+		public void TestConstructor()
+		{
+			Test<CS1520MethodMustHaveAReturnTypeAction> (
+				@"class Foo
+{
+	static $Fa (string str)
+	{
+	}
+}",
+				@"class Foo
+{
+	static Foo (string str)
+	{
+	}
+}", 0, true);
+		}
+
+		[Test]
+		public void TestConstructorWithBase()
+		{
+			Test<CS1520MethodMustHaveAReturnTypeAction> (
+				@"class Foo
+{
+	static $Fa (string str) : base (str)
+	{
+	}
+}",
+				@"class Foo
+{
+	static Foo (string str) : base (str)
+	{
+	}
+}", 0, true);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ChangeAccessModifierTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ChangeAccessModifierTests.cs
new file mode 100644
index 0000000000..6b5c01e151
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ChangeAccessModifierTests.cs
@@ -0,0 +1,239 @@
+// 
+// ChangeAccessModifiersTests.cs
+//  
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ChangeAccessModifierTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestNoEnumMember()
+		{
+			TestWrongContext<ChangeAccessModifierAction>(@"
+enum Test
+{
+	$Foo
+}");
+		}
+
+		[Test]
+		public void TestNoInterfaceMember()
+		{
+			TestWrongContext<ChangeAccessModifierAction>(@"
+interface Test
+{
+	void $Foo ();
+}");
+		}
+
+		[Test]
+		public void TestNoExplicitInterfaceImplementationMember()
+		{
+			TestWrongContext<ChangeAccessModifierAction>(@"
+interface Test
+{
+	void Foo ();
+}
+class TestClass : Test
+{
+	void $Test.Foo () {}
+}");
+		}
+
+		[Test]
+		public void TestNoOverrideMember()
+		{
+			TestWrongContext<ChangeAccessModifierAction>(@"
+class TestClass : Test
+{
+	public override string $ToString()
+	{
+		return ""Test"";
+	}
+		
+}");
+		}
+
+		[Test]
+		public void TestType ()
+		{
+			Test<ChangeAccessModifierAction>(@"
+class $Foo
+{
+}", @"
+public class Foo
+{
+}");
+		}
+
+		[Test]
+		public void TestMethodToProtected ()
+		{
+			Test<ChangeAccessModifierAction>(@"
+class Foo
+{
+	void $Bar ()
+	{
+	}
+}", @"
+class Foo
+{
+	protected void Bar ()
+	{
+	}
+}");
+		}
+
+		[Test]
+		public void TestPrivateMethodToProtected ()
+		{
+			Test<ChangeAccessModifierAction>(@"
+class Foo
+{
+	$private void Bar ()
+	{
+	}
+}", @"
+class Foo
+{
+	protected void Bar ()
+	{
+	}
+}");
+		}
+
+		[Test]
+		public void TestMethodToProtectedInternal ()
+		{
+			Test<ChangeAccessModifierAction>(@"
+class Foo
+{
+	void $Bar ()
+	{
+	}
+}", @"
+class Foo
+{
+	protected internal void Bar ()
+	{
+	}
+}", 1);
+		}
+
+		[Test]
+		public void TestAccessor ()
+		{
+			Test<ChangeAccessModifierAction>(@"
+class Foo
+{
+	public int Bar
+	{
+		get; $set;
+	}
+}", @"
+class Foo
+{
+	public int Bar
+	{
+		get; private set;
+	}
+}");
+		}
+
+		[Test]
+		public void TestStrictAccessor ()
+		{
+			TestWrongContext<ChangeAccessModifierAction>(@"
+class Foo
+{
+	private int Bar
+	{
+		get; $set;
+	}
+}");
+		}
+
+		[Test]
+		public void TestChangeAccessor ()
+		{
+			Test<ChangeAccessModifierAction>(@"
+class Foo
+{
+	public int Bar
+	{
+		get; private $set;
+	}
+}", @"
+class Foo
+{
+	public int Bar
+	{
+		get; protected set;
+	}
+}");
+		}
+	
+		[Test]
+		public void TestReturnTypeWrongContext()
+		{
+			TestWrongContext<ChangeAccessModifierAction>(@"
+class Test
+{
+	public $void Foo () {}
+}");
+		}
+
+		[Test]
+		public void TestWrongModiferContext()
+		{
+			TestWrongContext<ChangeAccessModifierAction>(@"
+class Test
+{
+	public $virtual void Foo () {}
+}");
+		}
+
+		[Test]
+		public void TestMethodImplementingInterface()
+		{
+			TestWrongContext<ChangeAccessModifierAction>(@"using System;
+
+class BaseClass : IDisposable
+{
+	public void $Dispose()
+	{
+	}
+}");
+		}
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ComputeConstantValueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ComputeConstantValueTests.cs
new file mode 100644
index 0000000000..1804a467f0
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ComputeConstantValueTests.cs
@@ -0,0 +1,280 @@
+// 
+// ComputeConstantValueTests.cs
+// 
+// Author:
+//      Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ComputeConstantValueTests : ContextActionTestBase
+	{
+		[Test]
+		public void Rational1()
+		{
+			Test<ComputeConstantValueAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		int a = 1 $+ 1;
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		int a = 2;
+	}
+}");
+		}
+		[Test]
+		public void Rational2()
+		{
+			Test<ComputeConstantValueAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		int b = 2 $* 2;
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		int b = 4;
+	}
+}");
+		}
+		[Test]
+		public void Rational3()
+		{
+			Test<ComputeConstantValueAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		double c = 0.2 $/ 2;
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		double c = 0.1;
+	}
+}");
+		}
+		[Test]
+		public void Rational4()
+		{
+			Test<ComputeConstantValueAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		double d = 2 $* (-0.2);
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		double d = -0.4;
+	}
+}");
+		}
+		[Test]
+		public void Rational5()
+		{
+			Test<ComputeConstantValueAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		int e = 2 $* (1 << 2);
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		int e = 8;
+	}
+}");
+		}
+		[Test]
+		public void Rational6()
+		{
+			Test<ComputeConstantValueAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		int f = 1 $+ (~4);
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		int f = -4;
+	}
+}");
+		}
+
+		[Test]
+		public void Bool1()
+		{
+			Test<ComputeConstantValueAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		bool a = $!(true);
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		bool a = false;
+	}
+}");
+		}
+
+		[Test]
+		public void Bool2()
+		{
+			Test<ComputeConstantValueAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		bool b = $!!(!!!(true & false));
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		bool b = true;
+	}
+}");
+		}
+
+		[Test]
+		public void Bool3()
+		{
+			Test<ComputeConstantValueAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		bool c = 1 $> 0;
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		bool c = true;
+	}
+}");
+		}
+
+		[Test]
+		public void String1()
+		{
+			Test<ComputeConstantValueAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		string a = ""a""$+""b"";
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		string a = ""ab"";
+	}
+}");
+		}
+
+		[Test]
+		public void UseConstant()
+		{
+			Test<ComputeConstantValueAction>(@"
+class TestClass
+{
+	const double pi = 3.141;
+	public void F()
+	{
+		double pi2 = $2 * pi;
+	}
+}", @"
+class TestClass
+{
+	const double pi = 3.141;
+	public void F()
+	{
+		double pi2 = 6.282;
+	}
+}");
+		}
+
+
+		[Test]
+		public void Invalid()
+		{
+			TestWrongContext<ComputeConstantValueAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		bool a = !(true);
+		bool b = $!!(!!!(true & a));
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestWrongHotSpot()
+		{
+			TestWrongContext<ComputeConstantValueAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		int a = 1 +$ 1;
+	}
+}");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ContextActionTestBase.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ContextActionTestBase.cs
index 8ebd281f79..4c25d4b664 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ContextActionTestBase.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ContextActionTestBase.cs
@@ -30,6 +30,8 @@ using ICSharpCode.NRefactory.CSharp.Refactoring;
 using System.Threading;
 using System.Linq;
 using System.Text;
+using ICSharpCode.NRefactory;
+using System.Collections.Generic;
 
 namespace ICSharpCode.NRefactory.CSharp.CodeActions
 {
@@ -48,11 +50,10 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 			var sb = new StringBuilder ();
 			for (int i = 0; i < str.Length; i++) {
 				var ch = str [i];
-				if (ch == '\n') {
+				var possibleNewline = NewLine.GetDelimiterLength(ch, i + 1 < str.Length ? str [i + 1] : '\0');
+				if (possibleNewline > 0) {
 					sb.AppendLine ();
-				} else if (ch == '\r') {
-					sb.AppendLine ();
-					if (i + 1 < str.Length && str [i + 1] == '\n')
+					if (possibleNewline == 2)
 						i++;
 				} else {
 					sb.Append (ch);
@@ -62,12 +63,12 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 		}
 
 		public void Test<T> (string input, string output, int action = 0, bool expectErrors = false)
-			where T : ICodeActionProvider, new ()
+			where T : CodeActionProvider, new ()
 		{
 			Test(new T(), input, output, action, expectErrors);
 		}
 		
-		public void Test (ICodeActionProvider provider, string input, string output, int action = 0, bool expectErrors = false)
+		public void Test (CodeActionProvider provider, string input, string output, int action = 0, bool expectErrors = false)
 		{
 			string result = RunContextAction (provider, HomogenizeEol (input), action, expectErrors);
 			bool passed = result == output;
@@ -80,7 +81,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 			Assert.AreEqual (HomogenizeEol (output), result);
 		}
 
-		protected string RunContextAction (ICodeActionProvider action, string input,
+		protected string RunContextAction (CodeActionProvider action, string input,
 		                                          int actionIndex = 0, bool expectErrors = false)
 		{
 			var context = TestRefactoringContext.Create (input, expectErrors);
@@ -97,22 +98,29 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 			return context.doc.Text;
 		}
 		
-		protected void TestWrongContext<T> (string input) where T : ICodeActionProvider, new ()
+		protected void TestWrongContext<T> (string input) where T : CodeActionProvider, new ()
 		{
 			TestWrongContext (new T(), input);
 		}
 		
-		protected void TestWrongContext (ICodeActionProvider action, string input)
+		protected void TestWrongContext (CodeActionProvider action, string input)
 		{
 			var context = TestRefactoringContext.Create (input);
 			context.FormattingOptions = formattingOptions;
 			bool isValid = action.GetActions (context).Any ();
-			if (!isValid)
-				Console.WriteLine ("invalid node is:" + context.GetNode ());
+			if (isValid)
+				Console.WriteLine ("valid node is:" + context.GetNode ());
 			Assert.IsTrue (!isValid, action.GetType () + " shouldn't be valid there.");
 		}
-		
-		protected void TestActionDescriptions (ICodeActionProvider provider, string input, params string[] expected)
+
+		protected List<CodeAction> GetActions<T> (string input) where T : CodeActionProvider, new ()
+		{
+			var ctx = TestRefactoringContext.Create(input);
+			ctx.FormattingOptions = formattingOptions;
+			return new T().GetActions(ctx).ToList();
+		}
+
+		protected void TestActionDescriptions (CodeActionProvider provider, string input, params string[] expected)
 		{
 			var ctx = TestRefactoringContext.Create(input);
 			ctx.FormattingOptions = formattingOptions;
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertAnonymousDelegateToLambdaTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertAnonymousDelegateToLambdaTests.cs
index f1f81024a2..e9b3e7f416 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertAnonymousDelegateToLambdaTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertAnonymousDelegateToLambdaTests.cs
@@ -47,9 +47,7 @@ class A
 {
 	void F ()
 	{
-		System.Action<int, int> action = (i1, i2) => {
-			System.Console.WriteLine (i1);
-		};
+		System.Action<int, int> action = (i1, i2) => System.Console.WriteLine (i1);
 	}
 }");
 		}
@@ -62,7 +60,7 @@ class A
 {
 	void F ()
 	{
-		var action = delegate$ (int i1, int i2) { System.Console.WriteLine (i1); };
+		var action = delegate$ (int i1, int i2) { System.Console.WriteLine (i1); System.Console.WriteLine (i2); };
 	}
 }", @"
 class A
@@ -71,20 +69,28 @@ class A
 	{
 		var action = (int i1, int i2) => {
 			System.Console.WriteLine (i1);
+			System.Console.WriteLine (i2);
 		};
 	}
 }");
 		}
 
 		[Test]
-		public void IgnoresParameterLessDelegates ()
+		public void ParameterLessDelegate ()
 		{
-			TestWrongContext<ConvertAnonymousDelegateToLambdaAction>(@"
+			Test<ConvertAnonymousDelegateToLambdaAction>(@"
 class A
 {
-	void F ()
+	void F (int i)
+	{
+		System.Action<int> act = $delegate { System.Console.WriteLine (i); };
+	}
+}", @"
+class A
+{
+	void F (int i)
 	{
-		System.Action<int> = delegate$ { System.Console.WriteLine (i); };
+		System.Action<int> act = obj => System.Console.WriteLine (i);
 	}
 }");
 		}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertAssignmentToIfActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertAssignmentToIfActionTests.cs
new file mode 100644
index 0000000000..0567804960
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertAssignmentToIfActionTests.cs
@@ -0,0 +1,165 @@
+//
+// ConvertAssignmentToIfActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertAssignmentToIfActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestConditionalOperator ()
+		{
+			Test<ConvertAssignmentToIfAction> (@"
+class TestClass
+{
+	int TestMethod (int o, int p)
+	{
+		int z;
+		z $= i > 0 ? o : p;
+		return z;
+	}
+}", @"
+class TestClass
+{
+	int TestMethod (int o, int p)
+	{
+		int z;
+		if (i > 0)
+			z = o;
+		else
+			z = p;
+		return z;
+	}
+}");
+		}
+
+		[Test]
+		public void TestNullCoalescingOperator ()
+		{
+			Test<ConvertAssignmentToIfAction> (@"
+class Test
+{
+	object TestMethod (object o, object p)
+	{
+		object z;
+		z $= o ?? p;
+		return z;
+	}
+}", @"
+class Test
+{
+	object TestMethod (object o, object p)
+	{
+		object z;
+		if (o != null)
+			z = o;
+		else
+			z = p;
+		return z;
+	}
+}");
+		}
+
+		[Test]
+		public void TestEmbeddedStatement ()
+		{
+			Test<ConvertAssignmentToIfAction> (@"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		if (i < 10)
+			a $= i > 0 ? 0 : 1;
+	}
+}", @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		if (i < 10)
+		if (i > 0)
+			a = 0;
+		else
+			a = 1;
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestAssignment ()
+		{
+			Test<ConvertAssignmentToIfAction> (@"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		a $= i > 0 ? 0 : 1;
+	}
+}", @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		if (i > 0)
+			a = 0;
+		else
+			a = 1;
+	}
+}");
+			Test<ConvertAssignmentToIfAction> (@"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		a $+= i > 0 ? 0 : 1;
+	}
+}", @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		if (i > 0)
+			a += 0;
+		else
+			a += 1;
+	}
+}");
+		}
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertBitwiseFlagComparisonToHasFlagsActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertBitwiseFlagComparisonToHasFlagsActionTests.cs
new file mode 100644
index 0000000000..2bdf39ff5b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertBitwiseFlagComparisonToHasFlagsActionTests.cs
@@ -0,0 +1,259 @@
+//
+// ConvertBitwiseFlagComparisonToHasFlagsActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertBitwiseFlagComparisonToHasFlagsActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestComparisonWithNullInEqual ()
+		{
+			Test<ConvertBitwiseFlagComparisonToHasFlagsAction>(@"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine ((f & Foo.A) $!= 0);
+	}
+}
+", @"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine (f.HasFlag (Foo.A));
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestComparisonWithNullEqual ()
+		{
+			Test<ConvertBitwiseFlagComparisonToHasFlagsAction>(@"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine ((f & Foo.A) $== 0);
+	}
+}
+", @"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine (!f.HasFlag (Foo.A));
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestComparisonWithFlagInEqual ()
+		{
+			Test<ConvertBitwiseFlagComparisonToHasFlagsAction>(@"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine ((f & Foo.A) $!= Foo.A);
+	}
+}
+", @"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine (!f.HasFlag (Foo.A));
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestComparisonWithFlagEqual ()
+		{
+			Test<ConvertBitwiseFlagComparisonToHasFlagsAction>(@"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine ((f & Foo.A) $== Foo.A);
+	}
+}
+", @"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine (f.HasFlag (Foo.A));
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestMultipleFlags ()
+		{
+			Test<ConvertBitwiseFlagComparisonToHasFlagsAction>(@"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine ((f & (Foo.A | Foo.B)) $!= 0);
+	}
+}
+", @"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine (f.HasFlag (Foo.A) | f.HasFlag (Foo.B));
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestMultipleFlagsCase2 ()
+		{
+			Test<ConvertBitwiseFlagComparisonToHasFlagsAction>(@"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine ((f & (Foo.A & Foo.B)) $!= 0);
+	}
+}
+", @"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine (f.HasFlag (Foo.A | Foo.B));
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestInvalid ()
+		{
+			TestWrongContext<ConvertBitwiseFlagComparisonToHasFlagsAction>(@"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine ((f & (Foo.A | Foo.B & 1)) $!= 0);
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertConditionalToIfTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertConditionalToIfTests.cs
deleted file mode 100644
index a0c7dc0aca..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertConditionalToIfTests.cs
+++ /dev/null
@@ -1,273 +0,0 @@
-// 
-// ConvertConditionalToIfTests.cs
-//  
-// Author:
-//       Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeActions
-{
-	[TestFixture]
-	public class ConvertConditionalToIfTests : ContextActionTestBase
-	{
-		[Test]
-		public void TestAssignment ()
-		{
-			Test<ConvertConditionalToIfAction> (@"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		a = i > 0 $? 0 : 1;
-	}
-}", @"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		if (i > 0)
-			a = 0;
-		else
-			a = 1;
-	}
-}");
-			Test<ConvertConditionalToIfAction> (@"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		a += i > 0 $? 0 : 1;
-	}
-}", @"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		if (i > 0)
-			a += 0;
-		else
-			a += 1;
-	}
-}");
-		}
-
-		[Test]
-		public void TestVariableInitializer ()
-		{
-			const string correctOutput = @"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		if (i > 0)
-			a = 0;
-		else
-			a = 1;
-	}
-}";
-			Test<ConvertConditionalToIfAction> (@"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a = i > 0 $? 0 : 1;
-	}
-}", correctOutput);
-			Test<ConvertConditionalToIfAction> (@"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a = (i > 0 $? 0 : 1);
-	}
-}", correctOutput);
-		}
-
-		[Test]
-		public void TestComplexVariableDeclaration ()
-		{
-			Test<ConvertConditionalToIfAction> (@"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a, b = i > 0 $? 0 : 1, c;
-	}
-}", @"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a, b, c;
-		if (i > 0)
-			b = 0;
-		else
-			b = 1;
-	}
-}");
-		}
-		
-		[Test]
-		public void TestInvalidAssignmentContext ()
-		{
-			TestWrongContext<ConvertConditionalToIfAction> (@"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		a = 1 + (i > 0 $? 0 : 1);
-	}
-}");
-		}
-
-		[Test]
-		public void TestInvalidInitializerContext ()
-		{
-			TestWrongContext<ConvertConditionalToIfAction> (@"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a = 1 + (i > 0 $? 0 : 1);
-	}
-}");
-		}
-		
-		[Test]
-		public void TestFor ()
-		{
-			TestWrongContext<ConvertConditionalToIfAction> (@"
-class TestClass
-{
-	void TestMethod ()
-	{
-		int a;
-		for (int i = 0; i < 10; i++, a = i > 10 $? 1 : 0) ;
-	}
-}");
-			TestWrongContext<ConvertConditionalToIfAction> (@"
-class TestClass
-{
-	void TestMethod ()
-	{
-		int a;
-		int i;
-		for (i = 0, a = i > 10 $? 1 : 0; i < 10; i++) ;
-	}
-}");
-			TestWrongContext<ConvertConditionalToIfAction> (@"
-class TestClass
-{
-	void TestMethod ()
-	{
-		int j;
-		for (int i = 0, a = i > 10 $? 1 : 0; i < 10; i++) ;
-	}
-}");
-		}
-
-		[Test]
-		public void TestUsing ()
-		{
-			TestWrongContext<ConvertConditionalToIfAction> (@"
-class TestClass
-{
-	void TestMethod ()
-	{
-		System.IDisposable a;
-		int i = 0;
-		using (a = i > 0 $? null : null) {
-		}
-	}
-}");
-			TestWrongContext<ConvertConditionalToIfAction> (@"
-class TestClass
-{
-	void TestMethod ()
-	{
-		int i = 0;
-		using (System.IDisposable a = i > 0 $? null : null) {
-		}
-	}
-}");
-		}
-
-		[Test]
-		public void TestEmbeddedStatement ()
-		{
-			Test<ConvertConditionalToIfAction> (@"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		if (i < 10)
-			a = i > 0 $? 0 : 1;
-	}
-}", @"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		if (i < 10)
-		if (i > 0)
-			a = 0;
-		else
-			a = 1;
-	}
-}");
-		}
-
-		[Test]
-		public void TestReturn ()
-		{
-			Test<ConvertConditionalToIfAction> (@"
-class TestClass
-{
-	int TestMethod (int i)
-	{
-		return i > 0 $? 1 : 0;
-	}
-}", @"
-class TestClass
-{
-	int TestMethod (int i)
-	{
-		if (i > 0)
-			return 1;
-		else
-			return 0;
-	}
-}");
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertDoWhileToWhileLoopTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertDoWhileToWhileLoopTests.cs
new file mode 100644
index 0000000000..d9a068068d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertDoWhileToWhileLoopTests.cs
@@ -0,0 +1,70 @@
+// 
+// ConvertDoWhileToWhileLoopTests.cs
+//  
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{/* TOOD: Enable - it's not possible to compile this file on mono 3.0.7 due to an internal compiler error.
+	[TestFixture]
+	public class ConvertDoWhileToWhileLoopTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestSimple()
+		{
+			Test<ConvertDoWhileToWhileLoopAction>(@"
+class Foo {
+	void TestMethod() {
+		int x = 1;
+		$do
+			x++;
+		while (x != 1);
+	}
+}", @"
+class Foo {
+	void TestMethod() {
+		int x = 1;
+		while (x != 1)
+			x++;
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisabledInContent()
+		{
+			TestWrongContext<ConvertDoWhileToWhileLoopAction>(@"
+class Foo {
+	void TestMethod() {
+		int x = 1;
+		do
+			$x++;
+		while (x != 1);
+	}
+}");
+		}
+	}*/
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertEqualityOperatorToEqualsActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertEqualityOperatorToEqualsActionTests.cs
new file mode 100644
index 0000000000..89cde952be
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertEqualityOperatorToEqualsActionTests.cs
@@ -0,0 +1,103 @@
+//
+// ConvertEqualityOperatorToEqualsActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertEqualityOperatorToEqualsActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestEquality ()
+		{
+			Test<ConvertEqualityOperatorToEqualsAction> (@"class FooBar
+{
+	public void Foo (object x , object y)
+	{
+		if (x $== y) {
+		}
+	}
+}", @"class FooBar
+{
+	public void Foo (object x , object y)
+	{
+		if (Equals (x, y)) {
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestInEquality ()
+		{
+			Test<ConvertEqualityOperatorToEqualsAction> (@"class FooBar
+{
+	public void Foo (object x , object y)
+	{
+		if (x $!= y) {
+		}
+	}
+}", @"class FooBar
+{
+	public void Foo (object x , object y)
+	{
+		if (!Equals (x, y)) {
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestEqualsFallback ()
+		{
+			Test<ConvertEqualityOperatorToEqualsAction> (@"class FooBar
+{
+	public void Foo (object x , object y)
+	{
+		if (x $== y) {
+		}
+	}
+	public new static bool Equals (object o, object x)
+	{
+		return false;
+	}
+}", @"class FooBar
+{
+	public void Foo (object x , object y)
+	{
+		if (object.Equals (x, y)) {
+		}
+	}
+	public new static bool Equals (object o, object x)
+	{
+		return false;
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertEqualsToEqualityOperatorActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertEqualsToEqualityOperatorActionTests.cs
new file mode 100644
index 0000000000..4c29d60d07
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertEqualsToEqualityOperatorActionTests.cs
@@ -0,0 +1,143 @@
+//
+// ConvertEqualsToEqualityOperatorActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertEqualsToEqualityOperatorActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestEquality ()
+		{
+			Test<ConvertEqualsToEqualityOperatorAction> (@"class FooBar
+{
+	public void Foo (object x , object y)
+	{
+		if ($Equals (x, y)) {
+		}
+	}
+}", @"class FooBar
+{
+	public void Foo (object x , object y)
+	{
+		if (x == y) {
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestInEquality ()
+		{
+			Test<ConvertEqualsToEqualityOperatorAction> (@"class FooBar
+{
+	public void Foo (object x , object y)
+	{
+		if (!$Equals (x, y)) {
+		}
+	}
+}", @"class FooBar
+{
+	public void Foo (object x , object y)
+	{
+		if (x != y) {
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestEqualsFallback ()
+		{
+			Test<ConvertEqualsToEqualityOperatorAction> (@"class FooBar
+{
+	public void Foo (object x , object y)
+	{
+		if (object.$Equals (x, y)) {
+		}
+	}
+	public new static bool Equals (object o, object x)
+	{
+		return false;
+	}
+}", @"class FooBar
+{
+	public void Foo (object x , object y)
+	{
+		if (x == y) {
+		}
+	}
+	public new static bool Equals (object o, object x)
+	{
+		return false;
+	}
+}");
+		}
+
+		[Test]
+		public void TestMemberReferencEquals ()
+		{
+			Test<ConvertEqualsToEqualityOperatorAction> (@"class FooBar
+{
+	public void Foo (object x , object y)
+	{
+		if (x.$Equals (y)) {
+		}
+	}
+}", @"class FooBar
+{
+	public void Foo (object x , object y)
+	{
+		if (x == y) {
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestNegatedMemberReferencEquals ()
+		{
+			Test<ConvertEqualsToEqualityOperatorAction> (@"class FooBar
+{
+	public void Foo (object x , object y)
+	{
+		if (!x.$Equals (y)) {
+		}
+	}
+}", @"class FooBar
+{
+	public void Foo (object x , object y)
+	{
+		if (x != y) {
+		}
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertForToWhileActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertForToWhileActionTests.cs
new file mode 100644
index 0000000000..9768bb03a3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertForToWhileActionTests.cs
@@ -0,0 +1,176 @@
+//
+// ConvertForToWhileActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertForToWhileActionTests  : ContextActionTestBase
+	{
+		[Test]
+		public void TestSimpleFor ()
+		{
+			Test<ConvertForToWhileAction>(@"
+class Test
+{
+	void Foo (object[] o)
+	{
+		$for (int i = 0, oLength = o.Length; i < oLength; i++) {
+			var p = o [i];
+			System.Console.WriteLine (p);
+		}
+	}
+}", @"
+class Test
+{
+	void Foo (object[] o)
+	{
+		int i = 0, oLength = o.Length;
+		while (i < oLength) {
+			var p = o [i];
+			System.Console.WriteLine (p);
+			i++;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestMissingInitializer ()
+		{
+			Test<ConvertForToWhileAction>(@"
+class Test
+{
+	void Foo ()
+	{
+		$for (; i < oLength; i++) {
+			var p = o [i];
+			System.Console.WriteLine (p);
+		}
+	}
+}", @"
+class Test
+{
+	void Foo ()
+	{
+		while (i < oLength) {
+			var p = o [i];
+			System.Console.WriteLine (p);
+			i++;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestMissingCondition ()
+		{
+			Test<ConvertForToWhileAction>(@"
+class Test
+{
+	void Foo (object[] o)
+	{
+		$for (int i = 0, oLength = o.Length;; i++) {
+			var p = o [i];
+			System.Console.WriteLine (p);
+		}
+	}
+}", @"
+class Test
+{
+	void Foo (object[] o)
+	{
+		int i = 0, oLength = o.Length;
+		while (true) {
+			var p = o [i];
+			System.Console.WriteLine (p);
+			i++;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestInfiniteLoop ()
+		{
+			Test<ConvertForToWhileAction>(@"
+class Test
+{
+	void Foo (object[] o)
+	{
+		$for (;;) {
+			var p = o [i];
+			System.Console.WriteLine (p);
+		}
+	}
+}", @"
+class Test
+{
+	void Foo (object[] o)
+	{
+		while (true) {
+			var p = o [i];
+			System.Console.WriteLine (p);
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestMultipleInitializersAndIterators ()
+		{
+			Test<ConvertForToWhileAction>(@"
+class Test
+{
+	void Foo (object[] o)
+	{
+		$for (i=0,j=0; i < oLength; i++,j++) {
+			var p = o [i];
+			System.Console.WriteLine (p);
+		}
+	}
+}", @"
+class Test
+{
+	void Foo (object[] o)
+	{
+		i = 0;
+		j = 0;
+		while (i < oLength) {
+			var p = o [i];
+			System.Console.WriteLine (p);
+			i++;
+			j++;
+		}
+	}
+}");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertForeachToForTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertForeachToForTests.cs
index 00b3f86f0b..504ae0ed3e 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertForeachToForTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertForeachToForTests.cs
@@ -32,7 +32,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 	[TestFixture]
 	public class ConvertForeachToForTests : ContextActionTestBase
 	{
-		[Test()]
+		[Test]
 		public void TestArray ()
 		{
 			string result = RunContextAction (
@@ -63,7 +63,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 				"}", result);
 		}
 		
-		[Test()]
+		[Test]
 		public void TestListOfT ()
 		{
 			string result = RunContextAction (
@@ -95,24 +95,6 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 				"	}" + Environment.NewLine +
 				"}", result);
 		}
-		
-		[Test()]
-		public void TestEnumerableOfT ()
-		{
-			TestWrongContext<ConvertForeachToForAction> (
-				"using System;" + Environment.NewLine +
-				"using System.Collections.Generic;" + Environment.NewLine +
-				"class TestClass" + Environment.NewLine +
-				"{" + Environment.NewLine +
-				"	void Test (IEnumerable<string> args)" + Environment.NewLine +
-				"	{" + Environment.NewLine +
-				"		$foreach (var v in args) {" + Environment.NewLine +
-				"			Console.WriteLine (v);" + Environment.NewLine +
-				"		}" + Environment.NewLine +
-				"	}" + Environment.NewLine +
-				"}"
-			);
-		}
 
 		/// <summary>
 		/// Bug 9876 - Convert to for loop created invalid code if iteration variable is called i
@@ -142,6 +124,62 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 			Console.WriteLine (i);
 		}
 	}
+}");
+		}
+	
+		[Test]
+		public void TestOptimizedForLoop ()
+		{
+			Test<ConvertForeachToForAction>(@"
+class Test
+{
+	void Foo (object[] o)
+	{
+		$foreach (var p in o) {
+			System.Console.WriteLine (p);
+		}
+	}
+}", @"
+class Test
+{
+	void Foo (object[] o)
+	{
+		for (int i = 0, oLength = o.Length; i < oLength; i++) {
+			var p = o [i];
+			System.Console.WriteLine (p);
+		}
+	}
+}", 1);
+		}
+
+		[Test]
+		public void TestEnumerableConversion ()
+		{
+			Test<ConvertForeachToForAction>(@"
+using System;
+using System.Collections.Generic;
+
+class Test
+{
+	public void Foo (IEnumerable<string> bar)
+	{
+		$foreach (var b in bar) {
+			Console.WriteLine (b);
+		}
+	}
+}", @"
+using System;
+using System.Collections.Generic;
+
+class Test
+{
+	public void Foo (IEnumerable<string> bar)
+	{
+		for (var i = bar.GetEnumerator (); i.MoveNext ();) {
+			var b = i.Current;
+			Console.WriteLine (b);
+		}
+	}
 }");
 		}
 	}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertHasFlagsToBitwiseFlagComparisonActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertHasFlagsToBitwiseFlagComparisonActionTests.cs
new file mode 100644
index 0000000000..0ba3d1750b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertHasFlagsToBitwiseFlagComparisonActionTests.cs
@@ -0,0 +1,138 @@
+//
+// ConvertHasFlagsToBitwiseFlagComparisonActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertHasFlagsToBitwiseFlagComparisonActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestSimpleHasFlag ()
+		{
+			Test<ConvertHasFlagsToBitwiseFlagComparisonAction>(@"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine (f.$HasFlag (Foo.A));
+	}
+}
+", @"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine ((f & Foo.A) != 0);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestNegatedSimpleHasFlag ()
+		{
+			Test<ConvertHasFlagsToBitwiseFlagComparisonAction>(@"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine (!f.$HasFlag (Foo.A));
+	}
+}
+", @"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine ((f & Foo.A) == 0);
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestMultipleFlagsCase2 ()
+		{
+			Test<ConvertHasFlagsToBitwiseFlagComparisonAction>(@"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine (f.$HasFlag (Foo.A | Foo.B));
+	}
+}
+", @"
+[Flags]
+enum Foo
+{
+	A, B
+}
+
+class FooBar
+{
+	public void Bar (Foo f)
+	{
+		Console.WriteLine ((f & (Foo.A & Foo.B)) != 0);
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfStatementToConditionalTernaryExpressionActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfStatementToConditionalTernaryExpressionActionTests.cs
new file mode 100644
index 0000000000..9be6192b52
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfStatementToConditionalTernaryExpressionActionTests.cs
@@ -0,0 +1,192 @@
+//
+// ConvertIfStatementToConditionalTernaryExpressionActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertIfStatementToConditionalTernaryExpressionActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestAssignment ()
+		{
+			Test<ConvertIfStatementToConditionalTernaryExpressionAction> (@"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		$if (i > 0)
+			a = 0;
+		else {
+			a = 1;
+		}
+	}
+}", @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		a = i > 0 ? 0 : 1;
+	}
+}");
+		}
+
+		[Test]
+		public void TestAddAssignment ()
+		{
+			Test<ConvertIfStatementToConditionalTernaryExpressionAction> (@"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		$if (i > 0)
+			a += 0;
+		else {
+			a += 1;
+		}
+	}
+}", @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		a += i > 0 ? 0 : 1;
+	}
+}");
+		}
+
+		[Test]
+		public void TestIfElse ()
+		{
+			TestWrongContext<ConvertIfStatementToConditionalTernaryExpressionAction> (@"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		$if (i > 0)
+			a = 0;
+		else if (i < 5) {
+			a = 1;
+		} else {
+			a = 2;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void MultipleStatementsInIf ()
+		{
+			TestWrongContext<ConvertIfStatementToConditionalTernaryExpressionAction> (@"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		$if (i > 0) {
+			a = 0;
+			a = 2;
+		} else {
+			a = 2;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestDifferentAssignmentOperator ()
+		{
+
+			TestWrongContext<ConvertIfStatementToConditionalTernaryExpressionAction> (@"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		$if (i > 0)
+			a += 0;
+		else {
+			a -= 1;
+		}
+	}
+}");
+		}
+
+		[Ignore("Are there any cases where this is needed ?")]
+		[Test]
+		public void TestInsertNecessaryParentheses ()
+		{
+			Test<ConvertIfStatementToConditionalTernaryExpressionAction> (@"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		int b;
+		$if (i > 0)
+			a = b = 0;
+		else {
+			a = 1;
+		}
+	}
+}", @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		int b;
+		a = i > 0 ? (b = 0) : 1;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalidImplicitElse ()
+		{
+
+			TestWrongContext<ConvertIfStatementToConditionalTernaryExpressionAction> (@"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		$if (i > 0)
+			a = 0;
+		a = 1;
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfStatementToNullCoalescingExpressionActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfStatementToNullCoalescingExpressionActionTests.cs
new file mode 100644
index 0000000000..ef91aceeae
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfStatementToNullCoalescingExpressionActionTests.cs
@@ -0,0 +1,276 @@
+// 
+// ConvertIfStatementToNullCoalescingExpressionActionTests.cs
+//  
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertIfStatementToNullCoalescingExpressionActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestDeclaration ()
+		{
+			string input = @"
+class TestClass
+{
+	void Foo()
+	{
+		return null;
+	}
+	void TestMethod()
+	{
+		object o = Foo ();
+		$if (o == null)
+			o = new object ();
+	}
+}
+";
+
+			string output = @"
+class TestClass
+{
+	void Foo()
+	{
+		return null;
+	}
+	void TestMethod()
+	{
+		object o = Foo () ?? new object ();
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new ConvertIfStatementToNullCoalescingExpressionAction(), input));
+		}
+
+		[Test]
+		public void TestYodaConditionals ()
+		{
+			string input = @"
+class TestClass
+{
+	void Foo()
+	{
+		return null;
+	}
+	void TestMethod()
+	{
+		object o = Foo ();
+		$if (null == o)
+			o = new object ();
+	}
+}
+";
+
+			string output = @"
+class TestClass
+{
+	void Foo()
+	{
+		return null;
+	}
+	void TestMethod()
+	{
+		object o = Foo () ?? new object ();
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new ConvertIfStatementToNullCoalescingExpressionAction(), input));
+		}
+
+		[Test]
+		public void TestAssignment ()
+		{
+			string input = @"
+class TestClass
+{
+	void Foo()
+	{
+		return null;
+	}
+	void TestMethod()
+	{
+		object o;
+		o = Foo ();
+		$if (o == null)
+			o = new object ();
+	}
+}
+";
+
+			string output = @"
+class TestClass
+{
+	void Foo()
+	{
+		return null;
+	}
+	void TestMethod()
+	{
+		object o;
+		o = Foo () ?? new object ();
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new ConvertIfStatementToNullCoalescingExpressionAction(), input));
+		}
+
+		[Test]
+		public void TestIsolated ()
+		{
+			string input = @"
+class TestClass
+{
+	object o;
+	void TestMethod()
+	{
+		$if (o == null)
+			o = new object ();
+	}
+}
+";
+
+			string output = @"
+class TestClass
+{
+	object o;
+	void TestMethod()
+	{
+		o = o ?? new object ();
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new ConvertIfStatementToNullCoalescingExpressionAction(), input));
+		}
+
+		[Test]
+		public void TestBlock ()
+		{
+			string input = @"
+class TestClass
+{
+	void Foo()
+	{
+		return null;
+	}
+	void TestMethod()
+	{
+		object o = Foo ();
+		$if (o == null)
+		{
+			o = new object ();
+		}
+	}
+}
+";
+
+			string output = @"
+class TestClass
+{
+	void Foo()
+	{
+		return null;
+	}
+	void TestMethod()
+	{
+		object o = Foo () ?? new object ();
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new ConvertIfStatementToNullCoalescingExpressionAction(), input));
+		}
+
+		[Test]
+		public void TestInvertedCondition ()
+		{
+			string input = @"
+class TestClass
+{
+	void Foo()
+	{
+		return null;
+	}
+	void TestMethod()
+	{
+		object o = Foo ();
+		$if (o != null)
+		{
+		} else {
+			o = new object ();
+		}
+	}
+}
+";
+
+			string output = @"
+class TestClass
+{
+	void Foo()
+	{
+		return null;
+	}
+	void TestMethod()
+	{
+		object o = Foo () ?? new object ();
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new ConvertIfStatementToNullCoalescingExpressionAction(), input));
+		}
+
+		[Test]
+		public void TestDisabledForImproperCondition()
+		{
+			string input = @"
+class TestClass
+{
+	void Foo()
+	{
+		return null;
+	}
+	void TestMethod()
+	{
+		object o = Foo ();
+		$if (o != null)
+		{
+			o = new object ();
+		}
+	}
+}
+";
+
+			TestWrongContext<ConvertIfStatementToNullCoalescingExpressionAction>(input);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfStatementToReturnStatementActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfStatementToReturnStatementActionTests.cs
new file mode 100644
index 0000000000..3c447355c5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfStatementToReturnStatementActionTests.cs
@@ -0,0 +1,105 @@
+// 
+// ConvertIfStatementToReturnStatementAction.cs
+//  
+// Author:
+//       Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertIfStatementToReturnStatementActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestReturn ()
+		{
+			Test<ConvertIfStatementToReturnStatementAction> (@"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		$if (i > 0)
+			return 1;
+		else
+			return 0;
+	}
+}", @"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		return i > 0 ? 1 : 0;
+	}
+}");
+		}
+
+		[Test]
+		public void TestIfElseWithBlocks ()
+		{
+			Test<ConvertIfStatementToReturnStatementAction>(@"class Foo
+{
+	bool Bar (string str)
+	{
+		$if (str.Length > 10) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+}", @"class Foo
+{
+	bool Bar (string str)
+	{
+		return str.Length > 10;
+	}
+}");
+		}
+
+		[Test]
+		public void TestImplicitElse ()
+		{
+
+			Test<ConvertIfStatementToReturnStatementAction> (@"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		$if (i > 0)
+			return 1;
+		return 0;
+	}
+}", @"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		return i > 0 ? 1 : 0;
+	}
+}");
+		}
+
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfStatementToSwitchStatementActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfStatementToSwitchStatementActionTests.cs
new file mode 100644
index 0000000000..19e0c6ab0d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfStatementToSwitchStatementActionTests.cs
@@ -0,0 +1,552 @@
+// 
+// ConvertIfToSwtichTests.cs
+//  
+// Author:
+//       Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertIfStatementToSwitchStatementActionTests : ContextActionTestBase
+	{
+
+		[Test]
+		public void TestBreak ()
+		{
+			Test<ConvertIfStatementToSwitchStatementAction> (@"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+		int b;
+		$if (a == 0) {
+			b = 0;
+		} else if (a == 1) {
+			b = 1;
+		} else if (a == 2 || a == 3) {
+			b = 2;
+		} else {
+			b = 3;
+		}
+	}
+}", @"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+		int b;
+		switch (a) {
+		case 0:
+			b = 0;
+			break;
+		case 1:
+			b = 1;
+			break;
+		case 2:
+		case 3:
+			b = 2;
+			break;
+		default:
+			b = 3;
+			break;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestReturn ()
+		{
+			Test<ConvertIfStatementToSwitchStatementAction> (@"
+class TestClass
+{
+	int TestMethod (int a)
+	{
+		$if (a == 0) {
+			int b = 1;
+			return b + 1;
+		} else if (a == 2 || a == 3) {
+			return 2;
+		} else {
+			return -1;
+		}
+	}
+}", @"
+class TestClass
+{
+	int TestMethod (int a)
+	{
+		switch (a) {
+		case 0:
+			int b = 1;
+			return b + 1;
+		case 2:
+		case 3:
+			return 2;
+		default:
+			return -1;
+		}
+	}
+}");
+		}
+		
+		[Test]
+		public void TestConstantExpression ()
+		{
+			Test<ConvertIfStatementToSwitchStatementAction> (@"
+class TestClass
+{
+	int TestMethod (int? a)
+	{
+		$if (a == (1 == 1 ? 11 : 12)) {
+			return 1;
+		} else if (a == (2 * 3) + 1 || a == 6 / 2) {
+			return 2;
+		} else if (a == null || a == (int)(10L + 2) || a == default(int) || a == sizeof(int)) {
+			return 3;		
+		} else {
+			return -1;
+		}
+	}
+}", @"
+class TestClass
+{
+	int TestMethod (int? a)
+	{
+		switch (a) {
+		case (1 == 1 ? 11 : 12):
+			return 1;
+		case (2 * 3) + 1:
+		case 6 / 2:
+			return 2;
+		case null:
+		case (int)(10L + 2):
+		case default(int):
+		case sizeof(int):
+			return 3;
+		default:
+			return -1;
+		}
+	}
+}");
+
+
+			Test<ConvertIfStatementToSwitchStatementAction> (@"
+class TestClass
+{
+	const int b = 0;
+	int TestMethod (int a)
+	{
+		const int c = 1;
+		$if (a == b) {
+			return 1;
+		} else if (a == b + c) {
+			return 0;
+		} else {
+			return -1;
+		}
+	}
+}", @"
+class TestClass
+{
+	const int b = 0;
+	int TestMethod (int a)
+	{
+		const int c = 1;
+		switch (a) {
+		case b:
+			return 1;
+		case b + c:
+			return 0;
+		default:
+			return -1;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestNestedOr ()
+		{
+			Test<ConvertIfStatementToSwitchStatementAction> (@"
+class TestClass
+{
+	int TestMethod (int a)
+	{
+		$if (a == 0) {
+			return 1;
+		} else if ((a == 2 || a == 4) || (a == 3 || a == 5)) {
+			return 2;
+		} else {
+			return -1;
+		}
+	}
+}", @"
+class TestClass
+{
+	int TestMethod (int a)
+	{
+		switch (a) {
+		case 0:
+			return 1;
+		case 2:
+		case 4:
+		case 3:
+		case 5:
+			return 2;
+		default:
+			return -1;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestComplexSwitchExpression ()
+		{
+			Test<ConvertIfStatementToSwitchStatementAction> (@"
+class TestClass
+{
+	int TestMethod (int a, int b)
+	{
+		$if (a + b == 0) {
+			return 1;
+		} else if (1 == a + b) {
+			return 0;
+		} else {
+			return -1;
+		}
+	}
+}", @"
+class TestClass
+{
+	int TestMethod (int a, int b)
+	{
+		switch (a + b) {
+		case 0:
+			return 1;
+		case 1:
+			return 0;
+		default:
+			return -1;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestNonConstantExpression ()
+		{
+			TestWrongContext<ConvertIfStatementToSwitchStatementAction> (@"
+class TestClass
+{
+	void TestMethod (int a, int c)
+	{
+		int b;
+		$if (a == 0) {
+			b = 0;
+		} else if (a == c) {
+			b = 1;
+		} else if (a == 2 || a == 3) {
+			b = 2;
+		} else {
+			b = 3;
+		}
+	}
+}");
+			TestWrongContext<ConvertIfStatementToSwitchStatementAction> (@"
+class TestClass
+{
+	void TestMethod (int a, int c)
+	{
+		int b;
+		$if (a == c) {
+			b = 0;
+		} else if (a == 1) {
+			b = 1;
+		} else if (a == 2 || a == 3) {
+			b = 2;
+		} else {
+			b = 3;
+		}
+	}
+}");
+			TestWrongContext<ConvertIfStatementToSwitchStatementAction> (@"
+class TestClass
+{
+	void TestMethod (int a, int c)
+	{
+		int b;
+		$if (a == 0) {
+			b = 0;
+		} else if (a == 1) {
+			b = 1;
+		} else if (a == 2 || a == c) {
+			b = 2;
+		} else {
+			b = 3;
+		}
+	}
+}");
+		}
+		
+		[Test]
+		public void TestNonEqualityComparison ()
+		{
+			TestWrongContext<ConvertIfStatementToSwitchStatementAction> (@"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+		int b;
+		$if (a == 0) {
+			b = 0;
+		} else if (a > 4) {
+			b = 1;
+		} else if (a == 2 || a == 3) {
+			b = 2;
+		} else {
+			b = 3;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestValidType ()
+		{
+			// enum
+			Test<ConvertIfStatementToSwitchStatementAction> (@"
+enum TestEnum
+{
+	First,
+	Second,
+}
+class TestClass
+{
+	int TestMethod (TestEnum a)
+	{
+		$if (a == TestEnum.First) {
+			return 1;
+		} else {
+			return -1;
+		}
+	}
+}", @"
+enum TestEnum
+{
+	First,
+	Second,
+}
+class TestClass
+{
+	int TestMethod (TestEnum a)
+	{
+		switch (a) {
+		case TestEnum.First:
+			return 1;
+		default:
+			return -1;
+		}
+	}
+}");
+
+			// string, bool, char, integral, nullable
+			TestValidType ("string", "\"test\"");
+			TestValidType ("bool", "true");
+			TestValidType ("char", "'a'");
+			TestValidType ("byte", "0");
+			TestValidType ("sbyte", "0");
+			TestValidType ("short", "0");
+			TestValidType ("long", "0");
+			TestValidType ("ushort", "0");
+			TestValidType ("uint", "0");
+			TestValidType ("ulong", "0");
+			TestValidType ("bool?", "null");
+		}
+
+		void TestValidType (string type, string caseValue)
+		{
+			Test<ConvertIfStatementToSwitchStatementAction> (@"
+class TestClass
+{
+	int TestMethod (" + type + @" a)
+	{
+		$if (a == " + caseValue + @") {
+			return 1;
+		} else {
+			return -1;
+		}
+	}
+}", @"
+class TestClass
+{
+	int TestMethod (" + type + @" a)
+	{
+		switch (a) {
+		case " + caseValue + @":
+			return 1;
+		default:
+			return -1;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalidType ()
+		{
+			TestWrongContext<ConvertIfStatementToSwitchStatementAction> (@"
+class TestClass
+{
+	void TestMethod (double a)
+	{
+		int b;
+		$if (a == 0) {
+			b = 0;
+		} else {
+			b = 3;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestNoElse()
+		{
+			Test<ConvertIfStatementToSwitchStatementAction> (@"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+		int b;
+		$if (a == 0) {
+			b = 0;
+		} else if (a == 1) {
+			b = 1;
+		}
+	}
+}", @"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+		int b;
+		switch (a) {
+		case 0:
+			b = 0;
+			break;
+		case 1:
+			b = 1;
+			break;
+		}
+	}
+}");
+		}
+	
+		[Test]
+		public void TestNestedIf ()
+		{
+			Test<ConvertIfStatementToSwitchStatementAction> (@"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+		int b;
+		$if (a == 0) {
+			if (b == 0)
+				return;
+		} else if (a == 2 || a == 3) {
+			b = 2;
+		}
+	}
+}", @"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+		int b;
+		switch (a) {
+		case 0:
+			if (b == 0)
+				return;
+			break;
+		case 2:
+		case 3:
+			b = 2;
+			break;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalid ()
+		{
+			TestWrongContext<ConvertIfStatementToSwitchStatementAction> (@"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+		int b;
+		while (true) {
+			$if (a == 0) {
+				b = 0;
+			} else if (a == 1) {
+				b = 1;
+			} else if (a == 2 || a == 3) {
+				b = 2;
+			} else {
+				break;
+			}
+		}
+	}
+}");
+		}
+		[Test]
+		public void TestInvalidCase2 ()
+		{
+			TestWrongContext<ConvertIfStatementToSwitchStatementAction> (@"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+		int b;
+		while (true) {
+			$if (a == 0) {
+				break;
+			} else if (a == 1) {
+				b = 1;
+			} else {
+				b = 2;
+			}
+		}
+	}
+}");
+		}
+
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfToConditionalTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfToConditionalTests.cs
deleted file mode 100644
index 2423db2de6..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfToConditionalTests.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-// 
-// ConvertIfToConditionalTests.cs
-//  
-// Author:
-//       Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeActions
-{
-	[TestFixture]
-	public class ConvertIfToConditionalTests : ContextActionTestBase
-	{
-		[Test]
-		public void TestAssignment ()
-		{
-			Test<ConvertIfToConditionalAction> (@"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		$if (i > 0)
-			a = 0;
-		else {
-			a = 1;
-		}
-	}
-}", @"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		a = i > 0 ? 0 : 1;
-	}
-}");
-		}
-
-		[Test]
-		public void TestAddAssignment ()
-		{
-			Test<ConvertIfToConditionalAction> (@"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		$if (i > 0)
-			a += 0;
-		else {
-			a += 1;
-		}
-	}
-}", @"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		a += i > 0 ? 0 : 1;
-	}
-}");
-		}
-
-		[Test]
-		public void TestIfElse ()
-		{
-			TestWrongContext<ConvertIfToConditionalAction> (@"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		$if (i > 0)
-			a = 0;
-		else if (i < 5) {
-			a = 1;
-		} else {
-			a = 2;
-		}
-	}
-}");
-		}
-
-		[Test]
-		public void MultipleStatementsInIf ()
-		{
-			TestWrongContext<ConvertIfToConditionalAction> (@"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		$if (i > 0) {
-			a = 0;
-			a = 2;
-		} else {
-			a = 2;
-		}
-	}
-}");
-		}
-
-		[Test]
-		public void TestDifferentAssignmentOperator ()
-		{
-
-			TestWrongContext<ConvertIfToConditionalAction> (@"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		$if (i > 0)
-			a += 0;
-		else {
-			a -= 1;
-		}
-	}
-}");
-		}
-
-		[Test]
-		public void TestInsertNecessaryParentheses ()
-		{
-			Test<ConvertIfToConditionalAction> (@"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		int b;
-		$if (i > 0)
-			a = b = 0;
-		else {
-			a = 1;
-		}
-	}
-}", @"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		int b;
-		a = i > 0 ? (b = 0) : 1;
-	}
-}");
-		}
-
-		[Test]
-		public void TestReturn ()
-		{
-			Test<ConvertIfToConditionalAction> (@"
-class TestClass
-{
-	int TestMethod (int i)
-	{
-		$if (i > 0)
-			return 1;
-		else
-			return 0;
-	}
-}", @"
-class TestClass
-{
-	int TestMethod (int i)
-	{
-		return i > 0 ? 1 : 0;
-	}
-}");
-		}
-
-		[Test]
-		public void TestImplicitElse ()
-		{
-
-			Test<ConvertIfToConditionalAction> (@"
-class TestClass
-{
-	int TestMethod (int i)
-	{
-		$if (i > 0)
-			return 1;
-		return 0;
-	}
-}", @"
-class TestClass
-{
-	int TestMethod (int i)
-	{
-		return i > 0 ? 1 : 0;
-	}
-}");
-		}
-
-		[Test]
-		public void TestInvalidImplicitElse ()
-		{
-
-			TestWrongContext<ConvertIfToConditionalAction> (@"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		$if (i > 0)
-			a = 0;
-		a = 1;
-	}
-}");
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfToSwtichTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfToSwtichTests.cs
deleted file mode 100644
index f2b32ed13c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertIfToSwtichTests.cs
+++ /dev/null
@@ -1,506 +0,0 @@
-// 
-// ConvertIfToSwtichTests.cs
-//  
-// Author:
-//       Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeActions
-{
-	[TestFixture]
-	public class ConvertIfToSwitchTests : ContextActionTestBase
-	{
-
-		[Test]
-		public void TestBreak ()
-		{
-			Test<ConvertIfToSwitchAction> (@"
-class TestClass
-{
-	void TestMethod (int a)
-	{
-		int b;
-		$if (a == 0) {
-			b = 0;
-		} else if (a == 1) {
-			b = 1;
-		} else if (a == 2 || a == 3) {
-			b = 2;
-		} else {
-			b = 3;
-		}
-	}
-}", @"
-class TestClass
-{
-	void TestMethod (int a)
-	{
-		int b;
-		switch (a) {
-		case 0:
-			b = 0;
-			break;
-		case 1:
-			b = 1;
-			break;
-		case 2:
-		case 3:
-			b = 2;
-			break;
-		default:
-			b = 3;
-			break;
-		}
-	}
-}");
-		}
-
-		[Test]
-		public void TestReturn ()
-		{
-			Test<ConvertIfToSwitchAction> (@"
-class TestClass
-{
-	int TestMethod (int a)
-	{
-		$if (a == 0) {
-			int b = 1;
-			return b + 1;
-		} else if (a == 2 || a == 3) {
-			return 2;
-		} else {
-			return -1;
-		}
-	}
-}", @"
-class TestClass
-{
-	int TestMethod (int a)
-	{
-		switch (a) {
-		case 0:
-			int b = 1;
-			return b + 1;
-		case 2:
-		case 3:
-			return 2;
-		default:
-			return -1;
-		}
-	}
-}");
-		}
-		
-		[Test]
-		public void TestConstantExpression ()
-		{
-			Test<ConvertIfToSwitchAction> (@"
-class TestClass
-{
-	int TestMethod (int? a)
-	{
-		$if (a == (1 == 1 ? 11 : 12)) {
-			return 1;
-		} else if (a == (2 * 3) + 1 || a == 6 / 2) {
-			return 2;
-		} else if (a == null || a == (int)(10L + 2) || a == default(int) || a == sizeof(int)) {
-			return 3;		
-		} else {
-			return -1;
-		}
-	}
-}", @"
-class TestClass
-{
-	int TestMethod (int? a)
-	{
-		switch (a) {
-		case (1 == 1 ? 11 : 12):
-			return 1;
-		case (2 * 3) + 1:
-		case 6 / 2:
-			return 2;
-		case null:
-		case (int)(10L + 2):
-		case default(int):
-		case sizeof(int):
-			return 3;
-		default:
-			return -1;
-		}
-	}
-}");
-
-
-			Test<ConvertIfToSwitchAction> (@"
-class TestClass
-{
-	const int b = 0;
-	int TestMethod (int a)
-	{
-		const int c = 1;
-		$if (a == b) {
-			return 1;
-		} else if (a == b + c) {
-			return 0;
-		} else {
-			return -1;
-		}
-	}
-}", @"
-class TestClass
-{
-	const int b = 0;
-	int TestMethod (int a)
-	{
-		const int c = 1;
-		switch (a) {
-		case b:
-			return 1;
-		case b + c:
-			return 0;
-		default:
-			return -1;
-		}
-	}
-}");
-		}
-
-		[Test]
-		public void TestNestedOr ()
-		{
-			Test<ConvertIfToSwitchAction> (@"
-class TestClass
-{
-	int TestMethod (int a)
-	{
-		$if (a == 0) {
-			return 1;
-		} else if ((a == 2 || a == 4) || (a == 3 || a == 5)) {
-			return 2;
-		} else {
-			return -1;
-		}
-	}
-}", @"
-class TestClass
-{
-	int TestMethod (int a)
-	{
-		switch (a) {
-		case 0:
-			return 1;
-		case 2:
-		case 4:
-		case 3:
-		case 5:
-			return 2;
-		default:
-			return -1;
-		}
-	}
-}");
-		}
-
-		[Test]
-		public void TestComplexSwitchExpression ()
-		{
-			Test<ConvertIfToSwitchAction> (@"
-class TestClass
-{
-	int TestMethod (int a, int b)
-	{
-		$if (a + b == 0) {
-			return 1;
-		} else if (1 == a + b) {
-			return 0;
-		} else {
-			return -1;
-		}
-	}
-}", @"
-class TestClass
-{
-	int TestMethod (int a, int b)
-	{
-		switch (a + b) {
-		case 0:
-			return 1;
-		case 1:
-			return 0;
-		default:
-			return -1;
-		}
-	}
-}");
-		}
-
-		[Test]
-		public void TestNonConstantExpression ()
-		{
-			TestWrongContext<ConvertIfToSwitchAction> (@"
-class TestClass
-{
-	void TestMethod (int a, int c)
-	{
-		int b;
-		$if (a == 0) {
-			b = 0;
-		} else if (a == c) {
-			b = 1;
-		} else if (a == 2 || a == 3) {
-			b = 2;
-		} else {
-			b = 3;
-		}
-	}
-}");
-			TestWrongContext<ConvertIfToSwitchAction> (@"
-class TestClass
-{
-	void TestMethod (int a, int c)
-	{
-		int b;
-		$if (a == c) {
-			b = 0;
-		} else if (a == 1) {
-			b = 1;
-		} else if (a == 2 || a == 3) {
-			b = 2;
-		} else {
-			b = 3;
-		}
-	}
-}");
-			TestWrongContext<ConvertIfToSwitchAction> (@"
-class TestClass
-{
-	void TestMethod (int a, int c)
-	{
-		int b;
-		$if (a == 0) {
-			b = 0;
-		} else if (a == 1) {
-			b = 1;
-		} else if (a == 2 || a == c) {
-			b = 2;
-		} else {
-			b = 3;
-		}
-	}
-}");
-		}
-		
-		[Test]
-		public void TestNonEqualityComparison ()
-		{
-			TestWrongContext<ConvertIfToSwitchAction> (@"
-class TestClass
-{
-	void TestMethod (int a)
-	{
-		int b;
-		$if (a == 0) {
-			b = 0;
-		} else if (a > 4) {
-			b = 1;
-		} else if (a == 2 || a == 3) {
-			b = 2;
-		} else {
-			b = 3;
-		}
-	}
-}");
-		}
-
-		[Test]
-		public void TestValidType ()
-		{
-			// enum
-			Test<ConvertIfToSwitchAction> (@"
-enum TestEnum
-{
-	First,
-	Second,
-}
-class TestClass
-{
-	int TestMethod (TestEnum a)
-	{
-		$if (a == TestEnum.First) {
-			return 1;
-		} else {
-			return -1;
-		}
-	}
-}", @"
-enum TestEnum
-{
-	First,
-	Second,
-}
-class TestClass
-{
-	int TestMethod (TestEnum a)
-	{
-		switch (a) {
-		case TestEnum.First:
-			return 1;
-		default:
-			return -1;
-		}
-	}
-}");
-
-			// string, bool, char, integral, nullable
-			TestValidType ("string", "\"test\"");
-			TestValidType ("bool", "true");
-			TestValidType ("char", "'a'");
-			TestValidType ("byte", "0");
-			TestValidType ("sbyte", "0");
-			TestValidType ("short", "0");
-			TestValidType ("long", "0");
-			TestValidType ("ushort", "0");
-			TestValidType ("uint", "0");
-			TestValidType ("ulong", "0");
-			TestValidType ("bool?", "null");
-		}
-
-		void TestValidType (string type, string caseValue)
-		{
-			Test<ConvertIfToSwitchAction> (@"
-class TestClass
-{
-	int TestMethod (" + type + @" a)
-	{
-		$if (a == " + caseValue + @") {
-			return 1;
-		} else {
-			return -1;
-		}
-	}
-}", @"
-class TestClass
-{
-	int TestMethod (" + type + @" a)
-	{
-		switch (a) {
-		case " + caseValue + @":
-			return 1;
-		default:
-			return -1;
-		}
-	}
-}");
-		}
-
-		[Test]
-		public void TestInvalidType ()
-		{
-			TestWrongContext<ConvertIfToSwitchAction> (@"
-class TestClass
-{
-	void TestMethod (double a)
-	{
-		int b;
-		$if (a == 0) {
-			b = 0;
-		} else {
-			b = 3;
-		}
-	}
-}");
-		}
-
-		[Test]
-		public void TestNoElse()
-		{
-			Test<ConvertIfToSwitchAction> (@"
-class TestClass
-{
-	void TestMethod (int a)
-	{
-		int b;
-		$if (a == 0) {
-			b = 0;
-		} else if (a == 1) {
-			b = 1;
-		}
-	}
-}", @"
-class TestClass
-{
-	void TestMethod (int a)
-	{
-		int b;
-		switch (a) {
-		case 0:
-			b = 0;
-			break;
-		case 1:
-			b = 1;
-			break;
-		}
-	}
-}");
-		}
-	
-		[Test]
-		public void TestNestedIf ()
-		{
-			Test<ConvertIfToSwitchAction> (@"
-class TestClass
-{
-	void TestMethod (int a)
-	{
-		int b;
-		$if (a == 0) {
-			if (b == 0)
-				return;
-		} else if (a == 2 || a == 3) {
-			b = 2;
-		}
-	}
-}", @"
-class TestClass
-{
-	void TestMethod (int a)
-	{
-		int b;
-		switch (a) {
-		case 0:
-			if (b == 0)
-				return;
-			break;
-		case 2:
-		case 3:
-			b = 2;
-			break;
-		}
-	}
-}");
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertMethodGroupToAnonymousMethodActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertMethodGroupToAnonymousMethodActionTests.cs
new file mode 100644
index 0000000000..061585fdd5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertMethodGroupToAnonymousMethodActionTests.cs
@@ -0,0 +1,147 @@
+//
+// ConvertMethodGroupToAnonymousMethodActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertMethodGroupToAnonymousMethodActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestVoidMethod ()
+		{
+			Test<ConvertMethodGroupToAnonymousMethodAction>(@"
+using System;
+public class Test
+{
+	void Foo ()
+	{
+		Action act = $Foo;
+	}
+}
+", @"
+using System;
+public class Test
+{
+	void Foo ()
+	{
+		Action act = delegate {
+	Foo ();
+};
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestParameter ()
+		{
+			Test<ConvertMethodGroupToAnonymousMethodAction>(@"
+using System;
+public class Test
+{
+	void Foo (int x, int y)
+	{
+		Action<int,int> act = $Foo;
+	}
+}
+", @"
+using System;
+public class Test
+{
+	void Foo (int x, int y)
+	{
+		Action<int,int> act = delegate (int arg1, int arg2) {
+	Foo (arg1, arg2);
+};
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestFunction ()
+		{
+			Test<ConvertMethodGroupToAnonymousMethodAction>(@"
+using System;
+public class Test
+{
+	bool Foo (int x, int y)
+	{
+		Func<int,int,bool> act = $Foo;
+	}
+}
+", @"
+using System;
+public class Test
+{
+	bool Foo (int x, int y)
+	{
+		Func<int,int,bool> act = delegate (int arg1, int arg2) {
+	return Foo (arg1, arg2);
+};
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestOverloads ()
+		{
+			Test<ConvertMethodGroupToAnonymousMethodAction>(@"
+using System;
+public class Test
+{
+	static void Foo (int x) { }
+	static void Foo (int x, int y) { }
+	static void Foo () { }
+
+	void Bar ()
+	{
+		Action<int, int> act = Test.$Foo;
+	}
+}", @"
+using System;
+public class Test
+{
+	static void Foo (int x) { }
+	static void Foo (int x, int y) { }
+	static void Foo () { }
+
+	void Bar ()
+	{
+		Action<int, int> act = delegate (int arg1, int arg2) {
+			Test.Foo (arg1, arg2);
+		};
+	}
+}");
+		}
+	
+	
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertMethodGroupToLambdaActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertMethodGroupToLambdaActionTests.cs
new file mode 100644
index 0000000000..b8813cabcc
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertMethodGroupToLambdaActionTests.cs
@@ -0,0 +1,139 @@
+//
+// ConvertMethodGroupToLambdaActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertMethodGroupToLambdaActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestVoidMethod ()
+		{
+			Test<ConvertMethodGroupToLambdaAction>(@"
+using System;
+public class Test
+{
+	void Foo ()
+	{
+		Action act = $Foo;
+	}
+}
+", @"
+using System;
+public class Test
+{
+	void Foo ()
+	{
+		Action act = () => Foo ();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestParameter ()
+		{
+			Test<ConvertMethodGroupToLambdaAction>(@"
+using System;
+public class Test
+{
+	void Foo (int x, int y)
+	{
+		Action<int,int> act = $Foo;
+	}
+}
+", @"
+using System;
+public class Test
+{
+	void Foo (int x, int y)
+	{
+		Action<int,int> act = (arg1, arg2) => Foo (arg1, arg2);
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestFunction ()
+		{
+			Test<ConvertMethodGroupToLambdaAction>(@"
+using System;
+public class Test
+{
+	bool Foo (int x, int y)
+	{
+		Func<int,int,bool> act = $Foo;
+	}
+}
+", @"
+using System;
+public class Test
+{
+	bool Foo (int x, int y)
+	{
+		Func<int,int,bool> act = (arg1, arg2) => Foo (arg1, arg2);
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestOverloads ()
+		{
+			Test<ConvertMethodGroupToLambdaAction>(@"
+using System;
+public class Test
+{
+	static void Foo (int x) { }
+	static void Foo (int x, int y) { }
+	static void Foo () { }
+
+	void Bar ()
+	{
+		Action<int, int> act = Test.$Foo;
+	}
+}", @"
+using System;
+public class Test
+{
+	static void Foo (int x) { }
+	static void Foo (int x, int y) { }
+	static void Foo () { }
+
+	void Bar ()
+	{
+		Action<int, int> act = (arg1, arg2) => Test.Foo (arg1, arg2);
+	}
+}");
+		}
+	
+	
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertMultiplyToShiftActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertMultiplyToShiftActionTests.cs
new file mode 100644
index 0000000000..1382800466
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertMultiplyToShiftActionTests.cs
@@ -0,0 +1,89 @@
+//
+// ConvertMultiplyToShiftActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertMultiplyToShiftActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestMultiply ()
+		{
+			Test<ConvertMultiplyToShiftAction> (@"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		return i $* 256;
+	}
+}", @"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		return i << 8;
+	}
+}");
+		}
+
+		[Test]
+		public void TestDivide ()
+		{
+			Test<ConvertMultiplyToShiftAction> (@"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		return i $/ 16;
+	}
+}", @"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		return i >> 4;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvaid ()
+		{
+			TestWrongContext<ConvertMultiplyToShiftAction> (@"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		return i $* 255;
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertNullCoalescingToConditionalExpressionActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertNullCoalescingToConditionalExpressionActionTests.cs
new file mode 100644
index 0000000000..e764bef488
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertNullCoalescingToConditionalExpressionActionTests.cs
@@ -0,0 +1,57 @@
+//
+// ConvertNullCoalescingToConditionalExpressionActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertNullCoalescingToConditionalExpressionActionTests: ContextActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase ()
+		{
+			Test<ConvertNullCoalescingToConditionalExpressionAction>(@"
+class Test
+{
+	object Foo (object o, object p)
+	{
+		return o $?? p;
+	}
+}
+", @"
+class Test
+{
+	object Foo (object o, object p)
+	{
+		return o != null ? o : p;
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertReturnStatementToIfActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertReturnStatementToIfActionTests.cs
new file mode 100644
index 0000000000..23f492efd9
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertReturnStatementToIfActionTests.cs
@@ -0,0 +1,81 @@
+//
+// ConvertReturnStatementToIfActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertReturnStatementToIfActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestConditionalOperator ()
+		{
+			Test<ConvertReturnStatementToIfAction> (@"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		$return i > 0 ? 1 : 0;
+	}
+}", @"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		if (i > 0)
+			return 1;
+		return 0;
+	}
+}");
+		}
+
+		[Test]
+		public void TestNullCoalescingOperator ()
+		{
+			Test<ConvertReturnStatementToIfAction> (@"
+class Test
+{
+	object Foo (object o, object p)
+	{
+		$return o ?? p;
+	}
+}", @"
+class Test
+{
+	object Foo (object o, object p)
+	{
+		if (o != null)
+			return o;
+		return p;
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertShiftToMultiplyActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertShiftToMultiplyActionTests.cs
new file mode 100644
index 0000000000..c8bf08e978
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertShiftToMultiplyActionTests.cs
@@ -0,0 +1,75 @@
+//
+// ConvertShiftToMultiplyActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertShiftToMultiplyActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestShiftLeft ()
+		{
+			Test<ConvertShiftToMultiplyAction> (@"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		return i $<< 8;
+	}
+}", @"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		return i * 256;
+	}
+}");
+		}
+
+		[Test]
+		public void TestShiftRight ()
+		{
+			Test<ConvertShiftToMultiplyAction> (@"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		return i $>> 4;
+	}
+}", @"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		return i / 16;
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertToInitializer/ConvertToInitializerTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertToInitializer/ConvertToInitializerTests.cs
index 622544d672..1d3d260d95 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertToInitializer/ConvertToInitializerTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertToInitializer/ConvertToInitializerTests.cs
@@ -36,7 +36,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 		// TODO: Remove this when the formatter handles object and collection initializers
 		// This tests the expected code vs the actual code based on their ASTs instead of the text they produce.
 		public new void Test<T>(string input, string output, int action = 0, bool expectErrors = false)
-			where T : ICodeActionProvider, new ()
+			where T : CodeActionProvider, new ()
 		{
 			string result = RunContextAction(new T(), HomogenizeEol(input), action, expectErrors);
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertWhileToDoWhileLoopTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertWhileToDoWhileLoopTests.cs
new file mode 100644
index 0000000000..d606e0eec5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertWhileToDoWhileLoopTests.cs
@@ -0,0 +1,81 @@
+// 
+// ConvertWhileToDoWhileLoopTests.cs
+//  
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertWhileToDoWhileLoopTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestSimple() {
+			Test<ConvertWhileToDoWhileLoopAction>(@"
+class Foo {
+	void Bar(int x) {
+		$while (x > 0) x++;
+	}
+}", @"
+class Foo {
+	void Bar(int x) {
+		do
+			x++;
+		while (x > 0);
+	}
+}");
+		}
+
+		[Test]
+		public void TestBlock() {
+			Test<ConvertWhileToDoWhileLoopAction>(@"
+class Foo {
+	void Bar(int x) {
+		$while (x > 0) { x++; }
+	}
+}", @"
+class Foo {
+	void Bar(int x) {
+		do {
+			x++;
+		}
+		while (x > 0);
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisabledOutOfToken() {
+			TestWrongContext<ConvertWhileToDoWhileLoopAction>(@"
+class Foo {
+	void Bar(int x) {
+		while (x > 0) $x++;
+	}
+}");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CopyCommentsFromBaseTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CopyCommentsFromBaseTests.cs
new file mode 100644
index 0000000000..16c10f091e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CopyCommentsFromBaseTests.cs
@@ -0,0 +1,167 @@
+// 
+// CopyCommentsFromBaseTests.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class CopyCommentsFromBaseTest : ContextActionTestBase
+	{
+		[Test()]
+		public void TestMultiString()
+		{
+			
+			Test<CopyCommentsFromBase>(@"
+namespace TestNS
+{
+	class TestClass
+	{
+		///ssss
+		///ssss
+		public virtual void Test()
+		{
+			int a;
+		}
+	}
+	class DerivdedClass : TestClass
+	{
+		public override void $Test()
+		{
+			string str = string.Empty;
+		}
+	}
+}", @"
+namespace TestNS
+{
+	class TestClass
+	{
+		///ssss
+		///ssss
+		public virtual void Test()
+		{
+			int a;
+		}
+	}
+	class DerivdedClass : TestClass
+	{
+		///ssss
+		///ssss
+		public override void Test()
+		{
+			string str = string.Empty;
+		}
+	}
+}");
+		}
+		
+		[Test()]
+		public void TestSingleString()
+		{
+			
+			Test<CopyCommentsFromBase>(@"
+namespace TestNS
+{
+	class TestClass
+	{
+		///ssss
+		public virtual void Test()
+		{
+			int a;
+		}
+	}
+	class DerivdedClass : TestClass
+	{
+		public override void $Test()
+		{
+			string str = string.Empty;
+		}
+	}
+}", @"
+namespace TestNS
+{
+	class TestClass
+	{
+		///ssss
+		public virtual void Test()
+		{
+			int a;
+		}
+	}
+	class DerivdedClass : TestClass
+	{
+		///ssss
+		public override void Test()
+		{
+			string str = string.Empty;
+		}
+	}
+}");
+		}
+		
+		[Test()]
+		public void TestAbstractClassString()
+		{
+			
+			Test<CopyCommentsFromBase>(@"
+namespace TestNS
+{
+	abstract class TestClass
+	{
+		///ssss
+		///ssss
+		public abstract void Test();
+	}
+	class DerivdedClass : TestClass
+	{
+		public override void $Test()
+		{
+			string str = string.Empty;
+		}
+	}
+}", @"
+namespace TestNS
+{
+	abstract class TestClass
+	{
+		///ssss
+		///ssss
+		public abstract void Test();
+	}
+	class DerivdedClass : TestClass
+	{
+		///ssss
+		///ssss
+		public override void Test()
+		{
+			string str = string.Empty;
+		}
+	}
+}");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CopyCommentsFromIntefaceTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CopyCommentsFromIntefaceTests.cs
new file mode 100644
index 0000000000..7f187ebb46
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CopyCommentsFromIntefaceTests.cs
@@ -0,0 +1,122 @@
+// 
+// CopyCommentsFromInterfaceTests.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class CopyCommentsFromInterfaceTest : ContextActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase()
+		{
+			Test<CopyCommentsFromInterface>(@"
+interface ITest
+{
+	///sssss
+	void Method ();
+}
+class TestClass : ITest
+{
+	public void $Method ()
+	{
+	}
+}", @"
+interface ITest
+{
+	///sssss
+	void Method ();
+}
+class TestClass : ITest
+{
+	///sssss
+	public void Method ()
+	{
+	}
+}");
+		}
+		
+		[Test]
+		public void TestMultiCase()
+		{
+			Test<CopyCommentsFromInterface>(@"
+interface ITest
+{
+	///sssss
+	///sssss
+	void Method ();
+}
+class TestClass : ITest
+{
+	public void $Method ()
+	{
+	}
+}", @"
+interface ITest
+{
+	///sssss
+	///sssss
+	void Method ();
+}
+class TestClass : ITest
+{
+	///sssss
+	///sssss
+	public void Method ()
+	{
+	}
+}");
+		}	
+
+		[Ignore]
+		public void TestNoProblem()
+		{
+			Test<CopyCommentsFromInterface>(@"
+interface ITest
+{
+	void Method ();
+}
+class TestClass : ITest
+{
+	public void $Method ()
+	{
+	}
+}", @"
+interface ITest
+{
+	void Method ();
+}
+class TestClass : ITest
+{
+	public void Method ()
+	{
+	}
+}");
+		}	
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateBackingStoreTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateBackingStoreTests.cs
index 9a0bb3fc39..ecc637c542 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateBackingStoreTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateBackingStoreTests.cs
@@ -70,6 +70,34 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 			test = value;
 		}
 	}
+}");
+		}
+
+		[Test]
+		public void TestWrongLocation()
+		{
+			TestWrongContext<CreateBackingStoreAction> (@"class TestClass
+{
+	public $string Test {
+		get;
+		set;
+	}
+}");
+
+			TestWrongContext<CreateBackingStoreAction> (@"class TestClass
+{
+	public string $FooBar.Test {
+		get;
+		set;
+	}
+}");
+
+			TestWrongContext<CreateBackingStoreAction> (@"class TestClass
+{
+	public string Test ${
+		get;
+		set;
+	}
 }");
 		}
 	}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateChangedEventTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateChangedEventTests.cs
index 0ad89107cf..05526cd78b 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateChangedEventTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateChangedEventTests.cs
@@ -34,7 +34,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 		[Test]
 		public void TestSimpleCase ()
 		{
-			Test<CreateChangedEvent> (@"class TestClass
+			Test<CreateChangedEventAction> (@"class TestClass
 {
 	string test;
 	public string $Test {
@@ -70,7 +70,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 		[Test]
 		public void TestStaticClassCase ()
 		{
-			Test<CreateChangedEvent> (@"static class TestClass
+			Test<CreateChangedEventAction> (@"static class TestClass
 {
 	static string test;
 	public static string $Test {
@@ -106,7 +106,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 		[Test]
 		public void TestSealedCase ()
 		{
-			Test<CreateChangedEvent> (@"sealed class TestClass
+			Test<CreateChangedEventAction> (@"sealed class TestClass
 {
 	string test;
 	public string $Test {
@@ -139,6 +139,49 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 }");
 		}
 
+		[Test]
+		public void TestWrongLocation()
+		{
+			TestWrongContext<CreateChangedEventAction> (@"class TestClass
+{
+	string test;
+	public $string Test {
+		get {
+			return test;
+		}
+		set {
+			test = value;
+		}
+	}
+}");
+
+			TestWrongContext<CreateChangedEventAction> (@"class TestClass
+{
+	string test;
+	public string $FooBar.Test {
+		get {
+			return test;
+		}
+		set {
+			test = value;
+		}
+	}
+}");
+
+			TestWrongContext<CreateChangedEventAction> (@"class TestClass
+{
+	string test;
+	public string Test ${
+		get {
+			return test;
+		}
+		set {
+			test = value;
+		}
+	}
+}");
+		}
+
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateClassDeclarationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateClassDeclarationTests.cs
index b36b3772b9..489c21704e 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateClassDeclarationTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateClassDeclarationTests.cs
@@ -286,6 +286,7 @@ class Foo : FooBar
 	public override int MoreFoo {
 		get;
 	}
+
 	protected override void SomeFoo ()
 	{
 		throw new System.NotImplementedException ();
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/DeclareLocalVariableTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/DeclareLocalVariableTests.cs
index ac09dfc9ab..0228004850 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/DeclareLocalVariableTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/DeclareLocalVariableTests.cs
@@ -298,5 +298,29 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 }");
 		}
 
+
+		[Test]
+		public void TestCollectionInitializer ()
+		{
+			Test<DeclareLocalVariableAction> (@"using System.Collections.Generic;
+
+class TestClass
+{
+	void Test (string str)
+	{
+		var list = new List<int> { 1, <-str.Length->, 2 };
+	}
+}", @"using System.Collections.Generic;
+
+class TestClass
+{
+	void Test (string str)
+	{
+		var length = str.Length;
+		var list = new List<int> { 1, length, 2 };
+	}
+}");
+		}
+
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ExtractMethodTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ExtractMethodTests.cs
index 4d11c525da..0afdb917aa 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ExtractMethodTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ExtractMethodTests.cs
@@ -212,15 +212,17 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 ", @"class TestClass
 {
 	int member;
-	void NewMethod (int i, ref int j, out int k)
+	int NewMethod (int i, ref int j)
 	{
+		int k;
 		j = i + j;
 		k = j + member;
+		return k;
 	}
 	void TestMethod ()
 	{
 		int i = 5, j = 10, k;
-		NewMethod (i, ref j, out k);
+		k = NewMethod (i, ref j);
 		Console.WriteLine (k + j);
 	}
 }
@@ -278,17 +280,19 @@ class TestClass
 }
 ", @"class TestClass
 {
-	static void NewMethod (out string ret, string x, int y)
+	static string NewMethod (string x, int y)
 	{
+		string ret;
 		string z = ret + y;
 		ret = x + z;
+		return ret;
 	}
 	void TestMethod ()
 	{
 		string ret;
 		string x;
 		int y;
-		NewMethod (out ret, x, y);
+		ret = NewMethod (x, y);
 	}
 }
 ");
@@ -516,7 +520,6 @@ class TestClass
 		/// Bug 10858 - Extract Method should use return, not out
 		/// </summary>
 		[Test]
-		[Ignore ("FIXME")]
 		public void TestBug10858 ()
 		{
 			Test<ExtractMethodAction> (@"class TestClass
@@ -536,7 +539,7 @@ class TestClass
 	{
 		int j;
 		j = i + k;
-		return j
+		return j;
 	}
 	public static void TestMethod ()
 	{
@@ -547,6 +550,66 @@ class TestClass
 		System.Console.WriteLine (j);
 
 	}
+}");
+		}
+
+		/// <summary>
+		/// Bug 13054 - Extract method creates params on new method for params declared on lambdas in method body
+		/// </summary>
+		[Test]
+		public void TestBug13054 ()
+		{
+			Test<ExtractMethodAction> (@"class TestClass
+{
+	public static void TestMethod ()
+	{
+		<-int i = 0;
+		Action<string> action = (str) =>  {
+			Console.WriteLine (str);
+		};->
+	}
+}", @"class TestClass
+{
+	static void NewMethod ()
+	{
+		int i = 0;
+		Action<string> action = str =>  {
+			Console.WriteLine (str);
+		};
+	}
+	public static void TestMethod ()
+	{
+		NewMethod ();
+	}
+}");
+		}
+
+		/// <summary>
+		/// Bug 13539 - Extracting method where last line is comment leaves comment outside new method
+		/// </summary>
+		[Test]
+		public void TestBug13539 ()
+		{
+			Test<ExtractMethodAction> (@"class TestClass
+{
+	public static void TestMethod ()
+	{
+		<-
+			Foo ();
+			// Comment
+->
+	}
+}", @"class TestClass
+{
+	static void NewMethod ()
+	{
+		Foo ();
+		// Comment
+	}
+	public static void TestMethod ()
+	{
+		NewMethod ();
+	}
 }");
 		}
 	}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ExtractWhileConditionToInternalIfStatementActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ExtractWhileConditionToInternalIfStatementActionTests.cs
new file mode 100644
index 0000000000..0124fbef6d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ExtractWhileConditionToInternalIfStatementActionTests.cs
@@ -0,0 +1,125 @@
+//
+// ExtractWhileConditionToInternalIfStatementActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ExtractWhileConditionToInternalIfStatementActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestBasicCase()
+		{
+			Test<ExtractWhileConditionToInternalIfStatementAction>(@"
+public class Main 
+{
+	public int Foo (int i)
+	{
+		$while (i < 10) {
+			System.Console.WriteLine (i);
+			i++;
+		}
+		return 2;
+	}
+}
+", @"
+public class Main 
+{
+	public int Foo (int i)
+	{
+		while (true) {
+			if (i >= 10)
+				break;
+			System.Console.WriteLine (i);
+			i++;
+		}
+		return 2;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestAddBlock()
+		{
+			Test<ExtractWhileConditionToInternalIfStatementAction>(@"
+public class Main 
+{
+	public int Foo (int i)
+	{
+		$while (i < 10)
+			System.Console.WriteLine (i++);
+		return 2;
+	}
+}
+", @"
+public class Main 
+{
+	public int Foo (int i)
+	{
+		while (true) {
+			if (i >= 10)
+				break;
+			System.Console.WriteLine (i++);
+		}
+		return 2;
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestRemoveEmptyStatement()
+		{
+			Test<ExtractWhileConditionToInternalIfStatementAction>(@"
+public class Main 
+{
+	public int Foo (int i)
+	{
+		$while (i++ < 10)
+			;
+		return 2;
+	}
+}
+", @"
+public class Main 
+{
+	public int Foo (int i)
+	{
+		while (true) {
+			if (i++ >= 10)
+				break;
+		}
+		return 2;
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/FlipEqualsTargetAndArgumentActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/FlipEqualsTargetAndArgumentActionTests.cs
new file mode 100644
index 0000000000..bb0c7771f3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/FlipEqualsTargetAndArgumentActionTests.cs
@@ -0,0 +1,177 @@
+//
+// FlipEqualsTargetAndArgumentActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class FlipEqualsTargetAndArgumentActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase ()
+		{
+			Test<FlipEqualsTargetAndArgumentAction>(@"
+class Foo
+{
+	public void FooFoo (object x, object y)
+	{
+		if (x.$Equals (y))
+			Console.WriteLine (x);
+	}
+}", @"
+class Foo
+{
+	public void FooFoo (object x, object y)
+	{
+		if (y.Equals (x))
+			Console.WriteLine (x);
+	}
+}");
+		}
+
+		[Test]
+		public void TestComplexCase ()
+		{
+			Test<FlipEqualsTargetAndArgumentAction>(@"
+class Foo
+{
+	public void FooFoo (object x, object y)
+	{
+		if (x.$Equals (1 + 2))
+			Console.WriteLine (x);
+	}
+}", @"
+class Foo
+{
+	public void FooFoo (object x, object y)
+	{
+		if ((1 + 2).Equals (x))
+			Console.WriteLine (x);
+	}
+}");
+		}
+
+		[Test]
+		public void TestRemoveParens ()
+		{
+			Test<FlipEqualsTargetAndArgumentAction>(@"
+class Foo
+{
+	public void FooFoo (object x, object y)
+	{
+		if ((1 + 2).Equals $(x))
+			Console.WriteLine (x);
+	}
+}", @"
+class Foo
+{
+	public void FooFoo (object x, object y)
+	{
+		if (x.Equals (1 + 2))
+			Console.WriteLine (x);
+	}
+}");
+		}
+
+		[Test]
+		public void TestUnaryOperatorCase ()
+		{
+			Test<FlipEqualsTargetAndArgumentAction>(@"
+class Foo
+{
+	public void FooFoo (object x, bool y)
+	{
+		if (x.$Equals (!y))
+			Console.WriteLine (x);
+	}
+}", @"
+class Foo
+{
+	public void FooFoo (object x, bool y)
+	{
+		if ((!y).Equals (x))
+			Console.WriteLine (x);
+	}
+}");
+		}
+
+		[Test]
+		public void TestNullCase ()
+		{
+			TestWrongContext<FlipEqualsTargetAndArgumentAction>(@"
+class Foo
+{
+	public void FooFoo (object x, object y)
+	{
+		if (x.$Equals (null))
+			Console.WriteLine (x);
+	}
+}");
+		}
+
+		[Test]
+		public void TestStaticCase ()
+		{
+			TestWrongContext<FlipEqualsTargetAndArgumentAction>(@"
+class Foo
+{
+	public static bool Equals (object a) { return false; }
+
+	public void FooFoo (object x, object y)
+	{
+		if (Foo.$Equals (x))
+			Console.WriteLine (x);
+	}
+}");
+		}
+
+		[Test]
+		public void TestCaretLocation ()
+		{
+			TestWrongContext<FlipEqualsTargetAndArgumentAction>(@"
+class Foo
+{
+	public void FooFoo (object x, object y)
+	{
+		if (x$.Equals (y))
+			Console.WriteLine (x);
+	}
+}");
+			TestWrongContext<FlipEqualsTargetAndArgumentAction>(@"
+class Foo
+{
+	public void FooFoo (object x, object y)
+	{
+		if (x.Equals ($y))
+			Console.WriteLine (x);
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/GenerateSwitchLabelsTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/GenerateSwitchLabelsTests.cs
index 2edae137e5..e4dd494eed 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/GenerateSwitchLabelsTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/GenerateSwitchLabelsTests.cs
@@ -33,7 +33,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 	[TestFixture]
 	public class GenerateSwitchLabelsTests : ContextActionTestBase
 	{
-		[Test()]
+		[Test]
 		public void Test ()
 		{
 			string result = RunContextAction (
@@ -68,5 +68,47 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 				"	}" + Environment.NewLine +
 				"}", result);
 		}
+
+		[Test]
+		public void TestAddMissing ()
+		{
+			Test<GenerateSwitchLabelsAction>(@"
+using System;
+
+class Foo
+{
+	void Bar (ConsoleModifiers mods)
+	{
+		$switch (mods) {
+		case ConsoleModifiers.Alt:
+			break;
+		default:
+			throw new ArgumentOutOfRangeException ();
+		}
+	}
+}
+", @"
+using System;
+
+class Foo
+{
+	void Bar (ConsoleModifiers mods)
+	{
+		switch (mods) {
+		case ConsoleModifiers.Alt:
+			break;
+		case ConsoleModifiers.Shift:
+			break;
+		case ConsoleModifiers.Control:
+			break;
+		default:
+			throw new ArgumentOutOfRangeException ();
+		}
+	}
+}
+");
+
+		}
+
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ImplementAbstractMembersTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ImplementAbstractMembersTest.cs
index 65bbd71c69..a6019a91c7 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ImplementAbstractMembersTest.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ImplementAbstractMembersTest.cs
@@ -112,10 +112,8 @@ class Foo : Simple
 ");
 		}
 	
-	
-		
 		[Test]
-		public void TestAbstractOverride()
+		public void TestAbstractOverrideMethodCase1()
 		{
 			Test<ImplementAbstractMembersAction>(@"class A {
 	public virtual void Foo() {
@@ -158,10 +156,263 @@ class C : B
 ");
 		}
 
+		[Test]
+		public void TestAbstractOverrideMethodCase2()
+		{
+			Test<ImplementAbstractMembersAction>(@"abstract class Base {
+	public abstract void Foo ();
+}
+
+abstract class Base2 : Base {
+	public abstract override void Foo ();
+}
+
+class MockTypeInfo : $Base2
+{
+}
+", @"abstract class Base {
+	public abstract void Foo ();
+}
+
+abstract class Base2 : Base {
+	public abstract override void Foo ();
+}
+
+class MockTypeInfo : Base2
+{
+	#region implemented abstract members of Base2
+	public override void Foo ()
+	{
+		throw new System.NotImplementedException ();
+	}
+	#endregion
+}
+");
+		}
+
+		[Test]
+		public void TestAbstractOverrideEventCase1()
+		{
+			Test<ImplementAbstractMembersAction>(@"using System;
+class A {
+	public virtual event EventHandler Foo { add {} remove {} }
+}
+
+abstract class B : A {
+	public abstract override event EventHandler Foo;
+	public abstract event EventHandler FooBar;
+}
+
+class C : $B
+{
+}
+", @"using System;
+class A {
+	public virtual event EventHandler Foo { add {} remove {} }
+}
+
+abstract class B : A {
+	public abstract override event EventHandler Foo;
+	public abstract event EventHandler FooBar;
+}
+
+class C : B
+{
+	#region implemented abstract members of B
+	public override event EventHandler Foo;
+	public override event EventHandler FooBar;
+	#endregion
+}
+");
+		}
+
 		
+		[Test]
+		public void TestAbstractOverridePropertyCase2()
+		{
+			Test<ImplementAbstractMembersAction>(@"abstract class Base {
+	public abstract int Foo { get;  }
+}
+
+abstract class Base2 : Base {
+	public abstract override int Foo { get; }
+}
+
+class MockTypeInfo : $Base2
+{
+}
+", @"abstract class Base {
+	public abstract int Foo { get;  }
+}
+
+abstract class Base2 : Base {
+	public abstract override int Foo { get; }
+}
+
+class MockTypeInfo : Base2
+{
+	#region implemented abstract members of Base2
+	public override int Foo {
+		get {
+			throw new System.NotImplementedException ();
+		}
+	}
+	#endregion
+}
+");
+		}
+
+
 
 		[Test]
-		public void TestAlreadyImplemented()
+		public void TestAbstractOverrideVirtualMethod()
+		{
+			Test<ImplementAbstractMembersAction>(@"abstract class Base {
+	public virtual void Foo () { }
+}
+
+abstract class Base2 : Base {
+	public abstract override void Foo () { }
+}
+
+class MockTypeInfo : $Base2
+{
+}
+", @"abstract class Base {
+	public virtual void Foo () { }
+}
+
+abstract class Base2 : Base {
+	public abstract override void Foo () { }
+}
+
+class MockTypeInfo : Base2
+{
+	#region implemented abstract members of Base2
+	public override void Foo ()
+	{
+		throw new System.NotImplementedException ();
+	}
+	#endregion
+}
+");
+		}
+
+
+
+		[Test]
+		public void TestAbstractOverrideVirtualProperty()
+		{
+			Test<ImplementAbstractMembersAction>(@"abstract class Base {
+	public virtual int Foo { get { return 1; } }
+}
+
+abstract class Base2 : Base {
+	public abstract override int Foo { get; }
+}
+
+class MockTypeInfo : $Base2
+{
+}
+", @"abstract class Base {
+	public virtual int Foo { get { return 1; } }
+}
+
+abstract class Base2 : Base {
+	public abstract override int Foo { get; }
+}
+
+class MockTypeInfo : Base2
+{
+	#region implemented abstract members of Base2
+	public override int Foo {
+		get {
+			throw new System.NotImplementedException ();
+		}
+	}
+	#endregion
+}
+");
+		}
+
+		[Test]
+		public void TestAbstractOverrideVirtualIndexer()
+		{
+			Test<ImplementAbstractMembersAction>(@"abstract class Base {
+	public virtual int this [int i] { get { return 1; } }
+}
+
+abstract class Base2 : Base {
+	public abstract override int this [int i] { get; }
+}
+
+class MockTypeInfo : $Base2
+{
+}
+", @"abstract class Base {
+	public virtual int this [int i] { get { return 1; } }
+}
+
+abstract class Base2 : Base {
+	public abstract override int this [int i] { get; }
+}
+
+class MockTypeInfo : Base2
+{
+	#region implemented abstract members of Base2
+	public override int this [int i] {
+		get {
+			throw new System.NotImplementedException ();
+		}
+	}
+	#endregion
+}
+");
+		}
+
+		[Test]
+		public void TestAbstractOverrideVirtualEvent()
+		{
+			Test<ImplementAbstractMembersAction>(@"using System;
+
+abstract class Base {
+	public virtual event EventHandler Foo {
+		add {}
+		remove{}
+	}
+}
+
+abstract class Base2 : Base {
+	public override abstract event EventHandler Foo;
+}
+
+class MockTypeInfo : $Base2
+{
+}
+", @"using System;
+
+abstract class Base {
+	public virtual event EventHandler Foo {
+		add {}
+		remove{}
+	}
+}
+
+abstract class Base2 : Base {
+	public override abstract event EventHandler Foo;
+}
+
+class MockTypeInfo : Base2
+{
+	#region implemented abstract members of Base2
+	public override event EventHandler Foo;
+	#endregion
+}
+");
+		}
+
+		[Test]
+		public void TestAlreadyImplementedMethods()
 		{
 			Test<ImplementAbstractMembersAction>(@"class A {
 	public abstract void Foo();
@@ -193,6 +444,43 @@ class C : B
 	}
 	#endregion
 }
+");
+		}
+
+		[Test]
+		public void TestAlreadyImplementedProperties()
+		{
+			Test<ImplementAbstractMembersAction>(@"class A {
+	public abstract int Foo { get; }
+	public abstract int FooBar { get; }
+}
+
+abstract class B : A {
+	public override int Foo { get { return 1; } }
+}
+
+class C : $B
+{
+}
+", @"class A {
+	public abstract int Foo { get; }
+	public abstract int FooBar { get; }
+}
+
+abstract class B : A {
+	public override int Foo { get { return 1; } }
+}
+
+class C : B
+{
+	#region implemented abstract members of A
+	public override int FooBar {
+		get {
+			throw new System.NotImplementedException ();
+		}
+	}
+	#endregion
+}
 ");
 		}
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ImplementInterfaceTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ImplementInterfaceTests.cs
index 687cf99915..8bfb84f0ef 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ImplementInterfaceTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ImplementInterfaceTests.cs
@@ -192,12 +192,10 @@ class Foo : $ITest
 
 class Foo : ITest
 {
-	#region ITest implementation
 	public void Method1 ()
 	{
 		throw new System.NotImplementedException ();
 	}
-	#endregion
 	public void Method2 () {}
 }");
 		}
@@ -444,6 +442,37 @@ class M : IB
 	#endregion
 }");
 		}
+
+		[Test]
+		public void TestImplementMissingMembers()
+		{
+			Test<ImplementInterfaceAction>(@"using System;
+interface IFoo
+{
+	void FooBar ();
+	void BarFoo ();
+}
+class Foo : $IFoo
+{
+	public void FooBar () {}
+}
+", @"using System;
+interface IFoo
+{
+	void FooBar ();
+	void BarFoo ();
+}
+class Foo : IFoo
+{
+	public void BarFoo ()
+	{
+		throw new NotImplementedException ();
+	}
+	public void FooBar () {}
+}
+");
+		}
+
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ImplementNotImplementedPropertyTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ImplementNotImplementedPropertyTests.cs
new file mode 100644
index 0000000000..c9bc96424b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ImplementNotImplementedPropertyTests.cs
@@ -0,0 +1,122 @@
+//
+// ImplementNotImplementedPropertyTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ImplementNotImplementedPropertyTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestGetter ()
+		{
+			Test<ImplementNotImplementedProperty> (@"class TestClass
+{
+	string $Test { get { throw new System.NotImplementedException (); } }
+}", @"class TestClass
+{
+	readonly string test;
+	string Test {
+		get {
+			return test;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestGetterAndSetter ()
+		{
+			Test<ImplementNotImplementedProperty> (@"class TestClass
+{
+	string $Test {
+		get {
+			throw new System.NotImplementedException ();
+		}
+		set {
+			throw new System.NotImplementedException ();
+		}
+	}
+}", @"class TestClass
+{
+	string test;
+	string Test {
+		get {
+			return test;
+		}
+		set {
+			test = value;
+		}
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestWrongLocation()
+		{
+			TestWrongContext<ImplementNotImplementedProperty> (@"class TestClass
+{
+	public $string Test {
+		get {
+			throw new System.NotImplementedException ();
+		}
+		set {
+			throw new System.NotImplementedException ();
+		}
+	}
+}");
+
+			TestWrongContext<ImplementNotImplementedProperty> (@"class TestClass
+{
+	public string $FooBar.Test {
+		get {
+			throw new System.NotImplementedException ();
+		}
+		set {
+			throw new System.NotImplementedException ();
+		}
+	}
+}");
+
+			TestWrongContext<ImplementNotImplementedProperty> (@"class TestClass
+{
+	public string Test ${
+		get {
+			throw new System.NotImplementedException ();
+		}
+		set {
+			throw new System.NotImplementedException ();
+		}
+	}
+}");
+		}
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/IntroduceConstantTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/IntroduceConstantTests.cs
index b0a253b276..073b71e7f8 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/IntroduceConstantTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/IntroduceConstantTests.cs
@@ -33,7 +33,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 	[TestFixture]
 	public class IntroduceConstantTests : ContextActionTestBase
 	{
-		[Test()]
+		[Test]
 		public void TestLocalConstant ()
 		{
 			Test<IntroduceConstantAction> (@"class TestClass
@@ -52,7 +52,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 }");
 		}
 
-		[Test()]
+		[Test]
 		public void TestLocalConstantHexNumber ()
 		{
 			Test<IntroduceConstantAction> (@"class TestClass
@@ -71,7 +71,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 }");
 		}
 
-		[Test()]
+		[Test]
 		public void TestFieldConstant ()
 		{
 			Test<IntroduceConstantAction> (@"class TestClass
@@ -90,8 +90,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 }", 1);
 		}
 
-
-		[Test()]
+		[Test]
 		public void TestLocalConstantReplaceAll ()
 		{
 			Test<IntroduceConstantAction> (@"class TestClass
@@ -113,5 +112,39 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 	}
 }", 2);
 		}
+	
+		[Test]
+		public void TestAlreadyConstant ()
+		{
+			TestWrongContext<IntroduceConstantAction> (@"class TestClass
+{
+	public void Hello ()
+	{
+		const int i = $0xAFFE;
+	}
+}");
+		}
+
+		[Test]
+		public void TestAlreadyConstantCase2 ()
+		{
+			TestWrongContext<IntroduceConstantAction> (@"class TestClass
+{
+	const int i = $0xAFFE;
+}");
+		}
+
+		[Test]
+		public void TestIntroduceConstantInInitializer ()
+		{
+			Test<IntroduceConstantAction> (@"class TestClass
+{
+	readonly int foo = new Foo ($5);
+}", @"class TestClass
+{
+	const int i = 5;
+	readonly int foo = new Foo (i);
+}");
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/InvertConditionalOperatorActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/InvertConditionalOperatorActionTests.cs
new file mode 100644
index 0000000000..79c9321edc
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/InvertConditionalOperatorActionTests.cs
@@ -0,0 +1,157 @@
+//
+// InvertConditionalOperatorActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class InvertConditionalOperatorActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestCase1()
+		{
+			Test<InvertConditionalOperatorAction>(@"
+class Foo
+{
+	void Bar (int i, int j)
+	{
+		Console.WriteLine (i > j $? i : j);
+	}
+}
+", @"
+class Foo
+{
+	void Bar (int i, int j)
+	{
+		Console.WriteLine (i <= j ? j : i);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestConditionStart()
+		{
+			Test<InvertConditionalOperatorAction>(@"
+class Foo
+{
+	void Bar (int i, int j)
+	{
+		Console.WriteLine ($i > j ? i : j);
+	}
+}
+", @"
+class Foo
+{
+	void Bar (int i, int j)
+	{
+		Console.WriteLine (i <= j ? j : i);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestTrueStart()
+		{
+			Test<InvertConditionalOperatorAction>(@"
+class Foo
+{
+	void Bar (int i, int j)
+	{
+		Console.WriteLine (i > j ? $i : j);
+	}
+}
+", @"
+class Foo
+{
+	void Bar (int i, int j)
+	{
+		Console.WriteLine (i <= j ? j : i);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestFalseStart()
+		{
+			Test<InvertConditionalOperatorAction>(@"
+class Foo
+{
+	void Bar (int i, int j)
+	{
+		Console.WriteLine (i > j ? i : $j);
+	}
+}
+", @"
+class Foo
+{
+	void Bar (int i, int j)
+	{
+		Console.WriteLine (i <= j ? j : i);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestPopupLocations()
+		{
+			TestWrongContext<InvertConditionalOperatorAction>(@"
+class Foo
+{
+	void Bar (int i, int j)
+	{
+		Console.WriteLine (i > $j ? i : j);
+	}
+}
+");
+			TestWrongContext<InvertConditionalOperatorAction>(@"
+class Foo
+{
+	void Bar (int i, int j)
+	{
+		Console.WriteLine (i > j ? i$i : j);
+	}
+}
+");
+
+			TestWrongContext<InvertConditionalOperatorAction>(@"
+class Foo
+{
+	void Bar (int i, int j)
+	{
+		Console.WriteLine (i > j ? ii : j$j);
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/InvertLogicalExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/InvertLogicalExpressionTests.cs
new file mode 100644
index 0000000000..e92cdbc48a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/InvertLogicalExpressionTests.cs
@@ -0,0 +1,274 @@
+// 
+// InvertLogicalExpressionTests.cs
+// 
+// Author:
+//      Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class InvertLogicalExpressionTests : ContextActionTestBase
+	{
+		[Test]
+		public void ConditionlAnd()
+		{
+			Test<InvertLogicalExpressionAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		bool a = true;
+		bool b = false;
+		if (a $&& b){}
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		bool a = true;
+		bool b = false;
+		if (!(!a || !b)) {
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void ConditionlAndReverse()
+		{
+			Test<InvertLogicalExpressionAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		bool a = true;
+		bool b = false;
+		if (!(!a $|| !b)) {
+		}
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		bool a = true;
+		bool b = false;
+		if (a && b) {
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void ConditionlOr()
+		{
+			Test<InvertLogicalExpressionAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		bool a = true;
+		bool b = false;
+		if (a $|| b){}
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		bool a = true;
+		bool b = false;
+		if (!(!a && !b)) {
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void ConditionlOrReverse()
+		{
+			Test<InvertLogicalExpressionAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		bool a = true;
+		bool b = false;
+		if (!(!a $&& !b)){}
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		bool a = true;
+		bool b = false;
+		if (a || b) {
+		}
+	}
+}");
+		}
+
+
+		[Test]
+		public void ConditionlAnd2()
+		{
+			Test<InvertLogicalExpressionAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		int a = 1;
+		bool b = true;
+		if ((a > 1) $&& b){}
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		int a = 1;
+		bool b = true;
+		if (!((a <= 1) || !b)) {
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void ConditionlOr2()
+		{
+			Test<InvertLogicalExpressionAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		int a = 1;
+		bool b = true;
+		if (!((a > 1) $|| b)){}
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		int a = 1;
+		bool b = true;
+		if ((a <= 1) && !b) {
+		}
+	}
+}");
+		}
+	
+		[Test]
+		public void Equals()
+		{
+			Test<InvertLogicalExpressionAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		bool a = true;
+		bool b = false;
+		if (a $== b){}
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		bool a = true;
+		bool b = false;
+		if (!(a != b)) {
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void EqualsReverse()
+		{
+			Test<InvertLogicalExpressionAction>(@"
+class TestClass
+{
+	public void F()
+	{
+		bool a = true;
+		bool b = false;
+		if (!(a $!= b)){}
+	}
+}", @"
+class TestClass
+{
+	public void F()
+	{
+		bool a = true;
+		bool b = false;
+		if (a == b) {
+		}
+	}
+}");
+		}
+
+		
+		[Test]
+		public void TestNullCoalescing()
+		{
+			TestWrongContext<InvertLogicalExpressionAction>(@"
+class Foo
+{
+	void Bar (object i, object j)
+	{
+		Console.WriteLine (i $?? j);
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestUnaryExpression()
+		{
+			Test<InvertLogicalExpressionAction>(@"
+class Foo
+{
+	void Bar (bool a, bool b)
+	{
+		Console.WriteLine ($!(a && b));
+	}
+}
+", @"
+class Foo
+{
+	void Bar (bool a, bool b)
+	{
+		Console.WriteLine (!a || !b);
+	}
+}
+");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/IterateViaForeachTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/IterateViaForeachTests.cs
index 3cf6a75b8d..d4b321ba64 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/IterateViaForeachTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/IterateViaForeachTests.cs
@@ -104,7 +104,7 @@ class TestClass
 	public void F()
 	{
 		IEnumerable<int> ints;
-		ints = GetIn$ts ();
+		$ints = GetInts ();
 	}
 }", @"
 using System.Collections.Generic;
@@ -159,7 +159,7 @@ class TestClass
 {
 	public void F()
 	{
-		var items$ = new List<TestClass> ();
+		var $items = new List<TestClass> ();
 	}
 }", @"
 using System.Collections.Generic;
@@ -281,7 +281,7 @@ class TestClass
 {
 	public void F()
 	{
-		using (int[] i = new $int[] {}) {
+		using (int[] $i = new int[] {}) {
 		}
 	}
 }",@"
@@ -305,14 +305,14 @@ class TestClass
 {
 	public void F()
 	{
-		using (int[] i = new $int[] {});
+		using (int[] $i = new int[] {});
 	}
 }",@"
 class TestClass
 {
 	public void F()
 	{
-		using (int[] i = new int[] {}) {
+		using (int[] i = new int[] { }) {
 			foreach (var j in i) {
 			}
 		}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/LinqFluentToQueryTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/LinqFluentToQueryTests.cs
new file mode 100644
index 0000000000..366f19d651
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/LinqFluentToQueryTests.cs
@@ -0,0 +1,627 @@
+//
+// LinqFluentToQueryTests.cs
+//
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+//
+// Copyright (c) 2013 Luís Reis
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class LinqFluentToQueryTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestBasicCase()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].$Select (t => t);
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from t in new int[0]
+		        select t;
+	}
+}");
+		}
+
+		[Test]
+		public void TestAddedParenthesis()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].$Select (t => t) + 1;
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = (from t in new int[0]
+select t) + 1;
+	}
+}");
+		}
+
+		[Test]
+		public void TestCast()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].$Cast<int> ();
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from int _1 in new int[0]
+		        select _1;
+	}
+}");
+		}
+
+		[Test]
+		public void TestLet()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].Select (w => new { w, two = w * 2 }).$Select (_ => _.two);
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from w in new int[0]
+		        let two = w * 2
+		        select two;
+	}
+}");
+		}
+
+		[Test]
+		public void TestLet2()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].Select (w => new { two = w * 2, w }).$Select (_ => _.two);
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from w in new int[0]
+		        let two = w * 2
+		        select two;
+	}
+}");
+		}
+
+		[Test]
+		public void TestLongLetChain()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].Select (w => new { w, two = w * 2 })
+			.Select (h => new { h, three = h.w * 3 })
+			.Select (k => new { k, four = k.h.w * 4 })
+			.$Select (_ => _.k.h.w + _.k.h.two + _.k.three + _.four)
+			.Select (sum => sum * 2);
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from w in new int[0]
+		        let two = w * 2
+		        let three = w * 3
+		        let four = w * 4
+		        select w + two + three + four into sum
+		        select sum * 2;
+	}
+}");
+		}
+
+		[Test]
+		public void TestLongLetChain2()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].Select (w => new { two = w * 2, w })
+			.Select (h => new { three = h.w * 3, h })
+			.Select (k => new { four = k.h.w * 4, k })
+			.$Select (_ => _.k.h.w + _.k.h.two + _.k.three + _.four)
+			.Select (sum => sum * 2);
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from w in new int[0]
+		        let two = w * 2
+		        let three = w * 3
+		        let four = w * 4
+		        select w + two + three + four into sum
+		        select sum * 2;
+	}
+}");
+		}
+
+		[Test]
+		public void TestSelectMany()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].$SelectMany (elem => new int[0], (elem1, elem2) => elem1 + elem2);
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from elem1 in new int[0]
+		        from elem2 in new int[0]
+		        select elem1 + elem2;
+	}
+}");
+		}
+
+		[Test]
+		public void TestSelectManyLet()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].$SelectMany (elem => new int[0], (elem1, elem2) => new { elem1, elem2 }).Select(i => new { i, sum = i.elem1 + i.elem2 })
+			.Select(j => j.i.elem1 + j.i.elem2 + j.sum);
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from elem1 in new int[0]
+		        from elem2 in new int[0]
+		        let sum = elem1 + elem2
+		        select elem1 + elem2 + sum;
+	}
+}");
+		}
+
+		[Test]
+		public void TestSelectManyLet2()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].$SelectMany (elem => new int[0], (elem1, elem2) => new { elem1, elem2 = elem2 + 1 }).Select(i => new { i, sum = i.elem1 + i.elem2 })
+			.Select(j => j.i.elem1 + j.i.elem2 + j.sum);
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from elem1 in new int[0]
+		        from elem2 in new int[0]
+		        select new {
+	elem1,
+	elem2 = elem2 + 1
+} into i
+		        let sum = i.elem1 + i.elem2
+		        select i.elem1 + i.elem2 + sum;
+	}
+}");
+		}
+
+		[Test]
+		public void TestCastSelect()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].$Cast<int> ().Select (t => t * 2);
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from int t in new int[0]
+		        select t * 2;
+	}
+}");
+		}
+
+		[Test]
+		public void TestSelectWhere ()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].$Where (t => t > 0).Select (t => t * 2);
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from t in new int[0]
+		        where t > 0
+		        select t * 2;
+	}
+}");
+		}
+
+		[Test]
+		public void TestSorting ()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].$OrderBy (t => t).ThenByDescending (t => t);
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from t in new int[0]
+		        orderby t, t descending
+		        select t;
+	}
+}");
+		}
+
+		[Test]
+		public void TestDegenerateWhere ()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].$Where (t => t > 0);
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from t in new int[0]
+		        where t > 0
+		        select t;
+	}
+}");
+		}
+
+		[Test]
+		public void TestChain ()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].Where (t => t > 0).$Where (u => u > 0);
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from t in new int[0]
+		        where t > 0
+		        select t into u
+		        where u > 0
+		        select u;
+	}
+}");
+		}
+
+		[Test]
+		public void TestJoin()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].Cast<char> ().$Join(new int[0].Cast<float> (), a => a * 2, b => b, (l, r) => l * r);
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from char a in new int[0]
+		        join float b in new int[0] on a * 2 equals b
+		        select a * b;
+	}
+}");
+		}
+
+		[Test]
+		public void TestGroupJoin()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].Cast<char> ().$GroupJoin(new int[0].Cast<float> (), a => a * 2, b => b, (l, r) => l * r [0]);
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from char a in new int[0]
+		        join float b in new int[0] on a * 2 equals b into r
+		        select a * r [0];
+	}
+}");
+		}
+
+		[Test]
+		public void TestNonRecursive()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = Enumerable.Empty<int[]> ().$Select (t => t.Select (v => v));
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from t in Enumerable.Empty<int[]> ()
+		        select t.Select (v => v);
+	}
+}");
+		}
+
+		[Test]
+		public void TestNonRecursiveCombineQueries()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = Enumerable.Empty<int[]> ().$Select (t => (from g in t select g));
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from t in Enumerable.Empty<int[]> ()
+		        select (from g in t
+		      select g);
+	}
+}");
+		}
+
+		[Test]
+		public void TestGroupBy()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].$GroupBy (t => t, t => new int[0]);
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from t in new int[0]
+		        group new int[0] by t;
+	}
+}");
+		}
+
+		[Test]
+		public void Test_1AlreadyUsed()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		int _1;
+		var x = new int[0].$Cast<float> ();
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		int _1;
+		var x = from float _2 in new int[0]
+		        select _2;
+	}
+}");
+		}
+
+		[Test]
+		public void TestDoubleCasts()
+		{
+			Test<LinqFluentToQueryAction>(@"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = new int[0].$Cast<float> ().Cast<int> ();
+	}
+}", @"
+using System.Linq;
+
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = from int _1 in
+		            from float _2 in new int[0]
+		select _2
+		        select _1;
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/LinqQueryToFluentTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/LinqQueryToFluentTests.cs
new file mode 100644
index 0000000000..6ac7e75ddb
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/LinqQueryToFluentTests.cs
@@ -0,0 +1,690 @@
+// 
+// LinqQueryToFluentTests.cs
+//  
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class LinqQueryToFluentTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestSimpleQuery()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = $from x in System.Enumerable.Empty<int> ()
+                   select x;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = System.Enumerable.Empty<int> ().Select (x => x);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestName()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		int _;
+		var _2 = $from x in System.Enumerable.Empty<int> ()
+		         let _1 = x
+		         select x;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		int _;
+		var _2 = System.Enumerable.Empty<int> ().Select (x => new {
+	x,
+	_1 = x
+}).Select (_3 => _3.x);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestPrecedence()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = $from x in true ? System.Enumerable.Empty<int> () : null
+			       select x;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = (true ? System.Enumerable.Empty<int> () : null).Select (x => x);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestWhereQuery()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = $from x in System.Enumerable.Empty<int> ()
+		           where x > 1
+		           select x;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = System.Enumerable.Empty<int> ().Where (x => x > 1);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestOrderByQuery()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = $from x in System.Enumerable.Empty<int> ()
+		           orderby x, x * 2 descending
+		           select x;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = System.Enumerable.Empty<int> ().OrderBy (x => x).ThenByDescending (x => x * 2);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestDoubleFromWithSelectQuery()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var newEnumerable = System.Enumerable.Empty<int> ();
+		var data = $from x in System.Enumerable.Empty<int> ()
+		           from y in newEnumerable
+		           select x * y;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var newEnumerable = System.Enumerable.Empty<int> ();
+		var data = System.Enumerable.Empty<int> ().SelectMany (x => newEnumerable, (x, y) => x * y);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestDoubleFromWithCastQuery()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var newEnumerable = System.Enumerable.Empty<int> ();
+		var data = $from x in System.Enumerable.Empty<int> ()
+		           from float y in newEnumerable
+		           select x * y;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var newEnumerable = System.Enumerable.Empty<int> ();
+		var data = System.Enumerable.Empty<int> ().SelectMany (x => newEnumerable.Cast<float> (), (x, y) => x * y);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestDoubleFromWithIntermediateQuery()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var newEnumerable = System.Enumerable.Empty<int> ();
+		var data = $from x in System.Enumerable.Empty<int> ()
+		           from y in newEnumerable
+		           where x > y
+		           select x * y;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var newEnumerable = System.Enumerable.Empty<int> ();
+		var data = System.Enumerable.Empty<int> ().SelectMany (x => newEnumerable, (x, y) => new {
+	x,
+	y
+}).Where (_ => _.x > _.y).Select (_1 => _1.x * _1.y);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestLetQuery()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = $from x in System.Enumerable.Empty<int> ()
+		           let y = x * 2
+		           select x * y;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = System.Enumerable.Empty<int> ().Select (x => new {
+	x,
+	y = x * 2
+}).Select (_ => _.x * _.y);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestLongChainQuery()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = $from x in System.Enumerable.Empty<int> ()
+		           let y = x * 2
+		           let z = x * y * 2
+		           select x * y * z;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = System.Enumerable.Empty<int> ().Select (x => new {
+	x,
+	y = x * 2
+}).Select (_ => new {
+	_,
+	z = _.x * _.y * 2
+}).Select (_1 => _1._.x * _1._.y * _1.z);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestCastQuery()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = $from float x in System.Enumerable.Empty<int> ()
+		           select x;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = System.Enumerable.Empty<int> ().Cast<float> ().Select (x => x);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestJoinQuery()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var newEnumerable = new int[] { 4, 5, 6 };
+		var data = $from x in System.Enumerable.Empty<int> ()
+		           join float yy in newEnumerable on x * 2 equals yy
+		           select x * yy;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var newEnumerable = new int[] { 4, 5, 6 };
+		var data = System.Enumerable.Empty<int> ().Join (newEnumerable.Cast<float> (), x => x * 2, yy => yy, (x, yy) => x * yy);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestJoinWithIntermediateQuery()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var newEnumerable = new int[] { 4, 5, 6 };
+		var data = $from x in System.Enumerable.Empty<int> ()
+		           join float y in newEnumerable on x * 2 equals y
+		           where x == 2
+		           select x * y;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var newEnumerable = new int[] { 4, 5, 6 };
+		var data = System.Enumerable.Empty<int> ().Join (newEnumerable.Cast<float> (), x => x * 2, y => y, (x, y) => new {
+	x,
+	y
+}).Where (_ => _.x == 2).Select (_1 => _1.x * _1.y);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestJoinWithIntoSelectQuery()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var newEnumerable = new int[] { 1, 2, 3 };
+		var data = $from x in System.Enumerable.Empty<int> ()
+		           join y in newEnumerable on x * 2 equals y
+		           into g
+		           select g;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var newEnumerable = new int[] { 1, 2, 3 };
+		var data = System.Enumerable.Empty<int> ().GroupJoin (newEnumerable, x => x * 2, y => y, (x, g) => g);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestJoinWithIntoIntermediateQuery()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var newEnumerable = new int[] { 1, 2, 3 };
+		var data = $from x in System.Enumerable.Empty<int> ()
+		           join y in newEnumerable on x * 2 equals y
+		           into g
+		           where true
+		           select g;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var newEnumerable = new int[] { 1, 2, 3 };
+		var data = System.Enumerable.Empty<int> ().GroupJoin (newEnumerable, x => x * 2, y => y, (x, g) => new {
+	x,
+	g
+}).Where (_ => true).Select (_1 => _1.g);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestSimpleGroup()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = $from x in System.Enumerable.Empty<int> ()
+		           group x by x % 10;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = System.Enumerable.Empty<int> ().GroupBy (x => x % 10);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestDifferentGroup()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = $from x in System.Enumerable.Empty<int> ()
+		           group x / 10 by x % 10;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = System.Enumerable.Empty<int> ().GroupBy (x => x % 10, x => x / 10);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestInto()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = $from x in System.Enumerable.Empty<int> ()
+		           select x * 2 into y
+		           select y * 3;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var data = System.Enumerable.Empty<int> ().Select (x => x * 2).Select (y => y * 3);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestDoubleFromWithLet()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var src = System.Enumerable.Empty<int> ();
+		var data = $from x in src
+		           from y in src
+		           let k = x * y
+		           select k;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var src = System.Enumerable.Empty<int> ();
+		var data = src.SelectMany (x => src, (x, y) => new {
+	x,
+	y
+}).Select (_ => new {
+	_,
+	k = _.x * _.y
+}).Select (_1 => _1.k);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+
+		[Test]
+		public void TestDoubleFromWithMidLet()
+		{
+			string input = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var src = System.Enumerable.Empty<int> ();
+		var data = $from x in src
+		           let k = x * x
+		           from y in src
+		           select k * y;
+	}
+}
+";
+
+			string output = @"
+using System.Linq;
+public class TestClass
+{
+	public void TestMethod()
+	{
+		var src = System.Enumerable.Empty<int> ();
+		var data = src.Select (x => new {
+	x,
+	k = x * x
+}).SelectMany (_ => src, (_1, y) => _1.k * y);
+	}
+}
+";
+
+			Assert.AreEqual(output, RunContextAction(new LinqQueryToFluentAction(), input));
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/MetaTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/MetaTests.cs
new file mode 100644
index 0000000000..fa33c502f0
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/MetaTests.cs
@@ -0,0 +1,283 @@
+// 
+// MetaTests.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	/// <summary>
+	/// Tests for the test APIs.
+	/// </summary>
+	[TestFixture]
+	public class MetaTests
+	{
+		[Test]
+		public void TestGlobalOperation ()
+		{
+			List<string> contents = new List<string>() {
+				@"class Test1
+{
+	public int $x;
+}", @"class Test2
+{
+	public void Foo(Test1 test1)
+	{
+		test1.x = 1;
+		test1.x = 2;
+	}
+}"
+			};
+			var context = TestRefactoringContext.Create(contents, 0);
+			using (var script = context.StartScript()) {
+				var variable = context.GetNode<VariableInitializer>();
+				script.DoGlobalOperationOn(new List<IEntity>() {
+					((MemberResolveResult) context.Resolve(variable)).Member
+				}, (rCtx, rScript, nodes) => {
+					foreach (var node in nodes) {
+						rScript.Replace(node, new IdentifierExpression("replacement"));
+					}
+				});
+			}
+
+			Assert.AreEqual(@"class Test1
+{
+	public int replacement;
+}", context.GetSideDocumentText(0));
+
+			Assert.AreEqual(@"class Test2
+{
+	public void Foo(Test1 test1)
+	{
+		replacement = 1;
+		replacement = 2;
+	}
+}", context.GetSideDocumentText(1));
+		}
+
+		[Test]
+		public void TestRename ()
+		{
+			List<string> contents = new List<string>() {
+				@"class Test1
+{
+	public int $x;
+}", @"class Test2
+{
+	public void Foo(Test1 test1)
+	{
+		test1.x = 1;
+		test1.x = 2;
+	}
+}"
+			};
+			var context = TestRefactoringContext.Create(contents, 0);
+			using (var script = context.StartScript()) {
+				var variable = context.GetNode<VariableInitializer>();
+				script.Rename(((MemberResolveResult)context.Resolve(variable)).Member, "newName");
+			}
+
+			Assert.AreEqual(@"class Test1
+{
+	public int newName;
+}", context.GetSideDocumentText(0));
+
+			Assert.AreEqual(@"class Test2
+{
+	public void Foo(Test1 test1)
+	{
+		test1.newName = 1;
+		test1.newName = 2;
+	}
+}", context.GetSideDocumentText(1));
+		}
+
+		[Ignore]
+		[Test]
+		public void TestRenameInterfaceMethod ()
+		{
+			List<string> contents = new List<string>() {
+				@"interface ITest1
+{
+	int $method ();
+}
+class Test2 : ITest1
+{
+	int method ()
+	{
+	}
+}", @"class Test3 : ITest1
+{
+	int method ()
+	{
+	}
+}"
+			};
+			var context = TestRefactoringContext.Create(contents, 0);
+			using (var script = context.StartScript()) {
+				var method = context.GetNode<MethodDeclaration>();
+				script.Rename(((MemberResolveResult)context.Resolve(method)).Member, "newName");
+			}
+
+			Assert.AreEqual(@"interface ITest1
+{
+	int newName ();
+}
+class Test2 : ITest1
+{
+	int newName ()
+	{
+	}
+}", context.GetSideDocumentText(0));
+
+			Assert.AreEqual(@"class Test3 : ITest1
+{
+	int newName ()
+	{
+	}
+}", context.GetSideDocumentText(1));
+		}
+
+		[Test]
+		public void TestRemoveBaseType()
+		{
+			var context = TestRefactoringContext.Create(@"
+public class $Foo : System.IDisposable
+{
+}");
+			using (var script = context.StartScript()) {
+				var type = context.GetNode<TypeDeclaration>();
+				script.ChangeBaseTypes(type, Enumerable.Empty<AstType>());
+			}
+
+			Assert.AreEqual(@"
+public class Foo
+{
+}", context.Text);
+		}
+
+		[Test]
+		public void TestRemoveBaseTypeInNested()
+		{
+			var context = TestRefactoringContext.Create(@"
+public class X
+{
+	public class $Foo : System.IDisposable
+	{
+	}
+}");
+			using (var script = context.StartScript()) {
+				var type = context.GetNode<TypeDeclaration>();
+				script.ChangeBaseTypes(type, Enumerable.Empty<AstType>());
+			}
+
+			Assert.AreEqual(@"
+public class X
+{
+	public class Foo
+	{
+	}
+}", context.Text);
+		}
+
+		[Test]
+		public void TestReplaceBaseType()
+		{
+			var context = TestRefactoringContext.Create(@"
+public class $Foo : System.IDisposable
+{
+}");
+			using (var script = context.StartScript()) {
+				var type = context.GetNode<TypeDeclaration>();
+				script.ChangeBaseTypes(type, new AstType[] { AstType.Create("System.Test") });
+			}
+
+			Assert.AreEqual(@"
+public class Foo : System.Test
+{
+}", context.Text);
+		}
+
+		[Test]
+		public void TestChangeBaseTypeGenerics()
+		{
+			var context = TestRefactoringContext.Create(@"
+public class $Foo<T> : System.IDisposable where T : new()
+{
+}");
+			using (var script = context.StartScript()) {
+				var type = context.GetNode<TypeDeclaration>();
+				script.ChangeBaseTypes(type, new AstType[] { AstType.Create("System.Test") });
+			}
+
+			Assert.AreEqual(@"
+public class Foo<T> : System.Test where T : new()
+{
+}", context.Text);
+		}
+
+		[Test]
+		public void TestAddBaseType()
+		{
+			var context = TestRefactoringContext.Create(@"
+public class $Foo
+{
+}");
+			using (var script = context.StartScript()) {
+				var type = context.GetNode<TypeDeclaration>();
+				script.ChangeBaseTypes(type, new AstType[] { AstType.Create("System.Test") });
+			}
+
+			Assert.AreEqual(@"
+public class Foo : System.Test
+{
+}", context.Text);
+		}
+
+		[Test]
+		public void TestAddBaseTypeGenerics()
+		{
+			var context = TestRefactoringContext.Create(@"
+public class $Foo<T> where T : new()
+{
+}");
+			using (var script = context.StartScript()) {
+				var type = context.GetNode<TypeDeclaration>();
+				script.ChangeBaseTypes(type, new AstType[] { AstType.Create("System.Test") });
+			}
+
+			Assert.AreEqual(@"
+public class Foo<T> : System.Test where T : new()
+{
+}", context.Text);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/MoveToOuterScopeTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/MoveToOuterScopeTests.cs
index 3f85ffa6f3..dd706128f4 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/MoveToOuterScopeTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/MoveToOuterScopeTests.cs
@@ -112,7 +112,7 @@ class A
 			TestStatements(@"
 	while (true) {
 		int i = 2;
-		int j$ = i;
+		int $j = i;
 	}
 ", @"
 		int j;
@@ -128,7 +128,7 @@ class A
 		{
 			TestStatements(@"
 	var action = new Action<int>(i => {
-		int j$ = 2;
+		int $j = 2;
 	});
 ", @"
 		int j = 2;
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/NegateIsExpressionActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/NegateIsExpressionActionTests.cs
new file mode 100644
index 0000000000..dbc2234ea4
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/NegateIsExpressionActionTests.cs
@@ -0,0 +1,76 @@
+//
+// NegateIsExpressionActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class NegateIsExpressionActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase ()
+		{
+			Test<NegateIsExpressionAction> (@"
+class TestClass
+{
+	void Test (object x)
+	{
+		var b = x $is TestClass;
+	}
+}", @"
+class TestClass
+{
+	void Test (object x)
+	{
+		var b = !(x is TestClass);
+	}
+}");
+		}
+
+		[Test]
+		public void TestReverse ()
+		{
+			Test<NegateIsExpressionAction> (@"
+class TestClass
+{
+	void Test (object x)
+	{
+		var b = !(x $is TestClass);
+	}
+}", @"
+class TestClass
+{
+	void Test (object x)
+	{
+		var b = x is TestClass;
+	}
+}");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/NegateRelationalExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/NegateRelationalExpressionTests.cs
index 6109e94afc..284f8c6893 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/NegateRelationalExpressionTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/NegateRelationalExpressionTests.cs
@@ -86,5 +86,29 @@ class TestClass
 		{
 			Test ("<=", ">");
 		}
+
+		[Test]
+		public void TestUnaryOperator ()
+		{
+			Test<NegateRelationalExpressionAction> (
+				@"
+class Foo 
+{
+	void Bar ()
+	{
+		var cond = $!(1 < 2);
+	}
+}
+", @"
+class Foo 
+{
+	void Bar ()
+	{
+		var cond = 1 < 2;
+	}
+}
+");
+
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/RemoveBackingStoreTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/RemoveBackingStoreTests.cs
index edae1c0523..caf45bacaf 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/RemoveBackingStoreTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/RemoveBackingStoreTests.cs
@@ -93,7 +93,50 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 				"}"
 			);
 		}
-		
+
+
+		[Test]
+		public void TestWrongLocation()
+		{
+			TestWrongContext<RemoveBackingStoreAction> (@"class TestClass
+{
+	string test;
+	public $string Test {
+		get {
+			return test;
+		}
+		set {
+			test = value;
+		}
+	}
+}");
+
+			TestWrongContext<RemoveBackingStoreAction> (@"class TestClass
+{
+	string test;
+	public string $FooBar.Test {
+		get {
+			return test;
+		}
+		set {
+			test = value;
+		}
+	}
+}");
+
+			TestWrongContext<RemoveBackingStoreAction> (@"class TestClass
+{
+	string test;
+	public string Test ${
+		get {
+			return test;
+		}
+		set {
+			test = value;
+		}
+	}
+}");
+		}
 		
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/RemoveBracesTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/RemoveBracesTests.cs
index 3f1765a125..48dee61df0 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/RemoveBracesTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/RemoveBracesTests.cs
@@ -32,7 +32,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 	[TestFixture]
 	public class RemoveBracesTests : ContextActionTestBase
 	{
-		[Test()]
+		[Test]
 		public void TestSimpleBraces()
 		{
 			string result = RunContextAction(
@@ -59,7 +59,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 				"}", result);
 		}
 
-		[Test()]
+		[Test]
 		public void TestTryCatch()
 		{
 			TestWrongContext<RemoveBracesAction>(@"class TestClass
@@ -71,7 +71,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 }");
 		}
 		
-		[Test()]
+		[Test]
 		public void TestTryCatchCatch()
 		{
 			TestWrongContext<RemoveBracesAction>(@"class TestClass
@@ -83,7 +83,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 }");
 		}
 		
-		[Test()]
+		[Test]
 		public void TestTryCatchFinally()
 		{
 			TestWrongContext<RemoveBracesAction>(@"class TestClass
@@ -96,7 +96,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 		}
 
 
-		[Test()]
+		[Test]
 		public void TestSwitchCatch()
 		{
 			TestWrongContext<RemoveBracesAction>(@"class TestClass
@@ -108,7 +108,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 }");
 		}
 
-		[Test()]
+		[Test]
 		public void TestMethodDeclaration()
 		{
 			TestWrongContext<RemoveBracesAction>(@"class TestClass
@@ -119,7 +119,196 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 	}
 }");
 		}
-		
+
+		[Test]
+		public void TestRemoveBracesFromIf()
+		{
+			Test<RemoveBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		$if (true) {
+			Console.WriteLine (""Hello"");
+		}
+	}
+}", @"class TestClass
+{
+	void Test ()
+	{
+		if (true)
+			Console.WriteLine (""Hello"");
+	}
+}");
+		}
+
+		[Test]
+		public void TestRemoveBracesFromElse()
+		{
+			Test<RemoveBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		if (true) {
+			Console.WriteLine (""Hello"");
+		} $else {
+			Console.WriteLine (""World"");
+		}
+	}
+}", @"class TestClass
+{
+	void Test ()
+	{
+		if (true) {
+			Console.WriteLine (""Hello"");
+		} else
+			Console.WriteLine (""World"");
+	}
+}");
+		}
+
+		[Test]
+		public void TestRemoveBracesFromDoWhile()
+		{
+			Test<RemoveBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		$do {
+			Console.WriteLine (""Hello"");
+		} while (true);
+	}
+}", @"class TestClass
+{
+	void Test ()
+	{
+		do
+			Console.WriteLine (""Hello"");
+		while (true);
+	}
+}");
+		}
+
+		[Test]
+		public void TestRemoveBracesFromForeach()
+		{
+			Test<RemoveBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		$foreach (var a in b) {
+			Console.WriteLine (""Hello"");
+		}
+	}
+}", @"class TestClass
+{
+	void Test ()
+	{
+		foreach (var a in b)
+			Console.WriteLine (""Hello"");
+	}
+}");
+		}
+	
+		[Test]
+		public void TestRemoveBracesFromFor()
+		{
+			Test<RemoveBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		$for (;;) {
+			Console.WriteLine (""Hello"");
+		}
+	}
+}", @"class TestClass
+{
+	void Test ()
+	{
+		for (;;)
+			Console.WriteLine (""Hello"");
+	}
+}");
+		}
+
+		[Test]
+		public void TestRemoveBracesFromLock()
+		{
+			Test<RemoveBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		$lock (this) {
+			Console.WriteLine (""Hello"");
+		}
+	}
+}", @"class TestClass
+{
+	void Test ()
+	{
+		lock (this)
+			Console.WriteLine (""Hello"");
+	}
+}");
+		}
+
+		[Test]
+		public void TestRemoveBracesFromUsing()
+		{
+			Test<RemoveBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		$using (var a = new A ()) {
+			Console.WriteLine (""Hello"");
+		}
+	}
+}", @"class TestClass
+{
+	void Test ()
+	{
+		using (var a = new A ())
+			Console.WriteLine (""Hello"");
+	}
+}");
+		}
+
+		[Test]
+		public void TestRemoveBracesFromWhile()
+		{
+			Test<RemoveBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		$while (true) {
+			Console.WriteLine (""Hello"");
+		}
+	}
+}", @"class TestClass
+{
+	void Test ()
+	{
+		while (true)
+			Console.WriteLine (""Hello"");
+	}
+}");
+		}
+
+		[Test]
+		public void TestNullNode()
+		{
+			TestWrongContext<RemoveBracesAction>(@"class TestClass
+{
+	void Test ()
+	{
+		if (true) {
+			Console.WriteLine (""Hello"");
+		}
+	}
+}
+
+        $          
+");
+		}
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/RemoveRegionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/RemoveRegionTests.cs
index d244bacefb..29629220c9 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/RemoveRegionTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/RemoveRegionTests.cs
@@ -33,58 +33,61 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 	[TestFixture]
 	public class RemoveRegionTests : ContextActionTestBase
 	{
-		[Test()]
+		[Test]
 		public void TestSimpleRegion ()
 		{
-			string result = RunContextAction (
-				new RemoveRegionAction (),
-				"class TestClass" + Environment.NewLine +
-					"{" + Environment.NewLine +
-					"	#region$ Foo" + Environment.NewLine +
-					"	void Test ()" + Environment.NewLine +
-					"	{" + Environment.NewLine +
-					"	}" + Environment.NewLine +
-					"	#endregion" + Environment.NewLine +
-					"}"
-			);
-			
-			Assert.AreEqual (
-				"class TestClass" + Environment.NewLine +
-				"{" + Environment.NewLine +
-				"	void Test ()" + Environment.NewLine +
-				"	{" + Environment.NewLine +
-				"	}" + Environment.NewLine +
-				"}", result);
+			Test<RemoveRegionAction> (@"class TestClass{
+#region$ Foo
+	void Test ()
+	{
+	}
+#endregion
+}", @"class TestClass{
+	void Test ()
+	{
+	}
+}");
 		}
 		
-		[Test()]
+		[Test]
 		public void TestNestedRegion ()
 		{
-			string result = RunContextAction (
-				new RemoveRegionAction (),
-				"class TestClass" + Environment.NewLine +
-					"{" + Environment.NewLine +
-					"	#region$ Foo" + Environment.NewLine +
-					"	void Test ()" + Environment.NewLine +
-					"	{" + Environment.NewLine +
-					"		#region Nested" + Environment.NewLine +
-					"		Foo ();" + Environment.NewLine +
-					"		#endregion" + Environment.NewLine +
-					"	}" + Environment.NewLine +
-					"	#endregion" + Environment.NewLine +
-					"}"
-			);
-			
-			Assert.AreEqual (
-				"class TestClass" + Environment.NewLine +
-				"{" + Environment.NewLine +
-				"	void Test ()" + Environment.NewLine +
-				"	{" + Environment.NewLine +
-				"		#region Nested" + Environment.NewLine +
-				"		Foo ();" + Environment.NewLine +
-				"		#endregion" + Environment.NewLine +
-				"	}" + Environment.NewLine +
-				"}", result);
+			Test<RemoveRegionAction> (@"class TestClass
+{
+	#region$ Foo
+	void Test ()
+	{
+		#region Nested
+		Foo ();
+		#endregion
+	}
+	#endregion
+}", @"class TestClass
+{
+	void Test ()
+	{
+		#region Nested
+		Foo ();
+		#endregion
+	}
+}");
+		}
+	
+
+		[Test]
+		public void TestEndRegion ()
+		{
+			Test<RemoveRegionAction> (@"class TestClass{
+#region Foo
+	void Test ()
+	{
+	}
+$#endregion
+}", @"class TestClass{
+	void Test ()
+	{
+	}
+}");
 		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReplaceAssignmentWithPostfixExpressionActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReplaceAssignmentWithPostfixExpressionActionTests.cs
new file mode 100644
index 0000000000..0019a0a824
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReplaceAssignmentWithPostfixExpressionActionTests.cs
@@ -0,0 +1,98 @@
+//
+// ReplaceAssignmentWithPostfixExpressionActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ReplaceAssignmentWithPostfixExpressionActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestAdd ()
+		{
+			Test<ReplaceAssignmentWithPostfixExpressionAction> (@"
+class Test
+{
+	void Foo (int i)
+	{
+		i $+= 1;
+	}
+}", @"
+class Test
+{
+	void Foo (int i)
+	{
+		i++;
+	}
+}");
+		}
+
+		[Test]
+		public void TestSub ()
+		{
+			Test<ReplaceAssignmentWithPostfixExpressionAction> (@"
+class Test
+{
+	void Foo (int i)
+	{
+		i $-= 1;
+	}
+}", @"
+class Test
+{
+	void Foo (int i)
+	{
+		i--;
+	}
+}");
+		}
+	
+
+		[Test]
+		public void TestAddCase2 ()
+		{
+			Test<ReplaceAssignmentWithPostfixExpressionAction> (@"
+class Test
+{
+	void Foo (int i)
+	{
+		i $= i + 1;
+	}
+}", @"
+class Test
+{
+	void Foo (int i)
+	{
+		i++;
+	}
+}");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReplaceOperatorAssignmentWithAssignmentActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReplaceOperatorAssignmentWithAssignmentActionTests.cs
new file mode 100644
index 0000000000..9697098b3a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReplaceOperatorAssignmentWithAssignmentActionTests.cs
@@ -0,0 +1,58 @@
+//
+// ReplaceOperatorAssignmentWithAssignmentActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ReplaceOperatorAssignmentWithAssignmentActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestAdd ()
+		{
+			Test<ReplaceOperatorAssignmentWithAssignmentAction> (@"
+class Test
+{
+	void Foo (int i)
+	{
+		i $+= 1 + 2;
+	}
+}", @"
+class Test
+{
+	void Foo (int i)
+	{
+		i = i + 1 + 2;
+	}
+}");
+		}
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReplacePostfixExpressionWithAssignmentActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReplacePostfixExpressionWithAssignmentActionTests.cs
new file mode 100644
index 0000000000..4697097c4d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReplacePostfixExpressionWithAssignmentActionTests.cs
@@ -0,0 +1,77 @@
+//
+// ReplacePostfixExpressionWithAssignmentActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ReplacePostfixExpressionWithAssignmentActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestAdd ()
+		{
+			Test<ReplacePostfixExpressionWithAssignmentAction> (@"
+class Test
+{
+	void Foo (int i)
+	{
+		$i++;
+	}
+}", @"
+class Test
+{
+	void Foo (int i)
+	{
+		i += 1;
+	}
+}");
+		}
+
+		[Test]
+		public void TestSub ()
+		{
+			Test<ReplacePostfixExpressionWithAssignmentAction> (@"
+class Test
+{
+	void Foo (int i)
+	{
+		$i--;
+	}
+}", @"
+class Test
+{
+	void Foo (int i)
+	{
+		i -= 1;
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReplaceWithOperatorAssignmentActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReplaceWithOperatorAssignmentActionTests.cs
new file mode 100644
index 0000000000..ce5946c43c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReplaceWithOperatorAssignmentActionTests.cs
@@ -0,0 +1,58 @@
+//
+// ReplaceWithOperatorAssignmentActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ReplaceWithOperatorAssignmentActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestAdd ()
+		{
+			Test<ReplaceWithOperatorAssignmentAction> (@"
+class Test
+{
+	void Foo (int i)
+	{
+		i $= i + 1 + 2;
+	}
+}", @"
+class Test
+{
+	void Foo (int i)
+	{
+		i += 1 + 2;
+	}
+}");
+		}
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReverseDirectionForForLoopTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReverseDirectionForForLoopTests.cs
new file mode 100644
index 0000000000..45510ed6a1
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ReverseDirectionForForLoopTests.cs
@@ -0,0 +1,423 @@
+//
+// ReverseDirectionForForLoopTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ReverseDirectionForForLoopTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestPrimitveExpression()
+		{
+			Test<ReverseDirectionForForLoopAction>(@"
+class Foo
+{
+	public void Bar ()
+	{
+		$for (int i = 0; i < 10; i++)
+			System.Console.WriteLine (i);
+	}
+}
+", @"
+class Foo
+{
+	public void Bar ()
+	{
+		for (int i = 9; i >= 0; i--)
+			System.Console.WriteLine (i);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestPrimitveExpressionCase2()
+		{
+			Test<ReverseDirectionForForLoopAction>(@"
+class Foo
+{
+	public void Bar ()
+	{
+		$for (int i = 0; 10 > i; i++)
+			System.Console.WriteLine (i);
+	}
+}
+", @"
+class Foo
+{
+	public void Bar ()
+	{
+		for (int i = 9; i >= 0; i--)
+			System.Console.WriteLine (i);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestPrimitveExpressionReverse()
+		{
+			Test<ReverseDirectionForForLoopAction>(@"
+class Foo
+{
+	public void Bar ()
+	{
+		$for (int i = 9; i >= 0; i--)
+			System.Console.WriteLine (i);
+	}
+}
+", @"
+class Foo
+{
+	public void Bar ()
+	{
+		for (int i = 0; i < 10; i++)
+			System.Console.WriteLine (i);
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestLowerEqualPrimitveExpression()
+		{
+			Test<ReverseDirectionForForLoopAction>(@"
+class Foo
+{
+	public void Bar ()
+	{
+		$for (int i = 0; i <= 10; i++)
+			System.Console.WriteLine (i);
+	}
+}
+", @"
+class Foo
+{
+	public void Bar ()
+	{
+		for (int i = 10; i >= 0; i--)
+			System.Console.WriteLine (i);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestLowerEqualPrimitveExpressionCase2()
+		{
+			Test<ReverseDirectionForForLoopAction>(@"
+class Foo
+{
+	public void Bar ()
+	{
+		$for (int i = 0; 10 >= i; i++)
+			System.Console.WriteLine (i);
+	}
+}
+", @"
+class Foo
+{
+	public void Bar ()
+	{
+		for (int i = 10; i >= 0; i--)
+			System.Console.WriteLine (i);
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestArbitraryBounds()
+		{
+			Test<ReverseDirectionForForLoopAction>(@"
+class Foo
+{
+	public void Bar (int from, int to)
+	{
+		$for (int i = from; i < to; i += 1)
+			System.Console.WriteLine (i);
+	}
+}
+", @"
+class Foo
+{
+	public void Bar (int from, int to)
+	{
+		for (int i = to - 1; i >= from; i--)
+			System.Console.WriteLine (i);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestArbitraryBoundsCase2()
+		{
+			Test<ReverseDirectionForForLoopAction>(@"
+class Foo
+{
+	public void Bar ()
+	{
+		$for (int i = 0; i < a.T; i++)
+			System.Console.WriteLine (i);
+	}
+}
+", @"
+class Foo
+{
+	public void Bar ()
+	{
+		for (int i = a.T - 1; i >= 0; i--)
+			System.Console.WriteLine (i);
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestComplex()
+		{
+			Test<ReverseDirectionForForLoopAction>(@"
+class Foo
+{
+	public void Bar ()
+	{
+		$for (int i = Foo ().Bar + Test; i < (to - from).Length; i += a + b)
+			System.Console.WriteLine (i);
+	}
+}
+", @"
+class Foo
+{
+	public void Bar ()
+	{
+		for (int i = (to - from).Length - (a + b); i >= Foo ().Bar + Test; i -= a + b)
+			System.Console.WriteLine (i);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestComplexReverse()
+		{
+			Test<ReverseDirectionForForLoopAction>(@"
+class Foo
+{
+	public void Bar ()
+	{
+		$for (int i = (to - from).Length - (a + b); i >= Foo ().Bar + Test; i -= a + b)
+			System.Console.WriteLine (i);
+	}
+}
+", @"
+class Foo
+{
+	public void Bar ()
+	{
+		for (int i = Foo ().Bar + Test; i < (to - from).Length; i += a + b)
+			System.Console.WriteLine (i);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestArbitraryBoundsReverse()
+		{
+			Test<ReverseDirectionForForLoopAction>(@"
+class Foo
+{
+	public void Bar (int from, int to)
+	{
+		$for (int i = to - 1; i >= from; --i)
+			System.Console.WriteLine (i);
+	}
+}
+", @"
+class Foo
+{
+	public void Bar (int from, int to)
+	{
+		for (int i = from; i < to; i++)
+			System.Console.WriteLine (i);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestPrimitiveExpressionArbitrarySteps()
+		{
+			Test<ReverseDirectionForForLoopAction>(@"
+class Foo
+{
+	public void Bar ()
+	{
+		$for (int i = 0; i < 100; i += 5)
+			System.Console.WriteLine (i);
+	}
+}
+", @"
+class Foo
+{
+	public void Bar ()
+	{
+		for (int i = 95; i >= 0; i -= 5)
+			System.Console.WriteLine (i);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestPrimitiveExpressionArbitraryStepsCase2()
+		{
+			Test<ReverseDirectionForForLoopAction>(@"
+class Foo
+{
+	public void Bar ()
+	{
+		$for (int i = 0; i <= 100; i += 5)
+			System.Console.WriteLine (i);
+	}
+}
+", @"
+class Foo
+{
+	public void Bar ()
+	{
+		for (int i = 100; i >= 0; i -= 5)
+			System.Console.WriteLine (i);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestPrimitiveExpressionArbitraryStepsReverse()
+		{
+			Test<ReverseDirectionForForLoopAction>(@"
+class Foo
+{
+	public void Bar ()
+	{
+		$for (int i = 95; i >= 0; i -= 5)
+			System.Console.WriteLine (i);
+	}
+}
+", @"
+class Foo
+{
+	public void Bar ()
+	{
+		for (int i = 0; i < 100; i += 5)
+			System.Console.WriteLine (i);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestArbitrarySteps()
+		{
+			Test<ReverseDirectionForForLoopAction>(@"
+class Foo
+{
+	public void Bar (int from, int to, int step)
+	{
+		$for (int i = from; i < to; i += step)
+			System.Console.WriteLine (i);
+	}
+}
+", @"
+class Foo
+{
+	public void Bar (int from, int to, int step)
+	{
+		for (int i = to - step; i >= from; i -= step)
+			System.Console.WriteLine (i);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestArbitraryStepsReverse()
+		{
+			Test<ReverseDirectionForForLoopAction>(@"
+class Foo
+{
+	public void Bar (int from, int to, int step)
+	{
+		$for (int i = to - step; i >= from; i -= step)
+			System.Console.WriteLine (i);
+	}
+}
+", @"
+class Foo
+{
+	public void Bar (int from, int to, int step)
+	{
+		for (int i = from; i < to; i += step)
+			System.Console.WriteLine (i);
+	}
+}
+");
+		}
+	
+		[Ignore("Implement me")]
+		[Test]
+		public void TestOptimizedFor()
+		{
+			Test<ReverseDirectionForForLoopAction>(@"
+class Foo
+{
+	public void Bar ()
+	{
+		$for (int i = 0, upper = 10; i < upper; i++)
+			System.Console.WriteLine (i);
+	}
+}
+", @"
+class Foo
+{
+	public void Bar ()
+	{
+		for (int i = 9; i >= 0; i--)
+			System.Console.WriteLine (i);
+	}
+}
+");
+		}
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/SplitDeclarationAndAssignmentTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/SplitDeclarationAndAssignmentTests.cs
index b0eb3566e9..82fd370ebd 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/SplitDeclarationAndAssignmentTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/SplitDeclarationAndAssignmentTests.cs
@@ -4,7 +4,7 @@
 // Author:
 //       Mike Krüger <mkrueger@xamarin.com>
 // 
-// Copyright (c) 2012 Xamarin Inc.
+// Copyright (c) 2012-2013 Xamarin Inc. (http://xamarin.com)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -32,7 +32,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 	[TestFixture]
 	public class SplitDeclarationAndAssignmentTests : ContextActionTestBase
 	{
-		[Test()]
+		[Test]
 		public void TestSimpleExpression ()
 		{
 			string result = RunContextAction (
@@ -57,7 +57,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 				"}", result);
 		}
 		
-		[Test()]
+		[Test]
 		public void TestVarType ()
 		{
 			string result = RunContextAction (
@@ -81,7 +81,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 				"}", result);
 		}
 		
-		[Test()]
+		[Test]
 		public void TestForStatement ()
 		{
 			string result = RunContextAction (
@@ -105,6 +105,90 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 				"	}" + Environment.NewLine +
 				"}", result);
 		}
+	
+	
+		[Test]
+		public void TestPopupAtAssign ()
+		{
+			Test<SplitDeclarationAndAssignmentAction>(@"class Test
+{
+	public static void Main (string[] args)
+	{
+		var foo $= 5;
+	}
+}", @"class Test
+{
+	public static void Main (string[] args)
+	{
+		int foo;
+		foo = 5;
+	}
+}");
+		}
+
+		[Test]
+		public void TestPopupAtBeginningOfExpression ()
+		{
+			Test<SplitDeclarationAndAssignmentAction>(@"class Test
+{
+	public static void Main (string[] args)
+	{
+		var foo = $5;
+	}
+}", @"class Test
+{
+	public static void Main (string[] args)
+	{
+		int foo;
+		foo = 5;
+	}
+}");
+		}
+
+		[Test]
+		public void TestMultipleInitializers ()
+		{
+			Test<SplitDeclarationAndAssignmentAction>(@"class Test
+{
+	public static void Main (string[] args)
+	{
+		int a, b, $foo = 5 + 12, c;
+		Console.WriteLine(foo);
+	}
+}", @"class Test
+{
+	public static void Main (string[] args)
+	{
+		int a, b, foo, c;
+		foo = 5 + 12;
+		Console.WriteLine(foo);
+	}
+}");
+		}
+
+		[Test]
+		public void TestHideInExpression ()
+		{
+			TestWrongContext<SplitDeclarationAndAssignmentAction>(@"class Test
+{
+	public static void Main (string[] args)
+	{
+		var foo = 5 $+ 5;
+	}
+}");
+		}
+
+		[Test]
+		public void TestLocalConstants ()
+		{
+			TestWrongContext<SplitDeclarationAndAssignmentAction>(@"class Test
+{
+	public static void Main (string[] args)
+	{
+		const int foo $= 5;
+	}
+}");
+		}
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/SplitIfActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/SplitIfActionTests.cs
new file mode 100644
index 0000000000..b6586d9d12
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/SplitIfActionTests.cs
@@ -0,0 +1,231 @@
+//
+// SplitIfActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class SplitIfActionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestAndSimple()
+		{
+			Test <SplitIfAction> (@"
+class Test
+{
+	void Foo (bool a, bool b)
+	{
+		if (a $&& b) {
+			return;
+		}
+	}
+}
+", @"
+class Test
+{
+	void Foo (bool a, bool b)
+	{
+		if (a) {
+			if (b) {
+				return;
+			}
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestAndIfElse()
+		{
+			Test <SplitIfAction> (@"
+class Test
+{
+	void Foo (bool a, bool b)
+	{
+		if (a $&& b) {
+			return;
+		} else {
+			Something ();
+		}
+	}
+}
+", @"
+class Test
+{
+	void Foo (bool a, bool b)
+	{
+		if (a) {
+			if (b) {
+				return;
+			} else {
+				Something ();
+			}
+		} else {
+			Something ();
+		}
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestOrSimple()
+		{
+			Test <SplitIfAction> (@"
+class Test
+{
+	void Foo (bool a, bool b)
+	{
+		if (a $|| b) {
+			return;
+		}
+	}
+}
+", @"
+class Test
+{
+	void Foo (bool a, bool b)
+	{
+		if (a) {
+			return;
+		} else if (b) {
+			return;
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestOrIfElse()
+		{
+			Test <SplitIfAction> (@"
+class Test
+{
+	void Foo (bool a, bool b)
+	{
+		if (a $|| b) {
+			return;
+		} else {
+			Something ();
+		}
+	}
+}
+", @"
+class Test
+{
+	void Foo (bool a, bool b)
+	{
+		if (a) {
+			return;
+		} else if (b) {
+			return;
+		} else {
+			Something ();
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestComplexAnd()
+		{
+			Test <SplitIfAction> (@"
+class Test
+{
+	void Foo (bool a, bool b)
+	{
+		if (a && b $&& !a && !b) {
+			return;
+		}
+	}
+}
+", @"
+class Test
+{
+	void Foo (bool a, bool b)
+	{
+		if (a && b) {
+			if (!a && !b) {
+				return;
+			}
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestAndOr()
+		{
+			Test <SplitIfAction> (@"
+class Test
+{
+	void Foo (bool a, bool b)
+	{
+		if (!b $|| a && b) {
+			return;
+		}
+	}
+}
+", @"
+class Test
+{
+	void Foo (bool a, bool b)
+	{
+		if (!b) {
+			return;
+		} else if (a && b) {
+			return;
+		}
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestInvalid()
+		{
+			TestWrongContext<SplitIfAction> (@"
+class Test
+{
+	void Foo (bool a, bool b)
+	{
+		if (!b || a $&& b) {
+			return;
+		}
+	}
+}
+");
+		}
+	}
+
+
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/StaticMethodInvocationToExtensionMethodInvocationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/StaticMethodInvocationToExtensionMethodInvocationTests.cs
deleted file mode 100644
index 57d5212146..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/StaticMethodInvocationToExtensionMethodInvocationTests.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-//
-// StaticMethodInvocationToExtensionMethodInvocationTests.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeActions
-{
-
-	[TestFixture]
-	public class StaticMethodInvocationToExtensionMethodInvocationTests : ContextActionTestBase
-	{
-
-		[Test]
-		public void HandlesBasicCase()
-		{
-			Test<StaticMethodInvocationToExtensionMethodInvocationAction>(@"
-class A { }
-static class B
-{
-	public static bool Ext (this A a, int i);
-}
-class C
-{
-	void F()
-	{
-		A a = new A();
-		B.$Ext (a, 1);
-	}
-}", @"
-class A { }
-static class B
-{
-	public static bool Ext (this A a, int i);
-}
-class C
-{
-	void F()
-	{
-		A a = new A();
-		a.Ext (1);
-	}
-}");
-		}
-
-		[Test]
-		public void HandlesReturnValueUsage()
-		{
-			Test<StaticMethodInvocationToExtensionMethodInvocationAction>(@"
-class A { }
-static class B
-{
-	public static void Ext (this A a, int i);
-}
-class C
-{
-	void F()
-	{
-		A a = new A();
-		if (B.$Ext (a, 1))
-			return;
-	}
-}", @"
-class A { }
-static class B
-{
-	public static void Ext (this A a, int i);
-}
-class C
-{
-	void F()
-	{
-		A a = new A();
-		if (a.Ext (1))
-			return;
-	}
-}");
-		}
-
-		[Test]
-		public void IgnoresIfNullArgument()
-		{
-			TestWrongContext<StaticMethodInvocationToExtensionMethodInvocationAction>(@"
-class A { }
-static class B
-{
-	public static void Ext (this A a);
-}
-class C
-{
-	void F()
-	{
-		B.$Ext (null);
-	}
-}");
-		}
-
-		[Test]
-		public void IgnoresIfNotExtensionMethod()
-		{
-			TestWrongContext<StaticMethodInvocationToExtensionMethodInvocationAction>(@"
-class A { }
-static class B
-{
-	public static void Ext (A a);
-}
-class C
-{
-	void F()
-	{
-		B.$Ext (new A());
-	}
-}");
-		}
-
-		[Test]
-		public void IgnoresIfAlreadyExtensionMethodCallSyntax()
-		{
-			TestWrongContext<StaticMethodInvocationToExtensionMethodInvocationAction>(@"
-class A { }
-static class B
-{
-	public static void Ext (this A a, int i);
-}
-class C
-{
-	void F()
-	{
-		A a = new A();
-		a.$Ext (1);
-	}
-}");
-		}
-
-		[Test]
-		public void IgnoresPropertyInvocation()
-		{
-			TestWrongContext<StaticMethodInvocationToExtensionMethodInvocationAction>(@"
-static class B
-{
-	public static int Ext { get; set; }
-}
-class C
-{
-	void F()
-	{
-		B.$Ext();
-	}
-}");
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/TestRefactoringContext.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/TestRefactoringContext.cs
index 5a0e9f346b..40090574d5 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/TestRefactoringContext.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/TestRefactoringContext.cs
@@ -31,12 +31,11 @@ using ICSharpCode.NRefactory.CSharp.Refactoring;
 using ICSharpCode.NRefactory.CSharp.Resolver;
 using ICSharpCode.NRefactory.CSharp.TypeSystem;
 using ICSharpCode.NRefactory.Editor;
-using ICSharpCode.NRefactory.CSharp.FormattingTests;
-using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using NUnit.Framework;
 using System.Threading;
 using System.Threading.Tasks;
+using ICSharpCode.NRefactory.CSharp;
 
 namespace ICSharpCode.NRefactory.CSharp.CodeActions
 {
@@ -47,8 +46,16 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 			set;
 		}
 
+		internal string defaultNamespace;
+		public override string DefaultNamespace {
+			get {
+				return defaultNamespace;
+			}
+		}
+
 		internal readonly IDocument doc;
 		readonly TextLocation location;
+		List<TestRefactoringContext> projectContexts;
 		
 		public TestRefactoringContext (IDocument document, TextLocation location, CSharpAstResolver resolver) : base(resolver, CancellationToken.None)
 		{
@@ -58,6 +65,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 			this.FormattingOptions = FormattingOptionsFactory.CreateMono ();
 			UseExplict = false;
 			Services.AddService (typeof(NamingConventionService), new TestNameService ());
+			Services.AddService (typeof(CodeGenerationService), new DefaultCodeGenerationService ());
 		}
 		
 		class TestNameService : NamingConventionService
@@ -68,18 +76,20 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 				}
 			}
 		}
-		
+
 		public override bool Supports(Version version)
 		{
-			return true;
+			return this.version == null || this.version.CompareTo(version) >= 0;
 		}
 		
 		public override TextLocation Location {
 			get { return location; }
 		}
+
+		public Version version;
 		
 		public CSharpFormattingOptions FormattingOptions { get; set; }
-		
+
 		public Script StartScript ()
 		{
 			return new TestScript (this);
@@ -102,7 +112,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 				return new Task (() => {});
 			}
 			
-			public override Task InsertWithCursor(string operation, InsertPosition defaultPosition, IEnumerable<AstNode> nodes)
+			public override Task<Script> InsertWithCursor(string operation, InsertPosition defaultPosition, IList<AstNode> nodes)
 			{
 				EntityDeclaration entity = context.GetNode<EntityDeclaration>();
 				if (entity is Accessor) {
@@ -112,17 +122,18 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 				foreach (var node in nodes) {
 					InsertBefore(entity, node);
 				}
-				var tcs = new TaskCompletionSource<object> ();
-				tcs.SetResult (null);
+				var tcs = new TaskCompletionSource<Script> ();
+				tcs.SetResult (this);
 				return tcs.Task;
 			}
 
-			public override Task InsertWithCursor (string operation, ITypeDefinition parentType, IEnumerable<AstNode> nodes)
+			public override Task<Script> InsertWithCursor(string operation, ITypeDefinition parentType, Func<Script, RefactoringContext, IList<AstNode>> nodeCallback)
 			{
 				var unit = context.RootNode;
 				var insertType = unit.GetNodeAt<TypeDeclaration> (parentType.Region.Begin);
 
 				var startOffset = GetCurrentOffset (insertType.LBraceToken.EndLocation);
+				var nodes = nodeCallback(this, context);
 				foreach (var node in nodes.Reverse ()) {
 					var output = OutputNode (1, node, true);
 					if (parentType.Kind == TypeKind.Enum) {
@@ -132,8 +143,8 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 					}
 					output.RegisterTrackedSegments (this, startOffset);
 				}
-				var tcs = new TaskCompletionSource<object> ();
-				tcs.SetResult (null);
+				var tcs = new TaskCompletionSource<Script> ();
+				tcs.SetResult (this);
 				return tcs.Task;
 			}
 
@@ -171,22 +182,31 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 					Rename(symbol as IVariable, name);
 					return;
 				}
+
 				FindReferences refFinder = new FindReferences ();
-				refFinder.FindReferencesInFile (refFinder.GetSearchScopes (symbol), 
-				                               context.UnresolvedFile, 
-				                               context.RootNode as SyntaxTree, 
-				                               context.Compilation, (n, r) => Rename (n, name), 
-				                               context.CancellationToken);
+
+				foreach (var fileContext in context.projectContexts)
+				{
+					using (var newScript = (TestScript) fileContext.StartScript()) {
+						refFinder.FindReferencesInFile(refFinder.GetSearchScopes(symbol), 
+						                               fileContext.UnresolvedFile, 
+						                               fileContext.RootNode as SyntaxTree, 
+						                               fileContext.Compilation,
+						                               (n, r) => newScript.Rename(n, name), 
+						                               context.CancellationToken);
+					}
+				}
 			}
 
 			void Rename (IVariable variable, string name)
 			{
 				FindReferences refFinder = new FindReferences ();
-				refFinder.FindLocalReferences (variable, 
-				                               context.UnresolvedFile, 
-				                               context.RootNode as SyntaxTree, 
-				                               context.Compilation, (n, r) => Rename (n, name), 
-				                               context.CancellationToken);
+
+				refFinder.FindLocalReferences(variable, 
+				                              context.UnresolvedFile, 
+				                              context.RootNode as SyntaxTree, 
+				                              context.Compilation, (n, r) => Rename(n, name), 
+				                              context.CancellationToken);
 			}
 			
 			public override void CreateNewType (AstNode newType, NewTypeContext context)
@@ -194,6 +214,32 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 				var output = OutputNode (0, newType, true);
 				InsertText (0, output.Text);
 			}
+
+			public override void DoGlobalOperationOn(IEnumerable<IEntity> entities, Action<RefactoringContext, Script, IEnumerable<AstNode>> callback, string operationDescripton)
+			{
+				foreach (var projectContext in context.projectContexts) {
+					DoLocalOperationOn(projectContext, entities, callback);
+				}
+			}
+
+			void DoLocalOperationOn(TestRefactoringContext localContext, IEnumerable<IEntity> entities, Action<RefactoringContext, Script, IEnumerable<AstNode>> callback)
+			{
+				List<AstNode> nodes = new List<AstNode>();
+				FindReferences refFinder = new FindReferences();
+				refFinder.FindCallsThroughInterface = true;
+				refFinder.FindReferencesInFile(refFinder.GetSearchScopes(entities),
+				                               localContext.UnresolvedFile,
+				                               localContext.RootNode as SyntaxTree,
+				                               localContext.Compilation,
+				                               (node, result) => {
+					                               nodes.Add(node);
+				                               },
+				                               CancellationToken.None);
+
+				using (var script = localContext.StartScript()) {
+					callback(localContext, script, nodes);
+				}
+			}
 		}
 
 		#region Text stuff
@@ -238,56 +284,95 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 				return doc.Text;
 			}
 		}
-		public static TestRefactoringContext Create (string content, bool expectErrors = false)
+
+		public static TestRefactoringContext Create (string content, bool expectErrors = false, CSharpParser parser = null)
 		{
-			int idx = content.IndexOf ("$");
-			if (idx >= 0)
-				content = content.Substring (0, idx) + content.Substring (idx + 1);
-			int idx1 = content.IndexOf ("<-");
-			int idx2 = content.IndexOf ("->");
-			
-			int selectionStart = 0;
-			int selectionEnd = 0;
-			if (0 <= idx1 && idx1 < idx2) {
-				content = content.Substring (0, idx2) + content.Substring (idx2 + 2);
-				content = content.Substring (0, idx1) + content.Substring (idx1 + 2);
-				selectionStart = idx1;
-				selectionEnd = idx2 - 2;
-				idx = selectionEnd;
-			}
+			return Create(new List<string>() { content }, 0, expectErrors, parser);
+		}
+
+		public static TestRefactoringContext Create (List<string> contents, int mainIndex, bool expectErrors = false, CSharpParser parser = null)
+		{
+			List<int> indexes = new List<int>();
+			List<int> selectionStarts = new List<int>();
+			List<int> selectionEnds = new List<int>();
+			List<IDocument> documents = new List<IDocument>();
+			List<CSharpUnresolvedFile> unresolvedFiles = new List<CSharpUnresolvedFile>();
+			List<SyntaxTree> units = new List<SyntaxTree>();
 
-			var doc = new StringBuilderDocument(content);
-			var parser = new CSharpParser();
-			var unit = parser.Parse(content, "program.cs");
-			if (!expectErrors) {
-				if (parser.HasErrors) {
-					Console.WriteLine (content);
-					Console.WriteLine ("----");
+			for (int i = 0; i < contents.Count; i++) {
+				string content = contents[i];
+				int idx = content.IndexOf("$");
+				if (idx >= 0)
+					content = content.Substring(0, idx) + content.Substring(idx + 1);
+				int idx1 = content.IndexOf("<-");
+				int idx2 = content.IndexOf("->");
+				int selectionStart = 0;
+				int selectionEnd = 0;
+				if (0 <= idx1 && idx1 < idx2) {
+					content = content.Substring(0, idx2) + content.Substring(idx2 + 2);
+					content = content.Substring(0, idx1) + content.Substring(idx1 + 2);
+					selectionStart = idx1;
+					selectionEnd = idx2 - 2;
+					idx = selectionEnd;
 				}
-				foreach (var error in parser.Errors) {
-					Console.WriteLine(error.Message);
+				indexes.Add(idx);
+				selectionStarts.Add(selectionStart);
+				selectionEnds.Add(selectionEnd);
+				var doc = new StringBuilderDocument(content);
+				if (parser == null)
+					parser = new CSharpParser();
+				var unit = parser.Parse(content, "program_" + i + ".cs");
+				if (!expectErrors) {
+					if (parser.HasErrors) {
+						Console.WriteLine(content);
+						Console.WriteLine("----");
+					}
+					foreach (var error in parser.ErrorsAndWarnings) {
+						Console.WriteLine(error.Message);
+					}
+					Assert.IsFalse(parser.HasErrors, "The file " + i + " contains unexpected parsing errors.");
+				}
+				else {
+					Assert.IsTrue(parser.HasErrors, "Expected parsing errors, but the file " + i + "doesn't contain any.");
 				}
-				Assert.IsFalse(parser.HasErrors, "The file contains unexpected parsing errors.");
-			} else {
-				Assert.IsTrue(parser.HasErrors, "Expected parsing errors, but the file doesn't contain any.");
+				unit.Freeze();
+				CSharpUnresolvedFile unresolvedFile = unit.ToTypeSystem();
+				units.Add(unit);
+				documents.Add(doc);
+				unresolvedFiles.Add(unresolvedFile);
 			}
 
-			unit.Freeze ();
-			var unresolvedFile = unit.ToTypeSystem ();
-			
 			IProjectContent pc = new CSharpProjectContent ();
-			pc = pc.AddOrUpdateFiles (unresolvedFile);
+			pc = pc.AddOrUpdateFiles (unresolvedFiles);
 			pc = pc.AddAssemblyReferences (new[] { CecilLoaderTests.Mscorlib, CecilLoaderTests.SystemCore });
-			
+
 			var compilation = pc.CreateCompilation ();
-			var resolver = new CSharpAstResolver (compilation, unit, unresolvedFile);
-			TextLocation location = TextLocation.Empty;
-			if (idx >= 0)
-				location = doc.GetLocation (idx);
-			return new TestRefactoringContext(doc, location, resolver) {
-				selectionStart = selectionStart,
-				selectionEnd = selectionEnd
-			};
+			List<TestRefactoringContext> contexts = new List<TestRefactoringContext>();
+
+			for (int documentIndex = 0; documentIndex < documents.Count; ++documentIndex)
+			{
+				var doc = documents [documentIndex];
+				var resolver = new CSharpAstResolver (compilation, units[documentIndex], unresolvedFiles[documentIndex]);
+				TextLocation location = TextLocation.Empty;
+				if (indexes[documentIndex] >= 0)
+					location = doc.GetLocation (indexes[documentIndex]);
+				var context = new TestRefactoringContext(doc, location, resolver) {
+					selectionStart = selectionStarts[documentIndex],
+					selectionEnd = selectionEnds[documentIndex],
+					projectContexts = contexts,
+					version = parser.CompilerSettings.LanguageVersion,
+					defaultNamespace = "Test"
+				};
+
+				contexts.Add(context);
+			}
+
+			return contexts [mainIndex];
+		}
+
+		public string GetSideDocumentText(int index)
+		{
+			return projectContexts [index].Text;
 		}
 		
 		internal static void Print (AstNode node)
@@ -296,4 +381,6 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 			node.AcceptVisitor (v);
 		}
 	}
+
+
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/UseAsAndNullCheckActionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/UseAsAndNullCheckActionTests.cs
new file mode 100644
index 0000000000..87d1b21ca5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/UseAsAndNullCheckActionTests.cs
@@ -0,0 +1,433 @@
+//
+// UseAsAndNullCheckActionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class UseAsAndNullCheckActionTests : ContextActionTestBase
+	{
+
+		[Test]
+		public void EmptyCase()
+		{
+			Test<UseAsAndNullCheckAction>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		if (foo $is Bar) {
+		}
+		return null;
+	}
+}
+", @"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		var bar = foo as Bar;
+		if (bar != null) {
+		}
+		return null;
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void SimpleCase()
+		{
+			Test<UseAsAndNullCheckAction>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		if (foo $is Bar) {
+			Baz ((Bar)foo);
+			return (Bar)foo;
+		}
+		return null;
+	}
+}
+", @"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		var bar = foo as Bar;
+		if (bar != null) {
+			Baz (bar);
+			return bar;
+		}
+		return null;
+	}
+}
+");
+		}
+
+		
+		[Test]
+		public void NegatedCase()
+		{
+			Test<UseAsAndNullCheckAction>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		if (!(foo $is Bar)) {
+			Baz ((Bar)foo);
+		}
+		return null;
+	}
+}
+", @"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		var bar = foo as Bar;
+		if (bar == null) {
+			Baz ((Bar)foo);
+		}
+		return null;
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void NegatedEmbeddedCase()
+		{
+			Test<UseAsAndNullCheckAction>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		if (true) {
+		} else if (!(foo $is Bar)) {
+			Baz ((Bar)foo);
+		}
+		return null;
+	}
+}
+", @"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		if (true) {
+		} else {
+			var bar = foo as Bar;
+			if (bar == null) {
+				Baz ((Bar)foo);
+			}
+		}
+		return null;
+	}
+}
+");
+		}
+
+		[Test]
+		public void ComplexCase()
+		{
+			Test<UseAsAndNullCheckAction>(@"
+class Bar
+{
+	public IDisposable Baz (object foo)
+	{
+		if (((foo) $is Bar)) {
+			Baz ((Bar)foo);
+			Baz (foo as Bar);
+			Baz (((foo) as Bar));
+			Baz ((Bar)(foo));
+			return (IDisposable)foo;
+		}
+		return null;
+	}
+}
+", @"
+class Bar
+{
+	public IDisposable Baz (object foo)
+	{
+		var bar = foo as Bar;
+		if (bar != null) {
+			Baz (bar);
+			Baz (bar);
+			Baz (bar);
+			Baz (bar);
+			return (IDisposable)foo;
+		}
+		return null;
+	}
+}
+");
+		}
+
+		[Test]
+		public void IfElseCase()
+		{
+			Test<UseAsAndNullCheckAction>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		if (foo $is Bar) {
+			Baz ((Bar)foo);
+			return (Bar)foo;
+		} else {
+			Console.WriteLine (""Hello World "");
+		}
+		return null;
+	}
+}
+", @"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		var bar = foo as Bar;
+		if (bar != null) {
+			Baz (bar);
+			return bar;
+		} else {
+			Console.WriteLine (""Hello World "");
+		}
+		return null;
+	}
+}
+");
+		}
+
+		[Test]
+		public void NestedIf()
+		{
+			Test<UseAsAndNullCheckAction>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		if (foo is string) {
+		} else if (foo $is Bar) {
+			Baz ((Bar)foo);
+			return (Bar)foo;
+		}
+		return null;
+	}
+}
+", @"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		if (foo is string) {
+		} else {
+			var bar = foo as Bar;
+			if (bar != null) {
+				Baz (bar);
+				return bar;
+			}
+		}
+		return null;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestNegatedCaseWithReturn()
+		{
+			Test<UseAsAndNullCheckAction>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		if (!(foo $is Bar))
+			return null;
+		Baz ((Bar)foo);
+		return (Bar)foo;
+	}
+}
+", @"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		var bar = foo as Bar;
+		if (bar == null)
+			return null;
+		Baz (bar);
+		return bar;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestNegatedCaseWithBreak()
+		{
+			Test<UseAsAndNullCheckAction>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		for (int i = 0; i < 10; i++) {
+			if (!(foo $is Bar))
+				break;
+			Baz ((Bar)foo);
+		}
+		return (Bar)foo;
+	}
+}
+", @"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		for (int i = 0; i < 10; i++) {
+			var bar = foo as Bar;
+			if (bar == null)
+				break;
+			Baz (bar);
+		}
+		return (Bar)foo;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestCaseWithContinue()
+		{
+			Test<UseAsAndNullCheckAction>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		for (int i = 0; i < 10; i++) {
+			if (!(foo $is Bar)) {
+				continue;
+			} else {
+				foo = new Bar ();
+			}
+			Baz ((Bar)foo);
+		}
+		return (Bar)foo;
+	}
+}
+", @"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		for (int i = 0; i < 10; i++) {
+			var bar = foo as Bar;
+			if (bar == null) {
+				continue;
+			} else {
+				foo = new Bar ();
+			}
+			Baz (bar);
+		}
+		return (Bar)foo;
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void ConditionalCase()
+		{
+			Test<UseAsAndNullCheckAction>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		if (((Bar)foo).y && foo $is Bar && ((Bar)foo).x) {
+			Baz ((Bar)foo);
+		}
+		return null;
+	}
+}
+", @"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		var bar = foo as Bar;
+		if (((Bar)foo).y && bar != null && bar.x) {
+			Baz (bar);
+		}
+		return null;
+	}
+}
+");
+		}
+
+		[Test]
+		public void InvalidCase()
+		{
+			TestWrongContext<UseAsAndNullCheckAction>(@"
+class Bar
+{
+	public int Baz (object foo)
+	{
+		if (foo $is int) {
+			Baz ((int)foo);
+			return (int)foo;
+		}
+		return 0;
+	}
+}
+");
+		}
+
+		[Test]
+		public void InvalidCase2()
+		{
+			TestWrongContext<UseAsAndNullCheckAction>(@"
+class Bar
+{
+	public int Baz (object foo)
+	{
+		if (!(foo $is int)) {
+		}
+		return 0;
+	}
+}
+");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/UseStringFormatTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/UseStringFormatTests.cs
index 56d4e41b76..af6246b4ed 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/UseStringFormatTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/UseStringFormatTests.cs
@@ -93,6 +93,160 @@ class TestClass
 		int i = 0;
 		string str = string.Format (""test{0}test{0}"", i);
 	}
+}");
+		}
+
+        [Test]
+        public void TestFormatString ()
+        {
+            Test<UseStringFormatAction>(@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int i = 42;
+		string res = $""A test number: "" + i.ToString(""N2"");
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int i = 42;
+		string res = string.Format (""A test number: {0:N2}"", i);
+	}
+}");
+        }
+
+        [Test]
+        public void TestFormatBracesRegular()
+        {
+            Test<UseStringFormatAction>(@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int i = 42;
+		string res = $""A test number: {"" + i + ""}"";
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int i = 42;
+		string res = string.Format (""A test number: {{{0}}}"", i);
+	}
+}");
+        }
+
+        /*
+        [Test]
+        public void TestFormatBracesWithFormat()
+        {
+            Test<UseStringFormatAction>(@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int i = 42;
+		string res = $""A test number: {"" + i.ToString(""N2"") + ""}"";
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int i = 42;
+		string res = string.Format (""A test number: {0}{1:N2}{2}"", '{', i, '}');
+	}
+}");
+        }
+         */
+
+        [Test]
+        public void TestUnnecessaryStringFormat()
+        {
+            Test<UseStringFormatAction>(@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		string res = $""String 1"" + ""String 2"";
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		string res = ""String 1String 2"";
+	}
+}");
+        }
+
+        [Test]
+        public void TestUnnecessaryToString()
+        {
+            Test<UseStringFormatAction>(@"
+class TestClass
+{
+	void TestMethod ()
+	{
+        int i = 42;
+		string res = $""String 1"" + i.ToString();
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+        int i = 42;
+		string res = string.Format (""String 1{0}"", i);
+	}
+}");
+        }
+		
+		[Test]
+		public void EscapeBraces ()
+		{
+			Test<UseStringFormatAction> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int i = 0;
+		string str = $""{"" + i + ""}"";
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int i = 0;
+		string str = string.Format (""{{{0}}}"", i);
+	}
+}");
+		}
+		
+		[Test]
+		public void QuotesMixedVerbatim ()
+		{
+			Test<UseStringFormatAction> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int i = 0;
+		string str = $""\"""" + i + @"""""""";
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int i = 0;
+		string str = string.Format (@""""""{0}"""""", i);
+	}
 }");
 		}
 	}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/BrowsableAttributeTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/BrowsableAttributeTests.cs
index 5631ad5a49..ab2db62fc3 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/BrowsableAttributeTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/BrowsableAttributeTests.cs
@@ -143,6 +143,66 @@ class Test
 			Assert.IsNotNull (provider.Find ("BrowsableTest"), "'BrowsableTest' not found.");
 			Assert.IsNotNull (provider.Find ("NotBrowsableTest"), "'NotBrowsableTest' not found.");
 		}
+
+		[Test]
+		public void TestIgnore ()
+		{
+			int cp;
+			var engine1 = CodeCompletionBugTests.CreateEngine (
+				@"
+using System;
+using System.ComponentModel;
+
+[EditorBrowsable(EditorBrowsableState.Always)]
+public class BrowsableTest {}
+
+[EditorBrowsable(EditorBrowsableState.Never)]
+public class NotBrowsableTest {}
+", out cp);
+
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+				@"class Test
+				{
+				void Test ()
+				{
+					$B$
+				}
+			}", false, e => e.EditorBrowsableBehavior = ICSharpCode.NRefactory.CSharp.Completion.EditorBrowsableBehavior.Ignore, engine1.ctx.CurrentAssembly.UnresolvedAssembly);
+			Assert.IsNotNull (provider, "provider == null");
+			Assert.IsNotNull (provider.Find ("BrowsableTest"), "'BrowsableTest' not found.");
+			Assert.IsNotNull (provider.Find ("NotBrowsableTest"), "'NotBrowsableTest' not found.");
+		}
+
+		[Test]
+		public void TestHideAdvanced ()
+		{
+			int cp;
+			var engine1 = CodeCompletionBugTests.CreateEngine (
+				@"
+using System;
+using System.ComponentModel;
+
+[EditorBrowsable(EditorBrowsableState.Always)]
+public class BrowsableTest {}
+
+[EditorBrowsable(EditorBrowsableState.Advanced)]
+public class NotBrowsableTest {}
+", out cp);
+
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+				@"class Test
+				{
+				void Test ()
+				{
+					$B$
+				}
+			}", false, e => e.EditorBrowsableBehavior = ICSharpCode.NRefactory.CSharp.Completion.EditorBrowsableBehavior.Normal, engine1.ctx.CurrentAssembly.UnresolvedAssembly);
+			Assert.IsNotNull (provider, "provider == null");
+			Assert.IsNotNull (provider.Find ("BrowsableTest"), "'BrowsableTest' not found.");
+			Assert.IsNull (provider.Find ("NotBrowsableTest"), "'NotBrowsableTest' found.");
+		}
+
+
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs
index 031f7dc2da..8211d79cca 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs
@@ -42,7 +42,7 @@ using ICSharpCode.NRefactory.CSharp.Refactoring;
 
 namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 {
-	[TestFixture()]
+	[TestFixture]
 	public class CodeCompletionBugTests : TestBase
 	{
 
@@ -70,12 +70,12 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 		public class TestFactory
 		: ICompletionDataFactory
 		{
-			readonly CSharpResolver state;
+//			readonly CSharpResolver state;
 			readonly TypeSystemAstBuilder builder;
 
 			public TestFactory(CSharpResolver state)
 			{
-				this.state = state;
+//				this.state = state;
 				builder = new TypeSystemAstBuilder(state);
 				builder.ConvertUnboundTypeArguments = true;
 			}
@@ -121,13 +121,13 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 						return overloadedData.Count > 0;
 					}
 				}
-				List<ICompletionData> overloadedData = new List<ICompletionData> ();
-				public System.Collections.Generic.IEnumerable<ICompletionData> OverloadedData {
+				readonly List<ICompletionData> overloadedData = new List<ICompletionData> ();
+				public IEnumerable<ICompletionData> OverloadedData {
 					get {
 						return overloadedData;
 					}
 					set {
-						throw new NotImplementedException ();
+						throw new InvalidOperationException ();
 					}
 				}
 				#endregion
@@ -192,22 +192,17 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 			}
 
 			#region ICompletionDataFactory implementation
-			public ICompletionData CreateEntityCompletionData (ICSharpCode.NRefactory.TypeSystem.IEntity entity)
+			public ICompletionData CreateEntityCompletionData (IEntity entity)
 			{
 				return new EntityCompletionData (entity);
 			}
 
-			public ICompletionData CreateEntityCompletionData (ICSharpCode.NRefactory.TypeSystem.IEntity entity, string text)
+			public ICompletionData CreateEntityCompletionData (IEntity entity, string text)
 			{
 				return new CompletionData (text);
 			}
 
-			public ICompletionData CreateEntityCompletionData (ICSharpCode.NRefactory.TypeSystem.IUnresolvedEntity entity)
-			{
-				return new CompletionData (entity.Name);
-			}
-
-			public ICompletionData CreateTypeCompletionData (ICSharpCode.NRefactory.TypeSystem.IType type, bool fullName, bool isInAttributeContext)
+			public ICompletionData CreateTypeCompletionData (IType type, bool fullName, bool isInAttributeContext, bool addForTypeCreation)
 			{
 				string name = fullName ? builder.ConvertType(type).ToString() : type.Name; 
 				if (isInAttributeContext && name.EndsWith("Attribute", StringComparison.Ordinal) && name.Length > "Attribute".Length) {
@@ -223,7 +218,12 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 			}
 
 
-			public ICompletionData CreateLiteralCompletionData (string title, string description, string insertText)
+			public ICompletionData CreateLiteralCompletionData (string title, string description = null, string insertText = null)
+			{
+				return new CompletionData (title);
+			}
+
+			public ICompletionData CreateXmlDocCompletionData (string title, string description = null, string insertText = null)
 			{
 				return new CompletionData (title);
 			}
@@ -233,22 +233,22 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 				return new CompletionData (ns.Name);
 			}
 
-			public ICompletionData CreateVariableCompletionData (ICSharpCode.NRefactory.TypeSystem.IVariable variable)
+			public ICompletionData CreateVariableCompletionData (IVariable variable)
 			{
 				return new CompletionData (variable.Name);
 			}
 
-			public ICompletionData CreateVariableCompletionData (ICSharpCode.NRefactory.TypeSystem.ITypeParameter parameter)
+			public ICompletionData CreateVariableCompletionData (ITypeParameter parameter)
 			{
 				return new CompletionData (parameter.Name);
 			}
 
-			public ICompletionData CreateEventCreationCompletionData (string varName, ICSharpCode.NRefactory.TypeSystem.IType delegateType, ICSharpCode.NRefactory.TypeSystem.IEvent evt, string parameterDefinition, ICSharpCode.NRefactory.TypeSystem.IUnresolvedMember currentMember, ICSharpCode.NRefactory.TypeSystem.IUnresolvedTypeDefinition currentType)
+			public ICompletionData CreateEventCreationCompletionData (string varName, IType delegateType, IEvent evt, string parameterDefinition, IUnresolvedMember currentMember, IUnresolvedTypeDefinition currentType)
 			{
 				return new CompletionData (varName);
 			}
 
-			public ICompletionData CreateNewOverrideCompletionData (int declarationBegin, ICSharpCode.NRefactory.TypeSystem.IUnresolvedTypeDefinition type, ICSharpCode.NRefactory.TypeSystem.IMember m)
+			public ICompletionData CreateNewOverrideCompletionData (int declarationBegin, IUnresolvedTypeDefinition type, IMember m)
 			{
 				return new OverrideCompletionData (m.Name, declarationBegin);
 			}
@@ -258,16 +258,21 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 				return new OverrideCompletionData (m.Name, declarationBegin);
 			}
 
-			public ICompletionData CreateImportCompletionData(IType type, bool useFullName)
+			public ICompletionData CreateImportCompletionData(IType type, bool useFullName, bool addForTypeCreation)
 			{
 				return new ImportCompletionData (type, useFullName);
 			}
 
-			public System.Collections.Generic.IEnumerable<ICompletionData> CreateCodeTemplateCompletionData ()
+			public IEnumerable<ICompletionData> CreateCodeTemplateCompletionData ()
 			{
 				return Enumerable.Empty<ICompletionData> ();
 			}
-			
+
+			public ICompletionData CreateFormatItemCompletionData(string format, string description, object example)
+			{
+				return new CompletionData (format + " - " + description +":" + example);
+			}
+
 			public IEnumerable<ICompletionData> CreatePreProcessorDefinesCompletionData ()
 			{
 				yield return new CompletionData ("DEBUG");
@@ -301,7 +306,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 			delegate {
 			var loader = new CecilLoader();
 			loader.IncludeInternalMembers = true;
-			return loader.LoadAssemblyFile(typeof(System.Linq.Enumerable).Assembly.Location);
+			return loader.LoadAssemblyFile(typeof(Enumerable).Assembly.Location);
 		});
 
 		public static void CreateCompilation (string parsedText, out IProjectContent pctx, out SyntaxTree syntaxTree, out CSharpUnresolvedFile unresolvedFile, bool expectErrors, params IUnresolvedAssembly[] references)
@@ -332,14 +337,11 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 		{
 			string parsedText;
 			string editorText;
-			cursorPosition = text.IndexOf('$');
+			var selectionStart = text.IndexOf('$');
+			cursorPosition = selectionStart;
 			int endPos = text.IndexOf('$', cursorPosition + 1);
 			if (endPos == -1) {
-				if (cursorPosition < 0) {
-					parsedText = editorText = text;
-				} else {
-					parsedText = editorText = text.Substring(0, cursorPosition) + text.Substring(cursorPosition + 1);
-				}
+				parsedText = editorText = cursorPosition < 0 ? text : text.Substring(0, cursorPosition) + text.Substring(cursorPosition + 1);
 			} else {
 				parsedText = text.Substring(0, cursorPosition) + new string(' ', endPos - cursorPosition) + text.Substring(endPos + 1);
 				editorText = text.Substring(0, cursorPosition) + text.Substring(cursorPosition + 1, endPos - cursorPosition - 1) + text.Substring(endPos + 1);
@@ -353,19 +355,19 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 			CreateCompilation (parsedText, out pctx, out syntaxTree, out unresolvedFile, true, references);
 			var cmp = pctx.CreateCompilation();
 
-			var loc = cursorPosition > 0 ? doc.GetLocation(cursorPosition) : new TextLocation (1, 1);
+			var loc = cursorPosition > 0 ? doc.GetLocation(selectionStart) : new TextLocation (1, 1);
 
 			var rctx = new CSharpTypeResolveContext(cmp.MainAssembly);
 			rctx = rctx.WithUsingScope(unresolvedFile.GetUsingScope(loc).Resolve(cmp));
 
 			var curDef = unresolvedFile.GetInnermostTypeDefinition(loc);
 			if (curDef != null) {
-					var resolvedDef = curDef.Resolve(rctx).GetDefinition();
-					rctx = rctx.WithCurrentTypeDefinition(resolvedDef);
-					var curMember = resolvedDef.Members.FirstOrDefault(m => m.Region.Begin <= loc && loc < m.BodyRegion.End);
-					if (curMember != null) {
-							rctx = rctx.WithCurrentMember(curMember);
-					}
+				var resolvedDef = curDef.Resolve(rctx).GetDefinition();
+				rctx = rctx.WithCurrentTypeDefinition(resolvedDef);
+				var curMember = resolvedDef.Members.FirstOrDefault(m => m.Region.Begin <= loc && loc < m.BodyRegion.End);
+				if (curMember != null) {
+					rctx = rctx.WithCurrentMember(curMember);
+				}
 			}
 			var mb = new DefaultCompletionContextProvider(doc, unresolvedFile);
 			mb.AddSymbol ("TEST");
@@ -373,19 +375,21 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 				mb.AddSymbol(sym);
 			}
 			var engine = new CSharpCompletionEngine(doc, mb, new TestFactory(new CSharpResolver (rctx)), pctx, rctx);
-
+			engine.AutomaticallyAddImports = true;
 			engine.EolMarker = Environment.NewLine;
 			engine.FormattingPolicy = FormattingOptionsFactory.CreateMono();
 			return engine;
 		}
-
-		public static CompletionDataList CreateProvider(string text, bool isCtrlSpace, params IUnresolvedAssembly[] references)
+		
+		public static CompletionDataList CreateProvider(string text, bool isCtrlSpace, Action<CSharpCompletionEngine> engineCallback, params IUnresolvedAssembly[] references)
 		{
 			int cursorPosition;
 			var engine = CreateEngine(text, out cursorPosition, references);
+			if (engineCallback != null)
+				engineCallback(engine);
 			var data = engine.GetCompletionData (cursorPosition, isCtrlSpace);
-			
-			return new CompletionDataList () {
+
+			return new CompletionDataList {
 				Data = data,
 				AutoCompleteEmptyMatch = engine.AutoCompleteEmptyMatch,
 				AutoSelect = engine.AutoSelect,
@@ -393,7 +397,12 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 			};
 		}
 		
-		Tuple<ReadOnlyDocument, CSharpCompletionEngine> GetContent(string text, SyntaxTree syntaxTree)
+		public static CompletionDataList CreateProvider(string text, bool isCtrlSpace, params IUnresolvedAssembly[] references)
+		{
+			return CreateProvider(text, isCtrlSpace, null, references);
+		}
+
+		static Tuple<ReadOnlyDocument, CSharpCompletionEngine> GetContent(string text, SyntaxTree syntaxTree)
 		{
 			var doc = new ReadOnlyDocument(text);
 			IProjectContent pctx = new CSharpProjectContent();
@@ -410,13 +419,13 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 			return Tuple.Create (doc, engine);
 		}
 		
-		static CompletionDataList CreateProvider (string text, SyntaxTree syntaxTree, CSharpCompletionEngine engine, ReadOnlyDocument doc, TextLocation loc)
+		static CompletionDataList CreateProvider (CSharpCompletionEngine engine, IDocument doc, TextLocation loc)
 		{
 			var cursorPosition = doc.GetOffset (loc);
 			
 			var data = engine.GetCompletionData (cursorPosition, true);
 			
-			return new CompletionDataList () {
+			return new CompletionDataList {
 				Data = data,
 				AutoCompleteEmptyMatch = engine.AutoCompleteEmptyMatch,
 				AutoSelect = engine.AutoSelect,
@@ -444,19 +453,18 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 			Assert.IsNotNull (provider.Find ("ReferenceEquals"), "Method 'System.Object.ReferenceEquals' not found.");
 		}
 		
-		class TestLocVisitor
-		: ICSharpCode.NRefactory.CSharp.DepthFirstAstVisitor
+		class TestLocVisitor : DepthFirstAstVisitor
 		{
-			public List<Tuple<TextLocation, string>> output = new List<Tuple<TextLocation, string>> ();
+			public List<Tuple<TextLocation, string>> Output = new List<Tuple<TextLocation, string>> ();
 			
 			public override void VisitMemberReferenceExpression (MemberReferenceExpression memberReferenceExpression)
 			{
-				output.Add (Tuple.Create (memberReferenceExpression.MemberNameToken.StartLocation, memberReferenceExpression.MemberName));
+				Output.Add (Tuple.Create (memberReferenceExpression.MemberNameToken.StartLocation, memberReferenceExpression.MemberName));
 			}
 			
 			public override void VisitIdentifierExpression (IdentifierExpression identifierExpression)
 			{
-				output.Add (Tuple.Create (identifierExpression.StartLocation, identifierExpression.Identifier));
+				Output.Add (Tuple.Create (identifierExpression.StartLocation, identifierExpression.Identifier));
 			}
 		}
 		
@@ -481,8 +489,8 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 					
 					var visitor = new TestLocVisitor ();
 					unit.AcceptVisitor (visitor);
-					foreach (var loc in visitor.output) {
-						var provider = CreateProvider (text, unit, cnt.Item2, cnt.Item1, loc.Item1);
+					foreach (var loc in visitor.Output) {
+						var provider = CreateProvider (cnt.Item2, cnt.Item1, loc.Item1);
 						if (provider.Find (loc.Item2) != null) {
 							found++;
 						} else {
@@ -602,7 +610,7 @@ public class Test {
 }
 
 ");
-			Assert.IsTrue (provider == null || provider.Count == 0);
+			Assert.IsFalse(provider.AutoSelect);
 		}
 		
 		[Test]
@@ -619,6 +627,7 @@ public class Test {
 
 ");
 			Assert.IsNotNull (provider);
+			Assert.IsTrue(provider.AutoSelect);
 		}
 
 		/// <summary>
@@ -1678,9 +1687,7 @@ public class Outer
         }
     }
 }
-", provider => {
-				Assert.IsNotNull (provider.Find ("value"), "field 'value' not found.");
-			});
+", provider => Assert.IsNotNull(provider.Find("value"), "field 'value' not found."));
 		}
 		
 		
@@ -1794,9 +1801,7 @@ class A
 		$this.$
 	}
 }
-", provider => {
-				Assert.IsNull (provider.Find ("Finalize"), "'Finalize' found.");
-			});
+", provider => Assert.IsNull(provider.Find("Finalize"), "'Finalize' found."));
 		}
 		
 		[Test]
@@ -1897,9 +1902,7 @@ public class MyClass
         C myclass = new C ();
         $myclass.$
     }
-}", provider => {
-				Assert.AreEqual(1, provider.Data.Count(c => c.DisplayText == "MouseClick"));
-			});
+}", provider => Assert.AreEqual(1, provider.Data.Count(c => c.DisplayText == "MouseClick")));
 		}
 		
 		/// <summary>
@@ -1969,9 +1972,7 @@ namespace Foobar
     }
 }
 
-", provider => {
-				Assert.IsNotNull (provider.Find ("Foo"), "'Foo' not found.");
-			});
+", provider => Assert.IsNotNull(provider.Find("Foo"), "'Foo' not found."));
 		}
 		
 		/// <summary>
@@ -2185,9 +2186,7 @@ class C
 			$d$
 		}
 	}	
-}", provider => {
-				Assert.IsNotNull (provider.Find ("data"), "'data' not found.");
-			});
+}", provider => Assert.IsNotNull(provider.Find("data"), "'data' not found."));
 		}
 		
 		/// <summary>
@@ -2215,9 +2214,7 @@ namespace Foo
 		$S$
 	}
 }
-", provider => {
-				Assert.IsNotNull (provider.Find ("SomeClass"), "'SomeClass' not found.");
-			});
+", provider => Assert.IsNotNull(provider.Find("SomeClass"), "'SomeClass' not found."));
 		}
 		
 		
@@ -2320,7 +2317,7 @@ public class SomeControl : Control
 		/// Bug 470954 - using System.Windows.Forms is not honored
 		/// </summary>
 		[Test]
-		public void TestBug470954_bis ()
+		public void TestBug470954_Bis ()
 		{
 			CompletionDataList provider = CreateProvider (
 @"
@@ -3448,7 +3445,44 @@ namespace B
 			Assert.IsNull (provider.Find ("Foo"), "enum 'Foo' found, but shouldn't.");
 			Assert.IsNotNull (provider.Find ("A.Foo"), "enum 'A.Foo' not found.");
 		}
+
+		[Test]
+		public void TestBug614045_IndexerCase ()
+		{
+			CompletionDataList provider = CreateProvider (
+				@"
+namespace A
+{
+	enum Foo
+	{
+		One,
+		Two,
+		Three
+	}
+}
+
+namespace B
+{
+	using A;
+	
+	public class Baz
+	{
+		public string Foo;
 		
+		int this[Foo b] {
+			get {}
+			set {
+				$switch (b) {
+				case $
+			}
+		}
+	}
+}
+");
+			Assert.IsNotNull (provider, "provider not found.");
+			Assert.IsNull (provider.Find ("Foo"), "enum 'Foo' found, but shouldn't.");
+			Assert.IsNotNull (provider.Find ("A.Foo"), "enum 'A.Foo' not found.");
+		}
 		/// <summary>
 		/// Bug 615992 - Intellisense broken when calling generic method.
 		/// </summary>
@@ -3766,7 +3800,8 @@ public class Test<T>
 			Assert.IsNotNull (provider, "provider not found.");
 			Assert.IsNull (provider.Find ("Foo"), "method 'Foo' found.");
 		}
-		
+
+		[Test]
 		public void TestBug669285B ()
 		{
 			var provider = CreateCtrlSpaceProvider (
@@ -4080,7 +4115,7 @@ namespace Test
 		}
 		
 		/// <summary>
-		/// Bug 678340 - Cannot infer types from Dictionary<K,V>.Values
+		/// Bug 678340 - Cannot infer types from Dictionary&lt;K,V&gt;.Values;
 		/// </summary>
 		[Test]
 		public void TestBug678340 ()
@@ -4104,7 +4139,7 @@ public class Test
 			Assert.IsNotNull (provider.Find ("SomeMethod"), "method 'SomeMethod' not found.");
 		}
 		/// <summary>
-		/// Bug 678340 - Cannot infer types from Dictionary<K,V>.Values
+		/// Bug 678340 - Cannot infer types from Dictionary&lt;K,V&gt;.Values
 		/// </summary>
 		[Test]
 		public void TestBug678340_Case2 ()
@@ -4248,10 +4283,6 @@ namespace N1
 			Assert.IsNotNull (provider.Find ("Foo"), "method 'Foo' not found.");
 		}
 		
-		/// <summary>
-		/// Bug 690606 - Incomplete subclasses listing in code completion
-
-
 		/// <summary>
 		/// Bug 690606 - Incomplete subclasses listing in code completion
 		/// </summary>
@@ -4291,7 +4322,7 @@ public class Test
 @"
 public class Test
 {
-	$public $
+	$public p$
 }
 
 ");
@@ -4423,9 +4454,7 @@ namespace ConsoleProject
 		}
 	}
 }
-", provider => {
-				Assert.IsNotNull (provider.Find ("ArgsNum"), "property 'ArgsNum' not found.");
-			});
+", provider => Assert.IsNotNull(provider.Find("ArgsNum"), "property 'ArgsNum' not found."));
 		}
 		
 		[Test]
@@ -4480,9 +4509,7 @@ public class TestMe
 	public Program ($System.$)
 	{
 	}
-}", provider => {
-				Assert.IsNotNull (provider.Find ("Object"), "'Object' not found.");
-			});
+}", provider => Assert.IsNotNull(provider.Find("Object"), "'Object' not found."));
 		}
 		
 		[Test]
@@ -4801,49 +4828,37 @@ class MainClass
 		[Test]
 		public void Test3655Case2 ()
 		{
-			CombinedProviderTest (@"$[assembly:System.R$", provider => {
-				Assert.IsNotNull (provider.Find ("Runtime"), "'Runtime' not found.");
-			});
+			CombinedProviderTest (@"$[assembly:System.R$", provider => Assert.IsNotNull(provider.Find("Runtime"), "'Runtime' not found."));
 		}
 		
 		[Test]
 		public void Test3655Case2Part2 ()
 		{
-			CombinedProviderTest (@"$[assembly:System.$", provider => {
-				Assert.IsNotNull (provider.Find ("Runtime"), "'Runtime' not found.");
-			});
+			CombinedProviderTest (@"$[assembly:System.$", provider => Assert.IsNotNull(provider.Find("Runtime"), "'Runtime' not found."));
 		}
 		
 		[Test]
 		public void Test3655Case3 ()
 		{
-			CombinedProviderTest (@"$[assembly:System.Runtime.C$", provider => {
-				Assert.IsNotNull (provider.Find ("CompilerServices"), "'CompilerServices' not found.");
-			});
+			CombinedProviderTest (@"$[assembly:System.Runtime.C$", provider => Assert.IsNotNull(provider.Find("CompilerServices"), "'CompilerServices' not found."));
 		}
 		
 		[Test]
 		public void Test3655Case3Part2 ()
 		{
-			CombinedProviderTest (@"$[assembly:System.Runtime.$", provider => {
-				Assert.IsNotNull (provider.Find ("CompilerServices"), "'CompilerServices' not found.");
-			});
+			CombinedProviderTest (@"$[assembly:System.Runtime.$", provider => Assert.IsNotNull(provider.Find("CompilerServices"), "'CompilerServices' not found."));
 		}
 		
 		[Test]
 		public void Test3655Case4 ()
 		{
-			CombinedProviderTest (@"$[assembly:System.Runtime.CompilerServices.I$", provider => {
-				Assert.IsNotNull (provider.Find ("InternalsVisibleTo"), "'InternalsVisibleTo' not found.");
-			});
+			CombinedProviderTest (@"$[assembly:System.Runtime.CompilerServices.I$", provider => Assert.IsNotNull(provider.Find("InternalsVisibleTo"), "'InternalsVisibleTo' not found."));
 		}
 		
 		[Test]
 		public void Test3655Case4Part2 ()
 		{
-			CombinedProviderTest (@"$[assembly:System.Runtime.CompilerServices.$", provider => {
-				Assert.IsNotNull (provider.Find ("InternalsVisibleTo"), "'InternalsVisibleTo' not found.");
-			});
+			CombinedProviderTest (@"$[assembly:System.Runtime.CompilerServices.$", provider => Assert.IsNotNull(provider.Find("InternalsVisibleTo"), "'InternalsVisibleTo' not found."));
 		}
 		
 		[Test]
@@ -5142,9 +5157,7 @@ public class Test
 {
 	$static extern IntPtr somefunction([MarshalAs(UnmanagedType.LPTStr)] string fileName, [MarshalAs(UnmanagedType.$
 }
-", provider => {
-				Assert.IsNotNull(provider.Find("LPStr"), "'LPStr' not found.");
-			});
+", provider => Assert.IsNotNull(provider.Find("LPStr"), "'LPStr' not found."));
 		}
 
 
@@ -5214,9 +5227,7 @@ public class Test
 		$string bar = new T$
 	}
 }
-", provider => {
-				Assert.IsNotNull(provider.Find("Test"), "'Test' not found.");
-			});
+", provider => Assert.IsNotNull(provider.Find("Test"), "'Test' not found."));
 		}
 
 		/// <summary>
@@ -5230,9 +5241,7 @@ public class Test
 {
 	$public new s$
 }
-", provider => {
-				Assert.IsNotNull(provider.Find("static"), "'static' not found.");
-			});
+", provider => Assert.IsNotNull(provider.Find("static"), "'static' not found."));
 		}
 		/// <summary>
 		/// Bug 4604 - [Resolver] Attribute Properties are not offered valid autocomplete choices
@@ -5275,9 +5284,7 @@ enum TestEnum
    EnumMember
 }
 
-", provider => {
-				Assert.IsNotNull(provider.Find("Obsolete"), "'Obsolete' not found.");
-			});
+", provider => Assert.IsNotNull(provider.Find("Obsolete"), "'Obsolete' not found."));
 		}
 
 		[Test]
@@ -5340,9 +5347,7 @@ public class TestFoo
 	}
 }
 
-", provider => {
-				Assert.IsNotNull(provider.Find("String"), "'String'not found.");
-			});
+", provider => Assert.IsNotNull(provider.Find("String"), "'String'not found."));
 		}
 
 		/// <summary>
@@ -5416,9 +5421,7 @@ static class Ext
 {
 	$public static void Foo(t$
 }
-", provider => {
-				Assert.IsNotNull(provider.Find("this"), "'this' not found.");
-			});
+", provider => Assert.IsNotNull(provider.Find("this"), "'this' not found."));
 
 			CombinedProviderTest(
 @"using System;
@@ -5427,9 +5430,7 @@ static class Ext
 {
 	$public static void Foo(int foo, t$
 }
-", provider => {
-				Assert.IsNull(provider.Find("this"), "'this' found.");
-			});
+", provider => Assert.IsNull(provider.Find("this"), "'this' found."));
 		}
 		
 		/// <summary>
@@ -5454,9 +5455,7 @@ $mc->$
 }
 }
 }
-", provider => {
-				Assert.IsNotNull(provider.Find("i"), "'i' not found.");
-			});
+", provider => Assert.IsNotNull(provider.Find("i"), "'i' not found."));
 		}
 		
 		/// <summary>
@@ -5476,9 +5475,7 @@ public class FooBar
 	}
 }
 
-", provider => {
-				Assert.IsNotNull(provider.Find("Foo"));
-			});
+", provider => Assert.IsNotNull(provider.Find("Foo")));
 		}
 
 
@@ -5496,9 +5493,7 @@ public class FooBar
 	}
 }
 
-", provider => {
-				Assert.IsNotNull(provider.Find("Foo"));
-			});
+", provider => Assert.IsNotNull(provider.Find("Foo")));
 		}
 
 		[Test]
@@ -5516,9 +5511,7 @@ public class FooBar
 	}
 }
 
-", provider => {
-				Assert.IsNotNull(provider.Find("WriteLine"));
-			});
+", provider => Assert.IsNotNull(provider.Find("WriteLine")));
 		}
 
 		[Test]
@@ -5536,9 +5529,7 @@ public class FooBar
 	}
 }
 
-", provider => {
-				Assert.IsNull(provider.Find("WriteLine"));
-			});
+", provider => Assert.IsNull(provider.Find("WriteLine")));
 		}
 
 		/// <summary>
@@ -5570,9 +5561,7 @@ public class FooBar
 			}
 		}
 
-", provider => {
-				Assert.IsNotNull(provider.Find("System"));
-			});
+", provider => Assert.IsNotNull(provider.Find("System")));
 		}
 
 		[Test]
@@ -5658,9 +5647,7 @@ namespace bug
     }
 }
 
-", provider => {
-				Assert.IsNotNull(provider.Find("List<Outer.Nested>"));
-			});
+", provider => Assert.IsNotNull(provider.Find("List<Outer.Nested>")));
 		}
 
 
@@ -5741,7 +5728,7 @@ namespace bug
 				Assert.IsTrue (provider.Count > 0);
 				// it's likely to be mono specific.
 				foreach (var data in provider.Data) {
-					Assert.IsFalse (data.DisplayText.StartsWith ("<"), "Data was:"+ data.DisplayText);
+					Assert.IsFalse(data.DisplayText.StartsWith("<", StringComparison.Ordinal), "Data was:" + data.DisplayText);
 				}
 			});
 		}
@@ -5785,9 +5772,7 @@ public class Bugged
         Test ($S$);
     }
 }
-", provider => {
-				Assert.AreEqual ("Foo.Selector", provider.DefaultCompletionString);
-			});
+", provider => Assert.AreEqual("Foo.Selector", provider.DefaultCompletionString));
 		}
 
 
@@ -5897,9 +5882,7 @@ class MainClass
 }
 
 
-", provider => {
-				Assert.IsNull(provider.Find("Foo"));
-			});
+", provider => Assert.IsNull(provider.Find("Foo")));
 		}
 
 		/// <summary>
@@ -5923,9 +5906,7 @@ class MainClass
 }
 
 
-", provider => {
-				Assert.IsFalse(provider.AutoSelect);
-			});
+", provider => Assert.IsFalse(provider.AutoSelect));
 		}
 
 		/// <summary>
@@ -5948,9 +5929,7 @@ public class Testing
     } 
 }
 
-", provider => {
-				Assert.IsTrue(provider == null || provider.Count == 0);
-			});
+", provider => Assert.IsTrue(provider == null || provider.Count == 0));
 		}
 
 		/// <summary>
@@ -5970,9 +5949,7 @@ public class Testing
 	} 
 }
 
-", provider => {
-				Assert.IsNotNull(provider.Find("new()"));
-			});
+", provider => Assert.IsNotNull(provider.Find("new()")));
 		}
 
 		/// <summary>
@@ -6002,9 +5979,7 @@ public class Testing
 				}
 			}
 		}
-", provider => {
-				Assert.IsNotNull(provider.Find("requireLogin:"));
-			});
+", provider => Assert.IsNotNull(provider.Find("requireLogin:")));
 		}
 
 		/// <summary>
@@ -6032,9 +6007,7 @@ class Test
 		$switch (c$
 	}
 }
-", provider => {
-				Assert.IsNotNull(provider.Find("color"));
-			});
+", provider => Assert.IsNotNull(provider.Find("color")));
 		}
 
 		[Test]
@@ -6052,9 +6025,7 @@ class Test
 		}
 	}
 }
-", provider => {
-				Assert.IsNotNull(provider.Find("ConsoleColor"));
-			});
+", provider => Assert.IsNotNull(provider.Find("ConsoleColor")));
 		}
 
 		/// <summary>
@@ -6096,9 +6067,252 @@ public class Test
 				List<string> list;
 				$list.Find(l => l.Name == l.Name ? l$
 			}
-		}", provider => {
-				Assert.IsNotNull(provider.Find("l"));
+		}", provider => Assert.IsNotNull(provider.Find("l")));
+		}
+
+		[Test]
+		public void TestLexerBug ()
+		{
+			CompletionDataList provider = CreateProvider (
+				@"
+public class TestMe : System.Object
+{
+/*
+
+	//*/
+	$override $
+}");
+			Assert.IsNotNull (provider, "provider not found.");
+			Assert.IsNotNull (provider.Find ("Equals"), "method 'Equals' not found.");
+		}
+
+		/// <summary>
+		/// Bug 13366 - Task result cannot be resolved in incomplete task continution
+		/// </summary>
+		[Test]
+		public void TestBug13366 ()
+		{
+			var provider = CreateProvider (
+				@"using System;
+using System.Threading.Tasks;
+
+public class TestMe
+{
+	
+	void Test ()
+	{
+		$Task.Factory.StartNew (() => 5).ContinueWith (t => t.$
+	}
+}");
+			Assert.IsNotNull (provider, "provider not found.");
+			Assert.IsNotNull (provider.Find ("Result"), "property 'Result' not found.");
+		}
+
+		[Ignore("Fixme")]
+		[Test]
+		public void TestBug13366Case2 ()
+		{
+			var provider = CreateProvider (
+				@"using System;
+
+class A { public void AMethod () {} }
+class B { public void BMethod () {} }
+
+public class TestMe
+{
+	void Foo(Action<A> act) {}
+	void Foo(Action<B> act) {}
+	
+	void Test ()
+	{
+		$Foo(a => a.$
+	}
+}");
+			Assert.IsNotNull (provider, "provider not found.");
+			Assert.IsNotNull (provider.Find ("AMethod"), "method 'AMethod' not found.");
+			Assert.IsNotNull (provider.Find ("BMethod"), "method 'BMethod' not found.");
+		}
+
+		/// <summary>
+		/// Bug 13746 - Not useful completion for async delegates 
+		/// </summary>
+		[Test]
+		public void TestBug13746 ()
+		{
+			var provider = CreateProvider (
+				@"using System;
+using System.Threading.Tasks;
+
+class Test
+{
+    public static void Main()
+    {
+        var c = new HttpClient ();
+        $Task.Run (a$
+        return;
+    }
+}
+");
+			Assert.IsNotNull (provider, "provider not found.");
+			foreach (var p in provider.Data)
+				Console.WriteLine(p.DisplayText);
+			Assert.AreEqual(1, provider.Data.Count(cd => cd.DisplayText == "async delegate"));
+			Assert.AreEqual(1, provider.Data.Count(cd => cd.DisplayText == "delegate()"));
+			Assert.AreEqual(1, provider.Data.Count(cd => cd.DisplayText == "async delegate()"));
+		}
+		[Ignore]
+		[Test]
+		public void TestBasicIntersectionProblem ()
+		{
+			CombinedProviderTest(@"using System;
+
+class A { public int AInt { get { return 1; } } }
+class B { public int BInt { get { return 0; } } }
+
+class Testm
+{
+	public void Foo (Action<A> a) {}
+	public void Foo (Action<B> b) {}
+
+	public void Bar ()
+	{
+		$Foo(x => x.$
+	}
+}", provider => {
+				Assert.IsNotNull (provider.Find ("AInt"), "property 'AInt' not found.");
+				Assert.IsNotNull (provider.Find ("BInt"), "property 'BInt' not found.");
 			});
 		}
+
+		[Ignore]
+		[Test]
+		public void TestComplexIntersectionTypeProblem ()
+		{
+			CombinedProviderTest(@"using System.Threading.Tasks;
+using System.Linq;
+
+class Foo
+{
+	public void Bar ()
+	{
+		$Task.Factory.ContinueWhenAll (new[] { Task.Factory.StartNew (() => 5) }, t => t.Select (r => r.$
+	}
+}", provider => Assert.IsNotNull(provider.Find("Result"), "property 'Result' not found."));
+		}
+
+		/// <summary>
+		/// Bug 8795 - Completion shows namespace entry which in not usable
+		/// </summary>
+		[Test]
+		public void TestBug8795 ()
+		{
+			CombinedProviderTest(@"namespace A.B
+{
+    public class Foo
+    {
+    }
+}
+namespace Foo
+{
+    using A.B;
+
+    class MainClass
+    {
+        public static void Main ()
+        {
+            $F$
+        }
+    }
+}
+", provider => provider.Data.Single(d => d.DisplayText == "Foo"));
+		}
+	
+		/// <summary>
+		/// Bug 10228 - [AST] Incomplete linq statements missing 
+		/// </summary>
+		[Test]
+		public void TestBug10228 ()
+		{
+			CombinedProviderTest(@"using System;
+using System.Linq;
+using System.Collections.Generic;
+
+class Program
+{
+	public void Hello()
+	{
+		var somelist = new List<object>();
+		$var query = from item in somelist group i$
+	}
+}
+
+", provider => Assert.IsNotNull(provider.Find("item"), "'item' not found."));
+		}
+
+
+		/// <summary>
+		/// Bug 15183 - New completion in params suggests array type 
+		/// </summary>
+		[Test]
+		public void TestBug15183 ()
+		{
+			CombinedProviderTest(@"class Foo
+{
+	static void Bar (params Foo[] args)
+	{
+		$Bar (new $
+	}
+}
+", provider => Assert.IsNotNull(provider.Find("Foo"), "'Foo' not found."));
+		}
+
+		/// <summary>
+		/// Bug 15387 - Broken completion for class inheritance at namespace level 
+		/// </summary>
+		[Test]
+		public void TestBug15387 ()
+		{
+			CombinedProviderTest(@"using System;
+$class Foo : $
+", provider => Assert.IsNotNull(provider.Find("IDisposable"), "'IDisposable' not found."));
+		}
+
+		/// <summary>
+		/// Bug 15550 - Inheritance completion 
+		/// </summary>
+		[Test]
+		public void TestBug15550 ()
+		{
+			CombinedProviderTest(@"using System;
+$class Foo : $
+", provider => Assert.IsNull(provider.Find("Console"), "'Console' found (static class)."));
+		}
+
+		[Test]
+		public void TestBug15550Case2 ()
+		{
+
+			CombinedProviderTest(@"using System;
+$class Foo : IDisposable, F$
+", provider => Assert.IsNull(provider.Find("Activator"), "'Activator' found (sealed class)."));
+		}
+
+
+		[Test]
+		public void TestGotoCompletion ()
+		{
+			var provider = CreateCtrlSpaceProvider(@"using System;
+
+class Program
+{
+	public void Hello()
+	{
+		$goto i$
+	}
+}
+
+");
+			Assert.IsTrue(provider == null || provider.Count == 0); 
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionOperatorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionOperatorTests.cs
new file mode 100644
index 0000000000..d24cea6f5b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionOperatorTests.cs
@@ -0,0 +1,674 @@
+//
+// OperatorTests.cs
+//
+// Author:
+//   Mike Krüger <mkrueger@novell.com>
+//
+// Copyright (C) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
+{
+	[TestFixture()]
+	public class CodeCompletionOperatorTests : TestBase
+	{
+
+		[Test()]
+		public void TestAddOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator+(A left, A right)
+	{
+		return new B ();
+	}
+}
+
+class B
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		A b = new A ();
+		$(a + b).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+
+		[Test()]
+		public void TestSubtractOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator-(A left, A right)
+	{
+		return new B ();
+	}
+}
+
+class B
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		A b = new A ();
+		$(a - b).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+		
+		[Test()]
+		public void TestMultiplyOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator*(A left, A right)
+	{
+		return new B ();
+	}
+}
+
+class B
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		A b = new A ();
+		$(a * b).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+		
+		[Test()]
+		public void TestDivideOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator/(A left, A right)
+	{
+		return new B ();
+	}
+}
+
+class B
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		A b = new A ();
+		$(a / b).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+
+		[Test()]
+		public void TestModulusOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator%(A left, A right)
+	{
+		return new B ();
+	}
+}
+
+class B
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		A b = new A ();
+		$(a % b).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+		
+		[Test()]
+		public void TestBitwiseAndOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator&(A left, A right)
+	{
+		return new B ();
+	}
+}
+
+class B
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		A b = new A ();
+		$(a & b).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+		
+		[Test()]
+		public void TestBitwiseOrOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator|(A left, A right)
+	{
+		return new B ();
+	}
+}
+
+class B
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		A b = new A ();
+		$(a | b).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+		
+		[Test()]
+		public void TestExclusiveOrOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator^(A left, A right)
+	{
+		return new B ();
+	}
+}
+
+class B
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		A b = new A ();
+		$(a ^ b).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+		
+		[Test()]
+		public void TestShiftLeftOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator<<(A left, A right)
+	{
+		return new B ();
+	}
+}
+
+class B
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		A b = new A ();
+		$(a << b).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+		
+		[Test()]
+		public void TestShiftRightOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator>>(A left, A right)
+	{
+		return new B ();
+	}
+}
+
+class B
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		A b = new A ();
+		$(a >> b).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+		
+		[Test()]
+		public void TestGreaterThanOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator>(A left, A right)
+	{
+		return new B ();
+	}
+}
+
+class B
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		A b = new A ();
+		$(a > b).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+		
+		[Test()]
+		public void TestGreaterThanOrEqualOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator>=(A left, A right)
+	{
+		return new B ();
+	}
+}
+
+class B
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		A b = new A ();
+		$(a >= b).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+		
+		[Test()]
+		public void TestEqualityOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator==(A left, A right)
+	{
+		return new B ();
+	}
+}
+
+class B
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		A b = new A ();
+		$(a == b).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+		
+		[Test()]
+		public void TestInEqualityOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator!=(A left, A right)
+	{
+		return new B ();
+	}
+}
+
+class B
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		A b = new A ();
+		$(a != b).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+		
+		[Test()]
+		public void TestLessThanOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator<(A left, A right)
+	{
+		return new B ();
+	}
+}
+
+class B
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		A b = new A ();
+		$(a < b).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+		
+		[Test()]
+		public void TestLessThanOrEqualOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator<=(A left, A right)
+	{
+		return new B ();
+	}
+}
+
+class B
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		A b = new A ();
+		$(a <= b).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+		
+		[Test()]
+		public void TestUnaryPlusOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator+(A left)
+	{
+		return new B ();
+	}
+}
+
+class B : A
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		$(+a).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+		
+		[Test()]
+		public void TestUnaryMinusOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator-(A left)
+	{
+		return new B ();
+	}
+}
+
+class B : A
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		$(-a).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+		
+		[Test()]
+		public void TestUnaryNotOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator!(A left)
+	{
+		return new B ();
+	}
+}
+
+class B : A
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		$(!a).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+		
+		[Test()]
+		public void TestUnaryBitwiseNotOperator ()
+		{
+			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
+@"class A
+{
+	public static B operator~(A left)
+	{
+		return new B ();
+	}
+}
+
+class B : A
+{
+	public void BMethod ()
+	{
+	}
+}
+
+class TestClass
+{
+	public void Test ()
+	{
+		A a = new A ();
+		$(~a).$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.IsNotNull (provider.Find ("BMethod"));
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeComplteionOperatorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeComplteionOperatorTests.cs
deleted file mode 100644
index 11f0718975..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeComplteionOperatorTests.cs
+++ /dev/null
@@ -1,673 +0,0 @@
-//
-// OperatorTests.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (C) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
-{
-	[TestFixture()]
-	public class CodeCompletionOperatorTests : TestBase
-	{
-		[Test()]
-		public void TestAddOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator+(A left, A right)
-	{
-		return new B ();
-	}
-}
-
-class B
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		A b = new A ();
-		$(a + b).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-
-		[Test()]
-		public void TestSubtractOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator-(A left, A right)
-	{
-		return new B ();
-	}
-}
-
-class B
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		A b = new A ();
-		$(a - b).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-		
-		[Test()]
-		public void TestMultiplyOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator*(A left, A right)
-	{
-		return new B ();
-	}
-}
-
-class B
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		A b = new A ();
-		$(a * b).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-		
-		[Test()]
-		public void TestDivideOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator/(A left, A right)
-	{
-		return new B ();
-	}
-}
-
-class B
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		A b = new A ();
-		$(a / b).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-
-		[Test()]
-		public void TestModulusOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator%(A left, A right)
-	{
-		return new B ();
-	}
-}
-
-class B
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		A b = new A ();
-		$(a % b).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-		
-		[Test()]
-		public void TestBitwiseAndOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator&(A left, A right)
-	{
-		return new B ();
-	}
-}
-
-class B
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		A b = new A ();
-		$(a & b).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-		
-		[Test()]
-		public void TestBitwiseOrOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator|(A left, A right)
-	{
-		return new B ();
-	}
-}
-
-class B
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		A b = new A ();
-		$(a | b).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-		
-		[Test()]
-		public void TestExclusiveOrOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator^(A left, A right)
-	{
-		return new B ();
-	}
-}
-
-class B
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		A b = new A ();
-		$(a ^ b).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-		
-		[Test()]
-		public void TestShiftLeftOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator<<(A left, A right)
-	{
-		return new B ();
-	}
-}
-
-class B
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		A b = new A ();
-		$(a << b).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-		
-		[Test()]
-		public void TestShiftRightOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator>>(A left, A right)
-	{
-		return new B ();
-	}
-}
-
-class B
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		A b = new A ();
-		$(a >> b).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-		
-		[Test()]
-		public void TestGreaterThanOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator>(A left, A right)
-	{
-		return new B ();
-	}
-}
-
-class B
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		A b = new A ();
-		$(a > b).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-		
-		[Test()]
-		public void TestGreaterThanOrEqualOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator>=(A left, A right)
-	{
-		return new B ();
-	}
-}
-
-class B
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		A b = new A ();
-		$(a >= b).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-		
-		[Test()]
-		public void TestEqualityOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator==(A left, A right)
-	{
-		return new B ();
-	}
-}
-
-class B
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		A b = new A ();
-		$(a == b).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-		
-		[Test()]
-		public void TestInEqualityOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator!=(A left, A right)
-	{
-		return new B ();
-	}
-}
-
-class B
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		A b = new A ();
-		$(a != b).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-		
-		[Test()]
-		public void TestLessThanOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator<(A left, A right)
-	{
-		return new B ();
-	}
-}
-
-class B
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		A b = new A ();
-		$(a < b).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-		
-		[Test()]
-		public void TestLessThanOrEqualOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator<=(A left, A right)
-	{
-		return new B ();
-	}
-}
-
-class B
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		A b = new A ();
-		$(a <= b).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-		
-		[Test()]
-		public void TestUnaryPlusOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator+(A left)
-	{
-		return new B ();
-	}
-}
-
-class B : A
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		$(+a).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-		
-		[Test()]
-		public void TestUnaryMinusOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator-(A left)
-	{
-		return new B ();
-	}
-}
-
-class B : A
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		$(-a).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-		
-		[Test()]
-		public void TestUnaryNotOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator!(A left)
-	{
-		return new B ();
-	}
-}
-
-class B : A
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		$(!a).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-		
-		[Test()]
-		public void TestUnaryBitwiseNotOperator ()
-		{
-			CompletionDataList provider = CodeCompletionBugTests.CreateProvider (
-@"class A
-{
-	public static B operator~(A left)
-	{
-		return new B ();
-	}
-}
-
-class B : A
-{
-	public void BMethod ()
-	{
-	}
-}
-
-class TestClass
-{
-	public void Test ()
-	{
-		A a = new A ();
-		$(~a).$
-	}
-}");
-			Assert.IsNotNull (provider);
-			Assert.IsNotNull (provider.Find ("BMethod"));
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CompletionDataList.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CompletionDataList.cs
index 6ade19e4ae..c1b744b6e6 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CompletionDataList.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CompletionDataList.cs
@@ -56,9 +56,9 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 		
 		public string DefaultCompletionString { get; set; }
 		
-		public ICompletionData Find (string name)
+		public ICompletionData Find (string name, bool includeImportData = false)
 		{
-			return Data.FirstOrDefault (d => d.DisplayText == name);
+			return Data.FirstOrDefault (d => (!(d is CodeCompletionBugTests.TestFactory.ImportCompletionData) || includeImportData) && d.DisplayText == name);
 		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/FormatItemTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/FormatItemTests.cs
new file mode 100644
index 0000000000..fd56592ecd
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/FormatItemTests.cs
@@ -0,0 +1,181 @@
+//
+// FormatItemTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
+{
+	[TestFixture]
+	public class FormatItemTests : TestBase
+	{
+		[Test]
+		public void TestFormatItem ()
+		{
+			var provider = CodeCompletionBugTests.CreateProvider (
+				@"
+class TestClass
+{
+	public void Test ()
+	{
+		$string.Format("" {0:$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.Greater(provider.Count, 0); 
+		}
+
+
+		[Test]
+		public void TestFalsePositive ()
+		{
+			var provider = CodeCompletionBugTests.CreateProvider (
+				@"using System;
+class TestClass
+{
+	public void Test ()
+	{
+		$Console.WriteLine (""Hello :$
+	}
+}");
+			Assert.IsTrue(provider == null || provider.Count == 0); 
+		}
+
+		[Test]
+		public void TestFormatItemRecognition ()
+		{
+			var provider = CodeCompletionBugTests.CreateProvider (
+				@"using System;
+class TestClass
+{
+	public void Test (Guid i)
+	{
+		string.Format("" ${0:$"", i);
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.AreEqual(4, provider.Count); 
+		}
+
+
+		[Test]
+		public void TestDontShowupCase ()
+		{
+			var provider = CodeCompletionBugTests.CreateProvider (
+				@"using System;
+class TestClass
+{
+	public void Test (string i)
+	{
+		string.Format("" ${1:$"", 12, i);
+	}
+}");
+			Assert.IsTrue(provider == null || provider.Count == 0); 
+		}
+
+		[Test]
+		public void TestIntToString ()
+		{
+			var provider = CodeCompletionBugTests.CreateProvider (
+				@"
+class TestClass
+{
+	public void Test (int i)
+	{
+		$i.ToString(""$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.Greater(provider.Count, 0); 
+		}
+		
+		[Test]
+		public void TestDateTimeToString ()
+		{
+			var provider = CodeCompletionBugTests.CreateProvider (
+				@"using System;
+class TestClass
+{
+	public void Test (DateTime i)
+	{
+		$i.ToString(""$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.Greater(provider.Count, 0); 
+		}
+
+		
+		[Test]
+		public void TestGuidToString ()
+		{
+			var provider = CodeCompletionBugTests.CreateProvider (
+				@"using System;
+class TestClass
+{
+	public void Test (Guid i)
+	{
+		$i.ToString(""$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.Greater(provider.Count, 0); 
+		}
+		
+		[Test]
+		public void TestTimeSpanToString ()
+		{
+			var provider = CodeCompletionBugTests.CreateProvider (
+				@"using System;
+class TestClass
+{
+	public void Test (TimeSpan i)
+	{
+		$i.ToString(""$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.Greater(provider.Count, 0); 
+		}
+
+		
+		[Test]
+		public void TestEnumToString ()
+		{
+			var provider = CodeCompletionBugTests.CreateProvider (
+				@"using System;
+class TestClass
+{
+	public void Test (ConsoleKey i)
+	{
+		$i.ToString(""$
+	}
+}");
+			Assert.IsNotNull (provider);
+			Assert.Greater(provider.Count, 0); 
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/ImportCompletionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/ImportCompletionTests.cs
index 4abbfe60be..194b1146a6 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/ImportCompletionTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/ImportCompletionTests.cs
@@ -72,12 +72,12 @@ class Test
 }
 ");
 			
-			var data = provider.Find ("AppDomain") as CodeCompletionBugTests.TestFactory.ImportCompletionData;
+			var data = provider.Find ("AppDomain", true) as CodeCompletionBugTests.TestFactory.ImportCompletionData;
 			Assert.NotNull(data);
 			Assert.AreEqual("System", data.Type.Namespace);
 			Assert.False(data.UseFullName);
 
-			data = provider.Find ("File") as CodeCompletionBugTests.TestFactory.ImportCompletionData;
+			data = provider.Find ("File", true) as CodeCompletionBugTests.TestFactory.ImportCompletionData;
 			Assert.NotNull(data);
 			Assert.AreEqual("System.IO", data.Type.Namespace);
 			Assert.False(data.UseFullName);
@@ -96,10 +96,10 @@ class Test
 }
 ");
 			
-			var data = provider.Find ("AppDomain") as CodeCompletionBugTests.TestFactory.ImportCompletionData;
+			var data = provider.Find ("AppDomain", true) as CodeCompletionBugTests.TestFactory.ImportCompletionData;
 			Assert.IsNull(data);
 			
-			data = provider.Find ("File") as CodeCompletionBugTests.TestFactory.ImportCompletionData;
+			data = provider.Find ("File", true) as CodeCompletionBugTests.TestFactory.ImportCompletionData;
 			Assert.NotNull(data);
 			Assert.AreEqual("System.IO", data.Type.Namespace);
 			Assert.False(data.UseFullName);
@@ -123,10 +123,81 @@ class Test
 }
 ");
 			
-			var data = provider.Find ("AppDomain") as CodeCompletionBugTests.TestFactory.ImportCompletionData;
+			var data = provider.Find ("AppDomain", true) as CodeCompletionBugTests.TestFactory.ImportCompletionData;
 			Assert.NotNull(data);
 			Assert.True(data.UseFullName);
 		}
+
+
+		[Test]
+		public void TestAutomaticImport ()
+		{
+			var provider = CodeCompletionBugTests.CreateProvider(@"class Test
+{
+	public static void Main (string[] args)
+	{
+		$c$
+	}
+}");
+			var data = provider.Find ("Console", true) as CodeCompletionBugTests.TestFactory.ImportCompletionData;
+			Assert.NotNull(data);
+			Assert.False(data.UseFullName);
+
+		}
+
+		[Test]
+		public void TestAutomaticImportClash1 ()
+		{
+			var provider = CodeCompletionBugTests.CreateProvider(@"class Console {}
+
+class Test
+{
+	public static void Main (string[] args)
+	{
+		$c$
+	}
+}");
+			var data = provider.Data.OfType<CodeCompletionBugTests.TestFactory.ImportCompletionData>().Single(d => d.DisplayText == "Console");
+			Assert.NotNull(data);
+			Assert.True(data.UseFullName);
+
+		}
+
+		[Ignore("Too slow atm :(")]
+		[Test]
+		public void TestAutomaticImportLocalClash ()
+		{
+			var provider = CodeCompletionBugTests.CreateProvider(@"
+class Test
+{
+	public static void Main (string[] args)
+	{
+		int Console = 12;
+		$c$
+	}
+}");
+			var data = provider.Data.OfType<CodeCompletionBugTests.TestFactory.ImportCompletionData>().Single(d => d.DisplayText == "Console");
+			Assert.NotNull(data);
+			Assert.True(data.UseFullName);
+
+		}
+
+		[Test]
+		public void TestAutomaticHiding ()
+		{
+			var provider = CodeCompletionBugTests.CreateProvider(@"using System.Collections.Generic;
+
+class Test
+{
+	public static void Main (string[] args)
+	{
+		$D$
+	}
+}");
+			var data = provider.Data.OfType<CodeCompletionBugTests.TestFactory.ImportCompletionData>().FirstOrDefault(d => d.DisplayText == "Dictionary");
+			Assert.IsNull(data);
+
+		}
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/KeywordTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/KeywordTests.cs
index ffa4d0e097..0680ce714a 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/KeywordTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/KeywordTests.cs
@@ -92,6 +92,8 @@ class Class
 	}
 }
 ");
+			Assert.IsNotNull (provider, "provider == null");
+			Assert.IsNull (provider.Find ("case"), "keyword 'case' found.");
 	}
 		
 		[Test()]
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/NameContextTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/NameContextTests.cs
index c265c7ff0f..a417a8c7da 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/NameContextTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/NameContextTests.cs
@@ -26,6 +26,7 @@
 using System;
 using NUnit.Framework;
 
+
 namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 {
 	[TestFixture]
@@ -203,7 +204,6 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 		/// <summary>
 		/// Bug 11609 - Completion engine offers namespaces when user types anonymous method parameter name
 		/// </summary>
-		[Ignore]
 		[Test]
 		public void TestBug11609 ()
 		{
@@ -222,11 +222,51 @@ namespace MyApplication
         {}
     }
 }
+", provider => Assert.AreEqual(0, provider.Count, "provider needs to be empty"));
+		}
+
+		/// <summary>
+		/// Bug 13365 - Suggestion context lost after ( in lambda args
+		/// </summary>
+		[Test]
+		public void TestBug13365 ()
+		{
+			CodeCompletionBugTests.CombinedProviderTest (@"using System;
+using System.Threading.Tasks;
+
+namespace MyApplication
+{
+   class MyClass
+   {
+        void MyMethod ()
+        {
+            $Task.Factory.StartNew ((a$
+        }
+    }
+}
 ", provider => {
-				Assert.AreEqual (0, provider.Count, "provider needs to be empty");
+
+				Assert.IsFalse (provider.AutoSelect);
 			});
 		}
 
+		[Test]
+		public void TestLambda ()
+		{
+			CodeCompletionBugTests.CombinedProviderTest (@"using System;
+using System.IO;
+
+class Foo
+{
+	static void Foo (Action<File> act) {}
+
+	public static void Main (string[] args)
+	{
+		$Foo((File f$
+	}
+}
+", provider => Assert.AreEqual(0, provider.Count, "provider needs to be empty"));
+		}
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/ParameterCompletionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/ParameterCompletionTests.cs
index 28133061d6..03ec2d0788 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/ParameterCompletionTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/ParameterCompletionTests.cs
@@ -26,32 +26,30 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.Collections.Generic;
 using NUnit.Framework;
 using ICSharpCode.NRefactory.Completion;
 using ICSharpCode.NRefactory.CSharp.Completion;
 using ICSharpCode.NRefactory.Editor;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using ICSharpCode.NRefactory.TypeSystem;
 using System.Linq;
 using ICSharpCode.NRefactory.CSharp.TypeSystem;
 
 namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 {
-	[TestFixture()]
+	[TestFixture]
 	public class ParameterCompletionTests : TestBase
 	{
 		internal class TestFactory : IParameterCompletionDataFactory
 		{
-			IProjectContent ctx;
+//			IProjectContent ctx;
 			
 			public TestFactory (IProjectContent ctx)
 			{
-				this.ctx = ctx;
+//				this.ctx = ctx;
 			}
 			
-			class Provider : IParameterDataProvider
+			internal class Provider : IParameterDataProvider
 			{
 				public IEnumerable<IMethod> Data { get; set; }
 				#region IParameterDataProvider implementation
@@ -276,33 +274,33 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 			}
 			
 			#region IParameterCompletionDataFactory implementation
-			public IParameterDataProvider CreateConstructorProvider(int startOffset, ICSharpCode.NRefactory.TypeSystem.IType type)
+			public IParameterDataProvider CreateConstructorProvider(int startOffset, IType type)
 			{
 				Assert.IsTrue(type.Kind != TypeKind.Unknown);
-				return new Provider () {
+				return new Provider {
 					Data = type.GetConstructors (m => m.Accessibility == Accessibility.Public)
 				};
 			}
 
-			public IParameterDataProvider CreateConstructorProvider(int startOffset, ICSharpCode.NRefactory.TypeSystem.IType type, AstNode skipNode)
+			public IParameterDataProvider CreateConstructorProvider(int startOffset, IType type, AstNode skipNode)
 			{
 				Assert.IsTrue(type.Kind != TypeKind.Unknown);
-				return new Provider () {
+				return new Provider {
 					Data = type.GetConstructors (m => m.Accessibility == Accessibility.Public)
 				};
 			}
 
 			public IParameterDataProvider CreateMethodDataProvider (int startOffset, IEnumerable<IMethod> methods)
 			{
-				return new Provider () {
+				return new Provider {
 					Data = methods
 				};
 			}
 
-			public IParameterDataProvider CreateDelegateDataProvider(int startOffset, ICSharpCode.NRefactory.TypeSystem.IType type)
+			public IParameterDataProvider CreateDelegateDataProvider(int startOffset, IType type)
 			{
 				Assert.IsTrue(type.Kind != TypeKind.Unknown);
-				return new Provider () {
+				return new Provider {
 					Data = new [] { type.GetDelegateInvokeMethod () }
 				};
 			}
@@ -312,21 +310,21 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 				Assert.IsTrue(type.Kind != TypeKind.Unknown);
 				if (type.Kind == TypeKind.Array)
 					return new ArrayProvider ();
-				return new IndexerProvider () {
+				return new IndexerProvider {
 					Data = accessibleIndexers
 				};
 			}
 			
 			public IParameterDataProvider CreateTypeParameterDataProvider (int startOffset, IEnumerable<IType> types)
 			{
-				return new TypeParameterDataProvider () {
+				return new TypeParameterDataProvider {
 					Data = types
 				};
 			}
 
 			public IParameterDataProvider CreateTypeParameterDataProvider (int startOffset, IEnumerable<IMethod> methods)
 			{
-				return new MethodTypeParameterDataProvider () {
+				return new MethodTypeParameterDataProvider {
 					Data = methods
 				};
 			}
@@ -378,7 +376,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 		/// <summary>
 		/// Bug 427448 - Code Completion: completion of constructor parameters not working
 		/// </summary>
-		[Test()]
+		[Test]
 		public void TestBug427448 ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -413,7 +411,7 @@ class AClass
 		/// <summary>
 		/// Bug 432437 - No completion when invoking delegates
 		/// </summary>
-		[Test()]
+		[Test]
 		public void TestBug432437 ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -435,7 +433,7 @@ class Test
 		/// <summary>
 		/// Bug 432658 - Incorrect completion when calling an extension method from inside another extension method
 		/// </summary>
-		[Test()]
+		[Test]
 		public void TestBug432658 ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -457,7 +455,7 @@ class Test
 		/// <summary>
 		/// Bug 432727 - No completion if no constructor
 		/// </summary>
-		[Test()]
+		[Test]
 		public void TestBug432727 ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -475,7 +473,7 @@ class Test
 		/// <summary>
 		/// Bug 434705 - No autocomplete offered if not assigning result of 'new' to a variable
 		/// </summary>
-		[Test()]
+		[Test]
 		public void TestBug434705 ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -500,7 +498,7 @@ class AClass
 		/// <summary>
 		/// Bug 434705 - No autocomplete offered if not assigning result of 'new' to a variable
 		/// </summary>
-		[Test()]
+		[Test]
 		public void TestBug434705B ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -526,7 +524,7 @@ class TestClass
 		/// <summary>
 		/// Bug 434701 - No autocomplete in attributes
 		/// </summary>
-		[Test()]
+		[Test]
 		public void TestBug434701 ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -550,7 +548,7 @@ class AClass
 		/// <summary>
 		/// Bug 447985 - Exception display tip is inaccurate for derived (custom) exceptions
 		/// </summary>
-		[Test()]
+		[Test]
 		public void TestBug447985 ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -585,7 +583,7 @@ class AClass
 		/// <summary>
 		/// Bug 1760 - [New Resolver] Parameter tooltip not shown for indexers 
 		/// </summary>
-		[Test()]
+		[Test]
 		public void Test1760 ()
 		{
 			var provider = CreateProvider (
@@ -601,7 +599,7 @@ class TestClass
 			Assert.AreEqual (1, provider.Count);
 		}
 		
-		[Test()]
+		[Test]
 		public void TestSecondIndexerParameter ()
 		{
 			var provider = CreateProvider (
@@ -618,7 +616,7 @@ class TestClass
 			Assert.AreEqual (1, provider.Count);
 		}
 		
-		[Test()]
+		[Test]
 		public void TestSecondMethodParameter ()
 		{
 			var provider = CreateProvider (
@@ -637,7 +635,7 @@ class TestClass
 		
 		
 		/// Bug 599 - Regression: No intellisense over Func delegate
-		[Test()]
+		[Test]
 		public void TestBug599 ()
 		{
 			var provider = CreateProvider (
@@ -656,7 +654,7 @@ class TestClass
 		}
 		
 		/// Bug 3307 - Chained linq methods do not work correctly
-		[Test()]
+		[Test]
 		public void TestBug3307 ()
 		{
 			var provider = CreateProvider (
@@ -674,7 +672,7 @@ class TestClass
 			Assert.IsTrue (provider.Count > 0);
 		}
 		
-		[Test()]
+		[Test]
 		public void TestBug3307FollowUp ()
 		{
 			var provider = CodeCompletionBugTests.CreateProvider (
@@ -696,7 +694,7 @@ public class MainClass
 			Assert.IsFalse (provider.AutoSelect, "auto select enabled !");
 		}
 		
-		[Test()]
+		[Test]
 		public void TestBug3307FollowUp2 ()
 		{
 			var provider = CodeCompletionBugTests.CreateProvider (
@@ -714,7 +712,7 @@ public class MainClass
 			Assert.IsFalse (provider.AutoSelect, "auto select enabled !");
 		}
 		
-		[Test()]
+		[Test]
 		public void TestConstructor ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -732,7 +730,7 @@ class A
 		}
 		
 		
-		[Test()]
+		[Test]
 		public void TestConstructorCase2 ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -758,7 +756,7 @@ namespace Test
 			Assert.AreEqual (2, provider.Count);
 		}
 		
-		[Test()]
+		[Test]
 		public void TestTypeParameter ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -778,7 +776,7 @@ namespace Test
 			Assert.AreEqual (16, provider.Count);
 		}
 		
-		[Test()]
+		[Test]
 		public void TestSecondTypeParameter ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -799,7 +797,7 @@ namespace Test
 		}
 		
 		[Ignore("TODO")]
-		[Test()]
+		[Test]
 		public void TestMethodTypeParameter ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -824,7 +822,7 @@ namespace Test
 		}
 		
 		[Ignore("TODO")]
-		[Test()]
+		[Test]
 		public void TestSecondMethodTypeParameter ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -848,7 +846,7 @@ namespace Test
 			Assert.AreEqual (1, provider.Count);
 		}		
 	
-		[Test()]
+		[Test]
 		public void TestArrayParameter ()
 		{
 			var provider = CreateProvider (
@@ -865,7 +863,7 @@ class TestClass
 			Assert.AreEqual (1, provider.Count);
 		}
 		
-		[Test()]
+		[Test]
 		public void TestSecondArrayParameter ()
 		{
 			var provider = CreateProvider (
@@ -883,7 +881,7 @@ class TestClass
 		}
 		
 		[Ignore("TODO!")]
-		[Test()]
+		[Test]
 		public void TestTypeParameterInBaseType ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -898,7 +896,7 @@ namespace Test
 		}
 		
 		
-		[Test()]
+		[Test]
 		public void TestBaseConstructorCall ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -925,7 +923,7 @@ namespace Test
 			Assert.AreEqual (2, provider.Count);
 		}
 		
-		[Test()]
+		[Test]
 		public void TestThisConstructorCall ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -957,7 +955,7 @@ namespace Test
 		/// <summary>
 		/// Bug 3645 - [New Resolver]Parameter completion shows all static and non-static overloads
 		/// </summary>
-		[Test()]
+		[Test]
 		public void TestBug3645 ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -984,7 +982,7 @@ namespace Test
 		/// <summary>
 		/// Bug 3991 - constructor argument completion not working for attributes applied to methods or parameters
 		/// </summary>
-		[Test()]
+		[Test]
 		public void TestBug3991()
 		{
 			IParameterDataProvider provider = CreateProvider(
@@ -1007,7 +1005,7 @@ namespace Test
 		/// <summary>
 		/// Bug 4087 - code completion handles object and collection initializers (braces) incorrectly in method calls
 		/// </summary>
-		[Test()]
+		[Test]
 		public void TestBug4087()
 		{
 			IParameterDataProvider provider = CreateProvider(
@@ -1026,7 +1024,7 @@ class TestClass
 		/// <summary>
 		/// Bug 4927 - [New Resolver] Autocomplete shows non-static methods when using class name
 		/// </summary>
-		[Test()]
+		[Test]
 		public void TestBug4927 ()
 		{
 			IParameterDataProvider provider = CreateProvider (
@@ -1058,7 +1056,7 @@ public class B
 		}
 
 
-		[Test()]
+		[Test]
 		public void TestLambdaCase()
 		{
 			IParameterDataProvider provider = CreateProvider(
@@ -1075,7 +1073,7 @@ class TestClass
 			Assert.IsTrue (provider != null && provider.Count == 1);
 		}
 
-		[Test()]
+		[Test]
 		public void TestJaggedArrayCreation()
 		{
 			IParameterDataProvider provider = CreateProvider(
@@ -1228,5 +1226,29 @@ class NUnitTestClass {
 }");
 			Assert.AreEqual (1, provider.Count);
 		}
+
+		/// <summary>
+		/// Bug 12824 - Invalid argument intellisense inside lambda
+		/// </summary>
+		[Ignore("Parser bug.")]
+		[Test]
+		public void TestBug12824 ()
+		{
+			var provider = (TestFactory.Provider)CreateProvider (
+				@"using System.Threading.Tasks;
+using System;
+
+public class MyEventArgs 
+{
+	public static void Main (string[] args)
+	{
+		Task.Factory.StartNew (() => {
+				$throw new Exception ($
+		});
+	}
+}");
+			string name = provider.Data.First().FullName;
+			Assert.AreEqual ("System.Exception..ctor", name);
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AccessToDisposedClosureTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AccessToDisposedClosureTests.cs
index 2093176f8d..71bb3947f8 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AccessToDisposedClosureTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AccessToDisposedClosureTests.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 
 namespace ICSharpCode.NRefactory.CSharp.CodeIssues
 {
+	[TestFixture]
 	public class AccessToDisposedClosureTests : InspectionActionTestBase
 	{
 		void Test (string input, int issueCount)
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AccessToStaticMemberViaDerivedTypeIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AccessToStaticMemberViaDerivedTypeIssueTests.cs
new file mode 100644
index 0000000000..d2430bb8a2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AccessToStaticMemberViaDerivedTypeIssueTests.cs
@@ -0,0 +1,346 @@
+//
+// CallToStaticMemberViaDerivedType.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class AccessToStaticMemberViaDerivedTypeIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void MemberInvocation()
+		{
+			var input = @"
+class A
+{
+	public static void F() { }
+}
+class B : A { }
+class C
+{
+	void Main()
+	{
+		B.F ();
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new AccessToStaticMemberViaDerivedTypeIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			Assert.AreEqual(11, issues [0].Start.Line);
+
+			CheckFix(context, issues [0], @"
+class A
+{
+	public static void F() { }
+}
+class B : A { }
+class C
+{
+	void Main()
+	{
+		A.F ();
+	}
+}"
+			);
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			var input = @"
+class A
+{
+	public static void F() { }
+}
+class B : A { }
+class C
+{
+	void Main()
+	{
+        // ReSharper disable once AccessToStaticMemberViaDerivedType
+		B.F ();
+	}
+}";
+			TestWrongContext<AccessToStaticMemberViaDerivedTypeIssue>(input);
+		}
+
+		[Test]
+		public void PropertyAccess()
+		{
+			var input = @"
+class A
+{
+	public static string Property { get; set; }
+}
+class B : A { }
+class C
+{
+	void Main()
+	{
+		System.Console.WriteLine(B.Property);
+	}
+}";
+			TestRefactoringContext context;			
+			var issues = GetIssues(new AccessToStaticMemberViaDerivedTypeIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			Assert.AreEqual(11, issues [0].Start.Line);
+			
+			CheckFix(context, issues [0], @"
+class A
+{
+	public static string Property { get; set; }
+}
+class B : A { }
+class C
+{
+	void Main()
+	{
+		System.Console.WriteLine(A.Property);
+	}
+}"
+			);
+		}
+
+		[Test]
+		public void FieldAccess()
+		{
+			var input = @"
+class A
+{
+	public static string Property;
+}
+class B : A { }
+class C
+{
+	void Main()
+	{
+		System.Console.WriteLine(B.Property);
+	}
+}";
+			TestRefactoringContext context;			
+			var issues = GetIssues(new AccessToStaticMemberViaDerivedTypeIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			Assert.AreEqual(11, issues [0].Start.Line);
+			
+			CheckFix(context, issues [0], @"
+class A
+{
+	public static string Property;
+}
+class B : A { }
+class C
+{
+	void Main()
+	{
+		System.Console.WriteLine(A.Property);
+	}
+}"
+			);
+		}
+
+		[Test]
+		public void NestedClass()
+		{
+			var input = @"
+class A
+{
+	public class B
+	{
+		public static void F() { }
+	}
+	public class C : B { }
+}
+class D
+{
+	void Main()
+	{
+		A.C.F ();
+	}
+}";
+			TestRefactoringContext context;			
+			var issues = GetIssues(new AccessToStaticMemberViaDerivedTypeIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			Assert.AreEqual(14, issues [0].Start.Line);
+			
+			CheckFix(context, issues [0], @"
+class A
+{
+	public class B
+	{
+		public static void F() { }
+	}
+	public class C : B { }
+}
+class D
+{
+	void Main()
+	{
+		A.B.F ();
+	}
+}"
+			);
+		}
+
+		[Test]
+		public void ExpandsTypeWithNamespaceIfNeccessary()
+		{
+			var input = @"
+namespace First
+{
+	class A
+	{
+		public static void F() { }
+	}
+}
+namespace Second
+{
+	public class B : First.A { }
+	class C
+	{
+		void Main()
+		{
+			B.F ();
+		}
+	}
+}";
+			TestRefactoringContext context;			
+			var issues = GetIssues(new AccessToStaticMemberViaDerivedTypeIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			Assert.AreEqual(16, issues [0].Start.Line);
+			
+			CheckFix(context, issues [0], @"
+namespace First
+{
+	class A
+	{
+		public static void F() { }
+	}
+}
+namespace Second
+{
+	public class B : First.A { }
+	class C
+	{
+		void Main()
+		{
+			First.A.F ();
+		}
+	}
+}"
+			);
+		}
+
+		[Test]
+		public void IgnoresCorrectCalls()
+		{
+			var input = @"
+class A
+{
+	public static void F() { }
+}
+class B
+{
+	void Main()
+	{
+		A.F();
+	}
+}";
+			TestRefactoringContext context;			
+			var issues = GetIssues(new AccessToStaticMemberViaDerivedTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void IgnoresNonStaticCalls()
+		{
+			var input = @"
+class A
+{
+	public void F() { }
+}
+class B : A { }
+class C
+{
+	void Main()
+	{
+		B b = new B();
+		b.F();
+	}
+}";
+			TestRefactoringContext context;			
+			var issues = GetIssues(new AccessToStaticMemberViaDerivedTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void IgnoresOwnMemberFunctions()
+		{
+			var input = @"
+class A
+{
+	protected static void F() { }
+}
+class B : A
+{
+	void Main()
+	{
+		F();
+		this.F();
+		base.F();
+	}
+}";
+			TestRefactoringContext context;			
+			var issues = GetIssues(new AccessToStaticMemberViaDerivedTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void IgnoresCuriouslyRecurringTemplatePattern()
+		{
+			var input = @"
+class Base<T>
+{
+	public static void F() { }
+}
+class Derived : Base<Derived> {}
+class Test
+{
+	void Main()
+	{
+		Derived.F();
+	}
+}";
+			// do not suggest replacing 'Derived.F()' with 'Base<Derived>.F()'
+			TestRefactoringContext context;			
+			var issues = GetIssues(new AccessToStaticMemberViaDerivedTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AdditionalOfTypeIssuesTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AdditionalOfTypeIssuesTests.cs
new file mode 100644
index 0000000000..5454b999d1
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AdditionalOfTypeIssuesTests.cs
@@ -0,0 +1,77 @@
+//
+// AdditionalOfTypeIssuesTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class AdditionalOfTypeIssuesTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestAdditionalCase ()
+		{
+			Test<AdditionalOfTypeIssues>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Where(o => (o is Test));
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalid ()
+		{
+			TestWrongContext<AdditionalOfTypeIssues>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<IDisposable> ().Where(o => this is IDisposable);
+	}
+}");
+		}
+
+
+
+
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ArrayCreationCanBeReplacedWithArrayInitializerIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ArrayCreationCanBeReplacedWithArrayInitializerIssueTests.cs
new file mode 100755
index 0000000000..6d8589d4f3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ArrayCreationCanBeReplacedWithArrayInitializerIssueTests.cs
@@ -0,0 +1,116 @@
+// ArrayCreationCanBeReplacedWithArrayInitializerIssueTests.cs
+//
+// Author:
+//      Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ArrayCreationCanBeReplacedWithArrayInitializerIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestVariableDeclaration()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int[] foo = new int[] {1, 2, 3};
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int[] foo = {1, 2, 3};
+	}
+}";
+			Test<ArrayCreationCanBeReplacedWithArrayInitializerIssue>(input, 1, output);
+		}
+
+		[Test]
+		public void TestFieldDeclaration()
+		{
+			var input = @"
+class TestClass
+{
+	public int[] filed = new [] {1,2,3};
+}";
+			var output = @"
+class TestClass
+{
+	public int[] filed = {1,2,3};
+}";
+			Test<ArrayCreationCanBeReplacedWithArrayInitializerIssue>(input, 1, output);
+		}
+
+		[Test]
+		public void TestNoProblem1()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		var foo = new[] {1, 2, 3};
+	}
+}";
+			Test<ArrayCreationCanBeReplacedWithArrayInitializerIssue>(input, 0);
+		}
+
+		[Test]
+		public void TestNoProblem2()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		var foo = new int[] {1, 2, 3};
+	}
+}";
+			Test<ArrayCreationCanBeReplacedWithArrayInitializerIssue>(input, 0);
+		}
+
+		[Test]
+		public void TestNoProblem3()
+		{
+			var input = @"
+class TestClass
+{
+	Void Foo(int[] a)
+	{}
+	void TestMethod ()
+	{
+		Foo(new int[]{1,2,3});
+	}
+}";
+			Test<ArrayCreationCanBeReplacedWithArrayInitializerIssue>(input, 0);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AssignmentMadeToSameVariableIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AssignmentMadeToSameVariableIssueTests.cs
deleted file mode 100644
index 46329fc0e0..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AssignmentMadeToSameVariableIssueTests.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-// 
-// AssignmentMadeToSameVariableIssueTests.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class AssignmentMadeToSameVariableIssueTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestVariable ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		int a = 0;
-		a = a;
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		int a = 0;
-	}
-}";
-			Test<AssignmentMadeToSameVariableIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestParameter ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod (int a)
-	{
-		a = a;
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod (int a)
-	{
-	}
-}";
-			Test<AssignmentMadeToSameVariableIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestField ()
-		{
-			var input = @"
-class TestClass
-{
-	int a;
-	void TestMethod ()
-	{
-		a = a;
-		this.a = this.a;
-		this.a = a;
-	}
-}";
-			var output = @"
-class TestClass
-{
-	int a;
-	void TestMethod ()
-	{
-	}
-}";
-			Test<AssignmentMadeToSameVariableIssue> (input, 3, output);
-		}
-
-		[Test]
-		public void TestFix ()
-		{
-			var input = @"
-class TestClass
-{
-	void Test (int i) { }
-	void TestMethod ()
-	{
-		int a = 0;
-		a = a;
-		Test (a = a);
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void Test (int i) { }
-	void TestMethod ()
-	{
-		int a = 0;
-		Test (a);
-	}
-}";
-			Test<AssignmentMadeToSameVariableIssue> (input, 2, output);
-		}
-		
-		[Test]
-		public void TestNoIssue ()
-		{
-			var input = @"
-class TestClass
-{
-	int a;
-	int b;
-
-	public int Prop { get; set; }
-
-	void TestMethod (int a)
-	{
-		a = b;
-		this.a = b;
-		this.a = a;
-		Prop = Prop;
-	}
-}";
-			Test<AssignmentMadeToSameVariableIssue> (input, 0);
-		}
-		
-		[Test]
-		public void IgnoresAssignmentWithDifferentRootObjects ()
-		{
-			var input = @"
-class TestClass
-{
-	int a;
-
-	void TestMethod (TestClass tc)
-	{
-		a = tc.a;
-	}
-}";
-			Test<AssignmentMadeToSameVariableIssue> (input, 0);
-		}
-		
-		[Test]
-		public void NestedFieldAccess ()
-		{
-			var input = @"
-class TestClass
-{
-	int a;
-
-	TestClass nested;
-
-	void TestMethod ()
-	{
-		nested.nested.a = nested.nested.a;
-	}
-}";
-			var output = @"
-class TestClass
-{
-	int a;
-
-	TestClass nested;
-
-	void TestMethod ()
-	{
-	}
-}";
-			Test<AssignmentMadeToSameVariableIssue> (input, 1, output);
-		}
-		
-		[Test]
-		public void NestedPropertyAccess ()
-		{
-			var input = @"
-class TestClass
-{
-	int a;
-
-	TestClass nested { get; set; }
-
-	void TestMethod ()
-	{
-		nested.nested.a = nested.nested.a;
-	}
-}";
-			Test<AssignmentMadeToSameVariableIssue> (input, 0);
-		}
-		
-		[Test]
-		public void TestNoIssueWithCompoundOperator ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod (int a)
-	{
-		a += a;
-	}
-}";
-			Test<AssignmentMadeToSameVariableIssue> (input, 0);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AutoAsyncTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AutoAsyncTests.cs
new file mode 100644
index 0000000000..43dfe154e3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/AutoAsyncTests.cs
@@ -0,0 +1,730 @@
+// 
+// AutoAsyncTests.cs
+//  
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class AutoAsyncTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimple() {
+			Test<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<int> ();
+		tcs.SetResult (1);
+		return tcs.Task;
+	}
+}", @"
+using System.Threading.Tasks;
+class TestClass
+{
+	public async Task<int> TestMethod ()
+	{
+		return 1;
+	}
+}");
+		}
+
+		[Test]
+		public void TestIncorrectlyInitializedCompletionSource() {
+			TestWrongContext<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	TaskCompletionSource<int> GetCompletionSource ()
+	{
+		return new TaskCompletionSource<int> ();
+	}
+	public Task<int> $TestMethod ()
+	{
+		var tcs = GetCompletionSource ();
+		tcs.SetResult (1);
+		return tcs.Task;
+	}
+}");
+		}
+
+		[Test]
+		public void TestTaskWithoutResult() {
+			Test<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<int> ();
+		tcs.SetResult (1);
+		return tcs.Task;
+	}
+}", @"
+using System.Threading.Tasks;
+class TestClass
+{
+	public async Task TestMethod ()
+	{
+		int result = 1;
+		return;
+	}
+}");
+		}
+
+		[Test]
+		public void TestAsyncContinueWith() {
+			Test<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task Foo () { return null; }
+	public Task<int> $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<int> ();
+		Foo ().ContinueWith (async (precedent) => {
+			await Foo();
+			tcs.SetResult (1);
+		});
+		return tcs.Task;
+	}
+}", @"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task Foo () { return null; }
+	public async Task<int> TestMethod ()
+	{
+		await Foo ();
+		await Foo ();
+		return 1;
+	}
+}");
+		}
+
+		[Test]
+		public void TestTaskWithoutResultExtraName() {
+			Test<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<int> ();
+		int result = 1;
+		tcs.SetResult (1);
+		return tcs.Task;
+	}
+}", @"
+using System.Threading.Tasks;
+class TestClass
+{
+	public async Task TestMethod ()
+	{
+		int result = 1;
+		int result1 = 1;
+		return;
+	}
+}");
+		}
+
+		[Test]
+		public void TestBasicContinueWith() {
+			Test<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public Task<int> $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<int> ();
+		Foo ().ContinueWith (precedent => {
+			tcs.SetResult (precedent.Result);
+		});
+		return tcs.Task;
+	}
+}", @"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public async Task<int> TestMethod ()
+	{
+		int precedentResult = await Foo ();
+		return precedentResult;
+	}
+}");
+		}
+
+		[Test]
+		public void TestTaskWithoutCompletionSource() {
+			Test<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public Task<int> $TestMethod ()
+	{
+		return Foo ().ContinueWith (precedent => {
+			return 3;
+		});
+	}
+}", @"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public async Task<int> TestMethod ()
+	{
+		int precedentResult = await Foo ();
+		return 3;
+	}
+}");
+		}
+
+		[Ignore("Broken on windows")]
+		[Test]
+		public void TestContinueWithUsingPrecedent() {
+			Test<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public Task<int> $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<int> ();
+		Foo ().ContinueWith (precedent => {
+			Console.WriteLine (precedent.IsFaulted);
+			tcs.SetResult (precedent.Result);
+		});
+		return tcs.Task;
+	}
+}", @"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public async Task<int> TestMethod ()
+	{
+		Task<int> precedent1 = Foo ();
+		int precedentResult = await precedent1;
+		Console.WriteLine (precedent1.IsFaulted);
+		return precedentResult;
+	}
+}");
+		}
+
+		[Test]
+		public void TestBasicContinueWithExtraName() {
+			Test<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public Task<int> $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<int> ();
+		Foo ().ContinueWith (precedent => {
+			int precedentResult = precedent.Result;
+			tcs.SetResult (precedentResult);
+		});
+		return tcs.Task;
+	}
+}", @"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public async Task<int> TestMethod ()
+	{
+		int precedentResult1 = await Foo ();
+		int precedentResult = precedentResult1;
+		return precedentResult;
+	}
+}");
+		}
+
+		[Test]
+		public void TestConditionalReturn() {
+			Test<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public Task<int> $TestMethod (int i)
+	{
+		var tcs = new TaskCompletionSource<int> ();
+		Foo ().ContinueWith (precedent => {
+			if (i == 0)
+				tcs.SetResult (precedent.Result);
+			else
+				tcs.SetResult (i);
+		});
+		return tcs.Task;
+	}
+}", @"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public async Task<int> TestMethod (int i)
+	{
+		int precedentResult = await Foo ();
+		if (i == 0)
+			return precedentResult;
+		else
+			return i;
+	}
+}");
+		}
+
+		[Test]
+		public void TestConditionalContinueWith() {
+			Test<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public Task<int> $TestMethod (int i)
+	{
+		var tcs = new TaskCompletionSource<int> ();
+		var task1 = Foo ();
+		var task2 = Foo ();
+		if (i == 0) {
+			task1.ContinueWith (precedent => {
+				tcs.SetResult (1);
+			});
+		} else {
+			task2.ContinueWith (precedent => {
+				tcs.SetResult (2);
+			});
+		}
+		return tcs.Task;
+	}
+}", @"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public async Task<int> TestMethod (int i)
+	{
+		var task1 = Foo ();
+		var task2 = Foo ();
+		if (i == 0) {
+			int precedentResult = await task1;
+			return 1;
+		}
+		else {
+			int precedentResult1 = await task2;
+			return 2;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestDelegate() {
+			Test<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public Task<int> $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<int> ();
+		Foo ().ContinueWith (delegate {
+			tcs.SetResult (42);
+		});
+		return tcs.Task;
+	}
+}", @"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public async Task<int> TestMethod ()
+	{
+		await Foo ();
+		return 42;
+	}
+}");
+		}
+
+		[Test]
+		public void TestTwoContinueWith() {
+			Test<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public Task<int> $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<int> ();
+		Foo ().ContinueWith (precedent => {
+			Foo ().ContinueWith (precedent2 => {
+				tcs.SetResult (precedent.Result + precedent2.Result);
+			});
+		});
+		return tcs.Task;
+	}
+}", @"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public async Task<int> TestMethod ()
+	{
+		int precedentResult = await Foo ();
+		int precedent2Result = await Foo ();
+		return precedentResult + precedent2Result;
+	}
+}");
+		}
+
+		[Test]
+		public void TestChainedContinueWith() {
+			Test<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public Task<int> $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<int> ();
+		Foo ().ContinueWith (precedent => {
+			Foo ();
+		}).ContinueWith (precedent => {
+			tcs.SetResult (1);
+		});
+		return tcs.Task;
+	}
+}", @"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task<int> Foo ()
+	{
+		return null;
+	}
+	public async Task<int> TestMethod ()
+	{
+		int precedentResult = await Foo ();
+		Foo ();
+		return 1;
+	}
+}");
+		}
+
+		[Test]
+		public void TestRedundantReturn() {
+			Test<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<object> ();
+		tcs.SetResult (null);
+		return tcs.Task;
+	}
+}", @"
+using System.Threading.Tasks;
+class TestClass
+{
+	public async Task TestMethod ()
+	{
+		object result = null;
+		return;
+	}
+}");
+		}
+
+		[Test]
+		public void TestNotInEnd() {
+			TestWrongContext<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task Foo () {}
+	public Task $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<object> ();
+		Foo ().ContinueWith (precedent => {
+			tcs.SetResult (null);
+			Console.WriteLine(42);
+		});
+		return tcs.Task;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalidChainedMethodAfterContinueWith() {
+			TestWrongContext<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task Foo () {}
+	public Task $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<object> ();
+		Foo ().ContinueWith (precedent => {
+			tcs.SetResult (null);
+		}).Wait ();
+		return tcs.Task;
+	}
+}");
+		}
+
+		[Test]
+		public void TestContinuationAfterSetResult() {
+			TestWrongContext<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task Foo () {}
+	public Task $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<object> ();
+		Foo ().ContinueWith (precedent => {
+			tcs.SetResult (null);
+		}).ContinueWith (precedent => {
+		});
+		return tcs.Task;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalidInLambda() {
+			TestWrongContext<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<object> ();
+		System.Action action = () => { tcs.SetResult (null); };
+		return tcs.Task;
+	}
+}");
+		}
+
+		[Ignore("Broken on windows")]
+		[Test]
+		public void TestInvalidContinue() {
+			Test<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task Foo() { return null; }
+	public Task $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<object> ();
+		Foo ().ContinueWith (precedent => 1).ContinueWith (precedent => {
+			Console.WriteLine (precedent.Result);
+			tcs.SetResult (null);
+		});
+		return tcs.Task;
+	}
+}", @"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task Foo() { return null; }
+	public async Task TestMethod ()
+	{
+		int precedentResult = await Foo ().ContinueWith (precedent => 1);
+		Console.WriteLine (precedentResult);
+		object result = null;
+		return;
+	}
+}");
+		}
+
+		[Ignore("Broken on windows")]
+		[Test]
+		public void TestLongInvalidContinue() {
+			Test<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task Foo() { return null; }
+	public Task $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<object> ();
+		Foo ().ContinueWith (precedent => {
+			return 1;
+		}).ContinueWith (precedent => {
+			Console.WriteLine (precedent.Result);
+			tcs.SetResult (null);
+		});
+		return tcs.Task;
+	}
+}", @"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task Foo() { return null; }
+	public async Task TestMethod ()
+	{
+		int precedentResult = await Foo ().ContinueWith (precedent =>  {
+			return 1;
+		});
+		Console.WriteLine (precedentResult);
+		object result = null;
+		return;
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisabledForBadReturn() {
+			TestWrongContext<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public Task $TestMethod ()
+	{
+		var tcs = new TaskCompletionSource<object> ();
+		tcs.SetResult (null);
+		return null;
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisabledForNoAction() {
+			TestWrongContext<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	public void $TestMethod ()
+	{
+	}
+}");
+		}
+
+		[Test]
+		public void TestValidVoid() {
+			Test<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	Task Foo() {}
+	public void $TestMethod ()
+	{
+		Foo ().ContinueWith (precedent => {
+			Console.WriteLine (1);
+		});
+	}
+}", @"
+using System.Threading.Tasks;
+class TestClass
+{
+	Task Foo() {}
+	public async void TestMethod ()
+	{
+		await Foo ();
+		Console.WriteLine (1);
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisabledForBadMultipleReturns() {
+			TestWrongContext<AutoAsyncIssue>(@"
+using System.Threading.Tasks;
+class TestClass
+{
+	Task Foo() { return null; }
+	public Task<int> $TestMethod ()
+	{
+		TaskCompletionSource<int> tcs = new TaskCompletionSource<int> ();
+		Foo ().ContinueWith(precedent => { tcs.SetResult(1); })
+			.ContinueWith(precedent => { tcs.SetResult(1); });
+		return tcs;
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BaseMemberHasParamsIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BaseMemberHasParamsIssueTests.cs
new file mode 100644
index 0000000000..078ac365b5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BaseMemberHasParamsIssueTests.cs
@@ -0,0 +1,111 @@
+//
+// BaseMemberHasParamsIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class BaseMemberHasParamsIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestBasicCase ()
+		{
+			Test<BaseMemberHasParamsIssue>(@"class FooBar
+{
+	public virtual void Foo(string fmt, params object[] args)
+	{
+	}
+}
+
+class FooBar2 : FooBar
+{
+	public override void Foo(string fmt, object[] args)
+	{
+		System.Console.WriteLine(fmt, args);
+	}
+}", @"class FooBar
+{
+	public virtual void Foo(string fmt, params object[] args)
+	{
+	}
+}
+
+class FooBar2 : FooBar
+{
+	public override void Foo(string fmt, params object[] args)
+	{
+		System.Console.WriteLine(fmt, args);
+	}
+}");
+		}
+
+		[Test]
+		public void TestValidCase ()
+		{
+			TestWrongContext<BaseMemberHasParamsIssue>(@"class FooBar
+{
+	public virtual void Foo(string fmt, params object[] args)
+	{
+	}
+}
+
+class FooBar2 : FooBar
+{
+	public override void Foo(string fmt, params object[] args)
+	{
+		System.Console.WriteLine(fmt, args);
+	}
+}");
+		}
+
+
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<BaseMemberHasParamsIssue>(@"class FooBar
+{
+	public virtual void Foo(string fmt, params object[] args)
+	{
+	}
+}
+
+class FooBar2 : FooBar
+{
+	// ReSharper disable once BaseMemberHasParams
+	public override void Foo(string fmt, object[] args)
+	{
+		System.Console.WriteLine(fmt, args);
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BaseMethodCallWithDefaultParameterIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BaseMethodCallWithDefaultParameterIssueTests.cs
new file mode 100644
index 0000000000..7c9d48265e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BaseMethodCallWithDefaultParameterIssueTests.cs
@@ -0,0 +1,155 @@
+//
+// BaseMethodCallWithDefaultParameterIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class BaseMethodCallWithDefaultParameterIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestBasicCase ()
+		{
+			TestRefactoringContext ctx;
+			var issues = GetIssues(new BaseMethodCallWithDefaultParameterIssue(), @"
+public class MyBase
+{
+	public virtual void FooBar(int x = 12)
+	{
+		System.Console.WriteLine(""Foo Bar"" + x);
+	}
+}
+
+public class MyClass : MyBase
+{
+	public override void FooBar(int x = 12)
+	{
+		base.FooBar();
+	}
+}
+", out ctx);
+			Assert.AreEqual(1, issues.Count);
+		}
+
+		[Test]
+		public void TestInterfaceCase ()
+		{
+			TestRefactoringContext ctx;
+			var issues = GetIssues(new BaseMethodCallWithDefaultParameterIssue(), @"
+public class MyBase
+{
+	public virtual int this[int x, int y = 12] {
+		get {
+			return 1;
+		}
+	}
+}
+
+public class MyClass : MyBase
+{
+	public override int this[int x, int y = 12] {
+		get {
+			return base[x];
+		}
+	}
+}
+", out ctx);
+			Assert.AreEqual(1, issues.Count);
+
+		}
+
+		[Test]
+		public void TestDoNotWarnCase ()
+		{
+			TestWrongContext<BaseMethodCallWithDefaultParameterIssue>(@"
+public class MyBase
+{
+	public virtual void FooBar(int x = 12)
+	{
+		System.Console.WriteLine(""Foo Bar"" + x);
+	}
+}
+
+public class MyClass : MyBase
+{
+	public override void FooBar(int x = 12)
+	{
+		base.FooBar(11);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDoNotWarnInParamsCase ()
+		{
+			TestWrongContext<BaseMethodCallWithDefaultParameterIssue>(@"
+public class MyBase
+{
+	public virtual void FooBar(params int[] x)
+	{
+		System.Console.WriteLine(""Foo Bar"" + x);
+	}
+}
+
+public class MyClass : MyBase
+{
+	public override void FooBar(params int[] x)
+	{
+		base.FooBar();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<BaseMethodCallWithDefaultParameterIssue> (@"
+public class MyBase
+{
+	public virtual void FooBar(int x = 12)
+	{
+		System.Console.WriteLine(""Foo Bar"" + x);
+	}
+}
+
+public class MyClass : MyBase
+{
+	public override void FooBar(int x = 12)
+	{
+		// ReSharper disable once BaseMethodCallWithDefaultParameter
+		base.FooBar();
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BaseMethodParameterNameMismatchIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BaseMethodParameterNameMismatchIssueTests.cs
new file mode 100644
index 0000000000..3046c5daed
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BaseMethodParameterNameMismatchIssueTests.cs
@@ -0,0 +1,91 @@
+//
+// BaseMethodParameterNameMismatchIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class BaseMethodParameterNameMismatchIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestMethod ()
+		{
+			Test<BaseMethodParameterNameMismatchIssue>(@"
+class Foo
+{
+	public virtual void FooBar (int bar) {}
+}
+
+class Bar : Foo
+{
+	public override void FooBar (int foo)
+	{
+	}
+}
+", @"
+class Foo
+{
+	public virtual void FooBar (int bar) {}
+}
+
+class Bar : Foo
+{
+	public override void FooBar (int bar)
+	{
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestIndexer ()
+		{
+			Test<BaseMethodParameterNameMismatchIssue>(@"
+class Foo
+{
+	protected virtual int this[int i, int j] { get { return 1; } }
+}
+
+class Bar : Foo
+{
+	protected override int this[int i, int x] { get { return 1; } }
+}
+", @"
+class Foo
+{
+	protected virtual int this[int i, int j] { get { return 1; } }
+}
+
+class Bar : Foo
+{
+	protected override int this[int i, int j] { get { return 1; } }
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BitwiseOperationOnNonFlagsEnumIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BitwiseOperationOnNonFlagsEnumIssueTests.cs
deleted file mode 100644
index 66379f2dba..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BitwiseOperationOnNonFlagsEnumIssueTests.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-// 
-// BitwiseOperationOnNonFlagsEnumIssueTests.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class BitwiseOperationOnNonFlagsEnumIssueTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestUnary ()
-		{
-			var input = @"
-enum TestEnum
-{
-	Item1, Item2
-}
-class TestClass
-{
-	void TestMethod ()
-	{
-		var x = ~TestEnum.Item1;
-	}
-}";
-			Test<BitwiseOperationOnNonFlagsEnumIssue> (input, 1);
-		}
-
-		public void TestAssignment (string op, bool bitwise = true)
-		{
-			var input = @"
-enum TestEnum
-{
-	Item1, Item2
-}
-class TestClass
-{
-	void TestMethod ()
-	{
-		var x = TestEnum.Item1;
-		x " + op + @"= TestEnum.Item2;
-	}
-}";
-			Test<BitwiseOperationOnNonFlagsEnumIssue> (input, bitwise ? 1: 0);
-		}
-		[Test]
-		public void TestAssignment ()
-		{
-			TestAssignment ("|");
-			TestAssignment ("&");
-			TestAssignment ("^");
-			TestAssignment ("+", false);
-		}
-
-		public void TestBinary (string op, bool bitwise = true)
-		{
-
-			var input = @"
-enum TestEnum
-{
-	Item1, Item2
-}
-class TestClass
-{
-	void TestMethod ()
-	{
-		var x =  TestEnum.Item1 " + op + @" TestEnum.Item2;
-	}
-}";
-			Test<BitwiseOperationOnNonFlagsEnumIssue> (input, bitwise ? 1 : 0);
-		}
-		[Test]
-		public void TestBinary()
-		{
-			TestBinary ("&");
-			TestBinary ("|");
-			TestBinary ("^");
-			TestBinary ("+", false);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BitwiseOperatorOnEnumWithoutFlagsIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BitwiseOperatorOnEnumWithoutFlagsIssueTests.cs
new file mode 100644
index 0000000000..0782e4d760
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/BitwiseOperatorOnEnumWithoutFlagsIssueTests.cs
@@ -0,0 +1,126 @@
+// 
+// BitwiseOperationOnNonFlagsEnumIssueTests.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class BitwiseOperatorOnEnumWithoutFlagsIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestUnary ()
+		{
+			var input = @"
+enum TestEnum
+{
+	Item1, Item2
+}
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = ~TestEnum.Item1;
+	}
+}";
+			Test<BitwiseOperatorOnEnumWithoutFlagsIssue> (input, 1);
+		}
+
+		public void TestAssignment (string op, bool bitwise = true)
+		{
+			var input = @"
+enum TestEnum
+{
+	Item1, Item2
+}
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = TestEnum.Item1;
+		x " + op + @"= TestEnum.Item2;
+	}
+}";
+			Test<BitwiseOperatorOnEnumWithoutFlagsIssue> (input, bitwise ? 1: 0);
+		}
+		[Test]
+		public void TestAssignment ()
+		{
+			TestAssignment ("|");
+			TestAssignment ("&");
+			TestAssignment ("^");
+			TestAssignment ("+", false);
+		}
+
+		public void TestBinary (string op, bool bitwise = true)
+		{
+
+			var input = @"
+enum TestEnum
+{
+	Item1, Item2
+}
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x =  TestEnum.Item1 " + op + @" TestEnum.Item2;
+	}
+}";
+			Test<BitwiseOperatorOnEnumWithoutFlagsIssue> (input, bitwise ? 1 : 0);
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<BitwiseOperatorOnEnumWithoutFlagsIssue>(@"
+enum TestEnum
+{
+    Item1, Item2
+}
+class TestClass
+{
+    void TestMethod()
+    {
+	    var x = TestEnum.Item1;
+        // ReSharper disable once BitwiseOperatorOnEnumWithoutFlags
+        x = x ^ TestEnum.Item2;
+    }
+}
+");
+		}
+
+		[Test]
+		public void TestBinary()
+		{
+			TestBinary ("&");
+			TestBinary ("|");
+			TestBinary ("^");
+			TestBinary ("+", false);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0029InvalidConversionIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0029InvalidConversionIssueTests.cs
index ff5ac49103..a599b663a7 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0029InvalidConversionIssueTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0029InvalidConversionIssueTests.cs
@@ -204,18 +204,21 @@ class TestClass
 		[Test]
 		public void AssignCustomClassToString()
 		{
-			var input = @"
+			Test<CS0029InvalidConversionIssue>(@"
 class TestClass
 {
 	void TestMethod ()
 	{
 		string x = this;
 	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues (new CS0029InvalidConversionIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			Assert.IsFalse(issues[0].Actions.Any());
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		var x = this;
+	}
+}");
 		}
 
 		/// <summary>
@@ -237,5 +240,296 @@ class TestClass
 			var issues = GetIssues (new CS0029InvalidConversionIssue(), input, out context);
 			Assert.AreEqual(0, issues.Count);
 		}
+		
+		[Test]
+		public void TestReturnInMethod()
+		{
+			var input = @"
+class TestClass
+{
+	enum Enum{ };
+	int TestMethod (Enum i)
+	{
+		return i;
+	}
+}";
+			var output = @"
+class TestClass
+{
+	enum Enum{ };
+	int TestMethod (Enum i)
+	{
+		return (int)i;
+	}
+}";
+			Test<CS0029InvalidConversionIssue>(input, output);
+		}
+
+		[Test]
+		public void TestReturnInMethodChangeReturnType()
+		{
+			var input = @"
+class TestClass
+{
+	int TestMethod ()
+	{
+		return ""foo"";
+	}
+}";
+			var output = @"
+class TestClass
+{
+	string TestMethod ()
+	{
+		return ""foo"";
+	}
+}";
+			Test<CS0029InvalidConversionIssue>(input, output);
+		}
+
+		
+		[Test]
+		public void TestReturnInAnonymousMethod()
+		{
+			var input = @"using System;
+
+class TestClass
+{
+	enum Enum{ };
+	void TestMethod (Enum i)
+	{
+		Func<int> foo = delegate {
+			return i;
+		};
+	}
+}";
+			var output = @"using System;
+
+class TestClass
+{
+	enum Enum{ };
+	void TestMethod (Enum i)
+	{
+		Func<int> foo = delegate {
+			return (int)i;
+		};
+	}
+}";
+			Test<CS0029InvalidConversionIssue>(input, output);
+		}
+
+
+		[Test]
+		public void TestReturnInProperty()
+		{
+			var input = @"
+class TestClass
+{
+	enum Enum{ A };
+	int Test {
+		get {
+			return Enum.A;
+		}
+	}
+}";
+			var output = @"
+class TestClass
+{
+	enum Enum{ A };
+	int Test {
+		get {
+			return (int)Enum.A;
+		}
+	}
+}";
+			Test<CS0029InvalidConversionIssue>(input, output);
+		}
+
+		[Test]
+		public void TestCall()
+		{
+			var input = @"
+class TestClass
+{
+	enum Enum{ };
+	void Foo(string s, int i) {}
+	void TestMethod (Enum i)
+	{
+		Foo (""Bar"", i);
+	}
+}";
+			var output = @"
+class TestClass
+{
+	enum Enum{ };
+	void Foo(string s, int i) {}
+	void TestMethod (Enum i)
+	{
+		Foo (""Bar"", (int)i);
+	}
+}";
+			Test<CS0029InvalidConversionIssue>(input, output);
+		}
+
+
+		[Test]
+		public void TestCallWithOverloads()
+		{
+			var input = @"
+class TestClass
+{
+	enum Enum{ };
+	void Foo(string s, object o) {}
+	void Foo(string s, int i) {}
+	void TestMethod (Enum i)
+	{
+		Foo (""Bar"", i);
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues (new CS0029InvalidConversionIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void TestCallWithOverloads2()
+		{
+			var input = @"
+class TestClass
+{
+	enum Enum{ };
+	void Foo(string s, string o) {}
+	void Foo(string s, int i) {}
+	void TestMethod (Enum i)
+	{
+		Foo (""Bar"", i);
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues (new CS0029InvalidConversionIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+		}
+
+		[Test]
+		public void TestArrayInitializer()
+		{
+			var input = @"
+class TestClass
+{
+	enum Enum{ A }
+	public static void Main (string[] args)
+	{
+		System.Console.WriteLine (new int[] { Enum.A });
+	}
+}";
+			var output = @"
+class TestClass
+{
+	enum Enum{ A }
+	public static void Main (string[] args)
+	{
+		System.Console.WriteLine (new int[] { (int)Enum.A });
+	}
+}";
+			Test<CS0029InvalidConversionIssue>(input, output);
+		}
+		
+		[Test]
+		public void ExplicitConversionFromUnknownType()
+		{
+			string input = @"
+class Test {
+	void M(MissingInterface m) {
+		this.Project = (Project)m;
+	}
+	public Project Project { get; set; }
+}
+class Project : MissingInterface {}";
+			TestWrongContext<CS0029InvalidConversionIssue>(input);
+		}
+
+		[Test]
+		public void TestFixedConversion()
+		{
+			var input = @"unsafe struct TestMe
+{
+	fixed int textureID[8], fooBar[12];
+
+	public void Randomize ()
+	{
+		fixed (int* buf = textureID) {
+			buf [0] = 1;
+		}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues (new CS0029InvalidConversionIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void TestBinaryOperator()
+		{
+			var input = @"
+class TestClass
+{
+enum Enum{ };
+	void TestMethod (ulong i)
+	{
+		int x;
+		x = i + i;
+	}
+}";
+			var output = @"
+class TestClass
+{
+enum Enum{ };
+	void TestMethod (ulong i)
+	{
+		int x;
+		x = (int)(i + i);
+	}
+}";
+			Test<CS0029InvalidConversionIssue>(input, output);
+		}
+	
+		[Test]
+		public void TestDeclarationFix ()
+		{
+			Test<CS0029InvalidConversionIssue>(@"
+using System.Collections.Generic;
+class TestClass
+{
+	string[] str = new List<string> ();
+}", @"
+using System.Collections.Generic;
+class TestClass
+{
+	List<string> str = new List<string> ();
+}");
+		}
+
+		[Test]
+		public void TestLocalDeclarationFix ()
+		{
+			Test<CS0029InvalidConversionIssue>(@"
+using System.Collections.Generic;
+class TestClass
+{
+	void Foo ()
+	{
+		string[] str = new List<string> ();
+	}
+}", @"
+using System.Collections.Generic;
+class TestClass
+{
+	void Foo ()
+	{
+		var str = new List<string> ();
+	}
+}");
+		}
+
 	}
 }
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0126ReturnMustBeFollowedByAnyExpressionTestes.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0126ReturnMustBeFollowedByAnyExpressionTestes.cs
new file mode 100644
index 0000000000..d52a208920
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0126ReturnMustBeFollowedByAnyExpressionTestes.cs
@@ -0,0 +1,335 @@
+//
+// CS0126ReturnMustBeFollowedByAnyExpressionTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class CS0126ReturnMustBeFollowedByAnyExpressionTests : InspectionActionTestBase
+	{
+		static void Test(string type, string defaultValue)
+		{
+			Test<CS0126ReturnMustBeFollowedByAnyExpression>(@"class Foo
+{
+	" + type + @" Bar (string str)
+	{
+		return;
+	}
+}", @"class Foo
+{
+	" + type + @" Bar (string str)
+	{
+		return " + defaultValue + @";
+	}
+}");
+		}
+
+		[Test]
+		public void TestSimpleCase ()
+		{
+			Test("int", "0");
+			Test("string", "\"\"");
+			Test("char", "' '");
+			Test("bool", "false");
+			Test("object", "null");
+			Test("System.DateTime", "default(System.DateTime)");
+		}
+
+		[Test]
+		public void TestReturnTypeFix ()
+		{
+			var input = @"class Foo
+{
+	int Bar (string str)
+	{
+		return;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new CS0126ReturnMustBeFollowedByAnyExpression (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		return;
+	}
+}", 1);
+		}
+
+
+		[Test]
+		public void TestProperty ()
+		{
+			var input = @"class Foo {
+	string Bar 
+	{
+		get {
+			return;
+		}
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new CS0126ReturnMustBeFollowedByAnyExpression (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+		}
+
+		
+		[Test]
+		public void TestPropertySetter ()
+		{
+			var input = @"class Foo {
+	string Bar 
+	{
+		set {
+			return;
+		}
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new CS0126ReturnMustBeFollowedByAnyExpression (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+
+		[Test]
+		public void TestIndexer ()
+		{
+			var input = @"class Foo {
+	string this [int idx]
+	{
+		get {
+			return;
+		}
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new CS0126ReturnMustBeFollowedByAnyExpression (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+		}
+
+		[Test]
+		public void TestAnonymousMethod ()
+		{
+			var input = @"
+using System;
+class Foo
+{
+	void Bar (string str)
+	{
+		System.Func<string> func = delegate {
+			return;
+		};
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new CS0126ReturnMustBeFollowedByAnyExpression (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+		}
+
+
+		[Test]
+		public void TestAnonymousMethodReturnTypeFix ()
+		{
+			Test<CS0126ReturnMustBeFollowedByAnyExpression>(@"
+using System;
+class Foo
+{
+	int Bar (string str)
+	{
+		System.Func<string> func = delegate {
+			return;
+		};
+	}
+}", @"
+using System;
+class Foo
+{
+	int Bar (string str)
+	{
+		System.Func<string> func = delegate {
+			return """";
+		};
+	}
+}");
+		}
+
+		[Test]
+		public void TestAnonymousMethodReturningVoid ()
+		{
+			var input = @"using System;
+
+class Foo
+{
+	void Bar (string str)
+	{
+		Action func = delegate {
+			return;
+		};
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new CS0126ReturnMustBeFollowedByAnyExpression (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+
+		[Test]
+		public void TestLambdaMethod ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		System.Func<string> func = () => {
+			return;
+		};
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new CS0126ReturnMustBeFollowedByAnyExpression (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+		}
+
+		[Test]
+		public void TestOperatorFalsePositives ()
+		{
+			var input = @"class Foo
+{
+	public static bool operator == (Foo left, Foo right)
+	{
+		return;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new CS0126ReturnMustBeFollowedByAnyExpression (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+		}
+
+		[Test]
+		public void TestConstructor ()
+		{
+			var input = @"class Foo
+{
+	Foo ()
+	{
+		return;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new CS0126ReturnMustBeFollowedByAnyExpression (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+		[Test]
+		public void TestDestructor ()
+		{
+			var input = @"class Foo
+{
+	~Foo ()
+	{
+		return;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new CS0126ReturnMustBeFollowedByAnyExpression (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+		[Test]
+		public void TestDontShowUpOnUndecidableCase ()
+		{
+			TestWrongContext<CS0126ReturnMustBeFollowedByAnyExpression>(@"
+using System;
+
+class Test
+{
+	void Foo (Func<int, int> func) {}
+	void Foo (Action<int> func) {}
+
+	void Bar (string str)
+	{
+		Foo(delegate {
+			return;
+		});
+	}
+}");
+		}
+
+		[Test]
+		public void TestParallelForBug ()
+		{
+			TestWrongContext<CS0126ReturnMustBeFollowedByAnyExpression>(@"
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+
+class Test
+{
+	void FooBar(IEnumerable<string> str)
+	{
+		Parallel.ForEach(str, p => {
+			return;
+		});
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestConstructorInitializer ()
+		{
+			TestWrongContext<CS0126ReturnMustBeFollowedByAnyExpression>(@"
+using System;
+
+class Test
+{
+	Test (Func<int, int> func) {}
+	Test (Action<int> func) {}
+	
+	Test () : this (delegate { return; }) 
+	{
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0127ReturnMustNotBeFollowedByAnyExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0127ReturnMustNotBeFollowedByAnyExpressionTests.cs
index 1b31aff653..1322218899 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0127ReturnMustNotBeFollowedByAnyExpressionTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0127ReturnMustNotBeFollowedByAnyExpressionTests.cs
@@ -51,11 +51,35 @@ namespace ICSharpCode.NRefactory.CSharp.CodeIssues
 {
 	void Bar (string str)
 	{
-		return ;
+		return;
 	}
 }");
 		}
-		
+
+
+		[Test]
+		public void TestReturnTypeFix ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		return str;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new CS0127ReturnMustNotBeFollowedByAnyExpression (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	string Bar (string str)
+	{
+		return str;
+	}
+}", 1);
+		}
+
 		[Test]
 		public void TestSimpleInvalidCase ()
 		{
@@ -106,8 +130,48 @@ namespace ICSharpCode.NRefactory.CSharp.CodeIssues
 			Assert.AreEqual (0, issues.Count);
 		}
 
+		[Test]
+		public void TestIndexerSetter ()
+		{
+			var input = @"class Foo {
+	string this [int idx]
+	{
+		set {
+			return ""Hello World "";
+		}
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new CS0127ReturnMustNotBeFollowedByAnyExpression (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+		}
+
+
 		[Test]
 		public void TestAnonymousMethod ()
+		{
+			Test<CS0127ReturnMustNotBeFollowedByAnyExpression>(@"class Foo
+{
+	void Bar (string str)
+	{
+		System.Action func = delegate {
+			return str;
+		};
+	}
+}", @"class Foo
+{
+	void Bar (string str)
+	{
+		System.Action func = delegate {
+			return;
+		};
+	}
+}");
+		}
+
+		[Test]
+		public void TestAnonymousMethodReturningValue ()
 		{
 			var input = @"class Foo
 {
@@ -189,6 +253,54 @@ namespace ICSharpCode.NRefactory.CSharp.CodeIssues
 			var issues = GetIssues (new CS0127ReturnMustNotBeFollowedByAnyExpression (), input, out context);
 			Assert.AreEqual (1, issues.Count);
 		}
+	
+
+		[Test]
+		public void TestDontShowUpOnUndecidableCase ()
+		{
+			TestWrongContext<CS0127ReturnMustNotBeFollowedByAnyExpression>(@"
+using System;
+
+class Test
+{
+	void Foo (Func<int, int> func) {}
+	void Foo (Action<int> func) {}
+
+	void Bar (string str)
+	{
+		Foo(delegate {
+			return str;
+		});
+	}
+}");
+		}
+
+
+
+		/// <summary>
+		/// Bug 14843 - CS0127ReturnMustNotBeFollowedByAnyExpression Code Issue false positive
+		/// </summary>
+		[Test]
+		public void TestBug14843 ()
+		{
+			TestWrongContext<CS0127ReturnMustNotBeFollowedByAnyExpression>(@"
+using System;
+
+class Foo {
+	public Func<object, object> Func;
+}
+class Bar
+{
+	void Test ()
+	{
+		new Foo {
+			Func = o => {
+				return o;
+			}
+		};
+	}
+}");
+		}
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0152DuplicateCaseLabelValueIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0152DuplicateCaseLabelValueIssueTests.cs
new file mode 100644
index 0000000000..393b94e4a9
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0152DuplicateCaseLabelValueIssueTests.cs
@@ -0,0 +1,136 @@
+//
+// DuplicateCaseLabelValueIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class CS0152DuplicateCaseLabelValueIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestConstants()
+		{
+			TestIssue<CS0152DuplicateCaseLabelValueIssue>(@"
+class Test
+{
+	const int foo = 1;
+	void TestMethod (int i = 0)
+	{
+		switch (i) {
+			case 1:
+				System.Console.WriteLine();
+				break;
+			case foo:
+				System.Console.WriteLine();
+				break;
+			case 4:
+				default:
+			case 3:
+				break;
+		}
+	}
+}", 2);
+		}
+
+
+
+		[Test]
+		public void TestInts()
+		{
+			TestIssue<CS0152DuplicateCaseLabelValueIssue>(@"
+class Test
+{
+	void TestMethod (int i = 0)
+	{
+		switch (i) {
+		case 0:
+			System.Console.WriteLine();
+			break;
+		case 0:
+			System.Console.WriteLine();
+			break;
+		default:
+		case 0:
+			break;
+		}
+	}
+}", 3);
+		}
+
+		[Test]
+		public void TestStrings()
+		{
+			TestIssue<CS0152DuplicateCaseLabelValueIssue>(@"
+class Test
+{
+	void TestMethod (string i = 0)
+	{
+		switch (i) {
+		case ""	"":
+			System.Console.WriteLine();
+			break;
+		case ""\t"":
+			System.Console.WriteLine();
+			break;
+		default:
+		case @""	"":
+			break;
+		}
+	}
+}", 3);
+		}
+
+		[Test]
+		public void TestNoIssue()
+		{
+			TestWrongContext<CS0152DuplicateCaseLabelValueIssue>(@"
+class Test
+{
+	void TestMethod (int i = 0)
+	{
+		switch (i) {
+		case 1:
+			System.Console.WriteLine();
+			break;
+		case 2:
+			System.Console.WriteLine();
+			break;
+		case 4:
+		default:
+		case 3:
+			break;
+		}
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0183ExpressionIsAlwaysOfProvidedTypeIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0183ExpressionIsAlwaysOfProvidedTypeIssueTests.cs
new file mode 100644
index 0000000000..b3351d6364
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0183ExpressionIsAlwaysOfProvidedTypeIssueTests.cs
@@ -0,0 +1,154 @@
+// 
+// ExpressionIsAlwaysOfProvidedTypeIssueTests.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+ 
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class CS0183ExpressionIsAlwaysOfProvidedTypeIssueTests : InspectionActionTestBase
+	{
+		public void Test (string variableType, string providedType)
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod (" + variableType + @" x)
+	{
+		if (x is " + providedType + @")
+			;
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void TestMethod (" + variableType + @" x)
+	{
+		if (x != null)
+			;
+	}
+}";
+			Test<CS0183ExpressionIsAlwaysOfProvidedTypeIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestSameType ()
+		{
+			Test ("int", "int");
+		}
+
+		[Test]
+		public void TestBaseType ()
+		{
+			Test ("int", "object");
+		}
+
+		[Test]
+		public void TestTypeParameter ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod<T> (T x) where T : TestClass
+	{
+		if (x is TestClass)
+			;
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void TestMethod<T> (T x) where T : TestClass
+	{
+		if (x != null)
+			;
+	}
+}";
+			Test<CS0183ExpressionIsAlwaysOfProvidedTypeIssue> (input, 1, output);
+		}
+		
+		[Test]
+		public void IntIsNotDouble ()
+		{
+			var input = @"
+sealed class TestClass
+{
+	void TestMethod (int x)
+	{
+		if (x is double) ;
+	}
+}";
+			Test<CS0183ExpressionIsAlwaysOfProvidedTypeIssue> (input, 0);
+		}
+		
+		[Test]
+		public void MissingTypes ()
+		{
+			var input = @"
+sealed class TestClass
+{
+	void TestMethod (object x)
+	{
+		if (x.MissingMethod() is MissingClass) ;
+	}
+}";
+			Test<CS0183ExpressionIsAlwaysOfProvidedTypeIssue> (input, 0);
+		}
+
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<CS0183ExpressionIsAlwaysOfProvidedTypeIssue> (@"
+class TestClass
+{
+	void TestMethod (TestClass x)
+	{
+		// ReSharper disable once CSharpWarnings::CS0183
+		if (x is TestClass)
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void TestPragmaDisable()
+		{
+			TestWrongContext<CS0183ExpressionIsAlwaysOfProvidedTypeIssue> (@"
+class TestClass
+{
+	void TestMethod (TestClass x)
+	{
+#pragma warning disable 183
+		if (x is TestClass)
+#pragma warning restore 183
+			;
+	}
+}");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0659OverrideEqualsWithoutGetHashCodeTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0659OverrideEqualsWithoutGetHashCodeTests.cs
new file mode 100644
index 0000000000..a99e033438
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0659OverrideEqualsWithoutGetHashCodeTests.cs
@@ -0,0 +1,171 @@
+//
+// CS0659OverrideEqualsWithoutGetHashCodeTests.cs
+//
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+//
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeIssues;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class CS0659OverrideEqualsWithoutGetHashCodeTests : InspectionActionTestBase
+	{
+		[Test]
+		public void WithoutGetHashCode()
+		{
+			var input = @"
+namespace application
+{
+	public class BaseClass
+	{
+		public override bool Equals(object o)
+		{
+			return base.Equals(o);
+		}
+	}
+}";
+			var output = @"
+namespace application
+{
+	public class BaseClass
+	{
+		public override bool Equals(object o)
+		{
+			return base.Equals(o);
+		}
+		public override int GetHashCode ()
+		{
+			return base.GetHashCode ();
+		}
+	}
+}";
+			Test<CS0659ClassOverrideEqualsWithoutGetHashCode>(input, output);
+		}
+
+		[Test]
+		public void WithoutEquals()
+		{
+			var input = @"
+
+namespace application
+{
+	public class Program
+	{
+		public bool Equals(Program o)
+		{
+			return false;
+		}
+	}
+}";
+			Test<CS0659ClassOverrideEqualsWithoutGetHashCode>(input, 0);
+		}
+
+		[Test]
+		public void PatialClass()
+		{
+			var input = @"
+namespace application
+{
+	public partial class BaseClass
+	{
+		public override bool Equals(object o)
+		{
+			return base.Equals(o);
+		}
+	}
+	public partial class BaseClass
+	{
+		public override int GetHashCode ()
+		{
+			return base.GetHashCode ();
+		}
+	}
+}";
+
+			Test<CS0659ClassOverrideEqualsWithoutGetHashCode>(input, 0);
+		}
+
+		[Test]
+		public void WithGetHashCode()
+		{
+			var input = @"
+namespace application
+{
+	public class Program
+	{
+		public override int GetHashCode()
+		{
+			return 1;
+		}
+		public override bool Equals(Object o)
+		{
+			return false;
+		}
+	}
+}";
+			Test<CS0659ClassOverrideEqualsWithoutGetHashCode>(input, 0);
+		}
+
+		[Test]
+		public void ResharperDisable()
+		{
+			var input = @"
+namespace application
+{
+	public class Program
+	{
+//Resharper disable CSharpWarnings::CS0659
+		public override bool Equals(Object o)
+		{
+			return false;
+		}
+//Resharper restore CSharpWarnings::CS0659
+	}
+}";
+			Test<CS0659ClassOverrideEqualsWithoutGetHashCode>(input, 0);
+		}
+
+		[Test]
+		public void TestPragmaSuppression()
+		{
+			var input = @"
+namespace application
+{
+	public class Program
+	{
+#pragma warning disable 0659
+		public override bool Equals(Object o)
+		{
+			return false;
+		}
+#pragma warning restore 0659
+	}
+}";
+			Test<CS0659ClassOverrideEqualsWithoutGetHashCode>(input, 0);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0759RedundantPartialMethodIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0759RedundantPartialMethodIssueTests.cs
new file mode 100644
index 0000000000..8bddfbcdb7
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS0759RedundantPartialMethodIssueTests.cs
@@ -0,0 +1,86 @@
+// 
+// RedundantPartialMethodTests.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class CS0759RedundantPartialMethodIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestRedundantModifier()
+		{
+			var input = @"
+partial class TestClass
+{
+	partial void TestMethod ()
+	{
+		int i = 1;
+	}
+}";
+			var output = @"
+partial class TestClass
+{
+	void TestMethod ()
+	{
+		int i = 1;
+	}
+}";
+			Test<CS0759RedundantPartialMethodIssue>(input, 1, output);
+		}
+
+		[Test]
+		public void TestMethodWithNoBody()
+		{
+			var input = @"
+partial class TestClass
+{
+	partial void TestMethod ();
+}";
+			Test<CS0759RedundantPartialMethodIssue>(input, 0);
+		}
+
+		[Test]
+		public void TestNecessaryModifier()
+		{
+			var input = @"
+partial class TestClass
+{
+	partial void TestMethod ();
+}
+partial class TestClass
+{
+	partial void TestMethod ()
+	{
+		int i = 1;
+	}
+}";
+			Test<CS0759RedundantPartialMethodIssue>(input, 0);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS1573ParameterHasNoMatchingParamTagIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS1573ParameterHasNoMatchingParamTagIssueTests.cs
new file mode 100644
index 0000000000..a4f68e30e4
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS1573ParameterHasNoMatchingParamTagIssueTests.cs
@@ -0,0 +1,111 @@
+//
+// CS1573ParameterHasNoMatchingParamTagIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using System.Collections.Generic;
+using NUnit.Framework;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class CS1573ParameterHasNoMatchingParamTagIssueTests: InspectionActionTestBase
+	{
+		[Test]
+		public void TestMethodMissesParameter()
+		{
+			Test<CS1573ParameterHasNoMatchingParamTagIssue>(@"
+class Foo {
+	/// <summary/>
+	/// <param name = ""y""></param>
+	/// <param name = ""z""></param>
+	public void FooBar(int x, int y, int z)
+	{
+	}
+}
+", @"
+class Foo {
+	/// <summary/>
+	/// <param name = ""x""></param>
+	/// <param name = ""y""></param>
+	/// <param name = ""z""></param>
+	public void FooBar(int x, int y, int z)
+	{
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestNoParamDocs()
+		{
+			TestWrongContext<CS1573ParameterHasNoMatchingParamTagIssue>(@"
+class Foo {
+	/// <summary/>
+	public void FooBar(int x, int y, int z)
+	{
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<CS1573ParameterHasNoMatchingParamTagIssue>(@"
+class Foo {
+	/// <summary/>
+	/// <param name = ""y""></param>
+	/// <param name = ""z""></param>
+// ReSharper disable once CSharpWarnings::CS1573
+	public void FooBar(int x, int y, int z)
+	{
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestPragmaDisable()
+		{
+			TestWrongContext<CS1573ParameterHasNoMatchingParamTagIssue>(@"
+class Foo {
+	/// <summary/>
+	/// <param name = ""y""></param>
+	/// <param name = ""z""></param>
+#pragma warning disable 1573
+	public void FooBar(int x, int y, int z)
+#pragma warning restore 1573
+	{
+	}
+}
+");
+		}
+	
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS1717AssignmentMadeToSameVariableIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS1717AssignmentMadeToSameVariableIssueTests.cs
new file mode 100644
index 0000000000..3ed6b95ed1
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS1717AssignmentMadeToSameVariableIssueTests.cs
@@ -0,0 +1,266 @@
+// 
+// CS1717AssignmentMadeToSameVariableIssueTests.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class CS1717AssignmentMadeToSameVariableIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestVariable ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int a = 0;
+		a = a;
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int a = 0;
+	}
+}";
+			Test<CS1717AssignmentMadeToSameVariableIssue> (input, 1, output);
+		}
+
+        [Ignore("Parser/AST generation error - WarningList is empty")]
+        [Test]
+        public void TestPragmaSuppression()
+        {
+            var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+        int a = 0;
+#pragma warning disable 1717
+        a = a;
+#pragma warning restore 1717
+	}
+}";
+            TestWrongContext<CS1717AssignmentMadeToSameVariableIssue>(input);
+        }
+
+        [Test]
+        public void TestDisable()
+        {
+            var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+        int a = 0;
+// ReSharper disable once CSharpWarnings::CS1717
+        a = a;
+	}
+}";
+            TestWrongContext<CS1717AssignmentMadeToSameVariableIssue>(input);
+        }
+
+
+
+		[Test]
+		public void TestParameter ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+		a = a;
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+	}
+}";
+			Test<CS1717AssignmentMadeToSameVariableIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestField ()
+		{
+			var input = @"
+class TestClass
+{
+	int a;
+	void TestMethod ()
+	{
+		a = a;
+		this.a = this.a;
+		this.a = a;
+	}
+}";
+			var output = @"
+class TestClass
+{
+	int a;
+	void TestMethod ()
+	{
+	}
+}";
+			Test<CS1717AssignmentMadeToSameVariableIssue> (input, 3, output);
+		}
+
+		[Test]
+		public void TestFix ()
+		{
+			var input = @"
+class TestClass
+{
+	void Test (int i) { }
+	void TestMethod ()
+	{
+		int a = 0;
+		a = a;
+		Test (a = a);
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void Test (int i) { }
+	void TestMethod ()
+	{
+		int a = 0;
+		Test (a);
+	}
+}";
+			Test<CS1717AssignmentMadeToSameVariableIssue> (input, 2, output);
+		}
+		
+		[Test]
+		public void TestNoIssue ()
+		{
+			var input = @"
+class TestClass
+{
+	int a;
+	int b;
+
+	public int Prop { get; set; }
+
+	void TestMethod (int a)
+	{
+		a = b;
+		this.a = b;
+		this.a = a;
+		Prop = Prop;
+	}
+}";
+			Test<CS1717AssignmentMadeToSameVariableIssue> (input, 0);
+		}
+		
+		[Test]
+		public void IgnoresAssignmentWithDifferentRootObjects ()
+		{
+			var input = @"
+class TestClass
+{
+	int a;
+
+	void TestMethod (TestClass tc)
+	{
+		a = tc.a;
+	}
+}";
+			Test<CS1717AssignmentMadeToSameVariableIssue> (input, 0);
+		}
+		
+		[Test]
+		public void NestedFieldAccess ()
+		{
+			var input = @"
+class TestClass
+{
+	int a;
+
+	TestClass nested;
+
+	void TestMethod ()
+	{
+		nested.nested.a = nested.nested.a;
+	}
+}";
+			var output = @"
+class TestClass
+{
+	int a;
+
+	TestClass nested;
+
+	void TestMethod ()
+	{
+	}
+}";
+			Test<CS1717AssignmentMadeToSameVariableIssue> (input, 1, output);
+		}
+		
+		[Test]
+		public void NestedPropertyAccess ()
+		{
+			var input = @"
+class TestClass
+{
+	int a;
+
+	TestClass nested { get; set; }
+
+	void TestMethod ()
+	{
+		nested.nested.a = nested.nested.a;
+	}
+}";
+			Test<CS1717AssignmentMadeToSameVariableIssue> (input, 0);
+		}
+		
+		[Test]
+		public void TestNoIssueWithCompoundOperator ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+		a += a;
+	}
+}";
+			Test<CS1717AssignmentMadeToSameVariableIssue> (input, 0);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS1729TypeHasNoConstructorWithNArgumentsIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS1729TypeHasNoConstructorWithNArgumentsIssueTests.cs
new file mode 100644
index 0000000000..c452f8bd62
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CS1729TypeHasNoConstructorWithNArgumentsIssueTests.cs
@@ -0,0 +1,271 @@
+//
+// CS1729TypeHasNoConstructorWithNArgumentsIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeIssues;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using System.Linq;
+
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class CS1729TypeHasNoConstructorWithNArgumentsIssueTests : InspectionActionTestBase
+	{
+
+		[Test]
+		public void ShouldReturnIssueIfBaseConstructorNotInvoked()
+		{
+			var testInput =
+				@"class BaseClass
+{
+	public BaseClass(string input) {}
+}
+
+class ChildClass : BaseClass
+{
+}";
+
+			Test<CS1729TypeHasNoConstructorWithNArgumentsIssue>(testInput, 1);
+		}
+
+		[Test]
+		public void ShouldNotReturnIssueIfBaseClassHasDefaultConstructor()
+		{
+			var testInput =
+				@"class BaseClass
+{
+}
+
+class ChildClass : BaseClass
+{
+}";
+
+			Test<CS1729TypeHasNoConstructorWithNArgumentsIssue>(testInput, 0);
+		}
+
+		[Test]
+		public void ShouldNotReturnIssueIfBaseConstructorIsInvoked()
+		{
+			var testInput =
+				@"class BaseClass
+{
+	public BaseClass(string input) {}
+}
+
+class ChildClass : BaseClass
+{
+	public ChildClass() : base(""test"") {}
+}";
+
+			Test<CS1729TypeHasNoConstructorWithNArgumentsIssue>(testInput, 0);
+		}
+
+		[Test]
+		public void ShouldIgnoreInterfaces()
+		{
+			var testInput =
+				@"class TestClass : System.Collections.IList
+{
+}";
+
+			Test<CS1729TypeHasNoConstructorWithNArgumentsIssue>(testInput, 0);
+		}
+
+		[Test]
+		public void ShouldMakeSureAllConstructorsInvokeBaseConstructor()
+		{
+			var testInput =
+				@"class BaseClass
+{
+	public BaseClass(string test) {}
+}
+
+class ChildClass : BaseClass
+{
+	public ChildClass() : base(""test"") {}
+	public ChildClass(string test) {}
+}";
+
+			Test<CS1729TypeHasNoConstructorWithNArgumentsIssue>(testInput, 1);
+		}
+
+		[Test]
+		public void ShouldOnlyLookAtDirectBaseClasses()
+		{
+			var testInput =
+				@"class TopLevelClass
+{
+	public TopLevelClass(string test) {}
+}
+
+class BaseClass : TopLevelClass
+{
+	public BaseClass() : base(""hello"") {}
+}
+
+class ChildClass : BaseClass
+{
+}";
+
+			Test<CS1729TypeHasNoConstructorWithNArgumentsIssue>(testInput, 0);
+		}
+
+		[Test]
+		public void ShouldReturnAnIssueIfBaseConstructorIsPrivate()
+		{
+			var testInput =
+				@"class BaseClass
+{
+	private BaseClass() {}
+}
+
+class ChildClass : BaseClass
+{
+}";
+
+			Test<CS1729TypeHasNoConstructorWithNArgumentsIssue>(testInput, 1);
+		}
+
+		[Test]
+		public void ShouldReturnAnIssueIfBaseConstructorIsPrivate_ExplicitInitializer()
+		{
+			var testInput =
+				@"class BaseClass
+{
+	private BaseClass() {}
+}
+
+class ChildClass : BaseClass
+{
+	public ChildClass() : base() {}
+}";
+
+			Test<CS1729TypeHasNoConstructorWithNArgumentsIssue>(testInput, 1);
+		}
+
+		[Test]
+		public void ShouldReturnIssuesForNestedTypes()
+		{
+			TestRefactoringContext context;
+
+			var testInput =
+				@"class B {
+	public B(string test) {}
+}
+
+class D {
+	public D(string test) {}
+}
+
+class A : B {
+	class C : D {}
+	public A() {}
+}";
+
+			var issues = GetIssues(new CS1729TypeHasNoConstructorWithNArgumentsIssue(), testInput, out context, false);
+
+			Assert.AreEqual("CS1729: The type 'B' does not contain a constructor that takes '0' arguments", issues.ElementAt(1).Description);
+			Assert.AreEqual("CS1729: The type 'D' does not contain a constructor that takes '0' arguments", issues.ElementAt(0).Description);
+		}
+
+		[Test]
+		public void ShouldNotReturnIssueIfBaseClassCtorHasOptionalParameters()
+		{
+			var testInput =
+				@"class BaseClass
+{
+	public BaseClass(int i = 0)
+	{
+	}
+}
+
+class ChildClass : BaseClass
+{
+}";
+
+			Test<CS1729TypeHasNoConstructorWithNArgumentsIssue>(testInput, 0);
+		}
+
+		[Test]
+		public void ShouldNotReturnIssueIfBaseClassCtorHasVariadicParameters()
+		{
+			var testInput =
+				@"class BaseClass
+{
+	public BaseClass(params string[] str)
+	{
+	}
+}
+
+class ChildClass : BaseClass
+{
+}";
+
+			Test<CS1729TypeHasNoConstructorWithNArgumentsIssue>(testInput, 0);
+		}
+
+		[Test]
+		public void ShouldNotReturnIssueForStaticConstructor()
+		{
+			var testInput =
+				@"class BaseClass
+{
+	public BaseClass(string text)
+	{
+	}
+}
+
+class ChildClass : BaseClass
+{
+	public ChildClass() : base(""text"") {}
+	
+	static ChildClass() {}
+}";
+
+			Test<CS1729TypeHasNoConstructorWithNArgumentsIssue>(testInput, 0);
+		}
+
+		[Test]
+		public void ShowIssueForObjectCreateExpression()
+		{
+			var testInput =
+				@"class Test {
+	public void M() {
+		new Test(1);
+	}
+}
+";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new CS1729TypeHasNoConstructorWithNArgumentsIssue(), testInput, out context);
+
+			Assert.AreEqual("CS1729: The type 'Test' does not contain a constructor that takes '1' arguments", issues.Single().Description);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CallToVirtualFunctionFromConstructorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CallToVirtualFunctionFromConstructorTests.cs
deleted file mode 100644
index 814408d438..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CallToVirtualFunctionFromConstructorTests.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// CallToVirtualFunctionFromConstructorTests.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class CallToVirtualFunctionFromConstructorTests : InspectionActionTestBase
-	{
-
-		[Test]
-		public void CatchesBadCase()
-		{
-			var input = @"class Foo
-{
-	Foo()
-	{
-		Bar();
-		Bar();
-	}
-
-	virtual void Bar ()
-	{
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new CallToVirtualFunctionFromConstructorIssue(), input, out context);
-			Assert.AreEqual(2, issues.Count);
-		}
-
-		[Test]
-		public void IgnoresGoodCase()
-		{
-			var input = @"class Foo
-{
-	Foo()
-	{
-		Bar();
-		Bar();
-	}
-
-	void Bar ()
-	{
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new CallToVirtualFunctionFromConstructorIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void IgnoresSealedClasses()
-		{
-			var input = @"sealed class Foo
-{
-	Foo()
-	{
-		Bar();
-		Bar();
-	}
-
-	virtual void Bar ()
-	{
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new CallToVirtualFunctionFromConstructorIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void IgnoresNonLocalCalls()
-		{
-			var input = @"class Foo
-{
-	Foo()
-	{
-		Foo f = new Foo();
-		f.Bar();
-	}
-
-	virtual void Bar ()
-	{
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new CallToVirtualFunctionFromConstructorIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void IgnoresEventHandlers()
-		{
-			var input = @"class Foo
-{
-	Foo()
-	{
-		SomeEvent += delegate { Bar(); };
-	}
-
-	virtual void Bar ()
-	{
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new CallToVirtualFunctionFromConstructorIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CanBeReplacedWithTryCastAndCheckForNullIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CanBeReplacedWithTryCastAndCheckForNullIssueTests.cs
new file mode 100644
index 0000000000..827926befe
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CanBeReplacedWithTryCastAndCheckForNullIssueTests.cs
@@ -0,0 +1,228 @@
+//
+// CanBeReplacedWithTryCastAndCheckForNullIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class CanBeReplacedWithTryCastAndCheckForNullIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void SimpleCase()
+		{
+			TestIssue<CanBeReplacedWithTryCastAndCheckForNullIssue>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		if (foo is Bar) {
+			Baz ((Bar)foo);
+			return (Bar)foo;
+		}
+		return null;
+	}
+}
+");
+		}
+
+		[Test]
+		public void ComplexCase()
+		{
+			TestIssue<CanBeReplacedWithTryCastAndCheckForNullIssue>(@"
+class Bar
+{
+	public IDisposable Baz (object foo)
+	{
+		if (((foo) is Bar)) {
+			Baz ((Bar)foo);
+			Baz (foo as Bar);
+			Baz (((foo) as Bar));
+			Baz ((Bar)(foo));
+			return (IDisposable)foo;
+		}
+		return null;
+	}
+}
+");
+		}
+
+		[Test]
+		public void IfElseCase()
+		{
+			TestIssue<CanBeReplacedWithTryCastAndCheckForNullIssue>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		if (foo is Bar) {
+			Baz ((Bar)foo);
+			return (Bar)foo;
+		} else {
+			Console.WriteLine (""Hello World "");
+		}
+		return null;
+	}
+}
+");
+		}
+
+		[Test]
+		public void InvalidIfNoTypeCast()
+		{
+			TestWrongContext<CanBeReplacedWithTryCastAndCheckForNullIssue>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		if (foo is Bar) {
+			Console.WriteLine (""Hello World "");
+		}
+		return null;
+	}
+}
+");
+		}
+
+		[Test]
+		public void NestedIf()
+		{
+			TestIssue<CanBeReplacedWithTryCastAndCheckForNullIssue>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		if (foo is string) {
+		} else if (foo is Bar) {
+			Baz ((Bar)foo);
+			return (Bar)foo;
+		}
+		return null;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestNegatedCaseWithReturn()
+		{
+			TestIssue<CanBeReplacedWithTryCastAndCheckForNullIssue>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		if (!(foo is Bar))
+			return null;
+		Baz ((Bar)foo);
+		return (Bar)foo;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestNegatedCaseWithBreak()
+		{
+			TestIssue<CanBeReplacedWithTryCastAndCheckForNullIssue>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		for (int i = 0; i < 10; i++) {
+			if (!(foo is Bar))
+				break;
+			Baz ((Bar)foo);
+		}
+		return (Bar)foo;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestCaseWithContinue()
+		{
+			TestIssue<CanBeReplacedWithTryCastAndCheckForNullIssue>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		for (int i = 0; i < 10; i++) {
+			if (!(foo is Bar)) {
+				continue;
+			} else {
+				foo = new Bar ();
+			}
+			Baz ((Bar)foo);
+		}
+		return (Bar)foo;
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<CanBeReplacedWithTryCastAndCheckForNullIssue>(@"
+class Bar
+{
+	public Bar Baz (object foo)
+	{
+		// ReSharper disable once CanBeReplacedWithTryCastAndCheckForNull
+		if (foo is Bar) {
+			Baz ((Bar)foo);
+			return (Bar)foo;
+		}
+		return null;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestInvaludValueType()
+		{
+			TestWrongContext<CanBeReplacedWithTryCastAndCheckForNullIssue>(@"
+class Bar
+{
+	public int Baz (object foo)
+	{
+		if (foo is int) {
+			Baz ((int)foo);
+			return (int)foo;
+		}
+		return 0;
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CastExpressionOfIncompatibleTypeIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CastExpressionOfIncompatibleTypeIssueTests.cs
index 290b346080..19915fc305 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CastExpressionOfIncompatibleTypeIssueTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CastExpressionOfIncompatibleTypeIssueTests.cs
@@ -94,5 +94,20 @@ class TestClass
 
 			Test<CastExpressionOfIncompatibleTypeIssue> (input, 0);
 		}
+
+		[Test]
+		public void CheckTemplates ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod<T> (TestClass t)
+	{
+		var o = t as T;
+	}
+}";
+
+			Test<CastExpressionOfIncompatibleTypeIssue> (input, 0);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CheckNamespaceIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CheckNamespaceIssueTests.cs
new file mode 100644
index 0000000000..5f7c2fce38
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CheckNamespaceIssueTests.cs
@@ -0,0 +1,70 @@
+//
+// CheckNamespaceIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class CheckNamespaceIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestWrongNamespace ()
+		{
+			TestIssue<CheckNamespaceIssue>(@"namespace Foo {}");
+		}
+
+		[Test]
+		public void TestSubstring ()
+		{
+			TestIssue<CheckNamespaceIssue>(@"namespace TestFoo {}");
+		}
+
+
+		[Test]
+		public void TestGlobalClass ()
+		{
+			TestIssue<CheckNamespaceIssue>(@"class Foo {}");
+		}
+
+
+		[Test]
+		public void CheckValidNamespace ()
+		{
+			TestWrongContext<CheckNamespaceIssue>(@"namespace Test {}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<CheckNamespaceIssue>(@"
+// ReSharper disable once CheckNamespace
+namespace Foo {}");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CompareBooleanWithTrueOrFalseIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CompareBooleanWithTrueOrFalseIssueTests.cs
deleted file mode 100644
index 9212f3eb59..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CompareBooleanWithTrueOrFalseIssueTests.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// 
-// CompareBooleanWithTrueOrFalseIssueTests.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class CompareBooleanWithTrueOrFalseIssueTests : InspectionActionTestBase
-	{
-		[Test]
-		public void Test ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod (bool x)
-	{
-		bool y;
-		y = x == true;
-		y = x != false;
-		y = x != true;
-		y = x == false;
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod (bool x)
-	{
-		bool y;
-		y = x;
-		y = x;
-		y = !x;
-		y = !x;
-	}
-}";
-			Test<CompareBooleanWithTrueOrFalseIssue> (input, 4, output);
-		}
-
-		[Test]
-		public void TestInsertParentheses ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		bool y = 2 > 1 == false;
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		bool y = !(2 > 1);
-	}
-}";
-			Test<CompareBooleanWithTrueOrFalseIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestNullable ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod (bool? x)
-	{
-		var y = x == false;
-	}
-}";
-			Test<CompareBooleanWithTrueOrFalseIssue> (input, 0);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CompareFloatWithEqualityOperatorIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CompareFloatWithEqualityOperatorIssueTests.cs
deleted file mode 100644
index 1276d4f688..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CompareFloatWithEqualityOperatorIssueTests.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-// 
-// CompareFloatWithEqualityOperatorIssueTests.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class CompareFloatWithEqualityOperatorIssueTests : InspectionActionTestBase
-	{
-		public void Test (string inputOp, string outputOp)
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		double x = 0.1;
-		bool test = x " + inputOp + @" 0.1;
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		double x = 0.1;
-		bool test = System.Math.Abs (x - 0.1) " + outputOp + @" EPSILON;
-	}
-}";
-			Test<CompareFloatWithEqualityOperatorIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestEquality ()
-		{
-			Test ("==", "<");
-		}
-
-		[Test]
-		public void TestInequality ()
-		{
-			Test ("!=", ">");
-		}
-
-		[Test]
-		public void TestNaN ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod (double x, float y)
-	{
-		bool test = x == System.Double.NaN;
-		bool test2 = x != double.NaN;
-		bool test3 = y == float.NaN;
-		bool test4 = x != float.NaN;
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod (double x, float y)
-	{
-		bool test = double.IsNaN (x);
-		bool test2 = !double.IsNaN (x);
-		bool test3 = float.IsNaN (y);
-		bool test4 = !double.IsNaN (x);
-	}
-}";
-			Test<CompareFloatWithEqualityOperatorIssue> (input, 4, output);
-		}
-		
-		
-		[Test]
-		public void TestPositiveInfinity ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod (double x, float y)
-	{
-		bool test = x == System.Double.PositiveInfinity;
-		bool test2 = x != double.PositiveInfinity;
-		bool test3 = y == float.PositiveInfinity;
-		bool test4 = x != float.PositiveInfinity;
-	}
-}";
-			Test<CompareFloatWithEqualityOperatorIssue> (input, 0);
-		}
-		
-		[Test]
-		public void TestNegativeInfinity ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod (double x, float y)
-	{
-		bool test = x == System.Double.NegativeInfinity;
-		bool test2 = x != double.NegativeInfinity;
-		bool test3 = y == float.NegativeInfinity;
-		bool test4 = x != float.NegativeInfinity;
-	}
-}";
-			Test<CompareFloatWithEqualityOperatorIssue> (input, 0);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CompareNonConstrainedGenericWithNullIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CompareNonConstrainedGenericWithNullIssueTests.cs
new file mode 100644
index 0000000000..1a64affe34
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CompareNonConstrainedGenericWithNullIssueTests.cs
@@ -0,0 +1,104 @@
+//
+// CompareNonConstrainedGenericWithNullIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class CompareNonConstrainedGenericWithNullIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestLocal ()
+		{
+			Test<CompareNonConstrainedGenericWithNullIssue>(@"public class Bar
+{
+	public void Foo<T> (T t)
+	{
+		if (t == null) {
+		}
+	}
+}", @"public class Bar
+{
+	public void Foo<T> (T t)
+	{
+		if (t == default(T)) {
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestField ()
+		{
+			Test<CompareNonConstrainedGenericWithNullIssue>(@"public class Bar<T>
+{
+	T t;
+	public void Foo ()
+	{
+		if (t == null) {
+		}
+	}
+}", @"public class Bar<T>
+{
+	T t;
+	public void Foo ()
+	{
+		if (t == default(T)) {
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalid ()
+		{
+			TestWrongContext<CompareNonConstrainedGenericWithNullIssue>(@"public class Bar
+{
+	public void Foo<T> (T t) where T : class
+	{
+		if (t == null) {
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<CompareNonConstrainedGenericWithNullIssue>(@"public class Bar
+{
+	public void Foo<T> (T t)
+	{
+		// ReSharper disable once CompareNonConstrainedGenericWithNull
+		if (t == null) {
+		}
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CompareOfFloatsByEqualityOperatorIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CompareOfFloatsByEqualityOperatorIssueTests.cs
new file mode 100644
index 0000000000..22468d7b10
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/CompareOfFloatsByEqualityOperatorIssueTests.cs
@@ -0,0 +1,194 @@
+// 
+// CompareFloatWithEqualityOperatorIssueTests.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class CompareOfFloatsByEqualityOperatorIssueTests : InspectionActionTestBase
+	{
+		static void Test (string inputOp, string outputOp)
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		double x = 0.1;
+		bool test = x " + inputOp + @" 0.1;
+		bool test2 = x " + inputOp + @" 1ul;
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		double x = 0.1;
+		bool test = System.Math.Abs (x - 0.1) " + outputOp + @" EPSILON;
+		bool test2 = System.Math.Abs (x - 1ul) " + outputOp + @" EPSILON;
+	}
+}";
+			Test<CompareOfFloatsByEqualityOperatorIssue> (input, 2, output);
+		}
+
+		[Test]
+		public void TestEquality ()
+		{
+			Test ("==", "<");
+		}
+
+		[Test]
+		public void TestInequality ()
+		{
+			Test ("!=", ">");
+		}
+
+		[Test]
+		public void TestZero ()
+		{
+			Test<CompareOfFloatsByEqualityOperatorIssue> (@"
+class TestClass
+{
+	void TestMethod (double x, float y)
+	{
+		bool test = x == 0;
+		bool test2 = 0.0e10 != x;
+		bool test3 = 0L == y;
+		bool test4 = y != 0.0000;
+	}
+}", 4, @"
+class TestClass
+{
+	void TestMethod (double x, float y)
+	{
+		bool test = System.Math.Abs (x) < EPSILON;
+		bool test2 = System.Math.Abs (x) > EPSILON;
+		bool test3 = System.Math.Abs (y) < EPSILON;
+		bool test4 = System.Math.Abs (y) > EPSILON;
+	}
+}");
+		}
+
+		[Test]
+		public void TestNaN ()
+		{
+			Test<CompareOfFloatsByEqualityOperatorIssue> (@"
+class TestClass
+{
+	void TestMethod (double x, float y)
+	{
+		bool test = x == System.Double.NaN;
+		bool test2 = x != double.NaN;
+		bool test3 = y == float.NaN;
+		bool test4 = x != float.NaN;
+	}
+}", 4, @"
+class TestClass
+{
+	void TestMethod (double x, float y)
+	{
+		bool test = double.IsNaN (x);
+		bool test2 = !double.IsNaN (x);
+		bool test3 = float.IsNaN (y);
+		bool test4 = !double.IsNaN (x);
+	}
+}");
+		}
+		
+		
+		[Test]
+		public void TestPositiveInfinity ()
+		{
+
+			Test<CompareOfFloatsByEqualityOperatorIssue> (@"
+class TestClass
+{
+	void TestMethod (double x, float y)
+	{
+		bool test = x == System.Double.PositiveInfinity;
+		bool test2 = x != double.PositiveInfinity;
+		bool test3 = y == float.PositiveInfinity;
+		bool test4 = x != float.PositiveInfinity;
+	}
+}", 4, @"
+class TestClass
+{
+	void TestMethod (double x, float y)
+	{
+		bool test = double.IsPositiveInfinity (x);
+		bool test2 = !double.IsPositiveInfinity (x);
+		bool test3 = float.IsPositiveInfinity (y);
+		bool test4 = !double.IsPositiveInfinity (x);
+	}
+}");
+		}
+		
+		[Test]
+		public void TestNegativeInfinity ()
+		{
+			Test<CompareOfFloatsByEqualityOperatorIssue> (@"
+class TestClass
+{
+	void TestMethod (double x, float y)
+	{
+		bool test = x == System.Double.NegativeInfinity;
+		bool test2 = x != double.NegativeInfinity;
+		bool test3 = y == float.NegativeInfinity;
+		bool test4 = x != float.NegativeInfinity;
+	}
+}", 4, @"
+class TestClass
+{
+	void TestMethod (double x, float y)
+	{
+		bool test = double.IsNegativeInfinity (x);
+		bool test2 = !double.IsNegativeInfinity (x);
+		bool test3 = float.IsNegativeInfinity (y);
+		bool test4 = !double.IsNegativeInfinity (x);
+	}
+}");
+		}
+	
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<CompareOfFloatsByEqualityOperatorIssue> (@"
+class TestClass
+{
+	void TestMethod (double x, float y)
+	{
+		// ReSharper disable once CompareOfFloatsByEqualityOperator
+		if (x == y)
+			System.Console.WriteLine (x);
+	}
+}");
+
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConditionIsAlwaysTrueOrFalseIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConditionIsAlwaysTrueOrFalseIssueTests.cs
new file mode 100644
index 0000000000..6eca5d0b97
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConditionIsAlwaysTrueOrFalseIssueTests.cs
@@ -0,0 +1,276 @@
+//
+// ConditionIsAlwaysTrueOrFalseIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ConditionIsAlwaysTrueOrFalseIssueTests: InspectionActionTestBase
+	{
+		[Test]
+		public void TestComparsionWithNull ()
+		{
+			Test<ConditionIsAlwaysTrueOrFalseIssue>(@"
+class Test
+{
+	void Foo(int i)
+	{
+		if (i == null) {
+		}
+	}
+}
+", @"
+class Test
+{
+	void Foo(int i)
+	{
+		if (false) {
+		}
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestComparsionWithNullCase2 ()
+		{
+			Test<ConditionIsAlwaysTrueOrFalseIssue>(@"
+enum Bar { A, B }
+class Test
+{
+	void Foo(Bar i)
+	{
+		if (i != null) {
+		}
+	}
+}
+", @"
+enum Bar { A, B }
+class Test
+{
+	void Foo(Bar i)
+	{
+		if (true) {
+		}
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestComparison ()
+		{
+			Test<ConditionIsAlwaysTrueOrFalseIssue>(@"
+class Test
+{
+	void Foo(int i)
+	{
+		if (1 > 2) {
+		}
+	}
+}
+", @"
+class Test
+{
+	void Foo(int i)
+	{
+		if (false) {
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestUnary ()
+		{
+			Test<ConditionIsAlwaysTrueOrFalseIssue>(@"
+class Test
+{
+	void Foo(int i)
+	{
+		if (!true) {
+		}
+	}
+}
+", @"
+class Test
+{
+	void Foo(int i)
+	{
+		if (false) {
+		}
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ConditionIsAlwaysTrueOrFalseIssue>(@"
+class Test
+{
+	void Foo(int i)
+	{
+		// ReSharper disable once ConditionIsAlwaysTrueOrFalse
+		if (i == null) {
+		}
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void CompareWithNullable ()
+		{
+			TestWrongContext<ConditionIsAlwaysTrueOrFalseIssue>(@"
+class Bar
+{
+	public void Test(int? a)
+	{
+		if (a != null) {
+
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void UserDefinedOperatorsNoReferences()
+		{
+			TestIssue<ConditionIsAlwaysTrueOrFalseIssue>(@"
+struct Foo 
+{
+	public static bool operator ==(Foo value, Foo o)
+	{
+		return false;
+	}
+
+	public static bool operator !=(Foo value, Foo o)
+	{
+		return false;
+	}
+}
+
+class Bar
+{
+	public void Test(Foo a)
+	{
+		if (a != null) {
+
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void UserDefinedOperators()
+		{
+			TestWrongContext<ConditionIsAlwaysTrueOrFalseIssue>(@"
+struct Foo 
+{
+	public static bool operator ==(Foo value, object o)
+	{
+		return false;
+	}
+
+	public static bool operator !=(Foo value, object o)
+	{
+		return false;
+	}
+}
+
+class Bar
+{
+	public void Test(Foo a)
+	{
+		if (a != null) {
+
+		}
+	}
+}
+");
+		}
+
+
+		/// <summary>
+		/// Bug 15099 - Wrong always true context
+		/// </summary>
+		[Test]
+		public void TestBug15099()
+		{
+			TestWrongContext<ConditionIsAlwaysTrueOrFalseIssue>(@"
+struct Foo 
+{
+	string name;
+
+	public Foo (string name)
+	{
+		this.name = name;
+	}
+
+	public static bool operator ==(Foo value, Foo o)
+	{
+		return value.name == o.name;
+	}
+
+	public static bool operator !=(Foo value, Foo o)
+	{
+		return !(value == o);
+	}
+
+	public static implicit operator Foo (string name)
+	{
+		return new Foo (name);
+	}
+}
+
+class Bar
+{
+	public static void Main (string[] args)
+	{
+		var foo = new Foo (null);
+		System.Console.WriteLine (foo == null);
+	}
+}");
+		}
+
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConditionalTernaryEqualBranchTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConditionalTernaryEqualBranchTests.cs
new file mode 100644
index 0000000000..b707d39465
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConditionalTernaryEqualBranchTests.cs
@@ -0,0 +1,142 @@
+//
+// ConditionalTernaryEqualBranchTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ConditionalTernaryEqualBranchTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestInspectorCase1 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		string c = str != null ? ""default"" : ""default"";
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConditionalTernaryEqualBranchIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+
+			CheckFix (context, issues [0], @"class Foo
+{
+	void Bar (string str)
+	{
+		string c = ""default"";
+	}
+}");
+
+		}
+
+		[Test]
+		public void TestMoreComplexBranch ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		var c = str != null ? 3 + (3 * 4) - 12 * str.Length : 3 + (3 * 4) - 12 * str.Length;
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConditionalTernaryEqualBranchIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+
+			CheckFix (context, issues [0], @"class Foo
+{
+	void Bar (string str)
+	{
+		var c = 3 + (3 * 4) - 12 * str.Length;
+	}
+}");
+
+		}
+
+		[Test]
+		public void TestNotEqualBranches ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		string c = str != null ? ""default"" : ""default2"";
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConditionalTernaryEqualBranchIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+
+		}
+
+		[Test]
+		public void TestResharperSuppression ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+// ReSharper disable once ConditionalTernaryEqualBranch
+		string c = str != null ? ""default"" : ""default"";
+	}
+}";
+			TestRefactoringContext context;
+            var issues = GetIssues(new ConditionalTernaryEqualBranchIssue(), input, out context);
+			Assert.AreEqual (0, issues.Count);
+
+		}
+
+        [Test]
+        public void Test()
+        {
+            var input = @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		var a = i > 0 ? 1 + 1 : 1 + 1;
+		var b = i > 1 ? 1 : 2;
+	}
+}";
+            var output = @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		var a = 1 + 1;
+		var b = i > 1 ? 1 : 2;
+	}
+}";
+            Test<ConditionalTernaryEqualBranchIssue>(input, 1, output);
+        }
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConditionalToNullCoalescingInspectorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConditionalToNullCoalescingInspectorTests.cs
deleted file mode 100644
index 4240f55a68..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConditionalToNullCoalescingInspectorTests.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-// 
-// ConditionalToNullCoalescingInspectorTests.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class ConditionalToNullCoalescingInspectorTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestInspectorCase1 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		string c = str != null ? str : ""default"";
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues (new ConditionalToNullCoalescingIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-
-			CheckFix (context, issues [0], @"class Foo
-{
-	void Bar (string str)
-	{
-		string c = str ?? ""default"";
-	}
-}");
-
-		}
-
-		[Test]
-		public void TestInspectorCase2 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		string c = null != str ? str : ""default"";
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues (new ConditionalToNullCoalescingIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			
-			CheckFix (context, issues [0], @"class Foo
-{
-	void Bar (string str)
-	{
-		string c = str ?? ""default"";
-	}
-}");
-
-		}
-
-		[Test]
-		public void TestInspectorCase3 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		string c = null == str ? ""default"" : str;
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues (new ConditionalToNullCoalescingIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			
-			CheckFix (context, issues [0], @"class Foo
-{
-	void Bar (string str)
-	{
-		string c = str ?? ""default"";
-	}
-}");
-		}
-
-		[Test]
-		public void TestInspectorCase4 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		string c = str == null ? ""default"" : str;
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues (new ConditionalToNullCoalescingIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			
-			CheckFix (context, issues [0], @"class Foo
-{
-	void Bar (string str)
-	{
-		string c = str ?? ""default"";
-	}
-}");
-		}
-
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConstantNullCoalescingConditionIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConstantNullCoalescingConditionIssueTests.cs
new file mode 100644
index 0000000000..49a2113ec3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConstantNullCoalescingConditionIssueTests.cs
@@ -0,0 +1,148 @@
+// 
+// RedundantNullCoalescingExpressionTests.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeCompletion;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ConstantNullCoalescingConditionIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestNullRightSide()
+		{
+			Test<ConstantNullCoalescingConditionIssue>(@"
+class TestClass
+{
+	void Foo()
+	{
+		object o = new object () ?? null;
+	}
+}", @"
+class TestClass
+{
+	void Foo()
+	{
+		object o = new object ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestNullLeftSide()
+		{
+			Test<ConstantNullCoalescingConditionIssue>(@"
+class TestClass
+{
+	void Foo()
+	{
+		object o = null ?? new object ();
+	}
+}", @"
+class TestClass
+{
+	void Foo()
+	{
+		object o = new object ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestEqualExpressions()
+		{
+			Test<ConstantNullCoalescingConditionIssue>(@"
+class TestClass
+{
+	void Foo()
+	{
+		object o = new object () ?? new object ();
+	}
+}", @"
+class TestClass
+{
+	void Foo()
+	{
+		object o = new object ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestSmartUsage()
+		{
+			//Previously, this was a "TestWrongContext".
+			//However, since smart null coallescing was introduced, this can now be
+			//detected as redundant
+			Test<ConstantNullCoalescingConditionIssue>(@"
+class TestClass
+{
+	void Foo()
+	{
+		object o = new object () ?? """";
+	}
+}", @"
+class TestClass
+{
+	void Foo()
+	{
+		object o = new object ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestSmartUsageInParam()
+		{
+			TestWrongContext<ConstantNullCoalescingConditionIssue>(@"
+class TestClass
+{
+	void Foo(object o)
+	{
+		object p = o ?? """";
+	}
+}");
+		}
+
+		[Ignore("enable again")]
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<ConstantNullCoalescingConditionIssue>(@"
+class TestClass
+{
+	void Foo()
+	{
+		// ReSharper disable once ConstantNullCoalescingCondition
+		object o = new object () ?? null;
+	}
+}");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertClosureToMethodGroupIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertClosureToMethodGroupIssueTests.cs
new file mode 100644
index 0000000000..61d5e11d89
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertClosureToMethodGroupIssueTests.cs
@@ -0,0 +1,378 @@
+//
+// SimplifyAnonymousMethodToDelegateIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ConvertClosureToMethodGroupIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleVoidLambda ()
+		{
+			var input = @"using System;
+class Foo
+{
+	void Bar (string str)
+	{
+		Action<int, int> action = $(foo, bar) => MyMethod (foo, bar);
+	}
+	void MyMethod(int foo, int bar) {}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConvertClosureToMethodGroupIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"using System;
+class Foo
+{
+	void Bar (string str)
+	{
+		Action<int, int> action = MyMethod;
+	}
+	void MyMethod(int foo, int bar) {}
+}");
+		}
+		
+		[Test]
+		public void TestSimpleBoolLambda ()
+		{
+			var input = @"using System;
+class Foo
+{
+	void Bar (string str)
+	{
+		Func<int, int, bool> action = $(foo, bar) => MyMethod (foo, bar);
+	}
+	bool MyMethod(int foo, int bar) {}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConvertClosureToMethodGroupIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"using System;
+class Foo
+{
+	void Bar (string str)
+	{
+		Func<int, int, bool> action = MyMethod;
+	}
+	bool MyMethod(int foo, int bar) {}
+}");
+		}
+
+		[Test]
+		public void TestLambdaWithBody ()
+		{
+			var input = @"using System;
+class Foo
+{
+	void Bar (string str)
+	{
+		Action<int, int> action = $(foo, bar) => { return MyMethod (foo, bar); };
+	}
+	void MyMethod(int foo, int bar) {}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConvertClosureToMethodGroupIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"using System;
+class Foo
+{
+	void Bar (string str)
+	{
+		Action<int, int> action = MyMethod;
+	}
+	void MyMethod(int foo, int bar) {}
+}");
+		}
+
+		[Test]
+		public void Lambda_SwapParameterOrder ()
+		{
+			var input = @"using System;
+class Foo
+{
+	void Bar (string str)
+	{
+		Action<int, int> action = $(foo, bar) => MyMethod (bar, foo);
+	}
+	void MyMethod(int foo, int bar) {}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConvertClosureToMethodGroupIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+		[Test]
+		public void TestSimpleAnonymousMethod ()
+		{
+			var input = @"using System;
+class Foo
+{
+	int MyMethod (int x, int y) { return x * y; }
+
+	void Bar (string str)
+	{
+		Func<int, int, int> action = $delegate(int foo, int bar) { return MyMethod (foo, bar); };
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConvertClosureToMethodGroupIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"using System;
+class Foo
+{
+	int MyMethod (int x, int y) { return x * y; }
+
+	void Bar (string str)
+	{
+		Func<int, int, int> action = MyMethod;
+	}
+}");
+		}
+
+		[Test]
+		public void TestSkipComplexCase ()
+		{
+			var input = @"using System;
+using System.Linq;
+
+class Foo
+{
+	int MyMethod (int x, int y) { return x * y; }
+
+	void Bar (string str)
+	{
+		Func<char[]> action = $() => str.Where (c => c != 'a').ToArray ();
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConvertClosureToMethodGroupIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+		[Test]
+		public void CallInvolvesOptionalParameter ()
+		{
+			var input = @"using System;
+class Foo
+{
+	int MyMethod (int x, int y = 1) { return x * y; }
+
+	void Bar (string str)
+	{
+		Func<int, int> action = $foo => MyMethod (foo);
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConvertClosureToMethodGroupIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+		[Test]
+		public void CallExpandsParams ()
+		{
+			var input = @"using System;
+class Foo
+{
+	int MyMethod (params object[] args) { return 0; }
+
+	void Bar (string str)
+	{
+		Func<string, int> action = $foo => MyMethod (foo);
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConvertClosureToMethodGroupIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+		/// <summary>
+		/// Bug 12184 - Expression can be reduced to delegate fix can create ambiguity
+		/// </summary>
+		[Test]
+		public void TestBug12184 ()
+		{
+			var input = @"using System;
+using System.Threading.Tasks;
+
+class C
+{
+	public static C GetResponse () { return null; }
+
+	public static void Foo ()
+	{
+		Task.Factory.StartNew (() => GetResponse());
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConvertClosureToMethodGroupIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+/*			CheckFix (context, issues, @"using System;
+using System.Threading.Tasks;
+
+class C
+{
+	public static C GetResponse () { return null; }
+
+	public static void Foo ()
+	{
+		Task.Factory.StartNew ((Func<C>)GetResponse);
+	}
+}");*/
+
+		}
+
+		[Test]
+		public void Return_ReferenceConversion ()
+		{
+			var input = @"using System;
+class Foo
+{
+	void Bar (string str)
+	{
+		Func<int, object> action = $foo => MyMethod(foo);
+	}
+	string MyMethod(int foo) {}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConvertClosureToMethodGroupIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+		}
+		
+		[Test]
+		public void Return_BoxingConversion ()
+		{
+			var input = @"using System;
+class Foo
+{
+	void Bar (string str)
+	{
+		Func<int, object> action = $foo => MyMethod(foo);
+	}
+	bool MyMethod(int foo) {}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConvertClosureToMethodGroupIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+		
+		[Test]
+		public void Parameter_ReferenceConversion ()
+		{
+			var input = @"using System;
+class Foo
+{
+	void Bar (string str)
+	{
+		Action<string> action = $foo => MyMethod(foo);
+	}
+	void MyMethod(object foo) {}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConvertClosureToMethodGroupIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+		}
+		
+		[Test]
+		public void Parameter_BoxingConversion ()
+		{
+			var input = @"using System;
+class Foo
+{
+	void Bar (string str)
+	{
+		Action<int> action = $foo => MyMethod(foo);
+	}
+	void MyMethod(object foo) {}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConvertClosureToMethodGroupIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+		/// <summary>
+		/// Bug 14759 - Lambda expression can be simplified to method group issue
+		/// </summary>
+		[Test]
+		public void TestBug14759 ()
+		{
+			TestWrongContext<ConvertClosureToMethodGroupIssue>(@"using System;
+using System.Collections.Generic;
+
+class C
+{
+	static bool DoStuff (int i)
+	{
+		return true;
+	}
+ 
+	public static void Main(string[] args)
+	{
+		List<int> list = new List<int> (2);
+		list.Add (1);
+		list.Add (3);
+		list.ForEach (u => DoStuff (u));
+	}
+}");
+		}
+
+		[Test]
+		public void TestTargetCollision ()
+		{
+			TestWrongContext<ConvertClosureToMethodGroupIssue>(@"
+using System;
+
+class Program
+{
+	public void Foo(Action act) {}
+	public void Foo(Action<int> act) {}
+
+	void Test ()
+	{
+		Foo (i => Console.WriteLine (i));
+	}
+}");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertConditionalTernaryToNullCoalescingIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertConditionalTernaryToNullCoalescingIssueTests.cs
new file mode 100644
index 0000000000..25cfed6c17
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertConditionalTernaryToNullCoalescingIssueTests.cs
@@ -0,0 +1,185 @@
+// 
+// ConvertConditionalTernaryToNullCoalescingIssueTests.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ConvertConditionalTernaryToNullCoalescingIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestInspectorCase1 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		string c = str != null ? str : ""default"";
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConvertConditionalTernaryToNullCoalescingIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+
+			CheckFix (context, issues [0], @"class Foo
+{
+	void Bar (string str)
+	{
+		string c = str ?? ""default"";
+	}
+}");
+
+		}
+
+		[Test]
+		public void TestInspectorCase2 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		string c = null != str ? str : ""default"";
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConvertConditionalTernaryToNullCoalescingIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			
+			CheckFix (context, issues [0], @"class Foo
+{
+	void Bar (string str)
+	{
+		string c = str ?? ""default"";
+	}
+}");
+
+		}
+
+		[Test]
+		public void TestInspectorCase3 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		string c = null == str ? ""default"" : str;
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConvertConditionalTernaryToNullCoalescingIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			
+			CheckFix (context, issues [0], @"class Foo
+{
+	void Bar (string str)
+	{
+		string c = str ?? ""default"";
+	}
+}");
+		}
+
+		[Test]
+		public void TestInspectorCase4 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		string c = str == null ? ""default"" : str;
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues (new ConvertConditionalTernaryToNullCoalescingIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			
+			CheckFix (context, issues [0], @"class Foo
+{
+	void Bar (string str)
+	{
+		string c = str ?? ""default"";
+	}
+}");
+		}
+
+        [Test]
+        public void TestDisable()
+        {
+            var input = @"class Foo
+{
+	void Bar (string str)
+	{
+// ReSharper disable once ConvertConditionalTernaryToNullCoalescing
+		string c = str != null ? str : ""default"";
+	}
+}";
+            TestRefactoringContext context;
+            var issues = GetIssues(new ConvertConditionalTernaryToNullCoalescingIssue(), input, out context);
+            Assert.AreEqual(0, issues.Count);
+        }
+	
+		[Test]
+		public void TestCastCase ()
+		{
+			Test<ConvertConditionalTernaryToNullCoalescingIssue>(@"class Foo
+{
+	void Bar (Foo o, Bar b)
+	{
+		IDisposable c = o != null ? (IDisposable)o : b;
+	}
+}", @"class Foo
+{
+	void Bar (Foo o, Bar b)
+	{
+		IDisposable c = (IDisposable)o ?? b;
+	}
+}");
+		}
+
+		[Test]
+		public void TestCastCase2 ()
+		{
+			Test<ConvertConditionalTernaryToNullCoalescingIssue>(@"class Foo
+{
+	void Bar (Foo o, Bar b)
+	{
+		IDisposable c = o == null ? (IDisposable)b : o;
+	}
+}", @"class Foo
+{
+	void Bar (Foo o, Bar b)
+	{
+		IDisposable c = (IDisposable)o ?? b;
+	}
+}");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfDoToWhileIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfDoToWhileIssueTests.cs
new file mode 100644
index 0000000000..407dd09946
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfDoToWhileIssueTests.cs
@@ -0,0 +1,117 @@
+//
+// ConvertIfDoToWhileIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ConvertIfDoToWhileIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestBasicCase ()
+		{
+			Test<ConvertIfDoToWhileIssue>(@"class FooBar
+{
+	public void FooFoo (int x)
+	{
+		if (x < 10) {
+			do {
+				Console.WriteLine (x++);
+			} while (x < 10);
+		}
+	}
+}", @"class FooBar
+{
+	public void FooFoo (int x)
+	{
+		while (x < 10) {
+			Console.WriteLine (x++);
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestWithoutBlocks ()
+		{
+			Test<ConvertIfDoToWhileIssue>(@"class FooBar
+{
+	public void FooFoo (int x)
+	{
+		if (x < 10)
+			do 
+				Console.WriteLine (x++);
+			while (x < 10);
+	}
+}", @"class FooBar
+{
+	public void FooFoo (int x)
+	{
+		while (x < 10)
+			Console.WriteLine (x++);
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalidCase ()
+		{
+			TestWrongContext<ConvertIfDoToWhileIssue>(@"class FooBar
+{
+	public void FooFoo (int x)
+	{
+		if (x < 10) {
+			do {
+				Console.WriteLine (x++);
+			} while (x < 11);
+		}
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ConvertIfDoToWhileIssue>(@"class FooBar
+{
+	public void FooFoo (int x)
+	{
+		// ReSharper disable once ConvertIfDoToWhile
+		if (x < 10) {
+			do {
+				Console.WriteLine (x++);
+			} while (x < 10);
+		}
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfStatementToConditionalTernaryExpressionIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfStatementToConditionalTernaryExpressionIssueTests.cs
new file mode 100644
index 0000000000..edb12428fd
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfStatementToConditionalTernaryExpressionIssueTests.cs
@@ -0,0 +1,164 @@
+//
+// ConvertIfStatementToConditionalTernaryExpressionIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ConvertIfStatementToConditionalTernaryExpressionIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestIfElse ()
+		{
+			TestIssue<ConvertIfStatementToConditionalTernaryExpressionIssue>(@"class Foo
+{
+	static int Bar (int x)
+	{
+		int result;
+		if (x > 10)
+			result = 10;
+		else
+			result = 20;
+		return result;
+	}
+}");
+		}
+
+		[Test]
+		public void TestSkipComplexCondition ()
+		{
+			TestWrongContext<ConvertIfStatementToConditionalTernaryExpressionIssue>(@"class Foo
+{
+	static int Bar (int x)
+	{
+		int result;
+		if (x > 10 ||
+		    x < -10)
+			result = 10;
+		else
+			result = 20;
+		return result;
+	}
+}");
+		}
+
+		[Test]
+		public void TestSkipIfElseIf ()
+		{
+			TestWrongContext<ConvertIfStatementToConditionalTernaryExpressionIssue>(@"class Foo
+{
+	static int Bar (int x)
+	{
+		int result;
+		if (x < 10)
+			result = -10;
+		else if (x > 10)
+			result = 10;
+		else
+			result = 20;
+		return result;
+	}
+}");
+		}
+
+		[Test]
+		public void TestSkipComplexTrueExpression ()
+		{
+			TestWrongContext<ConvertIfStatementToConditionalTernaryExpressionIssue>(@"class Foo
+{
+	static int Bar (int x)
+	{
+		int result;
+		if (x > 10)
+			result = 10 +
+					 12;
+		else
+			result = 20;
+		return result;
+	}
+}");
+		}
+
+		[Test]
+		public void TestSkipComplexFalseExpression ()
+		{
+			TestWrongContext<ConvertIfStatementToConditionalTernaryExpressionIssue>(@"class Foo
+{
+	static int Bar (int x)
+	{
+		int result;
+		if (x > 10)
+			result = 10;
+		else
+			result = 20 +
+
+12;
+		return result;
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ConvertIfStatementToConditionalTernaryExpressionIssue>(@"class Foo
+{
+	static int Bar (int x)
+	{
+		int result;
+		// ReSharper disable once ConvertIfStatementToConditionalTernaryExpression
+		if (x > 10)
+			result = 10;
+		else
+			result = 20;
+		return result;
+	}
+}");
+		}
+
+		[Test]
+		public void TestSkipAnnoyingCase1 ()
+		{
+			TestWrongContext<ConvertIfStatementToConditionalTernaryExpressionIssue>(@"class Foo
+{
+	int Bar(string example)
+	{
+		if (!string.IsNullOrEmpty (example)) {
+			text = Environment.NewLine != ""\n"" ? example.Replace (""\n"", Environment.NewLine) : example;
+		} else {
+			text = """";
+		}
+	}
+}");
+		}
+		
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfStatementToNullCoalescingExpressionIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfStatementToNullCoalescingExpressionIssueTests.cs
new file mode 100644
index 0000000000..8166e29241
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfStatementToNullCoalescingExpressionIssueTests.cs
@@ -0,0 +1,98 @@
+//
+// ConvertIfStatementToNullCoalescingExpressionIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ConvertIfStatementToNullCoalescingExpressionIssueTests: InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase ()
+		{
+			TestIssue<ConvertIfStatementToNullCoalescingExpressionIssue>(@"class Foo
+{
+	int Bar(object o)
+	{
+		var ob = o;
+		if (ob == null)
+			ob = this;
+	}
+}");
+		}
+
+		[Test]
+		public void TestSkipComplexExpression ()
+		{
+			TestWrongContext<ConvertIfStatementToNullCoalescingExpressionIssue>(@"class Foo
+{
+	int Bar(object o)
+	{
+		var ob = o;
+		if (ob == null)
+			ob = this +
+12;
+	}
+}");
+		}
+
+		[Test]
+		public void TestSkipComplexAssignment ()
+		{
+			TestWrongContext<ConvertIfStatementToNullCoalescingExpressionIssue>(@"class Foo
+{
+	int Bar(object o)
+	{
+		var ob = o  +
+
+12;
+		if (ob == null)
+			ob = this;
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ConvertIfStatementToNullCoalescingExpressionIssue>(@"class Foo
+{
+	int Bar(object o)
+	{
+		// ReSharper disable once ConvertIfStatementToNullCoalescingExpression
+		var ob = o;
+		if (ob == null)
+			ob = this;
+	}
+}");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfStatementToSwitchStatementIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfStatementToSwitchStatementIssueTests.cs
new file mode 100644
index 0000000000..59e18f7933
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfStatementToSwitchStatementIssueTests.cs
@@ -0,0 +1,398 @@
+//
+// ConvertIfStatementToSwitchStatementIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ConvertIfStatementToSwitchStatementIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestBreak ()
+		{
+			TestIssue<ConvertIfStatementToSwitchStatementIssue> (@"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+		int b;
+		$if (a == 0) {
+			b = 0;
+		} else if (a == 1) {
+			b = 1;
+		} else if (a == 2 || a == 3) {
+			b = 2;
+		} else {
+			b = 3;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestReturn ()
+		{
+			TestIssue<ConvertIfStatementToSwitchStatementIssue> (@"
+class TestClass
+{
+	int TestMethod (int a)
+	{
+		$if (a == 0) {
+			int b = 1;
+			return b + 1;
+		} else if (a == 2 || a == 3) {
+			return 2;
+		} else if (a == 13) {
+			return 12;
+		} else {
+			return -1;
+		}
+	}
+}");
+		}
+		
+		[Test]
+		public void TestConstantExpression ()
+		{
+			TestIssue<ConvertIfStatementToSwitchStatementIssue> (@"
+class TestClass
+{
+	int TestMethod (int? a)
+	{
+		if (a == (1 == 1 ? 11 : 12)) {
+			return 1;
+		} else if (a == (2 * 3) + 1 || a == 6 / 2) {
+			return 2;
+		} else if (a == null || a == (int)(10L + 2) || a == default(int) || a == sizeof(int)) {
+			return 3;		
+		} else {
+			return -1;
+		}
+	}
+}");
+
+
+			TestIssue<ConvertIfStatementToSwitchStatementIssue> (@"
+class TestClass
+{
+	const int b = 0;
+	int TestMethod (int a)
+	{
+		const int c = 1;
+		$if (a == b) {
+			return 1;
+		} else if (a == b + c) {
+			return 0;
+		} else if (a ==  c) {
+			return 2;
+		} else {
+			return -1;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestNestedOr ()
+		{
+			TestIssue<ConvertIfStatementToSwitchStatementIssue> (@"
+class TestClass
+{
+	int TestMethod (int a)
+	{
+		$if (a == 0) {
+			return 1;
+		} else if ((a == 2 || a == 4) || (a == 3 || a == 5)) {
+			return 2;
+		} else if (a == 12) {
+			return 23;
+		} else {
+			return -1;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestComplexSwitchExpression ()
+		{
+			TestIssue<ConvertIfStatementToSwitchStatementIssue> (@"
+class TestClass
+{
+	int TestMethod (int a, int b)
+	{
+		$if (a + b == 0) {
+			return 1;
+		} else if (1 == a + b) {
+			return 0;
+		} else if (2 == a + b) {
+			return 0;
+		} else {
+			return -1;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestNonConstantExpression ()
+		{
+			TestWrongContext<ConvertIfStatementToSwitchStatementIssue> (@"
+class TestClass
+{
+	void TestMethod (int a, int c)
+	{
+		int b;
+		$if (a == 0) {
+			b = 0;
+		} else if (a == c) {
+			b = 1;
+		} else if (a == 2 || a == 3) {
+			b = 2;
+		} else {
+			b = 3;
+		}
+	}
+}");
+			TestWrongContext<ConvertIfStatementToSwitchStatementIssue> (@"
+class TestClass
+{
+	void TestMethod (int a, int c)
+	{
+		int b;
+		$if (a == c) {
+			b = 0;
+		} else if (a == 1) {
+			b = 1;
+		} else if (a == 2 || a == 3) {
+			b = 2;
+		} else {
+			b = 3;
+		}
+	}
+}");
+			TestWrongContext<ConvertIfStatementToSwitchStatementIssue> (@"
+class TestClass
+{
+	void TestMethod (int a, int c)
+	{
+		int b;
+		$if (a == 0) {
+			b = 0;
+		} else if (a == 1) {
+			b = 1;
+		} else if (a == 2 || a == c) {
+			b = 2;
+		} else {
+			b = 3;
+		}
+	}
+}");
+		}
+		
+		[Test]
+		public void TestNonEqualityComparison ()
+		{
+			TestWrongContext<ConvertIfStatementToSwitchStatementIssue> (@"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+		int b;
+		$if (a == 0) {
+			b = 0;
+		} else if (a > 4) {
+			b = 1;
+		} else if (a == 2 || a == 3) {
+			b = 2;
+		} else {
+			b = 3;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestValidType ()
+		{
+			// enum
+			TestIssue<ConvertIfStatementToSwitchStatementIssue> (@"
+enum TestEnum
+{
+	First,
+	Second,
+	Third
+}
+class TestClass
+{
+	int TestMethod (TestEnum a)
+	{
+		$if (a == TestEnum.First) {
+			return 1;
+		} else if (a == TestEnum.Second) {
+			return -1;
+		} else if (a == TestEnum.Third) {
+			return 3;
+		} else {
+			return 0;
+		}
+	}
+}");
+
+			// string, bool, char, integral, nullable
+			TestValidType ("string", "\"test\"");
+			TestValidType ("bool", "true");
+			TestValidType ("char", "'a'");
+			TestValidType ("byte", "0");
+			TestValidType ("sbyte", "0");
+			TestValidType ("short", "0");
+			TestValidType ("long", "0");
+			TestValidType ("ushort", "0");
+			TestValidType ("uint", "0");
+			TestValidType ("ulong", "0");
+			TestValidType ("bool?", "null");
+		}
+
+		void TestValidType (string type, string caseValue)
+		{
+			TestIssue<ConvertIfStatementToSwitchStatementIssue> (@"
+class TestClass
+{
+	int TestMethod (" + type + @" a)
+	{
+		$if (a == " + caseValue + @") {
+			return 1;
+		} else if (a == default("  + type +  @")) {
+			return -1;
+		} else if (a == null) {
+			return -1;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalidType ()
+		{
+			TestWrongContext<ConvertIfStatementToSwitchStatementIssue> (@"
+class TestClass
+{
+	void TestMethod (double a)
+	{
+		int b;
+		$if (a == 0) {
+			b = 0;
+		} else {
+			b = 3;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestNoElse()
+		{
+			TestIssue<ConvertIfStatementToSwitchStatementIssue> (@"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+		int b;
+		$if (a == 0) {
+			b = 0;
+		} else if (a == 1) {
+			b = 1;
+		} else if (a == 2) {
+			b = 1;
+		}
+	}
+}");
+		}
+	
+		[Test]
+		public void TestNestedIf ()
+		{
+			TestIssue<ConvertIfStatementToSwitchStatementIssue> (@"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+		int b;
+		$if (a == 0) {
+			if (b == 0)
+				return;
+		} else if (a == 2 || a == 3) {
+			b = 2;
+		} else if (a == 12) {
+			b = 3;
+		}
+	}
+}");
+		}
+
+		
+		[Test]
+		public void TestτooSimpleCase1()
+		{
+			TestWrongContext<ConvertIfStatementToSwitchStatementIssue> (@"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+		int b;
+		$if (a == 0) {
+			b = 0;
+		} else if (a == 1) {
+			b = 1;
+		}
+	}
+}");
+		}
+		[Test]
+		public void TestτooSimpleCase2()
+		{
+			TestWrongContext<ConvertIfStatementToSwitchStatementIssue> (@"
+class TestClass
+{
+	void TestMethod (int a)
+	{
+		int b;
+		$if (a == 0) {
+			b = 0;
+		} else if (a == 1) {
+			b = 1;
+		} else {
+			b = 1;
+		}
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfToAndExpressionIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfToAndExpressionIssueTests.cs
new file mode 100644
index 0000000000..d0c21c1f61
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfToAndExpressionIssueTests.cs
@@ -0,0 +1,120 @@
+//
+// ConvertIfToAndExpressionIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ConvertIfToAndExpressionIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestVariableDeclarationCase ()
+		{
+			Test<ConvertIfToAndExpressionIssue>(@"class Foo
+{
+	int Bar(int o)
+	{
+		bool b = o > 10;
+		if (o < 10)
+			b = false;
+	}
+}", @"class Foo
+{
+	int Bar(int o)
+	{
+		bool b = o > 10 && o >= 10;
+	}
+}");
+		}
+
+		[Test]
+		public void TestComplexVariableDeclarationCase ()
+		{
+			Test<ConvertIfToAndExpressionIssue>(@"class Foo
+{
+	int Bar(int o)
+	{
+		bool b = o > 10 || o < 10;
+		if (o < 10)
+			b = false;
+	}
+}", @"class Foo
+{
+	int Bar(int o)
+	{
+		bool b = (o > 10 || o < 10) && o >= 10;
+	}
+}");
+		}
+
+		[Test]
+		public void TestConversionBug ()
+		{
+			Test<ConvertIfToAndExpressionIssue>(@"class Foo
+{
+	public override void VisitComposedType (ComposedType composedType)
+	{
+		if (composedType.PointerRank > 0)
+			unsafeStateStack.Peek ().UseUnsafeConstructs = false;
+	}
+}", @"class Foo
+{
+	public override void VisitComposedType (ComposedType composedType)
+	{
+		unsafeStateStack.Peek ().UseUnsafeConstructs &= composedType.PointerRank <= 0;
+	}
+}");
+		}
+
+		[Test]
+		public void TestCommonCase ()
+		{
+			Test<ConvertIfToAndExpressionIssue>(@"class Foo
+{
+	int Bar(int o)
+	{
+		bool b = o > 10;
+		Console.WriteLine ();
+		if (o < 10)
+			b = false;
+	}
+}", @"class Foo
+{
+	int Bar(int o)
+	{
+		bool b = o > 10;
+		Console.WriteLine ();
+		b &= o >= 10;
+	}
+}");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfToOrExpressionIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfToOrExpressionIssueTests.cs
new file mode 100644
index 0000000000..b874c4a2e3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertIfToOrExpressionIssueTests.cs
@@ -0,0 +1,116 @@
+//
+// ConvertIfToOrExpressionIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ConvertIfToOrExpressionIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestVariableDeclarationCase ()
+		{
+			Test<ConvertIfToOrExpressionIssue>(@"class Foo
+{
+	int Bar(int o)
+	{
+		bool b = o > 10;
+		if (o < 10)
+			b = true;
+	}
+}", @"class Foo
+{
+	int Bar(int o)
+	{
+		bool b = o > 10 || o < 10;
+	}
+}");
+		}
+
+		[Test]
+		public void TestCommonCase ()
+		{
+			Test<ConvertIfToOrExpressionIssue>(@"class Foo
+{
+	int Bar(int o)
+	{
+		bool b = o > 10;
+		Console.WriteLine ();
+		if (o < 10)
+			b = true;
+	}
+}", @"class Foo
+{
+	int Bar(int o)
+	{
+		bool b = o > 10;
+		Console.WriteLine ();
+		b |= o < 10;
+	}
+}");
+		}
+
+		
+		[Test]
+		public void TestConversionBug ()
+		{
+			Test<ConvertIfToOrExpressionIssue>(@"class Foo
+{
+	public override void VisitComposedType (ComposedType composedType)
+	{
+		if (composedType.PointerRank > 0)
+			unsafeStateStack.Peek ().UseUnsafeConstructs = true;
+	}
+}", @"class Foo
+{
+	public override void VisitComposedType (ComposedType composedType)
+	{
+		unsafeStateStack.Peek ().UseUnsafeConstructs |= composedType.PointerRank > 0;
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ConvertIfToOrExpressionIssue>(@"class Foo
+{
+	int Bar(int o)
+	{
+		bool b = o > 10;
+		// ReSharper disable once ConvertIfToOrExpression
+		if (o < 10)
+			b = true;
+	}
+}");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertNullableToShortFormIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertNullableToShortFormIssueTests.cs
new file mode 100644
index 0000000000..4c322bece6
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertNullableToShortFormIssueTests.cs
@@ -0,0 +1,137 @@
+//
+// ConvertNullableToShortFormIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ConvertNullableToShortFormIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase ()
+		{
+			Test<ConvertNullableToShortFormIssue>(@"using System;
+
+class Foo
+{
+	Nullable<int> Bar ()
+	{
+		return 5;
+	}
+}", @"using System;
+
+class Foo
+{
+	int? Bar ()
+	{
+		return 5;
+	}
+}");
+		}
+
+		[Test]
+		public void TestFullyQualifiedNameCase ()
+		{
+			Test<ConvertNullableToShortFormIssue>(@"class Foo
+{
+	void Bar ()
+	{
+		System.Nullable<int> a;
+	}
+}", @"class Foo
+{
+	void Bar ()
+	{
+		int? a;
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestAlreadyShort ()
+		{
+			TestWrongContext<ConvertNullableToShortFormIssue>(@"class Foo
+{
+	int? Bar (int o)
+	{
+		return 5;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalid ()
+		{
+			TestWrongContext<ConvertNullableToShortFormIssue>(@"using System;
+namespace NN {
+	class Nullable<T> {}
+	class Foo
+	{
+		void Bar ()
+		{
+			Nullable<int> a;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalidTypeOf ()
+		{
+			TestWrongContext<ConvertNullableToShortFormIssue>(@"using System;
+class Foo
+{
+	bool Bar (object o)
+	{
+		return o.GetType() == typeof (Nullable<>);
+	}
+	bool Bar2 (object o)
+	{
+		return o.GetType() == typeof (System.Nullable<>);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ConvertNullableToShortFormIssue>(@"class Foo
+{
+	void Bar ()
+	{
+		// ReSharper disable once ConvertNullableToShortForm
+		System.Nullable<int> a;
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertTailRecursiveCallToLoopIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertTailRecursiveCallToLoopIssueTests.cs
new file mode 100644
index 0000000000..3329fafccd
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertTailRecursiveCallToLoopIssueTests.cs
@@ -0,0 +1,95 @@
+//
+// ConvertTailRecursiveCallToLoopIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[Ignore]
+	[TestFixture]
+	public class ConvertTailRecursiveCallToLoopIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestBasicCase ()
+		{
+			Test<ConvertTailRecursiveCallToLoopIssue>(@"
+public class FooBar
+{
+	public static void Foo(int i)
+	{
+		if (i == 0)
+			return;
+		Foo(i - 1);
+	}
+}
+", @"
+public class FooBar
+{
+	public static void Foo(int i)
+	{
+		while (true) {
+			if (i == 0)
+				return;
+			i = i - 1;
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestConditionCase ()
+		{
+			Test<ConvertTailRecursiveCallToLoopIssue>(@"
+public class FooBar
+{
+	public static void Foo(int i)
+	{
+		Console.WriteLine(i);
+		if (i > 0)
+			Foo(i - 1);
+	}
+}
+", @"
+public class FooBar
+{
+	public static void Foo(int i)
+	{
+		while (true) {
+			Console.WriteLine(i);
+			if (i > 0) {
+				i = i - 1;
+				continue;
+			}
+			break;
+		}
+	}
+}");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToAutoPropertyIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToAutoPropertyIssueTests.cs
new file mode 100644
index 0000000000..9e40aecef2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToAutoPropertyIssueTests.cs
@@ -0,0 +1,102 @@
+//
+// ConvertToAutoPropertyIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ConvertToAutoPropertyIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestBasicCase ()
+		{
+			TestIssue<ConvertToAutoPropertyIssue>(@"
+class FooBar
+{
+	int foo;
+	public int Foo {
+		get { return foo; }
+		set { foo = value; }
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestThisSyntaxCase ()
+		{
+			TestIssue<ConvertToAutoPropertyIssue>(@"
+class FooBar
+{
+	int foo;
+	public int Foo {
+		get { return this.foo; }
+		set { this.foo = value; }
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ConvertToAutoPropertyIssue>(@"
+class FooBar
+{
+	int foo;
+
+	// ReSharper disable once ConvertToAutoProperty
+	public int Foo {
+		get { return foo; }
+		set { foo = value; }
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestArrayBug ()
+		{
+			TestWrongContext<ConvertToAutoPropertyIssue>(@"
+class Bar {
+	public int foo;
+}
+class FooBar
+{
+	Bar bar;
+
+	public int Foo {
+		get { return bar.foo; }
+		set { bar.foo = value; }
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToConstantIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToConstantIssueTests.cs
new file mode 100644
index 0000000000..5fe1b362d5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToConstantIssueTests.cs
@@ -0,0 +1,445 @@
+//
+// ConvertToConstantIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ConvertToConstantIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestBasicCase ()
+		{
+			Test<ConvertToConstantIssue>(@"class Test
+{
+	public static void Main (string[] args)
+	{
+		int fooBar = 12;
+		Console.WriteLine (fooBar);
+	}
+}", @"class Test
+{
+	public static void Main (string[] args)
+	{
+		const int fooBar = 12;
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestWrongLocalType ()
+		{
+			TestWrongContext<ConvertToConstantIssue>(@"class Test
+{
+	public static void Main (string[] args)
+	{
+		object fooBar = 12;
+	}
+}");
+		}
+
+		[Test]
+		public void TestChangingVariableCase1 ()
+		{
+			TestWrongContext<ConvertToConstantIssue>(@"class Test
+{
+	public static void Main (string[] args)
+	{
+		int fooBar = 12;
+		Console.WriteLine (fooBar++);
+	}
+}");
+		}
+		
+		[Test]
+		public void TestChangingVariableCase2 ()
+		{
+			TestWrongContext<ConvertToConstantIssue>(@"class Test
+{
+	public static void Main (string[] args)
+	{
+		int fooBar = 12;
+		Something (out fooBar);
+	}
+}");
+		}
+
+		[Test]
+		public void TestChangingVariableCase3 ()
+		{
+			TestWrongContext<ConvertToConstantIssue>(@"class Test
+{
+	public static void Main (string[] args)
+	{
+		int fooBar = 12;
+		if (args.Length == 10)
+			fooBar = 20;
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+		[Test]
+		public void TestChangingVariableCase4 ()
+		{
+			TestWrongContext<ConvertToConstantIssue>(@"class Test
+{
+	public static void Main (string[] args)
+	{
+		int fooBar = 12;
+		switch (args[0]) {
+			case ""Hello"":
+				fooBar = 20;
+				break;
+		}
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+		
+		[Test]
+		public void TestChangingVariableCase5 ()
+		{
+			TestWrongContext<ConvertToConstantIssue>(@"class Test
+{
+	public static void Main (string[] args)
+	{
+		int fooBar = 12;
+		fooBar += 1;
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestChangingVariableCase6 ()
+		{
+			TestWrongContext<ConvertToConstantIssue>(@"class Test
+{
+	public static void Main (string[] args)
+	{
+		int fooBar = 12;
+		TestMe (ref fooBar);
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ConvertToConstantIssue>(@"class Test
+{
+	public static void Main (string[] args)
+	{
+		// ReSharper disable once ConvertToConstant.Local
+		int fooBar = 12;
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+		[Test]
+		public void TestField ()
+		{
+			Test<ConvertToConstantIssue>(@"class Test
+{
+	int fooBar = 12;
+	public static void Main (string[] args)
+	{
+		Console.WriteLine (fooBar);
+	}
+}", @"class Test
+{
+	const int fooBar = 12;
+	public static void Main (string[] args)
+	{
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+		[Test]
+		public void TestReadonlyField ()
+		{
+			TestWrongContext<ConvertToConstantIssue>(@"class Test
+{
+	readonly int fooBar = 12;
+	public static void Main (string[] args)
+	{
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestStaticField ()
+		{
+			Test<ConvertToConstantIssue>(@"class Test
+{
+	static int fooBar = 12;
+	public static void Main (string[] args)
+	{
+		Console.WriteLine (fooBar);
+	}
+}", @"class Test
+{
+	const int fooBar = 12;
+	public static void Main (string[] args)
+	{
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestChangingField ()
+		{
+			TestWrongContext<ConvertToConstantIssue>(@"class Test
+{
+	public Test ()
+	{
+		fooBar = 2323;
+	}
+	int fooBar = 12;
+	public static void Main (string[] args)
+	{
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestWrongFieldType ()
+		{
+			TestWrongContext<ConvertToConstantIssue>(@"class Test
+{
+	object fooBar = 12;
+	public static void Main (string[] args)
+	{
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+		[Test]
+		public void TestChangingFieldCase2 ()
+		{
+			TestWrongContext<ConvertToConstantIssue>(@"class Test
+{
+	int fooBar = 12;
+	public Test ()
+	{
+		this.fooBar = 12;
+	}
+}");
+		}
+
+		[Test]
+		public void TestChangingFieldCase3 ()
+		{
+			TestWrongContext<ConvertToConstantIssue>(@"class Test
+{
+	int fooBar = 12;
+	public Test ()
+	{
+		++this.fooBar;
+	}
+}");
+		}
+
+		[Test]
+		public void TestShadowedField ()
+		{
+			Test<ConvertToConstantIssue>(@"class Test
+{
+	int fooBar = 12;
+
+	public Test (int fooBar)
+	{
+		fooBar = 2323;
+	}
+
+	public void Bar ()
+	{
+		Console.WriteLine (fooBar);
+	}
+}", @"class Test
+{
+	const int fooBar = 12;
+
+	public Test (int fooBar)
+	{
+		fooBar = 2323;
+	}
+
+	public void Bar ()
+	{
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+		[Test]
+		public void TestShadowedFieldCase2 ()
+		{
+			Test<ConvertToConstantIssue>(@"class Test
+{
+	int fooBar = 12;
+
+	public Test ()
+	{
+		int fooBar;
+		fooBar = 2323;
+	}
+
+	public void Bar ()
+	{
+		Console.WriteLine (fooBar);
+	}
+}", @"class Test
+{
+	const int fooBar = 12;
+
+	public Test ()
+	{
+		int fooBar;
+		fooBar = 2323;
+	}
+
+	public void Bar ()
+	{
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+		[Test]
+		public void TestNeverSuggestForControlVariable ()
+		{
+			TestWrongContext<ConvertToConstantIssue>(@"class Test
+{
+	public static void Main (string[] args)
+	{
+		for (int i = 0; i < 10;) {
+			Console.WriteLine(i);
+		}
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestVarCase ()
+		{
+			Test<ConvertToConstantIssue>(@"class Test
+{
+	public static void Main (string[] args)
+	{
+		var fooBar = 12;
+		Console.WriteLine (fooBar);
+	}
+}", @"class Test
+{
+	public static void Main (string[] args)
+	{
+		const int fooBar = 12;
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestArbitraryStructCase ()
+		{
+			TestWrongContext<ConvertToConstantIssue>(@"
+struct Bar {
+	public int A;
+}
+
+class Test
+{
+	public static void Main (string[] args)
+	{
+		var fooBar = default(Bar);
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+		[Test]
+		public void TestArbitraryStructCase2 ()
+		{
+			TestWrongContext<ConvertToConstantIssue>(@"
+struct Bar {
+	public int A;
+}
+
+class Test
+{
+	const Bar foo = new Bar();
+	public static void Main (string[] args)
+	{
+		var fooBar = foo;
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestComplexCase ()
+		{
+			Test<ConvertToConstantIssue>(@"
+class Test
+{
+	public static void Main (string[] args)
+	{
+		var pi2 = System.Math.PI * 2;
+		Console.WriteLine (pi2);
+	}
+}", @"
+class Test
+{
+	public static void Main (string[] args)
+	{
+		const double pi2 = System.Math.PI * 2;
+		Console.WriteLine (pi2);
+	}
+}");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToLambdaExpressionIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToLambdaExpressionIssueTests.cs
new file mode 100644
index 0000000000..4e18bcc513
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToLambdaExpressionIssueTests.cs
@@ -0,0 +1,180 @@
+//
+// ConvertToLambdaExpressionIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ConvertToLambdaExpressionIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestReturn ()
+		{
+			Test<ConvertToLambdaExpressionIssue> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Func<int, int> f = i => {
+			return i + 1;
+		};
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Func<int, int> f = i => i + 1;
+	}
+}");
+		}
+
+		[Test]
+		public void TestExpressionStatement ()
+		{
+			Test<ConvertToLambdaExpressionIssue> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Action<int> f = i => {
+			System.Console.Write (i);
+		};
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Action<int> f = i => System.Console.Write (i);
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ConvertToLambdaExpressionIssue> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		// ReSharper disable once ConvertToLambdaExpression
+		System.Func<int, int> f = i => {
+			return i + 1;
+		};
+	}
+}");
+		}
+
+
+		/// <summary>
+		/// Bug 14840 - Incorrect "can be converted to expression" suggestion
+		/// </summary>
+		[Test]
+		public void TestBug14840 ()
+		{
+			TestWrongContext<ConvertToLambdaExpressionIssue>(@"using System;
+using System.Collections.Generic;
+
+class C
+{
+	void Foo (Action<int> a) {}
+	void Foo (Func<int,int> a) {}
+
+	void Test ()
+	{
+		int t = 0;
+		Foo (c => { t = c; });
+	}
+}");
+		}
+
+		[Test]
+		public void TestAnonymousMethod ()
+		{
+			Test<ConvertToLambdaExpressionIssue> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Action a = delegate () {
+			System.Console.WriteLine ();
+		};
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Action a = () => System.Console.WriteLine ();
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestAnonymousFunction ()
+		{
+			Test<ConvertToLambdaExpressionIssue> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Func<int, int> f = delegate (int i) {
+			return i + 1;
+		};
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Func<int, int> f = (int i) => i + 1;
+	}
+}");
+		}
+
+		[Test]
+		public void TestAnonymousMethodWithoutParameterList ()
+		{
+			TestWrongContext<ConvertToLambdaExpressionIssue> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Func<int, int> f = delegate {
+			return 123;
+		};
+	}
+}");
+		}
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToStaticMethodIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToStaticMethodIssueTests.cs
deleted file mode 100644
index d0c3559a56..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToStaticMethodIssueTests.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-//
-// ConvertToStaticMethodIssue.cs
-//
-// Author:
-//       Ciprian Khlud <ciprian.mustiata@yahoo.com>
-//
-// Copyright (c) 2013 Ciprian Khlud
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class ConvertToStaticMethodIssueTests : InspectionActionTestBase
-	{
-		
-		[Test]
-		public void Test()
-		{
-			Test<ConvertToStaticMethodIssue>(
-				@"class TestClass
-{
-	void $Test ()
-	{
-		int a = 2;
-	}
-}",
-				@"class TestClass
-{
-	static void Test ()
-	{
-		int a = 2;
-	}
-}"
-				);
-		}
-		[Test]
-		public void TestWithVirtualFunction() {
-			
-			var input = @"class TestClass
-{
-	public virtual void $Test ()
-	{
-		int a = 2;
-	}
-}";
-            TestWrongContext<ConvertToStaticMethodIssue>(input);
-		}
-
-		[Ignore("Doesn't work for me.")]
-		[Test]
-		public void TestWithInterface() {
-			
-			var input = @"interface IBase {
-    void Test();
-}
-class TestClass : IBase
-{
-	public virtual void $Test ()
-	{
-		int a = 2;
-	}
-}";
-            TestWrongContext<ConvertToStaticMethodIssue>(input);
-		}
-
-		[Test]
-		public void TestWithStaticFunction()
-		{
-
-			var input = @"class TestClass
-{
-	static void $Test ()
-	{
-		int a = 2;
-	}
-}";
-			TestWrongContext<ConvertToStaticMethodIssue>(input);
-		}
-
-		[Test]
-		public void TestDoNotWarnOnAttributes()
-		{
-
-			var input = @"using System;
-class TestClass
-{
-	[Obsolete]
-	public void $Test ()
-	{
-		int a = 2;
-	}
-}";
-			TestWrongContext<ConvertToStaticMethodIssue>(input);
-		}
-
-		[Test]
-		public void TestDoNotWarnOnEmptyMethod()
-		{
-
-			var input = @"using System;
-class TestClass
-{
-	public void $Test ()
-	{
-	}
-}";
-			TestWrongContext<ConvertToStaticMethodIssue>(input);
-		}
-
-		[Test]
-		public void TestDoNotWarnOnNotImplementedMethod()
-		{
-			var input = @"using System;
-class TestClass
-{
-	public void $Test ()
-	{
-		throw new NotImplementedExceptionIssue();
-	}
-}";
-			TestWrongContext<ConvertToStaticMethodIssue>(input);
-		}
-
-		[Ignore("Body analyzation is missing.")]
-		[Test]
-		public void TestPropertyAccess()
-		{
-			var input = @"using System;
-class TestClass
-{
-	public int Foo { get; set; }
-	public void $Test ()
-	{
-		System.Console.WriteLine (Foo);
-	}
-}";
-			TestWrongContext<ConvertToStaticMethodIssue>(input);
-		}
-
-
-	
-	}
-    
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToStaticTypeTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToStaticTypeTests.cs
new file mode 100755
index 0000000000..c6c5dfc11a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConvertToStaticTypeTests.cs
@@ -0,0 +1,197 @@
+// 
+// ConvertToStaticTypeTests.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ConvertToStaticTypeTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestInspectorCase1()
+		{
+			var input = @"
+using System;
+
+namespace Demo
+{
+	public sealed class TestClass
+	{
+		static public int A;
+		static public int ReturnAPlusOne()
+		{
+			return A + 1;
+		}
+	}
+}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ConvertToStaticTypeIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+		}
+
+		[Test]
+		public void TestInspectorCase2()
+		{
+			var input = @"
+using System;
+
+namespace Demo
+{
+	public sealed class TestClass
+	{
+		public int B;
+		static public int A;
+		static public int ReturnAPlusOne()
+		{
+			return A + 1;
+		}
+	}
+}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ConvertToStaticTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void TestInspectorCase3()
+		{
+			var input = @"
+using System;
+
+namespace Demo
+{
+	public static class TestClass
+	{
+		static public int A;
+		static public int ReturnAPlusOne()
+		{
+			return A + 1;
+		}
+	}
+}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ConvertToStaticTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void TestInspectorCase4()
+		{
+			var input = @"
+using System;
+
+namespace Demo
+{
+	public class TestClass
+	{
+		TestClass(){}
+		static public int A;
+		static public int ReturnAPlusOne()
+		{
+			return A + 1;
+		}
+	}
+}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ConvertToStaticTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+
+		[Test]
+		public void TestEntryPoint()
+		{
+			TestWrongContext<ConvertToStaticTypeIssue>(@"
+using System;
+
+namespace Demo
+{
+	public sealed class TestClass
+	{
+		static public int A;
+		public static int Main()
+		{
+			return A + 1;
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestAbstract()
+		{
+			TestWrongContext<ConvertToStaticTypeIssue>(@"
+using System;
+
+namespace Demo
+{
+	public abstract class TestClass
+	{
+		public static int Main()
+		{
+			return 1;
+		}
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestResharperDisable()
+		{
+			var input = @"using System;
+
+namespace Demo
+{
+//Resharper disable ConvertToStaticType
+	public class TestClass
+	{
+		TestClass(){}
+		static public int A;
+		static public int ReturnAPlusOne()
+		{
+			return A + 1;
+		}
+	}
+//Resharper restore ConcertToStaticType
+}
+";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new ConvertToStaticTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DelegateSubtractionIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DelegateSubtractionIssueTests.cs
new file mode 100644
index 0000000000..a3faaf7eb1
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DelegateSubtractionIssueTests.cs
@@ -0,0 +1,82 @@
+//
+// DelegateSubtractionIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class DelegateSubtractionIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSubtraction()
+		{
+			TestIssue<DelegateSubtractionIssue>(@"
+using System;
+class Foo
+{
+	void Bar (Action a, Action b)
+	{
+		(a - b) ();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestAssignmentSubtraction()
+		{
+			TestIssue<DelegateSubtractionIssue>(@"
+using System;
+class Foo
+{
+	void Bar (Action a, Action b)
+	{
+		a -= b;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<DelegateSubtractionIssue>(@"
+using System;
+class Foo
+{
+	void Bar (Action a, Action b)
+	{
+		// ReSharper disable once DelegateSubtraction
+		(a - b) ();
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DisposeMethodInNonIDisposableTypeTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DisposeMethodInNonIDisposableTypeTests.cs
new file mode 100644
index 0000000000..106a6215cd
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DisposeMethodInNonIDisposableTypeTests.cs
@@ -0,0 +1,327 @@
+// 
+// DisposeMethodInNonIDisposableTypeTests.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis <luiscubal@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	public class DisposeMethodInNonIDisposableTypeTests : InspectionActionTestBase
+	{
+		void Test (string input, int issueCount)
+		{
+			TestRefactoringContext context;
+			var issues = GetIssues (new DisposeMethodInNonIDisposableTypeIssue(), input, out context);
+			Assert.AreEqual (issueCount, issues.Count);
+		}
+
+		void TestNoFix (string input, int issueCount)
+		{
+			TestRefactoringContext context;
+			var issues = GetIssues (new DisposeMethodInNonIDisposableTypeIssue(), input, out context);
+			Assert.AreEqual (issueCount, issues.Count);
+			CheckFix (context, issues, input);
+		}
+
+		void TestFix (string input, int issueCount, string output)
+		{
+			TestRefactoringContext context;
+			var issues = GetIssues (new DisposeMethodInNonIDisposableTypeIssue (), input, out context);
+			Assert.AreEqual (issueCount, issues.Count);
+			CheckFix (context, issues, output);
+		}
+
+		[Test]
+		public void IgnoreNonDisposeMethodsTest()
+		{
+			string input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+	}
+}
+";
+
+			Test(input, 0);
+		}
+
+		[Test]
+		public void IgnoreProperImplementationMethodsTest()
+		{
+			string input = @"
+class TestClass : System.IDisposable
+{
+	public void Dispose ()
+	{
+	}
+}
+";
+
+			Test(input, 0);
+		}
+
+		[Test]
+		public void TestInterfaceDispose()
+		{
+			string input = @"
+interface Foo
+{
+	void Dispose ();
+}
+class TestClass : Foo
+{
+	void Foo.Dispose ()
+	{
+	}
+}
+";
+			Test<DisposeMethodInNonIDisposableTypeIssue>(input, 1, @"
+interface Foo : System.IDisposable
+{
+}
+class TestClass : Foo
+{
+	void System.IDisposable.Dispose ()
+	{
+	}
+}
+", 0);
+		}
+
+		[Test]
+		public void TestMultipleInterfacesDispose()
+		{
+			string input = @"
+using System;
+interface Foo
+{
+	void Dispose ();
+}
+interface Bar
+{
+	void Dispose ();
+}
+class TestClass : Foo, Bar
+{
+	void Foo.Dispose ()
+	{
+	}
+	void Bar.Dispose ()
+	{
+	}
+}
+";
+			Test<DisposeMethodInNonIDisposableTypeIssue>(input, 2, @"
+using System;
+interface Foo : IDisposable
+{
+}
+interface Bar
+{
+	void Dispose ();
+}
+class TestClass : Foo, Bar
+{
+	void IDisposable.Dispose ()
+	{
+	}
+	void Bar.Dispose ()
+	{
+	}
+}
+", 0);
+		}
+
+		[Test]
+		public void TestShortenedInterfaceDispose()
+		{
+			string input = @"
+using System;
+interface Foo
+{
+	void Dispose ();
+}
+class TestClass : Foo
+{
+	void Foo.Dispose ()
+	{
+	}
+}
+";
+			Test<DisposeMethodInNonIDisposableTypeIssue>(input, 1, @"
+using System;
+interface Foo : IDisposable
+{
+}
+class TestClass : Foo
+{
+	void IDisposable.Dispose ()
+	{
+	}
+}
+", 0);
+		}
+
+		[Test]
+		public void IgnoreIndirectImplementationTest()
+		{
+			string input = @"
+interface Bar : System.IDisposable {}
+class TestClass : Bar
+{
+	public void Dispose ()
+	{
+	}
+}
+";
+
+			Test(input, 0);
+		}
+
+		[Test]
+		public void DisposeWithoutIDisposableTest()
+		{
+			string input = @"
+class TestClass
+{
+	public void Dispose ()
+	{
+	}
+}
+";
+
+			string output = @"
+class TestClass : System.IDisposable
+{
+	public void Dispose ()
+	{
+	}
+}
+";
+
+			TestFix(input, 1, output);
+		}
+
+		[Test]
+		public void DisposeWithUsingTest()
+		{
+			string input = @"
+using System;
+class TestClass
+{
+	public void Dispose ()
+	{
+	}
+}
+";
+
+			string output = @"
+using System;
+class TestClass : IDisposable
+{
+	public void Dispose ()
+	{
+	}
+}
+";
+
+			TestFix(input, 1, output);
+		}
+
+		[Test]
+		public void NonPublicDisposeTest()
+		{
+			string input = @"
+using System;
+class TestClass
+{
+	protected void Dispose ()
+	{
+	}
+}
+";
+
+			string output = @"
+using System;
+class TestClass : IDisposable
+{
+	public void Dispose ()
+	{
+	}
+}
+";
+
+			TestFix(input, 1, output);
+		}
+
+		[Test]
+		public void DisabledForStaticTest()
+		{
+			string input = @"
+class TestType
+{
+	public static void Dispose() {}
+}
+";
+
+			Test(input, 0);
+		}
+
+		[Test]
+		public void DisabledForArgumentsTest()
+		{
+			string input = @"
+class TestClass
+{
+	public void Dispose (object arg)
+	{
+	}
+}
+";
+
+			Test(input, 0);
+		}
+
+		[Test]
+		public void DisabledForNonVoidTest()
+		{
+			string input = @"
+class TestClass
+{
+	public int Dispose ()
+	{
+		return 0;
+	}
+}
+";
+
+			Test(input, 0);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DoNotCallOverridableMethodsInConstructorIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DoNotCallOverridableMethodsInConstructorIssueTests.cs
new file mode 100644
index 0000000000..516decd854
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DoNotCallOverridableMethodsInConstructorIssueTests.cs
@@ -0,0 +1,176 @@
+//
+// DoNotCallOverridableMethodsInConstructorIssueTests.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class DoNotCallOverridableMethodsInConstructorIssueTests : InspectionActionTestBase
+	{ 
+
+		[Test]
+		public void CatchesBadCase()
+		{
+			var input = @"class Foo
+{
+	Foo()
+	{
+		Bar();
+		Bar();
+	}
+
+	virtual void Bar ()
+	{
+	}
+}";
+			TestRefactoringContext context;
+            var issues = GetIssues(new DoNotCallOverridableMethodsInConstructorIssue(), input, out context);
+			Assert.AreEqual(2, issues.Count);
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+            var input = @"class Foo
+{
+	Foo()
+	{
+// ReSharper disable once DoNotCallOverridableMethodsInConstructor
+		Bar();
+	}
+
+	virtual void Bar ()
+	{
+	}
+}";
+            TestWrongContext<DoNotCallOverridableMethodsInConstructorIssue>(input);
+		}
+
+
+
+		[Test]
+		public void IgnoresGoodCase()
+		{
+			var input = @"class Foo
+{
+	Foo()
+	{
+		Bar();
+		Bar();
+	}
+
+	void Bar ()
+	{
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new DoNotCallOverridableMethodsInConstructorIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void IgnoresSealedClasses()
+		{
+			var input = @"sealed class Foo
+{
+	Foo()
+	{
+		Bar();
+		Bar();
+	}
+
+	virtual void Bar ()
+	{
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new DoNotCallOverridableMethodsInConstructorIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void IgnoresNonLocalCalls()
+		{
+			var input = @"class Foo
+{
+	Foo()
+	{
+		Foo f = new Foo();
+		f.Bar();
+	}
+
+	virtual void Bar ()
+	{
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new DoNotCallOverridableMethodsInConstructorIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void IgnoresEventHandlers()
+		{
+			var input = @"class Foo
+{
+	Foo()
+	{
+		SomeEvent += delegate { Bar(); };
+	}
+
+	virtual void Bar ()
+	{
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new DoNotCallOverridableMethodsInConstructorIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+
+		/// <summary>
+		/// Bug 14450 - False positive of "Virtual member call in constructor"
+		/// </summary>
+		[Test]
+		public void TestBug14450()
+		{
+			var input = @"
+using System;
+
+public class Test {
+    public Test(Action action) {
+        action();
+    }
+}
+";		
+			TestWrongContext<DoNotCallOverridableMethodsInConstructorIssue>(input);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DontUseLinqWhenItsVerboseAndInefficientTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DontUseLinqWhenItsVerboseAndInefficientTests.cs
new file mode 100644
index 0000000000..2b7a86f500
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DontUseLinqWhenItsVerboseAndInefficientTests.cs
@@ -0,0 +1,309 @@
+// 
+// DontUseLinqWhenItsVerboseAndInefficientTests.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class DontUseLinqWhenItsVerboseAndInefficientTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestStringLength()
+		{
+			Test<DontUseLinqWhenItsVerboseAndInefficientIssue>(@"
+using System.Linq;
+class TestClass
+{
+	int TestMethod()
+	{
+		string x = ""Hello"";
+		return x.Count ();
+	}
+}", @"
+using System.Linq;
+class TestClass
+{
+	int TestMethod()
+	{
+		string x = ""Hello"";
+		return x.Length;
+	}
+}");
+		}
+
+		[Test]
+		public void TestArrayCount()
+		{
+			Test<DontUseLinqWhenItsVerboseAndInefficientIssue>(@"
+using System.Linq;
+class TestClass
+{
+	int TestMethod()
+	{
+		int[] x = { 1, 2, 3 };
+		return x.Count ();
+	}
+}", @"
+using System.Linq;
+class TestClass
+{
+	int TestMethod()
+	{
+		int[] x = { 1, 2, 3 };
+		return x.Length;
+	}
+}");
+		}
+
+		[Test]
+		public void TestStaticMethod()
+		{
+			TestWrongContext<DontUseLinqWhenItsVerboseAndInefficientIssue>(@"
+using System.Linq;
+class TestClass
+{
+	int TestMethod()
+	{
+		int[] x = { 1, 2, 3 };
+		return Enumerable.Count<int> (x);
+	}
+}");
+		}
+
+		[Test]
+		public void TestListCount()
+		{
+			Test<DontUseLinqWhenItsVerboseAndInefficientIssue>(@"
+using System.Linq;
+using System.Collections.Generic;
+class TestClass
+{
+	int TestMethod()
+	{
+		IList<int> x = new List<int> ();
+		return x.Count ();
+	}
+}", @"
+using System.Linq;
+using System.Collections.Generic;
+class TestClass
+{
+	int TestMethod()
+	{
+		IList<int> x = new List<int> ();
+		return x.Count;
+	}
+}");
+		}
+
+		[Test]
+		public void TestListFirst()
+		{
+			Test<DontUseLinqWhenItsVerboseAndInefficientIssue>(@"
+using System.Linq;
+using System.Collections.Generic;
+class TestClass
+{
+	int TestMethod()
+	{
+		IList<int> x = new List<int> ();
+		return x.First ();
+	}
+}", @"
+using System.Linq;
+using System.Collections.Generic;
+class TestClass
+{
+	int TestMethod()
+	{
+		IList<int> x = new List<int> ();
+		return x [0];
+	}
+}");
+		}
+
+		[Test]
+		public void TestListElementAt()
+		{
+			Test<DontUseLinqWhenItsVerboseAndInefficientIssue>(@"
+using System.Linq;
+using System.Collections.Generic;
+class TestClass
+{
+	int TestMethod()
+	{
+		IList<int> x = new List<int> ();
+		return x.ElementAt (1);
+	}
+}", @"
+using System.Linq;
+using System.Collections.Generic;
+class TestClass
+{
+	int TestMethod()
+	{
+		IList<int> x = new List<int> ();
+		return x [1];
+	}
+}");
+		}
+
+		[Test]
+		public void TestListLast()
+		{
+			TestWrongContext<DontUseLinqWhenItsVerboseAndInefficientIssue>(@"
+using System.Linq;
+using System.Collections.Generic;
+class TestClass
+{
+	int TestMethod()
+	{
+		IList<int> x = new List<int> ();
+		return x.Last ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestListSkippedReversedLast()
+		{
+			Test<DontUseLinqWhenItsVerboseAndInefficientIssue>(@"
+using System.Linq;
+using System.Collections.Generic;
+class TestClass
+{
+	int TestMethod()
+	{
+		int[] x = new int [10];
+		return x.Skip (5).Reverse ().Last ();
+	}
+}", @"
+using System.Linq;
+using System.Collections.Generic;
+class TestClass
+{
+	int TestMethod()
+	{
+		int[] x = new int [10];
+		return x [5];
+	}
+}");
+		}
+
+		[Test]
+		public void TestListSkippedLast()
+		{
+			Test<DontUseLinqWhenItsVerboseAndInefficientIssue>(@"
+using System.Linq;
+using System.Collections.Generic;
+class TestClass
+{
+	int TestMethod()
+	{
+		int[] x = new int [10];
+		return x.Skip (5).Reverse ().Skip (5).Reverse ().Last ();
+	}
+}", @"
+using System.Linq;
+using System.Collections.Generic;
+class TestClass
+{
+	int TestMethod()
+	{
+		int[] x = new int [10];
+		return x [x.Length - 1 - (5)];
+	}
+}");
+		}
+
+		[Test]
+		public void TestListSkip()
+		{
+			Test<DontUseLinqWhenItsVerboseAndInefficientIssue>(@"
+using System.Linq;
+using System.Collections.Generic;
+class TestClass
+{
+	int TestMethod()
+	{
+		IList<int> x = new List<int> ();
+		int y = 5;
+		return x.Skip (y).First ();
+	}
+}", @"
+using System.Linq;
+using System.Collections.Generic;
+class TestClass
+{
+	int TestMethod()
+	{
+		IList<int> x = new List<int> ();
+		int y = 5;
+		return x [y];
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisabledForNoCount()
+		{
+			TestWrongContext<DontUseLinqWhenItsVerboseAndInefficientIssue>(@"
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+class MyCollection : ICollection<int>
+{
+	int ICollection<int>.Count { get { return 0; } }
+	bool ICollection<int>.IsReadOnly { get { return true; } }
+
+	public IEnumerator<int> GetEnumerator()
+	{
+		return null;
+	}
+	IEnumerator IEnumerable.GetEnumerator()
+	{
+		return GetEnumerator();
+	}
+
+	public void Add(int item) { }
+	public bool Contains(int item) { return false; }
+	public void CopyTo(int[] array, int arrayIndex) {}
+	public bool Remove(int item) { return false; }
+}
+class TestClass
+{
+	int TestMethod()
+	{
+		MyCollection x = new MyCollection ();
+		return x.Count ();
+	}
+}");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DoubleNegationIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DoubleNegationIssueTests.cs
deleted file mode 100644
index 8d9136101b..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DoubleNegationIssueTests.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// 
-// DoubleNegationIssueTests.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class DoubleNegationIssueTests : InspectionActionTestBase
-	{
-		[Test]
-		public void Test ()
-		{
-			var input = @"
-class TestClass
-{
-	bool GetBool () { }
-
-	void TestMethod ()
-	{
-		var x = !!GetBool ();
-		x = !(!(GetBool ()));
-	}
-}";
-			var output = @"
-class TestClass
-{
-	bool GetBool () { }
-
-	void TestMethod ()
-	{
-		var x = GetBool ();
-		x = GetBool ();
-	}
-}";
-			Test<DoubleNegationIssue> (input, 2, output);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DoubleNegationOperatorIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DoubleNegationOperatorIssueTests.cs
new file mode 100644
index 0000000000..56284a8e1a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DoubleNegationOperatorIssueTests.cs
@@ -0,0 +1,63 @@
+// 
+// DoubleNegationOperatorIssueTests.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class DoubleNegationOperatorIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void Test ()
+		{
+			var input = @"
+class TestClass
+{
+	bool GetBool () { }
+
+	void TestMethod ()
+	{
+		var x = !!GetBool ();
+		x = !(!(GetBool ()));
+	}
+}";
+			var output = @"
+class TestClass
+{
+	bool GetBool () { }
+
+	void TestMethod ()
+	{
+		var x = GetBool ();
+		x = GetBool ();
+	}
+}";
+			Test<DoubleNegationOperatorIssue> (input, 2, output);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DuplicatedLinqToListOrArrayTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DuplicatedLinqToListOrArrayTests.cs
new file mode 100644
index 0000000000..9bcf0c5ee5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/DuplicatedLinqToListOrArrayTests.cs
@@ -0,0 +1,159 @@
+// 
+// DuplicatedLinqToListOrArrayTests.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	public class DuplicatedLinqToListOrArrayTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestDisabledForSingleUse()
+		{
+			Test<DuplicatedLinqToListOrArrayIssue>(@"
+using System.Linq;
+class TestClass
+{
+	public void TestMethod()
+	{
+		var x = new int[0].ToList ();
+	}
+}", 0);
+		}
+
+		[Test]
+		public void TestSimpleCase()
+		{
+			Test<DuplicatedLinqToListOrArrayIssue>(@"
+using System.Linq;
+class TestClass
+{
+	public void TestMethod()
+	{
+		var x = new int[0].ToList ().ToList ();
+	}
+}", @"
+using System.Linq;
+class TestClass
+{
+	public void TestMethod()
+	{
+		var x = new int[0].ToList ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestToArray()
+		{
+			Test<DuplicatedLinqToListOrArrayIssue>(@"
+using System.Linq;
+class TestClass
+{
+	public void TestMethod()
+	{
+		var x = new int[0].ToArray ().ToArray ();
+	}
+}", @"
+using System.Linq;
+class TestClass
+{
+	public void TestMethod()
+	{
+		var x = new int[0].ToArray ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestMixed()
+		{
+			Test<DuplicatedLinqToListOrArrayIssue>(@"
+using System.Linq;
+class TestClass
+{
+	public void TestMethod()
+	{
+		var x = new int[0].ToList ().ToArray ();
+	}
+}", @"
+using System.Linq;
+class TestClass
+{
+	public void TestMethod()
+	{
+		var x = new int[0].ToArray ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestParenthesis()
+		{
+			Test<DuplicatedLinqToListOrArrayIssue>(@"
+using System.Linq;
+class TestClass
+{
+	public void TestMethod()
+	{
+		var x = ((new int[0]).ToList ()).ToArray ();
+	}
+}", @"
+using System.Linq;
+class TestClass
+{
+	public void TestMethod()
+	{
+		var x = (new int[0]).ToArray ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestTriple()
+		{
+			Test<DuplicatedLinqToListOrArrayIssue>(@"
+using System.Linq;
+class TestClass
+{
+	public void TestMethod()
+	{
+		var x = new int[0].ToList ().ToArray ().ToArray ();
+	}
+}", @"
+using System.Linq;
+class TestClass
+{
+	public void TestMethod()
+	{
+		var x = new int[0].ToArray ();
+	}
+}");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyConstructorIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyConstructorIssueTests.cs
new file mode 100644
index 0000000000..ddee25080c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyConstructorIssueTests.cs
@@ -0,0 +1,106 @@
+// 
+// RedundantConstructorTest.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class EmptyConstructorIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestInspectorCase1()
+		{
+			var input = @"using System;class Test {private int member; public Test(){}}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new EmptyConstructorIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+
+			CheckFix(context, issues, @"using System;class Test {private int member; }");
+		}
+
+		[Test]
+		public void TestInspectorCase2()
+		{
+			var input = @"using System;class Test {private int member;public Test(){} static Test(){}}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new EmptyConstructorIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			
+			CheckFix(context, issues, @"using System;class Test {private int member; static Test(){}}");
+		}
+
+		[Test]
+		public void TestResharperDisable()
+		{
+			var input = @"using System;
+	//Resharper disable EmptyConstructor
+class Test {
+	public Test(){
+	}
+	//Resharper restore EmptyConstructor	
+	}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new EmptyConstructorIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void TestNegateCase1()
+		{
+			var input = @"using System;class Test {public Test(){;}}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new EmptyConstructorIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+        [Test]
+        public void TestNegateCase2()
+        {
+            var input = @"using System;class Test {public Test(){;} private Test(){}}";
+
+            TestRefactoringContext context;
+            var issues = GetIssues(new EmptyConstructorIssue(), input, out context);
+            Assert.AreEqual(0, issues.Count);
+        }
+
+        [Test]
+		public void TestNegateCase3()
+		{
+			var input = @"using System;class Test {public Test() : base(4) {}}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new EmptyConstructorIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyDestructorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyDestructorTests.cs
new file mode 100644
index 0000000000..edf0478348
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyDestructorTests.cs
@@ -0,0 +1,111 @@
+//
+// EmptyDestructorTests.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+//
+// Copyright (c) 2013 Luís Reis
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	public class EmptyDestructorTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestBasicCase()
+		{
+			var input = @"
+class Foo
+{
+	~Foo()
+	{
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new EmptyDestructorIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"
+class Foo
+{
+}");
+		}
+
+		[Test]
+		public void TestCaseWithNesting()
+		{
+			var input = @"
+class Foo
+{
+	~Foo()
+	{
+		{}
+		;
+		{;}
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new EmptyDestructorIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"
+class Foo
+{
+}");
+		}
+
+		[Test]
+		public void TestDisabledForNonEmpty()
+		{
+			var input = @"
+class Foo
+{
+	~Foo()
+	{
+		System.Console.WriteLine();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new EmptyDestructorIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			var input = @"
+class Foo
+{
+	// ReSharper disable once EmptyDestructor
+	~Foo()
+	{
+	}
+}";
+			TestWrongContext<EmptyDestructorIssue>(input);
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyEmbeddedStatementIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyEmbeddedStatementIssueTests.cs
new file mode 100644
index 0000000000..d05c4e62a0
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyEmbeddedStatementIssueTests.cs
@@ -0,0 +1,96 @@
+//
+// UseBlockInsteadColonIssueTests.cs
+//
+// Author:
+//       Ciprian Khlud <ciprian.mustiata@yahoo.com>
+//
+// Copyright (c) 2013 Ciprian Khlud
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{	
+	[TestFixture]
+	public class EmptyEmbeddedStatementIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimple ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		if (i > 0);
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		if (i > 0) {
+		}
+	}
+}";
+			Test<EmptyEmbeddedStatementIssue>(input, output);
+		}
+		[Test]
+		public void TestForeach()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod (int[] list)
+	{
+		foreach (var i in list);
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void TestMethod (int[] list)
+	{
+		foreach (var i in list) {
+		}
+	}
+}";
+			Test<EmptyEmbeddedStatementIssue>(input, output);
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+//ReSharper disable once EmptyEmbeddedStatement
+		if (i > 0);
+	}
+}";
+			TestWrongContext<EmptyEmbeddedStatementIssue>(input);
+		}
+	}
+	
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyGeneralCatchClauseTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyGeneralCatchClauseTests.cs
new file mode 100644
index 0000000000..cef28212a5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyGeneralCatchClauseTests.cs
@@ -0,0 +1,122 @@
+// 
+// EmptyGeneralCatchClauseTests.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class EmptyGeneralCatchClauseTests : InspectionActionTestBase
+	{
+		
+		[Test]
+		public void TestInspectorCase1()
+		{
+			var input = @"using System;
+	using System.IO;
+	namespace Application
+	{
+		public class BaseClass
+		{
+			public void method()
+			{
+				try
+				{
+					F ();
+				}
+				catch (Exception e)
+				{
+				}
+			}
+		}
+	}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new EmptyGeneralCatchClauseIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+		}
+
+
+		[Test]
+		public void TestInspectorCase2()
+		{
+			var input = @"using System;
+	using System.IO;
+	namespace Application
+	{
+		public class BaseClass
+		{
+			public void method()
+			{
+				try
+				{
+					F ();
+				}
+				catch
+				{
+				}
+			}
+		}
+	}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new EmptyGeneralCatchClauseIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+		}
+
+		[Test]
+		public void TestResharperDisableRestore()
+		{
+			var input = @"using System;
+	using System.IO;
+	namespace Application
+	{
+		public class BaseClass
+		{
+			public void method()
+			{
+				try
+				{
+					F ();
+				}
+//Resharper disable EmptyGeneralCatchClause
+				catch (Exception e)
+				{
+				}
+//Resharper restore EmptyGeneralCatchClause
+			}
+		}
+	}
+";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new EmptyGeneralCatchClauseIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyNamespaceTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyNamespaceTests.cs
new file mode 100644
index 0000000000..9165446054
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyNamespaceTests.cs
@@ -0,0 +1,148 @@
+//
+// EmptyNamespaceTests.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+//
+// Copyright (c) 2013 Luís Reis
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	public class EmptyNamespaceTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestBasicCase()
+		{
+			var input = @"
+namespace Foo
+{
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new EmptyNamespaceIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"
+");
+		}
+
+		[Test]
+		public void TestCaseWithRegions()
+		{
+			var input = @"
+namespace Foo
+{
+	#region Bar
+	#endregion
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new EmptyNamespaceIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"
+");
+		}
+
+		[Test]
+		public void TestCaseWithUsing()
+		{
+			var input = @"
+namespace Foo
+{
+	using System;
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new EmptyNamespaceIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"
+");
+		}
+
+		[Test]
+		public void TestCaseWithNesting()
+		{
+			var input = @"
+namespace Foo
+{
+	namespace Bar
+	{
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new EmptyNamespaceIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"
+namespace Foo
+{
+}");
+		}
+
+		[Test]
+		public void TestDisabledForNonEmpty()
+		{
+			var input = @"
+namespace Foo
+{
+	class Bar
+	{
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new EmptyNamespaceIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+		[Test]
+		public void TestDisabledForRegionsWithClasses()
+		{
+			var input = @"
+namespace Foo
+{
+	#region Baz
+		class Bar
+		{
+		}
+	#endregion
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new EmptyNamespaceIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			var input = @"// ReSharper disable once EmptyNamespace
+namespace Foo
+{
+}";
+			TestWrongContext<EmptyNamespaceIssue>(input);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyStatementIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyStatementIssueTests.cs
new file mode 100644
index 0000000000..a476804207
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EmptyStatementIssueTests.cs
@@ -0,0 +1,105 @@
+//
+// EmptyStatementIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class EmptyStatementIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestBasicCase()
+		{
+			Test<EmptyStatementIssue>(@"
+class Test
+{
+	public void Foo ()
+	{
+		;
+	}
+}
+", @"
+class Test
+{
+	public void Foo ()
+	{
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<EmptyStatementIssue>(@"
+class Test
+{
+	public void Foo ()
+	{
+		// ReSharper disable once EmptyStatement
+		;
+	}
+}
+");
+		}
+		[Test]
+		public void TestEmbeddedStatements()
+		{
+			TestWrongContext<EmptyStatementIssue>(@"
+class Test
+{
+	public void Foo ()
+	{
+		for (;;) ;
+		if (true) ; else ;
+		while (true) ;
+		do ; while (true);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestInvalidCase()
+		{
+			TestWrongContext<EmptyStatementIssue>(@"
+class Test
+{
+	public void Foo ()
+	{
+		label:
+			;
+	}
+}
+");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EnumUnderlyingTypeIsIntTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EnumUnderlyingTypeIsIntTests.cs
new file mode 100644
index 0000000000..59532b060c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EnumUnderlyingTypeIsIntTests.cs
@@ -0,0 +1,102 @@
+// 
+// EnumUnderlyingTypeIsIntTests.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class EnumUnderlyingTypeIsIntTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestCase()
+		{
+			Test<EnumUnderlyingTypeIsIntIssue>(@"
+public enum Foo : int
+{
+	Bar
+}", @"
+public enum Foo
+{
+	Bar
+}");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<EnumUnderlyingTypeIsIntIssue>(@"
+// ReSharper disable once EnumUnderlyingTypeIsInt
+public enum Foo : int
+{
+    Bar
+}");
+		}
+
+
+		[Test]
+		public void TestNestedCase()
+		{
+			Test<EnumUnderlyingTypeIsIntIssue>(@"
+class Outer
+{
+	public enum Foo : int
+	{
+		Bar
+	}
+}", @"
+class Outer
+{
+	public enum Foo
+	{
+		Bar
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisabledForNoUnderlyingType()
+		{
+			Test<EnumUnderlyingTypeIsIntIssue>(@"
+public enum Foo
+{
+	Bar
+}", 0);
+		}
+
+		[Test]
+		public void TestDisabledForOtherTypes()
+		{
+			Test<EnumUnderlyingTypeIsIntIssue>(@"
+public enum Foo : byte
+{
+	Bar
+}", 0);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EqualExpressionComparisonIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EqualExpressionComparisonIssueTests.cs
new file mode 100644
index 0000000000..0b2c46d657
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EqualExpressionComparisonIssueTests.cs
@@ -0,0 +1,188 @@
+//
+// EqualExpressionComparisonIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class EqualExpressionComparisonIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestEquality ()
+		{
+			Test<EqualExpressionComparisonIssue>(@"class Foo
+{
+	static int Bar (object o)
+	{
+		if (o == o) {
+		}
+		return 5;
+	}
+}", @"class Foo
+{
+	static int Bar (object o)
+	{
+		if (true) {
+		}
+		return 5;
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestInequality ()
+		{
+			Test<EqualExpressionComparisonIssue>(@"class Foo
+{
+	static int Bar (object o)
+	{
+		if (o != o) {
+		}
+		return 5;
+	}
+}", @"class Foo
+{
+	static int Bar (object o)
+	{
+		if (false) {
+		}
+		return 5;
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestEquals ()
+		{
+			Test<EqualExpressionComparisonIssue>(@"class Foo
+{
+	static int Bar (object o)
+	{
+		if ((1 + 2).Equals(1 + 2)) {
+		}
+		return 5;
+	}
+}", @"class Foo
+{
+	static int Bar (object o)
+	{
+		if (true) {
+		}
+		return 5;
+	}
+}");
+		}
+
+		[Test]
+		public void TestNotEquals ()
+		{
+			Test<EqualExpressionComparisonIssue>(@"class Foo
+{
+	static int Bar (object o)
+	{
+		if (!(1 + 2).Equals(1 + 2)) {
+		}
+		return 5;
+	}
+}", @"class Foo
+{
+	static int Bar (object o)
+	{
+		if (false) {
+		}
+		return 5;
+	}
+}");
+		}
+
+		[Test]
+		public void TestStaticEquals ()
+		{
+			Test<EqualExpressionComparisonIssue>(@"class Foo
+{
+	static int Bar (object o)
+	{
+		if (Equals(o, o)) {
+		}
+		return 5;
+	}
+}", @"class Foo
+{
+	static int Bar (object o)
+	{
+		if (true) {
+		}
+		return 5;
+	}
+}");
+		}
+
+		[Test]
+		public void TestNotStaticEquals ()
+		{
+			Test<EqualExpressionComparisonIssue>(@"class Foo
+{
+	static int Bar (object o)
+	{
+		if (!Equals(o, o)) {
+		}
+		return 5;
+	}
+}", @"class Foo
+{
+	static int Bar (object o)
+	{
+		if (false) {
+		}
+		return 5;
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<EqualExpressionComparisonIssue>(@"class Foo
+{
+	static int Bar (object o)
+	{
+		// ReSharper disable once EqualExpressionComparison
+		if (o == o) {
+		}
+		return 5;
+	}
+}");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EventUnsubscriptionViaAnonymousDelegateIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EventUnsubscriptionViaAnonymousDelegateIssueTests.cs
new file mode 100644
index 0000000000..2231a3980a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/EventUnsubscriptionViaAnonymousDelegateIssueTests.cs
@@ -0,0 +1,99 @@
+//
+// EventUnsubscriptionViaAnonymousDelegateIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class EventUnsubscriptionViaAnonymousDelegateIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestDelegateCase ()
+		{
+			const string usingSystemClassFooPublicEventEventHandlerFooVoidTestFooDelegate = @"using System;
+
+class Bar
+{
+	public event EventHandler Foo;
+
+	void Test ()
+	{
+		Foo -= delegate { };
+	}
+}";
+			string input = usingSystemClassFooPublicEventEventHandlerFooVoidTestFooDelegate;
+			TestRefactoringContext context;
+			var issues = GetIssues (new EventUnsubscriptionViaAnonymousDelegateIssue(), input, out context);
+			Assert.AreEqual (1, issues.Count);
+		}
+
+		[Test]
+		public void TestLambdaCase ()
+		{
+			string input = @"using System;
+
+class Bar
+{
+	public event EventHandler Foo;
+
+	void Test ()
+	{
+		Foo -= (s ,e) => { };
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues (new EventUnsubscriptionViaAnonymousDelegateIssue(), input, out context);
+			Assert.AreEqual (1, issues.Count);
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			string input = @"using System;
+
+class Bar
+{
+	public event EventHandler Foo;
+
+	void Test ()
+	{
+		// ReSharper disable once EventUnsubscriptionViaAnonymousDelegate
+		Foo -= delegate { };
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues (new EventUnsubscriptionViaAnonymousDelegateIssue(), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ExpressionIsAlwaysOfProvidedTypeIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ExpressionIsAlwaysOfProvidedTypeIssueTests.cs
deleted file mode 100644
index b230d249ae..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ExpressionIsAlwaysOfProvidedTypeIssueTests.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-// 
-// ExpressionIsAlwaysOfProvidedTypeIssueTests.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class ExpressionIsAlwaysOfProvidedTypeIssueTests : InspectionActionTestBase
-	{
-		public void Test (string variableType, string providedType)
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod (" + variableType + @" x)
-	{
-		if (x is " + providedType + @")
-			;
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod (" + variableType + @" x)
-	{
-		if (x != null)
-			;
-	}
-}";
-			Test<ExpressionIsAlwaysOfProvidedTypeIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestSameType ()
-		{
-			Test ("int", "int");
-		}
-
-		[Test]
-		public void TestBaseType ()
-		{
-			Test ("int", "object");
-		}
-
-		[Test]
-		public void TestTypeParameter ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod<T> (T x) where T : TestClass
-	{
-		if (x is TestClass)
-			;
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod<T> (T x) where T : TestClass
-	{
-		if (x != null)
-			;
-	}
-}";
-			Test<ExpressionIsAlwaysOfProvidedTypeIssue> (input, 1, output);
-		}
-		
-		[Test]
-		public void IntIsNotDouble ()
-		{
-			var input = @"
-sealed class TestClass
-{
-	void TestMethod (int x)
-	{
-		if (x is double) ;
-	}
-}";
-			Test<ExpressionIsAlwaysOfProvidedTypeIssue> (input, 0);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/FieldCanBeMadeReadOnlyIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/FieldCanBeMadeReadOnlyIssueTests.cs
new file mode 100644
index 0000000000..3cd66aff5a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/FieldCanBeMadeReadOnlyIssueTests.cs
@@ -0,0 +1,199 @@
+//
+// FieldCanBeMadeReadOnlyIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class FieldCanBeMadeReadOnlyIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestInitializedField ()
+		{
+			Test<FieldCanBeMadeReadOnlyIssue>(@"class Test
+{
+	object fooBar = new object ();
+	public static void Main (string[] args)
+	{
+		Console.WriteLine (fooBar);
+	}
+}", @"class Test
+{
+	readonly object fooBar = new object ();
+	public static void Main (string[] args)
+	{
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+		[Test]
+		public void TestFieldAssignedInConstructor ()
+		{
+			Test<FieldCanBeMadeReadOnlyIssue>(@"class Test
+{
+	object fooBar;
+	public Test ()
+	{
+		fooBar = new object ();
+	}
+	public static void Main (string[] args)
+	{
+		Console.WriteLine (fooBar);
+	}
+}", @"class Test
+{
+	readonly object fooBar;
+	public Test ()
+	{
+		fooBar = new object ();
+	}
+	public static void Main (string[] args)
+	{
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+	
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<FieldCanBeMadeReadOnlyIssue>(@"class Test
+{
+	// ReSharper disable once FieldCanBeMadeReadOnly.Local
+	object fooBar = new object ();
+	public static void Main (string[] args)
+	{
+		Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestFactoryMethod ()
+		{
+			TestWrongContext<FieldCanBeMadeReadOnlyIssue>(@"class Test
+{
+	object fooBar;
+	
+	public static Test Create ()
+	{
+		var result = new Test ();
+		result.fooBar = new object ();
+		return result;
+	}
+}");
+		}
+
+		[Test]
+		public void TestFactoryMethodCase2 ()
+		{
+			TestWrongContext<FieldCanBeMadeReadOnlyIssue>(@"class Test
+{
+	object fooBar;
+	
+	public static Test Create ()
+	{
+		var result = new Test {fooBar = new object () };
+		return result;
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestUninitalizedValueTypeField ()
+		{
+			Test<FieldCanBeMadeReadOnlyIssue>(@"class Test
+{
+	int fooBar;
+	public Test ()
+	{
+		fooBar = 5;
+	}
+}", @"class Test
+{
+	readonly int fooBar;
+	public Test ()
+	{
+		fooBar = 5;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInitalizedValueTypeField ()
+		{
+			// Is handled by the 'to const' issue.
+			TestWrongContext<FieldCanBeMadeReadOnlyIssue>(@"class Test
+{
+	int fooBar = 12;
+	public void FooBar ()
+	{
+		System.Console.WriteLine (fooBar);
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestSpecializedFieldBug ()
+		{
+			TestWrongContext<FieldCanBeMadeReadOnlyIssue>(@"
+using System;
+class Test<T> where T : IDisposable
+{
+	object fooBar = new object ();
+	public void Foo ()
+	{
+		fooBar = null;
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestFieldAssignedInConstructorLambda ()
+		{
+			TestWrongContext<FieldCanBeMadeReadOnlyIssue>(@"
+using System;
+
+class Test
+{
+	object fooBar;
+	public Action<object> act;
+	public Test ()
+	{
+		act = o => { fooBar = o; };
+	}
+}");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ForCanBeConvertedToForeachIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ForCanBeConvertedToForeachIssueTests.cs
new file mode 100644
index 0000000000..65e5158d9b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ForCanBeConvertedToForeachIssueTests.cs
@@ -0,0 +1,228 @@
+//
+// ForCanBeConvertedToForeachIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ForCanBeConvertedToForeachIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestArrayCase ()
+		{
+			Test<ForCanBeConvertedToForeachIssue>(@"
+class Test
+{
+	void Foo (object[] o)
+	{
+		for (int i = 0; i < o.Length; i++) {
+			var p = o [i];
+			System.Console.WriteLine (p);
+		}
+	}
+}", @"
+class Test
+{
+	void Foo (object[] o)
+	{
+		foreach (var p in o) {
+			System.Console.WriteLine (p);
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestIListCase ()
+		{
+			Test<ForCanBeConvertedToForeachIssue>(@"
+using System.Collections.Generic;
+
+class Test
+{
+	void Foo(IList<int> o)
+	{
+		for (int i = 0; i < o.Count; i++) {
+			var p = o [i];
+			System.Console.WriteLine (p);
+		}
+	}
+}", @"
+using System.Collections.Generic;
+
+class Test
+{
+	void Foo(IList<int> o)
+	{
+		foreach (var p in o) {
+			System.Console.WriteLine (p);
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalid ()
+		{
+			TestWrongContext<ForCanBeConvertedToForeachIssue>(@"
+class Test
+{
+	void Foo (object[] o)
+	{
+		for (int i = 0; i < o.Length; i++) {
+			var p = o [i];
+			System.Console.WriteLine (p);
+			System.Console.WriteLine (i++);
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalidCase2 ()
+		{
+			TestWrongContext<ForCanBeConvertedToForeachIssue>(@"
+class Test
+{
+	void Foo (object[] o)
+	{
+		for (int i = 0; i < o.Length; i++) {
+			var p = o [i];
+			System.Console.WriteLine (p);
+			System.Console.WriteLine (i);
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalidCase3 ()
+		{
+			TestWrongContext<ForCanBeConvertedToForeachIssue>(@"
+class Test
+{
+	void Foo (object[] o)
+	{
+		for (int i = 0; i < o.Length; i++) {
+			var p = o [i];
+			p = o[0];
+			System.Console.WriteLine (p);
+		}
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestComplexExpression ()
+		{
+			Test<ForCanBeConvertedToForeachIssue>(@"
+using System.Collections.Generic;
+
+class Test
+{
+	IList<int> Bar { get { return null; } }
+
+	void Foo(object o)
+	{
+		for (int i = 0; i < ((Test)o).Bar.Count; i++) {
+			var p = ((Test)o).Bar [i];
+			System.Console.WriteLine (p);
+		}
+	}
+}", @"
+using System.Collections.Generic;
+
+class Test
+{
+	IList<int> Bar { get { return null; } }
+
+	void Foo(object o)
+	{
+		foreach (var p in ((Test)o).Bar) {
+			System.Console.WriteLine (p);
+		}
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestOptimizedFor ()
+		{
+			Test<ForCanBeConvertedToForeachIssue>(@"
+using System.Collections.Generic;
+
+class Test
+{
+	IList<int> Bar { get { return null; } }
+
+	void Foo(object o)
+	{
+		for (var i = 0, maxBarCount = ((Test)o).Bar.Count; i < maxBarCount; ++i) {
+			var p = ((Test)o).Bar[i];
+			System.Console.WriteLine(p);
+		}
+	}
+}", @"
+using System.Collections.Generic;
+
+class Test
+{
+	IList<int> Bar { get { return null; } }
+
+	void Foo(object o)
+	{
+		foreach (var p in ((Test)o).Bar) {
+			System.Console.WriteLine (p);
+		}
+	}
+}");
+		}
+
+
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ForCanBeConvertedToForeachIssue>(@"
+class Test
+{
+	void Foo (object[] o)
+	{
+		// ReSharper disable once ForCanBeConvertedToForeach
+		for (int i = 0; i < o.Length; i++) {
+			var p = o [i];
+			System.Console.WriteLine (p);
+		}
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ForControlVariableIsNeverModifiedIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ForControlVariableIsNeverModifiedIssueTests.cs
new file mode 100644
index 0000000000..95a6f0c70c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ForControlVariableIsNeverModifiedIssueTests.cs
@@ -0,0 +1,133 @@
+// 
+// ForControlVariableIsNeverModifiedIssueTests.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ForControlVariableIsNeverModifiedIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestBinaryOpConditionNotModified ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		for (int i = 0, j = 0; i < 10; j++)
+		{
+		}
+	}
+}";
+			Test<ForControlVariableIsNeverModifiedIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestBinaryOpConditionModified ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		for (int i = 0, j = 0; i < 10; i++)
+		{
+		}
+	}
+}";
+			Test<ForControlVariableIsNeverModifiedIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestUnaryOpConditionNotModified ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		for (bool x = true; !x;)
+		{
+		}
+	}
+}";
+			Test<ForControlVariableIsNeverModifiedIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestUnaryOpConditionModified()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		for (bool x = true; !x;)
+		{
+			x = false;
+		}
+	}
+}";
+			Test<ForControlVariableIsNeverModifiedIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestIdentifierConditionNotModified ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		for (bool x = true; x;)
+		{
+		}
+	}
+}";
+			Test<ForControlVariableIsNeverModifiedIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestIdentifierConditionModified ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		for (bool x = false; x;)
+		{
+			x = true;
+		}
+	}
+}";
+			Test<ForControlVariableIsNeverModifiedIssue> (input, 0);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ForControlVariableNotModifiedIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ForControlVariableNotModifiedIssueTests.cs
deleted file mode 100644
index 679550ca04..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ForControlVariableNotModifiedIssueTests.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-// 
-// ForControlVariableNotModifiedIssueTests.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class ForControlVariableNotModifiedIssueTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestBinaryOpConditionNotModified ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		for (int i = 0, j = 0; i < 10; j++)
-		{
-		}
-	}
-}";
-			Test<ForControlVariableNotModifiedIssue> (input, 1);
-		}
-
-		[Test]
-		public void TestBinaryOpConditionModified ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		for (int i = 0, j = 0; i < 10; i++)
-		{
-		}
-	}
-}";
-			Test<ForControlVariableNotModifiedIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestUnaryOpConditionNotModified ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		for (bool x = true; !x;)
-		{
-		}
-	}
-}";
-			Test<ForControlVariableNotModifiedIssue> (input, 1);
-		}
-
-		[Test]
-		public void TestUnaryOpConditionModified()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		for (bool x = true; !x;)
-		{
-			x = false;
-		}
-	}
-}";
-			Test<ForControlVariableNotModifiedIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestIdentifierConditionNotModified ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		for (bool x = true; x;)
-		{
-		}
-	}
-}";
-			Test<ForControlVariableNotModifiedIssue> (input, 1);
-		}
-
-		[Test]
-		public void TestIdentifierConditionModified ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		for (bool x = false; x;)
-		{
-			x = true;
-		}
-	}
-}";
-			Test<ForControlVariableNotModifiedIssue> (input, 0);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ForStatementConditionIsTrueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ForStatementConditionIsTrueTests.cs
new file mode 100644
index 0000000000..79600179e6
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ForStatementConditionIsTrueTests.cs
@@ -0,0 +1,131 @@
+// 
+// ForStatementConditionIsTrueTests.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ForStatementConditionIsTrueTests : InspectionActionTestBase
+	{
+		
+		[Test]
+		public void TestInspectorCase1()
+		{
+			var input = @"using System;
+namespace resharper_test
+{
+	public class baseClass
+	{
+		public void method()
+		{
+			for (; true ;)
+			{}
+		}
+	}
+}
+";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new ForStatementConditionIsTrueIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			CheckFix(context, issues, @"using System;
+namespace resharper_test
+{
+	public class baseClass
+	{
+		public void method()
+		{
+			for (;  ;)
+			{}
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestInspectorCase2()
+		{
+			var input = @"using System;
+namespace resharper_test
+{
+	public class baseClass
+	{
+		public void method()
+		{
+			for (int a; true ; )
+			{}
+		}
+	}
+}
+";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new ForStatementConditionIsTrueIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			CheckFix(context, issues, @"using System;
+namespace resharper_test
+{
+	public class baseClass
+	{
+		public void method()
+		{
+			for (int a;  ; )
+			{}
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestResharperDisableRestore()
+		{
+			var input = @"using System;
+namespace resharper_test
+{
+	public class baseClass
+	{
+		public void method()
+		{
+//Resharper disable ForStatementConditionIsTrue
+			for (; true ;)
+			{}
+//Resharper restore ForStatementConditionIsTrue
+		}
+	}
+}
+";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new ForStatementConditionIsTrueIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/FormatStringIssues/FormatStringTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/FormatStringIssues/FormatStringTests.cs
deleted file mode 100644
index ce0fb277f6..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/FormatStringIssues/FormatStringTests.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-//
-// FormatStringIssueTests.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class FormatStringTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TooFewArguments()
-		{
-			var input = @"
-class TestClass
-{
-	void Foo()
-	{
-		string.Format(""{0}"");
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new FormatStringIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-		}
-		
-		[Test]
-		public void SupportsFixedArguments()
-		{
-			var input = @"
-class TestClass
-{
-	void Foo()
-	{
-		Bar(""{0}"", 1);
-	}
-
-	void Bar(string format, string arg0)
-	{
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new FormatStringIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-
-		[Test]
-		public void IgnoresCallWithUnknownNumberOfArguments()
-		{
-			var input = @"
-class TestClass
-{
-	string Bar(params object[] args)
-	{
-		return string.Format(""{1}"", args);
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new FormatStringIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-
-		[Test]
-		public void FormatItemIndexOutOfRangeOfArguments()
-		{
-			var input = @"
-class TestClass
-{
-	void Foo()
-	{
-		string.Format(""{1}"", 1);
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new FormatStringIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-		}
-		
-		[Test]
-		public void FormatItemIndexOutOfRangeOfArguments_ExplicitArrayCreation()
-		{
-			var input = @"
-class TestClass
-{
-	void Foo()
-	{
-		string.Format(""{1}"", new object[] { 1 });
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new FormatStringIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-		}
-		
-		[Test]
-		public void FormatItemMissingEndBrace()
-		{
-			var input = @"
-class TestClass
-{
-	void Foo()
-	{
-		string.Format(""Text text text {0 text text text"", 1);
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues(new FormatStringIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-		}
-			
-		[Test]
-		public void UnescapedLeftBrace()
-		{
-				var input = @"
-class TestClass
-{
-	void Foo()
-	{
-		string.Format(""a { a"", 1);
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new FormatStringIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-		}
-
-		[Test]
-		public void IgnoresStringWithGoodArguments()
-		{
-			var input = @"
-class TestClass
-{
-	void Foo()
-	{
-		string.Format(""{0}"", ""arg0"");
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new FormatStringIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-
-		[Test]
-		public void IgnoresStringWithGoodArguments_ExplicitArrayCreation()
-		{
-			var input = @"
-class TestClass
-{
-	void Foo()
-	{
-		string.Format(""{1}"", new object[] { ""arg0"", ""arg1"" });
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new FormatStringIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-
-		[Test]
-		public void IgnoresNonFormattingCall()
-		{
-			var input = @"
-class TestClass
-{
-	void Foo()
-	{
-		string lower = string.ToLower(""{0}"");
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new FormatStringIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-		
-		[Test]
-		public void HandlesCallsWithExtraArguments()
-		{
-			var input = @"
-class TestClass
-{
-	void Foo()
-	{
-		Foo(1);
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new FormatStringIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/FormatStringProblemIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/FormatStringProblemIssueTests.cs
new file mode 100644
index 0000000000..1576902cd2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/FormatStringProblemIssueTests.cs
@@ -0,0 +1,285 @@
+//
+// FormatStringProblemIssueTests.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class FormatStringProblemIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TooFewArguments()
+		{
+			var input = @"
+class TestClass
+{
+	void Foo()
+	{
+		string.Format(""{0}"");
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new FormatStringProblemIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+		}
+
+
+		[Test]
+		public void SupportsFixedArguments()
+		{
+			var input = @"
+class TestClass
+{
+	void Foo()
+	{
+		Bar(""{0}"", 1);
+	}
+
+	void Bar(string format, string arg0)
+	{
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new FormatStringProblemIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+		[Test]
+		public void IgnoresCallWithUnknownNumberOfArguments()
+		{
+			var input = @"
+class TestClass
+{
+	string Bar(params object[] args)
+	{
+		return string.Format(""{1}"", args);
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new FormatStringProblemIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+		[Test]
+		public void FormatItemIndexOutOfRangeOfArguments()
+		{
+			var input = @"
+class TestClass
+{
+	void Foo()
+	{
+		string.Format(""{1}"", 1);
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new FormatStringProblemIssue (), input, out context);
+			Assert.AreEqual (2, issues.Count);
+		}
+		
+		[Test]
+		public void FormatItemIndexOutOfRangeOfArguments_ExplicitArrayCreation()
+		{
+			var input = @"
+class TestClass
+{
+	void Foo()
+	{
+		string.Format(""{1}"", new object[] { 1 });
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new FormatStringProblemIssue (), input, out context);
+			Assert.AreEqual (2, issues.Count);
+		}
+		
+		[Test]
+		public void FormatItemMissingEndBrace()
+		{
+			var input = @"
+class TestClass
+{
+	void Foo()
+	{
+		string.Format(""Text text text {0 text text text"", 1);
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new FormatStringProblemIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+		}
+			
+		[Test]
+		public void UnescapedLeftBrace()
+		{
+				var input = @"
+class TestClass
+{
+	void Foo()
+	{
+		string.Format(""a { a"", 1);
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new FormatStringProblemIssue (), input, out context);
+			Assert.AreEqual (2, issues.Count);
+		}
+
+		[Test]
+		public void IgnoresStringWithGoodArguments()
+		{
+			var input = @"
+class TestClass
+{
+	void Foo()
+	{
+		string.Format(""{0}"", ""arg0"");
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new FormatStringProblemIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+		[Test]
+		public void IgnoresStringWithGoodArguments_ExplicitArrayCreation()
+		{
+			var input = @"
+class TestClass
+{
+	void Foo()
+	{
+		string.Format(""{0} {1}"", new object[] { ""arg0"", ""arg1"" });
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new FormatStringProblemIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+		[Test]
+		public void IgnoresNonFormattingCall()
+		{
+			var input = @"
+class TestClass
+{
+	void Foo()
+	{
+		string lower = string.ToLower(""{0}"");
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new FormatStringProblemIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+		
+		[Test]
+		public void HandlesCallsWithExtraArguments()
+		{
+			var input = @"
+class TestClass
+{
+	void Foo()
+	{
+		Foo(1);
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new FormatStringProblemIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+
+		[Test]
+		public void TooManyArguments()
+		{
+			TestIssue<FormatStringProblemIssue>(@"
+class TestClass
+{
+	void Foo()
+	{
+		string.Format(""{0}"", 1, 2);
+	}
+}");
+		}
+
+		[Test]
+		public void UnreferencedArgument()
+		{
+			TestIssue<FormatStringProblemIssue>(@"
+class TestClass
+{
+	void Foo()
+	{
+		string.Format(""{0} {2}"", 1, 2, 3);
+	}
+}");
+		}
+
+		/// <summary>
+		/// Bug 14405 - Incorrect "argument not used in string format" warning
+		/// </summary>
+		[Test]
+		public void TestBug14405()
+		{
+			TestWrongContext<FormatStringProblemIssue>(@"
+using System;
+class TestClass
+{
+	void Foo()
+	{
+		DateTime.ParseExact(""expiresString"", ""s"", System.Globalization.CultureInfo.InvariantCulture);
+	}
+}");
+		}
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<FormatStringProblemIssue>(@"
+class TestClass
+{
+	void Foo()
+	{
+		// ReSharper disable once FormatStringProblem
+		string.Format(""{0}"", 1, 2);
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/FunctionNeverReturnsIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/FunctionNeverReturnsIssueTests.cs
new file mode 100644
index 0000000000..c49c8f3df1
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/FunctionNeverReturnsIssueTests.cs
@@ -0,0 +1,493 @@
+// 
+// MethodNeverReturnsIssueTests.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class FunctionNeverReturnsIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestEnd ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod () 
+	{
+		int i = 1;
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestReturn ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		return;
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestThrow ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		throw new System.NotImplementedException();	
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestNeverReturns ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		while (true) ;
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestIfWithoutElse ()
+		{
+			var input = @"
+class TestClass
+{
+	string TestMethod (int x)
+	{
+		if (x <= 0) return ""Hi"";
+		return ""_"" + TestMethod(x - 1);
+	}
+}";
+			TestWrongContext<FunctionNeverReturnsIssue> (input);
+		}
+
+		[Test]
+		public void TestRecursive ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		TestMethod ();
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestNonRecursive ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		TestMethod (0);
+	}
+	void TestMethod (int i)
+	{
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestVirtualNonRecursive ()
+		{
+			var input = @"
+class Base
+{
+	public Base parent;
+	public virtual string Result {
+		get { return parent.Result; }
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestNonRecursiveProperty ()
+		{
+			var input = @"
+class TestClass
+{
+	int foo;
+	int Foo
+	{
+		get { return foo; }
+		set
+		{
+			if (Foo != value)
+				foo = value;
+		}
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 0);
+		}
+
+
+		[Test]
+		public void TestGetterNeverReturns ()
+		{
+			var input = @"
+class TestClass
+{
+	int TestProperty
+	{
+		get {
+			while (true) ;
+		}
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestRecursiveGetter ()
+		{
+			var input = @"
+class TestClass
+{
+	int TestProperty
+	{
+		get {
+			return TestProperty;
+		}
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestRecursiveSetter ()
+		{
+			var input = @"
+class TestClass
+{
+	int TestProperty
+	{
+		set {
+			TestProperty = value;
+		}
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestAutoProperty ()
+		{
+			var input = @"
+class TestClass
+{
+	int TestProperty
+	{
+		get;
+		set;
+	}
+}";
+			TestWrongContext<FunctionNeverReturnsIssue> (input);
+		}
+
+		[Test]
+		public void TestMethodGroupNeverReturns ()
+		{
+			var input = @"
+class TestClass
+{
+	int TestMethod()
+	{
+		return TestMethod();
+	}
+	int TestMethod(object o)
+	{
+		return TestMethod();
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestIncrementProperty()
+		{
+			var input = @"
+class TestClass
+{
+	int TestProperty
+	{
+		get { return TestProperty++; }
+		set { TestProperty++; }
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 2);
+		}
+
+		[Test]
+		public void TestLambdaNeverReturns ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod()
+	{
+		System.Action action = () => { while (true) ; };
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestDelegateNeverReturns ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod()
+	{
+		System.Action action = delegate() { while (true) ; };
+	}
+}";
+
+			Test<FunctionNeverReturnsIssue> (input, 1);
+		}
+		[Test]
+		public void YieldBreak ()
+		{
+			var input = @"
+class TestClass
+{
+	System.Collections.Generic.IEnumerable<string> TestMethod ()
+	{
+		yield break;
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			var input = @"
+class TestClass
+{
+	// ReSharper disable once FunctionNeverReturns
+	void TestMethod ()
+	{
+		while (true) ;
+	}
+}";
+			TestWrongContext<FunctionNeverReturnsIssue> (input);
+		}
+
+		[Test]
+		public void TestBug254 ()
+		{
+			//https://github.com/icsharpcode/NRefactory/issues/254
+			var input = @"
+class TestClass
+{
+	int state = 0;
+
+	bool Foo()
+	{
+		return state < 10;
+	}
+
+	void TestMethod()
+	{
+		if (Foo()) {
+			++state;
+			TestMethod ();	
+		}
+	}
+}";
+			TestWrongContext<FunctionNeverReturnsIssue> (input);
+		}
+
+		[Test]
+		public void TestSwitch ()
+		{
+			//https://github.com/icsharpcode/NRefactory/issues/254
+			var input = @"
+class TestClass
+{
+	int foo;
+	void TestMethod()
+	{
+		switch (foo) {
+			case 0: TestMethod();
+		}
+	}
+}";
+			TestWrongContext<FunctionNeverReturnsIssue> (input);
+		}
+
+		[Test]
+		public void TestSwitchWithDefault ()
+		{
+			//https://github.com/icsharpcode/NRefactory/issues/254
+			var input = @"
+class TestClass
+{
+	int foo;
+	void TestMethod()
+	{
+		switch (foo) {
+			case 0: case 1: TestMethod();
+			default: TestMethod();
+		}
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestSwitchValue ()
+		{
+			//https://github.com/icsharpcode/NRefactory/issues/254
+			var input = @"
+class TestClass
+{
+	int foo;
+	int TestMethod()
+	{
+		switch (TestMethod()) {
+			case 0: return 0;
+		}
+		return 1;
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestLinqFrom ()
+		{
+			//https://github.com/icsharpcode/NRefactory/issues/254
+			var input = @"
+using System.Linq;
+using System.Collections.Generic;
+class TestClass
+{
+	IEnumerable<int> TestMethod()
+	{
+		return from y in TestMethod() select y;
+	}
+}";
+			Test<FunctionNeverReturnsIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestWrongLinqContexts ()
+		{
+			//https://github.com/icsharpcode/NRefactory/issues/254
+			var input = @"
+using System.Linq;
+using System.Collections.Generic;
+class TestClass
+{
+	IEnumerable<int> TestMethod()
+	{
+		return from y in Enumerable.Empty<int>()
+		       from z in TestMethod()
+		       select y;
+	}
+}";
+			TestWrongContext<FunctionNeverReturnsIssue> (input);
+		}
+
+		[Test]
+		public void TestForeach ()
+		{
+			//https://bugzilla.xamarin.com/show_bug.cgi?id=14732
+			var input = @"
+using System.Linq;
+class TestClass
+{
+	void TestMethod()
+	{
+		foreach (var x in new int[0])
+			TestMethod();
+	}
+}";
+			TestWrongContext<FunctionNeverReturnsIssue> (input);
+		}
+
+		[Test]
+		public void TestNoExecutionFor ()
+		{
+			var input = @"
+using System.Linq;
+class TestClass
+{
+	void TestMethod()
+	{
+		for (int i = 0; i < 0; ++i)
+			TestMethod ();
+	}
+}";
+			TestWrongContext<FunctionNeverReturnsIssue> (input);
+		}
+
+		[Test]
+		public void TestNullCoalescing ()
+		{
+			//https://bugzilla.xamarin.com/show_bug.cgi?id=14732
+			var input = @"
+using System.Linq;
+class TestClass
+{
+	TestClass parent;
+	int? value;
+	int TestMethod()
+	{
+		return value ?? parent.TestMethod();
+	}
+}";
+			TestWrongContext<FunctionNeverReturnsIssue> (input);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/IdenticalConditionalBranchIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/IdenticalConditionalBranchIssueTests.cs
deleted file mode 100644
index 5d7fd2f591..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/IdenticalConditionalBranchIssueTests.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// 
-// IdenticalConditionalBranchIssueTests.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class IdenticalConditionalBranchIssueTests : InspectionActionTestBase
-	{
-		[Test]
-		public void Test ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		var a = i > 0 ? 1 + 1 : 1 + 1;
-		var b = i > 1 ? 1 : 2;
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		var a = 1 + 1;
-		var b = i > 1 ? 1 : 2;
-	}
-}";
-			Test<IdenticalConditionalBranchIssue> (input, 1, output);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/InconsistentNamingTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/InconsistentNamingTests.cs
index cd2d3da009..1893b6feb3 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/InconsistentNamingTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/InconsistentNamingTests.cs
@@ -88,6 +88,14 @@ namespace ICSharpCode.NRefactory.CSharp.CodeIssues
 			CheckNaming (input, output);
 		}
 
+		[Test]
+		public void TestEventArgsSuffixOptimizationName ()
+		{
+			var input = @"			public class TestArgs : System.EventArgs {}";
+			var output = @"			public class TestEventArgs : System.EventArgs {}";
+			CheckNaming (input, output);
+		}
+
 		[Test]
 		public void TestException ()
 		{
@@ -332,5 +340,183 @@ class MyClass : Base { public override int Method (int Param) {} }";
 		}
 
 	}
+
+	[TestFixture]
+	public class NamingRuleTest
+	{
+		[Test]
+		public void TestPascalCase()
+		{
+			var rule = new NamingRule(AffectedEntity.Class);
+			rule.NamingStyle = NamingStyle.PascalCase;
+			Assert.IsTrue(rule.IsValid("PascalCase"));
+			Assert.IsTrue(rule.IsValid("PascalCase_1_23"));
+			Assert.IsFalse(rule.IsValid("Pascal_Case"));
+			Assert.IsFalse(rule.IsValid("camelCase"));
+		}
+
+		[Test]
+		public void TestCamelCase()
+		{
+			var rule = new NamingRule(AffectedEntity.Class);
+			rule.NamingStyle = NamingStyle.CamelCase;
+			Assert.IsFalse(rule.IsValid("PascalCase"));
+			Assert.IsFalse(rule.IsValid("camel_Case"));
+			Assert.IsTrue(rule.IsValid("camelCase"));
+			Assert.IsTrue(rule.IsValid("camelCase_10_11"));
+		}
+
+		[Test]
+		public void TestAllUpper()
+		{
+			var rule = new NamingRule(AffectedEntity.Class);
+			rule.NamingStyle = NamingStyle.AllUpper;
+			Assert.IsFalse(rule.IsValid("PascalCase"));
+			Assert.IsFalse(rule.IsValid("camelCase"));
+			Assert.IsTrue(rule.IsValid("ALL_UPPER"));
+			Assert.IsTrue(rule.IsValid("ALLUPPER"));
+		}
+
+		[Test]
+		public void TestAllLower()
+		{
+			var rule = new NamingRule(AffectedEntity.Class);
+			rule.NamingStyle = NamingStyle.AllLower;
+			Assert.IsFalse(rule.IsValid("PascalCase"));
+			Assert.IsFalse(rule.IsValid("camelCase"));
+			Assert.IsTrue(rule.IsValid("all_lower"));
+			Assert.IsTrue(rule.IsValid("alllower"));
+		}
+
+		[Test]
+		public void TestFirstUpper()
+		{
+			var rule = new NamingRule(AffectedEntity.Class);
+			rule.NamingStyle = NamingStyle.FirstUpper;
+			Assert.IsFalse(rule.IsValid("PascalCase"));
+			Assert.IsFalse(rule.IsValid("camelCase"));
+			Assert.IsTrue(rule.IsValid("First_upper"));
+			Assert.IsTrue(rule.IsValid("Firstupper"));
+		}
+
+		[Test]
+		public void UnderscoreTolerantPascalCaseWithUpperStart()
+		{
+			var rule = new NamingRule(AffectedEntity.Class);
+			rule.NamingStyle = NamingStyle.PascalCaseWithUpperLetterUnderscore;
+			Assert.IsFalse(rule.IsValid("camelCase"));
+			Assert.IsFalse(rule.IsValid("PascalCase_underscoreTolerant"));
+			Assert.IsFalse(rule.IsValid("PascalCase__UnderscoreTolerant"));
+			Assert.IsFalse(rule.IsValid("_PascalCase_UnderscoreTolerant"));
+			Assert.IsTrue(rule.IsValid("PascalCase_UnderscoreTolerant"));
+			Assert.IsTrue(rule.IsValid("PascalCase_UnderscoreTolerant_12"));
+		}
+
+		[Test]
+		public void UnderscoreTolerantPascalCaseWithLowStart()
+		{
+			var rule = new NamingRule(AffectedEntity.Class);
+			rule.NamingStyle = NamingStyle.PascalCaseWithLowerLetterUnderscore;
+			Assert.IsFalse(rule.IsValid("camelCase"));
+			Assert.IsFalse(rule.IsValid("PascalCase_UnderscoreTolerant"));
+			Assert.IsFalse(rule.IsValid("PascalCase__underscoreTolerant"));
+			Assert.IsFalse(rule.IsValid("_PascalCase_underscoreTolerant"));
+			Assert.IsTrue(rule.IsValid("PascalCase_underscoreTolerant"));
+		}
+
+		[Test]
+		public void UnderscoreTolerantCamelCaseWithLowStart()
+		{
+			var rule = new NamingRule(AffectedEntity.Class);
+			rule.NamingStyle = NamingStyle.CamelCaseWithLowerLetterUnderscore;
+			Assert.IsFalse(rule.IsValid("PascalCase"));
+			Assert.IsFalse(rule.IsValid("camelCase_UnderscoreTolerant"));
+			Assert.IsFalse(rule.IsValid("camelCase__underscoreTolerant"));
+			Assert.IsTrue(rule.IsValid("camelCase_underscoreTolerant"));
+		}
+
+		[Test]
+		public void UnderscoreTolerantCamelCaseWithUpperStart()
+		{
+			var rule = new NamingRule(AffectedEntity.Class);
+			rule.NamingStyle = NamingStyle.CamelCaseWithUpperLetterUnderscore;
+			Assert.IsFalse(rule.IsValid("PascalCase"));
+			Assert.IsFalse(rule.IsValid("camelCase_underscoreTolerant"));
+			Assert.IsFalse(rule.IsValid("camelCase__UnderscoreTolerant"));
+			Assert.IsTrue(rule.IsValid("camelCase_UnderscoreTolerant"));
+		}
+
+		[Test]
+		public void TestSuggestionForCamelCaseWithUpperStart()
+		{
+			var rule = new NamingRule(AffectedEntity.Class);
+			rule.NamingStyle = NamingStyle.CamelCaseWithUpperLetterUnderscore;
+			System.Collections.Generic.IList<string> suggestedNames;
+			rule.GetErrorMessage(new TestRefactoringContext (null, TextLocation.Empty, null), "camelCase_underscoreTolerant", out suggestedNames); 
+			Assert.IsTrue(suggestedNames.Contains("camelCase_UnderscoreTolerant"));
+		}
+
+		[Test]
+		public void TestSuggestionForCamelCaseWithUpperStartWithUnderscoreStart()
+		{
+			var rule = new NamingRule(AffectedEntity.Class);
+			rule.NamingStyle = NamingStyle.CamelCaseWithUpperLetterUnderscore;
+			System.Collections.Generic.IList<string> suggestedNames;
+			rule.GetErrorMessage(new TestRefactoringContext (null, TextLocation.Empty, null), "_camelCase_underscoreTolerant", out suggestedNames); 
+			Assert.IsTrue(suggestedNames.Contains("camelCase_UnderscoreTolerant"));
+		}
+
+		[Test]
+		public void TestSuggestionForCamelCaseWithLowerStart()
+		{
+			var rule = new NamingRule(AffectedEntity.Class);
+			rule.NamingStyle = NamingStyle.CamelCaseWithLowerLetterUnderscore;
+			System.Collections.Generic.IList<string> suggestedNames;
+			rule.GetErrorMessage(new TestRefactoringContext (null, TextLocation.Empty, null), "camelCase_UnderscoreTolerant", out suggestedNames); 
+			Assert.IsTrue(suggestedNames.Contains("camelCase_underscoreTolerant"));
+		}
+
+		[Test]
+		public void TestSuggestionForCamelCaseWithLowerStartMultipleUnderscores()
+		{
+			var rule = new NamingRule(AffectedEntity.Class);
+			rule.NamingStyle = NamingStyle.CamelCaseWithLowerLetterUnderscore;
+			System.Collections.Generic.IList<string> suggestedNames;
+			rule.GetErrorMessage(new TestRefactoringContext (null, TextLocation.Empty, null), "camelCase_____UnderscoreTolerant", out suggestedNames); 
+			Assert.IsTrue(suggestedNames.Contains("camelCase_underscoreTolerant"));
+		}
+
+		[Test]
+		public void TestSuggestionForPascalCaseWithUpperStart()
+		{
+			var rule = new NamingRule(AffectedEntity.Class);
+			rule.NamingStyle = NamingStyle.PascalCaseWithUpperLetterUnderscore;
+			System.Collections.Generic.IList<string> suggestedNames;
+			rule.GetErrorMessage(new TestRefactoringContext (null, TextLocation.Empty, null), "PascalCase_underscoreTolerant", out suggestedNames); 
+			Assert.IsTrue(suggestedNames.Contains("PascalCase_UnderscoreTolerant"));
+		}
+
+		[Test]
+		public void TestSuggestionForPascalCaseWithLowerStart()
+		{
+			var rule = new NamingRule(AffectedEntity.Class);
+			rule.NamingStyle = NamingStyle.PascalCaseWithLowerLetterUnderscore;
+			System.Collections.Generic.IList<string> suggestedNames;
+			rule.GetErrorMessage(new TestRefactoringContext (null, TextLocation.Empty, null), "PascalCase_UnderscoreTolerant", out suggestedNames); 
+			Assert.IsTrue(suggestedNames.Contains("PascalCase_underscoreTolerant"));
+		}
+
+
+		[Test]
+		public void TestSuggestionForPascalCase()
+		{
+			var rule = new NamingRule(AffectedEntity.Class);
+			rule.NamingStyle = NamingStyle.PascalCase;
+			System.Collections.Generic.IList<string> suggestedNames;
+			rule.GetErrorMessage(new TestRefactoringContext (null, TextLocation.Empty, null), "pascalCase_12_____12323", out suggestedNames); 
+			Assert.IsTrue(suggestedNames.Contains("PascalCase_12_12323"));
+		}
+
+	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/IncorrectExceptionParameterOrderingTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/IncorrectExceptionParameterOrderingTests.cs
deleted file mode 100644
index 1a50b304ca..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/IncorrectExceptionParameterOrderingTests.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// IncorrectExceptionParametersOrderingTests.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	public class IncorrectExceptionParameterOrderingTests : InspectionActionTestBase
-	{
-
-		[Test]
-		public void TestBadExamples()
-		{
-			var input = @"
-using System;
-class A
-{
-	void F()
-	{
-		throw new ArgumentNullException (""The parameter 'blah' can not be null"", ""blah"");
-		throw new ArgumentException (""blah"", ""The parameter 'blah' can not be null"");
-		throw new ArgumentOutOfRangeException (""The parameter 'blah' can not be null"", ""blah"");
-		throw new DuplicateWaitObjectException (""The parameter 'blah' can not be null"", ""blah"");
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new IncorrectExceptionParameterOrderingIssue(), input, out context);
-			Assert.AreEqual(4, issues.Count);
-
-			CheckFix(context, issues [0], @"
-using System;
-class A
-{
-	void F()
-	{
-		throw new ArgumentNullException (""blah"", ""The parameter 'blah' can not be null"");
-		throw new ArgumentException (""blah"", ""The parameter 'blah' can not be null"");
-		throw new ArgumentOutOfRangeException (""The parameter 'blah' can not be null"", ""blah"");
-		throw new DuplicateWaitObjectException (""The parameter 'blah' can not be null"", ""blah"");
-	}
-}");
-		}
-
-		[Test]
-		public void TestGoodExamples()
-		{
-			var input = @"
-using System;
-class A
-{
-	void F()
-	{
-		throw new ArgumentNullException (""blah"", ""The parameter 'blah' can not be null"");
-		throw new ArgumentException (""The parameter 'blah' can not be null"", ""blah"");
-		throw new ArgumentOutOfRangeException (""blah"", ""The parameter 'blah' can not be null"");
-		throw new DuplicateWaitObjectException (""blah"", ""The parameter 'blah' can not be null"");
-		throw new ArgumentOutOfRangeException (""blah"", 42);
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new IncorrectExceptionParameterOrderingIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/InspectionActionTestBase.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/InspectionActionTestBase.cs
index ecef790c70..037893009b 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/InspectionActionTestBase.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/InspectionActionTestBase.cs
@@ -36,13 +36,20 @@ namespace ICSharpCode.NRefactory.CSharp.CodeIssues
 {
 	public abstract class InspectionActionTestBase
 	{
-		protected static List<CodeIssue> GetIssues (ICodeIssueProvider action, string input, out TestRefactoringContext context, bool expectErrors = false)
+		protected static List<CodeIssue> GetIssues (CodeIssueProvider action, string input, out TestRefactoringContext context, bool expectErrors = false, CSharpParser parser = null)
 		{
-			context = TestRefactoringContext.Create (input, expectErrors);
+			context = TestRefactoringContext.Create (input, expectErrors, parser);
 			
 			return new List<CodeIssue> (action.GetIssues (context));
 		}
 
+		protected static List<CodeIssue> GetIssuesWithSubIssue (CodeIssueProvider action, string input, string subIssue, out TestRefactoringContext context, bool expectErrors = false)
+		{
+			context = TestRefactoringContext.Create (input, expectErrors);
+
+			return new List<CodeIssue> (action.GetIssues (context, subIssue));
+		}
+
 		protected static void CheckFix (TestRefactoringContext ctx, CodeIssue issue, string expectedOutput, int fixIndex = 0)
 		{
 			using (var script = ctx.StartScript ())
@@ -56,11 +63,11 @@ namespace ICSharpCode.NRefactory.CSharp.CodeIssues
 			Assert.AreEqual (expectedOutput, ctx.Text);
 		}
 
-		protected static void CheckFix (TestRefactoringContext ctx, IEnumerable<CodeIssue> issues, string expectedOutput)
+		protected static void CheckFix (TestRefactoringContext ctx, IEnumerable<CodeIssue> issues, string expectedOutput, int fixINdex = 0)
 		{
 			using (var script = ctx.StartScript ()) {
 				foreach (var issue in issues) {
-					issue.Actions.First ().Run (script);
+					issue.Actions[fixINdex].Run (script);
 				}
 			}
 			bool pass = expectedOutput == ctx.Text;
@@ -73,8 +80,27 @@ namespace ICSharpCode.NRefactory.CSharp.CodeIssues
 			Assert.AreEqual (expectedOutput, ctx.Text);
 		}
 
-		protected static void Test<T> (string input, int issueCount, string output = null, int issueToFix = -1)
-			where T : ICodeIssueProvider, new ()
+		protected static void CheckBatchFix (TestRefactoringContext ctx, IEnumerable<CodeIssue> issues, object siblingKey, string expectedOutput)
+		{
+			using (var script = ctx.StartScript ()) {
+				foreach (var issue in issues) {
+					var actions = issue.Actions.Where (a => a.SiblingKey == siblingKey).ToList ();
+					Assert.IsTrue(actions.Count <= 1, "At most a single action expected per sibling key and issue.");
+					actions.First (a => a.SiblingKey == siblingKey).Run (script);
+				}
+			}
+			bool pass = expectedOutput == ctx.Text;
+			if (!pass) {
+				Console.WriteLine ("expected:");
+				Console.WriteLine (expectedOutput);
+				Console.WriteLine ("got:");
+				Console.WriteLine (ctx.Text);
+			}
+			Assert.AreEqual (expectedOutput, ctx.Text);
+		}
+
+		protected static void Test<T> (string input, int issueCount, string output = null, int issueToFix = -1, int actionToRun = 0)
+			where T : CodeIssueProvider, new ()
 		{
 			TestRefactoringContext context;
 			var issues = GetIssues (new T (), input, out context);
@@ -82,25 +108,65 @@ namespace ICSharpCode.NRefactory.CSharp.CodeIssues
 			if (issueCount == 0 || output == null) 
 				return;
 			if (issueToFix == -1)
-				CheckFix (context, issues, output);
+				CheckFix (context, issues, output, actionToRun);
 			else
-				CheckFix (context, issues [issueToFix], output);
+				CheckFix (context, issues [issueToFix], output, actionToRun);
+		}
+
+		protected static void TestIssue<T> (string input, int issueCount = 1)
+			where T : CodeIssueProvider, new ()
+		{
+			TestRefactoringContext context;
+			var issues = GetIssues (new T (), input, out context);
+			Assert.AreEqual (issueCount, issues.Count);
 		}
 
 		protected static void Test<T> (string input, string output, int fixIndex = 0)
-			where T : ICodeIssueProvider, new ()
+			where T : CodeIssueProvider, new ()
 		{
 			TestRefactoringContext context;
 			var issues = GetIssues (new T (), input, out context);
+			if (issues.Count == 0)
+				Console.WriteLine("No issues in:\n" + input);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues[0], output, fixIndex);
+		}
+
+
+		protected static void TestWithSubIssue<T> (string input,  string subIssue, int issueCount, string output = null, int issueToFix = -1)
+			where T : CodeIssueProvider, new ()
+		{
+			TestRefactoringContext context;
+			var issues = GetIssuesWithSubIssue (new T (), input, subIssue, out context);
+			Assert.AreEqual (issueCount, issues.Count);
+			if (issueCount == 0 || output == null) 
+				return;
+			if (issueToFix == -1)
+				CheckFix (context, issues, output);
+			else
+				CheckFix (context, issues [issueToFix], output);
+		}
+
+		protected static void TestWithSubIssue<T> (string input, string output, string subIssue, int fixIndex = 0)
+			where T : CodeIssueProvider, new ()
+		{
+			TestRefactoringContext context;
+			var issues = GetIssuesWithSubIssue (new T (), input, subIssue, out context);
 			Assert.AreEqual (1, issues.Count);
 			CheckFix (context, issues[0], output, fixIndex);
 		}
 
 		protected static void TestWrongContext<T> (string input)
-			where T : ICodeIssueProvider, new ()
+			where T : CodeIssueProvider, new ()
 		{
 			Test<T>(input, 0);
 		}
+
+		protected static void TestWrongContextWithSubIssue<T> (string input, string subIssue)
+			where T : CodeIssueProvider, new ()
+		{
+			TestWithSubIssue<T>(input, subIssue, 0);
+		}
 	}
 	
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/InvokeAsExtensionMethodIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/InvokeAsExtensionMethodIssueTests.cs
new file mode 100644
index 0000000000..3fbf4e7ea6
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/InvokeAsExtensionMethodIssueTests.cs
@@ -0,0 +1,201 @@
+//
+// InvokeAsExtensionMethodIssueTests.cs
+//
+// Author:
+//   Simon Lindgren <simon.n.lindgren@gmail.com>
+//   Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using System.Collections.Generic;
+using NUnit.Framework;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class StaticMethodInvocationToExtensionMethodInvocationTests : InspectionActionTestBase
+	{
+
+		[Test]
+		public void HandlesBasicCase()
+		{
+			Test<InvokeAsExtensionMethodIssue>(@"
+class A { }
+static class B
+{
+	public static bool Ext (this A a, int i);
+}
+class C
+{
+	void F()
+	{
+		A a = new A();
+		B.$Ext (a, 1);
+	}
+}", @"
+class A { }
+static class B
+{
+	public static bool Ext (this A a, int i);
+}
+class C
+{
+	void F()
+	{
+		A a = new A();
+		a.Ext (1);
+	}
+}");
+		}
+
+		[Test]
+		public void HandlesReturnValueUsage()
+		{
+			Test<InvokeAsExtensionMethodIssue>(@"
+class A { }
+static class B
+{
+	public static void Ext (this A a, int i);
+}
+class C
+{
+	void F()
+	{
+		A a = new A();
+		if (B.$Ext (a, 1))
+			return;
+	}
+}", @"
+class A { }
+static class B
+{
+	public static void Ext (this A a, int i);
+}
+class C
+{
+	void F()
+	{
+		A a = new A();
+		if (a.Ext (1))
+			return;
+	}
+}");
+		}
+
+		[Test]
+		public void IgnoresIfNullArgument()
+		{
+			TestWrongContext<InvokeAsExtensionMethodIssue>(@"
+class A { }
+static class B
+{
+	public static void Ext (this A a);
+}
+class C
+{
+	void F()
+	{
+		B.$Ext (null);
+	}
+}");
+		}
+
+		[Test]
+		public void IgnoresIfNotExtensionMethod()
+		{
+			TestWrongContext<InvokeAsExtensionMethodIssue>(@"
+class A { }
+static class B
+{
+	public static void Ext (A a);
+}
+class C
+{
+	void F()
+	{
+		B.$Ext (new A());
+	}
+}");
+		}
+
+		[Test]
+		public void IgnoresIfAlreadyExtensionMethodCallSyntax()
+		{
+			TestWrongContext<InvokeAsExtensionMethodIssue>(@"
+class A { }
+static class B
+{
+	public static void Ext (this A a, int i);
+}
+class C
+{
+	void F()
+	{
+		A a = new A();
+		a.$Ext (1);
+	}
+}");
+		}
+
+		[Test]
+		public void IgnoresPropertyInvocation()
+		{
+			TestWrongContext<InvokeAsExtensionMethodIssue>(@"
+static class B
+{
+	public static int Ext { get; set; }
+}
+class C
+{
+	void F()
+	{
+		B.$Ext();
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<InvokeAsExtensionMethodIssue>(@"
+class A { }
+static class B
+{
+	public static bool Ext (this A a, int i);
+}
+class C
+{
+	void F()
+	{
+		A a = new A();
+		// ReSharper disable once InvokeAsExtensionMethod
+		B.Ext (a, 1);
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/LocalVariableHidesMemberIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/LocalVariableHidesMemberIssueTests.cs
index cbdf040a6f..c1b35958a7 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/LocalVariableHidesMemberIssueTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/LocalVariableHidesMemberIssueTests.cs
@@ -35,7 +35,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeIssues
 		[Test]
 		public void TestField ()
 		{
-			var input = @"
+		    const string input = @"
 class TestClass
 {
 	int i;
@@ -44,9 +44,23 @@ class TestClass
 		int i, j;
 	}
 }";
-			Test<LocalVariableHidesMemberIssue> (input, 1);
+		    Test<LocalVariableHidesMemberIssue>(input, 1);
 		}
 
+	    public void TestDisable()
+	    {
+	        var input = @"class TestClass
+{
+    int i;
+    void TestMethod()
+    {
+// ReSharper disable once LocalVariableHidesMember
+        int i, j;
+    }
+}";
+            TestWrongContext<LocalVariableHidesMemberIssue>(input);
+	    }
+
 		[Test]
 		public void TestMethod ()
 		{
@@ -192,5 +206,23 @@ class TestClass : BaseClass
 }";
 			Test<LocalVariableHidesMemberIssue> (input, 0);
 		}
+		
+		[Test]
+		public void SuppressIssueIfVariableInitializedFromField ()
+		{
+			var input = @"
+class TestClass
+{
+	int i;
+	
+	void Method ()
+	{
+		int i = this.i;
+	}
+}";
+			// Given the initializer, member hiding is obviously intended in this case;
+			// so we suppress the warning.
+			Test<LocalVariableHidesMemberIssue> (input, 0);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/LockThisTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/LockThisTests.cs
new file mode 100644
index 0000000000..c0fe1ea84a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/LockThisTests.cs
@@ -0,0 +1,742 @@
+// LockThisTests.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis <luiscubal@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class LockThisTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestLockThisInMethod ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		lock (this) {
+		}
+	}
+}";
+
+			var output = @"
+class TestClass
+{
+	object locker = new object ();
+	void TestMethod ()
+	{
+		lock (locker) {
+		}
+	}
+}";
+
+			Test<LockThisIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestLockThisInGetter ()
+		{
+			var input = @"
+class TestClass
+{
+	int MyProperty {
+		get {
+			lock (this) {
+				return 0;
+			}
+		}
+	}
+}";
+
+			var output = @"
+class TestClass
+{
+	object locker = new object ();
+	int MyProperty {
+		get {
+			lock (locker) {
+				return 0;
+			}
+		}
+	}
+}";
+
+			Test<LockThisIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestLockThisInSetter ()
+		{
+			var input = @"
+class TestClass
+{
+	int MyProperty {
+		set {
+			lock (this) {
+			}
+		}
+	}
+}";
+
+			var output = @"
+class TestClass
+{
+	object locker = new object ();
+	int MyProperty {
+		set {
+			lock (locker) {
+			}
+		}
+	}
+}";
+
+			Test<LockThisIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestLockThisInConstructor ()
+		{
+			var input = @"
+class TestClass
+{
+	TestClass()
+	{
+		lock (this) {
+		}
+	}
+}";
+
+			var output = @"
+class TestClass
+{
+	object locker = new object ();
+	TestClass()
+	{
+		lock (locker) {
+		}
+	}
+}";
+
+			Test<LockThisIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestLockThisInDelegate ()
+		{
+			var input = @"
+class TestClass
+{
+	TestClass()
+	{
+		Action lockThis = delegate ()
+		{
+			lock (this) {
+			}
+		};
+	}
+}";
+
+			var output = @"
+class TestClass
+{
+	object locker = new object ();
+	TestClass()
+	{
+		Action lockThis = delegate ()
+		{
+			lock (locker) {
+			}
+		};
+	}
+}";
+
+			Test<LockThisIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestLockThisInLambda ()
+		{
+			var input = @"
+class TestClass
+{
+	TestClass()
+	{
+		Action lockThis = () =>
+		{
+			lock (this) {
+			}
+		};
+	}
+}";
+
+			var output = @"
+class TestClass
+{
+	object locker = new object ();
+	TestClass()
+	{
+		Action lockThis = () =>
+		{
+			lock (locker) {
+			}
+		};
+	}
+}";
+
+			Test<LockThisIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestLockParenthesizedThis ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		lock ((this)) {
+		}
+	}
+}";
+
+			var output = @"
+class TestClass
+{
+	object locker = new object ();
+	void TestMethod ()
+	{
+		lock (locker) {
+		}
+	}
+}";
+
+			Test<LockThisIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestFixMultipleLockThis ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		lock (this) {
+		}
+	}
+
+	void TestMethod2 ()
+	{
+		lock (this) {
+		}
+	}
+}";
+
+			var output = @"
+class TestClass
+{
+	object locker = new object ();
+	void TestMethod ()
+	{
+		lock (locker) {
+		}
+	}
+
+	void TestMethod2 ()
+	{
+		lock (locker) {
+		}
+	}
+}";
+
+			Test<LockThisIssue> (input, 2, output, 0);
+		}
+		[Test]
+		public void TestFixMixedLocks ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		lock (this) {
+		}
+	}
+
+	object locker2 = new object ();
+	void TestMethod2 ()
+	{
+		lock (locker2) {
+		}
+	}
+}";
+
+			var output = @"
+class TestClass
+{
+	object locker = new object ();
+	void TestMethod ()
+	{
+		lock (locker) {
+		}
+	}
+
+	object locker2 = new object ();
+	void TestMethod2 ()
+	{
+		lock (locker2) {
+		}
+	}
+}";
+
+			Test<LockThisIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestLockNonThis ()
+		{
+			var input = @"
+class TestClass
+{
+	object locker = new object ();
+
+	TestClass()
+	{
+		lock (locker) {
+		}
+	}
+}";
+
+			Test<LockThisIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestNestedTypeLock ()
+		{
+			var input = @"
+class TestClass
+{
+	class Nested
+	{
+		Nested()
+		{
+			lock (this) {
+			}
+		}
+	}
+}";
+
+			var output = @"
+class TestClass
+{
+	class Nested
+	{
+		object locker = new object ();
+		Nested()
+		{
+			lock (locker) {
+			}
+		}
+	}
+}";
+
+			Test<LockThisIssue>(input, 1, output);
+		}
+
+		[Test]
+		public void TestMethodSynchronized ()
+		{
+			var input = @"
+using System.Runtime.CompilerServices;
+class TestClass
+{
+	[MethodImpl (MethodImplOptions.Synchronized)]
+	void TestMethod ()
+	{
+		System.Console.WriteLine (""Foo"");
+	}
+}";
+
+			var output = @"
+using System.Runtime.CompilerServices;
+class TestClass
+{
+	object locker = new object ();
+	void TestMethod ()
+	{
+		lock (locker) {
+			System.Console.WriteLine (""Foo"");
+		}
+	}
+}";
+
+			Test<LockThisIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestMethodWithSynchronizedValue ()
+		{
+			var input = @"
+using System.Runtime.CompilerServices;
+class TestClass
+{
+	[MethodImpl (Value = MethodImplOptions.Synchronized)]
+	void TestMethod ()
+	{
+		System.Console.WriteLine (""Foo"");
+	}
+}";
+
+			var output = @"
+using System.Runtime.CompilerServices;
+class TestClass
+{
+	object locker = new object ();
+	void TestMethod ()
+	{
+		lock (locker) {
+			System.Console.WriteLine (""Foo"");
+		}
+	}
+}";
+
+			Test<LockThisIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestMethodHasSynchronized ()
+		{
+			var input = @"
+using System.Runtime.CompilerServices;
+class TestClass
+{
+	[MethodImpl (MethodImplOptions.Synchronized | MethodImplOptions.NoInlining)]
+	void TestMethod ()
+	{
+		System.Console.WriteLine (""Foo"");
+	}
+}";
+
+			var output = @"
+using System.Runtime.CompilerServices;
+class TestClass
+{
+	object locker = new object ();
+	[MethodImpl (MethodImplOptions.NoInlining)]
+	void TestMethod ()
+	{
+		lock (locker) {
+			System.Console.WriteLine (""Foo"");
+		}
+	}
+}";
+
+			Test<LockThisIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestMethodNotSynchronized ()
+		{
+			var input = @"
+using System.Runtime.CompilerServices;
+class TestClass
+{
+	[MethodImpl (MethodImplOptions.NoInlining)]
+	void TestMethod ()
+	{
+		System.Console.WriteLine (""Foo"");
+	}
+}";
+
+			Test<LockThisIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestAbstractSynchronized ()
+		{
+			var input = @"
+using System.Runtime.CompilerServices;
+abstract class TestClass
+{
+	[MethodImpl (MethodImplOptions.Synchronized)]
+	public abstract void TestMethod ();
+}";
+
+			var output = @"
+using System.Runtime.CompilerServices;
+abstract class TestClass
+{
+	public abstract void TestMethod ();
+}";
+
+			Test<LockThisIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestDoubleLocking ()
+		{
+			var input = @"
+using System.Runtime.CompilerServices;
+abstract class TestClass
+{
+	[MethodImpl (MethodImplOptions.Synchronized)]
+	public void TestMethod ()
+	{
+		lock (this) {
+		}
+	}
+}";
+
+			var output = @"
+using System.Runtime.CompilerServices;
+abstract class TestClass
+{
+	object locker = new object ();
+	public void TestMethod ()
+	{
+		lock (locker) {
+			lock (locker) {
+			}
+		}
+	}
+}";
+
+			Test<LockThisIssue> (input, 2, output, 0);
+		}
+
+		[Test]
+		public void TestDelegateLocking ()
+		{
+			var input = @"
+using System.Runtime.CompilerServices;
+abstract class TestClass
+{
+	[MethodImpl (MethodImplOptions.Synchronized)]
+	public void TestMethod ()
+	{
+		Action action = delegate {
+			lock (this) {
+			}
+		};
+	}
+}";
+
+			var output = @"
+using System.Runtime.CompilerServices;
+abstract class TestClass
+{
+	object locker = new object ();
+	public void TestMethod ()
+	{
+		lock (locker) {
+			Action action = delegate {
+				lock (locker) {
+				}
+			};
+		}
+	}
+}";
+
+			Test<LockThisIssue> (input, 2, output, 0);
+		}
+
+		[Test]
+		public void TestLambdaLocking ()
+		{
+			var input = @"
+using System.Runtime.CompilerServices;
+abstract class TestClass
+{
+	[MethodImpl (MethodImplOptions.Synchronized)]
+	public void TestMethod ()
+	{
+		Action action = () => {
+			lock (this) {
+			}
+		};
+	}
+}";
+
+			var output = @"
+using System.Runtime.CompilerServices;
+abstract class TestClass
+{
+	object locker = new object ();
+	public void TestMethod ()
+	{
+		lock (locker) {
+			Action action = () => {
+				lock (locker) {
+				}
+			};
+		}
+	}
+}";
+
+			Test<LockThisIssue> (input, 2, output, 0);
+		}
+
+		[Test]
+		public void TestStaticMethod()
+		{
+			var input = @"
+using System.Runtime.CompilerServices;
+class TestClass
+{
+	[MethodImpl (MethodImplOptions.Synchronized)]
+	public static void TestMethod ()
+	{
+		Console.WriteLine ();
+	}
+}";
+
+			var output = @"
+using System.Runtime.CompilerServices;
+class TestClass
+{
+	static object locker = new object ();
+	public static void TestMethod ()
+	{
+		lock (locker) {
+			Console.WriteLine ();
+		}
+	}
+}";
+
+			Test<LockThisIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestStaticProperty()
+		{
+			var input = @"
+using System.Runtime.CompilerServices;
+class TestClass
+{
+	public static int TestProperty
+	{
+		[MethodImpl (MethodImplOptions.Synchronized)]
+		set {
+			Console.WriteLine (value);
+		}
+	}
+}";
+
+			var output = @"
+using System.Runtime.CompilerServices;
+class TestClass
+{
+	static object locker = new object ();
+	public static int TestProperty
+	{
+		set {
+			lock (locker) {
+				Console.WriteLine (value);
+			}
+		}
+	}
+}";
+
+			Test<LockThisIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestMixedStaticMethod()
+		{
+			var input = @"
+using System.Runtime.CompilerServices;
+class TestClass
+{
+	[MethodImpl (MethodImplOptions.Synchronized)]
+	public void TestMethod ()
+	{
+		Console.WriteLine ();
+	}
+
+	[MethodImpl (MethodImplOptions.Synchronized)]
+	public static void TestStaticMethod ()
+	{
+		Console.WriteLine ();
+	}
+}";
+
+			var output = @"
+using System.Runtime.CompilerServices;
+class TestClass
+{
+	object locker = new object ();
+	public void TestMethod ()
+	{
+		lock (locker) {
+			Console.WriteLine ();
+		}
+	}
+
+	[MethodImpl (MethodImplOptions.Synchronized)]
+	public static void TestStaticMethod ()
+	{
+		Console.WriteLine ();
+	}
+}";
+
+			Test<LockThisIssue> (input, 2, output, 0);
+		}
+
+		[Test]
+		public void TestNewNameLock()
+		{
+			var input = @"
+using System.Runtime.CompilerServices;
+class TestClass
+{
+	int locker;
+	[MethodImpl (MethodImplOptions.Synchronized)]
+	public void TestMethod ()
+	{
+		Console.WriteLine ();
+	}
+}";
+
+			var output = @"
+using System.Runtime.CompilerServices;
+class TestClass
+{
+	int locker;
+	object locker1 = new object ();
+	public void TestMethod ()
+	{
+		lock (locker1) {
+			Console.WriteLine ();
+		}
+	}
+}";
+
+			Test<LockThisIssue> (input, 1, output);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/LongLiteralEndingLowerLIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/LongLiteralEndingLowerLIssueTests.cs
new file mode 100644
index 0000000000..9643df58c1
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/LongLiteralEndingLowerLIssueTests.cs
@@ -0,0 +1,106 @@
+// 
+// LowercaseLongLiteralSuffixTests.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class LongLiteralEndingLowerLIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestNormal()
+		{
+			Test<LongLiteralEndingLowerLIssue>(@"
+class Test
+{
+	public long x = 3l;
+}", @"
+class Test
+{
+	public long x = 3L;
+}");
+		}
+
+		[Test]
+		public void TestDisabledForUnsignedFirst()
+		{
+			Test<LongLiteralEndingLowerLIssue>(@"
+class Test
+{
+	public ulong x = 3ul;
+}", 0);
+		}
+
+		[Test]
+		public void TestUnsigned()
+		{
+			Test<LongLiteralEndingLowerLIssue>(@"
+class Test
+{
+	public ulong x = 3lu;
+}", @"
+class Test
+{
+	public ulong x = 3LU;
+}");
+		}
+
+		[Test]
+		public void TestDisabledForUppercase()
+		{
+			Test<LongLiteralEndingLowerLIssue>(@"
+class Test
+{
+	public long x = 3L;
+}", 0);
+		}
+
+		[Test]
+		public void TestDisabledForString()
+		{
+			Test<LongLiteralEndingLowerLIssue>(@"
+class Test
+{
+	public string x = ""l"";
+}", 0);
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<LongLiteralEndingLowerLIssue>(@"
+class Test
+{
+	// ReSharper disable once LongLiteralEndingLowerL
+	public long x = 3l;
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/LoopCanBeConvertedToQueryIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/LoopCanBeConvertedToQueryIssueTests.cs
new file mode 100644
index 0000000000..77b9f167f7
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/LoopCanBeConvertedToQueryIssueTests.cs
@@ -0,0 +1,562 @@
+//
+// LoopCanBeConvertedToQueryIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[Ignore]
+	[TestFixture]
+	public class LoopCanBeConvertedToQueryIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestCount()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int count = 0;
+		foreach (var x in i)
+			count++;
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int sum = i.Count ();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestCountCase2()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int count = 1;
+		foreach (var x in i)
+			count = count + 1;
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int sum = 1 + i.Count ();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestCountPredicate()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int count = 0;
+		foreach (var x in i)
+			if (x < 10)
+				count++;
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int sum = 1 + i.Count (x => x < 10);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestForeachSum()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int sum = 0;
+		foreach (var j in i) {
+			sum += j;
+		}
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int sum = i.Sum ();
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestForSum()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int sum = 0;
+		for (int j = 0; j < i.Length; j++)
+			sum += i [j];
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int sum = i.Sum ();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestForBinaryExpression()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int mult = 1;
+		for (int j = 0; j < i.Length; j++) {
+			mult = mult * i[j];
+		}
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int mult = i.Aggregate (1, (current, t) => current*t);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestMaxCase1()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int max = 0;
+		foreach (var x in i) {
+			max = Math.Max (max, x);
+		}
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int max = i.Concat (new[] {0}).Max ();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestMaxCase2()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int max = 0;
+		foreach (var x in i) {
+			max = Math.Max (x, max);
+		}
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int max = i.Concat (new[] {0}).Max ();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestMaxCase3()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int max = 0;
+		foreach (var x in i) {
+			max = x > max ? x : max;
+		}
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int max = i.Concat (new[] {0}).Max ();
+	}
+}
+");
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int max = 0;
+		foreach (var x in i) {
+			max = x >= max ? x : max;
+		}
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int max = i.Concat (new[] {0}).Max ();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestMaxCase4()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int max = 0;
+		foreach (var x in i) {
+			max = x < max ? max : x;
+		}
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int max = i.Concat (new[] {0}).Max ();
+	}
+}
+");
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int max = 0;
+		foreach (var x in i) {
+			max = x <= max ? max : x;
+		}
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int max = i.Concat (new[] {0}).Max ();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestMinCase1()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int max = 0;
+		foreach (var x in i) {
+			max = Math.Min (max, x);
+		}
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		int max = i.Concat (new[] {0}).Min ();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestCastMatch()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (object[] i)
+	{
+		List<Bar> list = new List<Bar>();
+		foreach (var x in i) {
+			list.Add((Bar)x);
+		}
+	}
+}
+", @"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (object[] i)
+	{
+		List<Bar> list = i.Cast<Bar> ().ToList ();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestOfTypeMatch()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (object[] i)
+	{
+		List<Bar> list = new List<Bar>();
+		foreach (var x in i) {
+			if (x is Bar)
+				list.Add((Bar)x);
+		}
+	}
+}
+", @"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (object[] i)
+	{
+		List<Bar> list = i.OfType<Bar> ().ToList ();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestFirstOrDefault()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo (object[] i)
+	{
+		object first = null;
+		foreach (var x in i){
+			first = x;
+			break;
+		}
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (object[] i)
+	{
+		object first = i.FirstOrDefault ();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestLastOrDefault()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo (object[] i)
+	{
+		object last = null;
+		foreach (var x in i){
+			last = x;
+		}
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (object[] i)
+	{
+		object last = i.LastOrDefault ();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo(int[] i)
+	{
+		int sum = 0;
+		// ReSharper disable once LoopCanBeConvertedToQuery
+		foreach (var j in i) {
+			sum += j;
+		}
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MemberCanBeMadeStaticIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MemberCanBeMadeStaticIssueTests.cs
new file mode 100644
index 0000000000..d1d8309fdd
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MemberCanBeMadeStaticIssueTests.cs
@@ -0,0 +1,340 @@
+//
+// ConvertToStaticMethodIssue.cs
+//
+// Author:
+//       Ciprian Khlud <ciprian.mustiata@yahoo.com>
+//
+// Copyright (c) 2013 Ciprian Khlud
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class MemberCanBeMadeStaticIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestPrivateMethod()
+		{
+			TestWithSubIssue<MemberCanBeMadeStaticIssue>(
+				@"class TestClass
+{
+	void $Test ()
+	{
+		int a = 2;
+	}
+}",
+				@"class TestClass
+{
+	static void Test ()
+	{
+		int a = 2;
+	}
+}", CommonSubIssues.PrivateMember
+			);
+		}
+
+		[Test]
+		public void TestPrivateMethodPublicSkip()
+		{
+			TestWrongContextWithSubIssue<MemberCanBeMadeStaticIssue>(
+				@"class TestClass
+{
+	void $Test ()
+	{
+		int a = 2;
+	}
+}", CommonSubIssues.NonPrivateMember
+			);
+		}
+
+		[Test]
+		public void TestPublicMethod()
+		{
+			TestWithSubIssue<MemberCanBeMadeStaticIssue>(
+				@"class TestClass
+{
+	public void $Test ()
+	{
+		int a = 2;
+	}
+}",
+				@"class TestClass
+{
+	public static void Test ()
+	{
+		int a = 2;
+	}
+}", CommonSubIssues.NonPrivateMember
+			);
+		}
+
+		[Test]
+		public void TestPublicMethodSkip()
+		{
+			TestWrongContextWithSubIssue<MemberCanBeMadeStaticIssue>(
+				@"class TestClass
+{
+	public void $Test ()
+	{
+		int a = 2;
+	}
+}", CommonSubIssues.PrivateMember
+			);
+		}
+
+		[Test]
+		public void MethodThatCallsInstanceMethodOnParameter()
+		{
+			TestWithSubIssue<MemberCanBeMadeStaticIssue>(
+				@"class TestClass
+{
+	string $Test (string txt)
+	{
+		return txt.Trim ();
+	}
+}",
+				@"class TestClass
+{
+	static string Test (string txt)
+	{
+		return txt.Trim ();
+	}
+}", CommonSubIssues.PrivateMember
+			);
+		}
+
+		[Test]
+		public void TestWithVirtualFunction()
+		{
+			
+			var input = @"class TestClass
+{
+	public virtual void $Test ()
+	{
+		int a = 2;
+	}
+}";
+			TestWrongContextWithSubIssue<MemberCanBeMadeStaticIssue>(input, CommonSubIssues.PrivateMember);
+		}
+
+		[Test]
+		public void TestWithInterfaceImplementation()
+		{
+			var input = @"interface IBase {
+    void Test();
+}
+class TestClass : IBase
+{
+	public void $Test ()
+	{
+		int a = 2;
+	}
+}";
+			TestWrongContextWithSubIssue<MemberCanBeMadeStaticIssue>(input, CommonSubIssues.NonPrivateMember);
+		}
+
+		[Test]
+		public void TestWithStaticFunction()
+		{
+
+			var input = @"class TestClass
+{
+	static void $Test ()
+	{
+		int a = 2;
+	}
+}";
+			TestWrongContextWithSubIssue<MemberCanBeMadeStaticIssue>(input, CommonSubIssues.PrivateMember);
+		}
+
+		[Test]
+		public void TestDoNotWarnOnAttributes()
+		{
+
+			var input = @"using System;
+class TestClass
+{
+	[Obsolete]
+	public void $Test ()
+	{
+		int a = 2;
+	}
+}";
+			TestWrongContextWithSubIssue<MemberCanBeMadeStaticIssue>(input, CommonSubIssues.NonPrivateMember);
+		}
+
+		[Test]
+		public void TestDoNotWarnOnEmptyMethod()
+		{
+
+			var input = @"using System;
+class TestClass
+{
+	public void $Test ()
+	{
+	}
+}";
+			TestWrongContextWithSubIssue<MemberCanBeMadeStaticIssue>(input, CommonSubIssues.NonPrivateMember);
+		}
+
+		[Test]
+		public void TestDoNotWarnOnInterfaceMethod()
+		{
+
+			var input = @"using System;
+interface ITestInterface
+{
+	void $Test ();
+}";
+			TestWrongContextWithSubIssue<MemberCanBeMadeStaticIssue>(input, CommonSubIssues.PrivateMember);
+		}
+
+		[Test]
+		public void TestDoNotWarnOnNotImplementedMethod()
+		{
+			var input = @"using System;
+class TestClass
+{
+	public void $Test ()
+	{
+		throw new NotImplementedExceptionIssue();
+	}
+}";
+			TestWrongContextWithSubIssue<MemberCanBeMadeStaticIssue>(input, CommonSubIssues.NonPrivateMember);
+		}
+
+		[Test]
+		public void TestPropertyAccess()
+		{
+			var input = @"using System;
+class TestClass
+{
+	public int Foo { get; set; }
+	public void $Test ()
+	{
+		System.Console.WriteLine (Foo);
+	}
+}";
+			TestWrongContextWithSubIssue<MemberCanBeMadeStaticIssue>(input, CommonSubIssues.NonPrivateMember);
+		}
+
+		[Test]
+		public void DoNotWarnOnMarshalByRefObject()
+		{
+			
+			var input = @"class TestClass : System.MarshalByRefObject
+{
+	public void $Test ()
+	{
+		int a = 2;
+	}
+}";
+			TestWrongContextWithSubIssue<MemberCanBeMadeStaticIssue>(input, CommonSubIssues.NonPrivateMember);
+		}
+
+		[Test]
+		public void TestProperty()
+		{
+			TestWithSubIssue<MemberCanBeMadeStaticIssue>(
+				@"class TestClass
+{
+	int Test {
+		get {
+			return 2;
+		}
+	}
+}",
+				@"class TestClass
+{
+	static int Test {
+		get {
+			return 2;
+		}
+	}
+}", CommonSubIssues.PrivateMember
+			);
+		}
+
+
+		[Test]
+		public void TestCustomEvent()
+		{
+			TestWithSubIssue<MemberCanBeMadeStaticIssue>(
+				@"using System;
+
+class TestClass
+{
+	static event EventHandler Foo;
+
+	event EventHandler Bar {
+		add { Foo += value; }
+		remove { Foo -= value; }
+	}
+}",
+				@"using System;
+
+class TestClass
+{
+	static event EventHandler Foo;
+
+	static event EventHandler Bar {
+		add { Foo += value; }
+		remove { Foo -= value; }
+	}
+}", CommonSubIssues.PrivateMember
+				);
+		}
+
+		
+		[Test]
+		public void TestCustomEventOnNotImplemented()
+		{
+			TestWrongContextWithSubIssue<MemberCanBeMadeStaticIssue>(
+				@"using System;
+
+class TestClass
+{
+	static event EventHandler Foo;
+
+	event EventHandler Bar {
+		add { throw new NotImplementedException (); }
+		remove { throw new NotImplementedException (); }
+	}
+}", CommonSubIssues.PrivateMember
+				);
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContextWithSubIssue<MemberCanBeMadeStaticIssue>(
+				@"class TestClass
+{
+// ReSharper disable once MemberCanBeMadeStatic.Local
+	void Test ()
+	{
+		int a = 2;
+	}
+}", CommonSubIssues.PrivateMember);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MemberHidesStaticFromOuterClassIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MemberHidesStaticFromOuterClassIssueTests.cs
new file mode 100644
index 0000000000..b1c17e9afd
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MemberHidesStaticFromOuterClassIssueTests.cs
@@ -0,0 +1,71 @@
+//
+// MemberHidesStaticFromOuterClassIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class MemberHidesStaticFromOuterClassIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase()
+		{
+			TestIssue<MemberHidesStaticFromOuterClassIssue>(@"
+public class Foo
+{
+	public class Bar
+	{
+		public string Test { get; set; }
+	}
+
+	public static string Test { get; set; }
+}
+");
+		}
+
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<MemberHidesStaticFromOuterClassIssue>(@"
+public class Foo
+{
+	public class Bar
+	{
+		// ReSharper disable once MemberHidesStaticFromOuterClass
+		public string Test { get; set; }
+	}
+
+	public static string Test { get; set; }
+}
+");
+		}
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MethodNeverReturnsIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MethodNeverReturnsIssueTests.cs
deleted file mode 100644
index 58b4db6a5d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MethodNeverReturnsIssueTests.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-// 
-// MethodNeverReturnsIssueTests.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class MethodNeverReturnsIssueTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestEnd ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod () 
-	{
-		int i = 1;
-	}
-}";
-			Test<MethodNeverReturnsIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestReturn ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		return;
-	}
-}";
-			Test<MethodNeverReturnsIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestThrow ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		throw new System.NotImplementedException();	
-	}
-}";
-			Test<MethodNeverReturnsIssue> (input, 0);
-		}
-
-		[Test]
-		public void TesNeverReturns ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		while (true) ;
-	}
-}";
-			Test<MethodNeverReturnsIssue> (input, 1);
-		}
-		
-		[Test]
-		public void YieldBreak ()
-		{
-			var input = @"
-class TestClass
-{
-	System.Collections.Generic.IEnumerable<string> TestMethod ()
-	{
-		yield break;
-	}
-}";
-			Test<MethodNeverReturnsIssue> (input, 0);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MethodOverloadWithOptionalParameterIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MethodOverloadWithOptionalParameterIssueTests.cs
new file mode 100644
index 0000000000..4525b3e9ba
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MethodOverloadWithOptionalParameterIssueTests.cs
@@ -0,0 +1,125 @@
+//
+// MethodOverloadWithOptionalParameterIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class MethodOverloadWithOptionalParameterIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSingleMethod ()
+		{
+			TestIssue<MethodOverloadWithOptionalParameterIssue>(@"
+using System;
+
+public class FooBar
+{
+	public void Print(string message)
+	{
+		Console.WriteLine(message);
+	}
+
+	private void Print(string message, string messageDelimiter = ""==="")
+	{
+		Console.WriteLine(message + messageDelimiter);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestTwoParameters ()
+		{
+			TestIssue<MethodOverloadWithOptionalParameterIssue>(@"
+using System;
+
+public class FooBar
+{
+    public void Print(string message)
+    {
+        Console.WriteLine(message);
+    }
+
+    public void Print(string message, string str2)
+    {
+        Console.WriteLine(message);
+    }
+
+    private void Print(string message, string messageDelimiter = ""==="", string secondmessage = ""==="")
+	{
+		Console.WriteLine(message + messageDelimiter);
+	}
+}", 2);
+		}
+
+		[Test]
+		public void TestIndexer ()
+		{
+			TestIssue<MethodOverloadWithOptionalParameterIssue>(@"
+using System;
+
+public class FooBar
+{
+	public string this[string message]
+	{
+		get { return message; }
+	}
+
+	private string this[string message, string messageDelimiter = ""===""]
+	{
+		get { return message + messageDelimiter; }
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<MethodOverloadWithOptionalParameterIssue>(@"
+using System;
+
+public class FooBar
+{
+	public void Print(string message)
+	{
+		Console.WriteLine(message);
+	}
+
+	// ReSharper disable once MethodOverloadWithOptionalParameter
+	private void Print(string message, string messageDelimiter = ""==="")
+	{
+		Console.WriteLine(message + messageDelimiter);
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MissingInterfaceMemberImplementationIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MissingInterfaceMemberImplementationIssueTests.cs
new file mode 100644
index 0000000000..43e07b4c73
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MissingInterfaceMemberImplementationIssueTests.cs
@@ -0,0 +1,193 @@
+//
+// MissingInterfaceMemberImplementationIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class MissingInterfaceMemberImplementationIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestUnimplementedInterface ()
+		{
+			TestIssue<MissingInterfaceMemberImplementationIssue>(@"
+interface IF
+{
+	void Foo();
+}
+
+class Test : IF
+{
+}
+");
+		}
+
+		[Test]
+		public void TestPartiallyImplementedInterface ()
+		{
+			TestIssue<MissingInterfaceMemberImplementationIssue>(@"
+interface IF
+{
+	void Foo();
+	void Foo2();
+}
+
+class Test : IF
+{
+	public void Foo()
+	{
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestMultiple ()
+		{
+			TestIssue<MissingInterfaceMemberImplementationIssue>(@"
+interface IF
+{
+	void Foo();
+}
+
+interface IB
+{
+	void Bar();
+	void Bar2();
+}
+
+
+class Test : IF, IB
+{
+	public void Bar()
+	{
+	}
+}
+", 2);
+		}
+
+		[Test]
+		public void TestImplementedInterface ()
+		{
+			TestWrongContext<MissingInterfaceMemberImplementationIssue>(@"
+interface IF
+{
+	void Foo();
+}
+
+class Test : IF
+{
+	public void Foo()
+	{
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestInterfaceInheritance ()
+		{
+			TestWrongContext<MissingInterfaceMemberImplementationIssue>(@"
+	public interface IService
+	{
+		string ServiceName { get; }
+	}
+
+	public interface IExtensionService : IService
+	{
+		void Initialize ();
+	}
+");
+		}
+
+
+		/// <summary>
+		/// Bug 14944 - Incorrect issue context for Interface not implemented 
+		/// </summary>
+		[Test]
+		public void TestBug14944 ()
+		{
+			TestWrongContext<MissingInterfaceMemberImplementationIssue>(@"
+using System.Collections;
+using System.Collections.Generic;
+using System;
+
+abstract class Test<T> : IEnumerable, IEnumerable<T>
+{
+	#region IEnumerable implementation
+
+	public IEnumerator<T> GetEnumerator ()
+	{
+		throw new NotImplementedException ();
+	}
+
+	#endregion
+
+	#region IEnumerable implementation
+
+	IEnumerator IEnumerable.GetEnumerator ()
+	{
+		throw new NotImplementedException ();
+	}
+	#endregion
+}
+");
+		}
+
+
+		[Test]
+		public void TestAlreadyImplementedByInheritance ()
+		{
+			TestWrongContext<MissingInterfaceMemberImplementationIssue>(@"
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+public abstract class FooBase<T> : IEnumerable, IEnumerable<T>
+{
+	public IEnumerator<T> GetEnumerator ()
+	{
+		return null;
+	}
+
+	IEnumerator IEnumerable.GetEnumerator ()
+	{
+		return null;
+	}
+}
+
+public class Foo<T> : FooBase<T>, IEnumerable, IEnumerable<T>
+{
+}
+");
+		}
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MissingStringComparisonIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MissingStringComparisonIssueTests.cs
deleted file mode 100644
index 25fcae8768..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MissingStringComparisonIssueTests.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// Author:
-//       Daniel Grunwald <daniel@danielgrunwald.de>
-//
-// Copyright (c) 2012 Daniel Grunwald
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class MissingStringComparisonIssueTests : InspectionActionTestBase
-	{
-		const string stringIndexOfStringCalls = @"using System;
-using System.Collections.Generic;
-class Test {
-	public void StringIndexOfStringCalls(List<string> list)
-	{
-		list[0].IndexOf("".com"");
-		list[0].IndexOf("".com"", 0);
-		list[0].IndexOf("".com"", 0, 5);
-		list[0].IndexOf(list[1], 0, 10);
-	}
-}";
-		const string stringIndexOfStringCallsWithComparison = @"using System;
-using System.Collections.Generic;
-class Test {
-	public void StringIndexOfStringCalls(List<string> list)
-	{
-		list [0].IndexOf ("".com"", StringComparison.Ordinal);
-		list [0].IndexOf ("".com"", 0, StringComparison.Ordinal);
-		list [0].IndexOf ("".com"", 0, 5, StringComparison.Ordinal);
-		list [0].IndexOf (list [1], 0, 10, StringComparison.Ordinal);
-	}
-}";
-		
-		[Test]
-		public void IndexOfStringCalls()
-		{
-			Test<MissingStringComparisonIssue>(stringIndexOfStringCalls, 4, stringIndexOfStringCallsWithComparison);
-		}
-		
-		[Test]
-		public void IndexOfStringCallsAlreadyWithComparison()
-		{
-			Test<MissingStringComparisonIssue>(stringIndexOfStringCallsWithComparison, 0);
-		}
-		
-		[Test]
-		public void StringIndexOfChar()
-		{
-			string program = @"using System;
-class Test {
-	void M(string text) {
-		text.IndexOf('.');
-	}
-}";
-			Test<MissingStringComparisonIssue>(program, 0);
-		}
-		
-		[Test]
-		public void ListIndexOf()
-		{
-			string program = @"using System.Collections.Generic;
-class Test {
-	void M(List<string> list) {
-		list.IndexOf("".com"");
-	}
-}";
-			Test<MissingStringComparisonIssue>(program, 0);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MultipleEnumerationIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MultipleEnumerationIssueTests.cs
deleted file mode 100644
index 8a5ac38b4b..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/MultipleEnumerationIssueTests.cs
+++ /dev/null
@@ -1,679 +0,0 @@
-// 
-// MultipleEnumerationIssueTests.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class MultipleEnumerationIssueTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestVariableInvocation ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod ()
-	{
-		IEnumerable<object> e = null;
-		var type = e.GetType();
-		var x = e.First ();
-		var y = e.Count ();
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 2);
-		}
-
-		[Test] 
-		public void TestVariableForeach ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod ()
-	{
-		IEnumerable<object> e = null;
-		foreach (var x in e) ;
-		foreach (var y in e) ;
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 2);
-		}
-
-		[Test]
-		public void TestVariableMixed ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod ()
-	{
-		IEnumerable<object> e = null;
-		foreach (var x in e) ;
-		var y = e.Count ();
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 2);
-		}
-
-		[Test]
-		public void TestParameter ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod (IEnumerable<object> e)
-	{
-		foreach (var x in e) ;
-		var y = e.Count ();
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 2);
-		}
-
-		[Test]
-		public void TestObjectMethodInvocation ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod ()
-	{
-		IEnumerable<object> e;
-		var a = e.GetType ();
-		var b = e.ToString ();
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestIf ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		IEnumerable<object> e;
-		if (i > 0) {
-			var a = e.Count ();
-		} else {
-			var b = e.First ();
-			var c = e.Count ();
-		}
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 2);
-		}
-
-		[Test]
-		public void TestIf2 ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		IEnumerable<object> e;
-		if (i > 0) {
-			var a = e.Count ();
-		} else {
-			var b = e.First ();
-		}
-		var c = e.Count ();
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 3);
-		}
-
-		[Test]
-		public void TestIf3 ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		IEnumerable<object> e;
-		if (i > 0) {
-			var a = e.Count ();
-		} else {
-			var b = e.First ();
-		}
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestFor ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod ()
-	{
-		IEnumerable<object> e;
-		for (int i = 0; i < 10; i++) {
-			var a = e.Count ();
-		}
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 1);
-		}
-
-		[Test]
-		public void TestWhile ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod ()
-	{
-		IEnumerable<object> e;
-		int i;
-		while (i > 1) {
-			var a = e.Count ();
-		}
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 1);
-		}
-
-		[Test]
-		public void TestWhile2 ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod ()
-	{
-		IEnumerable<object> e;
-		int i;
-		while (i > e.Count ()) {
-		}
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 1);
-		}
-
-		[Test]
-		public void TestWhile3 ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod ()
-	{
-		IEnumerable<object> e;
-		int i;
-		object x;
-		while (true) {
-			if (i > 1) {
-				x = e.First ();
-				break;
-			} 
-		}
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestWhile4 ()
-		{
-			var input = @"
-using System;
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	IEnumerable<object> GetEnum () { }
-	void TestMethod (int i)
-	{
-		IEnumerable<object> e = GetEnum ();
-		var a1 = e.First ();
-		while ((e = GetEnum ()) != null) {
-			var a2 = e.First ();
-		}
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestDo ()
-		{
-			var input = @"
-using System;
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	IEnumerable<object> GetEnum () { }
-	void TestMethod (int i)
-	{
-		IEnumerable<object> e = GetEnum ();
-		var a1 = e.First ();
-		do {
-			var a2 = e.First ();
-		} while ((e = GetEnum ()) != null);
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 2);
-		}
-
-		[Test]
-		public void TestDo2 ()
-		{
-			var input = @"
-using System;
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	IEnumerable<object> GetEnum () { }
-	void TestMethod (int i)
-	{
-		IEnumerable<object> e = GetEnum ();
-		do {
-			var a2 = e.First ();
-		} while ((e = GetEnum ()) != null);
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestLambda ()
-		{
-			var input = @"
-using System;
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod ()
-	{
-		IEnumerable<object> e;
-		Action a = () => {
-			var x = e.Count ();
-			var y = e.Count ();
-		};
-		var z = e.Count ();
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 2);
-		}
-
-		[Test]
-		public void TestLambda2 ()
-		{
-			var input = @"
-using System;
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void Test (object a, object b) { }
-	void TestMethod ()
-	{
-		IEnumerable<object> e;
-		Action a = () => Test(e.First (), e.Count ());
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 2);
-		}
-
-		[Test]
-		public void TestLambda3 ()
-		{
-			var input = @"
-using System;
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void Test (object a, Action b) { }
-	void TestMethod ()
-	{
-		IEnumerable<object> e;
-		Test(e.First (), () => e.Count ());
-		e = null;
-		var x = e.First ();
-		Action a = () => e.Count();
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestLambda4 ()
-		{
-			var input = @"
-using System;
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void Test (object a, object b) { }
-	void TestMethod ()
-	{
-		IEnumerable<object> e;
-		Action a = () => Test(e.ToString (), e.ToString ());
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestConditionalExpression ()
-		{
-			var input = @"
-using System;
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		IEnumerable<object> e;
-		var a = i > 0 ? e.First () : e.FirstOrDefault ();
-		Action b = () => i > 0 ? e.First () : e.FirstOrDefault ();
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 0);
-		}
-		[Test]
-		public void TestConditionalExpression2 ()
-		{
-			var input = @"
-using System;
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		IEnumerable<object> e;
-		var a = i > 0 ? e.First () : new object ();
-		var b = e.First ();
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 2);
-		}
-
-		[Test]
-		public void TestConstantConditionalExpression ()
-		{
-			var input = @"
-using System;
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		IEnumerable<object> e;
-		var a = 1 > 2 ? e.First () : new object ();
-		var b = e.First ();
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestAssignmentInConditionalExpression ()
-		{
-			var input = @"
-using System;
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	IEnumerable<object> GetEnum () { }
-	void TestMethod (int i)
-	{
-		IEnumerable<object> e;
-		var x1 = e.First ();
-		var a = i > 0 ? e = GetEnum () : GetEnum ();
-		var x2 = e.First ();
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 2);
-		}
-
-		[Test]
-		public void TestAssignmentInConditionalExpression2 ()
-		{
-			var input = @"
-using System;
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	IEnumerable<object> GetEnum () { }
-	void TestMethod (int i)
-	{
-		IEnumerable<object> e;
-		var x1 = e.First ();
-		var a = i > 0 ? e = GetEnum () : e = GetEnum ();
-		var x2 = e.First ();
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestAssignment ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod (IEnumerable<object> e)
-	{
-		foreach (var x in e) ;
-		e = null;
-		var y = e.Count ();
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestAssignment2 ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod (IEnumerable<object> e)
-	{
-		foreach (var x in e) ;
-		e = null;
-		var y = e.Count ();
-		e = null;
-		var a = e.First ();
-		var b = e.First ();
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 2);
-		}
-
-		[Test]
-		public void TestNoIssue ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void TestMethod (IEnumerable<object> e)
-	{
-		foreach (var x in e) ;
-		IEnumerable<object> e2;
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestExpression ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	int Test (params object[] args) { }
-	void TestMethod ()
-	{
-		IEnumerable<object> e = null;
-		var type = e.GetType();
-		var x = Test (e.First (), e.Count ());
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 2);
-		}
-
-		[Test]
-		public void TestExpression2 ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	int Test (params object[] args) { }
-	void TestMethod ()
-	{
-		IEnumerable<object> e = null;
-		var type = e.GetType();
-		var x = Test (e.First (), e = new objct[0], e.Count ());
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestOutArgument ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void Test (out IEnumerable<object> e)
-	{
-		e = null;
-	}
-
-	void TestMethod (IEnumerable<object> e)
-	{
-		foreach (var x in e) ;
-		Test (out e);
-		var y = e.Count ();
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestOutArgument2 ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void Test (out IEnumerable<object> e)
-	{
-		e = null;
-	}
-
-	void TestMethod (IEnumerable<object> e)
-	{
-		foreach (var x in e) ;
-		Test (out e);
-		var y = e.Count ();
-		var z = e.Count ();
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 2);
-		}
-
-		[Test]
-		public void TestOutArgument3 ()
-		{
-			var input = @"
-using System.Collections.Generic;
-using System.Linq;
-class TestClass
-{
-	void Test (object arg1, out IEnumerable<object> e, object arg2)
-	{
-		e = null;
-	}
-
-	void TestMethod (IEnumerable<object> e)
-	{
-		Test (e.First (), out e, e.First ());
-	}
-}";
-			Test<MultipleEnumerationIssue> (input, 2);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NegativeRelationalExpressionIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NegativeRelationalExpressionIssueTests.cs
index fbc1d86dcb..a5d2006709 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NegativeRelationalExpressionIssueTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NegativeRelationalExpressionIssueTests.cs
@@ -136,5 +136,20 @@ struct LineChangeInfo
 }";
 			Test<NegativeRelationalExpressionIssue> (input, 0);
 		}
+
+		[Test]
+		public void TestBug ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod (bool a, bool b)
+	{
+		var x = !(a || b);
+	}
+}";
+			TestWrongContext<NegativeRelationalExpressionIssue> (input);
+		}
+
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NoDefaultConstructorIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NoDefaultConstructorIssueTests.cs
deleted file mode 100644
index 5ddd888d18..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NoDefaultConstructorIssueTests.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.CodeIssues;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-    [TestFixture]
-	public class NoDefaultConstructorIssueTests : InspectionActionTestBase
-	{
-		[Test]
-        public void ShouldReturnIssueIfBaseConstructorNotInvoked()
-        {
-			var testInput =
-@"class BaseClass
-{
-	public BaseClass(string input) {}
-}
-
-class ChildClass : BaseClass
-{
-}";
-
-			Test<NoDefaultConstructorIssue>(testInput, 1);
-        }
-
-		[Test]
-		public void ShouldNotReturnIssueIfBaseClassHasDefaultConstructor()
-		{
-			var testInput =
-@"class BaseClass
-{
-}
-
-class ChildClass : BaseClass
-{
-}";
-
-			Test<NoDefaultConstructorIssue>(testInput, 0);
-		}
-
-		[Test]
-		public void ShouldNotReturnIssueIfBaseConstructorIsInvoked()
-		{
-			var testInput =
-@"class BaseClass
-{
-	public BaseClass(string input) {}
-}
-
-class ChildClass : BaseClass
-{
-	public ChildClass() : base(""test"") {}
-}";
-
-			Test<NoDefaultConstructorIssue>(testInput, 0);
-		}
-
-		[Test]
-		public void ShouldReturnIssueIfInvalidArgumentsArePassedToBaseConstructor()
-		{
-			var testInput =
-@"class BaseClass
-{
-	public BaseClass(string input) {}
-}
-
-class ChildClass : BaseClass
-{
-	public ChildClass() : base(123) {}
-}";
-
-			Test<NoDefaultConstructorIssue>(testInput, 1);
-		}
-
-		[Test]
-		public void ShouldIgnoreInterfaces()
-		{
-			var testInput =
-@"class TestClass : System.Collections.IList
-{
-}";
-
-			Test<NoDefaultConstructorIssue>(testInput, 0);
-		}
-
-		[Test]
-		public void ShouldMakeSureAllConstructorsInvokeBaseConstructor()
-		{
-			var testInput =
-@"class BaseClass
-{
-	public BaseClass(string test) {}
-}
-
-class ChildClass : BaseClass
-{
-	public ChildClass() : base(""test"") {}
-	public ChildClass(string test) {}
-}";
-
-			Test<NoDefaultConstructorIssue>(testInput, 1);
-		}
-
-		[Test]
-		public void ShouldOnlyLookAtDirectBaseClasses()
-		{
-			var testInput =
-@"class TopLevelClass
-{
-	public TopLevelClass(string test) {}
-}
-
-class BaseClass : TopLevelClass
-{
-	public BaseClass() : base(""hello"") {}
-}
-
-class ChildClass : BaseClass
-{
-}";
-
-			Test<NoDefaultConstructorIssue>(testInput, 0);
-		}
-
-		[Test]
-		public void ShouldReturnAnIssueIfBaseConstructorIsPrivate()
-		{
-			var testInput =
-@"class BaseClass
-{
-	private BaseClass() {}
-}
-
-class ChildClass : BaseClass
-{
-}";
-
-			Test<NoDefaultConstructorIssue>(testInput, 1);
-		}
-
-		[Test]
-		public void ShouldReturnIssuesForNestedTypes()
-		{
-			TestRefactoringContext context;
-
-			var testInput =
-@"class B {
-	public B(string test) {}
-}
-
-class D {
-	public D(string test) {}
-}
-
-class A : B {
-	class C : D {}
-	public A() {}
-}";
-
-			var issues = GetIssues(new NoDefaultConstructorIssue(), testInput, out context, false);
-
-			Assert.AreEqual("CS1729: The type 'B' does not contain a constructor that takes '0' arguments", issues.ElementAt(1).Description);
-			Assert.AreEqual("CS1729: The type 'D' does not contain a constructor that takes '0' arguments", issues.ElementAt(0).Description);
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NonPublicMethodWithTestAttributeIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NonPublicMethodWithTestAttributeIssueTests.cs
new file mode 100644
index 0000000000..11a5bd9725
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NonPublicMethodWithTestAttributeIssueTests.cs
@@ -0,0 +1,170 @@
+//
+// NonPublicMethodWithTestAttributeIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class NonPublicMethodWithTestAttributeIssueTests : InspectionActionTestBase
+	{
+		const string NUnitClasses = @"using System;
+using NUnit.Framework;
+
+namespace NUnit.Framework {
+	public class TestFixtureAttribute : System.Attribute {}
+	public class TestAttribute : System.Attribute {}
+}";
+
+		[Test]
+		public void TestImplicitPrivate()
+		{
+			var input = NUnitClasses + 
+				@"
+[TextFixture]
+class Tests 
+{
+	[Test]
+	void NonPublicMethod ()
+	{
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new NonPublicMethodWithTestAttributeIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix(context, issues, NUnitClasses + 
+				@"
+[TextFixture]
+class Tests 
+{
+	[Test]
+	public void NonPublicMethod ()
+	{
+	}
+}");
+		}
+
+		[Test]
+		public void TestExplictPrivate()
+		{
+			var input = NUnitClasses + 
+				@"
+[TextFixture]
+class Tests 
+{
+	[Test]
+	private void NonPublicMethod ()
+	{
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new NonPublicMethodWithTestAttributeIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix(context, issues, NUnitClasses + 
+				@"
+[TextFixture]
+class Tests 
+{
+	[Test]
+	public void NonPublicMethod ()
+	{
+	}
+}");
+		}
+
+		[Test]
+		public void TestExplictProtected()
+		{
+			var input = NUnitClasses + 
+				@"
+[TextFixture]
+class Tests 
+{
+	[Test]
+	protected void NonPublicMethod ()
+	{
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new NonPublicMethodWithTestAttributeIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix(context, issues, NUnitClasses + 
+				@"
+[TextFixture]
+class Tests 
+{
+	[Test]
+	public void NonPublicMethod ()
+	{
+	}
+}");
+		}
+
+		
+		[Test]
+		public void TestDisable()
+		{
+			var input = NUnitClasses + 
+				@"
+[TextFixture]
+class Tests 
+{
+	// ReSharper disable once NUnit.NonPublicMethodWithTestAttribute
+	[Test]
+	void NonPublicMethod ()
+	{
+	}
+}
+";
+			TestWrongContext<NonPublicMethodWithTestAttributeIssue>(input);
+		}
+
+
+		[Test]
+		public void TestDisableAll()
+		{
+			var input = NUnitClasses + 
+				@"
+[TextFixture]
+class Tests 
+{
+	// ReSharper disable All
+	[Test]
+	void NonPublicMethod ()
+	{
+	}
+	// ReSharper restore All
+}
+";
+			TestWrongContext<NonPublicMethodWithTestAttributeIssue>(input);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NonReadonlyReferencedInGetHashCodeTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NonReadonlyReferencedInGetHashCodeTests.cs
new file mode 100644
index 0000000000..9902fdb0de
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NonReadonlyReferencedInGetHashCodeTests.cs
@@ -0,0 +1,219 @@
+// 
+// NonReadonlyReferencedInGetHashCodeTetsts.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class NonReadonlyReferencedInGetHashCodeTests : InspectionActionTestBase
+	{
+		
+		[Test]
+		public void TestInspectorCase1()
+		{
+			var input = @"using System;
+public class TestClass1
+{
+	public int a = 1;
+}
+
+public class TestClass2
+{
+	public override int GetHashCode()
+	{
+		TestClass1 c = new TestClass1();
+		int b = 1;
+		b++;
+		return c.a;
+	}
+}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new NonReadonlyReferencedInGetHashCodeIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+		}
+		
+		[Test]
+		public void TestInspectorCase2()
+		{
+			var input = @"using System;
+public class TestClass1
+{
+	public int a = 1;
+}
+
+public class TestClass2
+{
+	private int b;
+	public override int GetHashCode()
+	{
+		TestClass1 c = new TestClass1();
+		b++;
+		return c.a;
+	}
+}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new NonReadonlyReferencedInGetHashCodeIssue(), input, out context);
+			Assert.AreEqual(2, issues.Count);
+		}
+		
+		[Test]
+		public void TestInspectorCase3()
+		{
+			var input = @"using System;
+public class TestClass1
+{
+	public int a = 1;
+}
+
+public class TestClass2
+{
+	public override int GetHashCode()
+	{
+		TestClass1 c = new TestClass1();
+		int b = 1;
+		b++;
+		return c.GetHashCode();
+	}
+}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new NonReadonlyReferencedInGetHashCodeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void TestInspectorCase4()
+		{
+			var input = @"public class Test1
+{
+	public int a = 1;
+}
+
+public class Test2
+{
+	private int q;
+	public Test1 r;
+	public override int GetHashCode()
+	{
+		Test1 c = new Test1();
+		q = 1 + q + r.a;
+		return c.a;
+	}
+}
+
+
+public class Test3
+{
+	private int q;
+	public Test2 r;
+	public override int GetHashCode()
+	{
+		Test1 c = new Test1();
+		c.GetHashCode();
+		q = 1 + q + r.r.a;
+		return c.a;
+	}
+}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new NonReadonlyReferencedInGetHashCodeIssue(), input, out context);
+			Assert.AreEqual(11, issues.Count);
+		}
+		
+		
+		[Test]
+		public void TestResharperDisableRestore()
+		{
+			var input = @"using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace resharper_test
+{
+	class Foo
+	{
+		private readonly int fooval;
+		private int tmpval;
+
+		public override int GetHashCode()
+		{
+			int a = 6;
+//Resharper disable NonReadonlyReferencedInGetHashCode
+			tmpval = a + 3;
+//Resharper restore NonReadonlyReferencedInGetHashCode
+			a = tmpval + 5;
+			return fooval;
+		}
+	}
+}
+";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new NonReadonlyReferencedInGetHashCodeIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+		}
+
+
+
+		[Test]
+		public void TestConst()
+		{
+			TestWrongContext<NonReadonlyReferencedInGetHashCodeIssue>(@"using System;
+public class TestClass1
+{
+	public const int a = 1;
+	
+	public override int GetHashCode()
+	{
+		return a;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestReadOnly()
+		{
+			TestWrongContext<NonReadonlyReferencedInGetHashCodeIssue>(@"using System;
+public class TestClass1
+{
+	public readonly int a = 1;
+	
+	public override int GetHashCode()
+	{
+		return a;
+	}
+}
+");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NonReadonlyReferencedInGetHashCodeTetsts.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NonReadonlyReferencedInGetHashCodeTetsts.cs
new file mode 100644
index 0000000000..ec8c45ca3b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NonReadonlyReferencedInGetHashCodeTetsts.cs
@@ -0,0 +1,185 @@
+// 
+// NonReadonlyReferencedInGetHashCodeTetsts.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class NonReadonlyReferencedInGetHashCodeTetsts : InspectionActionTestBase
+	{
+		
+		[Test]
+		public void TestInspectorCase1()
+		{
+			var input = @"using System;
+public class TestClass1
+{
+	public int a = 1;
+}
+
+public class TestClass2
+{
+	public override int GetHashCode()
+	{
+		TestClass1 c = new TestClass1();
+		int b = 1;
+		b++;
+		return c.a;
+	}
+}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new NonReadonlyReferencedInGetHashCodeIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+		}
+		
+		[Test]
+		public void TestInspectorCase2()
+		{
+			var input = @"using System;
+public class TestClass1
+{
+	public int a = 1;
+}
+
+public class TestClass2
+{
+	private int b;
+	public override int GetHashCode()
+	{
+		TestClass1 c = new TestClass1();
+		b++;
+		return c.a;
+	}
+}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new NonReadonlyReferencedInGetHashCodeIssue(), input, out context);
+			Assert.AreEqual(2, issues.Count);
+		}
+		
+		[Test]
+		public void TestInspectorCase3()
+		{
+			var input = @"using System;
+public class TestClass1
+{
+	public int a = 1;
+}
+
+public class TestClass2
+{
+	public override int GetHashCode()
+	{
+		TestClass1 c = new TestClass1();
+		int b = 1;
+		b++;
+		return c.GetHashCode();
+	}
+}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new NonReadonlyReferencedInGetHashCodeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void TestInspectorCase4()
+		{
+			var input = @"public class Test1
+{
+	public int a = 1;
+}
+
+public class Test2
+{
+	private int q;
+	public Test1 r;
+	public override int GetHashCode()
+	{
+		Test1 c = new Test1();
+		q = 1 + q + r.a;
+		return c.a;
+	}
+}
+
+
+public class Test3
+{
+	private int q;
+	public Test2 r;
+	public override int GetHashCode()
+	{
+		Test1 c = new Test1();
+		c.GetHashCode();
+		q = 1 + q + r.r.a;
+		return c.a;
+	}
+}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new NonReadonlyReferencedInGetHashCodeIssue(), input, out context);
+			Assert.AreEqual(11, issues.Count);
+		}
+		
+		
+		[Test]
+		public void TestResharperDisableRestore()
+		{
+			var input = @"using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace resharper_test
+{
+	class Foo
+	{
+		private readonly int fooval;
+		private int tmpval;
+
+		public override int GetHashCode()
+		{
+			int a = 6;
+//Resharper disable NonReadonlyReferencedInGetHashCode
+			tmpval = a + 3;
+//Resharper restore NonReadonlyReferencedInGetHashCode
+			a = tmpval + 5;
+			return fooval;
+		}
+	}
+}
+";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new NonReadonlyReferencedInGetHashCodeIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NotResolvedInTextIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NotResolvedInTextIssueTests.cs
new file mode 100644
index 0000000000..a1b4a20e9c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/NotResolvedInTextIssueTests.cs
@@ -0,0 +1,412 @@
+//
+// IncorrectExceptionParametersOrderingTests.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class NotResolvedInTextIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestBadExamples()
+		{
+			TestIssue<NotResolvedInTextIssue>(@"
+using System;
+class A
+{
+	void F()
+	{
+		throw new ArgumentNullException (""The parameter 'blah' can not be null"", ""blah"");
+		throw new ArgumentException (""blah"", ""The parameter 'blah' can not be null"");
+		throw new ArgumentOutOfRangeException (""The parameter 'blah' can not be null"", ""blah"");
+		throw new DuplicateWaitObjectException (""The parameter 'blah' can not be null"", ""blah"");
+	}
+}", 4);
+		}
+
+		[Test]
+		public void TestArgumentNullExceptionSwap()
+		{
+			Test<NotResolvedInTextIssue>(@"
+using System;
+class A
+{
+	void F(int foo)
+	{
+		throw new ArgumentNullException (""bar"", ""foo"");
+	}
+}", 2, @"
+using System;
+class A
+{
+	void F(int foo)
+	{
+		throw new ArgumentNullException (""foo"", ""bar"");
+	}
+}", 0);
+		}
+
+		[Test]
+		public void TestArgumentExceptionSwap()
+		{
+			Test<NotResolvedInTextIssue>(@"
+using System;
+class A
+{
+	void F(int foo)
+	{
+		throw new ArgumentException (""foo"", ""bar"");
+	}
+}", 2, @"
+using System;
+class A
+{
+	void F(int foo)
+	{
+		throw new ArgumentException (""bar"", ""foo"");
+	}
+}", 0);
+		}
+
+		[Test]
+		public void TestArgumentOutOfRangeExceptionSwap()
+		{
+			Test<NotResolvedInTextIssue>(@"
+using System;
+class A
+{
+	void F(int foo)
+	{
+		throw new ArgumentOutOfRangeException (""bar"", ""foo"");
+	}
+}", 2, @"
+using System;
+class A
+{
+	void F(int foo)
+	{
+		throw new ArgumentOutOfRangeException (""foo"", ""bar"");
+	}
+}", 0);
+		}
+
+		[Test]
+		public void TestArgumentOutOfRangeExceptionSwapCase2()
+		{
+			Test<NotResolvedInTextIssue>(@"
+using System;
+class A
+{
+	void F(int foo)
+	{
+		throw new ArgumentOutOfRangeException (""bar"", 3, ""foo"");
+	}
+}", 2, @"
+using System;
+class A
+{
+	void F(int foo)
+	{
+		throw new ArgumentOutOfRangeException (""foo"", 3, ""bar"");
+	}
+}", 0);
+		}
+
+		[Test]
+		public void TestDuplicateWaitObjectExceptionSwap()
+		{
+			Test<NotResolvedInTextIssue>(@"
+using System;
+class A
+{
+	void F(int foo)
+	{
+		throw new DuplicateWaitObjectException (""bar"", ""foo"");
+	}
+}", 2, @"
+using System;
+class A
+{
+	void F(int foo)
+	{
+		throw new DuplicateWaitObjectException (""foo"", ""bar"");
+	}
+}", 0);
+		}
+
+
+		[Test]
+		public void TestInvalidArgumentException()
+		{
+			TestWrongContext<NotResolvedInTextIssue>(@"
+using System;
+class A
+{
+	void F (object foo)
+	{
+		if (foo != null)
+			throw new ArgumentException (""bar"");
+	}
+}");
+		}
+
+		[Test]
+		public void TestArgumentExceptionGuessing()
+		{
+			Test<NotResolvedInTextIssue>(@"
+using System;
+class A
+{
+	void F (object foo)
+	{
+		if (foo != null)
+			throw new ArgumentException (""bar"", ""bar"");
+	}
+}", @"
+using System;
+class A
+{
+	void F (object foo)
+	{
+		if (foo != null)
+			throw new ArgumentException (""bar"", ""foo"");
+	}
+}");
+		}
+
+		[Test]
+		public void TestArgumentExceptionGuessingCase2()
+		{
+			Test<NotResolvedInTextIssue>(@"
+using System;
+class A
+{
+	void F (object foo)
+	{
+		if (foo != null)
+			throw new ArgumentException (""bar"", ""bar"", new Exception ());
+	}
+}", @"
+using System;
+class A
+{
+	void F (object foo)
+	{
+		if (foo != null)
+			throw new ArgumentException (""bar"", ""foo"", new Exception ());
+	}
+}");
+		}
+
+		[Test]
+		public void TestArgumentNullGuessing()
+		{
+			Test<NotResolvedInTextIssue>(@"
+using System;
+class A
+{
+	void F (object foo)
+	{
+		if (foo != null)
+			throw new ArgumentNullException (""bar"");
+	}
+}", @"
+using System;
+class A
+{
+	void F (object foo)
+	{
+		if (foo != null)
+			throw new ArgumentNullException (""foo"");
+	}
+}", 1);
+		}
+
+		[Test]
+		public void TestArgumentNullGuessingResolve2()
+		{
+			Test<NotResolvedInTextIssue>(@"
+using System;
+class A
+{
+	void F (object foo)
+	{
+		if (foo != null)
+			throw new ArgumentNullException (""bar"");
+	}
+}", @"
+using System;
+class A
+{
+	void F (object foo)
+	{
+		if (foo != null)
+			throw new ArgumentNullException (""foo"", ""bar"");
+	}
+}", 0);
+		}
+
+		[Test]
+		public void TestArgumentNullGuessingCase2()
+		{
+			Test<NotResolvedInTextIssue>(@"
+using System;
+class A
+{
+	void F (object foo)
+	{
+		if (foo != null)
+			throw new ArgumentNullException (""bar"", ""test"");
+	}
+}", @"
+using System;
+class A
+{
+	void F (object foo)
+	{
+		if (foo != null)
+			throw new ArgumentNullException (""foo"", ""test"");
+	}
+}");
+		}
+
+		[Test]
+		public void TestArgumentOutOfRangeExceptionGuessing()
+		{
+			Test<NotResolvedInTextIssue>(@"
+using System;
+class A
+{
+	void F (int foo, int bar)
+	{
+		if (foo < 0 || foo > 10)
+			throw new ArgumentOutOfRangeException (""foobar"", ""foobar"");
+	}
+}", @"
+using System;
+class A
+{
+	void F (int foo, int bar)
+	{
+		if (foo < 0 || foo > 10)
+			throw new ArgumentOutOfRangeException (""foo"", ""foobar"");
+	}
+}");
+		}
+
+		[Test]
+		public void TestArgumentOutOfRangeExceptionGuessingCase2()
+		{
+			Test<NotResolvedInTextIssue>(@"
+using System;
+class A
+{
+	void F (object foo)
+	{
+		if (foo != null)
+			throw new ArgumentOutOfRangeException (""bar"", null, ""bar"");
+	}
+}", @"
+using System;
+class A
+{
+	void F (object foo)
+	{
+		if (foo != null)
+			throw new ArgumentOutOfRangeException (""foo"", null, ""bar"");
+	}
+}");
+		}
+
+		[Test]
+		public void TestConstructorValidCase()
+		{
+			TestWrongContext<NotResolvedInTextIssue>(@"
+using System;
+class A
+{
+	public A(BaseRefactoringContext context, Statement rootStatement, IEnumerable<ParameterDeclaration> parameters, CancellationToken cancellationToken)
+	{
+		if (rootStatement == null)
+			throw new ArgumentNullException(""rootStatement"");
+		if (context == null)
+			throw new ArgumentNullException(""context"");
+	}
+}");
+		}
+
+		/// <summary>
+		/// Bug 15039 - source analysis can't resolve 'value' in property setter 
+		/// </summary>
+		[Test]
+		public void TestBug15039()
+		{
+			TestWrongContext<NotResolvedInTextIssue>(@"
+using System;
+class A
+{
+	public string Foo {
+		get {}
+		set {
+			if (value == null)
+				throw new ArgumentNullException(""value"");
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestValue()
+		{
+			Test<NotResolvedInTextIssue>(@"
+using System;
+class A
+{
+	public string Foo {
+		get {}
+		set {
+			if (value == null)
+				throw new ArgumentNullException (""val"");
+		}
+	}
+}", @"
+using System;
+class A
+{
+	public string Foo {
+		get {}
+		set {
+			if (value == null)
+				throw new ArgumentNullException (""value"");
+		}
+	}
+}", 1);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ObjectCreationAsStatementIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ObjectCreationAsStatementIssueTests.cs
new file mode 100644
index 0000000000..249394d031
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ObjectCreationAsStatementIssueTests.cs
@@ -0,0 +1,80 @@
+//
+// ObjectCreationAsStatementIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ObjectCreationAsStatementIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase ()
+		{
+			TestIssue<ObjectCreationAsStatementIssue>(@"
+class Foo
+{
+	void Bar ()
+	{
+		new Foo ();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestNoIssue ()
+		{
+			TestWrongContext<ObjectCreationAsStatementIssue>(@"
+class Foo
+{
+	void Bar ()
+	{
+		System.Console.WriteLine (new Foo ());
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ObjectCreationAsStatementIssue>(@"
+class Foo
+{
+	void Bar ()
+	{
+		// ReSharper disable once ObjectCreationAsStatement
+		new Foo ();
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/OperatorIsCanBeUsedIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/OperatorIsCanBeUsedIssueTests.cs
new file mode 100755
index 0000000000..32e6a55fc8
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/OperatorIsCanBeUsedIssueTests.cs
@@ -0,0 +1,252 @@
+// 
+// ReplaceWithIsOperatorTests.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class OperatorIsCanBeUsedIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestInspectorCase1()
+		{
+			var input = @"
+using System;
+using System.Linq;
+using System.Reflection;
+
+namespace Demo
+{
+	public class BaseClass
+	{
+		public static void main(string[] args)
+		{
+			int a = 1;
+			if (typeof (int) == a.GetType()){}}}}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new OperatorIsCanBeUsedIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+
+			
+			CheckFix(context, issues, @"
+using System;
+using System.Linq;
+using System.Reflection;
+
+namespace Demo
+{
+	public class BaseClass
+	{
+		public static void main(string[] args)
+		{
+			int a = 1;
+			if (a is int) {
+			}}}}
+");
+		}
+
+		[Test]
+		public void TestInspectorCase2()
+		{
+			var input = @"
+using System;
+using System.Linq;
+using System.Reflection;
+
+namespace Demo
+{
+	public class BaseClass
+	{
+		public static void main(string[] args)
+		{
+			int a = 1;
+			if (a.GetType() == typeof (int)){}}}}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new OperatorIsCanBeUsedIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+
+			CheckFix(context, issues, @"
+using System;
+using System.Linq;
+using System.Reflection;
+
+namespace Demo
+{
+	public class BaseClass
+	{
+		public static void main(string[] args)
+		{
+			int a = 1;
+			if (a is int) {
+			}}}}
+");
+		}
+
+		[Test]
+		public void TestInspectorCase3()
+		{
+			var input = @"
+using System;
+using System.Linq;
+using System.Reflection;
+
+namespace Demo
+{
+	public class BaseClass
+	{
+		static public int a;
+		public static void main(string[] args)
+		{
+		if (BaseClass.a.GetType() == typeof (int)){}}}}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new OperatorIsCanBeUsedIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			
+			
+			CheckFix(context, issues, @"
+using System;
+using System.Linq;
+using System.Reflection;
+
+namespace Demo
+{
+	public class BaseClass
+	{
+		static public int a;
+		public static void main(string[] args)
+		{
+			if (BaseClass.a is int) {
+			}}}}
+");
+		}
+
+		[Test]
+		public void TestInspectorCase4()
+		{
+			var input = @"
+using System;
+using System.Reflection;
+
+namespace Demo
+{
+	public sealed class TestClass
+	{
+	}
+	public class BaseClass 
+	{
+		public static void main(string[] args)
+		{
+			BaseClass b = new BaseClass();if (typeof (TestClass) == b.GetType()){}}}}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new OperatorIsCanBeUsedIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+
+			CheckFix(context, issues, @"
+using System;
+using System.Reflection;
+
+namespace Demo
+{
+	public sealed class TestClass
+	{
+	}
+	public class BaseClass 
+	{
+		public static void main(string[] args)
+		{
+			BaseClass b = new BaseClass();
+			if (b is TestClass) {
+			}}}}
+");
+		}
+
+		[Test]
+		public void TestInspectorCase5()
+		{
+			var input = @"
+using System;
+using System.Reflection;
+
+namespace Demo
+{
+	public class TestClass
+	{
+	}
+	public class BaseClass : TestClass
+	{
+		public static void main(string[] args)
+		{
+			BaseClass b = new BaseClass();
+			if ((typeof (TestClass) == b.GetType()))
+			{
+
+			}
+		}
+	}
+}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new OperatorIsCanBeUsedIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void TestResharperDisable()
+		{
+			var input = @"using System;
+using System.Linq;
+using System.Reflection;
+
+namespace Demo
+{
+	public class BaseClass
+	{
+		public static void main(string[] args)
+		{
+			int a = 1;
+//Resharper disable OperatorIsCanBeUsed
+			if ((typeof (int) == a.GetType()))
+			{
+
+			}
+//Resharper restore OperatorIsCanBeUsed
+		}
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new OperatorIsCanBeUsedIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/OptionalParameterHierarchyMismatchIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/OptionalParameterHierarchyMismatchIssueTests.cs
new file mode 100644
index 0000000000..070cf2b7b0
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/OptionalParameterHierarchyMismatchIssueTests.cs
@@ -0,0 +1,306 @@
+// 
+// OptionalParameterValueMismatchTests.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class OptionalParameterHierarchyMismatchIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase ()
+		{
+			Test<OptionalParameterHierarchyMismatchIssue>(@"
+class Base
+{
+	public virtual void TestMethod(int value = 1) {}
+}
+class Derived : Base
+{
+	public override void TestMethod(int value = 2) {}
+}", @"
+class Base
+{
+	public virtual void TestMethod(int value = 1) {}
+}
+class Derived : Base
+{
+	public override void TestMethod(int value = 1) {}
+}");
+		}
+
+		[Test]
+		public void TestNullCase ()
+		{
+			Test<OptionalParameterHierarchyMismatchIssue>(@"
+class Base
+{
+	public virtual void TestMethod(object value = null) {}
+}
+class Derived : Base
+{
+	public override void TestMethod(object value = null) {}
+}", 0);
+		}
+
+		[Test]
+		public void TestInterface ()
+		{
+			Test<OptionalParameterHierarchyMismatchIssue>(@"
+interface IBase
+{
+	void TestMethod(int value = 1);
+}
+class Derived : IBase
+{
+	public void TestMethod(int value = 2) {}
+}", @"
+interface IBase
+{
+	void TestMethod(int value = 1);
+}
+class Derived : IBase
+{
+	public void TestMethod(int value = 1) {}
+}");
+		}
+
+		[Test]
+		public void TestIndexer ()
+		{
+			Test<OptionalParameterHierarchyMismatchIssue>(@"
+interface IBase
+{
+	int this[int x = 1]
+	{
+		get;
+	}
+}
+class Derived : IBase
+{
+	public int this[int x = 2]
+	{
+		get;
+	}
+}", @"
+interface IBase
+{
+	int this[int x = 1]
+	{
+		get;
+	}
+}
+class Derived : IBase
+{
+	public int this[int x = 1]
+	{
+		get;
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisabledForCorrect ()
+		{
+			Test<OptionalParameterHierarchyMismatchIssue>(@"
+interface IBase
+{
+	void TestMethod(int value = 1);
+}
+class Derived : IBase
+{
+	public void TestMethod(int value = 1) {}
+}", 0);
+		}
+
+		[Test]
+		public void TestAddOptional ()
+		{
+			Test<OptionalParameterHierarchyMismatchIssue>(@"
+class Base
+{
+	public virtual void TestMethod(int value) {}
+}
+class Derived : Base
+{
+	public override void TestMethod(int value = 2) {}
+}", @"
+class Base
+{
+	public virtual void TestMethod(int value) {}
+}
+class Derived : Base
+{
+	public override void TestMethod(int value) {}
+}");
+		}
+
+		[Test]
+		public void TestRemoveOptional ()
+		{
+			Test<OptionalParameterHierarchyMismatchIssue>(@"
+class Base
+{
+	public virtual void TestMethod(int value = 1) {}
+}
+class Derived : Base
+{
+	public override void TestMethod(int value) {}
+}", @"
+class Base
+{
+	public virtual void TestMethod(int value = 1) {}
+}
+class Derived : Base
+{
+	public override void TestMethod(int value = 1) {}
+}");
+		}
+	
+		[Test]
+		public void TestTakeDeclarationValue()
+		{
+			Test<OptionalParameterHierarchyMismatchIssue>(@"
+class A
+{
+	public virtual void Foo(int a = 1)
+	{
+
+	}
+}
+
+class B : A
+{
+	public override void Foo(int a = 2)
+	{
+
+	}
+}
+
+class C : B
+{
+	public override void Foo(int a = 3)
+	{
+
+	}
+}", 2, @"
+class A
+{
+	public virtual void Foo(int a = 1)
+	{
+
+	}
+}
+
+class B : A
+{
+	public override void Foo(int a = 2)
+	{
+
+	}
+}
+
+class C : B
+{
+	public override void Foo(int a = 1)
+	{
+
+	}
+}", 1);
+
+		}
+
+		[Test]
+		public void TestDisableForInterfaceMismatch ()
+		{
+			TestWrongContext<OptionalParameterHierarchyMismatchIssue>(@"class A
+{
+    public virtual void Foo(int a = 1)
+    {
+
+    }
+}
+
+interface IA
+{
+    void Foo(int a = 2);
+}
+
+
+class B : A, IA
+{
+    public override void Foo(int a = 1)
+    {
+
+    }
+}");
+		}
+
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<OptionalParameterHierarchyMismatchIssue>(@"
+class Base
+{
+	public virtual void TestMethod(int value = 1) {}
+}
+class Derived : Base
+{
+	// ReSharper disable once OptionalParameterHierarchyMismatch
+	public override void TestMethod(int value = 2) {}
+}");
+		}
+
+		[Test]
+		public void TestEnumValue ()
+		{
+			Test<OptionalParameterHierarchyMismatchIssue>(@"
+enum FooBar { Foo, Bar }
+class Base
+{
+	public virtual void TestMethod(FooBar value = FooBar.Foo) {}
+}
+class Derived : Base
+{
+	public override void TestMethod(FooBar value) {}
+}", @"
+enum FooBar { Foo, Bar }
+class Base
+{
+	public virtual void TestMethod(FooBar value = FooBar.Foo) {}
+}
+class Derived : Base
+{
+	public override void TestMethod(FooBar value = FooBar.Foo) {}
+}");
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/OptionalParameterRefOutIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/OptionalParameterRefOutIssueTests.cs
new file mode 100644
index 0000000000..4d814290de
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/OptionalParameterRefOutIssueTests.cs
@@ -0,0 +1,86 @@
+//
+// OptionalParameterRefOutIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class OptionalParameterRefOutIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestRef ()
+		{
+			string input = @"
+using System.Runtime.InteropServices;
+class Bar
+{
+	public void Foo([Optional] ref int test)
+	{
+	}
+}
+";
+			ICSharpCode.NRefactory.CSharp.CodeActions.TestRefactoringContext context;
+			var issues = GetIssues (new OptionalParameterRefOutIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+		}
+
+		[Test]
+		public void TestOut ()
+		{
+			string input = @"
+using System.Runtime.InteropServices;
+class Bar
+{
+	public void Foo([Optional] out int test)
+	{
+	}
+}
+";
+			ICSharpCode.NRefactory.CSharp.CodeActions.TestRefactoringContext context;
+			var issues = GetIssues (new OptionalParameterRefOutIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<OptionalParameterRefOutIssue>(@"
+using System.Runtime.InteropServices;
+class Bar
+{
+	// ReSharper disable once OptionalParameterRefOut
+	public void Foo([Optional] ref int test)
+	{
+	}
+}
+");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeDeclaredWithBaseTypeIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeDeclaredWithBaseTypeIssueTests.cs
new file mode 100644
index 0000000000..4c5d6a18d7
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeDeclaredWithBaseTypeIssueTests.cs
@@ -0,0 +1,1043 @@
+//
+// ParameterCouldBeDeclaredWithBaseTypeTests.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ParameterCanBeDeclaredWithBaseTypeIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void BasicTest()
+		{
+			var input = @"
+class A
+{
+	public virtual void Foo() {}
+}
+class B : A
+{
+	public virtual void Bar() {}
+}
+class C
+{
+	void F(B b)
+	{
+		b.Foo();
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			var issue = issues [0];
+			Assert.AreEqual(1, issue.Actions.Count);
+
+			CheckFix(context, issues [0], @"
+class A
+{
+	public virtual void Foo() {}
+}
+class B : A
+{
+	public virtual void Bar() {}
+}
+class C
+{
+	void F(A b)
+	{
+		b.Foo();
+	}
+}");
+		}
+		
+		[Test]
+		public void IgnoresUnusedParameters()
+		{
+			var input = @"
+class A
+{
+	void F(A a1)
+	{
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void IgnoresDirectionalParameters()
+		{
+			var input = @"
+interface IA
+{
+}
+class A : IA
+{
+	void F(out A a1)
+	{
+		object.Equals(a1, null);
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void IgnoresOverrides()
+		{
+			var input = @"
+interface IA
+{
+	void Foo();
+}
+class B : IA
+{
+	public virtual void Foo() {}
+	public virtual void Bar() {}
+}
+class TestBase
+{
+	public void F(B b) {
+		b.Foo();
+		b.Bar();
+	}
+}
+class TestClass : TestBase
+{
+	public override void F(B b)
+	{
+		b.Foo();
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void IgnoresOverridables()
+		{
+			var input = @"
+interface IA
+{
+	void Foo();
+}
+class B : IA
+{
+	public virtual void Foo() {}
+	public virtual void Bar() {}
+}
+class TestClass
+{
+	public virtual void F(B b)
+	{
+		b.Foo();
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void HandlesNeededProperties()
+		{
+			var input = @"
+interface IA
+{
+	void Foo(string s);
+}
+class B : IA
+{
+	public virtual void Foo(string s) {}
+	public string Property { get; }
+}
+class TestClass
+{
+	public void F(B b)
+	{
+		b.Foo(b.Property);
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(false), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void InterfaceTest()
+		{
+			var input = @"
+interface IA
+{
+	void Foo();
+}
+class B : IA
+{
+	public virtual void Foo() {}
+	public virtual void Bar() {}
+}
+class C
+{
+	void F(B b)
+	{
+		b.Foo();
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			var issue = issues [0];
+			Assert.AreEqual(1, issue.Actions.Count);
+			
+			CheckFix(context, issues [0], @"
+interface IA
+{
+	void Foo();
+}
+class B : IA
+{
+	public virtual void Foo() {}
+	public virtual void Bar() {}
+}
+class C
+{
+	void F(IA b)
+	{
+		b.Foo();
+	}
+}");
+		}
+		
+		[Test]
+		public void RespectsExpectedTypeInIfStatement()
+		{
+			var input = @"
+class C
+{
+	void F (bool b, bool c)
+	{
+		if (b && c)
+			return;
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(false), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void MultipleInterfaceTest()
+		{
+			var input = @"
+interface IA1
+{
+	void Foo();
+}
+interface IA2
+{
+	void Bar();
+}
+class B : IA1, IA2
+{
+	public virtual void Foo() {}
+	public virtual void Bar() {}
+}
+class C : B {}
+class Test
+{
+	void F(C c)
+	{
+		c.Foo();
+		c.Bar();
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			var issue = issues [0];
+			Assert.AreEqual(1, issue.Actions.Count);
+
+			CheckFix(context, issues [0], @"
+interface IA1
+{
+	void Foo();
+}
+interface IA2
+{
+	void Bar();
+}
+class B : IA1, IA2
+{
+	public virtual void Foo() {}
+	public virtual void Bar() {}
+}
+class C : B {}
+class Test
+{
+	void F(B c)
+	{
+		c.Foo();
+		c.Bar();
+	}
+}");
+		}
+
+		string baseInput = @"
+interface IA
+{
+	void Foo();
+}
+interface IB : IA
+{
+	void Bar();
+}
+interface IC : IA
+{
+	new void Foo();
+	void Baz();
+}
+class D : IB
+{
+	public void Foo() {}
+	public void Bar() {}
+}
+class E : D, IC
+{
+	public void Baz() {}
+	void IC.Foo() {}
+}";
+		
+		[Ignore]
+		[Test]
+		public void FindsTopInterface()
+		{
+			var input = baseInput + @"
+class Test
+{
+	void F(E e)
+	{
+		e.Foo();
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			var issue = issues [0];
+			Assert.AreEqual(4, issue.Actions.Count);
+			
+			CheckFix(context, issues [0], baseInput + @"
+class Test
+{
+	void F(IA e)
+	{
+		e.Foo();
+	}
+}");
+		}
+		
+		[Test]
+		public void DoesNotChangeOverload()
+		{
+			var input = baseInput + @"
+class Test
+{
+	void F(IB b)
+	{
+		Bar (b);
+	}
+	
+	void Bar (IA a)
+	{
+	}
+
+	void Bar (IB b)
+	{
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(false), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void AssignmentToExplicitlyTypedVariable()
+		{
+			var input = baseInput + @"
+class Test
+{
+	void F(IB b)
+	{
+		IB b2;
+		b2 = b;
+		object.Equals(b, b2);
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(false), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void GenericMethod()
+		{
+			var input = baseInput + @"
+class Test
+{
+	void F(IB b)
+	{
+		Generic (b);
+	}
+
+	void Generic<T> (T arg) where T : IA
+	{
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void VariableDeclarationWithTypeInference()
+		{
+			var input = baseInput + @"
+class Test
+{
+	void Foo (IB b)
+	{
+		var b2 = b;
+		Foo (b2);
+	}
+
+	void Foo (IA a)
+	{
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void RespectsOutgoingCallsTypeRestrictions()
+		{
+			var input = baseInput + @"
+class Test
+{
+	void F(E e)
+	{
+		e.Foo();
+		DemandType(e);
+	}
+
+	void DemandType(D d)
+	{
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			var issue = issues [0];
+			Assert.AreEqual(1, issue.Actions.Count);
+			
+			CheckFix(context, issues [0], baseInput + @"
+class Test
+{
+	void F(D e)
+	{
+		e.Foo();
+		DemandType(e);
+	}
+
+	void DemandType(D d)
+	{
+	}
+}");
+		}
+		
+		[Test]
+		public void AccountsForNonInvocationMethodGroupUsageInMethodCall()
+		{
+			var input = @"
+delegate void FooDelegate (string s);
+interface IBase
+{
+	void Bar();
+}
+interface IDerived : IBase
+{
+	void Foo(string s);
+}
+class TestClass
+{
+	public void Bar (IDerived derived)
+	{
+		derived.Bar();
+		Baz (derived.Foo);
+	}
+
+	void Baz (FooDelegate fd)
+	{
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(false), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void AccountsForNonInvocationMethodGroupUsageInVariableDeclaration()
+		{
+			var input = @"
+delegate void FooDelegate (string s);
+interface IBase
+{
+	void Bar();
+}
+interface IDerived : IBase
+{
+	void Foo(string s);
+}
+class TestClass
+{
+	public void Bar (IDerived derived)
+	{
+		derived.Bar();
+		FooDelegate d = derived.Foo;
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(false), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void AccountsForNonInvocationMethodGroupUsageInAssignmentExpression()
+		{
+			var input = @"
+delegate void FooDelegate (string s);
+interface IBase
+{
+	void Bar();
+}
+interface IDerived : IBase
+{
+	void Foo(string s);
+}
+class TestClass
+{
+	public void Bar (IDerived derived)
+	{
+		derived.Bar();
+		FooDelegate d;
+		d = derived.Foo;
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(false), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Ignore]
+		[Test]
+		public void AccountsForIndexers()
+		{
+			var input = @"
+class TestClass
+{
+	void Write(string[] s)
+	{
+		object.Equals(s, s);
+		var element = s[1];
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			var issue = issues[0];
+			// Suggested types: IList<T> and IReadOnlyList<T>
+			Assert.AreEqual(2, issue.Actions.Count);
+
+			CheckFix(context, issues [0], @"
+class TestClass
+{
+	void Write(System.Collections.Generic.IList<string> s)
+	{
+		object.Equals(s, s);
+		var element = s[1];
+	}
+}");
+		}
+		
+		[Test]
+		public void AccountsForArrays()
+		{
+			var input = @"
+class TestClass
+{
+	void Write(string[] s)
+	{
+		var i = s.Length;
+		SetValue (out s[1]);
+	}
+
+	void SetValue (out string s)
+	{
+	} 
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(false), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void LimitsParamsParametersToArrays()
+		{
+			var input = @"
+class TestClass
+{
+	void Write(params string[] s)
+	{
+		System.Console.WriteLine (s);
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(false), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void DoesNotSuggestProgramEntryPointChanges()
+		{
+			var input = @"
+class TestClass
+{
+	public static void Main (string[] args)
+	{
+		if (args.Length > 2) {
+		}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(false), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void IgnoresImplicitInterfaceImplementations()
+		{
+			var input = @"
+interface IHasFoo
+{
+	void Foo (string s);
+}
+class TestClass : IHasFoo
+{
+	public void Foo(string s)
+	{
+		object o = s;
+	} 
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(false), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void IgnoresEnumParameters()
+		{
+			var input = @"
+enum ApplicableValues
+{
+	None,
+	Some
+}
+class TestClass
+{
+	public void Foo(ApplicableValues av)
+	{
+		object o = av;
+	} 
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(false), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void CallToOverriddenMember()
+		{
+			var input = @"
+class TestBase
+{
+	public virtual void Foo()
+	{
+	}
+}
+class Test : TestBase
+{
+	void F (Test t)
+	{
+		t.Foo();
+	}
+	
+	public override void Foo()
+	{
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			var issue = issues[0];
+			Assert.AreEqual(1, issue.Actions.Count);
+			
+			CheckFix(context, issue, @"
+class TestBase
+{
+	public virtual void Foo()
+	{
+	}
+}
+class Test : TestBase
+{
+	void F (TestBase t)
+	{
+		t.Foo();
+	}
+	
+	public override void Foo()
+	{
+	}
+}");
+		}
+		
+		[Test]
+		public void CallToShadowingMember()
+		{
+			var input = @"
+class TestBase
+{
+	public virtual void Foo()
+	{
+	}
+}
+class Test : TestBase
+{
+	void F (Test t)
+	{
+		t.Foo();
+	}
+	
+	public new void Foo()
+	{
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(false), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void CallToShadowingMember2()
+		{
+			var input = @"
+class TestBaseBase
+{
+	public virtual void Foo()
+	{
+	}
+}
+class TestBase : TestBaseBase
+{
+	protected virtual new void Foo()
+	{
+	}
+}
+class Test : TestBase
+{
+	void F (Test t)
+	{
+		t.Foo();
+	}
+	
+	public override void Foo()
+	{
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(false), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			var issue = issues[0];
+			Assert.AreEqual(1, issue.Actions.Count);
+			
+			CheckFix(context, issue, @"
+class TestBaseBase
+{
+	public virtual void Foo()
+	{
+	}
+}
+class TestBase : TestBaseBase
+{
+	protected virtual new void Foo()
+	{
+	}
+}
+class Test : TestBase
+{
+	void F (TestBase t)
+	{
+		t.Foo();
+	}
+	
+	public override void Foo()
+	{
+	}
+}");
+		}
+		
+		[Test]
+		public void CallToShadowingMemberWithBaseInterface()
+		{
+			var input = @"
+interface IFoo
+{
+	void Foo();
+}
+class TestBaseBase : IFoo
+{
+	public virtual void Foo()
+	{
+	}
+}
+class TestBase : TestBaseBase
+{
+	protected virtual new void Foo()
+	{
+	}
+}
+class Test : TestBase
+{
+	void F (Test t)
+	{
+		t.Foo();
+	}
+	
+	protected override void Foo()
+	{
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(false), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			var issue = issues[0];
+			Assert.AreEqual(1, issue.Actions.Count);
+			
+			CheckFix(context, issue, @"
+interface IFoo
+{
+	void Foo();
+}
+class TestBaseBase : IFoo
+{
+	public virtual void Foo()
+	{
+	}
+}
+class TestBase : TestBaseBase
+{
+	protected virtual new void Foo()
+	{
+	}
+}
+class Test : TestBase
+{
+	void F (TestBase t)
+	{
+		t.Foo();
+	}
+	
+	protected override void Foo()
+	{
+	}
+}");
+		}
+
+		/// <summary>
+		/// Bug 9617 - Incorrect "parameter can be demoted to base class" warning for arrays
+		/// </summary>
+		[Test]
+		public void TestBug9617()
+		{
+			Test<ParameterCanBeDeclaredWithBaseTypeIssue>(@"class Test
+{
+	object Foo (object[] arr)
+	{
+	    return arr [0];
+	}
+}", 1, @"class Test
+{
+	object Foo (System.Collections.IList arr)
+	{
+	    return arr [0];
+	}
+}");
+		}
+
+		[Test]
+		public void TestBug9617Case2()
+		{
+			Test<ParameterCanBeDeclaredWithBaseTypeIssue>(@"class Test
+{
+	int Foo (int[] arr)
+	{
+	    return arr [0];
+	}
+}", 1, @"class Test
+{
+	int Foo (System.Collections.Generic.IList<int> arr)
+	{
+	    return arr [0];
+	}
+}");
+		}
+		
+		[Test]
+		public void DoNotDemoteStringComparisonToReferenceComparison_WithinLambda()
+		{
+			Test<ParameterCanBeDeclaredWithBaseTypeIssue>(@"using System; using System.Linq; using System.Collections.Generic;
+class Test
+{
+	IEnumerable<User> users;
+	User GetUser (String id)
+	{
+		return users.Where(u => u.Name == id).SingleOrDefault();
+	}
+}
+class User {
+	public string Name;
+}
+", 0);
+		}
+
+		[Test]
+		public void TestMicrosoftSuppressMessage()
+		{
+			var input = @"
+class A
+{
+	public virtual void Foo() {}
+}
+class B : A
+{
+	public virtual void Bar() {}
+}
+class C
+{
+	[System.Diagnostics.CodeAnalysis.SuppressMessage(""Microsoft.Design"", ""CA1011:ConsiderPassingBaseTypesAsParameters"")]
+	void F(B b)
+	{
+		b.Foo();
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void TestDisableAll()
+		{
+			var input = @"// ReSharper disable All
+
+class A
+{
+	public virtual void Foo() {}
+}
+class B : A
+{
+	public virtual void Bar() {}
+}
+class C
+{
+	void F(B b)
+	{
+		b.Foo();
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+
+		/// <summary>
+		/// Bug 14099 - Do not suggest demoting Exception to _Exception
+		/// </summary>
+		[Test]
+		public void TestBug14099()
+		{
+			var input = @"
+using System;
+
+public class Test
+{
+	public void Foo (Exception ex)
+	{
+		System.Console.WriteLine (ex.HelpLink);
+	}
+}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ParameterCanBeDeclaredWithBaseTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+
+		[Test]
+		public void TestPreferGenerics()
+		{
+			TestWrongContext<ParameterCanBeDeclaredWithBaseTypeIssue>(@"using System.Collections.Generic;
+
+class Test
+{
+	int Foo (ICollection<object> arr)
+	{
+		return arr.Count;
+	}
+}");
+		}
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeDemotedTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeDemotedTests.cs
deleted file mode 100644
index 3354e06496..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeDemotedTests.cs
+++ /dev/null
@@ -1,954 +0,0 @@
-//
-// ParameterCouldBeDeclaredWithBaseTypeTests.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class ParameterCanBeDemotedTests : InspectionActionTestBase
-	{
-		[Test]
-		public void BasicTest()
-		{
-			var input = @"
-class A
-{
-	public virtual void Foo() {}
-}
-class B : A
-{
-	public virtual void Bar() {}
-}
-class C
-{
-	void F(B b)
-	{
-		b.Foo();
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			var issue = issues [0];
-			Assert.AreEqual(1, issue.Actions.Count);
-
-			CheckFix(context, issues [0], @"
-class A
-{
-	public virtual void Foo() {}
-}
-class B : A
-{
-	public virtual void Bar() {}
-}
-class C
-{
-	void F(A b)
-	{
-		b.Foo();
-	}
-}");
-		}
-		
-		[Test]
-		public void IgnoresUnusedParameters()
-		{
-			var input = @"
-class A
-{
-	void F(A a1)
-	{
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void IgnoresDirectionalParameters()
-		{
-			var input = @"
-interface IA
-{
-}
-class A : IA
-{
-	void F(out A a1)
-	{
-		object.Equals(a1, null);
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-
-		[Test]
-		public void IgnoresOverrides()
-		{
-			var input = @"
-interface IA
-{
-	void Foo();
-}
-class B : IA
-{
-	public virtual void Foo() {}
-	public virtual void Bar() {}
-}
-class TestBase
-{
-	public void F(B b) {
-		b.Foo();
-		b.Bar();
-	}
-}
-class TestClass : TestBase
-{
-	public override void F(B b)
-	{
-		b.Foo();
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void IgnoresOverridables()
-		{
-			var input = @"
-interface IA
-{
-	void Foo();
-}
-class B : IA
-{
-	public virtual void Foo() {}
-	public virtual void Bar() {}
-}
-class TestClass
-{
-	public virtual void F(B b)
-	{
-		b.Foo();
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void HandlesNeededProperties()
-		{
-			var input = @"
-interface IA
-{
-	void Foo(string s);
-}
-class B : IA
-{
-	public virtual void Foo(string s) {}
-	public string Property { get; }
-}
-class TestClass
-{
-	public void F(B b)
-	{
-		b.Foo(b.Property);
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(false), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void InterfaceTest()
-		{
-			var input = @"
-interface IA
-{
-	void Foo();
-}
-class B : IA
-{
-	public virtual void Foo() {}
-	public virtual void Bar() {}
-}
-class C
-{
-	void F(B b)
-	{
-		b.Foo();
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			var issue = issues [0];
-			Assert.AreEqual(1, issue.Actions.Count);
-			
-			CheckFix(context, issues [0], @"
-interface IA
-{
-	void Foo();
-}
-class B : IA
-{
-	public virtual void Foo() {}
-	public virtual void Bar() {}
-}
-class C
-{
-	void F(IA b)
-	{
-		b.Foo();
-	}
-}");
-		}
-		
-		[Test]
-		public void RespectsExpectedTypeInIfStatement()
-		{
-			var input = @"
-class C
-{
-	void F (bool b, bool c)
-	{
-		if (b && c)
-			return;
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(false), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void MultipleInterfaceTest()
-		{
-			var input = @"
-interface IA1
-{
-	void Foo();
-}
-interface IA2
-{
-	void Bar();
-}
-class B : IA1, IA2
-{
-	public virtual void Foo() {}
-	public virtual void Bar() {}
-}
-class C : B {}
-class Test
-{
-	void F(C c)
-	{
-		c.Foo();
-		c.Bar();
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			var issue = issues [0];
-			Assert.AreEqual(1, issue.Actions.Count);
-
-			CheckFix(context, issues [0], @"
-interface IA1
-{
-	void Foo();
-}
-interface IA2
-{
-	void Bar();
-}
-class B : IA1, IA2
-{
-	public virtual void Foo() {}
-	public virtual void Bar() {}
-}
-class C : B {}
-class Test
-{
-	void F(B c)
-	{
-		c.Foo();
-		c.Bar();
-	}
-}");
-		}
-
-		string baseInput = @"
-interface IA
-{
-	void Foo();
-}
-interface IB : IA
-{
-	void Bar();
-}
-interface IC : IA
-{
-	new void Foo();
-	void Baz();
-}
-class D : IB
-{
-	public void Foo() {}
-	public void Bar() {}
-}
-class E : D, IC
-{
-	public void Baz() {}
-	void IC.Foo() {}
-}";
-		
-		[Ignore]
-		[Test]
-		public void FindsTopInterface()
-		{
-			var input = baseInput + @"
-class Test
-{
-	void F(E e)
-	{
-		e.Foo();
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			var issue = issues [0];
-			Assert.AreEqual(4, issue.Actions.Count);
-			
-			CheckFix(context, issues [0], baseInput + @"
-class Test
-{
-	void F(IA e)
-	{
-		e.Foo();
-	}
-}");
-		}
-		
-		[Test]
-		public void DoesNotChangeOverload()
-		{
-			var input = baseInput + @"
-class Test
-{
-	void F(IB b)
-	{
-		Bar (b);
-	}
-	
-	void Bar (IA a)
-	{
-	}
-
-	void Bar (IB b)
-	{
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(false), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void AssignmentToExplicitlyTypedVariable()
-		{
-			var input = baseInput + @"
-class Test
-{
-	void F(IB b)
-	{
-		IB b2;
-		b2 = b;
-		object.Equals(b, b2);
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(false), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void GenericMethod()
-		{
-			var input = baseInput + @"
-class Test
-{
-	void F(IB b)
-	{
-		Generic (b);
-	}
-
-	void Generic<T> (T arg) where T : IA
-	{
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-
-		[Test]
-		public void VariableDeclarationWithTypeInference()
-		{
-			var input = baseInput + @"
-class Test
-{
-	void Foo (IB b)
-	{
-		var b2 = b;
-		Foo (b2);
-	}
-
-	void Foo (IA a)
-	{
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-
-		[Test]
-		public void RespectsOutgoingCallsTypeRestrictions()
-		{
-			var input = baseInput + @"
-class Test
-{
-	void F(E e)
-	{
-		e.Foo();
-		DemandType(e);
-	}
-
-	void DemandType(D d)
-	{
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			var issue = issues [0];
-			Assert.AreEqual(1, issue.Actions.Count);
-			
-			CheckFix(context, issues [0], baseInput + @"
-class Test
-{
-	void F(D e)
-	{
-		e.Foo();
-		DemandType(e);
-	}
-
-	void DemandType(D d)
-	{
-	}
-}");
-		}
-		
-		[Test]
-		public void AccountsForNonInvocationMethodGroupUsageInMethodCall()
-		{
-			var input = @"
-delegate void FooDelegate (string s);
-interface IBase
-{
-	void Bar();
-}
-interface IDerived : IBase
-{
-	void Foo(string s);
-}
-class TestClass
-{
-	public void Bar (IDerived derived)
-	{
-		derived.Bar();
-		Baz (derived.Foo);
-	}
-
-	void Baz (FooDelegate fd)
-	{
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(false), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void AccountsForNonInvocationMethodGroupUsageInVariableDeclaration()
-		{
-			var input = @"
-delegate void FooDelegate (string s);
-interface IBase
-{
-	void Bar();
-}
-interface IDerived : IBase
-{
-	void Foo(string s);
-}
-class TestClass
-{
-	public void Bar (IDerived derived)
-	{
-		derived.Bar();
-		FooDelegate d = derived.Foo;
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(false), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void AccountsForNonInvocationMethodGroupUsageInAssignmentExpression()
-		{
-			var input = @"
-delegate void FooDelegate (string s);
-interface IBase
-{
-	void Bar();
-}
-interface IDerived : IBase
-{
-	void Foo(string s);
-}
-class TestClass
-{
-	public void Bar (IDerived derived)
-	{
-		derived.Bar();
-		FooDelegate d;
-		d = derived.Foo;
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(false), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Ignore]
-		[Test]
-		public void AccountsForIndexers()
-		{
-			var input = @"
-class TestClass
-{
-	void Write(string[] s)
-	{
-		object.Equals(s, s);
-		var element = s[1];
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			var issue = issues[0];
-			// Suggested types: IList<T> and IReadOnlyList<T>
-			Assert.AreEqual(2, issue.Actions.Count);
-
-			CheckFix(context, issues [0], @"
-class TestClass
-{
-	void Write(System.Collections.Generic.IList<string> s)
-	{
-		object.Equals(s, s);
-		var element = s[1];
-	}
-}");
-		}
-		
-		[Test]
-		public void AccountsForArrays()
-		{
-			var input = @"
-class TestClass
-{
-	void Write(string[] s)
-	{
-		var i = s.Length;
-		SetValue (out s[1]);
-	}
-
-	void SetValue (out string s)
-	{
-	} 
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(false), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void LimitsParamsParametersToArrays()
-		{
-			var input = @"
-class TestClass
-{
-	void Write(params string[] s)
-	{
-		System.Console.WriteLine (s);
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(false), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void DoesNotSuggestProgramEntryPointChanges()
-		{
-			var input = @"
-class TestClass
-{
-	public static void Main (string[] args)
-	{
-		if (args.Length > 2) {
-		}
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(false), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void IgnoresImplicitInterfaceImplementations()
-		{
-			var input = @"
-interface IHasFoo
-{
-	void Foo (string s);
-}
-class TestClass : IHasFoo
-{
-	public void Foo(string s)
-	{
-		object o = s;
-	} 
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(false), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-
-		[Test]
-		public void IgnoresEnumParameters()
-		{
-			var input = @"
-enum ApplicableValues
-{
-	None,
-	Some
-}
-class TestClass
-{
-	public void Foo(ApplicableValues av)
-	{
-		object o = av;
-	} 
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(false), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void CallToOverriddenMember()
-		{
-			var input = @"
-class TestBase
-{
-	public virtual void Foo()
-	{
-	}
-}
-class Test : TestBase
-{
-	void F (Test t)
-	{
-		t.Foo();
-	}
-	
-	public override void Foo()
-	{
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			var issue = issues[0];
-			Assert.AreEqual(1, issue.Actions.Count);
-			
-			CheckFix(context, issue, @"
-class TestBase
-{
-	public virtual void Foo()
-	{
-	}
-}
-class Test : TestBase
-{
-	void F (TestBase t)
-	{
-		t.Foo();
-	}
-	
-	public override void Foo()
-	{
-	}
-}");
-		}
-		
-		[Test]
-		public void CallToShadowingMember()
-		{
-			var input = @"
-class TestBase
-{
-	public virtual void Foo()
-	{
-	}
-}
-class Test : TestBase
-{
-	void F (Test t)
-	{
-		t.Foo();
-	}
-	
-	public new void Foo()
-	{
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(false), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void CallToShadowingMember2()
-		{
-			var input = @"
-class TestBaseBase
-{
-	public virtual void Foo()
-	{
-	}
-}
-class TestBase : TestBaseBase
-{
-	protected virtual new void Foo()
-	{
-	}
-}
-class Test : TestBase
-{
-	void F (Test t)
-	{
-		t.Foo();
-	}
-	
-	public override void Foo()
-	{
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(false), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			var issue = issues[0];
-			Assert.AreEqual(1, issue.Actions.Count);
-			
-			CheckFix(context, issue, @"
-class TestBaseBase
-{
-	public virtual void Foo()
-	{
-	}
-}
-class TestBase : TestBaseBase
-{
-	protected virtual new void Foo()
-	{
-	}
-}
-class Test : TestBase
-{
-	void F (TestBase t)
-	{
-		t.Foo();
-	}
-	
-	public override void Foo()
-	{
-	}
-}");
-		}
-		
-		[Test]
-		public void CallToShadowingMemberWithBaseInterface()
-		{
-			var input = @"
-interface IFoo
-{
-	void Foo();
-}
-class TestBaseBase : IFoo
-{
-	public virtual void Foo()
-	{
-	}
-}
-class TestBase : TestBaseBase
-{
-	protected virtual new void Foo()
-	{
-	}
-}
-class Test : TestBase
-{
-	void F (Test t)
-	{
-		t.Foo();
-	}
-	
-	protected override void Foo()
-	{
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(false), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			var issue = issues[0];
-			Assert.AreEqual(1, issue.Actions.Count);
-			
-			CheckFix(context, issue, @"
-interface IFoo
-{
-	void Foo();
-}
-class TestBaseBase : IFoo
-{
-	public virtual void Foo()
-	{
-	}
-}
-class TestBase : TestBaseBase
-{
-	protected virtual new void Foo()
-	{
-	}
-}
-class Test : TestBase
-{
-	void F (TestBase t)
-	{
-		t.Foo();
-	}
-	
-	protected override void Foo()
-	{
-	}
-}");
-		}
-
-		/// <summary>
-		/// Bug 9617 - Incorrect "parameter can be demoted to base class" warning for arrays
-		/// </summary>
-		[Test]
-		public void TestBug9617()
-		{
-			Test<ParameterCanBeDemotedIssue>(@"class Test
-{
-	object Foo (object[] arr)
-	{
-	    return arr [0];
-	}
-}", 0);
-		}
-		
-		[Test]
-		public void DoNotDemoteStringComparisonToReferenceComparison_WithinLambda()
-		{
-			Test<ParameterCanBeDemotedIssue>(@"using System; using System.Linq; using System.Collections.Generic;
-class Test
-{
-	IEnumerable<User> users;
-	User GetUser (String id)
-	{
-		return users.Where(u => u.Name == id).SingleOrDefault();
-	}
-}
-class User {
-	public string Name;
-}
-", 0);
-		}
-
-		[Test]
-		public void TestMicrosoftSuppressMessage()
-		{
-			var input = @"
-class A
-{
-	public virtual void Foo() {}
-}
-class B : A
-{
-	public virtual void Bar() {}
-}
-class C
-{
-	[System.Diagnostics.CodeAnalysis.SuppressMessage(""Microsoft.Design"", ""CA1011:ConsiderPassingBaseTypesAsParameters"")]
-	void F(B b)
-	{
-		b.Foo();
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ParameterCanBeDemotedIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ParameterHidesMemberIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ParameterHidesMemberIssueTests.cs
index 982182d02f..66cdaaae96 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ParameterHidesMemberIssueTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ParameterHidesMemberIssueTests.cs
@@ -46,6 +46,21 @@ class TestClass
 			Test<ParameterHidesMemberIssue> (input, 1);
 		}
 
+        [Test]
+		public void TestDisable ()
+		{
+			var input = @"
+class TestClass
+{
+	int i;
+// ReSharper disable once ParameterHidesMember
+	void TestMethod (int i, int j)
+	{
+	}
+}";
+			TestWrongContext<ParameterHidesMemberIssue> (input);
+		}
+
 		[Test]
 		public void TestMethod ()
 		{
@@ -175,6 +190,67 @@ class TestClass : BaseClass
 	void Method (int i)
 	{
 	}
+}";
+			Test<ParameterHidesMemberIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestIgnorePublicMethods ()
+		{
+			var input = @"
+class TestClass
+{
+	private int i;
+
+	public void SetI (int i) { this.i = i; }
+}";
+			Test<ParameterHidesMemberIssue> (input, 0);
+		}
+
+
+		[Test]
+		public void TestIgnoreAbstractMethods ()
+		{
+			var input = @"
+abstract class TestClass
+{
+	private int i;
+
+	public abstract void Method (int i);
+}";
+			Test<ParameterHidesMemberIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestIgnoreOverridenMethods ()
+		{
+			var input = @"
+class TestClass
+{
+	private int i;
+
+	protected override void Method (int i)
+	{
+	}
+}";
+			Test<ParameterHidesMemberIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestIgnoreInterfaceImplementations ()
+		{
+			var input = @"
+interface ITest {
+	void Method (int i);
+}
+
+class TestClass : ITest 
+{
+	private int i;
+
+	void ITest.Method (int i)
+	{
+	}
 }";
 			Test<ParameterHidesMemberIssue> (input, 0);
 		}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ParameterNotUsedIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ParameterNotUsedIssueTests.cs
deleted file mode 100644
index f7c1316d9b..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ParameterNotUsedIssueTests.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-// 
-// ParameterNotUsedIssueTests.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class ParameterNotUsedIssueTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestUnusedParameter ()
-		{
-			var input = @"
-class TestClass {
-	void TestMethod (int i)
-	{
-	}
-}";
-			Test<ParameterNotUsedIssue> (input, 1);
-		}
-		
-		[Test]
-		public void TestUnusedParameterMethodGetsCalled ()
-		{
-			var input = @"
-class TestClass {
-	void TestMethod (int i)
-	{
-		TestMethod(0);
-	}
-}";
-			Test<ParameterNotUsedIssue> (input, 1);
-		}
-		
-		[Test]
-		public void TestInterfaceImplementation ()
-		{
-			var input = @"
-interface ITestClass {
-	void TestMethod (int i);
-}
-class TestClass : ITestClass {
-	public void TestMethod (int i)
-	{
-	}
-}";
-			Test<ParameterNotUsedIssue> (input, 0);
-		}
-		
-		[Test]
-		public void TestAbstractMethodImplementation ()
-		{
-			var input = @"
-abstract class TestBase {
-	public abstract void TestMethod (int i);
-}
-class TestClass : TestBase {
-	public override void TestMethod (int i)
-	{
-	}
-}";
-			Test<ParameterNotUsedIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestUsedParameter ()
-		{
-			var input = @"
-class TestClass {
-	void TestMethod (int i)
-	{
-		i = 1;
-	}
-}";
-			Test<ParameterNotUsedIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestLambda ()
-		{
-			var input = @"
-class TestClass {
-	void TestMethod ()
-	{
-		System.Action<int> a = i => {
-		};
-	}
-}";
-			Test<ParameterNotUsedIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestAnonymousMethod ()
-		{
-			var input = @"
-class TestClass {
-	void TestMethod ()
-	{
-		System.Action<int> a = delegate (int i) {
-		};
-	}
-}";
-			Test<ParameterNotUsedIssue> (input, 0);
-		}
-
-
-		[Test]
-		public void TestMethodUsedAsDelegateMethod ()
-		{
-			var input = @"using System;
-class TestClass {
-	public event EventHandler FooEvt;
-	void TestMethod ()
-	{
-		FooEvt += FooBar;
-	}
-	void FooBar (object sender, EventArgs e) {}
-}";
-			Test<ParameterNotUsedIssue> (input, 0);
-		}
-		
-		[Test]
-		public void TestMethodLooksLikeEventHandlerButNotUsedAsSuch ()
-		{
-			var input = @"using System;
-class TestClass {
-	void FooBar (object sender, EventArgs e) {}
-}";
-			Test<ParameterNotUsedIssue> (input, 2);
-		}
-		
-		[Test]
-		public void TestMethodUsedAsDelegateInOtherPart ()
-		{
-			// This test doesn't add the second part;
-			// but the issue doesn't look at other files after all;
-			// we just rely on heuristics if the class is partial
-			var input = @"using System;
-partial class TestClass {
-	void FooBar (object sender, EventArgs e) {}
-}";
-			Test<ParameterNotUsedIssue> (input, 0);
-		}
-		
-		[Test]
-		public void UnusedParameterInConstructor()
-		{
-			var input = @"
-class TestClass {
-	public TestClass(int i)
-	{
-	}
-}";
-			Test<ParameterNotUsedIssue> (input, 1);
-		}
-
-		[Test]
-		public void TestUnusedParameterInVirtualMethod ()
-		{
-			var input = @"
-class TestClass {
-	public virtual void TestMethod (int i)
-	{
-	}
-}";
-			Test<ParameterNotUsedIssue> (input, 0);
-		}
-		
-		[Test]
-		public void TestUnusedParameterInShadowedMethod ()
-		{
-			var input = @"
-class TestClass {
-	public new void TestMethod (int i)
-	{
-	}
-}";
-			Test<ParameterNotUsedIssue> (input, 0);
-		}
-
-		
-		[Test]
-		public void TestUnusedParameterInPartialMethod ()
-		{
-			var input = @"
-partial class TestClass {
-	partial void TestMethod (int i)
-	{
-	}
-}";
-			Test<ParameterNotUsedIssue> (input, 0);
-		}
-
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PartOfBodyCanBeConvertedToQueryIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PartOfBodyCanBeConvertedToQueryIssueTests.cs
new file mode 100644
index 0000000000..aabf902551
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PartOfBodyCanBeConvertedToQueryIssueTests.cs
@@ -0,0 +1,139 @@
+//
+// PartOfBodyCanBeConvertedToQueryIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[Ignore]
+	[TestFixture]
+	public class PartOfBodyCanBeConvertedToQueryIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestWhere()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		foreach (var x in i) {
+			if (x < 10) {
+				Console.WriteLine(x);
+			}
+		}
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo (int[] i)
+	{
+		foreach (var x in i.Where (x => x < 10)) {
+			Console.WriteLine(x);
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestOfType()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo(object[] i)
+	{
+		foreach (var x in i) {
+			if (x is int) {
+				Console.WriteLine(x);
+			}
+		}
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo(object[] i)
+	{
+		foreach (var x in i.OfType<int> ()) {
+			Console.WriteLine(x);
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestOfTypeTakeWhile()
+		{
+			Test<LoopCanBeConvertedToQueryIssue>(@"
+using System;
+
+public class Bar
+{
+	public void Foo(object[] i)
+	{
+		foreach (var x in i) {
+			if (x is int) {
+				if ((int)x < 10)
+					break;
+				Console.WriteLine(x);
+			}
+		}
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+public class Bar
+{
+	public void Foo(object[] i)
+	{
+		foreach (var x in i.OfType<int> ().TakeWhile (x => x >= 10)) {
+			Console.WriteLine(x);
+		}
+	}
+}
+");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PartialMethodParameterNameMismatchIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PartialMethodParameterNameMismatchIssueTests.cs
new file mode 100644
index 0000000000..2b7b477417
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PartialMethodParameterNameMismatchIssueTests.cs
@@ -0,0 +1,86 @@
+//
+// PartialMethodParameterNameMismatchIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class PartialMethodParameterNameMismatchIssueTests : InspectionActionTestBase
+	{
+
+		[Test]
+		public void SimpleCaseFix ()
+		{
+			Test<PartialMethodParameterNameMismatchIssue>(@"
+partial class Test
+{
+	partial void FooBar(int bar);
+}
+
+partial class Test
+{
+	partial void FooBar(int foo)
+	{
+	}
+}
+", @"
+partial class Test
+{
+	partial void FooBar(int bar);
+}
+
+partial class Test
+{
+	partial void FooBar(int bar)
+	{
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<PartialMethodParameterNameMismatchIssue>(@"
+// ReSharper disable PartialMethodParameterNameMismatch
+partial class Test
+{
+    partial void FooBar(int bar);
+}
+
+partial class Test
+{
+    partial void FooBar(int foo)
+    {
+    }
+}
+// ReSharper restore PartialMethodParameterNameMismatch
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PartialTypeWithSinglePartIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PartialTypeWithSinglePartIssueTests.cs
new file mode 100644
index 0000000000..09b706276e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PartialTypeWithSinglePartIssueTests.cs
@@ -0,0 +1,167 @@
+// 
+// RedundantPartialTypeTests.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class PartialTypeWithSinglePartIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestRedundantModifier()
+		{
+			var input = @"
+partial class TestClass
+{
+}";
+			var output = @"
+class TestClass
+{
+}";
+			Test<PartialTypeWithSinglePartIssue>(input, 1, output);
+		}
+
+		[Test]
+		public void TestNecessaryModifier()
+		{
+			var input = @"
+partial class TestClass
+{
+}
+partial class TestClass
+{
+}";
+			Test<PartialTypeWithSinglePartIssue>(input, 0);
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			var input = @"
+// ReSharper disable once PartialTypeWithSinglePart
+partial class TestClass
+{
+}";
+			TestWrongContext<PartialTypeWithSinglePartIssue>(input);
+		}
+
+		[Test]
+		public void TestRedundantNestedPartial()
+		{
+			var input = @"
+partial class TestClass
+{
+	partial class Nested
+	{
+	}
+}
+partial class TestClass
+{
+}";
+			var output = @"
+partial class TestClass
+{
+	class Nested
+	{
+	}
+}
+partial class TestClass
+{
+}";
+			Test<PartialTypeWithSinglePartIssue>(input, output);
+		}
+
+		[Test]
+		public void TestRedundantNestedPartialInNonPartialOuterClass()
+		{
+			var input = @"
+class TestClass
+{
+	partial class Nested
+	{
+	}
+}";
+			var output = @"
+class TestClass
+{
+	class Nested
+	{
+	}
+}";
+			Test<PartialTypeWithSinglePartIssue>(input, output);
+		}
+
+		[Test]
+		public void TestRedundantNestedPartialDisable()
+		{
+			var input = @"
+// ReSharper disable PartialTypeWithSinglePart
+partial class TestClass
+// ReSharper restore PartialTypeWithSinglePart
+{
+	partial class Nested
+	{
+	}
+}
+";
+			var output = @"
+// ReSharper disable PartialTypeWithSinglePart
+partial class TestClass
+// ReSharper restore PartialTypeWithSinglePart
+{
+	class Nested
+	{
+	}
+}
+";
+			Test<PartialTypeWithSinglePartIssue>(input, output);
+		}
+
+
+		[Test]
+		public void TestNeededNestedPartial()
+		{
+			var input = @"
+partial class TestClass
+{
+	partial class Nested
+	{
+	}
+}
+partial class TestClass
+{
+	partial class Nested
+	{
+	}
+}";
+			Test<PartialTypeWithSinglePartIssue>(input, 0);
+		}
+
+
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PolymorphicFieldLikeEventInvocationIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PolymorphicFieldLikeEventInvocationIssueTests.cs
new file mode 100644
index 0000000000..048f5acfe4
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PolymorphicFieldLikeEventInvocationIssueTests.cs
@@ -0,0 +1,112 @@
+//
+// PolymorphicFieldLikeEventInvocationIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+using System;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+
+	[TestFixture]
+	public class PolymorphicFieldLikeEventInvocationIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase()
+		{
+			TestIssue<PolymorphicFieldLikeEventInvocationIssue>(@"
+using System;
+
+public class Bar
+{
+	public virtual event EventHandler FooBarEvent;
+}
+
+public class Foo : Bar
+{
+	public override event EventHandler FooBarEvent;
+
+	public void FooBar()
+	{
+		FooBarEvent(this, EventArgs.Empty);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestCustomEvent()
+		{
+			// Should be marked as error
+			TestIssue<PolymorphicFieldLikeEventInvocationIssue>(@"
+using System;
+
+public class Bar
+{
+	public virtual event EventHandler FooBarEvent;
+}
+
+public class Foo : Bar
+{
+	public override event EventHandler FooBarEvent {
+		add {}
+		remove {}
+	}
+
+	public void FooBar()
+	{
+		FooBarEvent(this, EventArgs.Empty);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<PolymorphicFieldLikeEventInvocationIssue>(@"
+using System;
+
+public class Bar
+{
+	public virtual event EventHandler FooBarEvent;
+}
+
+public class Foo : Bar
+{
+	public override event EventHandler FooBarEvent;
+
+	public void FooBar()
+	{
+		// ReSharper disable once PolymorphicFieldLikeEventInvocation
+		FooBarEvent(this, EventArgs.Empty);
+	}
+}
+");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PossibleAssignmentToReadonlyFieldIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PossibleAssignmentToReadonlyFieldIssueTests.cs
new file mode 100644
index 0000000000..8866e963a4
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PossibleAssignmentToReadonlyFieldIssueTests.cs
@@ -0,0 +1,197 @@
+//
+// PossibleAssignmentToReadonlyFieldIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class PossibleAssignmentToReadonlyFieldIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestTypeParameter()
+		{
+			TestIssue<PossibleAssignmentToReadonlyFieldIssue>(@"
+interface IFoo
+{
+	int Property { get; set; }
+}
+
+class FooBar<T> where T : IFoo
+{
+	readonly T field;
+
+	void Test ()
+	{
+		field.Property = 7;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestClassTypeParameter()
+		{
+			TestWrongContext<PossibleAssignmentToReadonlyFieldIssue>(@"
+interface IFoo
+{
+	int Property { get; set; }
+}
+
+class FooBar<T> where T : class, IFoo
+{
+	readonly T field;
+
+	void Test ()
+	{
+		field.Property = 7;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestValueType()
+		{
+			TestIssue<PossibleAssignmentToReadonlyFieldIssue>(@"
+struct Bar
+{
+	public int P;
+}
+
+class FooBar
+{
+	readonly Bar field;
+
+	public static void Foo()
+	{
+		var a = new FooBar();
+		a.field.P = 7;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestConstructor ()
+		{
+			TestWrongContext<PossibleAssignmentToReadonlyFieldIssue>(@"
+interface IFoo
+{
+	int Property { get; set; }
+}
+
+class FooBar<T> where T : IFoo
+{
+	readonly T field;
+
+	public FooBar (T t)
+	{
+		this.field = t;
+		this.field.Property = 5;
+	}
+}
+");
+		}
+
+		/// <summary>
+		/// Bug 15038 - readonly member property is incorrectly underlined in the .ctor when initialized 
+		/// </summary>
+		[Test]
+		public void TestBug15038 ()
+		{
+			TestWrongContext<PossibleAssignmentToReadonlyFieldIssue>(@"
+using System;
+using System.Collections.Generic;
+
+public class Multipart
+{
+	readonly List<MimeEntity> children;
+	
+	internal Multipart ()
+	{
+		children = new List<MimeEntity> ();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<PossibleAssignmentToReadonlyFieldIssue>(@"
+interface IFoo
+{
+	int Property { get; set; }
+}
+
+struct Bar : IFoo
+{
+	public int Property { get; set; }
+}
+
+class FooBar<T> where T : IFoo
+{
+	readonly T field;
+
+	public static void Foo()
+	{
+		var a = new FooBar<Bar>();
+		// ReSharper disable once PossibleAssignmentToReadonlyField
+		a.field.Property = 7;
+	}
+}
+");
+		}
+
+		/// <summary>
+		/// Bug 15109 - Incorrect "Readonly field cannot be used as assignment target" error
+		/// </summary>
+		[Test]
+		public void TestBug15109()
+		{
+			TestWrongContext<PossibleAssignmentToReadonlyFieldIssue>(@"
+namespace TestProject 
+{
+	class FileInfo {
+		public int Foo { get; set; } 
+	}
+	class Program
+	{
+		readonly FileInfo f = new FileInfo ();
+
+		void Test ()
+		{
+			f.Foo = 12;
+		}
+	}
+}
+");
+		}
+	}
+
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PossibleMistakenCallToGetTypeIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PossibleMistakenCallToGetTypeIssueTests.cs
new file mode 100644
index 0000000000..f820b7f46e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PossibleMistakenCallToGetTypeIssueTests.cs
@@ -0,0 +1,98 @@
+//
+// PossibleMistakenCallToGetTypeIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class PossibleMistakenCallToGetTypeIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestGetTypeCase ()
+		{
+			Test<PossibleMistakenCallToGetTypeIssue>(@"
+using System;
+
+public class Bar
+{
+	public void FooBar (Type a)
+	{
+		Console.WriteLine (a.GetType ());
+	}
+}
+", @"
+using System;
+
+public class Bar
+{
+	public void FooBar (Type a)
+	{
+		Console.WriteLine (a);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestStaticCall ()
+		{
+			TestWrongContext<PossibleMistakenCallToGetTypeIssue>(@"
+using System;
+
+public class Bar
+{
+	public void FooBar(Type a)
+	{
+		string abc = ""def"";
+		Type.GetType (abc, true);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<PossibleMistakenCallToGetTypeIssue>(@"
+public class Bar
+{
+	public void FooBar(Type a)
+	{
+		// ReSharper disable once PossibleMistakenCallToGetType
+		Console.WriteLine(a.GetType());
+	}
+}
+");
+		}
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PossibleMultipleEnumerationIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PossibleMultipleEnumerationIssueTests.cs
new file mode 100644
index 0000000000..ef7afe193c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PossibleMultipleEnumerationIssueTests.cs
@@ -0,0 +1,733 @@
+// 
+// MultipleEnumerationIssueTests.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class PossibleMultipleEnumerationIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestVariableInvocation ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod ()
+	{
+		IEnumerable<object> e = null;
+		var type = e.GetType();
+		var x = e.First ();
+		var y = e.Count ();
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (
+				input,
+				2,
+				@"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod ()
+	{
+		IEnumerable<object> e = null;
+		var type = e.GetType();
+		var enumerable = e as object[] ?? e.ToArray ();
+		var x = enumerable.First ();
+		var y = enumerable.Count ();
+	}
+}", 0);
+		}
+
+		[Test] 
+		public void TestVariableForeach ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod ()
+	{
+		IEnumerable<object> e = null;
+		foreach (var x in e) ;
+		foreach (var y in e) ;
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (
+				input, 
+				2,
+				@"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod ()
+	{
+		IEnumerable<object> e = null;
+		var enumerable = e as IList<object> ?? e.ToList ();
+		foreach (var x in enumerable) ;
+		foreach (var y in enumerable) ;
+	}
+}", 1, 1);
+		}
+
+		[Test]
+		public void TestVariableMixed ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod ()
+	{
+		IEnumerable<object> e = null;
+		foreach (var x in e) ;
+		var y = e.Count ();
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 2);
+		}
+
+		[Test]
+		public void TestParameter ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod (IEnumerable<object> e)
+	{
+		foreach (var x in e) ;
+		var y = e.Count ();
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 2);
+		}
+
+		[Test]
+		public void TestObjectMethodInvocation ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod ()
+	{
+		IEnumerable<object> e;
+		var a = e.GetType ();
+		var b = e.ToString ();
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestIf ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		IEnumerable<object> e;
+		if (i > 0) {
+			var a = e.Count ();
+		} else {
+			var b = e.First ();
+			var c = e.Count ();
+		}
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 2);
+		}
+
+		[Test]
+		public void TestIf2 ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		IEnumerable<object> e;
+		if (i > 0) {
+			var a = e.Count ();
+		} else {
+			var b = e.First ();
+		}
+		var c = e.Count ();
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 3);
+		}
+
+		[Test]
+		public void TestIf3 ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		IEnumerable<object> e;
+		if (i > 0) {
+			var a = e.Count ();
+		} else {
+			var b = e.First ();
+		}
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestFor ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod ()
+	{
+		IEnumerable<object> e;
+		for (int i = 0; i < 10; i++) {
+			var a = e.Count ();
+		}
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestWhile ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod ()
+	{
+		IEnumerable<object> e;
+		int i;
+		while (i > 1) {
+			var a = e.Count ();
+		}
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestWhile2 ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod ()
+	{
+		IEnumerable<object> e;
+		int i;
+		while (i > e.Count ()) {
+		}
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestWhile3 ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod ()
+	{
+		IEnumerable<object> e;
+		int i;
+		object x;
+		while (true) {
+			if (i > 1) {
+				x = e.First ();
+				break;
+			} 
+		}
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestWhile4 ()
+		{
+			var input = @"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	IEnumerable<object> GetEnum () { }
+	void TestMethod (int i)
+	{
+		IEnumerable<object> e = GetEnum ();
+		var a1 = e.First ();
+		while ((e = GetEnum ()) != null) {
+			var a2 = e.First ();
+		}
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestDo ()
+		{
+			var input = @"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	IEnumerable<object> GetEnum () { }
+	void TestMethod (int i)
+	{
+		IEnumerable<object> e = GetEnum ();
+		var a1 = e.First ();
+		do {
+			var a2 = e.First ();
+		} while ((e = GetEnum ()) != null);
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 2);
+		}
+
+		[Test]
+		public void TestDo2 ()
+		{
+			var input = @"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	IEnumerable<object> GetEnum () { }
+	void TestMethod (int i)
+	{
+		IEnumerable<object> e = GetEnum ();
+		do {
+			var a2 = e.First ();
+		} while ((e = GetEnum ()) != null);
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestLambda ()
+		{
+			var input = @"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod ()
+	{
+		IEnumerable<object> e;
+		Action a = () => {
+			var x = e.Count ();
+			var y = e.Count ();
+		};
+		var z = e.Count ();
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 2);
+		}
+
+		[Test]
+		public void TestLambda2 ()
+		{
+			var input = @"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void Test (object a, object b) { }
+	void TestMethod ()
+	{
+		IEnumerable<object> e;
+		Action a = () => Test(e.First (), e.Count ());
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 2);
+		}
+
+		[Test]
+		public void TestLambda3 ()
+		{
+			var input = @"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void Test (object a, Action b) { }
+	void TestMethod ()
+	{
+		IEnumerable<object> e;
+		Test(e.First (), () => e.Count ());
+		e = null;
+		var x = e.First ();
+		Action a = () => e.Count();
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestLambda4 ()
+		{
+			var input = @"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void Test (object a, object b) { }
+	void TestMethod ()
+	{
+		IEnumerable<object> e;
+		Action a = () => Test(e.ToString (), e.ToString ());
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestConditionalExpression ()
+		{
+			var input = @"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		IEnumerable<object> e;
+		var a = i > 0 ? e.First () : e.FirstOrDefault ();
+		Action b = () => i > 0 ? e.First () : e.FirstOrDefault ();
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 0);
+		}
+		[Test]
+		public void TestConditionalExpression2 ()
+		{
+			var input = @"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		IEnumerable<object> e;
+		var a = i > 0 ? e.First () : new object ();
+		var b = e.First ();
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 2);
+		}
+
+		[Test]
+		public void TestConstantConditionalExpression ()
+		{
+			var input = @"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		IEnumerable<object> e;
+		var a = 1 > 2 ? e.First () : new object ();
+		var b = e.First ();
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestAssignmentInConditionalExpression ()
+		{
+			var input = @"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	IEnumerable<object> GetEnum () { }
+	void TestMethod (int i)
+	{
+		IEnumerable<object> e;
+		var x1 = e.First ();
+		var a = i > 0 ? e = GetEnum () : GetEnum ();
+		var x2 = e.First ();
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 2);
+		}
+
+		[Test]
+		public void TestAssignmentInConditionalExpression2 ()
+		{
+			var input = @"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	IEnumerable<object> GetEnum () { }
+	void TestMethod (int i)
+	{
+		IEnumerable<object> e;
+		var x1 = e.First ();
+		var a = i > 0 ? e = GetEnum () : e = GetEnum ();
+		var x2 = e.First ();
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestAssignment ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod (IEnumerable<object> e)
+	{
+		foreach (var x in e) ;
+		e = null;
+		var y = e.Count ();
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestAssignment2 ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod (IEnumerable<object> e)
+	{
+		foreach (var x in e) ;
+		e = null;
+		var y = e.Count ();
+		e = null;
+		var a = e.First ();
+		var b = e.First ();
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 2);
+		}
+
+		[Test]
+		public void TestNoIssue ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod (IEnumerable<object> e)
+	{
+		foreach (var x in e) ;
+		IEnumerable<object> e2;
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestExpression ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	int Test (params object[] args) { }
+	void TestMethod ()
+	{
+		IEnumerable<object> e = null;
+		var type = e.GetType();
+		var x = Test (e.First (), e.Count ());
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 2);
+		}
+
+		[Test]
+		public void TestExpression2 ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	int Test (params object[] args) { }
+	void TestMethod ()
+	{
+		IEnumerable<object> e = null;
+		var type = e.GetType();
+		var x = Test (e.First (), e = new objct[0], e.Count ());
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestOutArgument ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void Test (out IEnumerable<object> e)
+	{
+		e = null;
+	}
+
+	void TestMethod (IEnumerable<object> e)
+	{
+		foreach (var x in e) ;
+		Test (out e);
+		var y = e.Count ();
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestOutArgument2 ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void Test (out IEnumerable<object> e)
+	{
+		e = null;
+	}
+
+	void TestMethod (IEnumerable<object> e)
+	{
+		foreach (var x in e) ;
+		Test (out e);
+		var y = e.Count ();
+		var z = e.Count ();
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 2);
+		}
+
+		[Test]
+		public void TestOutArgument3 ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void Test (object arg1, out IEnumerable<object> e, object arg2)
+	{
+		e = null;
+	}
+
+	void TestMethod (IEnumerable<object> e)
+	{
+		Test (e.First (), out e, e.First ());
+	}
+}";
+			Test<PossibleMultipleEnumerationIssue> (input, 2);
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			var input = @"
+using System.Collections.Generic;
+using System.Linq;
+class TestClass
+{
+	void TestMethod ()
+	{
+		// ReSharper disable PossibleMultipleEnumeration
+		IEnumerable<object> e = null;
+		var type = e.GetType();
+		var x = e.First ();
+		var y = e.Count ();
+		// ReSharper restore PossibleMultipleEnumeration
+	}
+}";
+			TestWrongContext<PossibleMultipleEnumerationIssue> (input);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ProhibitedModifiersIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ProhibitedModifiersIssueTests.cs
new file mode 100644
index 0000000000..6ac6734991
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ProhibitedModifiersIssueTests.cs
@@ -0,0 +1,221 @@
+//
+// ProhibitedModifiersIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ProhibitedModifiersIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestNonStaticMembersInStaticClass ()
+		{
+			Test<ProhibitedModifiersIssue>(@"
+static class Foo
+{
+	public void Bar () 
+	{
+	}
+}
+", @"
+static class Foo
+{
+	public static void Bar () 
+	{
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestValidStaticClass ()
+		{
+			TestWrongContext<ProhibitedModifiersIssue>(@"
+static class Foo
+{
+	public const int f = 1;
+	static Foo () {}
+
+	public static void Bar () 
+	{
+	}
+}
+");
+		}
+	
+
+		[Test]
+		public void TestNonStaticFieldsInStaticClass ()
+		{
+			Test<ProhibitedModifiersIssue>(@"
+static class Foo
+{
+	int a, b, c;
+}
+", 3, @"
+static class Foo
+{
+	static int a, b, c;
+}
+", 1);
+		}
+
+		[Ignore("Code issues don't run with errors atm.")]
+		[Test]
+		public void TestStaticConstructorWithPublicModifier()
+		{
+			Test<ProhibitedModifiersIssue>(@"
+class Test
+{
+	static int a;
+
+	public static Test ()
+	{
+		a = 100;
+	}
+}", @"
+class Test
+{
+	static int a;
+
+	static Test ()
+	{
+		a = 100;
+	}
+}");
+		}
+	
+		[Test]
+		public void TestVirtualMemberInSealedClass ()
+		{
+			Test<ProhibitedModifiersIssue>(@"
+sealed class Test
+{
+	public virtual void FooBar ()
+	{
+	}
+}", @"
+sealed class Test
+{
+	public void FooBar ()
+	{
+	}
+}");
+		}
+	
+
+		[Test]
+		public void TestPrivateVirtualMembers ()
+		{
+			TestIssue<ProhibitedModifiersIssue>(@"
+class Foo
+{
+	virtual void Bar () 
+	{
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestSealed ()
+		{
+			Test<ProhibitedModifiersIssue>(@"
+class Foo
+{
+	public sealed void Bar () 
+	{
+	}
+}
+", @"
+class Foo
+{
+	public void Bar () 
+	{
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestValidSealed ()
+		{
+			TestWrongContext<ProhibitedModifiersIssue>(@"
+class Foo
+{
+	public override sealed void Bar () 
+	{
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestExtensionMethodInNonStaticClass ()
+		{
+			Test<ProhibitedModifiersIssue>(@"
+class Foo
+{
+	public static void Bar (this int i) 
+	{
+	}
+}
+", @"
+static class Foo
+{
+	public static void Bar (this int i) 
+	{
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestExtensionMethodInNonStaticClassFix2 ()
+		{
+			Test<ProhibitedModifiersIssue>(@"
+class Foo
+{
+	public static void Bar (this int i) 
+	{
+	}
+}
+", @"
+class Foo
+{
+	public static void Bar (int i) 
+	{
+	}
+}
+", 1);
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PublicConstructorInAbstractClassIssueTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PublicConstructorInAbstractClassIssueTest.cs
index 7c3441b6c9..ddb55f15d4 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PublicConstructorInAbstractClassIssueTest.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/PublicConstructorInAbstractClassIssueTest.cs
@@ -23,6 +23,8 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
+
+using System;
 using ICSharpCode.NRefactory.CSharp.Refactoring;
 using NUnit.Framework;
 using ICSharpCode.NRefactory.CSharp.CodeActions;
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantAnonymousTypePropertyNameIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantAnonymousTypePropertyNameIssueTests.cs
new file mode 100644
index 0000000000..b02ea8240f
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantAnonymousTypePropertyNameIssueTests.cs
@@ -0,0 +1,86 @@
+//
+// RedundantAnonymousTypePropertyNameIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantAnonymousTypePropertyNameIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase()
+		{
+			Test<RedundantAnonymousTypePropertyNameIssue>(@"
+class FooBar
+{
+	public int Foo;
+	public int Bar;
+}
+class TestClass
+{
+	public void Test(FooBar f)
+	{
+		var n = new { Foo = f.Foo, b = 12 };
+	}
+}", @"
+class FooBar
+{
+	public int Foo;
+	public int Bar;
+}
+class TestClass
+{
+	public void Test(FooBar f)
+	{
+		var n = new { f.Foo, b = 12 };
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<RedundantAnonymousTypePropertyNameIssue>(@"
+class FooBar
+{
+	public int Foo;
+	public int Bar;
+}
+class TestClass
+{
+	public void Test(FooBar f)
+	{
+		// ReSharper disable once RedundantAnonymousTypePropertyName
+		var n = new { Foo = f.Foo, b = 12 };
+	}
+}");
+		}
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantArgumentDefaultValueIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantArgumentDefaultValueIssueTests.cs
new file mode 100644
index 0000000000..8beaaaa2ab
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantArgumentDefaultValueIssueTests.cs
@@ -0,0 +1,218 @@
+//
+// RedundantArgumentDefaultValueIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantArgumentDefaultValueIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase()
+		{
+			Test<RedundantArgumentDefaultValueIssue>(@"
+class Test
+{ 
+	public void Bar (int foo = 22)
+	{
+		const int s = 22;
+		Bar (s);
+	}
+}
+", @"
+class Test
+{ 
+	public void Bar (int foo = 22)
+	{
+		const int s = 22;
+		Bar ();
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestNamedArgument()
+		{
+			Test<RedundantArgumentDefaultValueIssue>(@"
+class Test
+{ 
+	public void Bar (int foo = 22)
+	{
+		Bar(foo: 22);
+	}
+}
+", @"
+class Test
+{ 
+	public void Bar (int foo = 22)
+	{
+		Bar ();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestMultipleRemoveFirst()
+		{
+			Test<RedundantArgumentDefaultValueIssue>(@"
+class Test
+{ 
+	public void Bar (int foo = 22, int test = 3)
+	{
+		const int s = 22;
+		Bar (s, 3);
+	}
+}
+", 2, @"
+class Test
+{ 
+	public void Bar (int foo = 22, int test = 3)
+	{
+		const int s = 22;
+		Bar ();
+	}
+}
+", 0);
+		}
+
+		[Test]
+		public void TestMultipleRemoveSecond()
+		{
+			Test<RedundantArgumentDefaultValueIssue>(@"
+class Test
+{ 
+	public void Bar (int foo = 22, int test = 3)
+	{
+		const int s = 22;
+		Bar (s, 3);
+	}
+}
+", 2, @"
+class Test
+{ 
+	public void Bar (int foo = 22, int test = 3)
+	{
+		const int s = 22;
+		Bar (s);
+	}
+}
+", 1);
+		}
+	
+		[Test]
+		public void TestInvalid()
+		{
+			TestWrongContext<RedundantArgumentDefaultValueIssue>(@"
+class Test
+{ 
+	public void Bar (int foo = 22)
+	{
+		Bar (21);
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalidCase2()
+		{
+			TestWrongContext<RedundantArgumentDefaultValueIssue>(@"
+class Test
+{ 
+	public void Bar (int foo = 22, int bar = 3)
+	{
+		Bar (22, 4);
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<RedundantArgumentDefaultValueIssue>(@"
+class Test
+{ 
+	public void Bar (int foo = 22)
+	{
+		const int s = 22;
+		// ReSharper disable once RedundantArgumentDefaultValue
+		Bar (s);
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestConstructor()
+		{
+			Test<RedundantArgumentDefaultValueIssue>(@"
+class Test
+{ 
+	public Test (int a, int b, int c = 4711)
+	{
+		new Test (1, 2, 4711);
+	}
+}
+", @"
+class Test
+{ 
+	public Test (int a, int b, int c = 4711)
+	{
+		new Test (1, 2);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestIndexer()
+		{
+			Test<RedundantArgumentDefaultValueIssue>(@"
+class Test
+{ 
+	public int this [int a, int b = 2] {
+		get {
+			return this [a, 2];
+		}
+	}
+}
+", @"
+class Test
+{ 
+	public int this [int a, int b = 2] {
+		get {
+			return this [a];
+		}
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantArgumentNameTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantArgumentNameTests.cs
new file mode 100755
index 0000000000..6db9b21f98
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantArgumentNameTests.cs
@@ -0,0 +1,274 @@
+// RedundantArgumentNameTests.cs
+//
+// Author:
+//      Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantArgumentNameTests : InspectionActionTestBase
+	{
+		[Test]
+		public void MethodInvocation1()
+		{
+			var input = @"
+class TestClass
+{
+	public void Foo(int a, int b, double c = 0.1){}
+	public void F()
+	{
+		Foo(1,b: 2);
+	}
+}
+";
+			var output = @"
+class TestClass
+{
+	public void Foo(int a, int b, double c = 0.1){}
+	public void F()
+	{
+		Foo (1, 2);
+	}
+}
+";
+			Test<RedundantArgumentNameIssue>(input, 1, output);
+		}
+		
+		[Test]
+		public void MethodInvocation2()
+		{
+			var input = @"
+class TestClass
+{
+	public void Foo(int a, int b, double c = 0.1){}
+	public void F()
+	{
+		Foo(a: 1, b: 2, c: 0.2);
+	}
+}
+";
+			var output = @"
+class TestClass
+{
+	public void Foo(int a, int b, double c = 0.1){}
+	public void F()
+	{
+		Foo (1, b: 2, c: 0.2);
+	}
+}
+";
+			Test<RedundantArgumentNameIssue>(input, 3, output, 0);
+		}
+		
+		[Test]
+		public void MethodInvocation3()
+		{
+			var input = @"
+class TestClass
+{
+	public void Foo(int a, int b, double c = 0.1){}
+	public void F()
+	{
+		Foo (a: 1, b: 2, c: 0.2);
+	}
+}
+";
+			var output = @"
+class TestClass
+{
+	public void Foo(int a, int b, double c = 0.1){}
+	public void F()
+	{
+		Foo (1, 2, c: 0.2);
+	}
+}
+";
+			Test<RedundantArgumentNameIssue>(input, 3, output, 1);
+		}
+
+
+		[Test]
+		public void MethodInvocation4()
+		{
+			Test<RedundantArgumentNameIssue>(@"
+class TestClass
+{
+	public void Foo (int a = 2, int b = 3, int c = 4, int d = 5, int e = 5)
+	{
+	}
+
+	public void F ()
+	{
+		Foo (1, b: 2, d: 2, c: 3, e:19);
+	}
+}
+", 1, @"
+class TestClass
+{
+	public void Foo (int a = 2, int b = 3, int c = 4, int d = 5, int e = 5)
+	{
+	}
+
+	public void F ()
+	{
+		Foo (1, 2, d: 2, c: 3, e: 19);
+	}
+}
+");
+		}
+	
+
+		[Test]
+		public void IndexerExpression() 
+		{
+			var input = @"
+public class TestClass
+{
+	public int this[int i, int j]
+	{
+		set { }
+		get { return 0; }
+	}
+}
+internal class Test
+{
+	private void Foo()
+	{
+		var TestBases = new TestClass();
+		int a = TestBases[i: 1, j: 2];
+	}
+}
+";
+			var output = @"
+public class TestClass
+{
+	public int this[int i, int j]
+	{
+		set { }
+		get { return 0; }
+	}
+}
+internal class Test
+{
+	private void Foo()
+	{
+		var TestBases = new TestClass();
+		int a = TestBases [1, j: 2];
+	}
+}
+";
+			Test<RedundantArgumentNameIssue>(input, 2, output, 0);
+		}
+		
+		[Test]
+		public void TestAttributes()
+		{
+			var input = @"using System;
+class MyAttribute : Attribute
+{
+	public MyAttribute(int x, int y) {}
+}
+
+
+[MyAttribute(x: 1, y: 2)]
+class TestClass
+{
+}
+";
+			var output = @"using System;
+class MyAttribute : Attribute
+{
+	public MyAttribute(int x, int y) {}
+}
+
+
+[MyAttribute(1, 2)]
+class TestClass
+{
+}
+";
+			Test<RedundantArgumentNameIssue>(input, 2, output, 1);
+		}
+		
+		[Test]
+		public void TestObjectCreation()
+		{
+			var input = @"
+class TestClass
+{
+	public TestClass (int x, int y)
+	{
+	}
+
+	public void Foo ()
+	{
+		new TestClass (0, y:1);
+	}
+}
+"
+				;
+			var output = @"
+class TestClass
+{
+	public TestClass (int x, int y)
+	{
+	}
+
+	public void Foo ()
+	{
+		new TestClass (0, 1);
+	}
+}
+";
+			Test<RedundantArgumentNameIssue>(input, 1, output);
+		}
+		
+		
+		[Test]
+		public void Invalid()
+		{
+			var input = @"
+public class TestClass
+{
+	public int this[int i, int j , int k]
+	{
+		set { }
+		get { return 0; }
+	}
+}
+internal class Test
+{
+	private void Foo()
+	{
+		var TestBases = new TestClass();
+		int a = TestBases[ j: 1, i: 2, k: 3];
+	}
+}
+";
+			Test<RedundantArgumentNameIssue>(input, 0);
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantArrayInitializerCommaIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantArrayInitializerCommaIssueTests.cs
deleted file mode 100644
index 9609e03b7e..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantArrayInitializerCommaIssueTests.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-// 
-// RedundantArrayInitializerCommaIssueTests.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class RedundantArrayInitializerCommaIssueTests : InspectionActionTestBase
-	{
-		[Test]
-		public void Test ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		var a = new int[] { 1, 2, };
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		var a = new int[] { 1, 2 };
-	}
-}";
-			Test<RedundantArrayInitializerCommaIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestArrayInitializerDescription ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		var a = new int[] { 1, 2, };
-	}
-}";
-			TestRefactoringContext ctx;
-			var issues = GetIssues (new RedundantArrayInitializerCommaIssue (), input, out ctx);
-			Assert.AreEqual (issues.Count, 1);
-			Assert.AreEqual (issues [0].Description, "Remove redundant comma in array initializer");
-		}
-
-		[Test]
-		public void TestObjectInitializerDescription ()
-		{
-			var input = @"
-class TestClass
-{
-	int Prop { get; set; }
-	void TestMethod ()
-	{
-		var a = new TestClass { Prop = 1, };
-	}
-}";
-			TestRefactoringContext ctx;
-			var issues = GetIssues (new RedundantArrayInitializerCommaIssue (), input, out ctx);
-			Assert.AreEqual (issues.Count, 1);
-			Assert.AreEqual (issues [0].Description, "Remove redundant comma in object initializer");
-		}
-
-		[Test]
-		public void TestCollectionInitializerDescrition ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		var a = new TestClass { 1, };
-	}
-}";
-			TestRefactoringContext ctx;
-			var issues = GetIssues (new RedundantArrayInitializerCommaIssue (), input, out ctx);
-			Assert.AreEqual (issues.Count, 1);
-			Assert.AreEqual (issues [0].Description, "Remove redundant comma in collection initializer");
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantAssignmentIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantAssignmentIssueTests.cs
index fd1bd2cf1a..3d06e8504d 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantAssignmentIssueTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantAssignmentIssueTests.cs
@@ -493,5 +493,33 @@ public class Test
 
 		}
 
+
+		/// <summary>
+		/// Bug 14929 - Assignment greyed out (meaning "redundant") when it should not be
+		/// </summary>
+		[Test]
+		public void TestBug14929 ()
+		{
+			TestWrongContext<RedundantAssignmentIssue>(@"
+using system;
+
+public class Test
+{
+	public void Demo ()
+	{
+		bool save = true;
+		try {
+			throw new Exception ();
+		} catch (Exception) {
+			save = false;
+			throw;
+		} finally {
+			System.Console.WriteLine (save);
+		}
+	}
+
+}");
+
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantAttributeParenthesesIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantAttributeParenthesesIssueTests.cs
index adacecc002..5ec6b330f0 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantAttributeParenthesesIssueTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantAttributeParenthesesIssueTests.cs
@@ -43,5 +43,17 @@ class TestClass { }";
 class TestClass { }";
 			Test<RedundantAttributeParenthesesIssue> (input, 1, output);
 		}
+
+		
+		[Test]
+		public void TestDisable ()
+		{
+			var input = @"
+// Resharper disable once RedundantAttributeParentheses
+[Test ()]
+class TestClass { }";
+			Test<RedundantAttributeParenthesesIssue> (input, 0);
+		}
+
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantBaseConstructorIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantBaseConstructorIssueTests.cs
index 8fb4d791ad..65234a3f49 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantBaseConstructorIssueTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantBaseConstructorIssueTests.cs
@@ -62,7 +62,26 @@ class TestClass : BaseClass
 	{ }
 }
 ";
-			Test<RedundantBaseConstructorIssue> (input, 1, output);
+			Test<RedundantBaseConstructorCallIssue> (input, 1, output);
 		}
+
+        [Test]
+        public void TestDisable()
+        {
+            var input = @"
+class BaseClass
+{
+    public BaseClass()
+    {
+    }
+}
+class TestClass : BaseClass
+{
+// ReSharper disable once RedundantBaseConstructorCall
+    public TestClass(int data) : base() { }
+}
+";
+            TestWrongContext<RedundantBaseConstructorCallIssue>(input);
+        }
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantBaseQualifierTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantBaseQualifierTests.cs
new file mode 100644
index 0000000000..ead5374a31
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantBaseQualifierTests.cs
@@ -0,0 +1,211 @@
+// 
+// RedundantBaseQualifierTests.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantBaseQualifierTests : InspectionActionTestBase
+	{
+
+		[Test]
+		public void TestInspectorCase1()
+		{
+			var input = @"using System;
+	namespace Application
+	{
+		public class BaseClass
+		{
+			public int a;
+			public virtual void method()
+			{
+				Console.Write(Environment.NewLine);
+			}
+			public void method1()
+			{
+				Console.Write(Environment.NewLine);
+			}
+		}
+
+		class Program : BaseClass
+		{
+			public void method2(int a)
+			{
+				base.a = 1;
+			}
+			public override void method()
+			{
+				base.method1();
+			}
+		}
+	}
+";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantBaseQualifierIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			CheckFix(context, issues, @"using System;
+	namespace Application
+	{
+		public class BaseClass
+		{
+			public int a;
+			public virtual void method()
+			{
+				Console.Write(Environment.NewLine);
+			}
+			public void method1()
+			{
+				Console.Write(Environment.NewLine);
+			}
+		}
+
+		class Program : BaseClass
+		{
+			public void method2(int a)
+			{
+				base.a = 1;
+			}
+			public override void method()
+			{
+				method1 ();
+			}
+		}
+	}
+");
+		}
+
+		[Test]
+		public void TestInspectorCase2()
+		{
+			var input = @"using System;
+	namespace Application
+	{
+		public class BaseClass
+		{
+			public int a;
+			public int b;
+			public void method()
+			{
+				Console.Write(Environment.NewLine);
+			}
+			public virtual void method1()
+			{
+				Console.Write(Environment.NewLine);
+			}
+		}
+
+		class Program : BaseClass
+		{
+			public new void method(int b)
+			{
+				base.a = 1;
+				base.b = 2;
+			}
+			public void method2()
+			{
+				base.method ();
+			}
+			public new int a;
+		}
+	}
+";
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantBaseQualifierIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void ComplexTests ()
+		{
+			TestWrongContext<RedundantBaseQualifierIssue>(@"
+
+class Base {
+	public int a;
+}
+
+class Foo : Base
+{
+	void Bar ()
+	{
+		{
+			int a = 343;
+		}
+		base.a = 2;
+		
+	}
+
+	void FooBar ()
+	{
+		int a = base.a;
+	}
+}");
+		}
+
+		[Test]
+		public void TestResharperDisableRestore()
+		{
+			var input = @"using System;
+	namespace Application
+	{
+		public class BaseClass
+		{
+			public int a;
+			public virtual void print()
+			{
+				Console.Write(Environment.NewLine);
+			}
+			public void print1()
+			{
+				Console.Write(Environment.NewLine);
+			}
+		}
+
+		class Program : BaseClass
+		{
+			public void print2()
+			{
+//Resharper disable RedundantBaseQualifier
+				base.a = 1;
+//Resharper restore RedundantBaseQualifier
+				base.a = 1;
+			}
+			public override void print()
+			{
+				base.print1();
+			}
+		}
+	}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantBaseQualifierIssue(), input, out context);
+			Assert.AreEqual(2, issues.Count);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantBlockInDifferentBranchesTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantBlockInDifferentBranchesTests.cs
new file mode 100644
index 0000000000..f8986d412d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantBlockInDifferentBranchesTests.cs
@@ -0,0 +1,177 @@
+// 
+// RedundantBlockInDifferentBranchesTests.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantBlockInDifferentBranchesTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestConditionalExpression1()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int foo = 1;
+		if (foo > 5)
+		{
+			foo = foo +  1;
+			foo = foo + foo;
+		}
+		else
+		{
+			foo = foo + 1;
+			foo = foo + foo;
+		}
+	}
+}";
+			Test<RedundantBlockInDifferentBranchesIssue>(input, 1);
+		}
+		
+		[Test]
+		public void TestConditionalExpression2()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int foo = 1;
+		if (foo > 5)
+			foo = foo + 1;
+		else
+			foo = foo + 1;
+	}
+}";
+			Test<RedundantBlockInDifferentBranchesIssue>(input, 1);
+		}
+		
+		[Test]
+		public void TestConditionalExpression3()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int foo;
+		if (foo > 5)
+			foo = foo + 1;
+		else
+		{
+			foo = foo + 1;
+		}
+	}
+}";
+			Test<RedundantBlockInDifferentBranchesIssue>(input, 1);
+		}
+		
+		[Test]
+		public void TestConditionalExpression4()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int foo = 1;
+		if (foo > 5)
+		{
+		}
+		else
+		{}
+	}
+}";
+			Test<RedundantBlockInDifferentBranchesIssue>(input, 1);
+		}
+
+		[Test]
+		public void TestNoProblem1()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod (int foo)
+	{
+		if (foo > 5)
+		{
+			foo = foo + 1;
+			return 2;
+		}
+		else
+		{
+			foo = foo + 1;
+			return 2;
+		}
+	}
+}";
+			Test<RedundantBlockInDifferentBranchesIssue>(input, 0);
+		}
+
+		[Test]
+		public void TestNoProblem2()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod (int foo)
+	{
+		if (foo > 5)
+		{
+			foo = foo + 1;
+			return 2;
+		}
+		else
+			return 5;
+	}
+}";
+			Test<RedundantBlockInDifferentBranchesIssue>(input, 0);
+		}
+		
+		[Test]
+		public void TestResharperDisableRestore()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod (int foo)
+	{
+//Resharper disable RedundantBlockInDifferentBranches
+		if (foo > 5)
+			return 2;
+		else
+			return 5;
+//Resharper restore RedundantBlockInDifferentBranches
+	}
+}";
+			Test<RedundantBlockInDifferentBranchesIssue>(input, 0);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantBoolCompareIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantBoolCompareIssueTests.cs
new file mode 100644
index 0000000000..b572efc049
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantBoolCompareIssueTests.cs
@@ -0,0 +1,118 @@
+// 
+// CompareBooleanWithTrueOrFalseIssueTests.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantBoolCompareIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void Test ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod (bool x)
+	{
+		bool y;
+		y = x == true;
+		y = x == false;
+		y = x != false;
+		y = x != true;
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void TestMethod (bool x)
+	{
+		bool y;
+		y = x;
+		y = !x;
+		y = x;
+		y = !x;
+	}
+}";
+			Test<RedundantBoolCompareIssue> (input, 4, output);
+		}
+
+		[Test]
+		public void TestInsertParentheses ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		bool y = 2 > 1 == false;
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		bool y = !(2 > 1);
+	}
+}";
+			Test<RedundantBoolCompareIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestInvalid ()
+		{
+			TestWrongContext<RedundantBoolCompareIssue> (@"
+class TestClass
+{
+	void TestMethod (bool? x)
+	{
+		bool y;
+		y = x == true;
+		y = x == false;
+		y = x != false;
+		y = x != true;
+	}
+}");
+		}
+
+		[Test]
+		public void TestNullable ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod (bool? x)
+	{
+		var y = x == false;
+	}
+}";
+			Test<RedundantBoolCompareIssue> (input, 0);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCaseLabelIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCaseLabelIssueTests.cs
index 9db0f522be..b3c33fbbc9 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCaseLabelIssueTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCaseLabelIssueTests.cs
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+using System;
 using ICSharpCode.NRefactory.CSharp.Refactoring;
 using NUnit.Framework;
 
@@ -50,6 +51,36 @@ class TestClass
 }";
 			var output = @"
 class TestClass
+{
+	void TestMethod (int i)
+	{
+		switch (i) {
+			default:
+				break;
+		}
+	}
+}";
+			Test<RedundantCaseLabelIssue> (input, 2, output);
+		}
+
+
+		[Test]
+		public void TestLabelAfterDefault ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		switch (i) {
+			default:
+			case 1:
+				break;
+		}
+	}
+}";
+			var output = @"
+class TestClass
 {
 	void TestMethod (int i)
 	{
@@ -61,5 +92,25 @@ class TestClass
 }";
 			Test<RedundantCaseLabelIssue> (input, 1, output);
 		}
+
+
+        [Test]
+        public void TestDisable()
+        {
+            var input = @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		switch (i) {
+// ReSharper disable once RedundantCaseLabel
+			case 1:
+			default:
+				break;
+		}
 	}
+}";
+            TestWrongContext<RedundantCaseLabelIssue>(input);
+        }
+    }
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCastIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCastIssueTests.cs
new file mode 100644
index 0000000000..53ffebc6c9
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCastIssueTests.cs
@@ -0,0 +1,323 @@
+// 
+// RedundantCastIssueTests.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantCastIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSameType ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int i = 0;
+		var i2 = ((int)i);
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int i = 0;
+		var i2 = i;
+	}
+}";
+			Test<RedundantCastIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestInvocation ()
+		{
+			var input = @"
+class TestClass
+{
+	void Test (object obj)
+	{
+	}
+	void TestMethod (object obj)
+	{
+		Test ((int)obj);
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void Test (object obj)
+	{
+	}
+	void TestMethod (object obj)
+	{
+		Test (obj);
+	}
+}";
+			Test<RedundantCastIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestLambdaInvocation ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod (object obj)
+	{
+		System.Action<object> a;
+		a ((int)obj);
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void TestMethod (object obj)
+	{
+		System.Action<object> a;
+		a (obj);
+	}
+}";
+			Test<RedundantCastIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestMember ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod (object obj)
+	{
+		var str = (obj as TestClass).ToString ();
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void TestMethod (object obj)
+	{
+		var str = obj.ToString ();
+	}
+}";
+			Test<RedundantCastIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestNoIssue ()
+		{
+			var input = @"
+class TestClass
+{
+	void Test (int k) { }
+	void TestMethod (object obj)
+	{
+		int i = (int)obj + 1;
+		Test ((long) obj);
+		(obj as TestClass).Test (0);
+	}
+}";
+			Test<RedundantCastIssue> (input, 0);
+		}
+
+		/// <summary>
+		/// Bug 7065 - "remove redundant type cast" false positive for explicit interface implementation
+		/// </summary>
+		[Test]
+		public void TestBug7065 ()
+		{
+			var input = @"
+using System;
+public class TestClass : IDisposable
+{
+	void IDisposable.Dispose()
+	{
+	}
+
+	void Foo()
+	{
+	    ((IDisposable)this).Dispose();
+	}
+}
+";
+			Test<RedundantCastIssue> (input, 0);
+		}
+
+		
+		/// <summary>
+		/// Bug 14081 - Incorrect redundant cast analysis with explicitly implemented interface member
+		/// </summary>
+		[Test]
+		public void TestBug14081 ()
+		{
+			var input = @"
+using System;
+using System.Collections.Generic;
+public class TestClass
+{
+	public IEnumerator<int> GetEnumerator ()
+	{
+		return ((IEnumerable<int>)new[] { 5 }).GetEnumerator ();
+	}
+}
+";
+			Test<RedundantCastIssue> (input, 0);
+		}
+
+
+		[Test]
+		public void TestConditionalOperator ()
+		{
+			TestWrongContext<RedundantCastIssue> (@"class A {} class B : A {} class C : A {}
+class TestClass
+{
+	void TestMethod (object obj)
+	{	
+		var a = obj != null ? (A)new A () : new B ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestRedundantConditionalOperator ()
+		{
+			Test<RedundantCastIssue> (@"class A {} class B : A {} class C : A {}
+class TestClass
+{
+	void TestMethod (object obj)
+	{	
+		var a = obj != null ? (A)new A () : new A ();
+	}
+}", @"class A {} class B : A {} class C : A {}
+class TestClass
+{
+	void TestMethod (object obj)
+	{	
+		var a = obj != null ? new A () : new A ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestNullCoalesingOperator ()
+		{
+			TestWrongContext<RedundantCastIssue> (@"class A {} class B : A {} class C : A {}
+class TestClass
+{
+	void TestMethod (A obj)
+	{	
+		var a = (A)obj ?? new B ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestRedundantNullCoalesingOperatior ()
+		{
+			Test<RedundantCastIssue> (@"class A {} class B : A {} class C : A {}
+class TestClass
+{
+	void TestMethod (A obj)
+	{	
+		var a = (A)obj ?? new A ();
+	}
+}", @"class A {} class B : A {} class C : A {}
+class TestClass
+{
+	void TestMethod (A obj)
+	{	
+		var a = obj ?? new A ();
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestNonRedundantDoubleCast ()
+		{
+			TestWrongContext<RedundantCastIssue> (@"
+class Foo
+{
+	void Bar ()
+	{	
+		float f = 5.6f;
+		double d = 5.6f;
+		int i = d + (int)f;
+	}
+}");
+		}
+
+		[Test]
+		public void TestNonRedundantFloatCast ()
+		{
+			TestWrongContext<RedundantCastIssue> (@"
+class Foo
+{
+	void Bar ()
+	{	
+		float f = 5.6f;
+		Console.WriteLine (""foo "" + (int)f);
+	}
+}");
+		}
+
+		[Test]
+		public void TestNonRedundantFloatCastCase2 ()
+		{
+			TestWrongContext<RedundantCastIssue> (@"
+using System;
+
+class Foo
+{
+	void Bar ()
+	{	
+		float f = 5.6f;
+		Console.WriteLine (""foo {0}"", (int)f);
+	}
+}");
+		}
+		
+		[Test, Ignore("https://github.com/icsharpcode/NRefactory/issues/118")]
+		public void TestNonRedundantCastDueToOverloading ()
+		{
+			TestWrongContext<RedundantCastIssue> (@"
+class Foo
+{
+	void F(string a) {}
+	void F(object a) {}
+
+	void Bar ()
+	{	
+		F((object)string.Empty);
+	}
+}");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCatchClauseIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCatchClauseIssueTests.cs
new file mode 100644
index 0000000000..15c5480370
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCatchClauseIssueTests.cs
@@ -0,0 +1,335 @@
+//
+// RedundantCatchIssueTests.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantCatchClauseIssueTests : InspectionActionTestBase
+	{
+		const string BaseInput = @"
+using System;
+class A
+{
+	void F()
+	{";
+
+
+        [Test]
+        public void TestDisable()
+        {
+            var input = BaseInput + @"
+// ReSharper disable once RedundantCatchClause
+		try {
+			F ();
+		} catch {
+			throw;
+		} finally {
+			Console.WriteLine (""Inside finally"");
+		}
+	}
+}";
+            TestWrongContext<RedundantCatchClauseIssue>(input);
+        }
+
+		[Test]
+		public void TestEmptyCatch()
+		{
+			var input = BaseInput + @"
+		try {
+			F ();
+		} catch (ArgumentOutOfRangeException aoore) {
+			Console.WriteLine (aoore);
+		} catch (ArgumentException) {
+			throw;
+		} catch {
+			throw;
+		}
+	}
+}";
+			TestRefactoringContext context;
+            var issues = GetIssues(new RedundantCatchClauseIssue(), input, out context);
+			Assert.AreEqual(2, issues.Count);
+			
+			CheckFix(context, issues, BaseInput + @"
+		try {
+			F ();
+		} catch (ArgumentOutOfRangeException aoore) {
+			Console.WriteLine (aoore);
+		}  
+	}
+}");
+		}
+		
+		[Test]
+		public void TestOnlyRedundantCatches()
+		{
+			var input = BaseInput + @"
+		try {
+			F ();
+			Console.WriteLine (""Inside try"");
+		} catch {
+			throw;
+		}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantCatchClauseIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			
+			CheckFix(context, issues, BaseInput + @"
+		F ();
+		Console.WriteLine (""Inside try"");
+	}
+}");
+		}
+		
+		[Test]
+		public void AddsBlockIfNeccessary()
+		{
+			var input = BaseInput + @"
+		if (true)
+			try {
+				F ();
+				Console.WriteLine (""Inside try"");
+			} catch {
+				throw;
+			}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantCatchClauseIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			
+			CheckFix(context, issues, BaseInput + @"
+		if (true) {
+			F ();
+			Console.WriteLine (""Inside try"");
+		}
+	}
+}");
+		}
+
+		
+		[Test]
+		public void AddsBlockIfNeccessaryOnEmptyTryBlock()
+		{
+			var input = BaseInput + @"
+		if (true)
+			try {
+			} catch {
+				throw;
+			}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantCatchClauseIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			
+			CheckFix(context, issues, BaseInput + @"
+		if (true) {
+		}
+	}
+}");
+		}
+		
+		[Test]
+		public void EmptyTryCatchSkeleton()
+		{
+			var input = BaseInput + @"
+		try {
+		} catch {
+		}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantCatchClauseIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void DoesNotAddBlockIfUnneccessary()
+		{
+			var input = BaseInput + @"
+		if (true)
+			try {
+				F ();
+			} catch {
+				throw;
+			}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantCatchClauseIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			
+			CheckFix(context, issues, BaseInput + @"
+		if (true)
+			F ();
+	}
+}");
+		}
+		
+		[Test]
+		public void NoIssuesWhenMissingCatch()
+		{
+			var input = BaseInput + @"
+		try {
+			F ();
+		}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantCatchClauseIssue(), input, out context, true);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void TestEmptyCatchWithFinally()
+		{
+			var input = BaseInput + @"
+		try {
+			F ();
+		} catch {
+			throw;
+		} finally {
+			Console.WriteLine (""Inside finally"");
+		}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantCatchClauseIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			
+			CheckFix(context, issues, BaseInput + @"
+		try {
+			F ();
+		}  finally {
+			Console.WriteLine (""Inside finally"");
+		}
+	}
+}");
+		}
+
+		/// <summary>
+		/// Bug 12273 - Incorrect redundant catch warning
+		/// </summary>
+		[Test]
+		public void TestBug12273()
+		{
+			var input = BaseInput + @"
+		try {
+			F ();
+		} catch (ArgumentOutOfRangeException) {
+			throw;
+		} catch (Exception e) {
+			Console.WriteLine (e);
+		}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantCatchClauseIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+
+			input = BaseInput + @"
+		try {
+			F ();
+		} catch (ArgumentOutOfRangeException) {
+			throw;
+		} catch (Exception e) {
+			throw;
+		}
+	}
+}";
+			issues = GetIssues(new RedundantCatchClauseIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			CheckFix(context, issues, BaseInput + @"
+		F ();
+	}
+}");
+
+		}
+
+		/// <summary>
+		/// Bug 12273 - Incorrect redundant catch warning
+		/// </summary>
+		[Test]
+		public void TestBug12273Case2()
+		{
+			var input = BaseInput + @"
+		try {
+			F ();
+		} catch (ArgumentOutOfRangeException) {
+			throw;
+		} catch {
+			Console.WriteLine (""hello world"");
+		}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantCatchClauseIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+
+			input = BaseInput + @"
+		try {
+			F ();
+		} catch (ArgumentOutOfRangeException) {
+			throw;
+		} catch {
+			throw;
+		}
+	}
+}";
+			issues = GetIssues(new RedundantCatchClauseIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+		}
+	
+		/// <summary>
+		/// Bug 14451 - False positive of "Redundant catch clause" 
+		/// </summary>
+		[Test]
+		public void TestBugBug14451()
+		{
+			TestWrongContext<RedundantCatchClauseIssue>(@"
+using System;
+public class Test {
+    public void Foo() {
+        try {
+            Foo();
+        }
+        catch (Exception ex) {
+            throw new Exception(""Some additional information: "" + ex.Message, ex);
+        }
+    }
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCatchTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCatchTests.cs
deleted file mode 100644
index afae8f7399..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCatchTests.cs
+++ /dev/null
@@ -1,296 +0,0 @@
-//
-// RedundantCatchTests.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class RedundantCatchTests : InspectionActionTestBase
-	{
-		const string BaseInput = @"
-using System;
-class A
-{
-	void F()
-	{";
-
-		[Test]
-		public void TestEmptyCatch()
-		{
-			var input = BaseInput + @"
-		try {
-			F ();
-		} catch (ArgumentOutOfRangeException aoore) {
-			Console.WriteLine (aoore);
-		} catch (ArgumentException) {
-			throw;
-		} catch {
-			throw;
-		}
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantCatchIssue(), input, out context);
-			Assert.AreEqual(2, issues.Count);
-			
-			CheckFix(context, issues, BaseInput + @"
-		try {
-			F ();
-		} catch (ArgumentOutOfRangeException aoore) {
-			Console.WriteLine (aoore);
-		}  
-	}
-}");
-		}
-		
-		[Test]
-		public void TestOnlyRedundantCatches()
-		{
-			var input = BaseInput + @"
-		try {
-			F ();
-			Console.WriteLine (""Inside try"");
-		} catch {
-			throw;
-		}
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantCatchIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			
-			CheckFix(context, issues, BaseInput + @"
-		F ();
-		Console.WriteLine (""Inside try"");
-	}
-}");
-		}
-		
-		[Test]
-		public void AddsBlockIfNeccessary()
-		{
-			var input = BaseInput + @"
-		if (true)
-			try {
-				F ();
-				Console.WriteLine (""Inside try"");
-			} catch {
-				throw;
-			}
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantCatchIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			
-			CheckFix(context, issues, BaseInput + @"
-		if (true) {
-			F ();
-			Console.WriteLine (""Inside try"");
-		}
-	}
-}");
-		}
-
-		
-		[Test]
-		public void AddsBlockIfNeccessaryOnEmptyTryBlock()
-		{
-			var input = BaseInput + @"
-		if (true)
-			try {
-			} catch {
-				throw;
-			}
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantCatchIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			
-			CheckFix(context, issues, BaseInput + @"
-		if (true) {
-		}
-	}
-}");
-		}
-		
-		[Test]
-		public void EmptyTryCatchSkeleton()
-		{
-			var input = BaseInput + @"
-		try {
-		} catch {
-		}
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantCatchIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void DoesNotAddBlockIfUnneccessary()
-		{
-			var input = BaseInput + @"
-		if (true)
-			try {
-				F ();
-			} catch {
-				throw;
-			}
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantCatchIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			
-			CheckFix(context, issues, BaseInput + @"
-		if (true)
-			F ();
-	}
-}");
-		}
-		
-		[Test]
-		public void NoIssuesWhenMissingCatch()
-		{
-			var input = BaseInput + @"
-		try {
-			F ();
-		}
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantCatchIssue(), input, out context, true);
-			Assert.AreEqual(0, issues.Count);
-		}
-
-		[Test]
-		public void TestEmptyCatchWithFinally()
-		{
-			var input = BaseInput + @"
-		try {
-			F ();
-		} catch {
-			throw;
-		} finally {
-			Console.WriteLine (""Inside finally"");
-		}
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantCatchIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			
-			CheckFix(context, issues, BaseInput + @"
-		try {
-			F ();
-		}  finally {
-			Console.WriteLine (""Inside finally"");
-		}
-	}
-}");
-		}
-
-		/// <summary>
-		/// Bug 12273 - Incorrect redundant catch warning
-		/// </summary>
-		[Test]
-		public void TestBug12273()
-		{
-			var input = BaseInput + @"
-		try {
-			F ();
-		} catch (ArgumentOutOfRangeException) {
-			throw;
-		} catch (Exception e) {
-			Console.WriteLine (e);
-		}
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantCatchIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-
-			input = BaseInput + @"
-		try {
-			F ();
-		} catch (ArgumentOutOfRangeException) {
-			throw;
-		} catch (Exception e) {
-			throw;
-		}
-	}
-}";
-			issues = GetIssues(new RedundantCatchIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			CheckFix(context, issues, BaseInput + @"
-		F ();
-	}
-}");
-
-		}
-
-		/// <summary>
-		/// Bug 12273 - Incorrect redundant catch warning
-		/// </summary>
-		[Test]
-		public void TestBug12273Case2()
-		{
-			var input = BaseInput + @"
-		try {
-			F ();
-		} catch (ArgumentOutOfRangeException) {
-			throw;
-		} catch {
-			Console.WriteLine (""hello world"");
-		}
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantCatchIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-
-			input = BaseInput + @"
-		try {
-			F ();
-		} catch (ArgumentOutOfRangeException) {
-			throw;
-		} catch {
-			throw;
-		}
-	}
-}";
-			issues = GetIssues(new RedundantCatchIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCheckBeforeAssignmentTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCheckBeforeAssignmentTests.cs
new file mode 100644
index 0000000000..b50c3f0ae2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCheckBeforeAssignmentTests.cs
@@ -0,0 +1,167 @@
+// 
+// RedundantCheckBeforeAssignmentTests.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantCheckBeforeAssignmentTests : InspectionActionTestBase
+	{
+		
+		[Test]
+		public void TestInspectorCase1()
+		{
+			Test<RedundantCheckBeforeAssignmentIssue>(@"using System;
+class baseClass
+{
+	public void method()
+	{
+		int q = 1;
+		if (q != 1) {
+			q = 1;
+		}
+	}
+}
+", @"using System;
+class baseClass
+{
+	public void method()
+	{
+		int q = 1;
+		q = 1;
+	}
+}
+");
+		}
+		
+		[Test]
+		public void TestInspectorCase2()
+		{
+			var input = @"using System;
+namespace resharper_test
+{
+	public class baseClass
+	{
+		public void method()
+		{
+			int q = 1;
+			if (q != 1)
+				q = 1;
+		}
+	}
+}
+";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantCheckBeforeAssignmentIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+		}
+		
+		[Test]
+		public void TestInspectorCase3()
+		{
+			var input = @"using System;
+namespace resharper_test
+{
+	public class baseClass
+	{
+		public void method()
+		{
+			int q = 1;
+			if (1+0 != q)
+			{
+				q = 1 + 0;
+			}
+			else
+			{}
+		}
+	}
+}
+";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantCheckBeforeAssignmentIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void TestInspectorCase4()
+		{
+			var input = @"using System;
+namespace resharper_test
+{
+	public class baseClass
+	{
+		public void method()
+		{
+			int q = 1;
+			if (1+0 != q)
+			{
+				q = 1 + 0;
+			}
+			else if(true)
+			{}
+		}
+	}
+}
+";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantCheckBeforeAssignmentIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void TestResharperDisableRestore()
+		{
+			var input = @"using System;
+namespace resharper_test
+{
+	public class baseClass
+	{
+		public void method()
+		{
+			int q = 1;
+//Resharper disable RedundantCheckBeforeAssignment
+			if (q != 1)
+			{
+				q = 1;
+			}
+//Resharper restore RedundantCheckBeforeAssignment
+		}
+	}
+}
+";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantCheckBeforeAssignmentIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCommaInArrayInitializerIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCommaInArrayInitializerIssueTests.cs
new file mode 100644
index 0000000000..4026527597
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantCommaInArrayInitializerIssueTests.cs
@@ -0,0 +1,122 @@
+// 
+// RedundantCommaInArrayInitializerIssueTests.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantCommaInArrayInitializerIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void Test ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		var a = new int[] { 1, 2, };
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		var a = new int[] { 1, 2 };
+	}
+}";
+			Test<RedundantCommaInArrayInitializerIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestArrayInitializerDescription ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		var a = new int[] { 1, 2, };
+	}
+}";
+			TestRefactoringContext ctx;
+			var issues = GetIssues (new RedundantCommaInArrayInitializerIssue (), input, out ctx);
+			Assert.AreEqual (issues.Count, 1);
+		}
+
+		[Test]
+		public void TestObjectInitializerDescription ()
+		{
+			var input = @"
+class TestClass
+{
+	int Prop { get; set; }
+	void TestMethod ()
+	{
+		var a = new TestClass { Prop = 1, };
+	}
+}";
+			TestRefactoringContext ctx;
+			var issues = GetIssues (new RedundantCommaInArrayInitializerIssue (), input, out ctx);
+			Assert.AreEqual (issues.Count, 1);
+		}
+
+        [Test]
+        public void TestCollectionInitializerDescrition()
+        {
+            var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		var a = new TestClass { 1, };
+	}
+}";
+            TestRefactoringContext ctx;
+            var issues = GetIssues(new RedundantCommaInArrayInitializerIssue(), input, out ctx);
+            Assert.AreEqual(issues.Count, 1);
+        }
+
+        [Test]
+        public void TestDisable()
+        {
+            var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{            
+// ReSharper disable once RedundantCommaInArrayInitializer
+		var a = new TestClass { 1, };
+	}
+}";
+            TestWrongContext<RedundantCommaInArrayInitializerIssue>(input);
+        }
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantComparisonWithNullIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantComparisonWithNullIssueTests.cs
new file mode 100644
index 0000000000..87bdfd6e5a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantComparisonWithNullIssueTests.cs
@@ -0,0 +1,163 @@
+// 
+// RedundantComparisonWithNullIssueTests.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantComparisonWithNullIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestInspectorCase1()
+		{
+			var input = @"using System;class Test {public void test(){int a = 0;if(a is int && a != null){a = 1;}}}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantComparisonWithNullIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+
+			
+			CheckFix(context, issues, @"using System;class Test {public void test(){int a = 0;
+		if (a is int) {
+			a = 1;
+		}}}");
+		}
+
+		[Test]
+		public void TestResharperDisable()
+		{
+			var input = @"using System;
+class Test {
+	public void test(){
+	int a = 0;
+	//Resharper disable RedundantComparisonWithNull
+	if(a is int && a != null)
+	{a = 1;}
+	//Resharper restore RedundantComparisonWithNull
+	}	
+	}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantComparisonWithNullIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void TestInspectorCase2()
+		{
+			var input = @"using System;class Test {public void test(){int a = 0;while(a != null && a is int){a = 1;}}}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantComparisonWithNullIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			CheckFix(context, issues, @"using System;class Test {public void test(){int a = 0;
+		while (a is int) {
+			a = 1;
+		}}}");
+		}
+
+		[Test]
+		public void TestCaseWithFullParens()
+		{
+			var input = 
+				@"using System;
+class TestClass
+{
+	public void Test(object o)
+	{
+		if (!((o is int) && (o != null))) {
+		}
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantComparisonWithNullIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			CheckFix(context, issues, @"using System;
+class TestClass
+{
+	public void Test(object o)
+	{
+		if (!(o is int)) {
+		}
+	}
+}");
+		}
+
+        [Test]
+        public void TestDisable()
+        {
+            var input =
+                @"using System;
+class TestClass
+{
+	public void Test(object o)
+	{
+// ReSharper disable once RedundantComparisonWithNull
+		if (!((o is int) && (o != null))) {
+		}
+	}
+}";
+
+            TestRefactoringContext context;
+            var issues = GetIssues(new RedundantComparisonWithNullIssue(), input, out context);
+            Assert.AreEqual(0, issues.Count);
+        }
+
+
+		[Ignore("Extended version")]
+		[Test]
+		public void TestNegatedCase()
+		{
+			var input = 
+				@"using System;
+class TestClass
+{
+	public void Test(object o)
+	{
+		if (null == o || !(o is int)) {
+		}
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantComparisonWithNullIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			CheckFix(context, issues, @"using System;
+class TestClass
+{
+	public void Test(object o)
+	{
+		if (!(o is int)) {
+		}
+	}
+}");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantConstructorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantConstructorTests.cs
deleted file mode 100755
index 36ee8beb29..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantConstructorTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// 
-// RedundantConstructorTest.cs
-//  
-// Author:
-//       Ji Kun <jikun.nus@gmail.com>
-// 
-// Copyright (c) 2013 Ji Kun
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class RedundantConstructorTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestInspectorCase1()
-		{
-			var input = @"using System;class Test {private int member; public Test(){}}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantConstructorIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-
-			CheckFix(context, issues, @"using System;class Test {private int member; }");
-		}
-
-		[Test]
-		public void TestInspectorCase2()
-		{
-			var input = @"using System;class Test {private int member;public Test(){} static Test(){}}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantConstructorIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			
-			CheckFix(context, issues, @"using System;class Test {private int member; static Test(){}}");
-		}
-
-		[Test]
-		public void TestResharperDisable()
-		{
-			var input = @"using System;
-	//Resharper disable RedundantConstructor
-class Test {
-	public Test(){
-	}
-	//Resharper restore RedundantConstructor	
-	}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantConstructorIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-
-		[Test]
-		public void TestNegateCase1()
-		{
-			var input = @"using System;class Test {public Test(){;}}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantConstructorIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-
-		[Test]
-		public void TestNegateCase2()
-		{
-			var input = @"using System;class Test {public Test(){;} private Test(){}}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantConstructorIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantDefaultFieldInitializerIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantDefaultFieldInitializerIssueTests.cs
new file mode 100644
index 0000000000..13102b5018
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantDefaultFieldInitializerIssueTests.cs
@@ -0,0 +1,204 @@
+// 
+// RedundantDefaultFieldInitializerIssueTests.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantDefaultFieldInitializerIssueTests : InspectionActionTestBase
+	{
+
+	    [Test]
+		public void TestRedundantIntInitializer ()
+		{
+			var input = @"
+class TestClass
+{
+	int i = 0;
+	long l = 0L;
+}";
+			var output = @"
+class TestClass
+{
+	int i;
+	long l;
+}";
+			Test<RedundantDefaultFieldInitializerIssue> (input, 2, output);
+		}
+
+		[Test]
+		public void TestRedundantFloatInitializer ()
+		{
+			var input = @"
+class TestClass
+{
+	double d = 0;
+	double d2 = 0.0;
+}";
+			var output = @"
+class TestClass
+{
+	double d;
+	double d2;
+}";
+			Test<RedundantDefaultFieldInitializerIssue> (input, 2, output);
+		}
+
+		[Test]
+		public void TestRedundantBooleanInitializer ()
+		{
+			var input = @"
+class TestClass
+{
+	bool x = false;
+}";
+			var output = @"
+class TestClass
+{
+	bool x;
+}";
+			Test<RedundantDefaultFieldInitializerIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestRedundantCharInitializer ()
+		{
+			var input = @"
+class TestClass
+{
+	char ch = '\0';
+}";
+			var output = @"
+class TestClass
+{
+	char ch;
+}";
+			Test<RedundantDefaultFieldInitializerIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestRedundantReferenceTypeInitializer ()
+		{
+			var input = @"
+class TestClass
+{
+	string str = null;
+}";
+			var output = @"
+class TestClass
+{
+	string str;
+}";
+			Test<RedundantDefaultFieldInitializerIssue> (input, 1, output);
+		}
+
+		[Test]
+		public void TestRedundantDynamicInitializer ()
+		{
+			var input = @"
+class TestClass
+{
+	dynamic x = null, y = null;
+}";
+			var output = @"
+class TestClass
+{
+	dynamic x, y;
+}";
+			Test<RedundantDefaultFieldInitializerIssue> (input, 2, output);
+		}
+
+		[Test]
+		public void TestRedundantStructInitializer ()
+		{
+			var input = @"
+struct TestStruct
+{
+}
+class TestClass
+{
+	TestStruct x = new TestStruct ();
+}";
+			var output = @"
+struct TestStruct
+{
+}
+class TestClass
+{
+	TestStruct x;
+}";
+			Test<RedundantDefaultFieldInitializerIssue> (input, 1, output);
+		}
+		
+		[Test]
+		public void TestRedundantNullableInitializer ()
+		{
+			var input = @"
+class TestClass
+{
+	int? i = null;
+}";
+			var output = @"
+class TestClass
+{
+	int? i;
+}";
+			Test<RedundantDefaultFieldInitializerIssue> (input, 1, output);
+		}
+		
+		
+		[Test]
+		public void TestRedundantConstantBug ()
+		{
+			Test<RedundantDefaultFieldInitializerIssue> (@"class Test { const int foo = 0;  }", 0);
+		}
+
+		[Test]
+		public void TestRedundantReadOnlyBug ()
+		{
+			Test<RedundantDefaultFieldInitializerIssue> (@"struct Test { static readonly Test foo = new Test ();  }", 0);
+		}
+
+		[Test]
+        public void TestDisable()
+        {
+            var input = @"
+class TestClass
+{
+    // ReSharper disable once RedundantDefaultFieldInitializer
+	int i = 0;
+}";
+            TestWrongContext<RedundantDefaultFieldInitializerIssue>(input);
+        }
+
+
+
+
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantDelegateCreationIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantDelegateCreationIssueTests.cs
new file mode 100644
index 0000000000..b1727a35da
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantDelegateCreationIssueTests.cs
@@ -0,0 +1,130 @@
+//
+// RedundantDelegateCreationIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantDelegateCreationIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestAdd ()
+		{
+			Test<RedundantDelegateCreationIssue>(@"
+using System;
+
+public class FooBase
+{
+	public event EventHandler<EventArgs> Changed;
+
+	FooBase()
+	{
+		Changed += new EventHandler<EventArgs>(HandleChanged);
+	}
+
+	void HandleChanged(object sender, EventArgs e)
+	{
+	}
+}", @"
+using System;
+
+public class FooBase
+{
+	public event EventHandler<EventArgs> Changed;
+
+	FooBase()
+	{
+		Changed += HandleChanged;
+	}
+
+	void HandleChanged(object sender, EventArgs e)
+	{
+	}
+}");
+		}
+
+		[Test]
+		public void TestRemove ()
+		{
+			Test<RedundantDelegateCreationIssue>(@"
+using System;
+
+public class FooBase
+{
+	public event EventHandler<EventArgs> Changed;
+
+	FooBase()
+	{
+		Changed -= new EventHandler<EventArgs>(HandleChanged);
+	}
+
+	void HandleChanged(object sender, EventArgs e)
+	{
+	}
+}", @"
+using System;
+
+public class FooBase
+{
+	public event EventHandler<EventArgs> Changed;
+
+	FooBase()
+	{
+		Changed -= HandleChanged;
+	}
+
+	void HandleChanged(object sender, EventArgs e)
+	{
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<RedundantDelegateCreationIssue>(@"
+using System;
+
+public class FooBase
+{
+	public event EventHandler<EventArgs> Changed;
+
+	FooBase()
+	{
+		// ReSharper disable once RedundantDelegateCreation
+		Changed += new EventHandler<EventArgs>(HandleChanged);
+	}
+
+	void HandleChanged(object sender, EventArgs e)
+	{
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantElseIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantElseIssueTests.cs
deleted file mode 100644
index 861aa4ac47..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantElseIssueTests.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-// 
-// RedundantElseIssueTests.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class RedundantElseIssueTests : InspectionActionTestBase
-	{
-
-		[Test]
-		public void TestReturn ()
-		{
-			var input = @"
-class TestClass
-{
-	int TestMethod (int i)
-	{
-		if (i > 0)
-			return 1;
-		else
-			return 0;
-	}
-}";
-			var output = @"
-class TestClass
-{
-	int TestMethod (int i)
-	{
-		if (i > 0)
-			return 1;
-		return 0;
-	}
-}";
-			Test<RedundantElseIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestBreakLoop ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		int k = 0;
-		for (int i = 0; i < 10; i++) {
-			if (i > 5)
-				break;
-			else
-				k++;
-		}
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		int k = 0;
-		for (int i = 0; i < 10; i++) {
-			if (i > 5)
-				break;
-			k++;
-		}
-	}
-}";
-			Test<RedundantElseIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestContinueLoop ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		int k = 0;
-		for (int i = 0; i < 10; i++) {
-			if (i > 5)
-				continue;
-			else
-				k++;
-		}
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		int k = 0;
-		for (int i = 0; i < 10; i++) {
-			if (i > 5)
-				continue;
-			k++;
-		}
-	}
-}";
-			Test<RedundantElseIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestBlockStatement()
-		{
-			var input = @"
-class TestClass
-{
-	int TestMethod (int i)
-	{
-		if (i > 0) {
-			return 1;
-		} else {
-			return 0;
-		}
-	}
-}";
-			var output = @"
-class TestClass
-{
-	int TestMethod (int i)
-	{
-		if (i > 0) {
-			return 1;
-		}
-		return 0;
-	}
-}";
-			Test<RedundantElseIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestEmptyFalseBlock ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		if (i > 0)
-			a = 1;
-		else { }
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		if (i > 0)
-			a = 1;
-	}
-}";
-			Test<RedundantElseIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestNecessaryElse ()
-		{
-
-			var input = @"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		if (i > 0)
-			a = 1;
-		else
-			a = 0;
-	}
-}";
-			Test<RedundantElseIssue> (input, 0);
-		}
-
-		[Test]
-		public void TestNecessaryElseCase2 ()
-		{
-
-			var input = @"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		int a;
-		while (true) {
-			if (i > 0) {
-				a = 1;
-			} else if (i < 0) {
-				a = 0;
-				break;
-			} else {
-				break;
-			}
-		}
-	}
-}";
-			Test<RedundantElseIssue> (input, 0);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantEmptyDefaultSwitchBranchIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantEmptyDefaultSwitchBranchIssueTests.cs
new file mode 100644
index 0000000000..3138deba6c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantEmptyDefaultSwitchBranchIssueTests.cs
@@ -0,0 +1,110 @@
+//
+// RedundantEmptyDefaultSwitchBranchIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantEmptyDefaultSwitchBranchIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestDefaultRedundantCase ()
+		{
+			Test<RedundantEmptyDefaultSwitchBranchIssue>(@"
+class Test
+{
+	void TestMethod (int i = 0)
+	{
+		switch (i) {
+		case 0:
+			System.Console.WriteLine();
+			break;
+		default:
+			break;
+		}
+	}
+}", @"
+class Test
+{
+	void TestMethod (int i = 0)
+	{
+		switch (i) {
+		case 0:
+			System.Console.WriteLine();
+			break;
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestMinimal ()
+		{
+			Test<RedundantEmptyDefaultSwitchBranchIssue>(@"
+class Test
+{
+	void TestMethod (int i = 0)
+	{
+		switch (i) {
+		default:
+			break;
+		}
+	}
+}", @"
+class Test
+{
+	void TestMethod (int i = 0)
+	{
+		switch (i) {
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<RedundantEmptyDefaultSwitchBranchIssue>(@"
+class Test
+{
+	void TestMethod (int i = 0)
+	{
+		switch (i) {
+		case 0:
+			System.Console.WriteLine();
+			break;
+		// ReSharper disable once RedundantEmptyDefaultSwitchBranch
+		default:
+			break;
+		}
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantEmptyFinallyBlockIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantEmptyFinallyBlockIssueTests.cs
new file mode 100644
index 0000000000..caa198abd3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantEmptyFinallyBlockIssueTests.cs
@@ -0,0 +1,139 @@
+//
+// RedundantEmptyFinallyBlockIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantEmptyFinallyBlockIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestRedundantTry()
+		{
+			Test<RedundantEmptyFinallyBlockIssue>(@"
+using System;
+class Test
+{
+	static void Main (string[] args)
+	{
+		try {
+			Console.WriteLine (""1"");
+			Console.WriteLine (""2"");
+		} finally {
+		}
+	}
+}
+", @"
+using System;
+class Test
+{
+	static void Main (string[] args)
+	{
+		Console.WriteLine (""1"");
+		Console.WriteLine (""2"");
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestSimpleCase()
+		{
+			Test<RedundantEmptyFinallyBlockIssue>(@"
+using System;
+class Test
+{
+	static void Main (string[] args)
+	{
+		try {
+			Console.WriteLine (""1"");
+			Console.WriteLine (""2"");
+		} catch (Exception) {
+		} finally {
+		}
+	}
+}
+", @"
+using System;
+class Test
+{
+	static void Main (string[] args)
+	{
+		try {
+			Console.WriteLine (""1"");
+			Console.WriteLine (""2"");
+		} catch (Exception) {
+		}  
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestInvalid()
+		{
+			TestWrongContext<RedundantEmptyFinallyBlockIssue>(@"
+using System;
+class Test
+{
+	static void Main(string[] args)
+	{
+		try {
+			Console.WriteLine(""1"");
+		} finally {
+			Console.WriteLine(""2"");
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<RedundantEmptyFinallyBlockIssue>(@"
+using System;
+class Test
+{
+	static void Main(string[] args)
+	{
+		try {
+			Console.WriteLine(""1"");
+			Console.WriteLine(""2"");
+		}
+		// ReSharper disable once RedundantEmptyFinallyBlock
+ 		finally {
+		}
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantEnumerableCastCallIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantEnumerableCastCallIssueTests.cs
new file mode 100644
index 0000000000..0c1794a641
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantEnumerableCastCallIssueTests.cs
@@ -0,0 +1,197 @@
+//
+// RedundantEnumerableCastCallIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantEnumerableCastCallIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestRedundantCast()
+		{
+			Test<RedundantEnumerableCastCallIssue>(@"
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+class Test
+{
+	static void Main (IEnumerable<string> args)
+	{
+		var a = args.Cast<string> ();
+	}
+}
+", @"
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+class Test
+{
+	static void Main (IEnumerable<string> args)
+	{
+		var a = args;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestRedundantCastCase2()
+		{
+			Test<RedundantEnumerableCastCallIssue>(@"
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+class Test
+{
+	static void Main (string[] args)
+	{
+		var a = args.Cast<string> ();
+	}
+}
+", @"
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+class Test
+{
+	static void Main (string[] args)
+	{
+		var a = args;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestRedundantOfType()
+		{
+			Test<RedundantEnumerableCastCallIssue>(@"
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+class Test
+{
+	static void Main (IEnumerable<string> args)
+	{
+		var a = args.OfType<string> ();
+	}
+}
+", @"
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+class Test
+{
+	static void Main (IEnumerable<string> args)
+	{
+		var a = args.Where (i => i != null);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestRedundantOfTypeResolution2()
+		{
+			Test<RedundantEnumerableCastCallIssue>(@"
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+class Test
+{
+	static void Main (IEnumerable<string> args)
+	{
+		var a = args.OfType<string> ();
+	}
+}
+", @"
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+class Test
+{
+	static void Main (IEnumerable<string> args)
+	{
+		var a = args;
+	}
+}
+", 1);
+		}
+
+
+		[Test]
+		public void TestInvalid()
+		{
+			TestWrongContext<RedundantEnumerableCastCallIssue>(@"
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+class Test
+{
+	static void Main (IEnumerable<string> args)
+	{
+		var a = args.Cast<object> ();
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<RedundantEnumerableCastCallIssue>(@"
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+class Test
+{
+	static void Main (IEnumerable<string> args)
+	{
+		// ReSharper disable once RedundantEnumerableCastCall
+		var a = args.Cast<string> ();
+	}
+}
+");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantExplicitArrayCreationIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantExplicitArrayCreationIssueTests.cs
new file mode 100644
index 0000000000..6d17014295
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantExplicitArrayCreationIssueTests.cs
@@ -0,0 +1,103 @@
+//
+// RedundantExplicitArrayCreationIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantExplicitArrayCreationIssueTests: InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase()
+		{
+			Test<RedundantExplicitArrayCreationIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		new int[] { 1, 2, 3 };
+	}
+}
+", @"
+class Test
+{
+	void Foo ()
+	{
+		new [] { 1, 2, 3 };
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestInvalid()
+		{
+			TestWrongContext<RedundantExplicitArrayCreationIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		new [] { 1, 2, 3 };
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestInvalidCase2()
+		{
+
+			TestWrongContext<RedundantExplicitArrayCreationIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		new long[] { 0, 1u, (byte)34 };
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<RedundantExplicitArrayCreationIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		// ReSharper disable once RedundantExplicitArrayCreation
+		new int[] { 1, 2, 3 };
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantExplicitArraySizeIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantExplicitArraySizeIssueTests.cs
new file mode 100644
index 0000000000..c2ab699f28
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantExplicitArraySizeIssueTests.cs
@@ -0,0 +1,116 @@
+//
+// RedundantExplicitArraySizeIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantExplicitArraySizeIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase()
+		{
+			Test<RedundantExplicitArraySizeIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		var foo = new int[3] { 1, 2, 3 };
+	}
+}
+", @"
+class Test
+{
+	void Foo ()
+	{
+		var foo = new int[] { 1, 2, 3 };
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestInvalidCase1()
+		{
+			TestWrongContext<RedundantExplicitArraySizeIssue>(@"
+class Test
+{
+	void Foo (int i)
+	{
+		var foo = new int[i] { 1, 2, 3 };
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestInvalidCase2()
+		{
+			TestWrongContext<RedundantExplicitArraySizeIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		var foo = new int[10];
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestInvalidCase3()
+		{
+			TestWrongContext<RedundantExplicitArraySizeIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		var foo = new int[0];
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<RedundantExplicitArraySizeIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		// ReSharper disable once RedundantExplicitArraySize
+		var foo = new int[3] { 1, 2, 3 };
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantExplicitNullableCreationIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantExplicitNullableCreationIssueTests.cs
new file mode 100644
index 0000000000..e79ebdc4e9
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantExplicitNullableCreationIssueTests.cs
@@ -0,0 +1,110 @@
+//
+// RedundantExplicitNullableCreationIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantExplicitNullableCreationIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestVariableCreation()
+		{
+			Test<RedundantExplicitNullableCreationIssue>(@"
+class FooBar
+{
+	void Test()
+	{
+		int? i = new int?(5);
+	}
+}
+", @"
+class FooBar
+{
+	void Test()
+	{
+		int? i = 5;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestLongForm()
+		{
+			Test<RedundantExplicitNullableCreationIssue>(@"
+class FooBar
+{
+	void Test()
+	{
+		int? i = new System.Nullable<int>(5);
+	}
+}
+", @"
+class FooBar
+{
+	void Test()
+	{
+		int? i = 5;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestInvalid()
+		{
+			TestWrongContext<RedundantExplicitNullableCreationIssue>(@"
+class FooBar
+{
+	void Test()
+	{
+		var i = new int?(5);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<RedundantExplicitNullableCreationIssue>(@"
+class FooBar
+{
+	void Test()
+	{
+		// ReSharper disable once RedundantExplicitNullableCreation
+		int? i = new int?(5);
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantExtendsListEntryIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantExtendsListEntryIssueTests.cs
new file mode 100644
index 0000000000..97530b8b12
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantExtendsListEntryIssueTests.cs
@@ -0,0 +1,222 @@
+// 
+// RedundantBaseTypeTests.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantExtendsListEntryIssueTests : InspectionActionTestBase
+	{
+		
+		[Test]
+		public void TestInspectorCase1()
+		{
+			var input = @"using System;
+
+namespace resharper_test
+{
+	public interface interf
+	{
+		void method();
+	}
+
+	public class baseClass:interf
+	{
+		public void method()
+		{
+			throw new NotImplementedException();
+		}
+	}
+
+	public partial class Foo: baseClass,interf
+	{
+	}
+	public partial class Foo 
+	{
+	}
+}
+";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantExtendsListEntryIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			CheckFix(context, issues, @"using System;
+
+namespace resharper_test
+{
+	public interface interf
+	{
+		void method();
+	}
+
+	public class baseClass:interf
+	{
+		public void method()
+		{
+			throw new NotImplementedException();
+		}
+	}
+
+	public partial class Foo: baseClass
+	{
+	}
+	public partial class Foo 
+	{
+	}
+}
+");
+		}
+		
+		[Test]
+		public void TestInspectorCase2()
+		{
+			var input = @"using System;
+
+namespace resharper_test
+{
+	public interface interf
+	{
+		void method();
+	}
+
+	public class baseClass:interf
+	{
+		public void method()
+		{
+			throw new NotImplementedException();
+		}
+	}
+
+	public partial class Foo: baseClass
+	{
+	}
+	public partial class Foo: baseClass
+	{
+	}
+}
+";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantExtendsListEntryIssue(), input, out context);
+			Assert.AreEqual(2, issues.Count);
+			CheckFix(context, issues, @"using System;
+
+namespace resharper_test
+{
+	public interface interf
+	{
+		void method();
+	}
+
+	public class baseClass:interf
+	{
+		public void method()
+		{
+			throw new NotImplementedException();
+		}
+	}
+
+	public partial class Foo 
+	{
+	}
+	public partial class Foo 
+	{
+	}
+}
+");
+		}
+		
+		[Test]
+		public void TestInspectorCase3()
+		{
+			var input = @"using System;
+
+namespace resharper_test
+{
+	public interface interf
+	{
+		void method();
+	}
+
+	public class baseClass:interf
+	{
+		public void method()
+		{
+			throw new NotImplementedException();
+		}
+	}
+
+	public class Foo: baseClass, interf
+	{
+		public void method()
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
+";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantExtendsListEntryIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void TestResharperDisableRestore()
+		{
+			var input = @"using System;
+
+namespace resharper_test
+{
+	public interface interf
+	{
+		void method();
+	}
+
+	public class baseClass:interf
+	{
+		public void method()
+		{
+			throw new NotImplementedException();
+		}
+	}
+//Resharper disable RedundantExtendsListEntry
+	public class Foo: baseClass, interf
+	{
+	}
+//Resharer restore RedundantExtendsListEntry
+}
+";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantExtendsListEntryIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantFieldInitializerIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantFieldInitializerIssueTests.cs
deleted file mode 100644
index 366691ed63..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantFieldInitializerIssueTests.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-// 
-// RedundantFieldInitializerIssueTests.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class RedundantFieldInitializerIssueTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestRedundantIntInitializer ()
-		{
-			var input = @"
-class TestClass
-{
-	int i = 0;
-	long l = 0L;
-}";
-			var output = @"
-class TestClass
-{
-	int i;
-	long l;
-}";
-			Test<RedundantFieldInitializerIssue> (input, 2, output);
-		}
-
-		[Test]
-		public void TestRedundantFloatInitializer ()
-		{
-			var input = @"
-class TestClass
-{
-	double d = 0;
-	double d2 = 0.0;
-}";
-			var output = @"
-class TestClass
-{
-	double d;
-	double d2;
-}";
-			Test<RedundantFieldInitializerIssue> (input, 2, output);
-		}
-
-		[Test]
-		public void TestRedundantBooleanInitializer ()
-		{
-			var input = @"
-class TestClass
-{
-	bool x = false;
-}";
-			var output = @"
-class TestClass
-{
-	bool x;
-}";
-			Test<RedundantFieldInitializerIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestRedundantCharInitializer ()
-		{
-			var input = @"
-class TestClass
-{
-	char ch = '\0';
-}";
-			var output = @"
-class TestClass
-{
-	char ch;
-}";
-			Test<RedundantFieldInitializerIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestRedundantReferenceTypeInitializer ()
-		{
-			var input = @"
-class TestClass
-{
-	string str = null;
-}";
-			var output = @"
-class TestClass
-{
-	string str;
-}";
-			Test<RedundantFieldInitializerIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestRedundantDynamicInitializer ()
-		{
-			var input = @"
-class TestClass
-{
-	dynamic x = null, y = null;
-}";
-			var output = @"
-class TestClass
-{
-	dynamic x, y;
-}";
-			Test<RedundantFieldInitializerIssue> (input, 2, output);
-		}
-
-		[Test]
-		public void TestRedundantStructInitializer ()
-		{
-			var input = @"
-struct TestStruct
-{
-}
-class TestClass
-{
-	TestStruct x = new TestStruct ();
-}";
-			var output = @"
-struct TestStruct
-{
-}
-class TestClass
-{
-	TestStruct x;
-}";
-			Test<RedundantFieldInitializerIssue> (input, 1, output);
-		}
-		
-		[Test]
-		public void TestRedundantNullableInitializer ()
-		{
-			var input = @"
-class TestClass
-{
-	int? i = null;
-}";
-			var output = @"
-class TestClass
-{
-	int? i;
-}";
-			Test<RedundantFieldInitializerIssue> (input, 1, output);
-		}
-		
-		
-		[Test]
-		public void TestRedundantConstantBug ()
-		{
-			Test<RedundantFieldInitializerIssue> (@"class Test { const int foo = 0;  }", 0);
-		}
-		
-
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantIfElseBlockIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantIfElseBlockIssueTests.cs
new file mode 100644
index 0000000000..54f46a9ad5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantIfElseBlockIssueTests.cs
@@ -0,0 +1,321 @@
+// 
+// RedundantIfElseBlockIssueTests.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantIfElseBlockIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestReturn()
+		{
+			var input = @"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		if (i > 0)
+			return 1;
+		else
+			return 0;
+	}
+}";
+			var output = @"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		if (i > 0)
+			return 1;
+		return 0;
+	}
+}";
+			Test<RedundantIfElseBlockIssue>(input, 1, output);
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			var input = @"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		if (i > 0)
+			return 1;
+// ReSharper disable once RedundantIfElseBlock
+		else
+			return 0;
+	}
+}";
+			TestWrongContext<RedundantIfElseBlockIssue>(input);
+		}
+
+		[Test]
+		public void TestBreakLoop()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int k = 0;
+		for (int i = 0; i < 10; i++) {
+			if (i > 5)
+				break;
+			else
+				k++;
+		}
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int k = 0;
+		for (int i = 0; i < 10; i++) {
+			if (i > 5)
+				break;
+			k++;
+		}
+	}
+}";
+			Test<RedundantIfElseBlockIssue>(input, 1, output);
+		}
+
+		[Test]
+		public void TestContinueLoop()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int k = 0;
+		for (int i = 0; i < 10; i++) {
+			if (i > 5)
+				continue;
+			else
+				k++;
+		}
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int k = 0;
+		for (int i = 0; i < 10; i++) {
+			if (i > 5)
+				continue;
+			k++;
+		}
+	}
+}";
+			Test<RedundantIfElseBlockIssue>(input, 1, output);
+		}
+
+		[Test]
+		public void TestBlockStatement()
+		{
+			var input = @"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		if (i > 0) {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+}";
+			var output = @"
+class TestClass
+{
+	int TestMethod (int i)
+	{
+		if (i > 0) {
+			return 1;
+		}
+		return 0;
+	}
+}";
+			Test<RedundantIfElseBlockIssue>(input, 1, output);
+		}
+
+		[Test]
+		public void TestEmptyFalseBlock()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		if (i > 0)
+			a = 1;
+		else { }
+	}
+}";
+			var output = @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		if (i > 0)
+			a = 1;
+	}
+}";
+			Test<RedundantIfElseBlockIssue>(input, 1, output);
+		}
+
+		[Test]
+		public void TestNecessaryElse()
+		{
+
+			var input = @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		if (i > 0)
+			a = 1;
+		else
+			a = 0;
+	}
+}";
+			Test<RedundantIfElseBlockIssue>(input, 0);
+		}
+
+		[Test]
+		public void TestNecessaryElseCase2()
+		{
+
+			var input = @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		int a;
+		while (true) {
+			if (i > 0) {
+				a = 1;
+			} else if (i < 0) {
+				a = 0;
+				break;
+			} else {
+				break;
+			}
+		}
+	}
+}";
+			Test<RedundantIfElseBlockIssue>(input, 0);
+		}
+
+		[Test]
+
+		public void TestNecessaryElseBecauseOfVarDeclaration()
+		{
+
+			var input = @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		if (i > 0) {
+			int a = 1;
+			return;
+		} else {
+			int a = 2;
+			return;
+		}
+	}
+}";
+			Test<RedundantIfElseBlockIssue>(input, 0);
+		}
+
+		[Test]
+		public void TestNecessaryElseBecauseOfVarDeclarationInDifferentStatement()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod (int i)
+	{
+		{
+			int a = 1;
+		}
+		if (i > 0) {
+			return;
+		} else {
+			int a = 2;
+			return;
+		}
+	}
+}";
+			Test<RedundantIfElseBlockIssue>(input, 0);
+		}
+
+		[Test]
+		public void TestReturn2()
+		{
+			var input = @"
+class TestClass
+{
+	bool? EvaluateCondition (Expression expr)
+	{
+		ResolveResult rr = EvaluateConstant (expr);
+		if (rr != null && rr.IsCompileTimeConstant)
+			return rr.ConstantValue as bool?;
+		else
+			return null;
+	}
+}";
+			var output = @"
+class TestClass
+{
+	bool? EvaluateCondition (Expression expr)
+	{
+		ResolveResult rr = EvaluateConstant (expr);
+		if (rr != null && rr.IsCompileTimeConstant)
+			return rr.ConstantValue as bool?;
+		return null;
+	}
+}";
+			Test<RedundantIfElseBlockIssue>(input, 1, output);
+		}
+
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantInternalInspectorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantInternalInspectorTests.cs
index f7a317e887..78e01c222f 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantInternalInspectorTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantInternalInspectorTests.cs
@@ -58,5 +58,17 @@ namespace ICSharpCode.NRefactory.CSharp.CodeIssues
 	}
 }");
 		}
+
+		
+		[Test]
+		public void TestNestedClass ()
+		{
+			TestWrongContext<RedundantInternalIssue>(@"class Foo
+{
+	internal class Nested
+	{
+	}
+}");
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantLambdaParameterTypeTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantLambdaParameterTypeTests.cs
new file mode 100644
index 0000000000..226d4ee615
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantLambdaParameterTypeTests.cs
@@ -0,0 +1,216 @@
+// 
+// RedundantLambdaParameterTypeTests.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantLambdaParameterTypeTests : InspectionActionTestBase
+	{
+
+		[Test]
+		public void SimpleCase()
+		{
+			Test<RedundantLambdaParameterTypeIssue>(@"
+class Program
+{
+	public delegate int IncreaseByANumber(int j);
+
+	public static void ExecuteCSharp3_0()
+	{
+		IncreaseByANumber increase = (int j) => (j * 42);
+	}
+}
+", @"
+class Program
+{
+	public delegate int IncreaseByANumber(int j);
+
+	public static void ExecuteCSharp3_0()
+	{
+		IncreaseByANumber increase = j => (j * 42);
+	}
+}
+");
+		}
+
+		[Test]
+		public void MultipleCases()
+		{
+			Test<RedundantLambdaParameterTypeIssue>(@"
+class Program
+{
+	public delegate int MultipleIncreaseByANumber(int i, string j, int l);
+
+	public static void ExecuteCSharp3_0()
+	{
+		MultipleIncreaseByANumber multiple = (int j, string k, int l) => ((j * 42) / k) % l;
+	}
+}
+", 3, @"
+class Program
+{
+	public delegate int MultipleIncreaseByANumber(int i, string j, int l);
+
+	public static void ExecuteCSharp3_0()
+	{
+		MultipleIncreaseByANumber multiple = (j, k, l) => ((j * 42) / k) % l;
+	}
+}
+", 0);
+		}
+
+		[Test]
+		public void TestInspectorCase2()
+		{
+			Test<RedundantLambdaParameterTypeIssue>(@"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace application
+{
+	internal class Program
+	{
+		public void Foo(Action<int, string> act) {}
+		public void Foo(Action<int> act) {}
+
+		void Test ()
+		{
+			Foo((int i) => Console.WriteLine (i));
+		}
+	}
+}", @"
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace application
+{
+	internal class Program
+	{
+		public void Foo(Action<int, string> act) {}
+		public void Foo(Action<int> act) {}
+
+		void Test ()
+		{
+			Foo(i => Console.WriteLine (i));
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestInspectorCase3()
+		{
+			var input = @"using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace application
+{
+	internal class Program
+	{
+		public void Foo(Action<int> act, Action<int> act1) { }
+		public void Foo(Action<string> act, Action<int> act1) { }
+
+		void Test()
+		{
+			Foo(((int i) => Console.WriteLine(i)), (i => Console.WriteLine(i)));
+		}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantLambdaParameterTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+
+		[Test]
+		public void TestInvalidContext()
+		{
+			var input = @"using System;
+		using System.Collections.Generic;
+		using System.Linq;
+
+namespace application
+{
+	internal class Program
+	{
+		public void Foo(Action<int> act) {}
+		public void Foo(Action<string> act) {}
+
+		void Test ()
+		{
+			Foo((int i) => Console.WriteLine (i));
+		}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantLambdaParameterTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void TestResharperDisableRestore()
+		{
+			var input = @"using System;
+		using System.Collections.Generic;
+		using System.Linq;
+
+namespace application
+{
+	internal class Program
+	{
+		public delegate int IncreaseByANumber(int j);
+
+		public delegate int MultipleIncreaseByANumber(int i, int j, int l);
+
+		public static void ExecuteCSharp3_0()
+		{
+			// declare the lambda expression
+			//Resharper disable RedundantLambdaParameterType
+			IncreaseByANumber increase = (int j) => (j * 42);
+			//Resharper restore RedundantLambdaParameterType
+			// invoke the method and print 420 to the console
+			Console.WriteLine(increase(10));
+
+			MultipleIncreaseByANumber multiple = (j, k, l) => ((j * 42) / k) % l;
+			Console.WriteLine(multiple(10, 11, 12));
+		}
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantLambdaParameterTypeIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantLambdaSignatureParenthesesIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantLambdaSignatureParenthesesIssueTests.cs
new file mode 100644
index 0000000000..7233e52ba9
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantLambdaSignatureParenthesesIssueTests.cs
@@ -0,0 +1,133 @@
+//
+// RedundantLambdaSignatureParenthesesIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantLambdaSignatureParenthesesIssueTests : InspectionActionTestBase
+	{
+
+		[Test]
+		public void SimpleCase()
+		{
+			Test<RedundantLambdaSignatureParenthesesIssue>(@"
+class Program
+{
+	public delegate int MyDel(int j);
+
+	public static void Foo()
+	{
+		MyDel increase = (j) => (j * 42);
+	}
+}
+", 2, @"
+class Program
+{
+	public delegate int MyDel(int j);
+
+	public static void Foo()
+	{
+		MyDel increase = j => (j * 42);
+	}
+}
+", 0);
+		}
+
+		[Test]
+		public void InvalidCase1()
+		{
+			TestWrongContext<RedundantLambdaSignatureParenthesesIssue>(@"
+class Program
+{
+	public delegate int MyDel(int j);
+
+	public static void Foo()
+	{
+		MyDel increase = (int j) => (j * 42);
+	}
+}
+");
+		}
+
+		[Test]
+		public void InvalidCase2()
+		{
+			TestWrongContext<RedundantLambdaSignatureParenthesesIssue>(@"
+using System;
+
+class Program
+{
+	public static void Foo()
+	{
+		Action<int, int> act = (i, j) => (j * j);
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestInvalid()
+		{
+			TestWrongContext<RedundantLambdaSignatureParenthesesIssue>(@"
+class Program
+{
+	public delegate int MyDel(int j);
+
+	public static void Foo()
+	{
+		MyDel increase = j => (j * 42);
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<RedundantLambdaSignatureParenthesesIssue>(@"
+class Program
+{
+	public delegate int MyDel(int j);
+
+	public static void Foo()
+	{
+// ReSharper disable RedundantLambdaSignatureParentheses
+		MyDel increase = (j) => (j * 42);
+// ReSharper restore RedundantLambdaSignatureParentheses
+	}
+}
+");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantLogicalConditionalExpressionOperandIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantLogicalConditionalExpressionOperandIssueTests.cs
new file mode 100644
index 0000000000..7e51214b9a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantLogicalConditionalExpressionOperandIssueTests.cs
@@ -0,0 +1,169 @@
+//
+// RedundantLogicalConditionalExpressionOperandIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantLogicalConditionalExpressionOperandIssueTests: InspectionActionTestBase
+	{
+		[Test]
+		public void TestTrue()
+		{
+			Test<RedundantLogicalConditionalExpressionOperandIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		if (true || b) {
+		}
+	}
+}
+", @"
+class Test
+{
+	void Foo ()
+	{
+		if (b) {
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestTrueCase2()
+		{
+			Test<RedundantLogicalConditionalExpressionOperandIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		if (b || (((true)))) {
+		}
+	}
+}
+", @"
+class Test
+{
+	void Foo ()
+	{
+		if (b) {
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestFalse()
+		{
+			Test<RedundantLogicalConditionalExpressionOperandIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		if (false && b) {
+		}
+	}
+}
+", @"
+class Test
+{
+	void Foo ()
+	{
+		if (b) {
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestFalseCase2()
+		{
+			Test<RedundantLogicalConditionalExpressionOperandIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		if (b && (((false)))) {
+		}
+	}
+}
+", @"
+class Test
+{
+	void Foo ()
+	{
+		if (b) {
+		}
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestInvalid()
+		{
+			TestWrongContext<RedundantLogicalConditionalExpressionOperandIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		if (false || b) {
+		}
+		if (true && b) {
+		}
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<RedundantLogicalConditionalExpressionOperandIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		// ReSharper disable once RedundantLogicalConditionalExpressionOperand
+		if (true || b) {
+		}
+	}
+}
+");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantNameQualifierIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantNameQualifierIssueTests.cs
new file mode 100644
index 0000000000..8ba25ba798
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantNameQualifierIssueTests.cs
@@ -0,0 +1,114 @@
+// 
+// RedundantNameQualifierIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantNameQualifierIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestInspectorCase1 ()
+		{
+			var input = @"using System;
+class Foo
+{
+	void Bar (string str)
+	{
+		System.Console.WriteLine ();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantNameQualifierIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"using System;
+class Foo
+{
+	void Bar (string str)
+	{
+		Console.WriteLine ();
+	}
+}");
+		}
+		
+		[Test]
+		public void TestInspectorCase2 ()
+		{
+			var input = @"using System.Text;
+class Foo
+{
+	void Bar (System.Text.StringBuilder b)
+	{
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantNameQualifierIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"using System.Text;
+class Foo
+{
+	void Bar (StringBuilder b)
+	{
+	}
+}");
+		}
+		
+		[Test]
+		public void UsingAlias()
+		{
+			var input = @"using IEnumerable = System.Collections.IEnumerable;";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantNameQualifierIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+        [Test]
+        public void TestDisable()
+        {
+            var input = @"using System;
+class Foo
+{
+	void Bar (string str)
+	{
+// ReSharper disable RedundantNameQualifier
+            System.Console.WriteLine();
+// ReSharper restore RedundantNameQualifier
+	}
+}";
+
+            TestRefactoringContext context;
+            var issues = GetIssues(new RedundantNameQualifierIssue(), input, out context);
+            Assert.AreEqual(0, issues.Count);
+        }
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantNamespaceUsageInspectorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantNamespaceUsageInspectorTests.cs
deleted file mode 100644
index 6c3a0d2466..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantNamespaceUsageInspectorTests.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// 
-// RedundantNamespaceUsageInspectorTests.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class RedundantNamespaceUsageInspectorTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestInspectorCase1 ()
-		{
-			var input = @"using System;
-class Foo
-{
-	void Bar (string str)
-	{
-		System.Console.WriteLine ();
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantNamespaceUsageIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"using System;
-class Foo
-{
-	void Bar (string str)
-	{
-		Console.WriteLine ();
-	}
-}");
-		}
-		
-		[Test]
-		public void TestInspectorCase2 ()
-		{
-			var input = @"using System.Text;
-class Foo
-{
-	void Bar (System.Text.StringBuilder b)
-	{
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantNamespaceUsageIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"using System.Text;
-class Foo
-{
-	void Bar (StringBuilder b)
-	{
-	}
-}");
-		}
-		
-		[Test]
-		public void UsingAlias()
-		{
-			var input = @"using IEnumerable = System.Collections.IEnumerable;";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantNamespaceUsageIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantNotNullAttributeInNonNullableTypeTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantNotNullAttributeInNonNullableTypeTests.cs
new file mode 100644
index 0000000000..76d00a585b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantNotNullAttributeInNonNullableTypeTests.cs
@@ -0,0 +1,220 @@
+// 
+// RedundantNotNullAttributeInNonNullableTypeTests.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantNotNullAttributeTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestValidReturn() {
+			TestWrongContext<RedundantNotNullAttributeInNonNullableTypeIssue>(@"namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Method)]
+	class NotNullAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	[JetBrains.Annotations.NotNull]
+	object NotNull() {
+		return 1;
+	}
+}");
+		}
+
+		[Test]
+		public void TestRedundantReturn() {
+			Test<RedundantNotNullAttributeInNonNullableTypeIssue>(@"namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Method)]
+	class NotNullAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	[JetBrains.Annotations.NotNull]
+	int NotNull() {
+		return 1;
+	}
+}", @"namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Method)]
+	class NotNullAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	int NotNull() {
+		return 1;
+	}
+}");
+		}
+
+		[Test]
+		public void TestValidField() {
+			TestWrongContext<RedundantNotNullAttributeInNonNullableTypeIssue>(@"namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Field)]
+	class NotNullAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	[JetBrains.Annotations.NotNull]
+	object NotNullField;
+}");
+		}
+
+		[Test]
+		public void TestValidNullable() {
+			TestWrongContext<RedundantNotNullAttributeInNonNullableTypeIssue>(@"namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Field)]
+	class NotNullAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	[JetBrains.Annotations.NotNull]
+	int? NotNullField;
+}");
+		}
+
+		[Test]
+		public void TestRedundantField() {
+			Test<RedundantNotNullAttributeInNonNullableTypeIssue>(@"namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Field)]
+	class NotNullAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	[JetBrains.Annotations.NotNull]
+	int NotNullField;
+}", @"namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Field)]
+	class NotNullAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	int NotNullField;
+}");
+		}
+
+		[Test]
+		public void TestRedundantFixedField() {
+			Test<RedundantNotNullAttributeInNonNullableTypeIssue>(@"namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Field)]
+	class NotNullAttribute : System.Attribute
+	{
+	}
+}
+unsafe struct TestClass
+{
+	[JetBrains.Annotations.NotNull]
+	fixed object NotNullField[1024];
+}", @"namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Field)]
+	class NotNullAttribute : System.Attribute
+	{
+	}
+}
+unsafe struct TestClass
+{
+	fixed object NotNullField[1024];
+}");
+		}
+
+		[Test]
+		public void TestRedundantProperty() {
+			Test<RedundantNotNullAttributeInNonNullableTypeIssue>(@"namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Property)]
+	class NotNullAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	[JetBrains.Annotations.NotNull]
+	int NotNullField { get; set; }
+}", @"namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Property)]
+	class NotNullAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	int NotNullField { get; set; }
+}");
+		}
+
+		[Test]
+		public void TestRedundantParameter() {
+			Test<RedundantNotNullAttributeInNonNullableTypeIssue>(@"namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Parameter)]
+	class NotNullAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	void Foo([JetBrains.Annotations.NotNull]int x) {}
+}", @"namespace JetBrains.Annotations
+{
+	[System.AttributeUsage(System.AttributeTargets.Parameter)]
+	class NotNullAttribute : System.Attribute
+	{
+	}
+}
+class TestClass
+{
+	void Foo(int x) {}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantNullCheckTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantNullCheckTests.cs
deleted file mode 100755
index 418657ac4a..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantNullCheckTests.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-// 
-// RedundantNullCheckTests.cs
-//  
-// Author:
-//       Ji Kun <jikun.nus@gmail.com>
-// 
-// Copyright (c) 2013 Ji Kun
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class RedundantNullCheckTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestInspectorCase1()
-		{
-			var input = @"using System;class Test {public void test(){int a = 0;if(a is int && a != null){a = 1;}}}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantNullCheckIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-
-			
-			CheckFix(context, issues, @"using System;class Test {public void test(){int a = 0;
-		if (a is int) {
-			a = 1;
-		}}}");
-		}
-
-		[Test]
-		public void TestResharperDisable()
-		{
-			var input = @"using System;
-class Test {
-	public void test(){
-	int a = 0;
-	//Resharper disable RedundantNullCheck
-	if(a is int && a != null)
-	{a = 1;}
-	//Resharper restore RedundantNullCheck
-	}	
-	}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantNullCheckIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-
-		[Test]
-		public void TestInspectorCase2()
-		{
-			var input = @"using System;class Test {public void test(){int a = 0;while(a != null && a is int){a = 1;}}}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantNullCheckIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			CheckFix(context, issues, @"using System;class Test {public void test(){int a = 0;
-		while (a is int) {
-			a = 1;
-		}}}");
-		}
-
-		[Test]
-		public void TestCaseWithFullParens()
-		{
-			var input = 
-				@"using System;
-class TestClass
-{
-	public void Test(object o)
-	{
-		if (!((o is int) && (o != null))) {
-		}
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantNullCheckIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			CheckFix(context, issues, @"using System;
-class TestClass
-{
-	public void Test(object o)
-	{
-		if (!(o is int)) {
-		}
-	}
-}");
-		}
-
-		[Ignore("Extended version")]
-		[Test]
-		public void TestNegatedCase()
-		{
-			var input = 
-				@"using System;
-class TestClass
-{
-	public void Test(object o)
-	{
-		if (null == o || !(o is int)) {
-		}
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues(new RedundantNullCheckIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			CheckFix(context, issues, @"using System;
-class TestClass
-{
-	public void Test(object o)
-	{
-		if (!(o is int)) {
-		}
-	}
-}");
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantObjectCreationArgumentListIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantObjectCreationArgumentListIssueTests.cs
index e1900e2f97..391fa39f35 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantObjectCreationArgumentListIssueTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantObjectCreationArgumentListIssueTests.cs
@@ -77,6 +77,25 @@ class TestClass
 }";
 			Test<RedundantObjectCreationArgumentListIssue> (input, 0);
 		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			var input = @"
+class TestClass
+{
+	public int Prop { get; set; }
+	void TestMethod ()
+	{
+		// ReSharper disable once RedundantEmptyObjectCreationArgumentList
+		var x = new TestClass () {
+			Prop = 1
+		};
+	}
+}";
+			Test<RedundantObjectCreationArgumentListIssue> (input, 0);
+		}
+
 	}
 
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantObjectOrCollectionInitializerIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantObjectOrCollectionInitializerIssueTests.cs
index 6448683d00..e7d38ca7f7 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantObjectOrCollectionInitializerIssueTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantObjectOrCollectionInitializerIssueTests.cs
@@ -29,6 +29,7 @@ using NUnit.Framework;
 
 namespace ICSharpCode.NRefactory.CSharp.CodeIssues
 {
+   
 	[TestFixture]
 	public class RedundantObjectOrCollectionInitializerIssueTests : InspectionActionTestBase
 	{
@@ -51,9 +52,22 @@ class TestClass
 		var x = new TestClass ();
 	}
 }";
-			Test<RedundantObjectOrCollectionInitializerIssue> (input, 1, output);
+            Test<RedundantObjectOrCollectionInitializerIssue>(input, 1, output);
 		}
 
+        [Test]
+	    public void TestDisable()
+	    {
+            TestWrongContext<RedundantObjectOrCollectionInitializerIssue>(@" class TestClass
+    {
+        void TestMethod()
+        {
+// ReSharper disable once RedundantEmptyObjectOrCollectionInitializer
+            var x = new TestClass() { };
+        }
+    }");
+	    }
+
 		[Test]
 		public void TestNoArgumentList ()
 		{
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantOverridenMemberTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantOverridenMemberTests.cs
new file mode 100644
index 0000000000..c73804aa9b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantOverridenMemberTests.cs
@@ -0,0 +1,450 @@
+// 
+// RedundantOverridenMemberTests.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun<jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantOverridenMemberTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestInspectorCase1()
+		{
+			var input = @"namespace Demo
+{
+	public class BaseClass
+	{
+		virtual public void run()
+		{
+			int a = 1+1;
+		}
+	}
+	public class CSharpDemo:BaseClass
+	{
+		override public void run()
+		{
+			base.run();
+		}
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantOverridenMemberIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+
+			
+			CheckFix(context, issues, @"namespace Demo
+{
+	public class BaseClass
+	{
+		virtual public void run()
+		{
+			int a = 1+1;
+		}
+	}
+	public class CSharpDemo:BaseClass
+	{
+	}
+}");
+		}
+
+		[Test]
+		public void TestResharperDisable()
+		{
+			var input = @"namespace Demo
+{
+	public class BaseClass
+	{
+		virtual public void run()
+		{
+			int a = 1+1;
+		}
+	}
+	//Resharper disable RedundantOverridenMember
+	public class CSharpDemo:BaseClass
+	{
+		override public void run()
+		{
+			base.run();
+		}
+	}
+	//Resharper restore RedundantOverridenMember
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantOverridenMemberIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void TestInspectorCase2()
+		{
+			var input = @"namespace Demo
+{
+	public class BaseClass
+	{
+		virtual public void run()
+		{
+			int a = 1+1;
+		}
+	}
+	public class CSharpDemo:BaseClass
+	{
+		override public void run()
+		{
+			int b = 1+1;
+			base.run();
+		}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantOverridenMemberIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void TestTestInspectorCase3()
+		{
+			var input = 
+				@"namespace Demo
+{
+	public class BaseClass
+	{
+		virtual public void run()
+		{
+			int a = 1+1;
+		}
+	}
+	public class CSharpDemo:BaseClass
+	{
+		public void run1()
+		{
+			base.run();
+		}
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantOverridenMemberIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void TestTestInspectorCase4()
+		{
+			var input = 
+				@"namespace Demo
+{
+	public class BaseClass
+	{
+		private int a;
+		virtual public int A
+		{
+			get{ return a; }
+			set{ a = value; }
+		}
+	}
+	public class CSharpDemo:BaseClass
+	{
+		public override int A
+		{
+			get{ return base.A; }
+			set{ base.A = value; }
+		}
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantOverridenMemberIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+
+			CheckFix(context, issues,
+@"namespace Demo
+{
+	public class BaseClass
+	{
+		private int a;
+		virtual public int A
+		{
+			get{ return a; }
+			set{ a = value; }
+		}
+	}
+	public class CSharpDemo:BaseClass
+	{
+	}
+}");
+		}
+
+		[Test]
+		public void TestTestInspectorCase5()
+		{
+			var input = 
+				@"namespace Application
+{
+	public class SampleCollection<T>
+	{ 
+		private T[] arr = new T[100];
+		public virtual T this[int i]
+		{
+			get{ return arr[i];}
+			set{ arr[i] = value;}
+		}
+	}
+
+	class Class2<T> : SampleCollection<T>
+	{
+		public override T this[int i]
+		{
+			get { return base[i];}
+			set { base[i] = value; }
+		}
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantOverridenMemberIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			
+			CheckFix(context, issues,
+			@"namespace Application
+{
+	public class SampleCollection<T>
+	{ 
+		private T[] arr = new T[100];
+		public virtual T this[int i]
+		{
+			get{ return arr[i];}
+			set{ arr[i] = value;}
+		}
+	}
+
+	class Class2<T> : SampleCollection<T>
+	{
+	}
+}");
+		}
+
+		[Test]
+		public void TestTestInspectorCase6()
+		{
+			var input = 
+				@"using System;
+using System.IO;
+
+partial class A
+{
+	public virtual int AProperty
+	{
+		get;
+		set;
+	}
+
+	public virtual int this[int i]
+	{
+		get { return i; }
+		set { Console.WriteLine(value); }
+	}
+}
+
+class B : A
+{
+	public override int AProperty
+	{
+		set
+		{
+			base.AProperty = value;
+		}
+	}
+	public override int this[int i]
+	{
+		get
+		{
+			return base[i];
+		}
+	}
+	public override string ToString()
+	{
+		return base.ToString();
+	}
+}
+
+class C : A
+{
+	public override int AProperty
+	{
+		get
+		{
+			return base.AProperty;
+		}
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantOverridenMemberIssue(), input, out context);
+			Assert.AreEqual(4, issues.Count);
+			
+			CheckFix(context, issues,
+			@"using System;
+using System.IO;
+
+partial class A
+{
+	public virtual int AProperty
+	{
+		get;
+		set;
+	}
+
+	public virtual int this[int i]
+	{
+		get { return i; }
+		set { Console.WriteLine(value); }
+	}
+}
+
+class B : A
+{
+}
+
+class C : A
+{
+}");
+		}
+
+		[Test]
+		public void TestRedundantEvent()
+		{
+			var input = @"namespace Demo
+{
+	public class BaseClass
+	{
+		public virtual event EventHandler FooBar { add {} remove {} }
+	}
+	public class CSharpDemo:BaseClass
+	{
+		public override event EventHandler FooBar { add { base.FooBar += value; } remove { base.FooBar -= value; } }
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new RedundantOverridenMemberIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+
+
+			CheckFix(context, issues, @"namespace Demo
+{
+	public class BaseClass
+	{
+		public virtual event EventHandler FooBar { add {} remove {} }
+	}
+	public class CSharpDemo:BaseClass
+	{
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestNonRedundantEvent()
+		{
+			var input = @"namespace Demo
+{
+	public class BaseClass
+	{
+		public virtual event EventHandler FooBar { add {} remove {} }
+		public virtual event EventHandler FooBar2 { add {} remove {} }
+	}
+	public class CSharpDemo:BaseClass
+	{
+		public override event EventHandler FooBar { add { base.FooBar += value; } remove { base.FooBar2 -= value; } }
+	}
+}";
+			TestWrongContext<RedundantOverridenMemberIssue>(input);
+		}
+
+
+		[Test]
+		public void TestGetHashCode()
+		{
+			TestWrongContext<RedundantOverridenMemberIssue>(@"
+class Bar
+{
+	public override bool Equals (object obj)
+	{
+		return false;
+	}
+
+	public override int GetHashCode ()
+	{
+		return base.GetHashCode ();
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestRedundantGetHashCode()
+		{
+			TestIssue<RedundantOverridenMemberIssue>(@"
+class Bar
+{
+	public override int GetHashCode ()
+	{
+		return base.GetHashCode ();
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestPropertyBug()
+		{
+			TestWrongContext<RedundantOverridenMemberIssue>(@"
+class BaseFoo
+{
+	public virtual int Foo { get; set; }
+}
+
+class Bar : BaseFoo
+{
+	int bar;
+	public override int Foo {
+		get {
+			return base.Foo;
+		}
+		set {
+			base.Foo = bar = value;
+		}
+	}
+}");
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantParamsIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantParamsIssueTests.cs
new file mode 100644
index 0000000000..20b044236d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantParamsIssueTests.cs
@@ -0,0 +1,109 @@
+//
+// RedundantParamsIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantParamsIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestBasicCase ()
+		{
+			Test<RedundantParamsIssue>(@"class FooBar
+{
+	public virtual void Foo(string fmt, object[] args)
+	{
+	}
+}
+
+class FooBar2 : FooBar
+{
+	public override void Foo(string fmt, params object[] args)
+	{
+		System.Console.WriteLine(fmt, args);
+	}
+}", @"class FooBar
+{
+	public virtual void Foo(string fmt, object[] args)
+	{
+	}
+}
+
+class FooBar2 : FooBar
+{
+	public override void Foo(string fmt, object[] args)
+	{
+		System.Console.WriteLine(fmt, args);
+	}
+}");
+		}
+
+		[Test]
+		public void TestValidCase ()
+		{
+			TestWrongContext<RedundantParamsIssue>(@"class FooBar
+{
+	public virtual void Foo(string fmt, object[] args)
+	{
+	}
+}
+
+class FooBar2 : FooBar
+{
+	public override void Foo(string fmt, object[] args)
+	{
+		System.Console.WriteLine(fmt, args);
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<RedundantParamsIssue>(@"class FooBar
+{
+	public virtual void Foo(string fmt, object[] args)
+	{
+	}
+}
+
+class FooBar2 : FooBar
+{
+	// ReSharper disable once RedundantParams
+	public override void Foo(string fmt, params object[] args)
+	{
+		System.Console.WriteLine(fmt, args);
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantPrivateInspectorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantPrivateInspectorTests.cs
index 91f46e0270..5a0c424f2c 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantPrivateInspectorTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantPrivateInspectorTests.cs
@@ -58,5 +58,22 @@ namespace ICSharpCode.NRefactory.CSharp.CodeIssues
 	}
 }");
 		}
+	
+	
+		[Test]
+		public void TestNestedClass ()
+		{
+			Test<RedundantPrivateIssue>(@"class Foo
+{
+	private class Nested
+	{
+	}
+}", @"class Foo
+{
+	class Nested
+	{
+	}
+}");
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantStringToCharArrayCallIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantStringToCharArrayCallIssueTests.cs
new file mode 100644
index 0000000000..7fd171829e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantStringToCharArrayCallIssueTests.cs
@@ -0,0 +1,137 @@
+//
+// RedundantStringToCharArrayCallIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantStringToCharArrayCallIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleForeachCase ()
+		{
+			Test<RedundantStringToCharArrayCallIssue>(@"
+using System;
+class FooBar
+{
+	public void Test (string str)
+	{
+		foreach (char c in str.ToCharArray ()) {
+			Console.WriteLine (c);
+		}
+	}
+}
+", @"
+using System;
+class FooBar
+{
+	public void Test (string str)
+	{
+		foreach (char c in str) {
+			Console.WriteLine (c);
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestVarForeachCase ()
+		{
+			Test<RedundantStringToCharArrayCallIssue>(@"
+using System;
+class FooBar
+{
+	public void Test (string str)
+	{
+		foreach (var c in str.ToCharArray ()) {
+			Console.WriteLine (c);
+		}
+	}
+}
+", @"
+using System;
+class FooBar
+{
+	public void Test (string str)
+	{
+		foreach (var c in str) {
+			Console.WriteLine (c);
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestIndexerCase ()
+		{
+			Test<RedundantStringToCharArrayCallIssue>(@"
+using System;
+class FooBar
+{
+	public void Test (string str)
+	{
+		Console.WriteLine ((str.ToCharArray ())[5]);
+	}
+}
+", @"
+using System;
+class FooBar
+{
+	public void Test (string str)
+	{
+		Console.WriteLine (str [5]);
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<RedundantStringToCharArrayCallIssue>(@"
+using System;
+class FooBar
+{
+	public void Test (string str)
+	{
+		// ReSharper disable once RedundantStringToCharArrayCall
+		foreach (char c in str.ToCharArray ()) {
+			Console.WriteLine (c);
+		}
+	}
+}
+");
+		}
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantTernaryExpressionIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantTernaryExpressionIssueTests.cs
new file mode 100644
index 0000000000..663a6cf20d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantTernaryExpressionIssueTests.cs
@@ -0,0 +1,73 @@
+//
+// RedundantTernaryExpressionIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantTernaryExpressionIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestTrueFalseCase ()
+		{
+			Test<RedundantTernaryExpressionIssue>(@"
+class Foo
+{
+	void Bar ()
+	{
+		var a = 1 < 2 ? true : false;
+	}
+}
+", @"
+class Foo
+{
+	void Bar ()
+	{
+		var a = 1 < 2;
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<RedundantTernaryExpressionIssue>(@"
+class Foo
+{
+	void Bar ()
+	{
+		// ReSharper disable once RedundantTernaryExpression
+		var a = 1 < 2 ? true : false;
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantThisInspectorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantThisInspectorTests.cs
deleted file mode 100644
index 31dc4939cd..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantThisInspectorTests.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// 
-// RedundantThisInspectorTests.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class RedundantThisInspectorTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestInspectorCase1 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		this.Bar (str);
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantThisIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		Bar (str);
-	}
-}");
-		}
-
-		[Test]
-		public void TestResharperDisableRestore ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		// ReSharper disable RedundantThisQualifier
-		this.Bar (str);
-		// ReSharper restore RedundantThisQualifier
-		this.Bar (str);
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantThisIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantThisQualifierIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantThisQualifierIssueTests.cs
new file mode 100644
index 0000000000..be5e113abf
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantThisQualifierIssueTests.cs
@@ -0,0 +1,377 @@
+// 
+// RedundantThisQualifierIssueTests.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantThisQualifierIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestInspectorCase1 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		this.Bar (str);
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssuesWithSubIssue (new RedundantThisQualifierIssue (), input, RedundantThisQualifierIssue.EverywhereElse, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		Bar (str);
+	}
+}");
+		}
+		
+		[Test]
+		public void TestSkipConstructors ()
+		{
+			var input = @"class Foo
+{
+	public Foo ()
+	{
+		this.Bar (str);
+	}
+}";
+			TestWrongContextWithSubIssue<RedundantThisQualifierIssue>(input, RedundantThisQualifierIssue.EverywhereElse);
+		}
+
+
+		[Test]
+		public void TestInsideConstructors ()
+		{
+			var input = @"class Foo
+{
+	public Foo ()
+	{
+		this.Bar (str);
+	}
+	void Bar (string str)
+	{
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssuesWithSubIssue (new RedundantThisQualifierIssue (), input, RedundantThisQualifierIssue.InsideConstructors, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	public Foo ()
+	{
+		Bar (str);
+	}
+	void Bar (string str)
+	{
+	}
+}");
+		}
+
+		[Test]
+		public void TestInsideConstructorsSkipMembers ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		this.Bar (str);
+	}
+}";
+			TestWrongContextWithSubIssue<RedundantThisQualifierIssue>(input, RedundantThisQualifierIssue.InsideConstructors);
+		}
+		
+		[Test]
+		public void TestRequiredThisInAssignmentFromFieldToLocal ()
+		{
+			TestWithSubIssue<RedundantThisQualifierIssue>(@"class Foo
+{
+	int a;
+	void Bar ()
+	{
+		var a = this.a;
+	}
+}", RedundantThisQualifierIssue.EverywhereElse, 0);
+		}
+		
+		[Test]
+		public void TestRequiredThisInAssignmentFromDelegateToLocal ()
+		{
+			TestWithSubIssue<RedundantThisQualifierIssue>(@"class Foo
+{
+	int a;
+	void Bar ()
+	{
+		Action a = () => {
+			Console.WriteLine (this.a);
+		};
+	}
+}", RedundantThisQualifierIssue.EverywhereElse, 0);
+		}
+		
+		[Test]
+		public void TestRedundantThisInAssignmentFromFieldToLocal ()
+		{
+			TestWithSubIssue<RedundantThisQualifierIssue>(@"class Foo
+{
+	int a;
+	void Bar ()
+	{
+		var b = this.a;
+	}
+}", @"class Foo
+{
+	int a;
+	void Bar ()
+	{
+		var b = a;
+	}
+}", RedundantThisQualifierIssue.EverywhereElse);
+		}
+		
+		[Test]
+		public void TestRedundantThisInAssignmentFromDelegateToLocal ()
+		{
+			TestWithSubIssue<RedundantThisQualifierIssue>(@"class Foo
+{
+	int a;
+	void Bar ()
+	{
+		Action b = () => {
+			Console.WriteLine (this.a);
+		};
+	}
+}", @"class Foo
+{
+	int a;
+	void Bar ()
+	{
+		Action b = () => {
+			Console.WriteLine (a);
+		};
+	}
+}", RedundantThisQualifierIssue.EverywhereElse);
+		}
+		
+		[Test]
+		public void TestRequiredThisInExtensionMethodCall ()
+		{
+			TestWithSubIssue<RedundantThisQualifierIssue>(@"static class Extensions
+{
+	public static void Ext (this Foo foo)
+	{
+	}
+}
+
+class Foo
+{
+	void Bar ()
+	{
+		this.Ext ();
+	}
+}", RedundantThisQualifierIssue.EverywhereElse, 0);
+		}
+
+		[Test]
+		public void TestRequiredThisToAvoidCS0135 ()
+		{
+			TestWithSubIssue<RedundantThisQualifierIssue>(@"class Foo
+{
+	int a;
+	void Bar ()
+	{
+		{
+			int a = 0;
+		}
+		this.a = 2;
+	}
+}", RedundantThisQualifierIssue.EverywhereElse, 0);
+		}
+
+		[Test]
+		public void TestRequiredThisToAvoidCS0844 ()
+		{
+			Test<RedundantThisQualifierIssue>(@"class Foo
+{
+	int a;
+	void Bar ()
+	{
+		{
+			this.a = 0;
+		}
+		var a = 2;
+	}
+}", 0);
+		}
+		
+		[Test]
+		public void TestRequiredThisToAvoidCS0135WithLambda ()
+		{
+			TestWithSubIssue<RedundantThisQualifierIssue>(@"class Foo
+{
+	int a;
+	void Bar ()
+	{
+		Action<int> action = (int a) => a.ToString();
+		this.a = 2;
+	}
+}", RedundantThisQualifierIssue.EverywhereElse, 0);
+		}
+		
+		[Test]
+		public void TestRequiredThisToAvoidCS0135WithDelegate ()
+		{
+			TestWithSubIssue<RedundantThisQualifierIssue>(@"class Foo
+{
+	int a;
+	void Bar ()
+	{
+		Action<int> action = delegate (int a) { a.ToString(); };
+		this.a = 2;
+	}
+}", RedundantThisQualifierIssue.EverywhereElse, 0);
+		}
+		
+		[Test]
+		public void TestRequiredThisToAvoidCS0135WithForeach ()
+		{
+			TestWithSubIssue<RedundantThisQualifierIssue>(@"class Foo
+{
+	int a;
+	void Bar ()
+	{
+		this.a = 2;
+		foreach (var a in ""abc"")
+			System.Console.WriteLine (a);
+	}
+}", RedundantThisQualifierIssue.EverywhereElse, 0);
+		}
+		
+		[Test]
+		public void TestRequiredThisToAvoidCS0135WithFor ()
+		{
+			TestWithSubIssue<RedundantThisQualifierIssue>(@"class Foo
+{
+	int a;
+	void Bar ()
+	{
+		this.a = 2;
+		for (int a = 0; a < 2; a++)
+			System.Console.WriteLine (a);
+	}
+}", RedundantThisQualifierIssue.EverywhereElse, 0);
+		}
+		
+		[Test]
+		public void TestRequiredThisToAvoidCS0135WithUsing ()
+		{
+			TestWithSubIssue<RedundantThisQualifierIssue>(@"class Foo
+{
+	int a;
+	void Bar ()
+	{
+		this.a = 2;
+		using (var a = new System.IO.MemoryStream())
+			a.Flush();
+	}
+}", RedundantThisQualifierIssue.EverywhereElse, 0);
+		}
+		
+		[Test]
+		public void TestRequiredThisToAvoidCS0135WithFixed ()
+		{
+			TestWithSubIssue<RedundantThisQualifierIssue>(@"class Baz
+{
+	public int c;
+}
+class Foo
+{
+	int a;
+	unsafe void Bar ()
+	{
+		this.a = 2;
+		var b = new Baz();
+		fixed (int* a = &b.c)
+			Console.WriteLine(a == null);
+	}
+}", RedundantThisQualifierIssue.EverywhereElse, 0);
+		}
+		
+		[Test]
+		public void TestResharperDisableRestore ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		// ReSharper disable RedundantThisQualifier
+		this.Bar (str);
+		// ReSharper restore RedundantThisQualifier
+		this.Bar (str);
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssuesWithSubIssue (new RedundantThisQualifierIssue (), input, RedundantThisQualifierIssue.EverywhereElse, out context);
+			Assert.AreEqual (1, issues.Count);
+		}
+
+		[Test]
+		public void TestBatchFix ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		this.Bar (str);
+		this.Bar (str);
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssuesWithSubIssue (new RedundantThisQualifierIssue (), input, RedundantThisQualifierIssue.EverywhereElse, out context);
+			Assert.AreEqual (2, issues.Count);
+			CheckBatchFix (context, issues, issues[0].Actions.First().SiblingKey, @"class Foo
+{
+	void Bar (string str)
+	{
+		Bar (str);
+		Bar (str);
+	}
+}");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantToStringCallForValueTypesIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantToStringCallForValueTypesIssue.cs
new file mode 100644
index 0000000000..f908404ee2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantToStringCallForValueTypesIssue.cs
@@ -0,0 +1,257 @@
+//
+// RedundantToStringCallForValueTypesForValueTypesIssue.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantToStringCallForValueTypesIssueTests : InspectionActionTestBase
+	{
+
+		[Test]
+		public void ConcatenationOperator ()
+		{
+			var input = @"
+class Foo
+{
+	void Bar (int i)
+	{
+		string s = """" + i.ToString() + """" + i.ToString();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantToStringCallForValueTypesIssue (), input, out context);
+			Assert.AreEqual (2, issues.Count);
+			CheckFix (context, issues, @"
+class Foo
+{
+	void Bar (int i)
+	{
+		string s = """" + i + """" + i;
+	}
+}");
+		}
+
+		[Test]
+		public void TestReferenceTypes ()
+		{
+			TestWrongContext<RedundantToStringCallForValueTypesIssue>(@"
+class Foo
+{
+	void Bar (object i)
+	{
+		string s = """" + i.ToString() + """" + i.ToString();
+	}
+}");
+		}
+
+		[Test]
+		public void ConcatenationOperatorWithToStringAsOnlyString ()
+		{
+			var input = @"
+class Foo
+{
+	void Bar (int i)
+	{
+		string s = i.ToString() + i + i + i + 1.3;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantToStringCallForValueTypesIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+		[Test]
+		public void IgnoresCallsToIFormattableToString ()
+		{
+			var input = @"
+class Foo
+{
+	void Bar (System.DateTime dt)
+	{
+		string s = dt.ToString("""", CultureInfo.InvariantCulture) + string.Empty;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantToStringCallForValueTypesIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+		[Test]
+		public void FormatStringTests ()
+		{
+			var input = @"
+class Foo
+{
+	void Bar (int i)
+	{
+		string s = string.Format(""{0}"", i.ToString());
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantToStringCallForValueTypesIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"
+class Foo
+{
+	void Bar (int i)
+	{
+		string s = string.Format (""{0}"", i);
+	}
+}");
+		}
+
+		[Test]
+		public void HandlesNonLiteralFormatParameter ()
+		{
+			var input = @"
+class Foo
+{
+	void Bar (int i)
+	{
+		string format = ""{0}"";
+		string s = string.Format(format, i.ToString());
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantToStringCallForValueTypesIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"
+class Foo
+{
+	void Bar (int i)
+	{
+		string format = ""{0}"";
+		string s = string.Format (format, i);
+	}
+}");
+		}
+
+		[Test]
+		public void FormatStringWithNonObjectParameterTests ()
+		{
+			var input = @"
+class Foo
+{
+	void Bar (int i)
+	{
+		string s = FakeFormat(""{0} {1}"", i.ToString(), i.ToString());
+	}
+
+	void FakeFormat(string format, string arg0, object arg1)
+	{
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantToStringCallForValueTypesIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"
+class Foo
+{
+	void Bar (int i)
+	{
+		string s = FakeFormat (""{0} {1}"", i.ToString (), i);
+	}
+
+	void FakeFormat(string format, string arg0, object arg1)
+	{
+	}
+}");
+		}
+
+		[Test]
+		public void FormatMethodWithObjectParamsArray ()
+		{
+			var input = @"
+class Foo
+{
+	void Bar (int i)
+	{
+		string s = FakeFormat(""{0} {1}"", i.ToString(), i.ToString());
+	}
+
+	void FakeFormat(string format, params object[] args)
+	{
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantToStringCallForValueTypesIssue (), input, out context);
+			Assert.AreEqual (2, issues.Count);
+			CheckFix (context, issues, @"
+class Foo
+{
+	void Bar (int i)
+	{
+		string s = FakeFormat (""{0} {1}"", i, i);
+	}
+
+	void FakeFormat(string format, params object[] args)
+	{
+	}
+}");
+		}
+
+		[Test]
+		public void DetectsBlacklistedCalls ()
+		{
+			var input = @"
+class Foo
+{
+	void Bar (int i)
+	{
+		var w = new System.IO.StringWriter ();
+		w.Write (i.ToString());
+		w.WriteLine (i.ToString());
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantToStringCallForValueTypesIssue (), input, out context);
+			Assert.AreEqual (2, issues.Count);
+			CheckFix (context, issues, @"
+class Foo
+{
+	void Bar (int i)
+	{
+		var w = new System.IO.StringWriter ();
+		w.Write (i);
+		w.WriteLine (i);
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantToStringCallIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantToStringCallIssueTests.cs
new file mode 100644
index 0000000000..d2b892760b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantToStringCallIssueTests.cs
@@ -0,0 +1,285 @@
+//
+// RedundantToStringCallIssueTests.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantToStringCallIssueTests : InspectionActionTestBase
+	{
+		
+		[Test]
+		public void ConcatenationOperator ()
+		{
+			var input = @"
+class Foo
+{
+	void Bar (object i)
+	{
+		string s = """" + i.ToString() + """" + i.ToString();
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantToStringCallIssue (), input, out context);
+			Assert.AreEqual (2, issues.Count);
+			CheckFix (context, issues, @"
+class Foo
+{
+	void Bar (object i)
+	{
+		string s = """" + i + """" + i;
+	}
+}");
+		}
+
+		[Test]
+		public void TestValueTypes ()
+		{
+			TestWrongContext<RedundantToStringCallIssue>(@"
+class Foo
+{
+	void Bar (int i)
+	{
+		string s = """" + i.ToString() + """" + i.ToString();
+	}
+}");
+		}
+
+
+		[Test]
+		public void ConcatenationOperatorWithToStringAsOnlyString ()
+		{
+			var input = @"
+class Foo
+{
+	void Bar (int i)
+	{
+		string s = i.ToString() + i + i + i + 1.3;
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantToStringCallIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+		
+		[Test]
+		public void IgnoresCallsToIFormattableToString ()
+		{
+			var input = @"
+class Foo
+{
+	void Bar (System.DateTime dt)
+	{
+		string s = dt.ToString("""", CultureInfo.InvariantCulture) + string.Empty;
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantToStringCallIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+		
+		[Test]
+		public void StringTarget ()
+		{
+			var input = @"
+class Foo
+{
+	void Bar (string str)
+	{
+		string s = str.ToString();
+		string inOperator = """" + str.ToString();
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantToStringCallIssue (), input, out context);
+			Assert.AreEqual (2, issues.Count);
+			CheckFix (context, issues, @"
+class Foo
+{
+	void Bar (string str)
+	{
+		string s = str;
+		string inOperator = """" + str;
+	}
+}");
+		}
+		
+		[Test]
+		public void FormatStringTests ()
+		{
+			var input = @"
+class Foo
+{
+	void Bar (object i)
+	{
+		string s = string.Format(""{0}"", i.ToString());
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantToStringCallIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"
+class Foo
+{
+	void Bar (object i)
+	{
+		string s = string.Format (""{0}"", i);
+	}
+}");
+		}
+		
+		[Test]
+		public void HandlesNonLiteralFormatParameter ()
+		{
+			var input = @"
+class Foo
+{
+	void Bar (object i)
+	{
+		string format = ""{0}"";
+		string s = string.Format(format, i.ToString());
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantToStringCallIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"
+class Foo
+{
+	void Bar (object i)
+	{
+		string format = ""{0}"";
+		string s = string.Format (format, i);
+	}
+}");
+		}
+		
+		[Test]
+		public void FormatStringWithNonObjectParameterTests ()
+		{
+			var input = @"
+class Foo
+{
+	void Bar (object i)
+	{
+		string s = FakeFormat(""{0} {1}"", i.ToString(), i.ToString());
+	}
+
+	void FakeFormat(string format, string arg0, object arg1)
+	{
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantToStringCallIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"
+class Foo
+{
+	void Bar (object i)
+	{
+		string s = FakeFormat (""{0} {1}"", i.ToString (), i);
+	}
+
+	void FakeFormat(string format, string arg0, object arg1)
+	{
+	}
+}");
+		}
+		
+		[Test]
+		public void FormatMethodWithObjectParamsArray ()
+		{
+			var input = @"
+class Foo
+{
+	void Bar (object i)
+	{
+		string s = FakeFormat(""{0} {1}"", i.ToString(), i.ToString());
+	}
+
+	void FakeFormat(string format, params object[] args)
+	{
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantToStringCallIssue (), input, out context);
+			Assert.AreEqual (2, issues.Count);
+			CheckFix (context, issues, @"
+class Foo
+{
+	void Bar (object i)
+	{
+		string s = FakeFormat (""{0} {1}"", i, i);
+	}
+
+	void FakeFormat(string format, params object[] args)
+	{
+	}
+}");
+		}
+		
+		[Test, Ignore("broken")]
+		public void DetectsBlacklistedCalls ()
+		{
+			var input = @"
+class Foo
+{
+	void Bar (object i)
+	{
+		var w = new System.IO.StringWriter ();
+		w.Write (i.ToString());
+		w.WriteLine (i.ToString());
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantToStringCallIssue (), input, out context);
+			Assert.AreEqual (2, issues.Count);
+			CheckFix (context, issues, @"
+class Foo
+{
+	void Bar (object i)
+	{
+		var w = new System.IO.StringWriter ();
+		w.Write (i);
+		w.WriteLine (i);
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantToStringTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantToStringTests.cs
deleted file mode 100644
index 0275ebb7fb..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantToStringTests.cs
+++ /dev/null
@@ -1,271 +0,0 @@
-//
-// RedundantToStringTests.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class RedundantToStringTests : InspectionActionTestBase
-	{
-		
-		[Test]
-		public void ConcatenationOperator ()
-		{
-			var input = @"
-class Foo
-{
-	void Bar (int i)
-	{
-		string s = """" + i.ToString() + """" + i.ToString();
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantToStringIssue (), input, out context);
-			Assert.AreEqual (2, issues.Count);
-			CheckFix (context, issues, @"
-class Foo
-{
-	void Bar (int i)
-	{
-		string s = """" + i + """" + i;
-	}
-}");
-		}
-		
-		[Test]
-		public void ConcatenationOperatorWithToStringAsOnlyString ()
-		{
-			var input = @"
-class Foo
-{
-	void Bar (int i)
-	{
-		string s = i.ToString() + i + i + i + 1.3;
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantToStringIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-		
-		[Test]
-		public void IgnoresCallsToIFormattableToString ()
-		{
-			var input = @"
-class Foo
-{
-	void Bar (System.DateTime dt)
-	{
-		string s = dt.ToString("""", CultureInfo.InvariantCulture) + string.Empty;
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantToStringIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-		
-		[Test]
-		public void StringTarget ()
-		{
-			var input = @"
-class Foo
-{
-	void Bar (string str)
-	{
-		string s = str.ToString();
-		string inOperator = """" + str.ToString();
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantToStringIssue (), input, out context);
-			Assert.AreEqual (2, issues.Count);
-			CheckFix (context, issues, @"
-class Foo
-{
-	void Bar (string str)
-	{
-		string s = str;
-		string inOperator = """" + str;
-	}
-}");
-		}
-		
-		[Test]
-		public void FormatStringTests ()
-		{
-			var input = @"
-class Foo
-{
-	void Bar (int i)
-	{
-		string s = string.Format(""{0}"", i.ToString());
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantToStringIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"
-class Foo
-{
-	void Bar (int i)
-	{
-		string s = string.Format (""{0}"", i);
-	}
-}");
-		}
-		
-		[Test]
-		public void HandlesNonLiteralFormatParameter ()
-		{
-			var input = @"
-class Foo
-{
-	void Bar (int i)
-	{
-		string format = ""{0}"";
-		string s = string.Format(format, i.ToString());
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantToStringIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"
-class Foo
-{
-	void Bar (int i)
-	{
-		string format = ""{0}"";
-		string s = string.Format (format, i);
-	}
-}");
-		}
-		
-		[Test]
-		public void FormatStringWithNonObjectParameterTests ()
-		{
-			var input = @"
-class Foo
-{
-	void Bar (int i)
-	{
-		string s = FakeFormat(""{0} {1}"", i.ToString(), i.ToString());
-	}
-
-	void FakeFormat(string format, string arg0, object arg1)
-	{
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantToStringIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"
-class Foo
-{
-	void Bar (int i)
-	{
-		string s = FakeFormat (""{0} {1}"", i.ToString (), i);
-	}
-
-	void FakeFormat(string format, string arg0, object arg1)
-	{
-	}
-}");
-		}
-		
-		[Test]
-		public void FormatMethodWithObjectParamsArray ()
-		{
-			var input = @"
-class Foo
-{
-	void Bar (int i)
-	{
-		string s = FakeFormat(""{0} {1}"", i.ToString(), i.ToString());
-	}
-
-	void FakeFormat(string format, params object[] args)
-	{
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantToStringIssue (), input, out context);
-			Assert.AreEqual (2, issues.Count);
-			CheckFix (context, issues, @"
-class Foo
-{
-	void Bar (int i)
-	{
-		string s = FakeFormat (""{0} {1}"", i, i);
-	}
-
-	void FakeFormat(string format, params object[] args)
-	{
-	}
-}");
-		}
-		
-		[Test, Ignore("broken")]
-		public void DetectsBlacklistedCalls ()
-		{
-			var input = @"
-class Foo
-{
-	void Bar (int i)
-	{
-		var w = new System.IO.StringWriter ();
-		w.Write (i.ToString());
-		w.WriteLine (i.ToString());
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantToStringIssue (), input, out context);
-			Assert.AreEqual (2, issues.Count);
-			CheckFix (context, issues, @"
-class Foo
-{
-	void Bar (int i)
-	{
-		var w = new System.IO.StringWriter ();
-		w.Write (i);
-		w.WriteLine (i);
-	}
-}");
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantTypeArgumentsOfMethodIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantTypeArgumentsOfMethodIssueTests.cs
new file mode 100644
index 0000000000..e491f46118
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantTypeArgumentsOfMethodIssueTests.cs
@@ -0,0 +1,96 @@
+//
+// RedundantTypeArgumentsOfMethodIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[Ignore]
+	[TestFixture]
+	public class RedundantTypeArgumentsOfMethodIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase ()
+		{
+			Test<RedundantTypeArgumentsOfMethodIssue>(@"
+using System;
+
+public class Bar
+{
+	void Foo<T> (T t)
+	{
+		Console.WriteLine (t);
+	}
+
+	public void FooBar ()
+	{
+		Foo<int> (5);
+	}
+}
+", @"
+using System;
+
+public class Bar
+{
+	void Foo<T> (T t)
+	{
+		Console.WriteLine (t);
+	}
+
+	public void FooBar ()
+	{
+		Foo (5);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<RedundantTypeArgumentsOfMethodIssue>(@"
+using System;
+
+public class Bar
+{
+	void Foo<T> (T t)
+	{
+		Console.WriteLine (t);
+	}
+
+	public void FooBar ()
+	{
+		// ReSharper disable once RedundantTypeArgumentsOfMethod
+		Foo<int> (5);
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantTypeCastIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantTypeCastIssueTests.cs
deleted file mode 100644
index 57023e0d38..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantTypeCastIssueTests.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-// 
-// RedundantTypeCastIssueTests.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class RedundantTypeCastIssueTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestSameType ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		int i = 0;
-		var i2 = ((int)i);
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod ()
-	{
-		int i = 0;
-		var i2 = i;
-	}
-}";
-			Test<RedundantTypeCastIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestInvocation ()
-		{
-			var input = @"
-class TestClass
-{
-	void Test (object obj)
-	{
-	}
-	void TestMethod (object obj)
-	{
-		Test ((int)obj);
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void Test (object obj)
-	{
-	}
-	void TestMethod (object obj)
-	{
-		Test (obj);
-	}
-}";
-			Test<RedundantTypeCastIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestLambdaInvocation ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod (object obj)
-	{
-		System.Action<object> a;
-		a ((int)obj);
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod (object obj)
-	{
-		System.Action<object> a;
-		a (obj);
-	}
-}";
-			Test<RedundantTypeCastIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestMember ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod (object obj)
-	{
-		var str = (obj as TestClass).ToString ();
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod (object obj)
-	{
-		var str = obj.ToString ();
-	}
-}";
-			Test<RedundantTypeCastIssue> (input, 1, output);
-		}
-
-		[Test]
-		public void TestNoIssue ()
-		{
-			var input = @"
-class TestClass
-{
-	void Test (int k) { }
-	void TestMethod (object obj)
-	{
-		int i = (int)obj + 1;
-		Test ((long) obj);
-		(obj as TestClass).Test (0);
-	}
-}";
-			Test<RedundantTypeCastIssue> (input, 0);
-		}
-
-		/// <summary>
-		/// Bug 7065 - "remove redundant type cast" false positive for explicit interface implementation
-		/// </summary>
-		[Test]
-		public void TestBug7065 ()
-		{
-			var input = @"
-using System;
-public class TestClass : IDisposable
-{
-	void IDisposable.Dispose()
-	{
-	}
-
-	void Foo()
-	{
-	    ((IDisposable)this).Dispose();
-	}
-}
-";
-			Test<RedundantTypeCastIssue> (input, 0);
-		}
-
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantUnsafeContextIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantUnsafeContextIssueTests.cs
new file mode 100644
index 0000000000..9ba61c8db9
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantUnsafeContextIssueTests.cs
@@ -0,0 +1,140 @@
+//
+// RedundantUnsafeContextIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantUnsafeContextIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestUnsafeClass ()
+		{
+			Test<RedundantUnsafeContextIssue>(@"
+unsafe class Foo
+{
+	public static void Main (string[] args)
+	{
+		System.Console.WriteLine (""Hello World!"");
+	}
+}
+", @"
+class Foo
+{
+	public static void Main (string[] args)
+	{
+		System.Console.WriteLine (""Hello World!"");
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestUnsafeStatement ()
+		{
+			Test<RedundantUnsafeContextIssue>(@"
+class Foo
+{
+	public static void Main (string[] args)
+	{
+		unsafe {
+			System.Console.WriteLine (""Hello World1!"");
+			System.Console.WriteLine (""Hello World2!"");
+		}
+	}
+}
+", @"
+class Foo
+{
+	public static void Main (string[] args)
+	{
+		System.Console.WriteLine (""Hello World1!"");
+		System.Console.WriteLine (""Hello World2!"");
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestNestedUnsafeStatement ()
+		{
+			Test<RedundantUnsafeContextIssue>(@"
+unsafe class Program
+{
+	static void Main(string str)
+	{
+		unsafe {
+			fixed (char* charPtr = &str) {
+				*charPtr = 'A';
+			}
+		}
+	}
+}
+", @"
+unsafe class Program
+{
+	static void Main(string str)
+	{
+		fixed (char* charPtr = &str) {
+			*charPtr = 'A';
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestValidFixedPointer ()
+		{
+			TestWrongContext<RedundantUnsafeContextIssue>(@"
+unsafe struct Foo {
+	public fixed char fixedBuffer[128];
+}
+");
+		}
+
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<RedundantUnsafeContextIssue>(@"
+unsafe class Foo
+{
+	public static void Main (string[] args)
+	{
+		// ReSharper disable once RedundantUnsafeContext
+		System.Console.WriteLine (""Hello World!"");
+	}
+}
+");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantUsingDirectiveIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantUsingDirectiveIssueTests.cs
new file mode 100644
index 0000000000..c2a39c03b9
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantUsingDirectiveIssueTests.cs
@@ -0,0 +1,274 @@
+// 
+// RedundantUsingDirectiveIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RedundantUsingDirectiveIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestInspectorCase1 ()
+		{
+			var input = @"using System;
+
+class Foo
+{
+	void Bar (string str)
+	{
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantUsingDirectiveIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"
+class Foo
+{
+	void Bar (string str)
+	{
+	}
+}");
+		}
+		
+		[Test]
+		public void TestInspectorCase2 ()
+		{
+			var input = @"using System;
+
+class Foo
+{
+	void Bar (string str)
+	{
+	}
+}";
+
+			TestRefactoringContext context;
+			var issueProvider = new RedundantUsingDirectiveIssue ();
+			issueProvider.NamespacesToKeep.Add("System");
+			var issues = GetIssues (issueProvider, input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+		
+		[Test]
+		public void TestInspectorCase3 ()
+		{
+			var input = @"using System;
+using System.Collections.Generic;
+
+namespace Foo
+{
+	class Bar
+	{
+		List<String> list;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantUsingDirectiveIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+		
+		[Test]
+		public void Linq1 ()
+		{
+			var input = @"using System;
+using System.Collections.Generic;
+using System.Linq;
+
+class Bar
+{
+	public object M(List<String> list)
+	{
+		return list.Where(t => !String.IsNullOrEmpty(t));
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantUsingDirectiveIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+		
+		[Test]
+		public void Linq2 ()
+		{
+			var input = @"using System;
+using System.Collections.Generic;
+using System.Linq;
+
+class Bar
+{
+	public object M(List<String> list)
+	{
+		return from t in list where !String.IsNullOrEmpty(t) select t;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantUsingDirectiveIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+		[Test]
+		public void TestResharperDisableRestore ()
+		{
+			var input = @"// ReSharper disable RedundantUsingDirective
+using System;
+// ReSharper restore RedundantUsingDirective
+using System.IO;
+
+class Foo
+{
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantUsingDirectiveIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+		}
+
+		[Test]
+		public void TestResharperDisableOnce ()
+		{
+			var input = @"using System;
+// ReSharper disable once RedundantUsingDirective
+using System.IO;
+using System.Text;
+
+class Foo
+{
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new RedundantUsingDirectiveIssue (), input, out context);
+			Assert.AreEqual (2, issues.Count);
+		}
+
+		[Test]
+		public void TestSubnamespace ()
+		{
+			Test<RedundantUsingDirectiveIssue>(@"namespace Foo
+{
+	using System;
+	using System.Collections.Generic;
+
+	class Bar
+	{
+		public static void Main (string[] args)
+		{
+			Console.WriteLine ();
+		}
+	}
+}", @"namespace Foo
+{
+	using System;
+
+	class Bar
+	{
+		public static void Main (string[] args)
+		{
+			Console.WriteLine ();
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestSubnamespaceCase1 ()
+		{
+			Test<RedundantUsingDirectiveIssue>(@"namespace Foo
+{
+	using System;
+	namespace Sub {
+		using System;
+	}
+	
+	namespace Sub2 {
+		class Bar
+		{
+			public static void Main (string[] args)
+			{
+				Console.WriteLine ();
+			}
+		}
+	}
+}", @"namespace Foo
+{
+	using System;
+	namespace Sub {
+	}
+	
+	namespace Sub2 {
+		class Bar
+		{
+			public static void Main (string[] args)
+			{
+				Console.WriteLine ();
+			}
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestSubnamespaceCase3 ()
+		{
+			Test<RedundantUsingDirectiveIssue>(@"namespace Foo
+{
+	using System;
+	
+	namespace Sub2 {
+		using System;
+		class Bar
+		{
+			public static void Main (string[] args)
+			{
+				Console.WriteLine ();
+			}
+		}
+	}
+}", @"namespace Foo
+{
+	
+	namespace Sub2 {
+		using System;
+		class Bar
+		{
+			public static void Main (string[] args)
+			{
+				Console.WriteLine ();
+			}
+		}
+	}
+}");
+		}
+
+
+	}
+
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantUsingInspectorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantUsingInspectorTests.cs
deleted file mode 100644
index 16803e5d8b..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantUsingInspectorTests.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// 
-// RedundantUsingInspectorTests.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class RedundantUsingInspectorTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestInspectorCase1 ()
-		{
-			var input = @"using System;
-
-class Foo
-{
-	void Bar (string str)
-	{
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantUsingIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"
-class Foo
-{
-	void Bar (string str)
-	{
-	}
-}");
-		}
-		
-		[Test]
-		public void TestInspectorCase2 ()
-		{
-			var input = @"using System;
-
-class Foo
-{
-	void Bar (string str)
-	{
-	}
-}";
-
-			TestRefactoringContext context;
-			var issueProvider = new RedundantUsingIssue ();
-			issueProvider.NamespacesToKeep.Add("System");
-			var issues = GetIssues (issueProvider, input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-		
-		[Test]
-		public void TestInspectorCase3 ()
-		{
-			var input = @"using System;
-using System.Collections.Generic;
-
-namespace Foo
-{
-	class Bar
-	{
-		List<String> list;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantUsingIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-		
-		[Test]
-		public void Linq1 ()
-		{
-			var input = @"using System;
-using System.Collections.Generic;
-using System.Linq;
-
-class Bar
-{
-	public object M(List<String> list)
-	{
-		return list.Where(t => !String.IsNullOrEmpty(t));
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantUsingIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-		
-		[Test]
-		public void Linq2 ()
-		{
-			var input = @"using System;
-using System.Collections.Generic;
-using System.Linq;
-
-class Bar
-{
-	public object M(List<String> list)
-	{
-		return from t in list where !String.IsNullOrEmpty(t) select t;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantUsingIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-
-		[Test]
-		public void TestResharperDisableRestore ()
-		{
-			var input = @"// ReSharper disable RedundantUsingDirective
-using System;
-// ReSharper restore RedundantUsingDirective
-using System.IO;
-
-class Foo
-{
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantUsingIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantWhereWithPredicateIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantWhereWithPredicateIssueTests.cs
index fc40866ca6..97fdadbab7 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantWhereWithPredicateIssueTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantWhereWithPredicateIssueTests.cs
@@ -1,3 +1,29 @@
+// 
+// ReplaceWithSingleCallToAnyIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
 using System;
 using NUnit.Framework;
 using ICSharpCode.NRefactory.CSharp.Refactoring;
@@ -6,7 +32,7 @@ using ICSharpCode.NRefactory.CSharp.CodeActions;
 namespace ICSharpCode.NRefactory.CSharp.CodeIssues
 {
 	[TestFixture]
-	public class RedundantWhereWithPredicateIssueTests : InspectionActionTestBase
+    public class ReplaceWithSingleCallToAnyIssueTests : InspectionActionTestBase
 	{
 		[Test]
 		public void TestWhereAnyCase1 ()
@@ -20,7 +46,7 @@ public class CSharpDemo {
 }";
 			
 			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantWhereWithPredicateIssue (), input, out context);
+			var issues = GetIssues (new ReplaceWithSingleCallToAnyIssue (), input, out context);
 			Assert.AreEqual (1, issues.Count);
 			CheckFix (context, issues, @"using System.Linq;
 public class CSharpDemo {
@@ -43,7 +69,7 @@ public class CSharpDemo {
 }";
 			
 			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantWhereWithPredicateIssue (), input, out context);
+			var issues = GetIssues (new ReplaceWithSingleCallToAnyIssue (), input, out context);
 			Assert.AreEqual (0, issues.Count);
 		}
 		
@@ -63,31 +89,25 @@ public class X
 }";
 			
 			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantWhereWithPredicateIssue (), input, out context);
+			var issues = GetIssues (new ReplaceWithSingleCallToAnyIssue (), input, out context);
 			Assert.AreEqual (0, issues.Count);
 		}
-		
-		[Test]
-		public void TestWhereCount()
-		{
-			var input = @"using System.Linq;
+
+        [Test]
+        public void TestDisable()
+        {
+            var input = @"using System.Linq;
 public class CSharpDemo {
 	public void Bla () {
 		int[] arr;
-		var bla = arr.Where (x => x < 4).Count ();
+        // ReSharper disable once ReplaceWithSingleCallToAny
+		var bla = arr.Where (x => x < 4).Any ();
 	}
 }";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new RedundantWhereWithPredicateIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"using System.Linq;
-public class CSharpDemo {
-	public void Bla () {
-		int[] arr;
-		var bla = arr.Count (x => x < 4);
-	}
-}");
-		}
+
+            TestRefactoringContext context;
+            var issues = GetIssues(new ReplaceWithSingleCallToAnyIssue(), input, out context);
+            Assert.AreEqual(0, issues.Count);
+        }
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReferenceEqualsCalledWithValueTypeIssueTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReferenceEqualsCalledWithValueTypeIssueTest.cs
deleted file mode 100644
index 15f205ec6a..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReferenceEqualsCalledWithValueTypeIssueTest.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-// 
-// ReferenceEqualsCalledWithValueTypeIssueTest.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class ReferenceEqualsCalledWithValueTypeIssueTest : InspectionActionTestBase
-	{
-		[Test]
-		public void TestValueType ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod (int i, int j)
-	{
-		var x = object.ReferenceEquals (i, j);
-		var x2 = ReferenceEquals (i, j);
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod (int i, int j)
-	{
-		var x = object.Equals (i, j);
-		var x2 = object.Equals (i, j);
-	}
-}";
-			Test<ReferenceEqualsCalledWithValueTypeIssue> (input, 2, output);
-		}
-
-		[Test]
-		public void TestNoIssue ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod<T> (object i, T j)
-	{
-		var x = object.ReferenceEquals (i, i);
-		var x2 = object.ReferenceEquals (j, j);
-	}
-}";
-			Test<ReferenceEqualsCalledWithValueTypeIssue> (input, 0);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReferenceEqualsWithValueTypeIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReferenceEqualsWithValueTypeIssueTests.cs
new file mode 100644
index 0000000000..6960b6d38c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReferenceEqualsWithValueTypeIssueTests.cs
@@ -0,0 +1,107 @@
+// 
+// ReferenceEqualsCalledWithValueTypeIssueTest.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReferenceEqualsWithValueTypeIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestValueTypeCase1 ()
+		{
+			Test<ReferenceEqualsWithValueTypeIssue> (@"
+class TestClass
+{
+	void TestMethod (int i, int j)
+	{
+		var x = object.ReferenceEquals (i, j);
+	}
+}", @"
+class TestClass
+{
+	void TestMethod (int i, int j)
+	{
+		var x = false;
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestValueTypeCase2 ()
+		{
+			Test<ReferenceEqualsWithValueTypeIssue> (@"
+class TestClass
+{
+	void TestMethod (int i, int j)
+	{
+		var x2 = ReferenceEquals (i, j);
+	}
+}", @"
+class TestClass
+{
+	void TestMethod (int i, int j)
+	{
+		var x2 = object.Equals (i, j);
+	}
+}", 1);
+		}
+
+		[Test]
+		public void TestNoIssue ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod<T> (object i, T j)
+	{
+		var x = object.ReferenceEquals (i, i);
+		var x2 = object.ReferenceEquals (j, j);
+	}
+}";
+			Test<ReferenceEqualsWithValueTypeIssue> (input, 0);
+		}
+	
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ReferenceEqualsWithValueTypeIssue> (@"
+class TestClass
+{
+	void TestMethod (int i, int j)
+	{
+		// ReSharper disable once ReferenceEqualsWithValueType
+		var x2 = ReferenceEquals (i, j);
+	}
+}");
+		}
+
+
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReferenceToStaticMemberViaDerivedTypeTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReferenceToStaticMemberViaDerivedTypeTests.cs
deleted file mode 100644
index b5d6100fe9..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReferenceToStaticMemberViaDerivedTypeTests.cs
+++ /dev/null
@@ -1,326 +0,0 @@
-//
-// CallToStaticMemberViaDerivedType.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class ReferenceToStaticMemberViaDerivedTypeTests : InspectionActionTestBase
-	{
-		[Test]
-		public void MemberInvocation()
-		{
-			var input = @"
-class A
-{
-	public static void F() { }
-}
-class B : A { }
-class C
-{
-	void Main()
-	{
-		B.F ();
-	}
-}";
-			TestRefactoringContext context;			
-			var issues = GetIssues(new ReferenceToStaticMemberViaDerivedTypeIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			Assert.AreEqual(11, issues [0].Start.Line);
-
-			CheckFix(context, issues [0], @"
-class A
-{
-	public static void F() { }
-}
-class B : A { }
-class C
-{
-	void Main()
-	{
-		A.F ();
-	}
-}"
-			);
-		}
-
-		[Test]
-		public void PropertyAccess()
-		{
-			var input = @"
-class A
-{
-	public static string Property { get; set; }
-}
-class B : A { }
-class C
-{
-	void Main()
-	{
-		System.Console.WriteLine(B.Property);
-	}
-}";
-			TestRefactoringContext context;			
-			var issues = GetIssues(new ReferenceToStaticMemberViaDerivedTypeIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			Assert.AreEqual(11, issues [0].Start.Line);
-			
-			CheckFix(context, issues [0], @"
-class A
-{
-	public static string Property { get; set; }
-}
-class B : A { }
-class C
-{
-	void Main()
-	{
-		System.Console.WriteLine(A.Property);
-	}
-}"
-			);
-		}
-		
-		[Test]
-		public void FieldAccess()
-		{
-			var input = @"
-class A
-{
-	public static string Property;
-}
-class B : A { }
-class C
-{
-	void Main()
-	{
-		System.Console.WriteLine(B.Property);
-	}
-}";
-			TestRefactoringContext context;			
-			var issues = GetIssues(new ReferenceToStaticMemberViaDerivedTypeIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			Assert.AreEqual(11, issues [0].Start.Line);
-			
-			CheckFix(context, issues [0], @"
-class A
-{
-	public static string Property;
-}
-class B : A { }
-class C
-{
-	void Main()
-	{
-		System.Console.WriteLine(A.Property);
-	}
-}"
-			);
-		}
-
-		[Test]
-		public void NestedClass()
-		{
-			var input = @"
-class A
-{
-	public class B
-	{
-		public static void F() { }
-	}
-	public class C : B { }
-}
-class D
-{
-	void Main()
-	{
-		A.C.F ();
-	}
-}";
-			TestRefactoringContext context;			
-			var issues = GetIssues(new ReferenceToStaticMemberViaDerivedTypeIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			Assert.AreEqual(14, issues [0].Start.Line);
-			
-			CheckFix(context, issues [0], @"
-class A
-{
-	public class B
-	{
-		public static void F() { }
-	}
-	public class C : B { }
-}
-class D
-{
-	void Main()
-	{
-		A.B.F ();
-	}
-}"
-			);
-		}
-		
-		[Test]
-		public void ExpandsTypeWithNamespaceIfNeccessary()
-		{
-			var input = @"
-namespace First
-{
-	class A
-	{
-		public static void F() { }
-	}
-}
-namespace Second
-{
-	public class B : First.A { }
-	class C
-	{
-		void Main()
-		{
-			B.F ();
-		}
-	}
-}";
-			TestRefactoringContext context;			
-			var issues = GetIssues(new ReferenceToStaticMemberViaDerivedTypeIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			Assert.AreEqual(16, issues [0].Start.Line);
-			
-			CheckFix(context, issues [0], @"
-namespace First
-{
-	class A
-	{
-		public static void F() { }
-	}
-}
-namespace Second
-{
-	public class B : First.A { }
-	class C
-	{
-		void Main()
-		{
-			First.A.F ();
-		}
-	}
-}"
-			);
-		}
-		
-		[Test]
-		public void IgnoresCorrectCalls()
-		{
-			var input = @"
-class A
-{
-	public static void F() { }
-}
-class B
-{
-	void Main()
-	{
-		A.F();
-	}
-}";
-			TestRefactoringContext context;			
-			var issues = GetIssues(new ReferenceToStaticMemberViaDerivedTypeIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void IgnoresNonStaticCalls()
-		{
-			var input = @"
-class A
-{
-	public void F() { }
-}
-class B : A { }
-class C
-{
-	void Main()
-	{
-		B b = new B();
-		b.F();
-	}
-}";
-			TestRefactoringContext context;			
-			var issues = GetIssues(new ReferenceToStaticMemberViaDerivedTypeIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void IgnoresOwnMemberFunctions()
-		{
-			var input = @"
-class A
-{
-	protected static void F() { }
-}
-class B : A
-{
-	void Main()
-	{
-		F();
-		this.F();
-		base.F();
-	}
-}";
-			TestRefactoringContext context;			
-			var issues = GetIssues(new ReferenceToStaticMemberViaDerivedTypeIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void IgnoresCuriouslyRecurringTemplatePattern()
-		{
-			var input = @"
-class Base<T>
-{
-	public static void F() { }
-}
-class Derived : Base<Derived> {}
-class Test
-{
-	void Main()
-	{
-		Derived.F();
-	}
-}";
-			// do not suggest replacing 'Derived.F()' with 'Base<Derived>.F()'
-			TestRefactoringContext context;			
-			var issues = GetIssues(new ReferenceToStaticMemberViaDerivedTypeIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RemoveRedundantOrStatementIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RemoveRedundantOrStatementIssueTests.cs
new file mode 100644
index 0000000000..8a9eaf16db
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RemoveRedundantOrStatementIssueTests.cs
@@ -0,0 +1,99 @@
+//
+// RemoveRedundantOrStatementIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RemoveRedundantOrStatementIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestOrCase ()
+		{
+			Test<RemoveRedundantOrStatementIssue>(@"
+class MainClass
+{
+	static bool bb { get; set; }
+	public static void Main(string[] args)
+	{
+		MainClass.bb |= false;
+	}
+}
+", @"
+class MainClass
+{
+	static bool bb { get; set; }
+	public static void Main(string[] args)
+	{
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestAndCase ()
+		{
+			Test<RemoveRedundantOrStatementIssue>(@"
+class MainClass
+{
+	static bool bb { get; set; }
+	public static void Main(string[] args)
+	{
+		MainClass.bb &= true;
+	}
+}
+", @"
+class MainClass
+{
+	static bool bb { get; set; }
+	public static void Main(string[] args)
+	{
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<RemoveRedundantOrStatementIssue>(@"
+class MainClass
+{
+	static bool bb { get; set; }
+	public static void Main(string[] args)
+	{
+		// ReSharper disable once RemoveRedundantOrStatement
+		MainClass.bb |= false;
+	}
+}
+");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithFirstOrDefaultIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithFirstOrDefaultIssueTests.cs
new file mode 100644
index 0000000000..60eedceeeb
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithFirstOrDefaultIssueTests.cs
@@ -0,0 +1,111 @@
+//
+// ReplaceWithFirstOrDefaultIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithFirstOrDefaultIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestBasicCase ()
+		{
+			Test<ReplaceWithFirstOrDefaultIssue>(@"using System.Linq;
+class Bar
+{
+	public void FooBar(string[] args)
+	{
+		var first = args.Any () ? args.First () : null;
+	}
+}", @"using System.Linq;
+class Bar
+{
+	public void FooBar(string[] args)
+	{
+		var first = args.FirstOrDefault ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestBasicCaseWithExpression ()
+		{
+			Test<ReplaceWithFirstOrDefaultIssue>(@"using System.Linq;
+class Bar
+{
+	public void FooBar(string[] args)
+	{
+		args.Any (a => a != null) ? args.First (a => a != null) : null;
+	}
+}", @"using System.Linq;
+class Bar
+{
+	public void FooBar(string[] args)
+	{
+		args.FirstOrDefault (a => a != null);
+	}
+}");
+		}
+
+		[Test]
+		public void TestBasicCaseWithDefault ()
+		{
+			Test<ReplaceWithFirstOrDefaultIssue>(@"using System.Linq;
+class Bar
+{
+	public void FooBar<T>(T[] args)
+	{
+		var first = args.Any () ? args.First () : default(T);
+	}
+}", @"using System.Linq;
+class Bar
+{
+	public void FooBar<T>(T[] args)
+	{
+		var first = args.FirstOrDefault ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ReplaceWithFirstOrDefaultIssue>(@"using System.Linq;
+class Bar
+{
+	public void FooBar(string[] args)
+	{
+		// ReSharper disable once ReplaceWithFirstOrDefault
+		var first = args.Any () ? args.First () : null;
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithLastOrDefaultIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithLastOrDefaultIssueTests.cs
new file mode 100644
index 0000000000..199003ccf3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithLastOrDefaultIssueTests.cs
@@ -0,0 +1,111 @@
+//
+// ReplaceWithLastOrDefaultIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithLastOrDefaultIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestBasicCase ()
+		{
+			Test<ReplaceWithLastOrDefaultIssue>(@"using System.Linq;
+class Bar
+{
+	public void FooBar(string[] args)
+	{
+		var first = args.Any () ? args.Last () : null;
+	}
+}", @"using System.Linq;
+class Bar
+{
+	public void FooBar(string[] args)
+	{
+		var first = args.LastOrDefault ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestBasicCaseWithExpression ()
+		{
+			Test<ReplaceWithLastOrDefaultIssue>(@"using System.Linq;
+class Bar
+{
+	public void FooBar(string[] args)
+	{
+		args.Any (a => a != null) ? args.Last (a => a != null) : null;
+	}
+}", @"using System.Linq;
+class Bar
+{
+	public void FooBar(string[] args)
+	{
+		args.LastOrDefault (a => a != null);
+	}
+}");
+		}
+
+		[Test]
+		public void TestBasicCaseWithDefault ()
+		{
+			Test<ReplaceWithLastOrDefaultIssue>(@"using System.Linq;
+class Bar
+{
+	public void FooBar<T>(T[] args)
+	{
+		var first = args.Any () ? args.Last () : default(T);
+	}
+}", @"using System.Linq;
+class Bar
+{
+	public void FooBar<T>(T[] args)
+	{
+		var first = args.LastOrDefault ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ReplaceWithLastOrDefaultIssue>(@"using System.Linq;
+class Bar
+{
+	public void FooBar(string[] args)
+	{
+		// ReSharper disable once ReplaceWithLastOrDefault
+		var first = args.Any () ? args.Last () : null;
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeAnyIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeAnyIssueTests.cs
new file mode 100644
index 0000000000..dbd69f8e00
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeAnyIssueTests.cs
@@ -0,0 +1,114 @@
+//
+// ReplaceWithOfTypeAnyIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithOfTypeAnyIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestCaseBasic ()
+		{
+			Test<ReplaceWithOfTypeAnyIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).Any (q => q != null);
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().Any ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestCaseBasicWithFollowUpExpresison ()
+		{
+			Test<ReplaceWithOfTypeAnyIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).Any (q => q != null && Foo (q));
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().Any (q => Foo (q));
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ReplaceWithOfTypeAnyIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		// ReSharper disable once ReplaceWithOfType.Any
+		obj.Select (q => q as Test).Any (q => q != null);
+	}
+}");
+		}
+
+		[Test]
+		public void TestJunk ()
+		{
+			TestWrongContext<ReplaceWithOfTypeAnyIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (x => q as Test).Any (q => q != null);
+	}
+}");
+			TestWrongContext<ReplaceWithOfTypeAnyIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).Any (q => 1 != null);
+	}
+}");
+
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeCountIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeCountIssueTests.cs
new file mode 100644
index 0000000000..cd59989213
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeCountIssueTests.cs
@@ -0,0 +1,113 @@
+//
+// ReplaceWithOfTypeCountIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithOfTypeCountIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestCaseBasic ()
+		{
+			Test<ReplaceWithOfTypeCountIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).Count (q => q != null);
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().Count ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestCaseBasicWithFollowUpExpresison ()
+		{
+			Test<ReplaceWithOfTypeCountIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).Count (q => q != null && Foo (q));
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().Count (q => Foo (q));
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ReplaceWithOfTypeCountIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		// ReSharper disable once ReplaceWithOfType.Count
+		obj.Select (q => q as Test).Count (q => q != null);
+	}
+}");
+		}
+
+		[Test]
+		public void TestJunk ()
+		{
+			TestWrongContext<ReplaceWithOfTypeCountIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (x => q as Test).Count (q => q != null);
+	}
+}");
+			TestWrongContext<ReplaceWithOfTypeCountIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).Count (q => 1 != null);
+	}
+}");
+
+		}
+
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeFirstIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeFirstIssueTests.cs
new file mode 100644
index 0000000000..9550bf81d1
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeFirstIssueTests.cs
@@ -0,0 +1,114 @@
+//
+// ReplaceWithOfTypeFirstIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithOfTypeFirstIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestCaseBasic ()
+		{
+			Test<ReplaceWithOfTypeFirstIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).First (q => q != null);
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().First ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestCaseBasicWithFollowUpExpresison ()
+		{
+			Test<ReplaceWithOfTypeFirstIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).First (q => q != null && Foo (q));
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().First (q => Foo (q));
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ReplaceWithOfTypeFirstIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		// ReSharper disable once ReplaceWithOfType.First
+		obj.Select (q => q as Test).First (q => q != null);
+	}
+}");
+		}
+
+		[Test]
+		public void TestJunk ()
+		{
+			TestWrongContext<ReplaceWithOfTypeFirstIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (x => q as Test).First (q => q != null);
+	}
+}");
+			TestWrongContext<ReplaceWithOfTypeFirstIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).First (q => 1 != null);
+	}
+}");
+
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeFirstOrDefaultIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeFirstOrDefaultIssueTests.cs
new file mode 100644
index 0000000000..9a8073a783
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeFirstOrDefaultIssueTests.cs
@@ -0,0 +1,114 @@
+//
+// ReplaceWithOfTypeFirstOrDefaultIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithOfTypeFirstOrDefaultIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestCaseBasic ()
+		{
+			Test<ReplaceWithOfTypeFirstOrDefaultIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).FirstOrDefault (q => q != null);
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().FirstOrDefault ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestCaseBasicWithFollowUpExpresison ()
+		{
+			Test<ReplaceWithOfTypeFirstOrDefaultIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).FirstOrDefault (q => q != null && Foo (q));
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().FirstOrDefault (q => Foo (q));
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ReplaceWithOfTypeFirstOrDefaultIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		// ReSharper disable once ReplaceWithOfType.FirstOrDefault
+		obj.Select (q => q as Test).FirstOrDefault (q => q != null);
+	}
+}");
+		}
+
+		[Test]
+		public void TestJunk ()
+		{
+			TestWrongContext<ReplaceWithOfTypeFirstOrDefaultIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (x => q as Test).FirstOrDefault (q => q != null);
+	}
+}");
+			TestWrongContext<ReplaceWithOfTypeFirstOrDefaultIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).FirstOrDefault (q => 1 != null);
+	}
+}");
+
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeIssueTests.cs
new file mode 100644
index 0000000000..c824afa444
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeIssueTests.cs
@@ -0,0 +1,221 @@
+//
+// ReplaceWithOfTypeIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithOfTypeIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestCaseSelectNotNull ()
+		{
+			Test<ReplaceWithOfTypeIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.SelectNotNull((object o) => o as Test);
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ();
+	}
+}");
+			Test<ReplaceWithOfTypeIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.SelectNotNull(o => o as Test);
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestCaseSelectNotNullWithParentheses ()
+		{
+			Test<ReplaceWithOfTypeIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.SelectNotNull(o => ((o as Test)));
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ();
+	}
+}");
+			Test<ReplaceWithOfTypeIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.SelectNotNull(o => o as Test);
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ();
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestCaseSelectWhereCase1 ()
+		{
+			Test<ReplaceWithOfTypeIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Where(o => o is Test).Select (o => o as Test);
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ();
+	}
+}");
+			Test<ReplaceWithOfTypeIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.SelectNotNull(o => o as Test);
+	}
+}",@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestCaseSelectWhereGabage ()
+		{
+			TestWrongContext<ReplaceWithOfTypeIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Where(o => o is Test).Select (x => o as Test);
+	}
+}");
+			TestWrongContext<ReplaceWithOfTypeIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.SelectNotNull(o => null as Test);
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestCaseSelectWhereCase2WithParens ()
+		{
+			Test<ReplaceWithOfTypeIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Where(o => (o is Test)).Select (o => ((Test)(o)));
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ();
+	}
+}");
+			Test<ReplaceWithOfTypeIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.SelectNotNull(o => o as Test);
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ();
+	}
+}");
+		}
+
+
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ReplaceWithOfTypeIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		// ReSharper disable once ReplaceWithOfType
+		obj.SelectNotNull((object o) => o as Test);
+	}
+}");
+		}
+
+
+
+	}
+	
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeLastIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeLastIssueTests.cs
new file mode 100644
index 0000000000..2ba5065e6c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeLastIssueTests.cs
@@ -0,0 +1,114 @@
+//
+// ReplaceWithOfTypeLastIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithOfTypeLastIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestCaseBasic ()
+		{
+			Test<ReplaceWithOfTypeLastIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).Last (q => q != null);
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().Last ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestCaseBasicWithFollowUpExpresison ()
+		{
+			Test<ReplaceWithOfTypeLastIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).Last (q => q != null && Foo (q));
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().Last (q => Foo (q));
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ReplaceWithOfTypeLastIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		// ReSharper disable once ReplaceWithOfType.Last
+		obj.Select (q => q as Test).Last (q => q != null);
+	}
+}");
+		}
+
+		[Test]
+		public void TestJunk ()
+		{
+			TestWrongContext<ReplaceWithOfTypeLastIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (x => q as Test).Last (q => q != null);
+	}
+}");
+			TestWrongContext<ReplaceWithOfTypeLastIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).Last (q => 1 != null);
+	}
+}");
+
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeLastOrDefaultIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeLastOrDefaultIssueTests.cs
new file mode 100644
index 0000000000..91f77a52bf
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeLastOrDefaultIssueTests.cs
@@ -0,0 +1,114 @@
+//
+// ReplaceWithOfTypeLastOrDefaultIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithOfTypeLastOrDefaultIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestCaseBasic ()
+		{
+			Test<ReplaceWithOfTypeLastOrDefaultIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).LastOrDefault (q => q != null);
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().LastOrDefault ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestCaseBasicWithFollowUpExpresison ()
+		{
+			Test<ReplaceWithOfTypeLastOrDefaultIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).LastOrDefault (q => q != null && Foo (q));
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().LastOrDefault (q => Foo (q));
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ReplaceWithOfTypeLastOrDefaultIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		// ReSharper disable once ReplaceWithOfType.LastOrDefault
+		obj.Select (q => q as Test).LastOrDefault (q => q != null);
+	}
+}");
+		}
+
+		[Test]
+		public void TestJunk ()
+		{
+			TestWrongContext<ReplaceWithOfTypeLastOrDefaultIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (x => q as Test).LastOrDefault (q => q != null);
+	}
+}");
+			TestWrongContext<ReplaceWithOfTypeLastOrDefaultIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).LastOrDefault (q => 1 != null);
+	}
+}");
+
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeLongCountIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeLongCountIssueTests.cs
new file mode 100644
index 0000000000..eb6ae18886
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeLongCountIssueTests.cs
@@ -0,0 +1,114 @@
+//
+// ReplaceWithOfTypeLongCountIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithOfTypeLongCountIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestCaseBasic ()
+		{
+			Test<ReplaceWithOfTypeLongCountIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).LongCount (q => q != null);
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().LongCount ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestCaseBasicWithFollowUpExpresison ()
+		{
+			Test<ReplaceWithOfTypeLongCountIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).LongCount (q => q != null && Foo (q));
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().LongCount (q => Foo (q));
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ReplaceWithOfTypeLongCountIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		// ReSharper disable once ReplaceWithOfType.LongCount
+		obj.Select (q => q as Test).LongCount (q => q != null);
+	}
+}");
+		}
+
+		[Test]
+		public void TestJunk ()
+		{
+			TestWrongContext<ReplaceWithOfTypeLongCountIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (x => q as Test).LongCount (q => q != null);
+	}
+}");
+			TestWrongContext<ReplaceWithOfTypeLongCountIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).LongCount (q => 1 != null);
+	}
+}");
+
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeSingleIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeSingleIssueTests.cs
new file mode 100644
index 0000000000..90bed2f0d8
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeSingleIssueTests.cs
@@ -0,0 +1,114 @@
+//
+// ReplaceWithOfTypeSingleIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithOfTypeSingleIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestCaseBasic ()
+		{
+			Test<ReplaceWithOfTypeSingleIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).Single (q => q != null);
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().Single ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestCaseBasicWithFollowUpExpresison ()
+		{
+			Test<ReplaceWithOfTypeSingleIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).Single (q => q != null && Foo (q));
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().Single (q => Foo (q));
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ReplaceWithOfTypeSingleIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		// ReSharper disable once ReplaceWithOfType.Single
+		obj.Select (q => q as Test).Single (q => q != null);
+	}
+}");
+		}
+
+		[Test]
+		public void TestJunk ()
+		{
+			TestWrongContext<ReplaceWithOfTypeSingleIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (x => q as Test).Single (q => q != null);
+	}
+}");
+			TestWrongContext<ReplaceWithOfTypeSingleIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).Single (q => 1 != null);
+	}
+}");
+
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeSingleOrDefaultIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeSingleOrDefaultIssueTests.cs
new file mode 100644
index 0000000000..125bb25a72
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeSingleOrDefaultIssueTests.cs
@@ -0,0 +1,114 @@
+//
+// ReplaceWithOfTypeSingleOrDefaultIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithOfTypeSingleOrDefaultIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestCaseBasic ()
+		{
+			Test<ReplaceWithOfTypeSingleOrDefaultIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).SingleOrDefault (q => q != null);
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().SingleOrDefault ();
+	}
+}");
+		}
+
+		[Test]
+		public void TestCaseBasicWithFollowUpExpresison ()
+		{
+			Test<ReplaceWithOfTypeSingleOrDefaultIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).SingleOrDefault (q => q != null && Foo (q));
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().SingleOrDefault (q => Foo (q));
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ReplaceWithOfTypeSingleOrDefaultIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		// ReSharper disable once ReplaceWithOfType.SingleOrDefault
+		obj.Select (q => q as Test).SingleOrDefault (q => q != null);
+	}
+}");
+		}
+
+		[Test]
+		public void TestJunk ()
+		{
+			TestWrongContext<ReplaceWithOfTypeSingleOrDefaultIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (x => q as Test).SingleOrDefault (q => q != null);
+	}
+}");
+			TestWrongContext<ReplaceWithOfTypeSingleOrDefaultIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).SingleOrDefault (q => 1 != null);
+	}
+}");
+
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeWhereIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeWhereIssueTests.cs
new file mode 100644
index 0000000000..5090d2d8c4
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithOfTypeWhereIssueTests.cs
@@ -0,0 +1,94 @@
+//
+// ReplaceWithOfTypeWhereIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithOfTypeWhereIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestCaseBasicWithFollowUpExpresison ()
+		{
+			Test<ReplaceWithOfTypeWhereIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).Where (q => q != null && Foo (q));
+	}
+}", @"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.OfType<Test> ().Where (q => Foo (q));
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ReplaceWithOfTypeWhereIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		// ReSharper disable once ReplaceWithOfType.Where
+		obj.Select (q => q as Test).Where (q => q != null);
+	}
+}");
+		}
+
+		[Test]
+		public void TestJunk ()
+		{
+			TestWrongContext<ReplaceWithOfTypeWhereIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (x => q as Test).Where (q => q != null && true);
+	}
+}");
+			TestWrongContext<ReplaceWithOfTypeWhereIssue>(@"using System.Linq;
+class Test
+{
+	public void Foo(object[] obj)
+	{
+		obj.Select (q => q as Test).Where (q => 1 != null && true);
+	}
+}");
+
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSimpleAssignmentIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSimpleAssignmentIssueTests.cs
new file mode 100644
index 0000000000..fcf1a8f908
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSimpleAssignmentIssueTests.cs
@@ -0,0 +1,98 @@
+//
+// ReplaceWithSimpleAssignmentIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithSimpleAssignmentIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestOrCase ()
+		{
+			Test<ReplaceWithSimpleAssignmentIssue>(@"
+class Test
+{
+	void Foo (bool b)
+	{
+		b |= true;
+	}
+}
+", @"
+class Test
+{
+	void Foo (bool b)
+	{
+		b = true;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestAndCase ()
+		{
+			Test<ReplaceWithSimpleAssignmentIssue >(@"
+class Test
+{
+	void Foo (bool b)
+	{
+		b |= true;
+	}
+}
+", @"
+class Test
+{
+	void Foo (bool b)
+	{
+		b = true;
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<ReplaceWithSimpleAssignmentIssue>(@"
+class Test
+{
+	void Foo (bool b)
+	{
+		// ReSharper disable once ReplaceWithSimpleAssignment
+		b |= true;
+	}
+}
+");
+		}
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToCountIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToCountIssueTests.cs
new file mode 100644
index 0000000000..fcd85eafc9
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToCountIssueTests.cs
@@ -0,0 +1,77 @@
+// 
+// ReplaceWithSingleCallToCountIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithSingleCallToCountIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase()
+		{
+			var input = @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+		var bla = arr.Where (x => x < 4).Count ();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new ReplaceWithSingleCallToCountIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			CheckFix(context, issues, @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+		var bla = arr.Count (x => x < 4);
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			var input = @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+// ReSharper disable ReplaceWithSingleCallToCount
+		var bla = arr.Where (x => x < 4).Count ();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new ReplaceWithSingleCallToCountIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToFirstIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToFirstIssueTests.cs
new file mode 100644
index 0000000000..d9e906cb93
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToFirstIssueTests.cs
@@ -0,0 +1,77 @@
+// 
+// ReplaceWithSingleCallToFirstIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithSingleCallToFirstIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase()
+		{
+			var input = @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+		var bla = arr.Where (x => x < 4).First ();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new ReplaceWithSingleCallToFirstIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			CheckFix(context, issues, @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+		var bla = arr.First (x => x < 4);
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			var input = @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+// ReSharper disable ReplaceWithSingleCallToFirst
+		var bla = arr.Where (x => x < 4).First ();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new ReplaceWithSingleCallToFirstIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToFirstOrDefaultIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToFirstOrDefaultIssueTests.cs
new file mode 100644
index 0000000000..ba589d968b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToFirstOrDefaultIssueTests.cs
@@ -0,0 +1,77 @@
+// 
+// ReplaceWithSingleCallToFirstOrDefaultIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithSingleCallToFirstOrDefaultIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase()
+		{
+			var input = @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+		var bla = arr.Where (x => x < 4).FirstOrDefault ();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new ReplaceWithSingleCallToFirstOrDefaultIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			CheckFix(context, issues, @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+		var bla = arr.FirstOrDefault (x => x < 4);
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			var input = @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+// ReSharper disable ReplaceWithSingleCallToFirstOrDefault
+		var bla = arr.Where (x => x < 4).FirstOrDefault ();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new ReplaceWithSingleCallToFirstOrDefaultIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToLastIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToLastIssueTests.cs
new file mode 100644
index 0000000000..27aad0a7f9
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToLastIssueTests.cs
@@ -0,0 +1,77 @@
+// 
+// ReplaceWithSingleCallToLastIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithSingleCallToLastIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase()
+		{
+			var input = @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+		var bla = arr.Where (x => x < 4).Last ();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new ReplaceWithSingleCallToLastIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			CheckFix(context, issues, @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+		var bla = arr.Last (x => x < 4);
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			var input = @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+// ReSharper disable ReplaceWithSingleCallToLast
+		var bla = arr.Where (x => x < 4).Last ();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new ReplaceWithSingleCallToLastIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToLastOrDefaultIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToLastOrDefaultIssueTests.cs
new file mode 100644
index 0000000000..3d3dc1db90
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToLastOrDefaultIssueTests.cs
@@ -0,0 +1,77 @@
+// 
+// ReplaceWithSingleCallToLastOrDefaultIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithSingleCallToLastOrDefaultIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase()
+		{
+			var input = @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+		var bla = arr.Where (x => x < 4).LastOrDefault ();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new ReplaceWithSingleCallToLastOrDefaultIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			CheckFix(context, issues, @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+		var bla = arr.LastOrDefault (x => x < 4);
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			var input = @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+// ReSharper disable ReplaceWithSingleCallToLastOrDefault
+		var bla = arr.Where (x => x < 4).LastOrDefault ();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new ReplaceWithSingleCallToLastOrDefaultIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToLongCountIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToLongCountIssueTests.cs
new file mode 100644
index 0000000000..f26eef23f3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToLongCountIssueTests.cs
@@ -0,0 +1,77 @@
+// 
+// ReplaceWithSingleCallToLongCountIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithSingleCallToLongCountIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase()
+		{
+			var input = @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+		var bla = arr.Where (x => x < 4).LongCount ();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new ReplaceWithSingleCallToLongCountIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			CheckFix(context, issues, @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+		var bla = arr.LongCount (x => x < 4);
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			var input = @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+// ReSharper disable ReplaceWithSingleCallToLongCount
+		var bla = arr.Where (x => x < 4).LongCount ();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new ReplaceWithSingleCallToLongCountIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToSingleIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToSingleIssueTests.cs
new file mode 100644
index 0000000000..d31b3d20cb
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToSingleIssueTests.cs
@@ -0,0 +1,77 @@
+// 
+// ReplaceWithSingleCallToSingleIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithSingleCallToSingleIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase()
+		{
+			var input = @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+		var bla = arr.Where (x => x < 4).Single ();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new ReplaceWithSingleCallToSingleIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			CheckFix(context, issues, @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+		var bla = arr.Single (x => x < 4);
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			var input = @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+// ReSharper disable ReplaceWithSingleCallToSingle
+		var bla = arr.Where (x => x < 4).Single ();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new ReplaceWithSingleCallToSingleIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToSingleOrDefaultIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToSingleOrDefaultIssueTests.cs
new file mode 100644
index 0000000000..e5bf61ea0c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithSingleCallToSingleOrDefaultIssueTests.cs
@@ -0,0 +1,77 @@
+// 
+// ReplaceWithSingleCallToSingleOrDefaultIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2013 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithSingleCallToSingleOrDefaultIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase()
+		{
+			var input = @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+		var bla = arr.Where (x => x < 4).SingleOrDefault ();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new ReplaceWithSingleCallToSingleOrDefaultIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+			CheckFix(context, issues, @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+		var bla = arr.SingleOrDefault (x => x < 4);
+	}
+}");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			var input = @"using System.Linq;
+public class CSharpDemo {
+	public void Bla () {
+		int[] arr;
+// ReSharper disable ReplaceWithSingleCallToSingleOrDefault
+		var bla = arr.Where (x => x < 4).SingleOrDefault ();
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues(new ReplaceWithSingleCallToSingleOrDefaultIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithStringIsNullOrEmptyIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithStringIsNullOrEmptyIssueTests.cs
new file mode 100644
index 0000000000..fb4f0da774
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ReplaceWithStringIsNullOrEmptyIssueTests.cs
@@ -0,0 +1,586 @@
+// 
+// ReplaceWithStringIsNullOrEmptyIssueTests.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ReplaceWithStringIsNullOrEmptyIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestInspectorCaseNS1 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if (str != null && str != """")
+			;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (!string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInspectorCaseNS2 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if (null != str && str != """")
+			;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (!string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInspectorNegatedStringEmpty ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if (null != str && str != string.Empty)
+			;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (!string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInspectorStringEmpty ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if (null == str || str == string.Empty)
+			;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInspectorCaseNS3 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if (null != str && """" != str)
+			;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (!string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInspectorCaseNS4 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if (str != null && str != """")
+			;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (!string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInspectorCaseSN1 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if (str != """" && str != null)
+			;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (!string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInspectorCaseSN2 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if ("""" != str && str != null)
+			;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (!string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInspectorCaseSN3 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if ("""" != str && null != str)
+			;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (!string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestInspectorCaseSN4 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if (str != """" && null != str)
+			;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (!string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInspectorCaseNS5 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if (str == null || str == """")
+			;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInspectorCaseNS6 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if (null == str || str == """")
+			;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInspectorCaseNS7 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if (null == str || """" == str)
+			;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInspectorCaseNS8 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if (str == null || """" == str)
+			;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInspectorCaseSN5 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if (str == """" || str == null)
+			;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInspectorCaseSN6 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if ("""" == str || str == null)
+			;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void TestInspectorCaseSN7 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if ("""" == str || null == str)
+			;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+		
+		[Test]
+		public void TestInspectorCaseSN8 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if (str == """" || null == str)
+			;
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+		
+		[TestCase("str == null || str.Length == 0")]
+		[TestCase("str == null || 0 == str.Length")]
+		[TestCase("null == str || str.Length == 0")]
+		[TestCase("null == str || 0 == str.Length")]
+		public void TestInspectorCaseNL (string expression)
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if (" + expression + @")
+			;
+	}
+}";
+			
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+	
+		[TestCase("str != null && str.Length != 0")]
+		[TestCase("str != null && 0 != str.Length")]
+		[TestCase("str != null && str.Length > 0")]
+		[TestCase("null != str && str.Length != 0")]
+		[TestCase("null != str && 0 != str.Length")]
+		[TestCase("null != str && str.Length > 0")]
+		public void TestInspectorCaseLN (string expression)
+		{
+			var input = @"class Foo
+{
+	void Bar (string str)
+	{
+		if (" + expression + @")
+			;
+	}
+}";
+		
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			CheckFix (context, issues, @"class Foo
+{
+	void Bar (string str)
+	{
+		if (!string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void TestArrays ()
+		{
+			var input = @"class Foo
+{
+	void Bar ()
+	{
+		int[] foo = new int[10];
+		if (foo == null || foo.Length == 0) {
+		}
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new ReplaceWithStringIsNullOrEmptyIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+		}
+
+		[Test]
+		public void TestInspectorCaseNS1WithParentheses ()
+		{
+			Test<ReplaceWithStringIsNullOrEmptyIssue>(@"class Foo
+{
+	void Bar (string str)
+	{
+		if ((str != null) && (str) != """")
+			;
+	}
+}", @"class Foo
+{
+	void Bar (string str)
+	{
+		if (!string.IsNullOrEmpty (str))
+			;
+	}
+}");
+		}
+
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RewriteIfReturnToReturnIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RewriteIfReturnToReturnIssueTests.cs
new file mode 100644
index 0000000000..c571bad614
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RewriteIfReturnToReturnIssueTests.cs
@@ -0,0 +1,134 @@
+//
+// RewriteIfReturnToReturnIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class RewriteIfReturnToReturnIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestIfElse ()
+		{
+			TestIssue<RewriteIfReturnToReturnIssue>(@"class Foo
+{
+	bool Bar (string str)
+	{
+		if (str.Length > 10)
+			return true;
+		else
+			return false;
+	}
+}");
+		}
+
+		[Test]
+		public void TestIfReturn ()
+		{
+			TestIssue<RewriteIfReturnToReturnIssue>(@"class Foo
+{
+	bool Bar (string str)
+	{
+		if (str.Length > 10)
+			return true;
+		return false;
+	}
+}");
+		}
+	
+		[Test]
+		public void TestSkipIfElseIf ()
+		{
+			TestWrongContext<ConvertIfStatementToConditionalTernaryExpressionIssue>(@"class Foo
+{
+	static int Bar (int x)
+	{
+		if (x < 10)
+			return -10;
+		else if (x > 10)
+			return 10;
+		else
+			return 20;
+		return result;
+	}
+}");
+		}
+
+		[Test]
+		public void TestSkipComplexTrueExpression ()
+		{
+			TestWrongContext<ConvertIfStatementToConditionalTernaryExpressionIssue>(@"class Foo
+{
+	static int Bar (int x)
+	{
+		if (x > 10)
+			return 10 +
+					 12;
+		else
+			return 20;
+		return result;
+	}
+}");
+		}
+
+		[Test]
+		public void TestSkipComplexFalseExpression ()
+		{
+			TestWrongContext<ConvertIfStatementToConditionalTernaryExpressionIssue>(@"class Foo
+{
+	static int Bar (int x)
+	{
+		if (x > 10)
+			return 10;
+		else
+			return 20 +
+
+12;
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestSkipAnnoyingSuggestionCase1 ()
+		{
+			TestWrongContext<ConvertIfStatementToConditionalTernaryExpressionIssue>(@"class Foo
+{
+	int Bar (int a, int b)
+	{
+		if (a < 1 && a > 2 && b < a) {
+			return a;
+		}
+		return b;
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SameGuardConditionExpressionInIfElseBranchesTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SameGuardConditionExpressionInIfElseBranchesTests.cs
new file mode 100644
index 0000000000..5159343ce8
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SameGuardConditionExpressionInIfElseBranchesTests.cs
@@ -0,0 +1,223 @@
+//
+// SameGuardConditionExpressionInIfElseBranchesTests.cs
+//
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+//
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class SameGuardConditionExpressionInIfElseBranchesTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestConditionalExpression()
+		{
+			var input = @"
+class TestClass
+{
+	int TestMethod ()
+	{
+		int foo = 1;
+		if (foo > 5)
+		{
+			return 2;
+		}
+		else if(foo > 5)
+		{
+			return 5;
+		}
+		return 0;
+	}
+}";
+			Test<SameGuardConditionExpressionInIfelseBranchesIssue>(input, 1);
+		}
+		
+		[Test]
+		public void TestConditionalExpression2()
+		{
+			var input = @"
+class TestClass
+{
+	int TestMethod ()
+	{
+		int foo = 1;
+		if (foo > 5)
+		{
+			return 2;
+		}
+		else if(foo < 5)
+		{
+			return 5;
+		}
+		else if (foo>5)
+		{
+			return 6;
+		}
+		return 0;
+	}
+}";
+			Test<SameGuardConditionExpressionInIfelseBranchesIssue>(input, 1);
+		}
+		
+		[Test]
+		public void TestNoProblem()
+		{
+			var input = @"
+class TestClass
+{
+	int TestMethod (int foo)
+	{
+		if (foo > 5)
+		{
+			return 2;
+		}
+		else if (foo > 5)
+		{
+			return 5;
+		}
+		return 0;
+	}
+}";
+			Test<SameGuardConditionExpressionInIfelseBranchesIssue>(input, 0);
+		}
+
+		[Test]
+		public void TestNoProblem2()
+		{
+			var input = @"
+class TestClass
+{
+	int TestMethod ()
+	{
+		int foo = 1;
+		if (foo > 5)
+		{
+			return 2;
+		}
+		else if (foo > 6)
+		{
+			return 5;
+		}
+		return 0;
+	}
+}";
+			Test<SameGuardConditionExpressionInIfelseBranchesIssue>(input, 0);
+		}
+
+		[Test]
+		public void TestNoProblem3()
+		{
+			var input = @"
+class TestClass
+{
+	int TestMethod ()
+	{
+		int foo = 1;
+		if (foo-- > 5)
+		{
+			return 2;
+		}
+		else if (foo-- > 5)
+		{
+			return 5;
+		}
+		return 0;
+	}
+}";
+			Test<SameGuardConditionExpressionInIfelseBranchesIssue>(input, 0);
+		}
+
+		[Test]
+		public void TestNoProblem4()
+		{
+			var input = @"
+class TestClass
+{
+	int TestMethod ()
+	{
+		int foo = 1;
+		if ((foo=3) > 5)
+		{
+			return 2;
+		}
+		else if ((foo=3) > 5)
+		{
+			return 5;
+		}
+		return 0;
+	}
+}";
+			Test<SameGuardConditionExpressionInIfelseBranchesIssue>(input, 0);
+		}
+
+		[Test]
+		public void TestNoProblem5()
+		{
+			var input = @"
+class TestClass
+{
+	private int foo;
+	int TestMethod ()
+	{
+		if (foo > 5)
+		{
+			return 2;
+		}
+		else if (foo > 5)
+		{
+			return 5;
+		}
+		return 0;
+	}
+}";
+			Test<SameGuardConditionExpressionInIfelseBranchesIssue>(input, 0);
+		}
+
+		[Test]
+		public void TestResharperDisableRestore()
+		{
+			var input = @"
+class TestClass
+{
+	int TestMethod (int foo)
+	{
+//Resharper disable SameGuardConditionExpressionInIfelseBranches
+		if (foo > 5)
+		{
+			return 2;
+		}
+		else if (foo > 5)
+		{
+			return 5;
+		}
+//Resharper restore SameGuardConditionExpressionInIfelseBranches
+		return 0;
+	}
+}";
+			Test<SameGuardConditionExpressionInIfelseBranchesIssue>(input, 0);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SealedMemberInSealedClassIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SealedMemberInSealedClassIssueTests.cs
new file mode 100644
index 0000000000..503ca1bffc
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SealedMemberInSealedClassIssueTests.cs
@@ -0,0 +1,89 @@
+//
+// SealedMemberInSealedClassIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class SealedMemberInSealedClassIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestBasicCase ()
+		{
+			Test<SealedMemberInSealedClassIssue>(@"
+sealed class Foo
+{
+	public sealed override string ToString()
+	{
+		return ""''"";
+	}
+}
+", @"
+sealed class Foo
+{
+	public override string ToString()
+	{
+		return ""''"";
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestValid ()
+		{
+			TestWrongContext<SealedMemberInSealedClassIssue>(@"
+class Foo
+{
+	public sealed override string ToString()
+	{
+		return ""''"";
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<SealedMemberInSealedClassIssue>(@"
+sealed class Foo
+{
+	// ReSharper disable once SealedMemberInSealedClass
+	public sealed override string ToString()
+	{
+		return ""''"";
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SimplifyAnonymousMethodToDelegateIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SimplifyAnonymousMethodToDelegateIssueTests.cs
deleted file mode 100644
index 1f8f117308..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SimplifyAnonymousMethodToDelegateIssueTests.cs
+++ /dev/null
@@ -1,333 +0,0 @@
-//
-// SimplifyAnonymousMethodToDelegateIssueTests.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class SimplifyAnonymousMethodToDelegateIssueTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestSimpleVoidLambda ()
-		{
-			var input = @"using System;
-class Foo
-{
-	void Bar (string str)
-	{
-		Action<int, int> action = $(foo, bar) => MyMethod (foo, bar);
-	}
-	void MyMethod(int foo, int bar) {}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new SimplifyAnonymousMethodToDelegateIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"using System;
-class Foo
-{
-	void Bar (string str)
-	{
-		Action<int, int> action = MyMethod;
-	}
-	void MyMethod(int foo, int bar) {}
-}");
-		}
-		
-		[Test]
-		public void TestSimpleBoolLambda ()
-		{
-			var input = @"using System;
-class Foo
-{
-	void Bar (string str)
-	{
-		Func<int, int, bool> action = $(foo, bar) => MyMethod (foo, bar);
-	}
-	bool MyMethod(int foo, int bar) {}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new SimplifyAnonymousMethodToDelegateIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"using System;
-class Foo
-{
-	void Bar (string str)
-	{
-		Func<int, int, bool> action = MyMethod;
-	}
-	bool MyMethod(int foo, int bar) {}
-}");
-		}
-
-		[Test]
-		public void TestLambdaWithBody ()
-		{
-			var input = @"using System;
-class Foo
-{
-	void Bar (string str)
-	{
-		Action<int, int> action = $(foo, bar) => { return MyMethod (foo, bar); };
-	}
-	void MyMethod(int foo, int bar) {}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new SimplifyAnonymousMethodToDelegateIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"using System;
-class Foo
-{
-	void Bar (string str)
-	{
-		Action<int, int> action = MyMethod;
-	}
-	void MyMethod(int foo, int bar) {}
-}");
-		}
-
-		[Test]
-		public void Lambda_SwapParameterOrder ()
-		{
-			var input = @"using System;
-class Foo
-{
-	void Bar (string str)
-	{
-		Action<int, int> action = $(foo, bar) => MyMethod (bar, foo);
-	}
-	void MyMethod(int foo, int bar) {}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new SimplifyAnonymousMethodToDelegateIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-
-		[Test]
-		public void TestSimpleAnonymousMethod ()
-		{
-			var input = @"using System;
-class Foo
-{
-	int MyMethod (int x, int y) { return x * y; }
-
-	void Bar (string str)
-	{
-		Func<int, int, int> action = $delegate(int foo, int bar) { return MyMethod (foo, bar); };
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new SimplifyAnonymousMethodToDelegateIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"using System;
-class Foo
-{
-	int MyMethod (int x, int y) { return x * y; }
-
-	void Bar (string str)
-	{
-		Func<int, int, int> action = MyMethod;
-	}
-}");
-		}
-
-		[Test]
-		public void TestSkipComplexCase ()
-		{
-			var input = @"using System;
-using System.Linq;
-
-class Foo
-{
-	int MyMethod (int x, int y) { return x * y; }
-
-	void Bar (string str)
-	{
-		Func<char[]> action = $() => str.Where (c => c != 'a').ToArray ();
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new SimplifyAnonymousMethodToDelegateIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-
-		[Test]
-		public void CallInvolvesOptionalParameter ()
-		{
-			var input = @"using System;
-class Foo
-{
-	int MyMethod (int x, int y = 1) { return x * y; }
-
-	void Bar (string str)
-	{
-		Func<int, int> action = $foo => MyMethod (foo);
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new SimplifyAnonymousMethodToDelegateIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-
-		[Test]
-		public void CallExpandsParams ()
-		{
-			var input = @"using System;
-class Foo
-{
-	int MyMethod (params object[] args) { return 0; }
-
-	void Bar (string str)
-	{
-		Func<string, int> action = $foo => MyMethod (foo);
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new SimplifyAnonymousMethodToDelegateIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-
-		/// <summary>
-		/// Bug 12184 - Expression can be reduced to delegate fix can create ambiguity
-		/// </summary>
-		[Test]
-		public void TestBug12184 ()
-		{
-			var input = @"using System;
-using System.Threading.Tasks;
-
-class C
-{
-	public C GetResponse () { return null; }
-
-	public static void Foo ()
-	{
-		Task.Factory.StartNew (() => GetResponse());
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new SimplifyAnonymousMethodToDelegateIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"using System;
-using System.Threading.Tasks;
-
-class C
-{
-	public C GetResponse () { return null; }
-
-	public static void Foo ()
-	{
-		Task.Factory.StartNew ((Func<C>)GetResponse);
-	}
-}");
-
-		}
-		
-		[Test]
-		public void Return_ReferenceConversion ()
-		{
-			var input = @"using System;
-class Foo
-{
-	void Bar (string str)
-	{
-		Func<int, object> action = $foo => MyMethod(foo);
-	}
-	string MyMethod(int foo) {}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new SimplifyAnonymousMethodToDelegateIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-		}
-		
-		[Test]
-		public void Return_BoxingConversion ()
-		{
-			var input = @"using System;
-class Foo
-{
-	void Bar (string str)
-	{
-		Func<int, object> action = $foo => MyMethod(foo);
-	}
-	bool MyMethod(int foo) {}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new SimplifyAnonymousMethodToDelegateIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-		
-		[Test]
-		public void Parameter_ReferenceConversion ()
-		{
-			var input = @"using System;
-class Foo
-{
-	void Bar (string str)
-	{
-		Action<string> action = $foo => MyMethod(foo);
-	}
-	void MyMethod(object foo) {}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new SimplifyAnonymousMethodToDelegateIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-		}
-		
-		[Test]
-		public void Parameter_BoxingConversion ()
-		{
-			var input = @"using System;
-class Foo
-{
-	void Bar (string str)
-	{
-		Action<int> action = $foo => MyMethod(foo);
-	}
-	void MyMethod(object foo) {}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new SimplifyAnonymousMethodToDelegateIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SimplifyConditionalTernaryExpressionIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SimplifyConditionalTernaryExpressionIssueTests.cs
new file mode 100644
index 0000000000..bdad4b2fa2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SimplifyConditionalTernaryExpressionIssueTests.cs
@@ -0,0 +1,213 @@
+//
+// SimplifyConditionalTernaryExpressionIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class SimplifyConditionalTernaryExpressionIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestFalseTrueCase ()
+		{
+			Test<SimplifyConditionalTernaryExpressionIssue>(@"
+class Foo
+{
+	void Bar ()
+	{
+		var a = 1 < 2 ? false : true;
+	}
+}
+", @"
+class Foo
+{
+	void Bar ()
+	{
+		var a = 1 >= 2;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestFalseTrueCase2 ()
+		{
+			Test<SimplifyConditionalTernaryExpressionIssue>(@"
+class Foo
+{
+	void Bar ()
+	{
+		var a = obj is foo ? false : true;
+	}
+}
+", @"
+class Foo
+{
+	void Bar ()
+	{
+		var a = !(obj is foo);
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestFalseExprCase ()
+		{
+			Test<SimplifyConditionalTernaryExpressionIssue>(@"
+class Foo
+{
+	void FooBar (int a, int b, bool c)
+	{
+		Console.WriteLine (a < b ? false : c);
+	}
+}
+", @"
+class Foo
+{
+	void FooBar (int a, int b, bool c)
+	{
+		Console.WriteLine (a >= b && c);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestTrueExprCase ()
+		{
+			Test<SimplifyConditionalTernaryExpressionIssue>(@"
+class Foo
+{
+	void FooBar (int a, int b, bool c)
+	{
+		Console.WriteLine (a < b ? true : c);
+	}
+}
+", @"
+class Foo
+{
+	void FooBar (int a, int b, bool c)
+	{
+		Console.WriteLine (a < b || c);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestExprFalseCase ()
+		{
+			Test<SimplifyConditionalTernaryExpressionIssue>(@"
+class Foo
+{
+	void FooBar (int a, int b, bool c)
+	{
+		Console.WriteLine (a < b ? c : false);
+	}
+}
+", @"
+class Foo
+{
+	void FooBar (int a, int b, bool c)
+	{
+		Console.WriteLine (a < b && c);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestExprTrueCase ()
+		{
+			Test<SimplifyConditionalTernaryExpressionIssue>(@"
+class Foo
+{
+	void FooBar (int a, int b, bool c)
+	{
+		Console.WriteLine (a < b ? c : true);
+	}
+}
+", @"
+class Foo
+{
+	void FooBar (int a, int b, bool c)
+	{
+		Console.WriteLine (a >= b || c);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestInvalidCase ()
+		{
+			TestWrongContext<SimplifyConditionalTernaryExpressionIssue>(@"
+class Foo
+{
+	void FooBar (int a, int b, bool c, boold d)
+	{
+		Console.WriteLine (a < b ? c : d);
+	}
+}");
+		}
+	
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<SimplifyConditionalTernaryExpressionIssue>(@"
+class Foo
+{
+	void Bar ()
+	{
+		// ReSharper disable once SimplifyConditionalTernaryExpression
+		var a = 1 < 2 ? false : true;
+	}
+}
+");
+		}
+	
+
+		[Test]
+		public void TestSkipRedundantCase ()
+		{
+			TestWrongContext<SimplifyConditionalTernaryExpressionIssue>(@"
+class Foo
+{
+	void Bar ()
+	{
+		var a = 1 < 2 ? true : false;
+	}
+}
+");
+		}
+	
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SimplifyLinqExpressionIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SimplifyLinqExpressionIssueTests.cs
new file mode 100644
index 0000000000..2b27f9ad49
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SimplifyLinqExpressionIssueTests.cs
@@ -0,0 +1,193 @@
+//
+// SimplifyLinqExpressionIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class SimplifyLinqExpressionIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestNotAny ()
+		{
+			Test<SimplifyLinqExpressionIssue>(@"
+using System;
+using System.Linq;
+
+class FooBar
+{
+	void Test (string[] args)
+	{
+		Console.WriteLine (!args.Any (d => d.Length == 0));
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+class FooBar
+{
+	void Test (string[] args)
+	{
+		Console.WriteLine (args.All (d => d.Length != 0));
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestNotAll ()
+		{
+			Test<SimplifyLinqExpressionIssue>(@"
+using System;
+using System.Linq;
+
+class FooBar
+{
+	void Test (string[] args)
+	{
+		Console.WriteLine (!args.All (d => d.Length == 0));
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+class FooBar
+{
+	void Test (string[] args)
+	{
+		Console.WriteLine (args.Any (d => d.Length != 0));
+	}
+}
+");
+		}
+	
+		[Test]
+		public void TestLambdaBlockNotAny ()
+		{
+			Test<SimplifyLinqExpressionIssue>(@"
+using System;
+using System.Linq;
+
+class FooBar
+{
+	void Test (string[] args)
+	{
+		Console.WriteLine (!args.Any (d => {
+			return d.Length == 0;
+		}));
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+class FooBar
+{
+	void Test (string[] args)
+	{
+		Console.WriteLine (args.All (d => {
+			return d.Length != 0;
+		}));
+	}
+}
+");
+		}
+
+
+		[Test]
+		public void TestAnonymousMethodBlockNotAny ()
+		{
+			Test<SimplifyLinqExpressionIssue>(@"
+using System;
+using System.Linq;
+
+class FooBar
+{
+	void Test (string[] args)
+	{
+		Console.WriteLine (!args.Any (delegate (string d) {
+			return d.Length == 0;
+		}));
+	}
+}
+", @"
+using System;
+using System.Linq;
+
+class FooBar
+{
+	void Test (string[] args)
+	{
+		Console.WriteLine (args.All (delegate (string d) {
+			return d.Length != 0;
+		}));
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestNoSimplifiction ()
+		{
+			TestWrongContext<SimplifyLinqExpressionIssue>(@"
+using System;
+using System.Linq;
+
+class FooBar
+{
+	void Test (object[] args)
+	{
+		Console.WriteLine (!args.Any (d => d is FooBar));
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<SimplifyLinqExpressionIssue>(@"
+using System;
+using System.Linq;
+
+class FooBar
+{
+	void Test (string[] args)
+	{
+		// ReSharper disable once SimplifyLinqExpression
+		Console.WriteLine (!args.Any (d => d.Length == 0));
+	}
+}
+");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StaticConstructorAccessModifierTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StaticConstructorAccessModifierTest.cs
deleted file mode 100644
index 39703abcd2..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StaticConstructorAccessModifierTest.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// 
-// StaticConstructorAccessModifierTest.cs
-//  
-// Author:
-//       Ji Kun <jikun.nus@gmail.com>
-// 
-// Copyright (c) 2013 Ji Kun
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class StaticConstructorAccessModifer : InspectionActionTestBase
-	{
-		[Test]
-		public void TestInspectorCase1()
-		{
-			var input = @"using System;
-class Test {
-	static int a;
-	public static Test(){a = 100;}
-	}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues(new StaticConstructorAccessModifierIssue(), input, out context, true);
-			Assert.AreEqual(1, issues.Count);
-		}
-		
-		[Test]
-		public void TestInspectorCase2()
-		{
-			var input = @"using System;
-class Test {
-	static int a;
-	static private Test(){
-	a = 1;	
-	}
-	public Test()
-	{}
-	}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new StaticConstructorAccessModifierIssue(), input, out context, true);
-			Assert.AreEqual(1, issues.Count);
-		}
-
-
-		[Test]
-		public void TestResharperDisableCase()
-		{
-			var input = 
-				@"using System;
-class Test {
-	private int a;
-	//Resharper disable StaticConstructorAccessModifier
-	public static Test(){	
-	}
-	//Resharper restore StaticConstructorAccessModifier
-	}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues(new StaticConstructorAccessModifierIssue(), input, out context, true);
-			Assert.AreEqual(0, issues.Count);
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StaticConstructorParameterIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StaticConstructorParameterIssueTests.cs
new file mode 100644
index 0000000000..8efa49dd93
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StaticConstructorParameterIssueTests.cs
@@ -0,0 +1,72 @@
+//
+// StaticConstructorParameterIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class StaticConstructorParameterIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase()
+		{
+			Test<StaticConstructorParameterIssue>(@"
+class Foo
+{
+	static Foo (int bar)
+	{
+	}
+}
+", @"
+class Foo
+{
+	static Foo ()
+	{
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestNoIssue()
+		{
+			TestWrongContext<StaticConstructorParameterIssue>(@"
+class Foo
+{
+	static Foo ()
+	{
+	}
+}
+");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StaticFieldInGenericTypeTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StaticFieldInGenericTypeTests.cs
index c9fcdbba76..504601b0d3 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StaticFieldInGenericTypeTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StaticFieldInGenericTypeTests.cs
@@ -23,10 +23,12 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
+
 using System;
 using ICSharpCode.NRefactory.CSharp.CodeActions;
 using ICSharpCode.NRefactory.CSharp.Refactoring;
 using NUnit.Framework;
+
 namespace ICSharpCode.NRefactory.CSharp.CodeIssues
 {
 
@@ -131,6 +133,7 @@ class Foo<T>
 			var issues = GetIssues(new StaticFieldInGenericTypeIssue(), input, out context);
 			Assert.AreEqual(1, issues.Count);
 		}
+
 		[Test]
 		public void TestAssemblyMicrosoftSuppressMessage()
 		{
@@ -148,6 +151,20 @@ class Foo<T>
 			var issues = GetIssues(new StaticFieldInGenericTypeIssue(), input, out context);
 			Assert.AreEqual(0, issues.Count);
 		}
+
+        [Test]
+        public void TestDisable()
+        {
+            var input = @"using System.Diagnostics.CodeAnalysis;
+
+class Foo<T>
+{
+    // ReSharper disable once StaticFieldInGenericType
+	static string Data;
+}";
+            TestWrongContext<StaticFieldInGenericTypeIssue>(input);
+        }
+
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringCompareIsCultureSpecificIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringCompareIsCultureSpecificIssueTests.cs
new file mode 100644
index 0000000000..f392b20c7a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringCompareIsCultureSpecificIssueTests.cs
@@ -0,0 +1,242 @@
+//
+// StringCompareIsCultureSpecificIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class StringCompareIsCultureSpecificIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestCase1()
+		{
+			Test<StringCompareIsCultureSpecificIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		Console.WriteLine (string.Compare (""Foo"", ""Bar""));
+	}
+}", @"
+class Test
+{
+	void Foo ()
+	{
+		Console.WriteLine (string.Compare (""Foo"", ""Bar"", System.StringComparison.Ordinal));
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalidCase1()
+		{
+			TestWrongContext<StringCompareIsCultureSpecificIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		Console.WriteLine (string.Compare (""Foo"", ""Bar"", System.StringComparison.Ordinal));
+	}
+}");
+		}
+
+		[Test]
+		public void TestCase2()
+		{
+			Test<StringCompareIsCultureSpecificIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		Console.WriteLine (System.String.Compare (""Foo"", ""Bar"", true));
+	}
+}", @"
+class Test
+{
+	void Foo ()
+	{
+		Console.WriteLine (System.String.Compare (""Foo"", ""Bar"", System.StringComparison.OrdinalIgnoreCase));
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalidCase2()
+		{
+			TestWrongContext<StringCompareIsCultureSpecificIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		Console.WriteLine (string.Compare (""Foo"", ""Bar"", System.StringComparison.OrdinalIgnoreCase));
+	}
+}");
+		}
+
+		[Test]
+		public void TestCase3()
+		{
+			Test<StringCompareIsCultureSpecificIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		Console.WriteLine (string.Compare (""Foo"", ""Bar"", false));
+	}
+}", @"
+class Test
+{
+	void Foo ()
+	{
+		Console.WriteLine (string.Compare (""Foo"", ""Bar"", System.StringComparison.Ordinal));
+	}
+}");
+		}
+
+		[Test]
+		public void TestCase4()
+		{
+			Test<StringCompareIsCultureSpecificIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		Console.WriteLine (string.Compare (""Foo"", 0, ""Bar"", 1, 1));
+	}
+}", @"
+class Test
+{
+	void Foo ()
+	{
+		Console.WriteLine (string.Compare (""Foo"", 0, ""Bar"", 1, 1, System.StringComparison.Ordinal));
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalidCase4()
+		{
+			TestWrongContext<StringCompareIsCultureSpecificIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		Console.WriteLine (string.Compare (""Foo"", 0, ""Bar"", 1, 1, System.StringComparison.Ordinal));
+	}
+}");
+		}
+
+		[Test]
+		public void TestCase5()
+		{
+			Test<StringCompareIsCultureSpecificIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		Console.WriteLine (string.Compare (""Foo"", 0, ""Bar"", 1, 1, true));
+	}
+}", @"
+class Test
+{
+	void Foo ()
+	{
+		Console.WriteLine (string.Compare (""Foo"", 0, ""Bar"", 1, 1, System.StringComparison.OrdinalIgnoreCase));
+	}
+}");
+		}
+
+		[Test]
+		public void TestCase6()
+		{
+			Test<StringCompareIsCultureSpecificIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		Console.WriteLine (string.Compare (""Foo"", 0, ""Bar"", 1, 1, false));
+	}
+}", @"
+class Test
+{
+	void Foo ()
+	{
+		Console.WriteLine (string.Compare (""Foo"", 0, ""Bar"", 1, 1, System.StringComparison.Ordinal));
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvalid()
+		{
+			TestWrongContext<StringCompareIsCultureSpecificIssue>(@"
+class Test
+{
+	void Foo ()
+	{
+		Console.WriteLine (string.Compare(""a"", ""b"", true, System.Globalization.CultureInfo.CurrentCulture));
+	}
+}");
+		}
+
+		[Test]
+		public void TestComplex()
+		{
+			Test<StringCompareIsCultureSpecificIssue>(@"
+class Test
+{
+	void Foo (bool b)
+	{
+		Console.WriteLine (string.Compare (""Foo"", ""Bar"", b));
+	}
+}", @"
+class Test
+{
+	void Foo (bool b)
+	{
+		Console.WriteLine (string.Compare (""Foo"", ""Bar"", b ? System.StringComparison.OrdinalIgnoreCase : System.StringComparison.Ordinal));
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<StringCompareIsCultureSpecificIssue>(@"
+class Test
+{
+	void Foo()
+	{
+		// ReSharper disable once StringCompareIsCultureSpecific
+		Console.WriteLine(string.Compare(""Foo"", ""Bar""));
+	}
+}");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringCompareToIsCultureSpecificIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringCompareToIsCultureSpecificIssueTests.cs
new file mode 100644
index 0000000000..c564cf111d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringCompareToIsCultureSpecificIssueTests.cs
@@ -0,0 +1,88 @@
+//
+// StringCompareToIsCultureSpecificIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class StringCompareToIsCultureSpecificIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleCase()
+		{
+			Test<StringCompareToIsCultureSpecificIssue>(@"
+public class Test
+{
+	void Foo (string b)
+	{
+		Console.WriteLine (""Foo"".CompareTo(b));
+	}
+}
+", @"
+public class Test
+{
+	void Foo (string b)
+	{
+		Console.WriteLine (string.Compare (""Foo"", b, System.StringComparison.Ordinal));
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestInvalidCase()
+		{
+			TestWrongContext<StringCompareToIsCultureSpecificIssue>(@"
+public class Test
+{
+	void Foo (object b)
+	{
+		Console.WriteLine (""Foo"".CompareTo(b));
+	}
+}
+");
+		}
+
+		
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<StringCompareToIsCultureSpecificIssue>(@"
+public class Test
+{
+	void Foo (string b)
+	{
+		// ReSharper disable once StringCompareToIsCultureSpecific
+		Console.WriteLine (""Foo"".CompareTo(b));
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringEndsWithIsCultureSpecificIssueTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringEndsWithIsCultureSpecificIssueTest.cs
new file mode 100644
index 0000000000..f64d8e21cc
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringEndsWithIsCultureSpecificIssueTest.cs
@@ -0,0 +1,74 @@
+//
+// StringEndsWithIsCultureSpecificIssueTest.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class StringEndsWithIsCultureSpecificIssueTest : InspectionActionTestBase
+	{
+		[Test]
+		public void TestEndsWith()
+		{
+			Test<StringEndsWithIsCultureSpecificIssue>(@"
+public class Test
+{
+	public void Foo (string bar)
+	{
+		bar.EndsWith ("".com"");
+	}
+}
+", @"
+public class Test
+{
+	public void Foo (string bar)
+	{
+		bar.EndsWith ("".com"", System.StringComparison.Ordinal);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<StringEndsWithIsCultureSpecificIssue>(@"
+public class Test
+{
+	public void Foo (string bar)
+	{
+		// ReSharper disable once StringEndsWithIsCultureSpecific
+		bar.EndsWith ("".com"");
+	}
+}
+");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringIndexOfIsCultureSpecificIssueTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringIndexOfIsCultureSpecificIssueTest.cs
new file mode 100644
index 0000000000..1b4f49a359
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringIndexOfIsCultureSpecificIssueTest.cs
@@ -0,0 +1,110 @@
+//
+// Author:
+//       Daniel Grunwald <daniel@danielgrunwald.de>
+//
+// Copyright (c) 2012 Daniel Grunwald
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class StringIndexOfIsCultureSpecificIssueTest : InspectionActionTestBase
+	{
+		const string stringIndexOfStringCalls = @"using System;
+using System.Collections.Generic;
+class Test {
+	public void StringIndexOfStringCalls(List<string> list)
+	{
+		list[0].IndexOf("".com"");
+		list[0].IndexOf("".com"", 0);
+		list[0].IndexOf("".com"", 0, 5);
+		list[0].IndexOf(list[1], 0, 10);
+	}
+}";
+		const string stringIndexOfStringCallsWithComparison = @"using System;
+using System.Collections.Generic;
+class Test {
+	public void StringIndexOfStringCalls(List<string> list)
+	{
+		list [0].IndexOf ("".com"", StringComparison.Ordinal);
+		list [0].IndexOf ("".com"", 0, StringComparison.Ordinal);
+		list [0].IndexOf ("".com"", 0, 5, StringComparison.Ordinal);
+		list [0].IndexOf (list [1], 0, 10, StringComparison.Ordinal);
+	}
+}";
+		
+		[Test]
+		public void IndexOfStringCalls()
+		{
+			Test<StringIndexOfIsCultureSpecificIssue>(stringIndexOfStringCalls, 4, stringIndexOfStringCallsWithComparison);
+		}
+		
+		[Test]
+		public void IndexOfStringCallsAlreadyWithComparison()
+		{
+			Test<StringIndexOfIsCultureSpecificIssue>(stringIndexOfStringCallsWithComparison, 0);
+		}
+		
+		[Test]
+		public void StringIndexOfChar()
+		{
+			string program = @"using System;
+class Test {
+	void M(string text) {
+		text.IndexOf('.');
+	}
+}";
+			Test<StringIndexOfIsCultureSpecificIssue>(program, 0);
+		}
+		
+		[Test]
+		public void ListIndexOf()
+		{
+			string program = @"using System.Collections.Generic;
+class Test {
+	void M(List<string> list) {
+		list.IndexOf("".com"");
+	}
+}";
+			Test<StringIndexOfIsCultureSpecificIssue>(program, 0);
+		}
+
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<StringIndexOfIsCultureSpecificIssue>(@"using System;
+using System.Collections.Generic;
+class Test {
+	public void StringIndexOfStringCalls(List<string> list)
+	{
+		// ReSharper disable once StringIndexOfIsCultureSpecific
+		list[0].IndexOf("".com"");
+	}
+}");
+		}
+
+
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringIsNullOrEmptyInspectorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringIsNullOrEmptyInspectorTests.cs
deleted file mode 100644
index ce2158685a..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringIsNullOrEmptyInspectorTests.cs
+++ /dev/null
@@ -1,515 +0,0 @@
-// 
-// StringIsNullOrEmptyInspectorTests.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-
-using System;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class StringIsNullOrEmptyInspectorTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestInspectorCaseNS1 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if (str != null && str != """")
-			;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (!string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-
-		[Test]
-		public void TestInspectorCaseNS2 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if (null != str && str != """")
-			;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (!string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-
-		[Test]
-		public void TestInspectorCaseNS3 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if (null != str && """" != str)
-			;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (!string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-
-		[Test]
-		public void TestInspectorCaseNS4 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if (str != null && str != """")
-			;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (!string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-
-		[Test]
-		public void TestInspectorCaseSN1 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if (str != """" && str != null)
-			;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (!string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-
-		[Test]
-		public void TestInspectorCaseSN2 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if ("""" != str && str != null)
-			;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (!string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-
-		[Test]
-		public void TestInspectorCaseSN3 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if ("""" != str && null != str)
-			;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (!string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-
-
-		[Test]
-		public void TestInspectorCaseSN4 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if (str != """" && null != str)
-			;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (!string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-
-		[Test]
-		public void TestInspectorCaseNS5 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if (str == null || str == """")
-			;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-
-		[Test]
-		public void TestInspectorCaseNS6 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if (null == str || str == """")
-			;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-
-		[Test]
-		public void TestInspectorCaseNS7 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if (null == str || """" == str)
-			;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-
-		[Test]
-		public void TestInspectorCaseNS8 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if (str == null || """" == str)
-			;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-
-		[Test]
-		public void TestInspectorCaseSN5 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if (str == """" || str == null)
-			;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-
-		[Test]
-		public void TestInspectorCaseSN6 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if ("""" == str || str == null)
-			;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-
-		[Test]
-		public void TestInspectorCaseSN7 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if ("""" == str || null == str)
-			;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-		
-		[Test]
-		public void TestInspectorCaseSN8 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if (str == """" || null == str)
-			;
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-		
-		[TestCase("str == null || str.Length == 0")]
-		[TestCase("str == null || 0 == str.Length")]
-		[TestCase("null == str || str.Length == 0")]
-		[TestCase("null == str || 0 == str.Length")]
-		public void TestInspectorCaseNL (string expression)
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if (" + expression + @")
-			;
-	}
-}";
-			
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-	
-		[TestCase("str != null && str.Length != 0")]
-		[TestCase("str != null && 0 != str.Length")]
-		[TestCase("str != null && str.Length > 0")]
-		[TestCase("null != str && str.Length != 0")]
-		[TestCase("null != str && 0 != str.Length")]
-		[TestCase("null != str && str.Length > 0")]
-		public void TestInspectorCaseLN (string expression)
-		{
-			var input = @"class Foo
-{
-	void Bar (string str)
-	{
-		if (" + expression + @")
-			;
-	}
-}";
-		
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			CheckFix (context, issues, @"class Foo
-{
-	void Bar (string str)
-	{
-		if (!string.IsNullOrEmpty (str))
-			;
-	}
-}");
-		}
-
-		[Test]
-		public void TestArrays ()
-		{
-			var input = @"class Foo
-{
-	void Bar ()
-	{
-		int[] foo = new int[10];
-		if (foo == null || foo.Length == 0) {
-		}
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new StringIsNullOrEmptyIssue (), input, out context);
-			Assert.AreEqual (0, issues.Count);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringLastIndexOfIsCultureSpecificIssueTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringLastIndexOfIsCultureSpecificIssueTest.cs
new file mode 100644
index 0000000000..4b43e20f45
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringLastIndexOfIsCultureSpecificIssueTest.cs
@@ -0,0 +1,75 @@
+//
+// StringLastIndexOfIsCultureSpecificIssueTest.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class StringLastIndexOfIsCultureSpecificIssueTest : InspectionActionTestBase
+	{
+		[Test]
+		public void TestLastIndexOf()
+		{
+			Test<StringLastIndexOfIsCultureSpecificIssue>(@"
+public class Test
+{
+	public void Foo (string bar)
+	{
+		bar.LastIndexOf ("".com"");
+	}
+}
+", @"
+public class Test
+{
+	public void Foo (string bar)
+	{
+		bar.LastIndexOf ("".com"", System.StringComparison.Ordinal);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<StringLastIndexOfIsCultureSpecificIssue>(@"
+public class Test
+{
+	public void Foo (string bar)
+	{
+		// ReSharper disable once StringLastIndexOfIsCultureSpecific
+		bar.LastIndexOf ("".com"");
+	}
+}
+");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringStartsWithIsCultureSpecificIssueTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringStartsWithIsCultureSpecificIssueTest.cs
new file mode 100644
index 0000000000..638687f85d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/StringStartsWithIsCultureSpecificIssueTest.cs
@@ -0,0 +1,74 @@
+//
+// StringStartsWithIsCultureSpecificIssueTest.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class StringStartsWithIsCultureSpecificIssueTest : InspectionActionTestBase
+	{
+		[Test]
+		public void TestStartsWith()
+		{
+			Test<StringStartsWithIsCultureSpecificIssue>(@"
+public class Test
+{
+	public void Foo (string bar)
+	{
+		bar.StartsWith ("".com"");
+	}
+}
+", @"
+public class Test
+{
+	public void Foo (string bar)
+	{
+		bar.StartsWith ("".com"", System.StringComparison.Ordinal);
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable()
+		{
+			TestWrongContext<StringStartsWithIsCultureSpecificIssue>(@"
+public class Test
+{
+	public void Foo (string bar)
+	{
+		// ReSharper disable once StringStartsWithIsCultureSpecific
+		bar.StartsWith ("".com"");
+	}
+}
+");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SuggestUseVarKeywordEvidentTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SuggestUseVarKeywordEvidentTests.cs
new file mode 100644
index 0000000000..de6c34141b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/SuggestUseVarKeywordEvidentTests.cs
@@ -0,0 +1,72 @@
+// 
+// SuggestUseVarKeywordEvidentTests.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class SuggestUseVarKeywordEvidentTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestInspectorCase1 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (object o)
+	{
+		Foo foo = (Foo)o;
+	}
+}";
+
+			TestRefactoringContext context;
+			var issues = GetIssues (new SuggestUseVarKeywordEvidentIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			// Fix is done by code action.
+		}
+
+		[Test]
+		public void TestV2 ()
+		{
+			var input = @"class Foo
+{
+	void Bar (object o)
+	{
+		Foo foo = (Foo)o;
+	}
+}";
+
+			TestRefactoringContext context;
+			CSharpParser parser = new CSharpParser();
+			parser.CompilerSettings.LanguageVersion = new Version(2, 0, 0);
+			var issues = GetIssues (new SuggestUseVarKeywordEvidentIssue (), input, out context, false, parser);
+			Assert.AreEqual (0, issues.Count);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ThreadStaticAtInstanceFieldTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ThreadStaticAtInstanceFieldTests.cs
new file mode 100644
index 0000000000..ba4938bfeb
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ThreadStaticAtInstanceFieldTests.cs
@@ -0,0 +1,180 @@
+//
+// ThreadStaticAtInstanceFieldTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class ThreadStaticAtInstanceFieldTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestInspectorCase1 ()
+		{
+			var input = @"using System;
+class Foo
+{
+	[ThreadStatic]
+	int bar;
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues (new ThreadStaticAtInstanceFieldIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+
+			CheckFix (context, issues [0], @"using System;
+class Foo
+{
+	int bar;
+}");
+		}
+
+		[Test]
+		public void TestInspectorCase2 ()
+		{
+			var input = @"using System;
+class Foo
+{
+	[Serializable, ThreadStatic]
+	int bar;
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues (new ThreadStaticAtInstanceFieldIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+
+			CheckFix (context, issues [0], @"using System;
+class Foo
+{
+	[Serializable]
+	int bar;
+}");
+		}
+
+		[Test]
+		public void TestInspectorCase3 ()
+		{
+			var input = @"class Foo
+{
+	[System.ThreadStatic, System.Serializable]
+	int bar;
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues (new ThreadStaticAtInstanceFieldIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+
+			CheckFix (context, issues [0], @"class Foo
+{
+	[System.Serializable]
+	int bar;
+}");
+		}
+
+
+
+		[Test]
+		public void TestResharperSuppression ()
+		{
+			var input = @"using System;
+class Foo
+{
+// ReSharper disable once ThreadStaticAtInstanceField
+	[ThreadStatic]
+	int bar;
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues (new ThreadStaticAtInstanceFieldIssue (), input, out context);
+			Assert.AreEqual (0, issues.Count);
+
+		}
+
+
+        [Test]
+        public void InstanceField()
+        {
+            var input = @"
+using System;
+class TestClass
+{
+	[ThreadStatic]
+	string field;
+}";
+            TestRefactoringContext context;
+            var issues = GetIssues(new ThreadStaticAtInstanceFieldIssue(), input, out context);
+            Assert.AreEqual(1, issues.Count);
+            var issue = issues[0];
+            Assert.AreEqual(2, issue.Actions.Count);
+
+            CheckFix(context, issues[0], @"
+using System;
+class TestClass
+{
+	string field;
+}");
+        }
+
+        [Test]
+        public void InstanceFieldWithMultiAttributeSection()
+        {
+            var input = @"
+using System;
+class TestClass
+{
+	[field: ThreadStatic, ContextStatic]
+	string field;
+}";
+            TestRefactoringContext context;
+            var issues = GetIssues(new ThreadStaticAtInstanceFieldIssue(), input, out context);
+            Assert.AreEqual(1, issues.Count);
+            var issue = issues[0];
+            Assert.AreEqual(2, issue.Actions.Count);
+
+            CheckFix(context, issues[0], @"
+using System;
+class TestClass
+{
+	[field: ContextStatic]
+	string field;
+}");
+        }
+
+        [Test]
+        public void StaticField()
+        {
+            var input = @"
+using System;
+class TestClass
+{
+	[ThreadStatic]
+	static string field;
+}";
+            TestRefactoringContext context;
+            var issues = GetIssues(new ThreadStaticAtInstanceFieldIssue(), input, out context);
+            Assert.AreEqual(0, issues.Count);
+        }
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ThreadStaticOnInstanceFieldTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ThreadStaticOnInstanceFieldTests.cs
deleted file mode 100644
index 20055499f0..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ThreadStaticOnInstanceFieldTests.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// ThreadStaticOnInstanceFieldTests.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class ThreadStaticOnInstanceFieldTests : InspectionActionTestBase
-	{
-		
-		[Test]
-		public void InstanceField()
-		{
-			var input = @"
-using System;
-class TestClass
-{
-	[ThreadStatic]
-	string field;
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ThreadStaticOnInstanceFieldIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			var issue = issues [0];
-			Assert.AreEqual(2, issue.Actions.Count);
-			
-			CheckFix(context, issues [0], @"
-using System;
-class TestClass
-{
-	string field;
-}");
-		}
-		
-		[Ignore]
-		[Test]
-		public void InstanceFieldWithMultiAttributeSection()
-		{
-			var input = @"
-using System;
-class TestClass
-{
-	[field: ThreadStatic, ContextStatic]
-	string field;
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ThreadStaticOnInstanceFieldIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-			var issue = issues [0];
-			Assert.AreEqual(2, issue.Actions.Count);
-			
-			CheckFix(context, issues [0], @"
-using System;
-class TestClass
-{
-	[field: ContextStatic]
-	string field;
-}");
-		}
-		
-		[Test]
-		public void StaticField()
-		{
-			var input = @"
-using System;
-class TestClass
-{
-	[ThreadStatic]
-	static string field;
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ThreadStaticOnInstanceFieldIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/TypeParameterNotUsedIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/TypeParameterNotUsedIssueTests.cs
deleted file mode 100644
index 7a9f771338..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/TypeParameterNotUsedIssueTests.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// 
-// TypeParameterNotUsedIssueTests.cs
-// 
-// Author:
-//      Mansheng Yang <lightyang0@gmail.com>
-// 
-// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class TypeParameterNotUsedIssueTests : InspectionActionTestBase
-	{
-
-		[Test]
-		public void TestUnusedTypeParameter ()
-		{
-			var input = @"
-class TestClass {
-	void TestMethod<T> ()
-	{
-	}
-}";
-			Test<TypeParameterNotUsedIssue> (input, 1);
-		}
-
-		[Test]
-		public void TestUsedTypeParameter ()
-		{
-			var input = @"
-class TestClass {
-	void TestMethod<T> (T i)
-	{
-	}
-}";
-			var input2 = @"
-class TestClass {
-	T TestMethod<T> ()
-	{
-	}
-}";
-			Test<TypeParameterNotUsedIssue> (input, 0);
-			Test<TypeParameterNotUsedIssue> (input2, 0);
-		}
-
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnassignedReadonlyFieldIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnassignedReadonlyFieldIssueTests.cs
new file mode 100644
index 0000000000..05ef7cf45f
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnassignedReadonlyFieldIssueTests.cs
@@ -0,0 +1,125 @@
+//
+// UnassignedReadonlyFieldIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class UnassignedReadonlyFieldIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestField ()
+		{
+			Test<UnassignedReadonlyFieldIssue>(@"class Test
+{
+	readonly object fooBar;
+}", @"class Test
+{
+	public Test (object fooBar)
+	{
+		this.fooBar = fooBar;
+	}
+	readonly object fooBar;
+}");
+		}
+
+		[Test]
+		public void TestValueTypeField ()
+		{
+			Test<UnassignedReadonlyFieldIssue>(@"class Test
+{
+	readonly int fooBar;
+}", @"class Test
+{
+	public Test (int fooBar)
+	{
+		this.fooBar = fooBar;
+	}
+	readonly int fooBar;
+}");
+		}
+
+		
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<UnassignedReadonlyFieldIssue>(@"class Test
+{
+	// ReSharper disable once UnassignedReadonlyField.Compiler
+	readonly object fooBar;
+}");
+		}
+
+		
+		[Test]
+		public void TestPragmaDisable ()
+		{
+			TestWrongContext<UnassignedReadonlyFieldIssue>(@"class Test
+{
+	#pragma warning disable 649
+	readonly int test;
+	#pragma warning restore 649
+}");
+		}
+
+		[Test]
+		public void TestAlreadyInitalized ()
+		{
+			TestWrongContext<UnassignedReadonlyFieldIssue>(@"class Test
+{
+	public Test (object fooBar)
+	{
+		this.fooBar = fooBar;
+	}
+	readonly object fooBar;
+}");
+		}
+
+		[Test]
+		public void TestAlreadyInitalizedCase2 ()
+		{
+			TestWrongContext<UnassignedReadonlyFieldIssue>(@"
+using System;
+public class FooBar
+{
+	sealed class Bar
+	{
+		public int foo;
+	}
+
+	readonly string foo;
+	
+	public FooBar()
+	{
+		this.foo = """";
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnmatchedSizeSpeicificationInArrayCreationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnmatchedSizeSpeicificationInArrayCreationTests.cs
new file mode 100644
index 0000000000..559a9c2df5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnmatchedSizeSpeicificationInArrayCreationTests.cs
@@ -0,0 +1,131 @@
+// 
+// UnmatchedSizeSpeicificationInArrayCreationTests.cs
+//  
+// Author:
+//       Ji Kun <jikun.nus@gmail.com>
+// 
+// Copyright (c) 2013 Ji Kun <jikun.nus@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class UnmatchedSizeSpeicificationInArrayCreationTests : InspectionActionTestBase
+	{
+		
+		[Test]
+		public void TestInspectorCase1()
+		{
+			Test<UnmatchedSizeSpecificationInArrayCreationIssue>(@"using System;
+	namespace Application
+	{
+		public class BaseClass
+		{
+			public void method()
+			{
+				int[] array = new int[4]{1,2,3,4,5};
+			}
+		}
+	}
+", @"using System;
+	namespace Application
+	{
+		public class BaseClass
+		{
+			public void method()
+			{
+				int[] array = new int[5]{ 1, 2, 3, 4, 5 };
+			}
+		}
+	}
+");
+		}
+		
+		[Test]
+		public void TestInspectorCase2()
+		{
+			TestWrongContext<UnmatchedSizeSpecificationInArrayCreationIssue>(@"using System;
+	namespace Application
+	{
+		public class BaseClass
+		{
+			public void method()
+			{
+				int[] array = new int[]{1,2,3,4,5};
+				int[] array1= new int[5]{1,2,3,4,5};
+				int[] array2 = new int[0x05]{1,2,3,4,5};
+			}
+		}
+	}
+");
+		}
+
+		[Test]
+		public void TestInspectorCase3()
+		{
+			Test<UnmatchedSizeSpecificationInArrayCreationIssue>(@"using System;
+	namespace Application
+	{
+		public class BaseClass
+		{
+			public void method()
+			{
+				int[] array = new int[0x01]{1,2,3,4,5};
+			}
+		}
+	}
+", @"using System;
+	namespace Application
+	{
+		public class BaseClass
+		{
+			public void method()
+			{
+				int[] array = new int[5]{ 1, 2, 3, 4, 5 };
+			}
+		}
+	}
+");
+		}
+
+		[Test]
+		public void TestResharperDisableRestore()
+		{
+			TestWrongContext<UnmatchedSizeSpecificationInArrayCreationIssue>(@"using System;
+	namespace Application
+	{
+		public class BaseClass
+		{
+			public void method()
+			{
+//Resharper disable UnmatchedSizeSpecificationInArrayCreation
+				int[] array = new int[4]{1,2,3,4,5};
+//Resharper restore UnmatchedSizeSpecificationInArrayCreation
+			}
+		}
+	}
+");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnreachableCodeIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnreachableCodeIssueTests.cs
index 9da0a43d13..dd27e995f5 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnreachableCodeIssueTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnreachableCodeIssueTests.cs
@@ -26,6 +26,7 @@
 
 using ICSharpCode.NRefactory.CSharp.Refactoring;
 using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
 
 namespace ICSharpCode.NRefactory.CSharp.CodeIssues
 {
@@ -64,6 +65,46 @@ class TestClass
 			Test<UnreachableCodeIssue> (input, 1);
 		}
 
+		[Test]
+		public void TestRedundantGoto ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		goto Foo; Foo:
+		int a = 1;
+	}
+}";
+			TestWrongContext<UnreachableCodeIssue> (input);
+		}
+
+		[Test]
+		public void TestGotoUnreachableBlock ()
+		{
+			var input = @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int x = 1;
+		goto Foo;
+		{
+			x = 2;
+			Foo:
+			x = 3;
+		}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues (new UnreachableCodeIssue (), input, out context);
+			Assert.AreEqual (1, issues.Count);
+			var issue = issues [0];
+			Assert.AreEqual(9, issue.Start.Line);
+			Assert.AreEqual(9, issue.End.Line);
+		}
+
 		[Test]
 		public void TestContinue ()
 		{
@@ -293,5 +334,58 @@ namespace TestProjectForBug
 }";
 			Test<UnreachableCodeIssue> (input, 0);
 		}
+
+		[Test]
+		public void TestIfTrueBranch ()
+		{
+			Test<UnreachableCodeIssue> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		if (true) {
+			System.Console.WriteLine (1);
+		} else {
+			System.Console.WriteLine (2);
+		}
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		if (true) {
+			System.Console.WriteLine (1);
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestIfFalseBranch ()
+		{
+			Test<UnreachableCodeIssue> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		if (false) {
+			System.Console.WriteLine (1);
+		} else {
+			System.Console.WriteLine (2);
+		}
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		{
+			System.Console.WriteLine (2);
+		}
+	}
+}");
+		}
+
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnusedAnonymousMethodSignatureIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnusedAnonymousMethodSignatureIssueTests.cs
new file mode 100644
index 0000000000..c0d42cb892
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnusedAnonymousMethodSignatureIssueTests.cs
@@ -0,0 +1,140 @@
+// 
+// DelegateParametersAreUnusedTests.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class UnusedAnonymousMethodSignatureIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimpleUsage ()
+		{
+			Test<UnusedAnonymousMethodSignatureIssue>(@"
+using System;
+
+class TestClass
+{
+	void TestMethod()
+	{
+		Action<int> x = delegate (int p) {};
+	}
+}", @"
+using System;
+
+class TestClass
+{
+	void TestMethod()
+	{
+		Action<int> x = delegate {};
+	}
+}");
+		}
+
+		[Test]
+		public void TestNecessaryParameter ()
+		{
+			TestWrongContext<UnusedAnonymousMethodSignatureIssue>(@"
+class TestClass
+{
+	void TestMethod()
+	{
+		//Even if just one is used, it's still necessary
+		Action<int> x = delegate(int p, int q) { Console.WriteLine(p); };
+	}
+}");
+		}
+
+		[Test]
+		public void TestVisitChild ()
+		{
+			Test<UnusedAnonymousMethodSignatureIssue>(@"
+using System;
+
+class TestClass
+{
+	void TestMethod()
+	{
+		Action<int> x = delegate(int p) {
+			Console.WriteLine(p);
+			Action<int> y = delegate(int q) {};
+		};
+	}
+}", @"
+using System;
+
+class TestClass
+{
+	void TestMethod()
+	{
+		Action<int> x = delegate(int p) {
+			Console.WriteLine(p);
+			Action<int> y = delegate {};
+		};
+	}
+}");
+		}
+
+		[Test]
+		public void TestAmbiguousCase ()
+		{
+			TestWrongContext<UnusedAnonymousMethodSignatureIssue>(@"
+using System;
+class TestClass
+{
+	void Foo(Action<int> action) {}
+	void Foo(Action<string> action) {}
+	void TestMethod()
+	{
+		Foo(delegate(int p) {});
+	}
+}
+");
+		}
+
+		/// <summary>
+		/// Bug 15058 - Wrong context for unused parameter list 
+		/// </summary>
+		[Test]
+		public void TestBug15058 ()
+		{
+			TestWrongContext<UnusedAnonymousMethodSignatureIssue>(@"
+using System;
+using System.Threading;
+
+class TestClass
+{
+	void TestMethod()
+	{
+		var myThing = new Thread (delegate () { doStuff (); });
+	}
+}
+");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnusedLabelIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnusedLabelIssueTests.cs
new file mode 100644
index 0000000000..9f8c2e4b2b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnusedLabelIssueTests.cs
@@ -0,0 +1,103 @@
+//
+// UnusedLabelIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class UnusedLabelIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestUnusedLabelInMethod ()
+		{
+			Test<UnusedLabelIssue>(@"
+class Foo
+{
+	void Test()
+	{
+		bar: ;
+	}
+}
+", @"
+class Foo
+{
+	void Test()
+	{
+		;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestInvalidCase ()
+		{
+			TestWrongContext<UnusedLabelIssue>(@"
+class Foo
+{
+	void Test()
+	{
+		bar:
+		goto bar;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<UnusedLabelIssue>(@"
+class Foo
+{
+	void Test()
+	{
+		// ReSharper disable once UnusedLabel
+		bar: ;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestPragmaDisable ()
+		{
+			TestWrongContext<UnusedLabelIssue>(@"
+class Foo
+{
+	void Test()
+	{
+#pragma warning disable 164
+		bar: ;
+#pragma warning restore 164
+	}
+}
+");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnusedParameterIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnusedParameterIssueTests.cs
new file mode 100644
index 0000000000..7d4da25f8f
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnusedParameterIssueTests.cs
@@ -0,0 +1,234 @@
+// 
+// ParameterNotUsedIssueTests.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class UnusedParameterIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestUnusedParameter ()
+		{
+			var input = @"
+class TestClass {
+	void TestMethod (int i)
+	{
+	}
+}";
+			Test<UnusedParameterIssue> (input, 1);
+		}
+		
+		[Test]
+		public void TestUnusedParameterMethodGetsCalled ()
+		{
+			var input = @"
+class TestClass {
+	void TestMethod (int i)
+	{
+		TestMethod(0);
+	}
+}";
+			Test<UnusedParameterIssue> (input, 1);
+		}
+		
+		[Test]
+		public void TestInterfaceImplementation ()
+		{
+			var input = @"
+interface ITestClass {
+	void TestMethod (int i);
+}
+class TestClass : ITestClass {
+	public void TestMethod (int i)
+	{
+	}
+}";
+			Test<UnusedParameterIssue> (input, 0);
+		}
+		
+		[Test]
+		public void TestAbstractMethodImplementation ()
+		{
+			var input = @"
+abstract class TestBase {
+	public abstract void TestMethod (int i);
+}
+class TestClass : TestBase {
+	public override void TestMethod (int i)
+	{
+	}
+}";
+			Test<UnusedParameterIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestUsedParameter ()
+		{
+			var input = @"
+class TestClass {
+	void TestMethod (int i)
+	{
+		i = 1;
+	}
+}";
+			Test<UnusedParameterIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestLambda ()
+		{
+			var input = @"
+class TestClass {
+	void TestMethod ()
+	{
+		System.Action<int> a = i => {
+		};
+	}
+}";
+			Test<UnusedParameterIssue> (input, 0);
+		}
+
+		[Test]
+		public void TestAnonymousMethod ()
+		{
+			var input = @"
+class TestClass {
+	void TestMethod ()
+	{
+		System.Action<int> a = delegate (int i) {
+		};
+	}
+}";
+			Test<UnusedParameterIssue> (input, 0);
+		}
+
+
+		[Test]
+		public void TestMethodUsedAsDelegateMethod ()
+		{
+			var input = @"using System;
+class TestClass {
+	public event EventHandler FooEvt;
+	void TestMethod ()
+	{
+		FooEvt += FooBar;
+	}
+	void FooBar (object sender, EventArgs e) {}
+}";
+			Test<UnusedParameterIssue> (input, 0);
+		}
+		
+		[Test]
+		public void TestMethodLooksLikeEventHandlerButNotUsedAsSuch ()
+		{
+			var input = @"using System;
+class TestClass {
+	void FooBar (object sender, EventArgs e) {}
+}";
+			Test<UnusedParameterIssue> (input, 2);
+		}
+		
+		[Test]
+		public void TestMethodUsedAsDelegateInOtherPart ()
+		{
+			// This test doesn't add the second part;
+			// but the issue doesn't look at other files after all;
+			// we just rely on heuristics if the class is partial
+			var input = @"using System;
+partial class TestClass {
+	void FooBar (object sender, EventArgs e) {}
+}";
+			Test<UnusedParameterIssue> (input, 0);
+		}
+		
+		[Test]
+		public void UnusedParameterInConstructor()
+		{
+			var input = @"
+class TestClass {
+	public TestClass(int i)
+	{
+	}
+}";
+			Test<UnusedParameterIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestUnusedParameterInVirtualMethod ()
+		{
+			var input = @"
+class TestClass {
+	public virtual void TestMethod (int i)
+	{
+	}
+}";
+			Test<UnusedParameterIssue> (input, 0);
+		}
+		
+		[Test]
+		public void TestUnusedParameterInShadowedMethod ()
+		{
+			var input = @"
+class TestClass {
+	public new void TestMethod (int i)
+	{
+	}
+}";
+			Test<UnusedParameterIssue> (input, 0);
+		}
+
+		
+		[Test]
+		public void TestUnusedParameterInPartialMethod ()
+		{
+			var input = @"
+partial class TestClass {
+	partial void TestMethod (int i)
+	{
+	}
+}";
+			Test<UnusedParameterIssue> (input, 0);
+		}
+
+		[Test]
+		public void SerializationConstructor ()
+		{
+			var input = @"using System;
+using System.Runtime.Serialization;
+class TestClass : ISerializable {
+	string text;
+	protected TestClass(SerializationInfo info, StreamingContext context)
+	{
+		this.text = info.GetString(""Text"");
+	}
+}";
+			TestWrongContext<UnusedParameterIssue> (input);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnusedTypeParameterIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnusedTypeParameterIssueTests.cs
new file mode 100644
index 0000000000..27560bf2d2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnusedTypeParameterIssueTests.cs
@@ -0,0 +1,68 @@
+// 
+// UnusedTypeParameterIssueTests.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class UnusedTypeParameterIssueTests : InspectionActionTestBase
+	{
+
+		[Test]
+		public void TestUnusedTypeParameter ()
+		{
+			var input = @"
+class TestClass {
+	void TestMethod<T> ()
+	{
+	}
+}";
+			Test<UnusedTypeParameterIssue> (input, 1);
+		}
+
+		[Test]
+		public void TestUsedTypeParameter ()
+		{
+			var input = @"
+class TestClass {
+	void TestMethod<T> (T i)
+	{
+	}
+}";
+			var input2 = @"
+class TestClass {
+	T TestMethod<T> ()
+	{
+	}
+}";
+			Test<UnusedTypeParameterIssue> (input, 0);
+			Test<UnusedTypeParameterIssue> (input2, 0);
+		}
+
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseArrayCreationExpressionIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseArrayCreationExpressionIssueTests.cs
new file mode 100644
index 0000000000..2dd42034b8
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseArrayCreationExpressionIssueTests.cs
@@ -0,0 +1,95 @@
+//
+// UseArrayCreationExpressionIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class UseArrayCreationExpressionIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestTypeOfIsAssignableFrom ()
+		{
+			Test<UseArrayCreationExpressionIssue> (@"
+class Test
+{
+	void Foo()
+	{
+		System.Array.CreateInstance(typeof(int), 10);
+	}
+}
+", @"
+class Test
+{
+	void Foo()
+	{
+		new int[10];
+	}
+}
+");
+		}
+
+		[Test]
+		public void MultiDim ()
+		{
+			Test<UseArrayCreationExpressionIssue> (@"
+class Test
+{
+	void Foo(int i)
+	{
+		System.Array.CreateInstance(typeof(int), 10, 20, i);
+	}
+}
+", @"
+class Test
+{
+	void Foo(int i)
+	{
+		new int[10, 20, i];
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<UseArrayCreationExpressionIssue> (@"
+class Test
+{
+	void Foo()
+	{
+		// ReSharper disable once UseArrayCreationExpression
+		System.Array.CreateInstance(typeof(int), 10);
+	}
+}
+");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseBlockInsteadColonIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseBlockInsteadColonIssueTests.cs
deleted file mode 100644
index 095d4969eb..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseBlockInsteadColonIssueTests.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// UseBlockInsteadColonIssueTests.cs
-//
-// Author:
-//       Ciprian Khlud <ciprian.mustiata@yahoo.com>
-//
-// Copyright (c) 2013 Ciprian Khlud
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{	
-	[TestFixture]
-	public class UseBlockInsteadColonIssueTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestSimple ()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		if (i > 0);
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod (int i)
-	{
-		if (i > 0) {
-		}
-	}
-}";
-			Test<UseBlockInsteadColonIssue>(input, output);
-		}
-		[Test]
-		public void TestForeach()
-		{
-			var input = @"
-class TestClass
-{
-	void TestMethod (int[] list)
-	{
-		foreach (var i in list);
-	}
-}";
-			var output = @"
-class TestClass
-{
-	void TestMethod (int[] list)
-	{
-		foreach (var i in list) {
-		}
-	}
-}";
-			Test<UseBlockInsteadColonIssue>(input, output);
-		}
-	}
-	
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseIsOperatorIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseIsOperatorIssueTests.cs
new file mode 100644
index 0000000000..20439a068d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseIsOperatorIssueTests.cs
@@ -0,0 +1,98 @@
+//
+// UseIsOperatorIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class UseIsOperatorIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestTypeOfIsAssignableFrom ()
+		{
+			Test<UseIsOperatorIssue> (@"using System;
+class FooBar
+{
+	void Foo()
+	{
+		if (typeof(FooBar).IsAssignableFrom (this.GetType ())) {
+		}
+	}
+}
+", @"using System;
+class FooBar
+{
+	void Foo()
+	{
+		if (this is FooBar) {
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestTypeOfIsInstanceOfType ()
+		{
+			Test<UseIsOperatorIssue> (@"using System;
+class FooBar
+{
+	void Foo()
+	{
+		if (typeof(FooBar).IsInstanceOfType (1 + 2)) {
+		}
+	}
+}
+", @"using System;
+class FooBar
+{
+	void Foo()
+	{
+		if ((1 + 2) is FooBar) {
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<UseIsOperatorIssue> (@"using System;
+class FooBar
+{
+	void Foo()
+	{
+		// ReSharper disable once UseIsOperator
+		if (typeof(FooBar).IsAssignableFrom (this.GetType ())) {
+		}
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseMethodAnyIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseMethodAnyIssueTests.cs
new file mode 100644
index 0000000000..0cbd0fc7fd
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseMethodAnyIssueTests.cs
@@ -0,0 +1,153 @@
+//
+// UseMethodAnyIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class UseMethodAnyIssueTests: InspectionActionTestBase
+	{
+		static string ConstructExpression(string expr)
+		{
+			return @"
+using System;
+using System.Linq;
+class Bar
+{
+	public void Foo (string[] args)
+	{
+		if (" + expr + @")
+			Console.WriteLine ();
+	}
+}
+";
+		}
+
+		[Test]
+		public void TestAnyNotEqual ()
+		{
+			Test<UseMethodAnyIssue>(ConstructExpression("args.Count () != 0"), ConstructExpression("args.Any ()"));
+		}
+
+		[Test]
+		public void TestAnyGreater ()
+		{
+			Test<UseMethodAnyIssue>(ConstructExpression("args.Count () > 0"), ConstructExpression("args.Any ()"));
+		}
+
+		[Test]
+		public void TestAnyLower ()
+		{
+			Test<UseMethodAnyIssue>(ConstructExpression("0 < args.Count ()"), ConstructExpression("args.Any ()"));
+		}
+
+
+		[Test]
+		public void TestAnyGreaterEqual ()
+		{
+			Test<UseMethodAnyIssue>(ConstructExpression("args.Count () >= 1"), ConstructExpression("args.Any ()"));
+		}
+
+		[Test]
+		public void TestAnyLessEqual ()
+		{
+			Test<UseMethodAnyIssue>(ConstructExpression("1 <= args.Count ()"), ConstructExpression("args.Any ()"));
+		}
+
+
+		[Test]
+		public void TestNotAnyEqual ()
+		{
+			Test<UseMethodAnyIssue>(ConstructExpression("args.Count () == 0"), ConstructExpression("!args.Any ()"));
+		}
+
+		[Test]
+		public void TestNotAnyLess ()
+		{
+			Test<UseMethodAnyIssue>(ConstructExpression("args.Count () < 1"), ConstructExpression("!args.Any ()"));
+		}
+
+		[Test]
+		public void TestNotAnyGreater ()
+		{
+			Test<UseMethodAnyIssue>(ConstructExpression("1 > args.Count ()"), ConstructExpression("!args.Any ()"));
+		}
+
+		[Test]
+		public void TestNotAnyLessEqual ()
+		{
+			Test<UseMethodAnyIssue>(ConstructExpression("args.Count () <= 0"), ConstructExpression("!args.Any ()"));
+		}
+
+		[Test]
+		public void TestNotAnyGreaterEqual ()
+		{
+			Test<UseMethodAnyIssue>(ConstructExpression("0 >= args.Count ()"), ConstructExpression("!args.Any ()"));
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<UseMethodAnyIssue>(@"
+using System;
+using System.Linq;
+class Bar
+{
+	public void Foo (string[] args)
+	{
+		// ReSharper disable once UseMethodAny
+		if (args.Count () > 0)
+			Console.WriteLine();
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestWrongMethod ()
+		{
+			TestWrongContext<UseMethodAnyIssue>(@"
+using System;
+using System.Linq;
+class Bar
+{
+	public int Count () { return 5; }
+
+	public void Foo (Bar args)
+	{
+		if (args.Count () > 0)
+			Console.WriteLine();
+	}
+}
+");
+		}
+
+
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseMethodIsInstanceOfTypeIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseMethodIsInstanceOfTypeIssueTests.cs
new file mode 100644
index 0000000000..342985c833
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseMethodIsInstanceOfTypeIssueTests.cs
@@ -0,0 +1,79 @@
+//
+// UseMethodIsInstanceOfTypeIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class UseMethodIsInstanceOfTypeIssueTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestBasicUsage ()
+		{
+			Test<UseMethodIsInstanceOfTypeIssue> (@"using System;
+class FooBar
+{
+	void Foo()
+	{
+		Type t;
+		if (t.IsAssignableFrom (this.GetType ())) {
+		}
+	}
+}
+", @"using System;
+class FooBar
+{
+	void Foo()
+	{
+		Type t;
+		if (t.IsInstanceOfType (this)) {
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestDisable ()
+		{
+			TestWrongContext<UseMethodIsInstanceOfTypeIssue> (@"using System;
+class FooBar
+{
+	void Foo()
+	{
+		Type t;
+		// ReSharper disable once UseMethodIsInstanceOfType
+		if (t.IsAssignableFrom (this.GetType ())) {
+		}
+	}
+}
+");
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseOfMemberOfNullReferenceTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseOfMemberOfNullReferenceTests.cs
new file mode 100644
index 0000000000..4ff1f2858d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseOfMemberOfNullReferenceTests.cs
@@ -0,0 +1,283 @@
+// 
+// UseOfMemberOfNullReferenceTests.cs
+// 
+// Author:
+//      Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class UseOfMemberOfNullReferenceTests : InspectionActionTestBase
+	{
+		[Test]
+		public void TestSimple ()
+		{
+			string input = @"
+class TestClass
+{
+	int TestMethod() {
+		string x = null;
+		return x.Length;
+	}
+}";
+			Test<UseOfMemberOfNullReference> (input, 1);
+		}
+
+		[Test]
+		public void TestDisabledForNonNull ()
+		{
+			string input = @"
+class TestClass
+{
+	int TestMethod() {
+		string x = """";
+		return x.Length;
+	}
+}";
+			TestWrongContext<UseOfMemberOfNullReference> (input);
+		}
+
+		[Test]
+		public void TestDisabledForHasValue ()
+		{
+			string input = @"
+class TestClass
+{
+	bool TestMethod() {
+		int? x = null;
+		return x.HasValue;
+	}
+}";
+			TestWrongContext<UseOfMemberOfNullReference> (input);
+		}
+
+		[Test]
+		public void TestMethodGroup ()
+		{
+			string input = @"
+static class X {
+	static void Clone(this string x, int i) {}
+}
+class TestClass
+{
+	object TestMethod() {
+		string x = null;
+		return x.Clone();
+	}
+}";
+			Test<UseOfMemberOfNullReference> (input, 1);
+		}
+
+		[Test]
+		public void TestDisabledForExtensionMethods ()
+		{
+			string input = @"
+static class X
+{
+	static void Foo(this string x) {}
+}
+class TestClass
+{
+	void TestMethod() {
+		string x = """";
+		x.Foo();
+	}
+}";
+			TestWrongContext<UseOfMemberOfNullReference> (input);
+		}
+
+		[Test]
+		public void TestAs ()
+		{
+			string input = @"
+class TestClass
+{
+	int TestMethod(object x) {
+		return (x as string).Length;
+	}
+}";
+			Test<UseOfMemberOfNullReference> (input, 1);
+		}
+
+		[Test]
+		public void TestAsCase2 ()
+		{
+			string input = @"
+class TestClass
+{
+	int TestMethod(object x) {
+		return (this as TestClass).TestMethod(null);
+	}
+}";
+			Test<UseOfMemberOfNullReference> (input, 0);
+		}
+
+
+		[Test]
+		public void TestIfBranch ()
+		{
+			string input = @"
+class TestClass
+{
+	int TestMethod(object x, object y) 
+	{
+		if (y != null)
+			x = null;
+		return x.GetHashCode ();
+	}
+}";
+			Test<UseOfMemberOfNullReference> (input, 1);
+		}
+
+		[Test]
+		public void TestSwitchBranch ()
+		{
+			string input = @"
+class TestClass
+{
+	int TestMethod(object x, int y) 
+	{
+		switch (y) {
+		case 1:
+			break;
+		case 2:
+			x = null;
+			break;
+		default:
+			x = new object ();
+			break;
+		}
+		return x.GetHashCode ();
+	}
+}";
+			Test<UseOfMemberOfNullReference> (input, 1);
+		}
+
+		[Test]
+		public void TestWhile ()
+		{
+			string input = @"
+class TestClass
+{
+	int TestMethod(object x, int y) 
+	{
+		while (y++ < 10) {
+			x = null;
+		}
+		return x.GetHashCode ();
+	}
+}";
+			Test<UseOfMemberOfNullReference> (input, 1);
+		}
+
+		[Test]
+		public void TestNullExpression ()
+		{
+			string input = @"
+class TestClass
+{
+	int TestMethod() {
+		return default(string).Length;
+	}
+}";
+			Test<UseOfMemberOfNullReference> (input, 1);
+		}
+
+		[Test]
+		public void TestNullExpressionCase2 ()
+		{
+			string input = @"
+class TestClass
+{
+	int TestMethod() {
+		return (default(string) ?? default(string)).Length;
+	}
+}";
+			Test<UseOfMemberOfNullReference> (input, 1);
+		}
+
+		[Test]
+		public void TestNullExpressionCase3 ()
+		{
+			string input = @"
+class TestClass
+{
+	int TestMethod() {
+		return (1 == 1 ? default(string) : """").Length;
+	}
+}";
+			Test<UseOfMemberOfNullReference> (input, 1);
+		}
+
+
+		
+		[Test]
+		public void TestParameter ()
+		{
+			TestWrongContext<UseOfMemberOfNullReference> (@"
+class TestClass
+{
+	void TestMethod(TestClass test) 
+	{
+		test.TestMethod(this);
+	}
+}");
+		}
+
+		[Test]
+		public void TestDoWhile()
+		{
+			TestWrongContext<UseOfMemberOfNullReference> (@"
+public class TestClass {
+	static string GetElement ()
+	{
+		string x = """";
+		do {
+			break;
+		} while ((x = null) == null);
+		x.ToString();
+	}
+}");
+		}
+
+		[Test]
+		public void TestDefaultStruct ()
+		{
+			TestWrongContext<UseOfMemberOfNullReference> (@"
+struct Foo { public int Length { get { return 0; } } } 
+class TestClass
+{
+	int TestMethod() 
+	{
+		var foo = default(Foo);
+		return foo.Length;
+	}
+}");
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseVarKeywordInspectorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseVarKeywordInspectorTests.cs
deleted file mode 100644
index ff6981d0e7..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UseVarKeywordInspectorTests.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// 
-// UseVarKeywordInspectorTests.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	[TestFixture]
-	public class UseVarKeywordInspectorTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestInspectorCase1 ()
-		{
-			var input = @"class Foo
-{
-	void Bar (object o)
-	{
-		Foo foo = (Foo)o;
-	}
-}";
-
-			TestRefactoringContext context;
-			var issues = GetIssues (new UseVarKeywordIssue (), input, out context);
-			Assert.AreEqual (1, issues.Count);
-			// Fix is done by code action.
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ValueParameterNotUsedIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ValueParameterNotUsedIssueTests.cs
new file mode 100644
index 0000000000..d86a26e27d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ValueParameterNotUsedIssueTests.cs
@@ -0,0 +1,228 @@
+//
+// SetterDoesNotUseValueParameterTests.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.CSharp;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+ 
+	public class ValueParameterNotUsedIssueTests : InspectionActionTestBase
+	{
+       
+        [Test]
+        public void TestPropertySetter()
+        {
+            var input = @"class A
+{
+	int Property1
+	{
+		set {
+			int val = value;
+		}
+	}
+	int Property2
+	{
+		set {
+		}
+	}
+}";
+            TestRefactoringContext context;
+            var issues = GetIssues(new ValueParameterNotUsedIssue(), input, out context);
+            Assert.AreEqual(1, issues.Count);
+        }
+
+
+        [Test]
+        public void TestDisable()
+        {
+            var input = @"class A
+{
+    int Property1
+    {
+        set
+        {
+            int val = value;
+        }
+    }
+    int Property2
+    {
+// ReSharper disable once ValueParameterNotUsed
+        set
+        {
+        }
+    }
+}";
+            TestWrongContext<ValueParameterNotUsedIssue>(input);
+        }
+
+		[Test]
+		public void TestMatchingIndexerSetter()
+		{
+			var input = @"class A
+{
+	A this[int index]
+	{
+		set {
+		}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ValueParameterNotUsedIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+		}
+
+		[Test]
+		public void TestMatchingEventAdder()
+		{
+			var input = @"class A	
+{
+	delegate void TestEventHandler ();
+	TestEventHandler eventTested;
+	event TestEventHandler EventTested
+	{
+		add {
+			eventTested += value;
+		}
+		remove {
+		}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ValueParameterNotUsedIssue(), input, out context);
+			Assert.AreEqual(1, issues.Count);
+		}
+
+		[Test]
+		public void TestNonMatchingIndexerSetter()
+		{
+			var input = @"class A
+{
+	A this[int index]
+	{
+		set {
+			A a = value;
+		}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ValueParameterNotUsedIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void IgnoresAutoSetter()
+		{
+			var input = @"class A
+{
+	string  Property { set; }
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ValueParameterNotUsedIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void IgnoreReadOnlyProperty()
+		{
+			var input = @"class A
+{
+	string  Property { get; }
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ValueParameterNotUsedIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void DoesNotCrashOnNullIndexerAccessorBody()
+		{
+			var input = @"abstract class A
+{
+	public abstract string this[int i] { get; set; }
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ValueParameterNotUsedIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+		
+		[Test]
+		public void DoesNotWarnOnExceptionThrowingAccessor()
+		{
+			var input = @"abstract class A
+{
+	public string Property
+	{
+		set {
+			throw new Exception();
+		}
+	}
+}";
+			TestRefactoringContext context;
+			var issues = GetIssues(new ValueParameterNotUsedIssue(), input, out context);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+        [Test]
+        public void DoesNotWarnOnEmptyCustomEvent()
+        {
+            // Empty custom events are often used when the event can never be raised
+            // by a class (but the event is required e.g. due to an interface).
+            var input = @"class A	
+{
+	delegate void TestEventHandler ();
+	event TestEventHandler EventTested
+	{
+		add { }
+		remove { }
+	}
+}";
+            TestRefactoringContext context;
+            var issues = GetIssues(new ValueParameterNotUsedIssue(), input, out context);
+            Assert.AreEqual(0, issues.Count);
+        }
+        
+        [Test]
+        public void DoesNotWarnOnNotImplementedCustomEvent()
+        {
+            var input = @"class A	
+{
+	delegate void TestEventHandler ();
+	event TestEventHandler EventTested
+	{
+		add { throw new System.NotImplementedException(); }
+		remove { throw new System.NotImplementedException(); }
+	}
+}";
+            TestRefactoringContext context;
+            var issues = GetIssues(new ValueParameterNotUsedIssue(), input, out context);
+            Assert.AreEqual(0, issues.Count);
+        }
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ValueParameterUnusedTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ValueParameterUnusedTests.cs
deleted file mode 100644
index a3327d82f6..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ValueParameterUnusedTests.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-// SetterDoesNotUseValueParameterTests.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2012 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.CSharp.CodeActions;
-
-namespace ICSharpCode.NRefactory.CSharp.CodeIssues
-{
-	public class ValueParameterUnusedTests : InspectionActionTestBase
-	{
-		[Test]
-		public void TestPropertySetter()
-		{
-			var input = @"class A
-{
-	int Property1
-	{
-		set {
-			int val = value;
-		}
-	}
-	int Property2
-	{
-		set {
-		}
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ValueParameterUnusedIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-		}
-
-		[Test]
-		public void TestMatchingIndexerSetter()
-		{
-			var input = @"class A
-{
-	A this[int index]
-	{
-		set {
-		}
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ValueParameterUnusedIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-		}
-
-		[Test]
-		public void TestMatchingEventAdder()
-		{
-			var input = @"class A	
-{
-	delegate void TestEventHandler ();
-	TestEventHandler eventTested;
-	event TestEventHandler EventTested
-	{
-		add {
-			eventTested += value;
-		}
-		remove {
-		}
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ValueParameterUnusedIssue(), input, out context);
-			Assert.AreEqual(1, issues.Count);
-		}
-
-		[Test]
-		public void TestNonMatchingIndexerSetter()
-		{
-			var input = @"class A
-{
-	A this[int index]
-	{
-		set {
-			A a = value;
-		}
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ValueParameterUnusedIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-
-		[Test]
-		public void IgnoresAutoSetter()
-		{
-			var input = @"class A
-{
-	string  Property { set; }
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ValueParameterUnusedIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void IgnoreReadOnlyProperty()
-		{
-			var input = @"class A
-{
-	string  Property { get; }
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ValueParameterUnusedIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void DoesNotCrashOnNullIndexerAccessorBody()
-		{
-			var input = @"abstract class A
-{
-	public abstract string this[int i] { get; set; }
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ValueParameterUnusedIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void DoesNotWarnOnExceptionThrowingAccessor()
-		{
-			var input = @"abstract class A
-{
-	public string Property
-	{
-		set {
-			throw new Exception();
-		}
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ValueParameterUnusedIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-		
-		[Test]
-		public void DoesNotWarnOnEmptyCustomEvent()
-		{
-			// Empty custom events are often used when the event can never be raised
-			// by a class (but the event is required e.g. due to an interface).
-			var input = @"class A	
-{
-	delegate void TestEventHandler ();
-	event TestEventHandler EventTested
-	{
-		add { }
-		remove { }
-	}
-}";
-			TestRefactoringContext context;
-			var issues = GetIssues(new ValueParameterUnusedIssue(), input, out context);
-			Assert.AreEqual(0, issues.Count);
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/XmlDocIssueIssueTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/XmlDocIssueIssueTests.cs
new file mode 100644
index 0000000000..d6efc5c9e5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/XmlDocIssueIssueTests.cs
@@ -0,0 +1,157 @@
+//
+// InvalidXmlTypeReferenceIssueTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using System.Collections.Generic;
+using NUnit.Framework;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeIssues
+{
+	[TestFixture]
+	public class XmlDocIssueTests: InspectionActionTestBase
+	{
+		[Test]
+		public void TestBeforeNamespace()
+		{
+			Test<XmlDocIssue>(@"
+/// foo
+namespace Foo {}
+", @"
+namespace Foo {}
+");
+		}
+
+		[Test]
+		public void TestBeforeUsing()
+		{
+			Test<XmlDocIssue>(@"
+/// foo
+using System;
+", @"
+using System;
+");
+		}
+
+		[Test]
+		public void TestBeforeUsingAlias()
+		{
+			Test<XmlDocIssue>(@"
+/// foo
+using A = System;
+", @"
+using A = System;
+");
+		}
+		
+		[Test]
+		public void TestBeforeExternAlias()
+		{
+			Test<XmlDocIssue>(@"
+/// foo
+extern alias System;
+", @"
+extern alias System;
+");
+		}
+
+		[Test]
+		public void TestTypeParameter()
+		{
+			TestRefactoringContext ctx;
+			var issues = GetIssues(new XmlDocIssue(), @"
+/// <typeparam name=""Undefined""></typeparam>
+class Foo {}
+
+/// <typeparam name=""T""></typeparam>
+class Foo2<T> {}
+", out ctx);
+			Assert.AreEqual(1, issues.Count);
+		}
+
+		[Test]
+		public void TestWrongMethodParameter()
+		{
+			TestRefactoringContext ctx;
+			var issues = GetIssues(new XmlDocIssue(), @"
+class Foo {
+	/// <param name=""undefined""></param>
+	/// <param name=""y""></param>
+	/// <param name=""z""></param>
+	public void FooBar(int x, int y, int z)
+	{
+	}
+
+	/// <param name=""x1""></param>
+	/// <param name=""y""></param>
+	int this[int x, int y] { get { return 1;  } }
+}
+", out ctx);
+			Assert.AreEqual(2, issues.Count);
+		}
+
+		[Test]
+		public void TestSeeCref()
+		{
+			TestRefactoringContext ctx;
+			var issues = GetIssues(new XmlDocIssue(), @"
+/// <summary>
+/// </summary>
+/// <see cref=""Undefined""/>
+class Foo {
+	public void Undefined () {}
+}
+
+/// <summary>
+/// <seealso cref=""Foo""/>
+/// </summary>
+/// <see cref=""Foo2""/>
+class Foo2 {}
+", out ctx);
+			Assert.AreEqual(0, issues.Count);
+		}
+
+		[Test]
+		public void TestValidCref()
+		{
+			TestWrongContext<XmlDocIssue>(@"
+using System;
+
+namespace Foo {
+	/// <summary>
+	/// </summary>
+	/// <see cref=""IDisposable""/>
+	class Foo {
+		public void Undefined () {}
+	}
+}");
+		}
+	}
+
+
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/InsertParenthesesVisitorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/InsertParenthesesVisitorTests.cs
index 5b0d3fc36d..2ee58946c2 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/InsertParenthesesVisitorTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/InsertParenthesesVisitorTests.cs
@@ -214,8 +214,8 @@ namespace ICSharpCode.NRefactory.CSharp
 				}
 			}.Invoke("ToArray");
 			
-			Assert.AreEqual("( from a in b select a.c ()).ToArray ()", InsertRequired(expr));
-			Assert.AreEqual("( from a in b select a.c ()).ToArray ()", InsertReadable(expr));
+			Assert.AreEqual("(from a in b select a.c ()).ToArray ()", InsertRequired(expr));
+			Assert.AreEqual("(from a in b select a.c ()).ToArray ()", InsertReadable(expr));
 		}
 		
 		[Test]
@@ -238,10 +238,10 @@ namespace ICSharpCode.NRefactory.CSharp
 				query.Clone()
 			);
 			
-			Assert.AreEqual("( from a in b select a) + " +
-			                " from a in b select a", InsertRequired(expr));
-			Assert.AreEqual("( from a in b select a) + " +
-			                "( from a in b select a)", InsertReadable(expr));
+			Assert.AreEqual("(from a in b select a) + " +
+			                "from a in b select a", InsertRequired(expr));
+			Assert.AreEqual("(from a in b select a) + " +
+			                "(from a in b select a)", InsertReadable(expr));
 		}
 		
 		[Test]
@@ -259,8 +259,8 @@ namespace ICSharpCode.NRefactory.CSharp
 				}
 			}.IsType(new PrimitiveType("int"));
 			
-			Assert.AreEqual("( from a in b select a) is int", InsertRequired(expr));
-			Assert.AreEqual("( from a in b select a) is int", InsertReadable(expr));
+			Assert.AreEqual("(from a in b select a) is int", InsertRequired(expr));
+			Assert.AreEqual("(from a in b select a) is int", InsertReadable(expr));
 		}
 		
 		[Test]
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Bugs/ParserBugTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Bugs/ParserBugTests.cs
index 02ae4df20c..1ffdb7b2ea 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Bugs/ParserBugTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Bugs/ParserBugTests.cs
@@ -302,6 +302,7 @@ class Test
 			var unit = SyntaxTree.Parse(code);
 			
 			bool passed = unit.ToString().Trim() == @"using System;
+
 class Test
 {
 	void Foo ()
@@ -433,7 +434,7 @@ class Foo
 }
 ";
 			var unit = SyntaxTree.Parse(code);
-			
+
 			var type = unit.Members.First() as TypeDeclaration;
 			var method = type.Members.First() as MethodDeclaration;
 			bool passed = method.Parameters.Count == 1;
@@ -443,6 +444,216 @@ class Foo
 			}
 			Assert.IsTrue(passed);
 		}
+
+		[Test]
+		public void TestMultipleNestedPartialClassesInSameFile ()
+		{
+			string code = @"public partial class PartialClassInSameFile
+	{
+		public partial class NestedPartial
+		{
+			void Foo ()
+			{
+			}
+		}
+	}
+
+	public partial class PartialClassInSameFile
+	{
+		public partial class NestedPartial 
+		{
+			void FooBar ()
+			{
+
+			}
+		}
+	}
+";
+			var unit = SyntaxTree.Parse(code);
+			Console.WriteLine(unit);
+			var type = unit.Members.First() as TypeDeclaration;
+			Assert.IsTrue(type.Members.FirstOrDefault() is TypeDeclaration, "1st nested partial not found."); 
+
+			type = unit.Members.Skip (1).First() as TypeDeclaration;
+			Assert.IsTrue(type.Members.FirstOrDefault() is TypeDeclaration, "2nd nested partial not found."); 
+
+		}
+
+
+		/// <summary>
+		/// Bug 12383 - [AST] Non existing namespaces generated
+		/// </summary>
+		[Test]
+		public void TestBug12383()
+		{
+			string code = @"using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Xml;
+using Kajabity.Tools.Java;
+using Xamarin.Installer.Core;
+
+namespace Xamarin.Installer.Core.Components.Android
+{
+	public class AndroidComponentSystemImage : AndroidComponentBase
+	{
+		public string Abi { get; private set; }
+
+		public uint ApiLevel { get; private set; }
+
+		public override string Name {
+			get { return String.Format (SYSTEM_IMAGE_NAME_FORMAT, ApiLevel); }
+		}
+
+		public override string UserFriendlyName {
+			get { return String.Format (""{0} System Image for API {1} ({2})"", LicenseVendor, ApiLevel, Abi); }
+		}
+
+		public override string LicenseTitle {
+			get { return String.Format (""{0} System Image"", LicenseVendor); }
+		}
+
+		string LicenseVendor {
+			get {
+				string ul = Info.UsesLicense;
+				if (String.IsNullOrWhiteSpace (ul))
+					return ""Android"";
+				if (ul.IndexOf (""intel"", StringComparison.OrdinalIgnoreCase) >= 0)
+					return ""Intel"";
+				else if (ul.IndexOf (""mips"", StringComparison.OrdinalIgnoreCase) >= 0)
+					return ""MIPS"";
+				else
+					return ""Android"";
+			
+		}
+
+		public override bool Init (AndroidComponentInfoBase componentInfo, AndroidSDKComponentInfo sdkInfo)
+		{
+			if (!base.Init (componentInfo, sdkInfo))
+				return false;
+
+			var info = componentInfo as AndroidComponentSystemImageInfo;
+			if (info == null) {
+				LogUnexpectedComponentInfoType (componentInfo);
+				return false;
+			}
+			ApiLevel = info.ApiLevel;
+			Abi = info.Abi;
+
+			return true;
+		}
+
+		public override bool Install (DownloadedItem item, AndroidSdkInstance sdk)
+		{
+			if (item == null)
+				throw new ArgumentNullException (""item"");
+			if (sdk == null)
+				throw new ArgumentNullException (""sdk"");
+
+			bool success = true;
+			string message = ""Android SDK Platform API level {0}, ABI {1} system image failed to install."";
+
+			Log.Debug (""Installing system image for Android SDK Platform API {0}, ABI {1}."", ApiLevel, Abi);
+			try {
+				if (!DoInstall (item.FilePath, sdk.Path, ""system-images"", ""android-"" + ApiLevel, Abi)) {
+					Log.Warning (message, ApiLevel, Abi);
+					success = false;
+				} else
+					UpdateSourceProperties (sdk.Path);
+			} catch (Exception ex) {
+				Log.Warning (message, ex, ApiLevel, Abi);
+				success = false;
+			}
+
+			return success;
+		}
+
+		public override bool IsInstallationNeeded (AndroidSdkInstance instance, AndroidPlatformSpecificToolNames toolNames)
+		{
+			Installed = false;
+			if (instance == null)
+				throw new ArgumentNullException (""instance"");
+
+			string systemImagePath = Path.Combine (instance.Path, ""system-images"", ""android-"" + ApiLevel, Abi);
+			AndroidDownloadsCharter charter = instance.DownloadCharter;
+			JavaProperties props;
+
+			if (!Directory.Exists (systemImagePath)) {
+				charter.DownloadSystemImages = true;
+				instance.AddUpdateReason (""System image {0}/{1} directory does not exist"", ApiLevel, Abi);
+				return true;
+			}
+
+			if (!ReadJavaProperties (Path.Combine (systemImagePath, ""source.properties""), out props) || props == null) {
+				charter.DownloadSystemImages = true;
+				instance.AddUpdateReason (""Unable to read System Image {0}/{1} properties, assuming it's outdated"", ApiLevel, Abi);
+				return true;
+			}
+
+			Installed = true;
+			string rev;
+			Version instv;
+			if (!props.GetPkgRevision (out rev, out instv)) {
+				charter.DownloadSystemImages = true;
+				instance.AddUpdateReason (""Unable to read System Image {0}/{1} revision, assuming it's outdated"", ApiLevel, Abi);
+				return true;
+			}
+
+			string value;
+			if (!props.GetProperty<string> (""SystemImage.Abi"", out value) || String.IsNullOrEmpty (value)) {
+				charter.DownloadSystemImages = true;
+				instance.AddUpdateReason (""Unable to read System Image {0}/{1} ABI, assuming it's outdated"", ApiLevel, Abi);
+				return true;
+			}
+
+			if (String.Compare (value, Abi, StringComparison.OrdinalIgnoreCase) != 0) {
+				charter.DownloadSystemImages = true;
+				instance.AddUpdateReason (""Installed System Image {0} ABI ({1}) is different ({2}), assuming it's outdated"", ApiLevel, Abi, value);
+				return true;
+			}
+
+			if (Revision.AndroidTryParse (true) > instv) {
+				charter.DownloadSystemImages = true;
+				instance.AddUpdateReason (""Installed System Image {0}/{1} revision {2} is older than the required one ({3})"", ApiLevel, Abi, instv, Revision);
+				return true;
+			}
+
+			bool needsDownload = false;
+			if (!File.Exists (Path.Combine (systemImagePath, ""system.img""))) {
+				if (!File.Exists (Path.Combine (systemImagePath, ""images"", Abi, ""system.img""))) {
+					needsDownload = true;
+					charter.DownloadSystemImages = true;
+					instance.AddUpdateReason (""system.img not found for API {0}, ABI {1}"", ApiLevel, Abi);
+				}
+			}
+
+			return needsDownload;
+		}
+
+		protected override void UpdateSourceProperties (string targetBasePath)
+		{
+			var props = new JavaProperties ();
+
+			props.SetProperty (""Pkg.Desc"", Description);
+			props.SetProperty (""Archive.Os"", OS.ToUpperInvariant ());
+			props.SetProperty (""Archive.Arch"", Arch.ToUpperInvariant ());
+			props.SetProperty (""AndroidVersion.ApiLevel"", ApiLevel.ToString ());
+			props.SetProperty (""Pkg.Revision"", Revision.ToString ());
+			props.SetProperty (""SystemImage.Abi"", Abi);
+			props.SetProperty (""Pkg.SourceUrl"", SDKInfo.RepositoryUrl);
+
+			SaveProperties (props, targetBasePath, ""system-images"", ""android-"" + ApiLevel, Abi);
+		}
+	}
+}
+
+";
+			var unit = SyntaxTree.Parse(code);
+			Assert.AreEqual(1, unit.DescendantNodesAndSelf().OfType<NamespaceDeclaration>().Count());
+
+		}
+
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/ArrayCreateExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/ArrayCreateExpressionTests.cs
index fa761e2081..fb9f14dc21 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/ArrayCreateExpressionTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/ArrayCreateExpressionTests.cs
@@ -169,5 +169,12 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Expression
 			                	Roles.RBrace
 			                }, ace.Initializer.Children.Select(c => c.Role).ToArray());
 		}
+		
+		[Test]
+		public void IncompleteExpressionInArrayCreateExpression()
+		{
+			// test that the parser doesn't crash
+			ParseUtilCSharp.ParseExpression<ArrayCreateExpression>("new int[sections.]", expectErrors: true);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/UndocumentedExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/UndocumentedExpressionTests.cs
index 55e4b38c60..245de10d71 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/UndocumentedExpressionTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/UndocumentedExpressionTests.cs
@@ -108,7 +108,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Expression
 						UndocumentedExpressionType = UndocumentedExpressionType.RefValue,
 						Arguments = {
 							new IdentifierExpression("tr"),
-							new TypeReferenceExpression(new PrimitiveType("object"))
+							new PrimitiveType("object")
 						}
 					}));
 		}
@@ -123,7 +123,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Expression
 						UndocumentedExpressionType = UndocumentedExpressionType.RefValue,
 						Arguments = {
 							new IdentifierExpression("tr"),
-							new TypeReferenceExpression(new PrimitiveType("object"))
+							new PrimitiveType("object")
 						}
 					},
 					new IdentifierExpression("o")));
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/AttributeSectionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/AttributeSectionTests.cs
index 64a888ab9e..87740c03d9 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/AttributeSectionTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/AttributeSectionTests.cs
@@ -84,7 +84,7 @@ public class Form1 {
 			Assert.IsTrue(attr.GetChildByRole(Roles.RPar).IsNull);
 		}
 		
-		[Test, Ignore("Parser bug - parenthesis are missing")]
+		[Test]
 		public void AttributeWithEmptyParenthesis()
 		{
 			string program = @"[Attr()] class Test {}";
@@ -233,7 +233,6 @@ public class Form1 {
 					}});
 		}
 		
-		[Ignore("Fixme!")]
 		[Test]
 		public void AssemblyAttributeBeforeNamespace()
 		{
@@ -246,7 +245,6 @@ public class Form1 {
 				}, syntaxTree.Children.Select(c => c.GetType()).ToArray());
 		}
 		
-		[Ignore("Fixme!")]
 		[Test]
 		public void AssemblyAttributeBeforeClass()
 		{
@@ -259,5 +257,20 @@ public class Form1 {
 				}, syntaxTree.Children.Select(c => c.GetType()).ToArray());
 			Assert.That(((TypeDeclaration)syntaxTree.LastChild).Attributes, Is.Empty);
 		}
+		
+		[Test, Ignore("parser bug; see https://github.com/icsharpcode/NRefactory/pull/73")]
+		public void AssemblyAndModuleAttributeBeforeClass()
+		{
+			// See also: TypeSystemConvertVisitorTests.AssemblyAndModuleAttributesDoNotAppearOnTypes
+			var syntaxTree = SyntaxTree.Parse("[assembly: My1][module: My2][My3]class C {}");
+			Assert.AreEqual(
+				new Type[] {
+					typeof(AttributeSection),
+					typeof(AttributeSection),
+					typeof(TypeDeclaration)
+				}, syntaxTree.Children.Select(c => c.GetType()).ToArray());
+			var td = (TypeDeclaration)syntaxTree.LastChild;
+			Assert.AreEqual(1, td.Attributes.Count);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/CommentTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/CommentTests.cs
index 89552a7d4f..f05af4bb65 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/CommentTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/CommentTests.cs
@@ -96,7 +96,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope
 			Assert.AreEqual(CommentType.MultiLine, c.CommentType);
 			Assert.AreEqual("", c.Content);
 		}
-		
+
 		[Test]
 		public void MultilineCommentWith3Stars()
 		{
@@ -108,5 +108,24 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope
 			Assert.AreEqual(CommentType.MultiLine, c.CommentType);
 			Assert.AreEqual("** Comment ", c.Content);
 		}
+
+		[Test]
+		public void NoEmptyComments()
+		{
+			string program = @"#if foo
+#undef a
+#endif";
+			var parser = new CSharpParser();
+			var syntaxTree = parser.Parse(program);
+			Assert.IsFalse(parser.HasErrors, string.Join(Environment.NewLine, parser.Errors.Select(e => string.Format("{0}: {1}", e.Region.BeginLine, e.Message))));
+			var roles = syntaxTree.Children.Select(c => c.Role).ToArray();
+			Assert.AreEqual(new Role[] {
+				Roles.PreProcessorDirective,
+				Roles.NewLine,
+				Roles.PreProcessorDirective,
+				Roles.NewLine,
+				Roles.PreProcessorDirective
+			}, roles);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/PreprocessorDirectiveTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/PreprocessorDirectiveTests.cs
index ed2b923226..408af435f9 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/PreprocessorDirectiveTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/PreprocessorDirectiveTests.cs
@@ -38,7 +38,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope
 			
 			Assert.AreEqual(new Role[] {
 			                	Roles.NamespaceKeyword,
-			                	Roles.Identifier,
+			                	NamespaceDeclaration.NamespaceNameRole,
 			                	Roles.LBrace,
 			                	Roles.PreProcessorDirective,
 			                	Roles.Comment,
@@ -83,7 +83,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope
 			
 			Assert.AreEqual(new Role[] {
 			                	Roles.NamespaceKeyword,
-			                	Roles.Identifier,
+			                	NamespaceDeclaration.NamespaceNameRole,
 			                	Roles.LBrace,
 			                	Roles.PreProcessorDirective,
 			                	Roles.Comment,
@@ -121,15 +121,33 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope
 			Assert.AreEqual(CommentType.SingleLine, ns.GetChildrenByRole(Roles.Comment).First().CommentType);
 			Assert.AreEqual(CommentType.InactiveCode, ns.GetChildrenByRole(Roles.Comment).Last().CommentType);
 		}
-		
+
 		[Test]
 		public void PragmaWarning()
 		{
 			string program = "#pragma warning disable 809";
-			var ppd = ParseUtilCSharp.ParseGlobal<PragmaWarningPreprocssorDirective>(program);
+			var ppd = ParseUtilCSharp.ParseGlobal<PragmaWarningPreprocessorDirective>(program);
 			Assert.AreEqual(PreProcessorDirectiveType.Pragma, ppd.Type);
 			Assert.IsTrue(ppd.Disable);
-			Assert.IsTrue(ppd.WarningList.Contains (809));
+			Assert.IsTrue(ppd.IsDefined (809));
+		}
+		
+		[Test]
+		public void PragmaWarningLocations()
+		{
+			string program = "#pragma warning disable 809";
+			var ppd = ParseUtilCSharp.ParseGlobal<PragmaWarningPreprocessorDirective>(program);
+			Assert.AreEqual(new TextLocation(1, 1), ppd.StartLocation);
+			Assert.AreEqual(new TextLocation(1, 1), ppd.PragmaToken.StartLocation);
+			Assert.AreEqual(new TextLocation(1, 8), ppd.PragmaToken.EndLocation);
+			Assert.AreEqual(new TextLocation(1, 9), ppd.WarningToken.StartLocation);
+			Assert.AreEqual(new TextLocation(1, 16), ppd.WarningToken.EndLocation);
+			Assert.AreEqual(new TextLocation(1, 17), ppd.DisableToken.StartLocation);
+			Assert.AreEqual(new TextLocation(1, 24), ppd.DisableToken.EndLocation);
+			var id = ppd.Warnings.Single();
+			Assert.AreEqual(new TextLocation(1, 25), id.StartLocation);
+			Assert.AreEqual(new TextLocation(1, 28), id.EndLocation);
+			Assert.AreEqual(new TextLocation(1, 28), ppd.EndLocation);
 		}
 		
 		[Test, Ignore("mcs crashes because it tries to compute the full path to file.cs")]
@@ -137,7 +155,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope
 		{
 			string program = "#pragma checksum \"file.cs\" \"{3673e4ca-6098-4ec1-890f-8fceb2a794a2}\" \"{012345678AB}\"";
 			var ppd = ParseUtilCSharp.ParseGlobal<PreProcessorDirective>(program);
-			Assert.IsFalse(ppd is PragmaWarningPreprocssorDirective);
+			Assert.IsFalse(ppd is PragmaWarningPreprocessorDirective);
 			Assert.AreEqual(PreProcessorDirectiveType.Pragma, ppd.Type);
 			Assert.AreEqual("checksum \"file.cs\" \"{3673e4ca-6098-4ec1-890f-8fceb2a794a2}\" \"{012345678AB}\"", ppd.Argument);
 		}
@@ -156,7 +174,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope
 			}, syntaxTree.Children.Select(c => c.Role).ToArray());
 			Assert.AreEqual(new TextLocation(2, 1), syntaxTree.Members.Single().StartLocation);
 
-			var ppd = (LinePreprocssorDirective)syntaxTree.FirstChild;
+			var ppd = (LinePreprocessorDirective)syntaxTree.FirstChild;
 			Assert.AreEqual(PreProcessorDirectiveType.Line, ppd.Type);
 			Assert.AreEqual(200, ppd.LineNumber);
 			Assert.AreEqual("otherfile.cs", ppd.FileName);
@@ -169,13 +187,14 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope
 			CSharpParser parser = new CSharpParser();
 			SyntaxTree syntaxTree = parser.Parse(program);
 			Assert.IsFalse(parser.HasErrors, string.Join(Environment.NewLine, parser.Errors.Select(e => e.Message)));
+			var roles = syntaxTree.Children.Select(c => c.Role).ToArray();
 			Assert.AreEqual(new Role[] {
-			                	Roles.PreProcessorDirective,
-			                	Roles.NewLine,
-			                	NamespaceDeclaration.MemberRole
-			}, syntaxTree.Children.Select(c => c.Role).ToArray());
+				Roles.PreProcessorDirective,
+				Roles.NewLine,
+				NamespaceDeclaration.MemberRole
+			}, roles);
 			Assert.AreEqual(new TextLocation(2, 1), syntaxTree.Members.Single().StartLocation);
-			var ppd = (LinePreprocssorDirective)syntaxTree.FirstChild;
+			var ppd = (LinePreprocessorDirective)syntaxTree.FirstChild;
 			Assert.AreEqual(PreProcessorDirectiveType.Line, ppd.Type);
 			Assert.AreEqual(200, ppd.LineNumber);
 		}
@@ -288,7 +307,63 @@ class B { }
 			Assert.AreEqual(PreProcessorDirectiveType.Elif, bbb.Type);
 			Assert.AreEqual("BBB", bbb.Argument);
 		}
-		
+
+		[Test]
+		public void NewLinesAfterPreprocessorDirectives()
+		{
+			string program = @"#define FOO
+#undef FOO
+#define FOO
+#region Blah
+#if FOO
+class Test {}
+#elif FOO
+class Test {}
+#else
+class Test {}
+#endif
+#endregion";
+			CSharpParser parser = new CSharpParser();
+			SyntaxTree syntaxTree = parser.Parse(program);
+			Assert.IsFalse(parser.HasErrors, string.Join(Environment.NewLine, parser.Errors.Select(e => string.Format("{0}: {1}", e.Region.BeginLine, e.Message))));
+			var roles = syntaxTree.Children.Select(c => c.Role).ToArray();
+			Assert.AreEqual(new Role[] {
+				// #define FOO
+				Roles.PreProcessorDirective,
+				Roles.NewLine,
+				// #undef FOO
+				Roles.PreProcessorDirective,
+				Roles.NewLine,
+				// #define FOO
+				Roles.PreProcessorDirective,
+				Roles.NewLine,
+				// #region Blah
+				Roles.PreProcessorDirective,
+				Roles.NewLine,
+				// #if FOO
+				Roles.PreProcessorDirective,
+				Roles.NewLine,
+				// class Test {}
+				NamespaceDeclaration.MemberRole,
+				Roles.NewLine,
+				// #elif FOO
+				Roles.PreProcessorDirective,
+				Roles.NewLine,
+				// class Test {}
+				Roles.Comment,
+				// #else
+				Roles.PreProcessorDirective,
+				Roles.NewLine,
+				// class Test {}
+				Roles.Comment,
+				// #endif
+				Roles.PreProcessorDirective,
+				Roles.NewLine,
+				// #endregion
+				Roles.PreProcessorDirective
+			}, roles);
+		}
+				
 		[Test]
 		public void ConditionalSymbolTest()
 		{
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/TypeDeclarationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/TypeDeclarationTests.cs
index b69b4b75f7..f52d2e49d3 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/TypeDeclarationTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/TypeDeclarationTests.cs
@@ -304,7 +304,7 @@ public abstract class MyClass : MyBase, Interface1, My.Test.Interface2
 			Assert.AreEqual("short", ((PrimitiveType)td.BaseTypes.Single()).Keyword);
 		}
 		
-		[Test, Ignore("Mono parser crash")]
+		[Test]
 		public void EnumWithIncorrectNewlineAfterIntegerLiteral ()
 		{
 			ParseUtilCSharp.AssertGlobal (
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/UsingDeclarationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/UsingDeclarationTests.cs
index 8ff3a7d6e3..5331581e31 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/UsingDeclarationTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/UsingDeclarationTests.cs
@@ -31,7 +31,8 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope
 		{
 			string program = "using\n";
 			CSharpParser parser = new CSharpParser();
-			SyntaxTree syntaxTree = parser.Parse (program);
+			//SyntaxTree syntaxTree = 
+			parser.Parse (program);
 //			Assert.AreEqual(0, syntaxTree.Children.Count());
 			Assert.IsTrue(parser.HasErrors);
 		}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseSelfTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseSelfTests.cs
index df744650a0..149bc13cec 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseSelfTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseSelfTests.cs
@@ -120,7 +120,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser
 		
 		void CheckMissingTokens(AstNode node)
 		{
-			if (node is CSharpTokenNode) {
+			if (IsLeafNode(node)) {
 				Assert.IsNull(node.FirstChild, "Token nodes should not have children");
 			} else {
 				var prevNodeEnd = node.StartLocation;
@@ -135,9 +135,18 @@ namespace ICSharpCode.NRefactory.CSharp.Parser
 			}
 		}
 		
+		bool IsLeafNode(AstNode node)
+		{
+			if (node.NodeType == NodeType.Token)
+				return true;
+			if (node.NodeType == NodeType.Whitespace)
+				return !(node is PragmaWarningPreprocessorDirective);
+			return node is PrimitiveType || node is PrimitiveExpression || node is NullReferenceExpression;
+		}
+		
 		void CheckWhitespace(AstNode startNode, TextLocation whitespaceStart, AstNode endNode, TextLocation whitespaceEnd)
 		{
-			if (whitespaceStart == whitespaceEnd || startNode == endNode)
+			if (whitespaceStart == whitespaceEnd)
 				return;
 			int start = currentDocument.GetOffset(whitespaceStart.Line, whitespaceStart.Column);
 			int end = currentDocument.GetOffset(whitespaceEnd.Line, whitespaceEnd.Column);
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseUtil.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseUtil.cs
index ac771072d3..269bccaf8d 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseUtil.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseUtil.cs
@@ -20,6 +20,7 @@ using System;
 using System.IO;
 using System.Linq;
 
+using System.Text;
 using ICSharpCode.NRefactory.PatternMatching;
 using NUnit.Framework;
 
@@ -35,9 +36,10 @@ namespace ICSharpCode.NRefactory.CSharp.Parser
 			CSharpParser parser = new CSharpParser();
 			SyntaxTree syntaxTree = parser.Parse(code);
 			
+			StringBuilder errorOutput = new StringBuilder();
 			foreach (var error in parser.Errors)
-				Console.WriteLine (error.Message);
-			Assert.AreEqual(expectErrors, parser.HasErrors, "HasErrors");
+				errorOutput.AppendLine (error.Message);
+			Assert.AreEqual(expectErrors, parser.HasErrors, errorOutput.ToString());
 			
 			AstNode node = syntaxTree.Children.Single(c => c.Role != Roles.NewLine);
 			Type type = typeof(T);
@@ -58,9 +60,10 @@ namespace ICSharpCode.NRefactory.CSharp.Parser
 			CSharpParser parser = new CSharpParser();
 			var statements = parser.ParseStatements(stmt);
 			
+			StringBuilder errorOutput = new StringBuilder();
 			foreach (var error in parser.Errors)
-				Console.WriteLine (error.Message);
-			Assert.AreEqual(expectErrors, parser.HasErrors, "HasErrors");
+				errorOutput.AppendLine (error.Message);
+			Assert.AreEqual(expectErrors, parser.HasErrors, errorOutput.ToString());
 			
 			AstNode statement = statements.Single();
 			Type type = typeof(T);
@@ -81,9 +84,11 @@ namespace ICSharpCode.NRefactory.CSharp.Parser
 			CSharpParser parser = new CSharpParser();
 			AstNode parsedExpression = parser.ParseExpression(expr);
 			
+			StringBuilder errorOutput = new StringBuilder();
 			foreach (var error in parser.Errors)
-				Console.WriteLine (error.Message);
-			Assert.AreEqual(expectErrors, parser.HasErrors, "HasErrors");
+				errorOutput.AppendLine (error.Message);
+			Assert.AreEqual(expectErrors, parser.HasErrors, errorOutput.ToString());
+			
 			if (expectErrors && parsedExpression == null)
 				return default (T);
 			Type type = typeof(T);
@@ -103,9 +108,12 @@ namespace ICSharpCode.NRefactory.CSharp.Parser
 		{
 			CSharpParser parser = new CSharpParser();
 			var members = parser.ParseTypeMembers(expr);
+
+			StringBuilder errorOutput = new StringBuilder();
 			foreach (var error in parser.Errors)
-				Console.WriteLine (error.Message);
-			Assert.AreEqual(expectErrors, parser.HasErrors, "HasErrors");
+				errorOutput.AppendLine (error.Message);
+			Assert.AreEqual(expectErrors, parser.HasErrors, errorOutput.ToString());
+			
 			EntityDeclaration m = members.Single();
 			Type type = typeof(T);
 			Assert.IsTrue(type.IsAssignableFrom(m.GetType()), String.Format("Parsed member was {0} instead of {1} ({2})", m.GetType(), type, m));
@@ -125,9 +133,11 @@ namespace ICSharpCode.NRefactory.CSharp.Parser
 			CSharpParser parser = new CSharpParser();
 			var parsedExpression = parser.ParseDocumentationReference(cref);
 			
+			StringBuilder errorOutput = new StringBuilder();
 			foreach (var error in parser.Errors)
-				Console.WriteLine (error.Message);
-			Assert.AreEqual(expectErrors, parser.HasErrors, "HasErrors");
+				errorOutput.AppendLine (error.Message);
+			Assert.AreEqual(expectErrors, parser.HasErrors, errorOutput.ToString());
+			
 			if (expectErrors && parsedExpression == null)
 				return null;
 			return parsedExpression;
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/EmptyStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/EmptyStatementTests.cs
index 65abf68f22..873c93f0a9 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/EmptyStatementTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/EmptyStatementTests.cs
@@ -27,7 +27,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Statements
 		[Test]
 		public void EmptyStatementTest()
 		{
-			EmptyStatement emptyStmt = ParseUtilCSharp.ParseStatement<EmptyStatement>(";");
+			ParseUtilCSharp.ParseStatement<EmptyStatement>(";");
 		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/GotoStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/GotoStatementTests.cs
index 554e4f1d55..cf8c9f4814 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/GotoStatementTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/GotoStatementTests.cs
@@ -34,7 +34,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Statements
 		[Test]
 		public void GotoDefaultStatementTest()
 		{
-			var gotoCaseStmt = ParseUtilCSharp.ParseStatement<GotoDefaultStatement>("goto default;");
+			ParseUtilCSharp.ParseStatement<GotoDefaultStatement>("goto default;");
 		}
 		
 		[Test]
@@ -47,13 +47,13 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Statements
 		[Test]
 		public void BreakStatementTest()
 		{
-			BreakStatement breakStmt = ParseUtilCSharp.ParseStatement<BreakStatement>("break;");
+			ParseUtilCSharp.ParseStatement<BreakStatement>("break;");
 		}
 		
 		[Test]
 		public void ContinueStatementTest()
 		{
-			ContinueStatement continueStmt = ParseUtilCSharp.ParseStatement<ContinueStatement>("continue;");
+			ParseUtilCSharp.ParseStatement<ContinueStatement>("continue;");
 		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/LockStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/LockStatementTests.cs
index 736ad9756d..2dc4cb40bd 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/LockStatementTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/LockStatementTests.cs
@@ -27,7 +27,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Statements
 		[Test]
 		public void LockStatementTest()
 		{
-			LockStatement lockStmt = ParseUtilCSharp.ParseStatement<LockStatement>("lock (myObj) {}");
+			ParseUtilCSharp.ParseStatement<LockStatement>("lock (myObj) {}");
 			// TODO : Extend test.
 		}
 	}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeMembers/DestructorDeclarationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeMembers/DestructorDeclarationTests.cs
index feb7c40a4f..f873b9fd74 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeMembers/DestructorDeclarationTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeMembers/DestructorDeclarationTests.cs
@@ -27,7 +27,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.TypeMembers
 		[Test]
 		public void DestructorDeclarationTest()
 		{
-			DestructorDeclaration dd = ParseUtilCSharp.ParseTypeMember<DestructorDeclaration>("~MyClass() {}");
+			ParseUtilCSharp.ParseTypeMember<DestructorDeclaration>("~MyClass() {}");
 		}
 		
 		[Test]
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/QueryExpressionExpanderTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/QueryExpressionExpanderTests.cs
index 6ddadda8a4..537f8cce05 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/QueryExpressionExpanderTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/QueryExpressionExpanderTests.cs
@@ -267,6 +267,23 @@ namespace ICSharpCode.NRefactory.CSharp {
 			});
 		}
 
+		[Test]
+		public void JoinWithCast() {
+			var node = ParseUtilCSharp.ParseExpression<QueryExpression>("from i in arr1 join CJ j in arr2 on i.keyi equals j.keyj select i.valuei + j.valuej");
+			var actual = new QueryExpressionExpander().ExpandQueryExpressions(node);
+			AssertCorrect(actual.AstNode, "arr1.Join(arr2.Cast<CJ>(),i=>i.keyi,j=>j.keyj,(i,j)=>i.valuei+j.valuej)");
+			dynamic astNode = actual.AstNode;
+			AssertLookupCorrect(actual.RangeVariables, new[] {
+				Tuple.Create(new TextLocation(1, 6), (AstNode)ElementAt(ElementAt(astNode.Arguments, 1).Parameters, 0)),
+				Tuple.Create(new TextLocation(1, 24), (AstNode)ElementAt(ElementAt(astNode.Arguments, 2).Parameters, 0)),
+			});
+			AssertLookupCorrect(actual.Expressions, new[] {
+				Tuple.Create(new TextLocation(1, 1), (AstNode)astNode.Target.Target),
+				Tuple.Create(new TextLocation(1, 16), (AstNode)astNode),
+				Tuple.Create(new TextLocation(1, 58), (AstNode)astNode),
+			});
+		}
+
 		[Test]
 		public void JoinFollowedByLet() {
 			var node = ParseUtilCSharp.ParseExpression<QueryExpression>("from i in arr1 join j in arr2 on i.keyi equals j.keyj let k = i + j select i + j + k");
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Refactoring/LambdaHelperTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Refactoring/LambdaHelperTests.cs
new file mode 100644
index 0000000000..737527af4d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Refactoring/LambdaHelperTests.cs
@@ -0,0 +1,65 @@
+//
+// LambdaHelperTests.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+//
+// Copyright (c) 2013 Luís Reis
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using System;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.CSharp.CodeActions;
+using ICSharpCode.NRefactory.CSharp;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[TestFixture]
+	public class LambdaHelperTests
+	{
+		RefactoringContext MakeContext(string input, bool expectErrors = false)
+		{
+			var context = TestRefactoringContext.Create(input, expectErrors);
+			return context;
+		}
+
+		[Test]
+		public void TestExtensionMethod()
+		{
+			string input = @"
+using System.Linq;
+class Test
+{
+	void Method() {
+		System.Linq.Enumerable.Empty<int> ().Where(<-i => i > 0->);
+	}
+}
+";
+
+			var context = MakeContext(input);
+			var lambda = context.GetSelectedNodes().OfType<LambdaExpression>().First();
+			var type = LambdaHelper.GetLambdaReturnType(context, lambda);
+			
+			Assert.AreEqual("System.Boolean", type.ReflectionName);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Refactoring/RefactoringStructureTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Refactoring/RefactoringStructureTests.cs
index 9d9df79bae..cb2b36bb4f 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Refactoring/RefactoringStructureTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Refactoring/RefactoringStructureTests.cs
@@ -28,7 +28,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		[Test]
 		public void GatherVisitorBaseClass()
 		{
-			Assembly NR_CSharp = typeof(ICodeIssueProvider).Assembly;
+			Assembly NR_CSharp = typeof(InconsistentNamingIssue).Assembly;
 			bool foundGatherVisitor = false;
 			foreach (var topLevelType in NR_CSharp.GetTypes()) {
 				foreach (var nestedType in topLevelType.GetNestedTypes(BindingFlags.NonPublic | BindingFlags.Public)) {
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/BinaryOperatorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/BinaryOperatorTests.cs
index 4de3718696..2eb6b28b8f 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/BinaryOperatorTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/BinaryOperatorTests.cs
@@ -129,6 +129,9 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			TestOperator(MakeResult(typeof(StringComparison?)), BinaryOperatorType.Add, MakeResult(typeof(int)),
 			             Conversion.IdentityConversion, Conversion.ImplicitNullableConversion, typeof(StringComparison?));
 			
+			TestOperator(MakeResult(typeof(StringComparison)), BinaryOperatorType.Add, MakeResult(typeof(int?)),
+			             Conversion.ImplicitNullableConversion, Conversion.IdentityConversion, typeof(StringComparison?));
+			
 			TestOperator(MakeResult(typeof(StringComparison?)), BinaryOperatorType.Add, MakeResult(typeof(int?)),
 			             Conversion.IdentityConversion, Conversion.IdentityConversion, typeof(StringComparison?));
 			
@@ -185,14 +188,20 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			AssertConstant(3, resolver.ResolveBinaryOperator(
 				BinaryOperatorType.Subtract, MakeConstant(StringComparison.OrdinalIgnoreCase), MakeConstant(StringComparison.InvariantCulture)));
 			
+			AssertConstant(StringComparison.InvariantCulture, resolver.ResolveBinaryOperator(
+				BinaryOperatorType.Subtract, MakeConstant(StringComparison.InvariantCulture), MakeConstant(0)));
+			
 			TestOperator(MakeResult(typeof(StringComparison?)), BinaryOperatorType.Subtract, MakeResult(typeof(int)),
 			             Conversion.IdentityConversion, Conversion.ImplicitNullableConversion, typeof(StringComparison?));
 			
 			TestOperator(MakeResult(typeof(StringComparison?)), BinaryOperatorType.Subtract, MakeResult(typeof(StringComparison)),
 			             Conversion.IdentityConversion, Conversion.ImplicitNullableConversion, typeof(int?));
 			
-			Assert.IsTrue(resolver.ResolveBinaryOperator(
-				BinaryOperatorType.Subtract, MakeResult(typeof(int?)), MakeResult(typeof(StringComparison))).IsError);
+			TestOperator(MakeResult(typeof(int?)), BinaryOperatorType.Subtract, MakeResult(typeof(StringComparison)),
+			             Conversion.IdentityConversion, Conversion.ImplicitNullableConversion, typeof(StringComparison?));
+			
+			TestOperator(MakeResult(typeof(int)), BinaryOperatorType.Subtract, MakeResult(typeof(StringComparison?)),
+			             Conversion.ImplicitNullableConversion, Conversion.IdentityConversion, typeof(StringComparison?));
 		}
 		
 		[Test]
@@ -449,6 +458,19 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				BinaryOperatorType.BitwiseOr, MakeConstant(0), MakeConstant(AttributeTargets.Field)));
 		}
 		
+		[Test]
+		public void NullableBitwiseEnum()
+		{
+			TestOperator(MakeResult(typeof(StringComparison?)), BinaryOperatorType.BitwiseAnd, MakeResult(typeof(StringComparison?)),
+			             Conversion.IdentityConversion, Conversion.IdentityConversion, typeof(StringComparison?));
+			
+			TestOperator(MakeResult(typeof(StringComparison)), BinaryOperatorType.BitwiseAnd, MakeResult(typeof(StringComparison?)),
+			             Conversion.ImplicitNullableConversion, Conversion.IdentityConversion, typeof(StringComparison?));
+			
+			TestOperator(MakeResult(typeof(StringComparison?)), BinaryOperatorType.BitwiseAnd, MakeResult(typeof(StringComparison)),
+			             Conversion.IdentityConversion, Conversion.ImplicitNullableConversion, typeof(StringComparison?));
+		}
+		
 		[Test]
 		public void LogicalAnd()
 		{
@@ -702,7 +724,7 @@ class Test {
 			Assert.IsFalse(irr.IsError);
 			Assert.IsTrue(irr.IsLiftedOperator);
 		}
-
+		
 		[Test]
 		public void IsLiftedProperty2()
 		{
@@ -717,5 +739,159 @@ class Test {
 			Assert.IsFalse(irr.IsError);
 			Assert.IsTrue(irr.IsLiftedOperator);
 		}
+		
+		[Test]
+		public void TestLiftedOperatorBug()
+		{
+			string program = @"
+using System;
+
+struct C<T>
+{
+	public static C<T> operator+(C<T> u, T u2)
+	{
+		return u;
+	}
+
+	public C ()
+	{
+		int? foo = 4;
+		var a = $new C<int> () + foo$;
+	}
+}";
+			var irr = Resolve<OperatorResolveResult>(program);
+			Assert.IsFalse(irr.IsError);
+			Assert.IsTrue(irr.IsLiftedOperator);
+			Assert.AreEqual("System.Nullable`1[[C`1[[System.Int32]]]]", irr.Type.ReflectionName);
+		}
+
+		/// <summary>
+		/// Bug 12717 - Wrong type resolved for enum substraction
+		/// </summary>
+		[Test]
+		public void TestIntEnumSubstraction()
+		{
+			string program = @"using System;
+
+enum E
+{
+    V
+}
+
+class Test
+{
+    public static void Main ()
+    {
+
+        E e = 0;
+        var res = $1 - e$;
+    }
+}";
+			var rr = Resolve<OperatorResolveResult>(program);
+			Assert.AreEqual("E", rr.Type.FullName);
+		}
+
+		/// <summary>
+		/// Bug 12689 - Wrong type of bitwise operation with enums
+		/// </summary>
+		[Test]
+		public void TestEnumBitwiseAndOperatorOverloading()
+		{
+			string program = @"using System;
+
+struct S
+{
+    public static implicit operator E? (S s)
+    {
+        return 0;
+    }
+}
+
+
+public enum E
+{
+
+}
+
+class C
+{
+    public static void Main ()
+    {
+        E e = 0;
+        S s;
+        var res = $e & s$; // INVALID type of res XS shows int but should be E?
+    }
+}";
+			var rr = Resolve<OperatorResolveResult>(program);
+			Assert.AreEqual("System.Nullable`1[[E]]", rr.Type.ReflectionName);
+		}
+
+		/// <summary>
+		/// Bug 12677 - Wrong result of constant binary result
+		/// </summary>
+		[Test]
+		public void TestEnumSubstractionWithNull()
+		{
+			string program = @"using System;
+
+public enum E
+{
+}
+
+class C
+{
+    public static void Main ()
+    {
+        E? e = null;
+        var res = $(e - null).Value$; // Value is E but should be int
+    }
+}";
+			var rr = Resolve<MemberResolveResult>(program);
+			Assert.AreEqual("System.Int32", rr.Type.ReflectionName);
+		}
+
+		/// <summary>
+		/// Bug 12670 - Wrong type resolution for enums
+		/// </summary>
+		[Test]
+		public void TestEnumBitwiseAndOperatorWithNull()
+		{
+			string program = @"public enum E {}
+
+class C
+{
+    public static void Main ()
+    {
+        E f = 0;
+        var res = $f & null$; // XS sees Value as type uint instead of E
+    }
+}";
+			var rr = Resolve<OperatorResolveResult>(program);
+			Assert.AreEqual("System.Nullable`1[[E]]", rr.Type.ReflectionName);
+		}
+		
+		[Test]
+		public void EnumSubtractionWithImplicitOperators()
+		{
+			string program = @"using System;
+public enum E {}
+struct S {
+    public static implicit operator E (S s) { return 0; }
+    public static implicit operator int (S s) { return 0; }
+}
+
+class C
+{
+    public void Test(E e, S s)
+    {
+        var res = $e - s$; // C# uses the conversion to E, so result will be int
+    }
+}";
+			var rr = Resolve<OperatorResolveResult>(program);
+			Assert.AreEqual("System.Int32", rr.Type.ReflectionName);
+			var c = ((ConversionResolveResult)rr.Operands[1]).Conversion;
+			Assert.IsTrue(c.IsUserDefined);
+			Assert.AreEqual("E", c.Method.ReturnType.ReflectionName);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/CastTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/CastTests.cs
index 6b00bf2aed..0de0b1f520 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/CastTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/CastTests.cs
@@ -78,7 +78,9 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			AssertConstant(-3L, resolver.ResolveCast(ResolveType(typeof(long)), MakeConstant(-3.5)));
 		}
 
+#if __MonoCS__
 		[Ignore("Broken on mcs/mac os x")]
+#endif
 		[Test]
 		public void OverflowingCast()
 		{
@@ -128,5 +130,98 @@ class Test {
 			Assert.AreEqual(typeof(int), rr.Variable.ConstantValue.GetType());
 			Assert.AreEqual(ushort.MaxValue, (int)rr.Variable.ConstantValue);
 		}
+		
+		[Test]
+		public void ExplicitConversion_In_Assignment()
+		{
+			string input = @"
+class Test {
+	void M(int i) {
+		long l;
+		l = $(long)i$;
+	}
+}";
+			var crr = Resolve<ConversionResolveResult>(input);
+			Assert.AreEqual(Conversion.ImplicitNumericConversion, crr.Conversion);
+			Assert.AreEqual(Conversion.IdentityConversion, GetConversion(input));
+		}
+		
+		[Test]
+		public void ExplicitConversion_In_Assignment_Followed_By_ImplicitConversion()
+		{
+			string input = @"
+class Test {
+	void M(short i) {
+		long l;
+		l = $(int)i$;
+	}
+}";
+			var crr = Resolve<ConversionResolveResult>(input);
+			Assert.AreEqual(Conversion.ImplicitNumericConversion, crr.Conversion);
+			Assert.AreEqual(Conversion.ImplicitNumericConversion, GetConversion(input));
+		}
+		
+		[Test]
+		public void ExplicitConversion_In_BinaryOperator()
+		{
+			string input = @"
+class Test {
+	void M(int i) {
+		long n;
+		n = n + $(long)i$;
+	}
+}";
+			var crr = Resolve<ConversionResolveResult>(input);
+			Assert.AreEqual(Conversion.ImplicitNumericConversion, crr.Conversion);
+			Assert.AreEqual(Conversion.IdentityConversion, GetConversion(input));
+		}
+		
+		[Test]
+		public void ExplicitConversion_In_BinaryOperator_Navigator()
+		{
+			string input = @"
+class Test {
+	void M(int i) {
+		long n;
+		n = n + $(long)i$;
+	}
+}";
+			var tuple = PrepareResolver(input);
+			var astResolver = tuple.Item1;
+			var castExpression = (CastExpression)tuple.Item2;
+			var navigator = new ExplicitConversion_In_BinaryOperator_NavigatorImpl(castExpression);
+			astResolver.ApplyNavigator(navigator);
+			Assert.AreEqual(1, navigator.CallCount);
+		}
+		
+		class ExplicitConversion_In_BinaryOperator_NavigatorImpl : IResolveVisitorNavigator
+		{
+			CastExpression castExpression;
+			public int CallCount;
+			
+			public ExplicitConversion_In_BinaryOperator_NavigatorImpl(CastExpression castExpression)
+			{
+				this.castExpression = castExpression;
+			}
+			
+			public ResolveVisitorNavigationMode Scan(AstNode node)
+			{
+				return ResolveVisitorNavigationMode.Resolve;
+			}
+			
+			public void Resolved(AstNode node, ResolveResult result)
+			{
+			}
+			
+			public void ProcessConversion(Expression expression, ResolveResult result, Conversion conversion, IType targetType)
+			{
+				CallCount++;
+				Assert.AreEqual(Conversion.ImplicitNumericConversion, conversion);
+				Assert.AreSame(castExpression.Expression, expression);
+				Assert.IsInstanceOf<LocalResolveResult>(result);
+				Assert.AreEqual("System.Int32", result.Type.ReflectionName);
+				Assert.AreEqual("System.Int64", targetType.ReflectionName);
+			}
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ConversionsTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ConversionsTest.cs
index ed1e7d0eaa..826711e566 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ConversionsTest.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ConversionsTest.cs
@@ -890,6 +890,86 @@ class Test {
 			Assert.IsFalse(c.DelegateCapturesFirstArgument);
 		}
 
+		[Test]
+		public void MethodGroupConversion_ObjectToDynamic() {
+			string program = @"using System;
+class Test {
+	public void F(object o) {}
+	public void M() {
+		Action<dynamic> x = $F$;
+	}
+}";
+			var c = GetConversion(program);
+			Assert.IsTrue(c.IsValid);
+		}
+
+		[Test]
+		public void MethodGroupConversion_ObjectToDynamicGenericArgument() {
+			string program = @"using System;
+using System.Collections.Generic;
+class Test {
+	public void F(List<object> l) {}
+	public void M() {
+		Action<List<dynamic>> x = $F$;
+	}
+}";
+			var c = GetConversion(program);
+			Assert.IsTrue(c.IsValid);
+		}
+
+		[Test]
+		public void MethodGroupConversion_ObjectToDynamicReturnValue() {
+			string program = @"using System;
+class Test {
+	public object F() {}
+	public void M() {
+		Func<dynamic> x = $F$;
+	}
+}";
+			var c = GetConversion(program);
+			Assert.IsTrue(c.IsValid);
+		}
+
+		[Test]
+		public void MethodGroupConversion_DynamicToObject() {
+			string program = @"using System;
+class Test {
+	public void F(dynamic o) {}
+	public void M() {
+		Action<object> x = $F$;
+	}
+}";
+			var c = GetConversion(program);
+			Assert.IsTrue(c.IsValid);
+		}
+
+		[Test]
+		public void MethodGroupConversion_DynamicToObjectGenericArgument() {
+			string program = @"using System;
+using System.Collections.Generic;
+class Test {
+	public void F(List<dynamic> l) {}
+	public void M() {
+		Action<List<object>> x = $F$;
+	}
+}";
+			var c = GetConversion(program);
+			Assert.IsTrue(c.IsValid);
+		}
+
+		[Test]
+		public void MethodGroupConversion_DynamicToObjectReturnValue() {
+			string program = @"using System;
+class Test {
+	public dynamic F() {}
+	public void M() {
+		Func<object> x = $F$;
+	}
+}";
+			var c = GetConversion(program);
+			Assert.IsTrue(c.IsValid);
+		}
+
 		[Test]
 		public void UserDefined_IntLiteral_ViaUInt_ToCustomStruct()
 		{
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/FindReferencesTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/FindReferencesTest.cs
index 033acf7fc1..e9cdc98d31 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/FindReferencesTest.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/FindReferencesTest.cs
@@ -46,7 +46,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			findReferences = new FindReferences();
 		}
 		
-		AstNode[] FindReferences(IEntity entity)
+		AstNode[] FindReferences(ISymbol entity)
 		{
 			var result = new List<AstNode>();
 			var searchScopes = findReferences.GetSearchScopes(entity);
@@ -64,6 +64,28 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			return result.OrderBy(n => n.StartLocation).ToArray();
 		}
 
+		#region Parameters
+		[Test]
+		public void FindParameterReferences()
+		{
+			Init(@"using System;
+class Test {
+	void M(string par) {
+		Console.WriteLine (par);
+	}
+
+	void Other()
+	{
+		M(par:null);
+	}
+}");
+			var test = compilation.MainAssembly.TopLevelTypeDefinitions.Single();
+			var method = test.Methods.Single(m => m.Name == "M");
+			Assert.AreEqual(new int[] { 3, 4, 9 }, FindReferences(method.Parameters[0]).Select(n => n.StartLocation.Line).ToArray());
+		}
+		#endregion
+
+
 		#region Method Group
 		[Test]
 		public void FindMethodGroupReference()
@@ -165,6 +187,43 @@ class Test {
 			Assert.IsTrue(actual.Any(r => r.StartLocation.Line == 4 && r is ObjectCreateExpression));
 			Assert.IsTrue(actual.Any(r => r.StartLocation.Line == 6 && r is OperatorDeclaration));
 		}
+		
+		[Test]
+		public void FindReferencesForOpImplicitInLocalVariableInitialization_ExplicitCast()
+		{
+			Init(@"using System;
+class Test {
+ static void T() {
+  int x = (int)new Test();
+ }
+ public static implicit operator int(Test x) { return 0; }
+}");
+			var test = compilation.MainAssembly.TopLevelTypeDefinitions.Single(t => t.Name == "Test");
+			var opImplicit = test.Methods.Single(m => m.Name == "op_Implicit");
+			var actual = FindReferences(opImplicit).ToList();
+			Assert.AreEqual(2, actual.Count);
+			Assert.IsTrue(actual.Any(r => r.StartLocation.Line == 4 && r is ObjectCreateExpression));
+			Assert.IsTrue(actual.Any(r => r.StartLocation.Line == 6 && r is OperatorDeclaration));
+		}
+		
+		[Test]
+		public void FindReferencesForOpImplicitInAssignment_ExplicitCast()
+		{
+			Init(@"using System;
+class Test {
+ static void T() {
+  int x;
+  x = (int)new Test();
+ }
+ public static implicit operator int(Test x) { return 0; }
+}");
+			var test = compilation.MainAssembly.TopLevelTypeDefinitions.Single(t => t.Name == "Test");
+			var opImplicit = test.Methods.Single(m => m.Name == "op_Implicit");
+			var actual = FindReferences(opImplicit).ToList();
+			Assert.AreEqual(2, actual.Count);
+			Assert.IsTrue(actual.Any(r => r.StartLocation.Line == 5 && r is ObjectCreateExpression));
+			Assert.IsTrue(actual.Any(r => r.StartLocation.Line == 7 && r is OperatorDeclaration));
+		}
 		#endregion
 		
 		#region Inheritance
@@ -312,7 +371,7 @@ public class C {
 		#endif // NET_4_5
 
 		#endregion
-	
+		
 		#region Namespaces
 		[Test]
 		public void FindNamespaceTest()
@@ -328,9 +387,9 @@ namespace Other.Bar {
 	class OtherTest {}
 }
 
-namespace Foo 
+namespace Foo
 {
-	class Test 
+	class Test
 	{
 		static void T()
 		{
@@ -369,9 +428,9 @@ namespace Foo.Bar {
 	class MyTest { }
 }
 
-namespace Foo 
+namespace Foo
 {
-	class Test 
+	class Test
 	{
 		Foo.Bar.MyTest t;
 	}
@@ -386,7 +445,7 @@ namespace Foo
 			Assert.IsTrue(actual.Any(r => r.StartLocation.Line == 12 && r is SimpleType));
 		}
 		#endregion
-	
+		
 		#region Rename
 
 		internal static ISymbol GetSymbol (ICompilation compilation, string reflectionName)
@@ -425,8 +484,8 @@ namespace Foo
 					result.Add (obj.NodeToReplace);
 				},
 				delegate(Error obj) {
-			
-			});
+					
+				});
 			return result;
 		}
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/InvocationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/InvocationTests.cs
index c559ff5d61..ad77375c11 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/InvocationTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/InvocationTests.cs
@@ -798,5 +798,159 @@ public class B<T> {
 			Assert.IsFalse(rr.IsError);
 			Assert.AreEqual("System.Int32", rr.Member.ReturnType.FullName);
 		}
+
+		[Test]
+		public void GenericInvocationWithTypeArgumentAsICollection() {
+			string program = @"
+using System;
+using System.Collections.Generic;
+
+static class C1 {
+	public static void G<TC, TI>(TC items) where TC : ICollection<TI> {}
+
+	public static void M<TI>(TI[] items) {
+		$G<TI[], TI>(items)$;
+	}
+}";
+			var rr = Resolve<CSharpInvocationResolveResult>(program);
+			Assert.IsFalse(rr.IsError);
+		}
+		
+		[Test]
+		public void ConstraintBetweenTwoInferredTypeArguments() {
+			string program = @"using System;
+using System.Collections.Generic;
+class Program
+{
+	static T[] ToArray<T, V>(List<V> list, T[] empty) where V : T {}
+	
+	public static void Test(List<Type> interfaces, Type[] emptyTypes)
+	{
+		return $ToArray(interfaces, emptyTypes)$;
+	}
+}";
+			var rr = Resolve<CSharpInvocationResolveResult>(program);
+			Assert.IsFalse(rr.IsError);
+		}
+
+		[Test]
+		public void OverloadResolutionWithDerivedTypesAndLambdas() {
+			string program = @"using System;
+public class C {
+	class B {}
+	class D : B {}
+
+	static void F(B a, Func<B, object> f) {}
+	static void F(D a, Func<D, object> f) {}
+
+	public static void M(object obj) {
+		$F(new D(), n => 0)$;
+	}
+}";
+			var rr = Resolve<CSharpInvocationResolveResult>(program);
+			Assert.That(rr.IsError, Is.False);
+			Assert.That(rr.Member.Parameters[0].Type.Name == "D");
+		}
+
+		[Test]
+		public void OverloadResolutionBetweenArrayTypes() {
+			string program = @"using System;
+public class C {
+	static void F(object[] a, Func<object, object> f) {}
+	static void F(string[] a, Func<string, object> f) {}
+
+	public static void M() {
+		$F(new string[0], n => 0)$;
+	}
+}";
+
+			var rr = Resolve<CSharpInvocationResolveResult>(program);
+			Assert.That(rr.IsError, Is.False);
+			Assert.That(rr.Member.Parameters[0].Type.Kind == TypeKind.Array && ((ArrayType)rr.Member.Parameters[0].Type).ElementType.Name == "String");
+		}
+
+		[Test]
+		public void OverloadResolutionBetweenArrayAndArrayType() {
+			string program = @"using System;
+public class C {
+	static void F(Array a, Func<object, object> f) {}
+	static void F(string[] a, Func<string, object> f) {}
+
+	public static void M() {
+		$F(new string[0], n => 0)$;
+	}
+}";
+
+			var rr = Resolve<CSharpInvocationResolveResult>(program);
+			Assert.That(rr.IsError, Is.False);
+			Assert.That(rr.Member.Parameters[0].Type.Kind == TypeKind.Array);
+		}
+
+		[Test]
+		public void OverloadResolutionBetweenArrayAndArrayTypeGeneric() {
+			string program = @"using System;
+public class C {
+	static void F(Array a, Func<object, object> f) {}
+	static void F<T>(T[] a, Func<T, object> f) {}
+
+	public static void M() {
+		$F(new string[0], n => 0)$;
+	}
+}";
+
+			var rr = Resolve<CSharpInvocationResolveResult>(program);
+			Assert.That(rr.IsError, Is.False);
+			Assert.That(rr.Member, Is.InstanceOf<SpecializedMember>());
+			Assert.That(rr.Member.Parameters[0].Type.Kind == TypeKind.Array);
+		}
+		
+		[Test]
+		public void PrivateExtensionMethodIsNotUsableFromOtherClass()
+		{
+			string program = @"
+using System.Collections.Generic;
+namespace Foo {
+	public static class FooExtensions {
+		static T Extension<T>(this object value) { return default(T); }
+	}
+}
+namespace Bar {
+	public static class BarExtensions {
+		public static IEnumerable<T> Extension<T>(this object value) { return new T[0]; }
+	}
+}
+
+namespace Bazz {
+	using Foo;
+	using Bar;
+	public class Client {
+		public void Method() {
+			var x = $new object().Extension<int>()$;
+		}
+	}
+}";
+			var rr = Resolve<CSharpInvocationResolveResult>(program);
+			Assert.IsFalse(rr.IsError);
+			Assert.AreEqual(rr.Type.FullName, "System.Collections.Generic.IEnumerable");
+		}
+
+		[Test]
+		public void PrivateExtensionMethodIsUsableFromSameClass()
+		{
+			string program = @"
+using System.Collections.Generic;
+namespace Foo {
+	public static class FooExtensions {
+		static T Extension<T>(this object value) { return default(T); }
+		
+		static void Method() {
+			var x = $new object().Extension<int>()$;
+		}
+	}
+}";
+			var rr = Resolve<CSharpInvocationResolveResult>(program);
+			Assert.IsFalse(rr.IsError);
+			Assert.AreEqual(rr.Type.FullName, "System.Int32");
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/LambdaTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/LambdaTests.cs
index bc327efa36..97c7f73a2a 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/LambdaTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/LambdaTests.cs
@@ -680,6 +680,8 @@ class Test {
 			var rr = Resolve<LambdaResolveResult>(program);
 			Assert.IsInstanceOf<ConversionResolveResult>(rr.Body);
 			Assert.That(((ConversionResolveResult)rr.Body).Conversion.IsNullLiteralConversion);
+			Assert.AreEqual("System.String", rr.ReturnType.ReflectionName);
+			Assert.AreEqual("System.String", rr.Body.Type.ReflectionName);
 		}
 
 		[Test]
@@ -693,6 +695,8 @@ class Test {
 			var rr = Resolve<LambdaResolveResult>(program);
 			Assert.IsInstanceOf<ConversionResolveResult>(rr.Body);
 			Assert.That(((ConversionResolveResult)rr.Body).Conversion.IsNullLiteralConversion);
+			Assert.AreEqual("System.String", rr.ReturnType.ReflectionName);
+			Assert.AreEqual("System.String", rr.Body.Type.ReflectionName);
 		}
 
 		[Test]
@@ -705,6 +709,8 @@ class Test {
 }";
 			var rr = Resolve<LambdaResolveResult>(program);
 			Assert.IsInstanceOf<OperatorResolveResult>(rr.Body);
+			Assert.AreEqual("System.Void", rr.ReturnType.ReflectionName);
+			Assert.AreEqual("System.Int32", rr.Body.Type.ReflectionName);
 		}
 
 		[Test]
@@ -717,6 +723,8 @@ class Test {
 }";
 			var rr = Resolve<LambdaResolveResult>(program);
 			Assert.IsInstanceOf<OperatorResolveResult>(rr.Body);
+			Assert.AreEqual("System.Void", rr.ReturnType.ReflectionName);
+			Assert.AreEqual("System.Int32", rr.Body.Type.ReflectionName);
 		}
 		
 		[Test]
@@ -833,5 +841,55 @@ class Test {
 			Assert.IsTrue(c.IsValid);
 			Assert.IsTrue(c.IsAnonymousFunctionConversion);
 		}
+
+		[Test]
+		public void AnonymousMethodConversionObjectToDynamic() {
+			string program = @"using System;
+class Test {
+	public void M() {
+		Action<dynamic> x = $delegate(object z) { z = null; }$;
+	}
+}";
+			var c = GetConversion(program);
+			Assert.IsTrue(c.IsValid);
+		}
+
+		[Test]
+		public void AnonymousMethodConversionObjectToDynamicGenericArgument() {
+			string program = @"using System;
+using System.Collections.Generic;
+class Test {
+	public void M() {
+		Action<List<dynamic>> x = $delegate(List<object> z) { z = null; }$;
+	}
+}";
+			var c = GetConversion(program);
+			Assert.IsTrue(c.IsValid);
+		}
+
+		[Test]
+		public void AnonymousMethodConversionDynamicToObject() {
+			string program = @"using System;
+class Test {
+	public void M() {
+		Action<object> x = $delegate(dynamic z) { z = null; }$;
+	}
+}";
+			var c = GetConversion(program);
+			Assert.IsTrue(c.IsValid);
+		}
+
+		[Test]
+		public void AnonymousMethodConversionDynamicToObjectGenericArgument() {
+			string program = @"using System;
+using System.Collections.Generic;
+class Test {
+	public void M() {
+		Action<List<object>> x = $delegate(List<dynamic> z) { z = null; }$;
+	}
+}";
+			var c = GetConversion(program);
+			Assert.IsTrue(c.IsValid);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/MemberLookupTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/MemberLookupTests.cs
index d9a128257d..1b7f8af4e6 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/MemberLookupTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/MemberLookupTests.cs
@@ -61,7 +61,7 @@ class Middle : Base {
 class Derived : Middle {
 	public override void Method() {}
 }";
-			var unresolvedFile = Parse(program);
+			Parse(program);
 			ITypeDefinition derived = compilation.MainAssembly.GetTypeDefinition(new TopLevelTypeName("Derived"));
 			var rr = lookup.Lookup(new ResolveResult(derived), "Method", EmptyList<IType>.Instance, true) as MethodGroupResolveResult;
 			Assert.AreEqual(2, rr.MethodsGroupedByDeclaringType.Count());
@@ -88,7 +88,7 @@ class Derived : Base<int> {
 	public override void Method(int a) {}
 	public override void Method(string a) {}
 }";
-			var unresolvedFile = Parse(program);
+			Parse(program);
 			ITypeDefinition derived = compilation.MainAssembly.GetTypeDefinition(new TopLevelTypeName("Derived"));
 			var rr = lookup.Lookup(new ResolveResult(derived), "Method", EmptyList<IType>.Instance, true) as MethodGroupResolveResult;
 			Assert.AreEqual(2, rr.MethodsGroupedByDeclaringType.Count());
@@ -116,7 +116,7 @@ class Base {
 class Derived : Base {
 	public override void Method<S>(S a) {}
 }";
-			var unresolvedFile = Parse(program);
+			Parse(program);
 			ITypeDefinition derived = compilation.MainAssembly.GetTypeDefinition(new TopLevelTypeName("Derived"));
 			var rr = lookup.Lookup(new ResolveResult(derived), "Method", EmptyList<IType>.Instance, true) as MethodGroupResolveResult;
 			Assert.AreEqual(1, rr.MethodsGroupedByDeclaringType.Count());
@@ -163,7 +163,7 @@ class Derived : Base {
 			Assert.AreEqual("Test.Field", rr.Member.FullName);
 			Assert.IsTrue(rr.TargetResult is TypeResolveResult);
 		}
-		
+
 		[Test]
 		public void InstanceMethodImplicitThis()
 		{
@@ -563,5 +563,68 @@ public class G<U, V> : IA<$G<V, string>$>
 			Assert.AreEqual("System.String", baseType.TypeArguments [0].FullName);
 			Assert.AreEqual("System.String", baseType.TypeArguments [1].FullName);
 		}
+
+		[Test]
+		public void FixedFieldTest()
+		{
+			string program = @"unsafe struct Test {
+	fixed int Field[8];
+	int* M() { return $Field$; }
+}";
+			var rr = Resolve<MemberResolveResult>(program);
+			Assert.AreEqual("Test.Field", rr.Member.FullName);
+			Assert.AreEqual("System.Int32*", rr.Type.ToString());
+		}
+
+		[Test]
+		public void FixedFieldTest2()
+		{
+			string program = @"unsafe struct Test {
+	fixed int Field[8];
+	int* M() { return $this.Field$; }
+}";
+			var rr = Resolve<MemberResolveResult>(program);
+			Assert.AreEqual("Test.Field", rr.Member.FullName);
+			Assert.AreEqual("System.Int32*", rr.Type.ToString());
+		}
+
+		[Test]
+		public void FixedFieldDeclarationTest()
+		{
+			string program = @"unsafe struct Test {
+	fixed int $Field[8]$;
+}";
+			var rr = Resolve<MemberResolveResult>(program);
+			Assert.AreEqual("Test.Field", rr.Member.FullName);
+		}
+
+
+		[Test]
+		public void FixedFieldDeclarationTestCase2()
+		{
+			string program = @"unsafe struct Test {
+	fixed int foo[12], $Field[8]$;
+}";
+			var rr = Resolve<MemberResolveResult>(program);
+			Assert.AreEqual("Test.Field", rr.Member.FullName);
+		}
+		
+		[Test]
+		public void CrossTypeParametersInheritance()
+		{
+			string program = @"using System;
+class BaseClass<A,B> {
+	public A a;
+	public B b;
+}
+class DerivedClass<A,B> : BaseClass<B,A> {
+	object Test() { return $; }
+}";
+			var mrr = Resolve<MemberResolveResult>(program.Replace("$", "$a$"));
+			Assert.AreEqual("B", mrr.Type.Name);
+			
+			mrr = Resolve<MemberResolveResult>(program.Replace("$", "$b$"));
+			Assert.AreEqual("A", mrr.Type.Name);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/MethodTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/MethodTests.cs
index c59eb4a226..7a6164052a 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/MethodTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/MethodTests.cs
@@ -56,13 +56,13 @@ class TestClass {
 			var resolver = prep.Item1;
 			var method = (IMethod)((MemberResolveResult)resolver.Resolve(md)).Member;
 			IVariable i1 = method.Parameters.Single(p => p.Name == "i");
-			IVariable j1 = method.Parameters.Single(p => p.Name == "j");
+//			IVariable j1 = method.Parameters.Single(p => p.Name == "j");
 
 			var returnExpr = (BinaryOperatorExpression)md.Body.Children.OfType<ReturnStatement>().Single().Expression;
 			var returnRR = (OperatorResolveResult)resolver.Resolve(returnExpr);
 
 			IVariable i2 = ((LocalResolveResult)returnRR.Operands[0]).Variable;
-			IVariable j2 = ((LocalResolveResult)returnRR.Operands[1]).Variable;
+//			IVariable j2 = ((LocalResolveResult)returnRR.Operands[1]).Variable;
 
 			Assert.IsTrue(ReferenceEquals(i1, i2));
 			Assert.IsTrue(ReferenceEquals(i1, i2));
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/NameLookupTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/NameLookupTests.cs
index bd78cba3d5..57b9b80f83 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/NameLookupTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/NameLookupTests.cs
@@ -1092,6 +1092,31 @@ namespace Test
 			var nrr = Resolve<NamespaceResolveResult>(program);
 			Assert.AreEqual("A.B.C.D", nrr.NamespaceName);
 		}
-
+		
+		[Test]
+		public void CuriouslyRecurringInnerClass()
+		{
+			string program = @"
+	abstract class Table<T>
+	{
+		internal T[] records = {};
+	}
+	
+	sealed class ConcreteTable : Table<ConcreteTable.Record>
+	{
+		internal struct Record
+		{
+			public int Value;
+		}
+		
+		int First()
+		{
+			return $records[0].Value$;
+		}
+	}";
+			var rr = Resolve<MemberResolveResult>(program);
+			Assert.IsFalse(rr.IsError);
+			Assert.AreEqual("ConcreteTable+Record.Value", rr.Member.ReflectionName);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ObjectCreationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ObjectCreationTests.cs
index 622fe2d04d..693640814e 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ObjectCreationTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ObjectCreationTests.cs
@@ -286,13 +286,10 @@ class C {
 }";
 			var rr = Resolve<ConversionResolveResult>(program);
 			Assert.IsFalse(rr.IsError);
-			Assert.IsTrue(rr.Conversion.IsIdentityConversion);
-			var rr2 = (ConversionResolveResult)rr.Input;
-			Assert.IsFalse(rr2.IsError);
-			Assert.IsTrue(rr2.Conversion.IsMethodGroupConversion);
+			Assert.IsTrue(rr.Conversion.IsMethodGroupConversion);
 			
-			Assert.AreEqual("C.M", rr2.Conversion.Method.FullName);
-			var mgrr = (MethodGroupResolveResult)rr2.Input;
+			Assert.AreEqual("C.M", rr.Conversion.Method.FullName);
+			var mgrr = (MethodGroupResolveResult)rr.Input;
 			Assert.IsInstanceOf<ThisResolveResult>(mgrr.TargetResult);
 		}
 		
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/OverloadResolutionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/OverloadResolutionTests.cs
index 513bfc5a16..a1e85e799e 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/OverloadResolutionTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/OverloadResolutionTests.cs
@@ -29,11 +29,8 @@ using NUnit.Framework;
 namespace ICSharpCode.NRefactory.CSharp.Resolver
 {
 	[TestFixture]
-	public class OverloadResolutionTests
+	public class OverloadResolutionTests : ResolverTestBase
 	{
-		readonly ICompilation compilation = new SimpleCompilation(
-			CecilLoaderTests.SystemCore, new[] { CecilLoaderTests.Mscorlib });
-		
 		ResolveResult[] MakeArgumentList(params Type[] argumentTypes)
 		{
 			return argumentTypes.Select(t => new ResolveResult(compilation.FindType(t))).ToArray();
@@ -269,6 +266,10 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				get { throw new NotImplementedException(); }
 			}
 			
+			public override IType ReturnType {
+				get { throw new NotImplementedException(); }
+			}
+			
 			public override IType GetInferredReturnType(IType[] parameterTypes)
 			{
 				return inferredReturnType;
@@ -327,5 +328,25 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			Assert.AreEqual(OverloadResolutionErrors.None, r.AddCandidate(m2));
 			Assert.AreEqual(OverloadResolutionErrors.AmbiguousMatch, r.BestCandidateErrors);
 		}
+		
+		[Test, Ignore("Overload Resolution bug")]
+		public void BetterFunctionMemberIsNotTransitive()
+		{
+			string program = @"using System;
+class Program
+{
+	static void Method(Action<string> a) {}
+	static void Method<T>(Func<string, T> a) {}
+	static void Method(Action<object> a) {}
+	static void Method<T>(Func<object, T> a) {}
+	
+	public static void Main(string[] args)
+	{
+	        $Method(a => a.ToString())$;
+	}
+}";
+			var rr = Resolve<CSharpInvocationResolveResult>(program);
+			Assert.AreEqual(OverloadResolutionErrors.AmbiguousMatch, rr.OverloadResolutionErrors);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolveAtLocationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolveAtLocationTests.cs
index 31d03134ab..587cb12162 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolveAtLocationTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolveAtLocationTests.cs
@@ -250,5 +250,47 @@ class Test {
 ");
 			Assert.AreEqual("System.Environment", rr.Type.FullName);
 		}
+
+		[Test]
+		public void TestIndexer()
+		{
+			var rr = ResolveAtLocation<MemberResolveResult>(
+				@"using System;
+class Test {
+	public int $this[int index] { get { return 1; } }
+}
+");
+			Assert.AreEqual("Test.Item", rr.Member.FullName);
+		}
+
+		[Test]
+		public void TestUserDefinedOperator()
+		{
+			var rr = ResolveAtLocation<OperatorResolveResult>(
+				@"class Foo 
+{
+	public static Foo operator+(Foo a, Foo b)
+	{
+		return a;
+	}
+}
+
+class MainClass
+{
+	public static void Main (string[] args)
+	{
+		Foo f = new Foo () $+ new Foo ();
+	}
+}
+");
+			Assert.AreEqual("Foo.op_Addition", rr.UserDefinedOperatorMethod.FullName);
+		}
+
+		
+		[Test]
+		public void PragmaWarningID()
+		{
+			ResolveAtLocation(@"#pragma warning disable 1$0");
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolverTestBase.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolverTestBase.cs
index 88b20b0596..c2aefc0086 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolverTestBase.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolverTestBase.cs
@@ -204,11 +204,12 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		{
 			ResolveResult rr = Resolve(code);
 			Assert.IsNotNull(rr);
-			if (typeof(T) == typeof(LambdaResolveResult)) {
-				Assert.IsTrue(rr is LambdaResolveResult, "Resolve should be " + typeof(T).Name + ", but was " + rr.GetType().Name);
-			} else {
-				Assert.IsTrue(rr.GetType() == typeof(T), "Resolve should be " + typeof(T).Name + ", but was " + rr.GetType().Name);
-			}
+			// Find most specific public type:
+			Type rrType = rr.GetType();
+			while (!rrType.IsPublic)
+				rrType = rrType.BaseType;
+			
+			Assert.IsTrue(rrType == typeof(T), "Resolve should be " + typeof(T).Name + ", but was " + rr.GetType().Name);
 			return (T)rr;
 		}
 		
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/TypeInferenceTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/TypeInferenceTests.cs
index 039434fcae..73d6115048 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/TypeInferenceTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/TypeInferenceTests.cs
@@ -264,6 +264,10 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				get { throw new NotImplementedException(); }
 			}
 			
+			public override IType ReturnType {
+				get { throw new NotImplementedException(); }
+			}
+			
 			public override IType GetInferredReturnType(IType[] parameterTypes)
 			{
 				Assert.AreEqual(expectedParameterTypes, parameterTypes, "Parameters types passed to " + this);
@@ -598,5 +602,47 @@ class C : I<string>
 			Assert.AreEqual("System.String", mrr.Type.FullName);
 			Assert.IsFalse(mrr.IsError);
 		}
+
+		[Test]
+		public void GenericArgumentImplicitlyConvertibleToAndFromAnotherTypeList() {
+			string program = @"
+using System.Collections.Generic;
+public class MyConvertible {
+	public static implicit operator MyConvertible(int number) { return null; }
+	public static implicit operator int(MyConvertible obj) { return 0; }
+}
+
+class C {
+	public static void F<K>(IList<K> a, K b) {
+	}
+	void M() {
+		$F(new List<MyConvertible>(), 1)$;
+	}
+}";
+			var rr = Resolve<CSharpInvocationResolveResult>(program);
+			Assert.IsFalse(rr.IsError);
+			Assert.That(rr.Member, Is.InstanceOf<SpecializedMethod>());
+			Assert.That(((SpecializedMethod)rr.Member).TypeArguments.Select(ta => ta.FullName), Is.EqualTo(new[] { "MyConvertible" }));
+		}
+
+		[Test]
+		public void GenericArgumentImplicitlyConvertibleToAndFromAnotherTypeIEnumerable() {
+			string program = @"
+using System.Collections.Generic;
+public class MyConvertible {
+	public static implicit operator MyConvertible(int number) { return null; }
+	public static implicit operator int(MyConvertible obj) { return 0; }
+}
+
+class C {
+	public static void F<K>(IEnumerable<K> a, K b) {
+	}
+	void M() {
+		$F(new List<MyConvertible>(), 1)$;
+	}
+}";
+			var rr = Resolve<CSharpInvocationResolveResult>(program);
+			Assert.IsTrue(rr.IsError);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/UnaryOperatorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/UnaryOperatorTests.cs
index f386127a6d..fe1fc26bb6 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/UnaryOperatorTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/CSharp/Resolver/UnaryOperatorTests.cs
@@ -222,7 +222,9 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			AssertType(typeof(StringComparison?), resolver.ResolveUnaryOperator(UnaryOperatorType.BitNot, MakeResult(typeof(StringComparison?))));
 		}
 		
+#if __MonoCS__
 		[Ignore("Broken on mcs")]
+#endif
 		[Test]
 		public void IntMinValue()
 		{
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/Documentation/CSharpDocumentationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/Documentation/CSharpDocumentationTests.cs
index 031c555546..b1060879a3 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/Documentation/CSharpDocumentationTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/Documentation/CSharpDocumentationTests.cs
@@ -169,5 +169,18 @@ class Test { }");
 class Test { }");
 			Assert.AreEqual("<summary/>", typeDefinition.Documentation.ToString());
 		}
+		
+		[Test]
+		public void CDATAInDocumentation()
+		{
+			Init(@"using System;
+/// <summary>before<![CDATA[<xml/>]]>after</summary>
+class Test { }
+");
+			var element = XmlDocumentationElement.Get(typeDefinition);
+			Assert.AreEqual(1, element.Children.Count());
+			Assert.AreEqual("summary", element.Children[0].Name);
+			Assert.AreEqual("before<xml/>after", element.Children[0].TextContent);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestBlankLineFormatting.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestBlankLineFormatting.cs
index dc39f6af33..eab9aae66d 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestBlankLineFormatting.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestBlankLineFormatting.cs
@@ -236,7 +236,7 @@ namespace Test
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
 			policy.BlankLinesBetweenMembers = 1;
-			
+
 			var adapter = Test (policy, @"class Test
 {
 	void AMethod ()
@@ -262,7 +262,7 @@ namespace Test
 	{
 	}
 }", FormattingMode.Intrusive);
-			
+
 			policy.BlankLinesBetweenMembers = 0;
 			Continue (policy, adapter, @"class Test
 {
@@ -277,9 +277,259 @@ namespace Test
 	}
 }", FormattingMode.Intrusive);
 		}
-		
-		
-		
+
+		[Test]
+		public void TestBlankLinesAroundRegion ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			policy.BlankLinesAroundRegion = 2;
+
+			var adapter = Test (policy, @"class Test
+{
+	#region FooBar
+	
+	void AMethod ()
+	{
+	}
+	
+	#endregion
+}", @"class Test
+{
+
+
+	#region FooBar
+
+	void AMethod ()
+	{
+	}
+
+	#endregion
+
+
+}", FormattingMode.Intrusive);
+
+			policy.BlankLinesAroundRegion = 0;
+			Continue (policy, adapter, @"class Test
+{
+	#region FooBar
+
+	void AMethod ()
+	{
+	}
+
+	#endregion
+}", FormattingMode.Intrusive);
+		}
+
+		[Test]
+		public void TestBlankLinesInsideRegion ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			policy.BlankLinesInsideRegion = 2;
+			var adapter = Test (policy, @"class Test
+{
+
+	#region FooBar
+	void AMethod ()
+	{
+	}
+	#endregion
+
+}", @"class Test
+{
+
+	#region FooBar
+
+
+	void AMethod ()
+	{
+	}
+
+
+	#endregion
+
+}", FormattingMode.Intrusive);
+
+			policy.BlankLinesInsideRegion = 0;
+			Continue (policy, adapter, @"class Test
+{
+
+	#region FooBar
+	void AMethod ()
+	{
+	}
+	#endregion
+
+}", FormattingMode.Intrusive);
+		}
+
+		/// <summary>
+		/// Bug 13373 - XS adding linefeeds within #ifs
+		/// </summary>
+		[Test]
+		public void TestBug13373_Global ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+
+			Test (policy, @"
+#if false
+class Test2
+{
+}
+#endif
+",
+			                    @"
+#if false
+class Test2
+{
+}
+#endif
+", FormattingMode.Intrusive);
+
+		}
+
+		[Test]
+		public void TestBug13373_TypeLevel ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+
+			Test (policy, 
+@"class Foo
+{
+	#if false
+	class Test2
+	{
+	}
+	#endif
+}
+",
+@"class Foo
+{
+	#if false
+	class Test2
+	{
+	}
+	#endif
+}
+", FormattingMode.Intrusive);
+
+		}
+
+		[Test]
+		public void TestBug13373_StatementLevel ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+
+			Test (policy, 
+			                    @"class Foo
+{
+	void Test ()
+	{
+		#if false
+		class Test2
+		{
+		}
+		#endif
+	}
+}",
+@"class Foo
+{
+	void Test ()
+	{
+		#if false
+		class Test2
+		{
+		}
+		#endif
+	}
+}", FormattingMode.Intrusive);
+
+		}
+
+		[Test]
+		public void TestAddIndentOnBlankLines ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			policy.EmptyLineFormatting = EmptyLineFormatting.Indent;
+
+			Test (policy, @"class Foo
+{
+	void Test ()
+	{
+	}
+	void Test2 ()
+	{
+	}
+}", @"class Foo
+{
+	void Test ()
+	{
+	}
+	
+	void Test2 ()
+	{
+	}
+}", FormattingMode.Intrusive);
+
+		}
+
+		[Test]
+		public void TestRemoveIndentOnBlankLines ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			policy.EmptyLineFormatting = EmptyLineFormatting.DoNotIndent;
+
+			Test (policy, @"class Foo
+{
+	void Test ()
+	{
+	}
+	
+	void Test2 ()
+	{
+	}
+}", @"class Foo
+{
+	void Test ()
+	{
+	}
+
+	void Test2 ()
+	{
+	}
+}", FormattingMode.Intrusive);
+
+		}
+
+		[Test]
+		public void TestDoNotChangeIndentOnBlankLines ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			policy.EmptyLineFormatting = EmptyLineFormatting.DoNotChange;
+
+			var indented = @"class Foo
+{
+	void Test ()
+	{
+	}
+	
+	void Test2 ()
+	{
+	}
+}";
+			var nonIndented = @"class Foo
+{
+	void Test ()
+	{
+	}
+
+	void Test2 ()
+	{
+	}
+}";
+			Test(policy, indented, indented, FormattingMode.Intrusive);
+			Test(policy, nonIndented, nonIndented, FormattingMode.Intrusive);
+		}
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestBraceStlye.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestBraceStlye.cs
index 0b62482c4a..25b62b767d 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestBraceStlye.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestBraceStlye.cs
@@ -34,7 +34,7 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 	[TestFixture()]
 	public class TestBraceStyle : TestBase
 	{
-		[Test()]
+		[Test]
 		public void TestNamespaceBraceStyle ()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
@@ -65,7 +65,7 @@ namespace B {
 		}
 
 
-		[Test()]
+		[Test]
 		public void TestAnonymousMethodBraceStyle ()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
@@ -89,7 +89,7 @@ namespace B {
 	}
 }");
 		}
-		[Test()]
+		[Test]
 		public void TestClassBraceStlye ()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
@@ -101,7 +101,7 @@ namespace B {
 }");
 		}
 
-		[Test()]
+		[Test]
 		public void TestStructBraceStyle ()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
@@ -114,7 +114,7 @@ namespace B {
 }");
 		}
 
-		[Test()]
+		[Test]
 		public void TestInterfaceBraceStyle ()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
@@ -127,7 +127,7 @@ namespace B {
 }");
 		}
 
-		[Test()]
+		[Test]
 		public void TestEnumBraceStyle ()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
@@ -142,7 +142,7 @@ namespace B {
 	}");
 		}
 
-		[Test()]
+		[Test]
 		public void TestMethodBraceStlye ()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
@@ -160,7 +160,7 @@ namespace B {
 }");
 		}
 
-		[Test()]
+		[Test]
 		public void TestConstructorBraceStyle ()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
@@ -178,7 +178,7 @@ namespace B {
 }");
 		}
 
-		[Test()]
+		[Test]
 		public void TestDestructorBraceStyle ()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
@@ -196,7 +196,7 @@ namespace B {
 }");
 		}
 
-		[Test()]
+		[Test]
 		public void TestPropertyBraceStyle ()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
@@ -219,7 +219,7 @@ namespace B {
 }");
 		}
 
-		[Test()]
+		[Test]
 		public void TestPropertyGetBraceStyle ()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
@@ -246,19 +246,19 @@ namespace B {
 }");
 		}
 
-		[Test()]
+		[Test]
 		public void TestAllowPropertyGetBlockInline ()
 		{
 			
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
 			policy.PropertyBraceStyle = BraceStyle.DoNotChange;
-			policy.AllowPropertyGetBlockInline = true;
-			policy.AllowPropertySetBlockInline = false;
-			
+			policy.SimpleGetBlockFormatting = PropertyFormatting.AllowOneLine;
+			policy.SimpleSetBlockFormatting = PropertyFormatting.ForceNewLine;
+
 			var adapter = Test (policy, @"class Test
 {
 	Test A {
-		get { return null; }
+		get { return null;}
 		set { ; }
 	}
 }",
@@ -271,8 +271,8 @@ namespace B {
 		}
 	}
 }");
-			
-			policy.AllowPropertyGetBlockInline = false;
+			policy.SimpleGetBlockFormatting = PropertyFormatting.ForceNewLine;
+			policy.SimpleSetBlockFormatting = PropertyFormatting.ForceOneLine;
 			Continue (policy, adapter,
 @"class Test
 {
@@ -280,21 +280,39 @@ namespace B {
 		get {
 			return null;
 		}
-		set {
-			;
+		set { ; }
+	}
+}");
 		}
+
+		[Test]
+		public void TestPropertyForceOneLine ()
+		{
+
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			policy.SimplePropertyFormatting = PropertyFormatting.ForceOneLine;
+
+			Test (policy, @"class Test
+{
+	Test A {
+		get { return null; }
+		set { ; }
 	}
+}",
+			                    @"class Test
+{
+	Test A { get { return null; } set { ; } }
 }");
 		}
 
-		[Test()]
+		[Test]
 		public void TestAllowPropertySetBlockInline ()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
 			policy.PropertyBraceStyle = BraceStyle.DoNotChange;
-			policy.AllowPropertyGetBlockInline = false;
-			policy.AllowPropertySetBlockInline = true;
-			
+			policy.SimpleGetBlockFormatting = PropertyFormatting.ForceNewLine;
+			policy.SimpleSetBlockFormatting = PropertyFormatting.ForceOneLine;
+
 			var adapter = Test (policy, @"class Test
 {
 	Test A {
@@ -312,7 +330,7 @@ namespace B {
 	}
 }");
 			
-			policy.AllowPropertySetBlockInline = false;
+			policy.SimpleSetBlockFormatting = PropertyFormatting.ForceNewLine;
 			Continue (policy, adapter,
 @"class Test
 {
@@ -327,7 +345,7 @@ namespace B {
 }");
 		}
 
-		[Test()]
+		[Test]
 		public void TestPropertySetBraceStyle ()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
@@ -354,7 +372,7 @@ namespace B {
 }");
 		}
 
-		[Test()]
+		[Test]
 		public void TestEventBraceStyle ()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
@@ -385,7 +403,7 @@ namespace B {
 }");
 		}
 
-		[Test()]
+		[Test]
 		public void TestAllowEventAddBlockInline ()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
@@ -410,7 +428,7 @@ namespace B {
 }");
 		}
 
-		[Test()]
+		[Test]
 		public void TestAllowEventRemoveBlockInline ()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
@@ -436,7 +454,7 @@ namespace B {
 		}
 
 		[Ignore("FixMe")]
-		[Test()]
+		[Test]
 		public void TestTryCatchWithBannerStyle ()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestExpressionFormatting.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestExpressionFormatting.cs
index bb17e9859e..5830da6607 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestExpressionFormatting.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestExpressionFormatting.cs
@@ -80,7 +80,7 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		}
 
 
-
+		
 		[Test]
 		public void TestArrayInitializer ()
 		{
@@ -110,6 +110,23 @@ class Test
 }");
 		}
 
+		[Test]
+		public void TestNoUneccessaryChangesToImplicitArrayInitializer ()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+			const string input = @"using System.Collections.Generic;
+
+class Test
+{
+	void Init ()
+	{
+		var list = { 1, 2 };
+	}
+}";
+
+			TestNoUnnecessaryChanges(policy, input);
+		}
+
 
 		[Test]
 		public void TestAllowOneLinedArrayInitialziers ()
@@ -155,6 +172,206 @@ class Test
 	}
 }");
 		}
+
+
+		[Test]
+		public void AnonymousBlocksAsParameter ()
+		{
+			var policy = FormattingOptionsFactory.CreateMono ();
+
+			Test (policy, @"class Test
+{
+	Test TestMethod ()
+	{
+		FooBar (
+			foo,
+			delegate {
+Bar ();
+}, 
+test
+);
+	}
+}", @"class Test
+{
+	Test TestMethod ()
+	{
+		FooBar (
+			foo,
+			delegate {
+				Bar ();
+			}, 
+			test
+		);
+	}
+}");
+		}
+
+
+		[Test]
+		public void TestAnonymousMethodBlocks ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+
+			policy.AnonymousMethodBraceStyle = BraceStyle.NextLine;
+
+			Test (policy, @"class Test
+{
+	Test TestMethod ()
+	{
+		Action act = delegate{};
+	}
+}", @"class Test
+{
+	Test TestMethod ()
+	{
+		Action act = delegate
+		{
+		};
+	}
+}");
+		}
+
+		[Test]
+		public void TestLambdaBraceStyle ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+
+			policy.AnonymousMethodBraceStyle = BraceStyle.NextLine;
+
+			Test (policy, @"class Test
+{
+	Test TestMethod ()
+	{
+		Action act = () => {};
+	}
+}", @"class Test
+{
+	Test TestMethod ()
+	{
+		Action act = () =>
+		{
+		};
+	}
+}");
+		}
+
+		[Test]
+		public void TestBinaryExpressionsInInitializer ()
+		{
+			var policy = FormattingOptionsFactory.CreateMono ();
+			Test (policy, @"class Test
+{
+	private void Foo ()
+	{
+		int x =    5+ 
+23 - 
+43*12 - 44*
+5;
+	}
+}
+", @"class Test
+{
+	private void Foo ()
+	{
+		int x = 5 +
+		        23 -
+		        43 * 12 - 44 *
+		        5;
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestBinaryExpressionsInInitializerBreakAfterAssign ()
+		{
+			var policy = FormattingOptionsFactory.CreateMono ();
+			Test (policy, @"class Test
+{
+	private void Foo ()
+	{
+		int x =
+ 5+ 
+23 
+- 43
+*12 
+ - 
+44*
+5;
+	}
+}
+", @"class Test
+{
+	private void Foo ()
+	{
+		int x =
+			5 +
+			23
+			- 43
+			* 12
+			-
+			44 *
+			5;
+	}
+}
+");
+			}
+
+		[Test]
+		public void TestBinaryExpressionsInInitializerWithParenthesizedExpr ()
+		{
+			var policy = FormattingOptionsFactory.CreateMono ();
+			Test (policy, @"class Test
+{
+	private void Foo ()
+	{
+		int x = 5
+		+ (2343 *  12)            - (
+		44 * 5
+		);
+	}
+}
+", @"class Test
+{
+	private void Foo ()
+	{
+		int x = 5
+		        + (2343 * 12) - (
+		            44 * 5
+		        );
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestArrayInitializerFormattingBugSimple ()
+		{
+			var policy = FormattingOptionsFactory.CreateSharpDevelop ();
+			Test (policy, @"class Test
+{
+	static readonly AstNode forPattern =
+		new Choice {
+			new BinaryOperatorExpression(
+				PatternHelper.OptionalParentheses(
+					new AnyNode(""upperBound"")
+				)
+			)
+		};
+}
+", @"class Test
+{
+	static readonly AstNode forPattern =
+		new Choice {
+			new BinaryOperatorExpression(
+				PatternHelper.OptionalParentheses(
+					new AnyNode(""upperBound"")
+				)
+			)
+		};
+}
+");
+		}
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs
index 1689f20a46..b387407a6b 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs
@@ -375,6 +375,57 @@ foo ();
 }");
 		}
 
+		/// <summary>
+		/// Bug 14324 - System.ArgumentOutOfRangeException while formatting C# code
+		/// </summary>
+		[Test]
+		public void TestBug14324()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
+
+			Test(policy,
+			     @"class C
+{
+	public void Test ()
+	{
+		if
+(true ||
+false) {
+}
+	}
+}",
+			     @"class C
+{
+	public void Test ()
+	{
+		if (true ||
+		false) {
+		}
+	}
+}");
+		}
+
+
+
+		/// <summary>
+		/// Bug 14957 - System.InvalidOperationException: Sequence contains no elements
+		/// </summary>
+		[Test]
+		public void TestBug14957()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
+			policy.SimplePropertyFormatting = PropertyFormatting.ForceOneLine;
+			Test(policy,
+				@"class X
+{
+	public int Foo { get {
+	} }
+}", @"class X
+{
+	public int Foo { get { } }
+}");
+		}
+
 
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestGlobalLevelFormatting.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestGlobalLevelFormatting.cs
new file mode 100644
index 0000000000..51399f3809
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestGlobalLevelFormatting.cs
@@ -0,0 +1,169 @@
+//
+// TestGlobalLevelFormatting.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.IO;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp;
+
+namespace ICSharpCode.NRefactory.CSharp.FormattingTests
+{
+	[TestFixture]
+	public class TestGlobalLevelFormatting : TestBase
+	{
+		[Test]
+		public void TestGlobalAttributes ()
+		{
+			var policy = FormattingOptionsFactory.CreateMono ();
+			Test (policy,
+			      @"[assembly: AssemblyDescription   (""""  )   ]",
+			      @"[assembly: AssemblyDescription ("""")]");
+		}
+
+		/// <summary>
+		/// Bug 13361 - Format Document partially removes pragmas (#pragma
+		/// </summary>
+		[Test]
+		public void TestBug13361()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
+			Test(policy, 
+			     @"#pragma warning disable 0219
+
+class Foo
+{
+	#pragma warning disable 123
+	void Foo ()
+	{
+		#pragma warning disable 123
+	}
+}", @"#pragma warning disable 0219
+
+class Foo
+{
+	#pragma warning disable 123
+	void Foo ()
+	{
+		#pragma warning disable 123
+	}
+}");
+		}
+
+		/// <summary>
+		/// Bug 13413 - Formatter inserts new line between #undef statements in an #if block on every reformat 
+		/// </summary>
+		[Test]
+		public void TestBug13413()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
+			Test(policy, 
+			     @"#if foo
+#undef a
+#undef b
+#undef c
+#undef d
+#endif
+", @"#if foo
+#undef a
+#undef b
+#undef c
+#undef d
+#endif
+");
+		}
+
+		
+
+		[Test]
+		public void TestOverlappingChangeBug ()
+		{
+			var policy = FormattingOptionsFactory.CreateMono ();
+			Test (policy,
+			      @"//
+
+
+using System;", @"//
+
+using System;");
+		}
+
+		[Test]
+		public void TestUsingBlankLines ()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.BlankLinesBeforeUsings = 2;
+			Test(policy,
+			      @"//
+using System;",
+			      @"//
+
+
+using System;");
+		}
+
+		[Test]
+		public void TestUsingBlankLinesCase2 ()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.BlankLinesBeforeUsings = 2;
+			Test(policy,
+			       @"//
+
+
+using System;",
+			       @"//
+
+
+using System;");
+		}
+
+		[Test]
+		public void TestUsingBlankLinesCase3 ()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.BlankLinesBeforeUsings = 2;
+			Test(policy,
+			      @"
+
+using System;",
+			      @"
+
+using System;");
+		}
+
+		[Test]
+		public void TestUsingBlankLinesCase4 ()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.BlankLinesBeforeUsings = 2;
+			Test (policy,
+			      @"using System;",
+			      @"
+
+using System;");
+
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestLinq.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestLinq.cs
new file mode 100644
index 0000000000..c69f29472a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestLinq.cs
@@ -0,0 +1,253 @@
+// TestLinq.cs
+//  
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.IO;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp;
+
+namespace ICSharpCode.NRefactory.CSharp.FormattingTests
+{
+	[TestFixture]
+	public class TestLinq : TestBase
+	{
+		[Test]
+		public void TestBasicQuery ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			Test (policy, @"
+class Test
+{
+	public void Foo ()
+	{
+		var ax = from y in z
+select y;
+	}
+}", @"
+class Test
+{
+	public void Foo ()
+	{
+		var ax = from y in z
+		         select y;
+	}
+}");
+		}
+
+		[Ignore]
+		[Test]
+		public void TestFormatWhole ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			Test (policy, @"
+class Test
+{
+	public void Foo ()
+	{
+		var x =from y in z
+select y;
+	}
+}", @"
+class Test
+{
+	public void Foo ()
+	{
+		var x = from y in z
+		        select y;
+	}
+}");
+		}
+
+		[Test]
+		public void TestFormatParenthesized ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			Test (policy, @"
+class Test
+{
+	public void Foo ()
+	{
+		var x = (from y in z
+select y);
+	}
+}", @"
+class Test
+{
+	public void Foo ()
+	{
+		var x = (from y in z
+		         select y);
+	}
+}");
+		}
+
+		[Test]
+		public void TestFormatInExpression ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			Test (policy, @"
+class Test
+{
+	public void Foo ()
+	{
+		var x = 1 + (from y in new int[1]
+select y).First();
+	}
+}", @"
+class Test
+{
+	public void Foo ()
+	{
+		var x = 1 + (from y in new int[1]
+		             select y).First ();
+	}
+}");
+		}
+
+		[Ignore]
+		[Test]
+		public void TestFormatMultiple ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			Test (policy, @"
+class Test
+{
+	public void Foo ()
+	{
+		var x = from y in
+from w in k
+select w
+select y;
+	}
+}", @"
+class Test
+{
+	public void Foo ()
+	{
+		var x = from y in
+		            from w in k
+		            select w
+		        select y;
+	}
+}");
+		}
+
+		[Test]
+		public void TestExpression ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			Test (policy, @"
+class Test
+{
+	public void Foo ()
+	{
+		var x = from y in z
+select
+3;
+	}
+}", @"
+class Test
+{
+	public void Foo ()
+	{
+		var x = from y in z
+		        select
+		            3;
+	}
+}");
+		}
+
+		[Test]
+		public void TestBasicQueryNoLines ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			policy.NewLineBeforeNewQueryClause = NewLinePlacement.SameLine;
+			Test (policy, @"
+class Test
+{
+	public void Foo ()
+	{
+		var x = from y in z
+select y;
+	}
+}", @"
+class Test
+{
+	public void Foo ()
+	{
+		var x = from y in z select y;
+	}
+}");
+		}
+
+		[Test]
+		public void TestBasicQueryAlwaysChangeLines ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			policy.NewLineBeforeNewQueryClause = NewLinePlacement.NewLine;
+			Test (policy, @"
+class Test
+{
+	public void Foo ()
+	{
+		var x = from y in z
+select y;
+	}
+}", @"
+class Test
+{
+	public void Foo ()
+	{
+		var x = from y in z
+		        select y;
+	}
+}");
+		}
+
+		[Test]
+		public void TestBasicQueryAddLine ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			policy.NewLineBeforeNewQueryClause = NewLinePlacement.NewLine;
+			Test (policy, @"
+class Test
+{
+	public void Foo ()
+	{
+		var x = from y in z select y;
+	}
+}", @"
+class Test
+{
+	public void Foo ()
+	{
+		var x = from y in z
+		        select y;
+	}
+}");
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestSpacingVisitor.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestSpacingVisitor.cs
index 1bdd4637a6..8ac7c8e0dc 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestSpacingVisitor.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestSpacingVisitor.cs
@@ -136,8 +136,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		{
 			var result = GetResult (policy, "class Test { void TestMe () { result = left" + op + "right; } }");
 			
-			int i1 = result.Text.IndexOf ("left");
-			int i2 = result.Text.IndexOf ("right") + "right".Length;
+			int i1 = result.Text.IndexOf("left", System.StringComparison.Ordinal);
+			int i2 = result.Text.IndexOf("right", System.StringComparison.Ordinal) + "right".Length;
 			if (i1 < 0 || i2 < 0)
 				Assert.Fail ("text invalid:" + result.Text);
 			Assert.AreEqual ("left " + op + " right", result.GetText (i1, i2 - i1));
@@ -162,6 +162,15 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 			TestBinaryOperator (policy, ">>");
 		}
 
+		[Test]
+		public void TestSpaceAroundNullCoalescingOperator ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			policy.SpaceAroundNullCoalescingOperator = true;
+			TestBinaryOperator (policy, "??");
+		}
+
+
 		[Test]
 		public void TestSpacesAroundAdditiveOperator ()
 		{
@@ -230,8 +239,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		result = condition?trueexpr:falseexpr;
 	}
 }");
-			int i1 = result.Text.IndexOf ("condition");
-			int i2 = result.Text.IndexOf ("falseexpr") + "falseexpr".Length;
+			int i1 = result.Text.IndexOf("condition", System.StringComparison.Ordinal);
+			int i2 = result.Text.IndexOf("falseexpr", System.StringComparison.Ordinal) + "falseexpr".Length;
 			Assert.AreEqual (@"condition ? trueexpr : falseexpr", result.GetText (i1, i2 - i1));
 			
 			
@@ -246,8 +255,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		result = true ? trueexpr : falseexpr;
 	}
 }");
-			i1 = result.Text.IndexOf ("true");
-			i2 = result.Text.IndexOf ("falseexpr") + "falseexpr".Length;
+			i1 = result.Text.IndexOf("true", System.StringComparison.Ordinal);
+			i2 = result.Text.IndexOf("falseexpr", System.StringComparison.Ordinal) + "falseexpr".Length;
 			Assert.AreEqual (@"true?trueexpr:falseexpr", result.GetText (i1, i2 - i1));
 		}
 
@@ -264,8 +273,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 	}
 }");
 			
-			int i1 = result.Text.IndexOf ("MethodCall");
-			int i2 = result.Text.IndexOf (";") + ";".Length;
+			int i1 = result.Text.IndexOf("MethodCall", System.StringComparison.Ordinal);
+			int i2 = result.Text.IndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual (@"MethodCall ();", result.GetText (i1, i2 - i1));
 			
 			
@@ -278,8 +287,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 			policy.SpaceBeforeMethodCallParentheses = false;
 			
 			result = GetResult (policy, result.Text);
-			i1 = result.Text.IndexOf ("MethodCall");
-			i2 = result.Text.IndexOf (";") + ";".Length;
+			i1 = result.Text.IndexOf("MethodCall", System.StringComparison.Ordinal);
+			i2 = result.Text.IndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual (@"MethodCall();", result.GetText (i1, i2 - i1));
 		}
 
@@ -295,8 +304,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		MethodCall(true);
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( true )", result.GetText (i1, i2 - i1));
 			
 			
@@ -308,8 +317,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 	}
 }");
 			
-			i1 = result.Text.LastIndexOf ("(");
-			i2 = result.Text.LastIndexOf (")") + ")".Length;
+			i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"(true)", result.GetText (i1, i2 - i1));
 		}
 
@@ -325,8 +334,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		if(true);
 	}
 }");
-			int i1 = result.Text.IndexOf ("if");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.IndexOf("if", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"if (true)", result.GetText (i1, i2 - i1));
 		}
 
@@ -342,8 +351,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		if (true);
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( true )", result.GetText (i1, i2 - i1));
 		}
 
@@ -359,8 +368,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		while(true);
 	}
 }");
-			int i1 = result.Text.IndexOf ("while");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.IndexOf("while", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"while (true)", result.GetText (i1, i2 - i1));
 		}
 
@@ -377,11 +386,30 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 	}
 }");
 			
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
+			Assert.AreEqual (@"( true )", result.GetText (i1, i2 - i1));
+		}
+
+		[Test]
+		public void TestWithinWhileParenthesesSpaceDoWhile ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			policy.SpacesWithinWhileParentheses = true;
+
+			var result = GetResult (policy, @"class Test {
+	void TestMe ()
+	{
+		do {} while (true);
+	}
+}");
+
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( true )", result.GetText (i1, i2 - i1));
 		}
 
+
 		[Test]
 		public void TestBeforeForParenthesesSpace ()
 		{
@@ -394,8 +422,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		for(;;);
 	}
 }");
-			int i1 = result.Text.IndexOf ("for");
-			int i2 = result.Text.LastIndexOf ("(") + "(".Length;
+			int i1 = result.Text.IndexOf("for", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal) + "(".Length;
 			Assert.AreEqual (@"for (", result.GetText (i1, i2 - i1));
 		}
 
@@ -411,8 +439,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		for(;;);
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( ;; )", result.GetText (i1, i2 - i1));
 		}
 
@@ -428,8 +456,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		foreach(var o in list);
 	}
 }");
-			int i1 = result.Text.IndexOf ("foreach");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.IndexOf("foreach", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"foreach (var o in list)", result.GetText (i1, i2 - i1));
 		}
 
@@ -445,8 +473,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		foreach(var o in list);
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( var o in list )", result.GetText (i1, i2 - i1));
 		}
 
@@ -462,8 +490,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
   try {} catch(Exception) {}
 	}
 }");
-			int i1 = result.Text.IndexOf ("catch");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.IndexOf("catch", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"catch (Exception)", result.GetText (i1, i2 - i1));
 		}
 
@@ -479,8 +507,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		try {} catch(Exception) {}
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( Exception )", result.GetText (i1, i2 - i1));
 		}
 
@@ -496,8 +524,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		lock(this) {}
 	}
 }");
-			int i1 = result.Text.IndexOf ("lock");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.IndexOf("lock", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"lock (this)", result.GetText (i1, i2 - i1));
 		}
 
@@ -513,8 +541,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		lock(this) {}
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( this )", result.GetText (i1, i2 - i1));
 		}
 
@@ -530,8 +558,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		for (int i;true;i++) ;
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("for");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("for", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			
 			Assert.AreEqual (@"for (int i; true; i++)", result.GetText (i1, i2 - i1));
 		}
@@ -549,8 +577,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		for (int i;true;i++) ;
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("for");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("for", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			
 			Assert.AreEqual (@"for (int i ;true ;i++)", result.GetText (i1, i2 - i1));
 		}
@@ -567,8 +595,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 return (Test)null;
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("return");
-			int i2 = result.Text.LastIndexOf ("null") + "null".Length;
+			int i1 = result.Text.LastIndexOf("return", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf("null", System.StringComparison.Ordinal) + "null".Length;
 			
 			Assert.AreEqual (@"return (Test) null", result.GetText (i1, i2 - i1));
 		}
@@ -585,8 +613,8 @@ return (Test)null;
 		using(a) {}
 	}
 }");
-			int i1 = result.Text.IndexOf ("using");
-			int i2 = result.Text.LastIndexOf ("(") + "(".Length;
+			int i1 = result.Text.IndexOf("using", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal) + "(".Length;
 			Assert.AreEqual (@"using (", result.GetText (i1, i2 - i1));
 		}
 
@@ -602,17 +630,17 @@ return (Test)null;
 		using(a) {}
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( a )", result.GetText (i1, i2 - i1));
 		}
 
 		static void TestAssignmentOperator (CSharpFormattingOptions policy, string op)
 		{
 			var result = GetResult (policy, "class Test { void TestMe () { left" + op + "right; } }");
-			
-			int i1 = result.Text.IndexOf ("left");
-			int i2 = result.Text.IndexOf ("right") + "right".Length;
+
+			int i1 = result.Text.IndexOf("left", System.StringComparison.Ordinal);
+			int i2 = result.Text.IndexOf("right", System.StringComparison.Ordinal) + "right".Length;
 			if (i1 < 0 || i2 < 0)
 				Assert.Fail ("text invalid:" + result.Text);
 			Assert.AreEqual ("left " + op + " right", result.GetText (i1, i2 - i1));
@@ -649,8 +677,8 @@ return (Test)null;
 	}
 }");
 			
-			int i1 = result.Text.LastIndexOf ("left");
-			int i2 = result.Text.LastIndexOf ("right") + "right".Length;
+			int i1 = result.Text.LastIndexOf("left", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf("right", System.StringComparison.Ordinal) + "right".Length;
 			Assert.AreEqual (@"left = right", result.GetText (i1, i2 - i1));
 		}
 
@@ -666,8 +694,8 @@ return (Test)null;
 		switch (test) { default: break; }
 	}
 }");
-			int i1 = result.Text.IndexOf ("switch");
-			int i2 = result.Text.LastIndexOf ("(") + "(".Length;
+			int i1 = result.Text.IndexOf("switch", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal) + "(".Length;
 			Assert.AreEqual (@"switch (", result.GetText (i1, i2 - i1));
 		}
 
@@ -683,8 +711,8 @@ return (Test)null;
 		switch (test) { default: break; }
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( test )", result.GetText (i1, i2 - i1));
 		}
 
@@ -700,8 +728,8 @@ return (Test)null;
 		c = (test);
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( test )", result.GetText (i1, i2 - i1));
 		}
 
@@ -716,8 +744,8 @@ return (Test)null;
 	{
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( int a )", result.GetText (i1, i2 - i1));
 		}
 
@@ -733,8 +761,8 @@ return (Test)null;
 		a = (int)b;
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( int )", result.GetText (i1, i2 - i1));
 		}
 
@@ -750,8 +778,8 @@ return (Test)null;
 		a = sizeof(int);
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( int )", result.GetText (i1, i2 - i1));
 		}
 
@@ -767,8 +795,8 @@ return (Test)null;
 		a = sizeof(int);
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("sizeof");
-			int i2 = result.Text.LastIndexOf ("(") + "(".Length;
+			int i1 = result.Text.LastIndexOf("sizeof", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal) + "(".Length;
 			Assert.AreEqual (@"sizeof (", result.GetText (i1, i2 - i1));
 		}
 
@@ -784,8 +812,8 @@ return (Test)null;
 		a = typeof(int);
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( int )", result.GetText (i1, i2 - i1));
 		}
 
@@ -802,8 +830,8 @@ return (Test)null;
 	}
 }");
 			
-			int i1 = result.Text.LastIndexOf ("typeof");
-			int i2 = result.Text.LastIndexOf ("(") + "(".Length;
+			int i1 = result.Text.LastIndexOf("typeof", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal) + "(".Length;
 			Assert.AreEqual (@"typeof (", result.GetText (i1, i2 - i1));
 		}
 
@@ -819,8 +847,8 @@ return (Test)null;
 		a = checked(a + b);
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( a + b )", result.GetText (i1, i2 - i1));
 			
 			result = GetResult (policy, @"class Test {
@@ -831,8 +859,8 @@ return (Test)null;
 }");
 			
 			result = GetResult (policy, result.Text);
-			i1 = result.Text.LastIndexOf ("(");
-			i2 = result.Text.LastIndexOf (")") + ")".Length;
+			i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( a + b )", result.GetText (i1, i2 - i1));
 		}
 
@@ -848,8 +876,8 @@ return (Test)null;
 		new Test();
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("new");
-			int i2 = result.Text.LastIndexOf (";") + ";".Length;
+			int i1 = result.Text.LastIndexOf("new", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual (@"new Test ();", result.GetText (i1, i2 - i1));
 		}
 
@@ -865,8 +893,8 @@ return (Test)null;
 		new Test (1);
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("new");
-			int i2 = result.Text.LastIndexOf (";") + ";".Length;
+			int i1 = result.Text.LastIndexOf("new", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual (@"new Test ( 1 );", result.GetText (i1, i2 - i1));
 		}
 
@@ -882,8 +910,8 @@ return (Test)null;
 		new Test ();
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("new");
-			int i2 = result.Text.LastIndexOf (";") + ";".Length;
+			int i1 = result.Text.LastIndexOf("new", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual (@"new Test ( );", result.GetText (i1, i2 - i1));
 		}
 
@@ -900,8 +928,8 @@ return (Test)null;
 		new Test (1,2);
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("new");
-			int i2 = result.Text.LastIndexOf (";") + ";".Length;
+			int i1 = result.Text.LastIndexOf("new", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual (@"new Test (1 ,2);", result.GetText (i1, i2 - i1));
 		}
 
@@ -917,8 +945,8 @@ return (Test)null;
 		new Test (1,2);
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("new");
-			int i2 = result.Text.LastIndexOf (";") + ";".Length;
+			int i1 = result.Text.LastIndexOf("new", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual (@"new Test (1, 2);", result.GetText (i1, i2 - i1));
 		}
 
@@ -932,21 +960,21 @@ return (Test)null;
 			var result = GetResult (policy, @"class Test {
 	int a,b,c;
 }");
-			int i1 = result.Text.LastIndexOf ("int");
-			int i2 = result.Text.LastIndexOf (";") + ";".Length;
+			int i1 = result.Text.LastIndexOf("int", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual (@"int a, b, c;", result.GetText (i1, i2 - i1));
 			policy.SpaceBeforeFieldDeclarationComma = true;
 			
 			result = GetResult (policy, result.Text);
-			i1 = result.Text.LastIndexOf ("int");
-			i2 = result.Text.LastIndexOf (";") + ";".Length;
+			i1 = result.Text.LastIndexOf("int", System.StringComparison.Ordinal);
+			i2 = result.Text.LastIndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual (@"int a , b , c;", result.GetText (i1, i2 - i1));
 			
 			policy.SpaceBeforeFieldDeclarationComma = false;
 			policy.SpaceAfterFieldDeclarationComma = false;
 			result = GetResult (policy, result.Text);
-			i1 = result.Text.LastIndexOf ("int");
-			i2 = result.Text.LastIndexOf (";") + ";".Length;
+			i1 = result.Text.LastIndexOf("int", System.StringComparison.Ordinal);
+			i2 = result.Text.LastIndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual (@"int a,b,c;", result.GetText (i1, i2 - i1));
 		}
 
@@ -960,14 +988,14 @@ return (Test)null;
 			var result = GetResult (policy, @"class Test {
 	public void Foo (int a,int b,int c) {}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"(int a ,int b ,int c)", result.GetText (i1, i2 - i1));
 			
 			policy.SpaceBeforeMethodDeclarationParameterComma = false;
 			result = GetResult (policy, result.Text);
-			i1 = result.Text.LastIndexOf ("(");
-			i2 = result.Text.LastIndexOf (")") + ")".Length;
+			i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"(int a,int b,int c)", result.GetText (i1, i2 - i1));
 		}
 
@@ -981,14 +1009,14 @@ return (Test)null;
 			var result = GetResult (policy, @"class Test {
 	public void Foo (int a,int b,int c) {}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"(int a, int b, int c)", result.GetText (i1, i2 - i1));
 			
 			policy.SpaceAfterMethodDeclarationParameterComma = false;
 			result = GetResult (policy, result.Text);
-			i1 = result.Text.LastIndexOf ("(");
-			i2 = result.Text.LastIndexOf (")") + ")".Length;
+			i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"(int a,int b,int c)", result.GetText (i1, i2 - i1));
 		}
 
@@ -1004,8 +1032,8 @@ return (Test)null;
 		var v = x=>x!=null;
 	}
 }");
-			int i1 = result.Text.IndexOf ("x");
-			int i2 = result.Text.LastIndexOf ("null") + "null".Length;
+			int i1 = result.Text.IndexOf("x", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf("null", System.StringComparison.Ordinal) + "null".Length;
 			Assert.AreEqual (@"x => x != null", result.GetText (i1, i2 - i1));
 		}
 
@@ -1022,8 +1050,8 @@ return (Test)null;
 		int a,b,c;
 	}
 }");
-			int i1 = result.Text.IndexOf ("int");
-			int i2 = result.Text.IndexOf (";") + ";".Length;
+			int i1 = result.Text.IndexOf("int", System.StringComparison.Ordinal);
+			int i2 = result.Text.IndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual (@"int a ,b ,c;", result.GetText (i1, i2 - i1));
 
 			result = GetResult (policy, result.Text);
@@ -1031,8 +1059,8 @@ return (Test)null;
 			policy.SpaceBeforeLocalVariableDeclarationComma = false;
 
 			result = GetResult (policy, result.Text);
-			i1 = result.Text.IndexOf ("int");
-			i2 = result.Text.IndexOf (";") + ";".Length;
+			i1 = result.Text.IndexOf("int", System.StringComparison.Ordinal);
+			i2 = result.Text.IndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual (@"int a,b,c;", result.GetText (i1, i2 - i1));
 		}
 
@@ -1049,8 +1077,8 @@ return (Test)null;
 		int a = 5,b = 6,c;
 	}
 }");
-			int i1 = result.Text.IndexOf ("int");
-			int i2 = result.Text.IndexOf (";") + ";".Length;
+			int i1 = result.Text.IndexOf("int", System.StringComparison.Ordinal);
+			int i2 = result.Text.IndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual (@"int a = 5 , b = 6 , c;", result.GetText (i1, i2 - i1));
 
 			result = GetResult (policy, result.Text);
@@ -1059,8 +1087,8 @@ return (Test)null;
 			policy.SpaceAfterLocalVariableDeclarationComma = false;
 
 			result = GetResult (policy, result.Text);
-			i1 = result.Text.IndexOf ("int");
-			i2 = result.Text.IndexOf (";") + ";".Length;
+			i1 = result.Text.IndexOf("int", System.StringComparison.Ordinal);
+			i2 = result.Text.IndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual (@"int a = 5,b = 6,c;", result.GetText (i1, i2 - i1));
 		}
 		
@@ -1077,8 +1105,8 @@ return (Test)null;
 		List<Test> a;
 	}
 }");
-			int i1 = result.Text.IndexOf ("List");
-			int i2 = result.Text.IndexOf (";") + ";".Length;
+			int i1 = result.Text.IndexOf("List", System.StringComparison.Ordinal);
+			int i2 = result.Text.IndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual (@"List<Test> a;", result.GetText (i1, i2 - i1));
 
 		}
@@ -1117,15 +1145,15 @@ return (Test)null;
 	public Test (int a,int b,int c) {}
 }");
 			
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"(int a ,int b ,int c)", result.GetText (i1, i2 - i1));
 			
 			policy.SpaceBeforeConstructorDeclarationParameterComma = false;
 			result = GetResult (policy, result.Text);
 			
-			i1 = result.Text.LastIndexOf ("(");
-			i2 = result.Text.LastIndexOf (")") + ")".Length;
+			i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"(int a,int b,int c)", result.GetText (i1, i2 - i1));
 		}
 
@@ -1139,14 +1167,14 @@ return (Test)null;
 			var result = GetResult (policy, @"class Test {
 	public Test (int a,int b,int c) {}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"(int a, int b, int c)", result.GetText (i1, i2 - i1));
 			
 			policy.SpaceAfterConstructorDeclarationParameterComma = false;
 			result = GetResult (policy, result.Text);
-			i1 = result.Text.LastIndexOf ("(");
-			i2 = result.Text.LastIndexOf (")") + ")".Length;
+			i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"(int a,int b,int c)", result.GetText (i1, i2 - i1));
 		}
 
@@ -1161,8 +1189,8 @@ return (Test)null;
 	{
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( int a )", result.GetText (i1, i2 - i1));
 		}
 
@@ -1177,8 +1205,8 @@ return (Test)null;
 	{
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( )", result.GetText (i1, i2 - i1));
 		}
 
@@ -1216,14 +1244,14 @@ return (Test)null;
 			
 			var result = GetResult (policy, @"delegate void Test (int a,int b,int c);");
 			
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"(int a ,int b ,int c)", result.GetText (i1, i2 - i1));
 			
 			policy.SpaceBeforeDelegateDeclarationParameterComma = false;
 			result = GetResult (policy, result.Text);
-			i1 = result.Text.LastIndexOf ("(");
-			i2 = result.Text.LastIndexOf (")") + ")".Length;
+			i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"(int a,int b,int c)", result.GetText (i1, i2 - i1));
 		}
 
@@ -1236,14 +1264,14 @@ return (Test)null;
 			
 			var result = GetResult (policy, @"delegate void Test (int a,int b,int c);");
 			
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"(int a, int b, int c)", result.GetText (i1, i2 - i1));
 			
 			policy.SpaceAfterDelegateDeclarationParameterComma = false;
 			result = GetResult (policy, result.Text);
-			i1 = result.Text.LastIndexOf ("(");
-			i2 = result.Text.LastIndexOf (")") + ")".Length;
+			i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"(int a,int b,int c)", result.GetText (i1, i2 - i1));
 		}
 
@@ -1254,8 +1282,8 @@ return (Test)null;
 			policy.SpaceWithinDelegateDeclarationParentheses = true;
 			var result = GetResult (policy, @"delegate void Test (int a);");
 			
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( int a )", result.GetText (i1, i2 - i1));
 		}
 
@@ -1266,8 +1294,8 @@ return (Test)null;
 			policy.SpaceBetweenEmptyDelegateDeclarationParentheses = true;
 			var result = GetResult (policy, @"delegate void Test();");
 			
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( )", result.GetText (i1, i2 - i1));
 		}
 
@@ -1311,14 +1339,14 @@ return (Test)null;
 		Test(a,b,c);
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"(a ,b ,c)", result.GetText (i1, i2 - i1));
 			
 			policy.SpaceBeforeMethodCallParameterComma = false;
 			result = GetResult (policy, result.Text);
-			i1 = result.Text.LastIndexOf ("(");
-			i2 = result.Text.LastIndexOf (")") + ")".Length;
+			i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"(a,b,c)", result.GetText (i1, i2 - i1));
 		}
 
@@ -1336,14 +1364,14 @@ return (Test)null;
 		Test(a,b,c);
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"(a, b, c)", result.GetText (i1, i2 - i1));
 			
 			policy.SpaceAfterMethodCallParameterComma = false;
 			result = GetResult (policy, result.Text);
-			i1 = result.Text.LastIndexOf ("(");
-			i2 = result.Text.LastIndexOf (")") + ")".Length;
+			i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"(a,b,c)", result.GetText (i1, i2 - i1));
 		}
 
@@ -1360,8 +1388,8 @@ return (Test)null;
 		Test(a);
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( a )", result.GetText (i1, i2 - i1));
 		}
 
@@ -1378,8 +1406,8 @@ return (Test)null;
 		Test();
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("(");
-			int i2 = result.Text.LastIndexOf (")") + ")".Length;
+			int i1 = result.Text.LastIndexOf("(", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(")", System.StringComparison.Ordinal) + ")".Length;
 			Assert.AreEqual (@"( )", result.GetText (i1, i2 - i1));
 		}
 
@@ -1426,8 +1454,8 @@ return (Test)null;
 		}
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("[");
-			int i2 = result.Text.LastIndexOf ("]") + "]".Length;
+			int i1 = result.Text.LastIndexOf("[", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf("]", System.StringComparison.Ordinal) + "]".Length;
 			Assert.AreEqual (@"[int a ,int b]", result.GetText (i1, i2 - i1));
 
 		}
@@ -1446,8 +1474,8 @@ return (Test)null;
 		}
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("[");
-			int i2 = result.Text.LastIndexOf ("]") + "]".Length;
+			int i1 = result.Text.LastIndexOf("[", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf("]", System.StringComparison.Ordinal) + "]".Length;
 			Assert.AreEqual (@"[int a, int b]", result.GetText (i1, i2 - i1));
 		}
 
@@ -1465,8 +1493,8 @@ return (Test)null;
 		}
 	}
 }");
-			int i1 = result.Text.LastIndexOf ("[");
-			int i2 = result.Text.LastIndexOf ("]") + "]".Length;
+			int i1 = result.Text.LastIndexOf("[", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf("]", System.StringComparison.Ordinal) + "]".Length;
 			Assert.AreEqual (@"[ int a, int b ]", result.GetText (i1, i2 - i1));
 		}
 
@@ -1537,8 +1565,8 @@ return (Test)null;
 	}
 }");
 			
-			int i1 = result.Text.LastIndexOf ("[");
-			int i2 = result.Text.LastIndexOf ("]") + "]".Length;
+			int i1 = result.Text.LastIndexOf("[", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf("]", System.StringComparison.Ordinal) + "]".Length;
 			Assert.AreEqual (@"[1 ,2 ,3]", result.GetText (i1, i2 - i1));
 		}
 
@@ -1555,8 +1583,8 @@ return (Test)null;
 	}
 }");
 			
-			int i1 = result.Text.LastIndexOf ("[");
-			int i2 = result.Text.LastIndexOf ("]") + "]".Length;
+			int i1 = result.Text.LastIndexOf("[", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf("]", System.StringComparison.Ordinal) + "]".Length;
 			Assert.AreEqual (@"[1, 2, 3]", result.GetText (i1, i2 - i1));
 		}
 
@@ -1593,8 +1621,8 @@ return (Test)null;
 		Foo ()        ;
 	}
 }");
-			int i1 = result.Text.IndexOf("Foo");
-			int i2 = result.Text.LastIndexOf(";") + ";".Length;
+			int i1 = result.Text.IndexOf("Foo", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual(@"Foo ();", result.GetText(i1, i2 - i1));
 		}
 
@@ -1609,8 +1637,8 @@ return (Test)null;
 		Foo (bar:expr);
 	}
 }");
-			int i1 = result.Text.IndexOf("Foo");
-			int i2 = result.Text.LastIndexOf(";") + ";".Length;
+			int i1 = result.Text.IndexOf("Foo", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual(@"Foo (bar: expr);", result.GetText(i1, i2 - i1));
 		}
 
@@ -1625,15 +1653,120 @@ return (Test)null;
 		Foo (bar:                      expr);
 	}
 }");
-			int i1 = result.Text.IndexOf("Foo");
-			int i2 = result.Text.LastIndexOf(";") + ";".Length;
+			int i1 = result.Text.IndexOf("Foo", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf(";", System.StringComparison.Ordinal) + ";".Length;
 			Assert.AreEqual(@"Foo (bar:expr);", result.GetText(i1, i2 - i1));
 		}
 
+		[Test]
+		public void TestSpaceAroundOptionalArgumentAssignment ()
+		{
+			var policy = FormattingOptionsFactory.CreateMono ();
 
+			var result = GetResult (policy, "class Test { void TestMe (int x=0) {  } }");
 
+			int i1 = result.Text.IndexOf("x", System.StringComparison.Ordinal);
+			int i2 = result.Text.IndexOf("0", System.StringComparison.Ordinal) + "0".Length;
+			if (i1 < 0 || i2 < 0)
+				Assert.Fail ("text invalid:" + result.Text);
+			Assert.AreEqual ("x = 0", result.GetText (i1, i2 - i1));
+		}
+
+		[Test]
+		public void TestSpaceAroundUsingAliasAssignment ()
+		{
+			var policy = FormattingOptionsFactory.CreateMono ();
+
+			var result = GetResult (policy, "using foo=bar;");
+
+			int i1 = result.Text.IndexOf("foo", System.StringComparison.Ordinal);
+			int i2 = result.Text.IndexOf("bar", System.StringComparison.Ordinal) + "bar".Length;
+			if (i1 < 0 || i2 < 0)
+				Assert.Fail ("text invalid:" + result.Text);
+			Assert.AreEqual ("foo = bar", result.GetText (i1, i2 - i1));
+		}
+
+		[Test]
+		public void TestSpaceAroundNamedExpressionAssignment ()
+		{
+			var policy = FormattingOptionsFactory.CreateMono ();
+
+			var result = GetResult (policy, "[MyAttr(foo=0)] class A{ }");
+
+			int i1 = result.Text.IndexOf("foo", System.StringComparison.Ordinal);
+			int i2 = result.Text.IndexOf("0", System.StringComparison.Ordinal) + "0".Length;
+			if (i1 < 0 || i2 < 0)
+				Assert.Fail ("text invalid:" + result.Text);
+			Assert.AreEqual ("foo = 0", result.GetText (i1, i2 - i1));
+		}
+
+		[Test]
+		public void TestSpaceAroundObjectInitializerAssignment ()
+		{
+			var policy = FormattingOptionsFactory.CreateMono ();
+
+			var result = GetResult (policy, "class A{ void Test () { new B { foo=bar }; } }");
+
+			int i1 = result.Text.IndexOf("foo", System.StringComparison.Ordinal);
+			int i2 = result.Text.IndexOf("bar", System.StringComparison.Ordinal) + "bar".Length;
+			if (i1 < 0 || i2 < 0)
+				Assert.Fail ("text invalid:" + result.Text);
+			Assert.AreEqual ("foo = bar", result.GetText (i1, i2 - i1));
+		}
+
+
+		[Test]
+		public void TestSpaceAfterUnsafeAddressOfOperator ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			policy.SpaceAfterUnsafeAddressOfOperator = true;
+
+			var result = GetResult (policy, @"unsafe class Test {
+	void TestMe ()
+	{
+		int* a = &x;
+	}
+}");
+			int i1 = result.Text.LastIndexOf("&", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf("x", System.StringComparison.Ordinal) + "x".Length;
+			Assert.AreEqual (@"& x", result.GetText (i1, i2 - i1));
+		}
+
+		[Test]
+		public void TestSpaceAfterUnsafeAsteriskOfOperator ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			policy.SpaceAfterUnsafeAsteriskOfOperator = true;
+
+			var result = GetResult (policy, @"unsafe class Test {
+	void TestMe ()
+	{
+		int a = *x;
+	}
+}");
+			int i1 = result.Text.LastIndexOf("*", System.StringComparison.Ordinal);
+			int i2 = result.Text.LastIndexOf("x", System.StringComparison.Ordinal) + "x".Length;
+			Assert.AreEqual (@"* x", result.GetText (i1, i2 - i1));
+		}
+
+		[Test]
+		public void TestSpaceAroundUnsafeArrowOperator ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			policy.SpaceAroundUnsafeArrowOperator = true;
+
+			var result = GetResult (policy, @"unsafe class Test {
+	void TestMe ()
+	{
+		x->Foo ();
+	}
+}");
+			var txt = result.Text;
+			int i1 = txt.LastIndexOf("x", System.StringComparison.Ordinal);
+			int i2 = txt.LastIndexOf(";", System.StringComparison.Ordinal) + ";".Length;
+			Assert.AreEqual (@"x -> Foo ();", txt.Substring (i1, i2 - i1));
+		}
 
 
-		
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestStatementIndentation.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestStatementIndentation.cs
index 17b965c339..392e4cca21 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestStatementIndentation.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestStatementIndentation.cs
@@ -1,21 +1,21 @@
-// 
+//
 // TestStatementIndentation.cs
-//  
+//
 // Author:
 //       Mike Krüger <mkrueger@novell.com>
-// 
+//
 // Copyright (c) 2010 Novell, Inc (http://www.novell.com)
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,7 +23,6 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-
 using System;
 using System.IO;
 using NUnit.Framework;
@@ -35,19 +34,19 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 	public class TestStatements : TestBase
 	{
 		[Test]
-		public void TestInvocationIndentation ()
+		public void TestInvocationIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy,
-@"class Test {
+			Test(policy,
+			     @"class Test {
 	Test TestMethod ()
 	{
 this.TestMethod ();
 	}
 }",
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		this.TestMethod ();
@@ -56,13 +55,13 @@ this.TestMethod ();
 		}
 
 		[Test]
-		public void TestIndentBlocks ()
+		public void TestIndentBlocks()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.IndentBlocks = true;
 			
-			var adapter = Test (policy,
-@"class Test {
+			var adapter = Test(policy,
+			                   @"class Test {
 	Test TestMethod ()
 	{
 {
@@ -70,7 +69,7 @@ this.TestMethod ();
 }
 	}
 }",
-@"class Test
+			                   @"class Test
 {
 	Test TestMethod ()
 	{
@@ -80,7 +79,7 @@ this.TestMethod ();
 	}
 }");
 			policy.IndentBlocks = false;
-			Continue (policy, adapter, @"class Test
+			Continue(policy, adapter, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -90,15 +89,15 @@ this.TestMethod ();
 	}
 }");
 		}
-		
+
 		[Test]
-		public void TestIndentBlocksCase2 ()
+		public void TestIndentBlocksCase2()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.IndentBlocks = true;
 			
-			var adapter = Test (policy,
-@"class Test {
+			var adapter = Test(policy,
+			                   @"class Test {
 	Test TestMethod ()
 	{
 		if (true) {
@@ -106,7 +105,7 @@ this.TestMethod ();
 		}
 	}
 }",
-@"class Test
+			                   @"class Test
 {
 	Test TestMethod ()
 	{
@@ -116,7 +115,7 @@ this.TestMethod ();
 	}
 }");
 			policy.IndentBlocks = false;
-			Continue (policy, adapter, @"class Test
+			Continue(policy, adapter, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -128,19 +127,19 @@ this.TestMethod ();
 		}
 
 		[Test]
-		public void TestBreakIndentation ()
+		public void TestBreakIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, 
-@"class Test {
+			Test(policy, 
+			     @"class Test {
 	Test TestMethod ()
 	{
                               break;
 	}
 }",
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		break;
@@ -149,19 +148,19 @@ this.TestMethod ();
 		}
 
 		[Test]
-		public void TestBreakSemicolon ()
+		public void TestBreakSemicolon()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 
-			Test (policy, 
-@"class Test
+			Test(policy, 
+			     @"class Test
 {
 	Test TestMethod ()
 	{
 		break     ;
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -171,13 +170,13 @@ this.TestMethod ();
 		}
 
 		[Test]
-		public void TestCheckedIndentation ()
+		public void TestCheckedIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
 			
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 checked {
@@ -193,12 +192,12 @@ checked {
 		}
 
 		[Test]
-		public void TestBaseIndentation ()
+		public void TestBaseIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
                               base.FooBar();
@@ -212,19 +211,19 @@ checked {
 		}
 
 		[Test]
-		public void TestUncheckedIndentation ()
+		public void TestUncheckedIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 unchecked {
 }
 	}
 }", 
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		unchecked {
@@ -234,18 +233,18 @@ unchecked {
 		}
 
 		[Test]
-		public void TestContinueIndentation ()
+		public void TestContinueIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 continue;
 	}
 }",
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		continue;
@@ -254,17 +253,17 @@ continue;
 		}
 
 		[Test]
-		public void TestContinueSemicolon ()
+		public void TestContinueSemicolon()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
-			Test (policy, @"class Test
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
 		continue ;
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -274,12 +273,12 @@ continue;
 		}
 
 		[Test]
-		public void TestEmptyStatementIndentation ()
+		public void TestEmptyStatementIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 ;
@@ -293,19 +292,19 @@ continue;
 		}
 
 		[Test]
-		public void TestFixedStatementIndentation ()
+		public void TestFixedStatementIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 fixed (object* obj = &obj)
 ;
 	}
 }",
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		fixed (object* obj = &obj)
@@ -315,12 +314,12 @@ fixed (object* obj = &obj)
 		}
 
 		[Test]
-		public void TestForeachIndentation ()
+		public void TestForeachIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.StatementBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -338,13 +337,13 @@ foreach (var obj in col) {
 		}
 
 		[Test]
-		public void TestForIndentation ()
+		public void TestForIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 for (;;) {
@@ -360,18 +359,43 @@ for (;;) {
 		}
 
 		[Test]
-		public void TestGotoIndentation ()
+		public void TestForInitializerIteratorConditionFormatting ()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			var policy = FormattingOptionsFactory.CreateMono ();
+			Test (policy, @"
+class Test
+{
+	void Init ()
+	{
+		for (int i     =        12; i <           10; i               ++) {
+		}
+	}
+}", @"
+class Test
+{
+	void Init ()
+	{
+		for (int i = 12; i < 10; i++) {
+		}
+	}
+}");
+		}
+
+
+
+		[Test]
+		public void TestGotoIndentation()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 goto label;
 	}
 }",
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		goto label;
@@ -380,10 +404,10 @@ goto label;
 		}
 
 		[Test]
-		public void TestGotoSemicolon ()
+		public void TestGotoSemicolon()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
-			Test (policy, @"class Test
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -391,7 +415,7 @@ goto label;
 ;
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -401,18 +425,18 @@ goto label;
 		}
 
 		[Test]
-		public void TestReturnIndentation ()
+		public void TestReturnIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 		return;
 	}
 }",
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		return;
@@ -421,17 +445,17 @@ goto label;
 		}
 
 		[Test]
-		public void TestReturnSemicolon ()
+		public void TestReturnSemicolon()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
-			Test (policy, @"class Test
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
 		return ;
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -439,20 +463,21 @@ goto label;
 	}
 }");
 		}
+
 		[Test]
-		public void TestLockIndentation ()
+		public void TestLockIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 lock (this) {
 }
 	}
 }",
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		lock (this) {
@@ -462,19 +487,19 @@ lock (this) {
 		}
 
 		[Test]
-		public void TestThrowIndentation ()
+		public void TestThrowIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 throw new NotSupportedException ();
 	}
 }",
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		throw new NotSupportedException ();
@@ -483,17 +508,17 @@ throw new NotSupportedException ();
 		}
 
 		[Test]
-		public void TestThrowSemicolon ()
+		public void TestThrowSemicolon()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
-			Test (policy, @"class Test
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
 		throw new NotSupportedException () 	 ;
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -503,20 +528,20 @@ throw new NotSupportedException ();
 		}
 
 		[Test]
-		public void TestUnsafeIndentation ()
+		public void TestUnsafeIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 unsafe {
 }
 	}
 }",
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		unsafe {
@@ -526,74 +551,99 @@ unsafe {
 		}
 
 		[Test]
-		public void TestUsingIndentation ()
+		public void TestUsingIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
-using (var o = new MyObj()) {
+using (var o = new MyObj ()) {
 }
 	}
 }", @"class Test {
 	Test TestMethod ()
 	{
-		using (var o = new MyObj()) {
+		using (var o = new MyObj ()) {
 		}
 	}
 }");
 		}
 
 		[Test]
-		public void TestUsingAlignment ()
+		public void TestUsingAlignment()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.AlignEmbeddedUsingStatements = true;
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			var adapter = Test (policy, @"class Test {
+			var adapter = Test(policy, @"class Test {
 	Test TestMethod ()
 	{
-using (var p = new MyObj())
-using (var o = new MyObj()) {
+using (var p = new MyObj ())
+using (var o = new MyObj ()) {
 }
 	}
 }",
-@"class Test {
+			                   @"class Test {
 	Test TestMethod ()
 	{
-		using (var p = new MyObj())
-		using (var o = new MyObj()) {
+		using (var p = new MyObj ())
+		using (var o = new MyObj ()) {
 		}
 	}
 }");
 			policy.AlignEmbeddedUsingStatements = false;
-			Continue (policy, adapter, @"class Test {
+			Continue(policy, adapter, @"class Test {
 	Test TestMethod ()
 	{
-		using (var p = new MyObj())
-			using (var o = new MyObj()) {
+		using (var p = new MyObj ())
+			using (var o = new MyObj ()) {
 			}
 	}
 }");
 		}
 
 		[Test]
-		public void TestVariableDeclarationIndentation ()
+		public void TestUsingExpressionFormatting ()
+		{
+			var policy = FormattingOptionsFactory.CreateMono ();
+			Test (policy, @"
+class Test
+{
+	void Init ()
+	{
+		using (var o = new object(              )) {
+		}
+	}
+}", @"
+class Test
+{
+	void Init ()
+	{
+		using (var o = new object ()) {
+		}
+	}
+}");
+		}
+
+
+
+		[Test]
+		public void TestVariableDeclarationIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 Test a;
 	}
 }",
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		Test a;
@@ -602,18 +652,18 @@ Test a;
 		}
 
 		[Test]
-		public void TestConstantVariableDeclarationIndentation ()
+		public void TestConstantVariableDeclarationIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 const int a = 5;
 	}
 }",
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		const int a = 5;
@@ -622,18 +672,18 @@ const int a = 5;
 		}
 
 		[Test]
-		public void TestYieldReturnIndentation ()
+		public void TestYieldReturnIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 yield return null;
 	}
 }",
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		yield return null;
@@ -642,18 +692,18 @@ yield return null;
 		}
 
 		[Test]
-		public void TestYieldReturnSemicolon ()
+		public void TestYieldReturnSemicolon()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 		yield return null     ;
 	}
 }",
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		yield return null;
@@ -662,18 +712,18 @@ yield return null;
 		}
 
 		[Test]
-		public void TestYieldBreakIndentation ()
+		public void TestYieldBreakIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 yield break;
 	}
 }",
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		yield break;
@@ -682,39 +732,40 @@ yield break;
 		}
 
 		[Test]
-		public void TestYieldBreakSemicolon ()
+		public void TestYieldBreakSemicolon()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 		yield break      ;
 	}
 }",
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		yield break;
 	}
 }");
 		}
+
 		[Test]
-		public void TestWhileIndentation ()
+		public void TestWhileIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 while (true)
 ;
 	}
 }",
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		while (true)
@@ -724,19 +775,19 @@ while (true)
 		}
 
 		[Test]
-		public void TestDoWhileIndentation ()
+		public void TestDoWhileIndentation()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
-			Test (policy, @"class Test {
+			Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 do {
 } while (true);
 	}
 }",
-@"class Test {
+			     @"class Test {
 	Test TestMethod ()
 	{
 		do {
@@ -746,19 +797,42 @@ do {
 		}
 
 		[Test]
-		public void TestForeachBracketPlacement ()
+		public void TestDoWhileWithoutBrackets()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
+
+			Test(policy, @"class Test
+{
+	Test TestMethod ()
+	{
+do FooBar(); while (true);
+	}
+}",
+			     @"class Test
+{
+	Test TestMethod ()
+	{
+		do
+			FooBar ();
+		while (true);
+	}
+}");
+		}
+
+		[Test]
+		public void TestForeachBracketPlacement()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.StatementBraceStyle = BraceStyle.EndOfLine;
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
 		foreach (var obj in col) {}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -769,19 +843,19 @@ do {
 		}
 
 		[Test]
-		public void TestForeachBracketPlacement2 ()
+		public void TestForeachBracketPlacement2()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.StatementBraceStyle = BraceStyle.NextLineShifted2;
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
 		foreach (var obj in col) {;}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -794,20 +868,20 @@ do {
 		}
 
 		[Test]
-		public void TestIfBracketPlacement ()
+		public void TestIfBracketPlacement()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.StatementBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
 		if (true) {}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -818,13 +892,13 @@ do {
 		}
 
 		[Test]
-		public void TestAllowIfBlockInline ()
+		public void TestAllowIfBlockInline()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.StatementBraceStyle = BraceStyle.EndOfLine;
 			policy.AllowIfBlockInline = true;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -839,7 +913,7 @@ do {
 }");
 			
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -852,24 +926,7 @@ do {
 		if (true) { Foo (); }
 	}
 }");
-			
-			
-			Test (policy, @"class Test
-{
-	Test TestMethod ()
-	{
-		if (true) Foo ();
-	}
-}", @"class Test
-{
-	Test TestMethod ()
-	{
-		if (true) Foo ();
-	}
-}");
-			
-			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -877,7 +934,7 @@ do {
 			Foo ();
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -888,20 +945,20 @@ do {
 		}
 
 		[Test]
-		public void TestIfElseBracketPlacement ()
+		public void TestIfElseBracketPlacement()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.StatementBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
 		if (true) {} else {}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -913,13 +970,13 @@ do {
 		}
 
 		[Test]
-		public void TestIfAlignment ()
+		public void TestIfAlignment()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.AlignEmbeddedIfStatements = true;
 			policy.ClassBraceStyle = BraceStyle.EndOfLine;
 			
-			var adapter = Test (policy, @"class Test {
+			var adapter = Test(policy, @"class Test {
 	Test TestMethod ()
 	{
 if (a)
@@ -927,7 +984,7 @@ if (b) {
 }
 	}
 }",
-@"class Test {
+			                   @"class Test {
 	Test TestMethod ()
 	{
 		if (a)
@@ -936,7 +993,7 @@ if (b) {
 	}
 }");
 			policy.AlignEmbeddedIfStatements = false;
-			Continue (policy, adapter, @"class Test {
+			Continue(policy, adapter, @"class Test {
 	Test TestMethod ()
 	{
 		if (a)
@@ -946,12 +1003,11 @@ if (b) {
 }");
 		}
 
-		
 		[Test]
 		public void TestElseWithPreprocessorDirective()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	void TestMethod ()
 	{
@@ -963,7 +1019,7 @@ if (b) {
 				#endif
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	void TestMethod ()
 	{
@@ -983,7 +1039,7 @@ if (b) {
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.ElseNewLinePlacement = NewLinePlacement.NewLine;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -994,7 +1050,7 @@ if (b) {
 		}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1014,7 +1070,7 @@ if (b) {
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.ElseIfNewLinePlacement = NewLinePlacement.NewLine;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1025,7 +1081,7 @@ if (b) {
 		}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1045,7 +1101,7 @@ if (b) {
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.ElseNewLinePlacement = NewLinePlacement.SameLine;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1057,7 +1113,7 @@ if (b) {
 		}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1078,14 +1134,14 @@ if (b) {
 			policy.StatementBraceStyle = BraceStyle.EndOfLine;
 			policy.ElseIfNewLinePlacement = NewLinePlacement.SameLine; // for simple statements it must be new line.
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	void TestMethod ()
 	{
 		if (true) Call (); else Call ();
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	void TestMethod ()
 	{
@@ -1098,13 +1154,126 @@ if (b) {
 		}
 
 		[Test]
-		public void TestFixedBracketPlacement ()
+		public void TestIfElseIfCorrection()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateKRStyle();
+
+			Test(policy, @"class Test
+{
+	void TestMethod()
+	{
+		int i = 0;
+		if (i == 0) {
+		} else
+			if (i == 1) {
+		} else
+if (i == 2) {
+		} else                     if (i == 2)	
+		Foo();
+		else {
+		}
+	}
+}", @"class Test
+{
+	void TestMethod()
+	{
+		int i = 0;
+		if (i == 0) {
+		} else if (i == 1) {
+		} else if (i == 2) {
+		} else if (i == 2)
+			Foo();
+		else {
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestIfElseNewLine()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateKRStyle();
+			policy.ElseIfNewLinePlacement = NewLinePlacement.NewLine;
+			Test(policy, @"class Test
+{
+	void TestMethod()
+	{
+		int i = 0;
+		if (i == 0) {
+		} else
+			if (i == 1) {
+		} else
+if (i == 2) {
+		} else                     if (i == 2)	
+		Foo();
+		else {
+		}
+	}
+}", @"class Test
+{
+	void TestMethod()
+	{
+		int i = 0;
+		if (i == 0) {
+		} else
+		if (i == 1) {
+		} else
+		if (i == 2) {
+		} else
+		if (i == 2)
+			Foo();
+		else {
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestIfElseDoNotCare()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateKRStyle();
+			policy.ElseIfNewLinePlacement = NewLinePlacement.DoNotCare;
+			Test(policy, @"class Test
+{
+	void TestMethod()
+	{
+		int i = 0;
+		if (i == 0) {
+		} else
+			if (i == 1) {
+		} else
+if (i == 2) {
+		} else                     if (i == 2)	
+		Foo();
+		else {
+		}
+	}
+}", @"class Test
+{
+	void TestMethod()
+	{
+		int i = 0;
+		if (i == 0) {
+		} else
+		if (i == 1) {
+		} else
+		if (i == 2) {
+		} else if (i == 2)
+			Foo();
+		else {
+		}
+	}
+}");
+		}
+
+		[Test]
+		public void TestFixedBracketPlacement()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.StatementBraceStyle = BraceStyle.NextLineShifted;
 
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1113,7 +1282,7 @@ if (b) {
 ;}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1127,19 +1296,19 @@ if (b) {
 		}
 
 		[Test]
-		public void TestForBracketPlacement ()
+		public void TestForBracketPlacement()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.StatementBraceStyle = BraceStyle.EndOfLineWithoutSpace;
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
 		for (;;) {;}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1151,20 +1320,20 @@ if (b) {
 		}
 
 		[Test]
-		public void TestCheckedBracketPlacement ()
+		public void TestCheckedBracketPlacement()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.StatementBraceStyle = BraceStyle.EndOfLineWithoutSpace;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
 		checked {;}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1176,20 +1345,20 @@ if (b) {
 		}
 
 		[Test]
-		public void TestUncheckedBracketPlacement ()
+		public void TestUncheckedBracketPlacement()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.StatementBraceStyle = BraceStyle.EndOfLineWithoutSpace;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
 		unchecked {;}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1201,13 +1370,13 @@ if (b) {
 		}
 
 		[Test]
-		public void TestLockBracketPlacement ()
+		public void TestLockBracketPlacement()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.StatementBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1217,7 +1386,7 @@ if (b) {
 		}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1229,13 +1398,13 @@ if (b) {
 		}
 
 		[Test]
-		public void TestUnsafeBracketPlacement ()
+		public void TestUnsafeBracketPlacement()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.StatementBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1245,7 +1414,7 @@ if (b) {
 		}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1257,27 +1426,27 @@ if (b) {
 		}
 
 		[Test]
-		public void TestUsingBracketPlacement ()
+		public void TestUsingBracketPlacement()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.StatementBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
-		using (var e = new E())
+		using (var e = new E ())
 		{
 			;
 		}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
-		using (var e = new E()) {
+		using (var e = new E ()) {
 			;
 		}
 	}
@@ -1285,13 +1454,13 @@ if (b) {
 		}
 
 		[Test]
-		public void TestWhileBracketPlacement ()
+		public void TestWhileBracketPlacement()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.StatementBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1301,7 +1470,7 @@ if (b) {
 		}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1313,13 +1482,13 @@ if (b) {
 		}
 
 		[Test]
-		public void TestDoWhileBracketPlacement ()
+		public void TestDoWhileBracketPlacement()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.StatementBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1329,7 +1498,7 @@ if (b) {
 		} while (true);
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1341,22 +1510,22 @@ if (b) {
 		}
 
 		[Test]
-		public void TestSwitchFormatting1 ()
+		public void TestSwitchFormatting1()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.IndentSwitchBody = true;
 			policy.IndentCaseBody = true;
 			policy.IndentBreakStatements = true;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
 		switch (a) { case 1: case 2: DoSomething(); break; default: Foo (); break;}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1374,22 +1543,22 @@ if (b) {
 		}
 
 		[Test]
-		public void TestSwitchFormatting2 ()
+		public void TestSwitchFormatting2()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.IndentSwitchBody = false;
 			policy.IndentCaseBody = false;
 			policy.IndentBreakStatements = false;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
 		switch (a) { case 1: case 2: DoSomething(); break; default: Foo (); break;}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1405,17 +1574,16 @@ if (b) {
 	}
 }");
 		}
-		
-		
+
 		[Test]
-		public void TestSwitchIndentBreak ()
+		public void TestSwitchIndentBreak()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.IndentSwitchBody = true;
 			policy.IndentBreakStatements = true;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1430,7 +1598,7 @@ if (b) {
 		}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1448,7 +1616,7 @@ if (b) {
 			policy.IndentSwitchBody = true;
 			policy.IndentBreakStatements = false;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1463,7 +1631,7 @@ if (b) {
 		}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1480,22 +1648,21 @@ if (b) {
 }");
 		}
 
-
 		[Test]
-		public void TestTryCatchBracketPlacement ()
+		public void TestTryCatchBracketPlacement()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			
 			policy.StatementBraceStyle = BraceStyle.EndOfLine;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
 		try { ; } catch (Exception e) { } finally { }
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1515,7 +1682,7 @@ if (b) {
 			
 			policy.CatchNewLinePlacement = NewLinePlacement.NewLine;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1526,7 +1693,7 @@ if (b) {
 		}
 	}
 }",
-@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1546,7 +1713,7 @@ if (b) {
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 			policy.FinallyNewLinePlacement = NewLinePlacement.NewLine;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1557,7 +1724,7 @@ if (b) {
 		}
 	}
 }",
-	@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1578,7 +1745,7 @@ if (b) {
 			
 			policy.WhileNewLinePlacement = NewLinePlacement.NewLine;
 			
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1587,7 +1754,7 @@ if (b) {
 		} while (true);
 	}
 }",
-	@"class Test
+			     @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1600,11 +1767,11 @@ if (b) {
 		}
 
 		[Test]
-		public void TestBlockStatementWithComments ()
+		public void TestBlockStatementWithComments()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1628,11 +1795,11 @@ if (b) {
 		}
 
 		[Test]
-		public void TestBlockStatementWithPreProcessorDirective ()
+		public void TestBlockStatementWithPreProcessorDirective()
 		{
-			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
 
-			Test (policy, @"class Test
+			Test(policy, @"class Test
 {
 	Test TestMethod ()
 	{
@@ -1677,6 +1844,173 @@ using System;
 	}
 }");
 		}
-		
+
+		[Test]
+		public void TestEmbeddedStatementPlacement()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
+			policy.EmbeddedStatementPlacement = NewLinePlacement.SameLine;
+
+			Test(policy, @"class Test
+{
+	void MyTest ()
+	{
+		if (true)                 ;
+	}
+}", @"class Test
+{
+	void MyTest ()
+	{
+		if (true) ;
+	}
+}");
+
+			Test(policy, @"class Test
+{
+	void MyTest ()
+	{
+		if (true)
+			;
+	}
+}", @"class Test
+{
+	void MyTest ()
+	{
+		if (true) ;
+	}
+}");
+			policy.EmbeddedStatementPlacement = NewLinePlacement.NewLine;
+			Test(policy, @"class Test
+{
+	void MyTest ()
+	{
+		if (true) ;
+	}
+}", @"class Test
+{
+	void MyTest ()
+	{
+		if (true)
+			;
+	}
+}");
+		}
+
+		[Test]
+		public void AlignmentTest_DoWhile()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+
+			Test(policy, @"
+class Test
+{
+	void Foo ()
+	{
+		do {
+		} while(a <
+b);
+	}
+}
+", @"
+class Test
+{
+	void Foo ()
+	{
+		do {
+		} while(a <
+		        b);
+	}
+}
+");
+		}
+
+		[Test]
+		public void AlignmentTest_IfElse()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+
+			Test(policy, @"
+class Test
+{
+	void Foo ()
+	{
+		if (a 
+> b) {
+		}
+	}
+}
+", @"
+class Test
+{
+	void Foo ()
+	{
+		if (a
+		    > b) {
+		}
+	}
+}
+");
+		}
+
+		[Test]
+		public void AlignmentTest_While()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+
+			Test(policy, @"
+class Test
+{
+	void Foo()
+	{
+		while (a 
+> b) {
+		}
+	}
+}
+", @"
+class Test
+{
+	void Foo ()
+	{
+		while (a
+		       > b) {
+		}
+	}
+}
+");
+		}
+
+		[Ignore("fixme")]
+		[Test]
+		public void AlignmentTest_StackedIfElse_ElseIf()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+
+			Test(policy, @"
+class Foo
+{
+	void Test ()
+	{ 
+		if (true)
+			FooBar ();
+		else
+		if (true) {
+		}
+	}
+}
+", @"
+class Foo
+{
+	void Test ()
+	{ 
+		if (true)
+			FooBar ();
+		else 
+			if (true) {
+			}
+	}
+}
+");
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestTypeLevelIndentation.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestTypeLevelIndentation.cs
index 5325697972..c49ea16bd4 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestTypeLevelIndentation.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestTypeLevelIndentation.cs
@@ -49,6 +49,7 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 			Test(policy, @"// THE SOFTWARE.
 
 using    Foo   ;", @"// THE SOFTWARE.
+
 using Foo;");
 		}
 
@@ -69,13 +70,19 @@ using Foo;");
 			Test(policy,
 			      @"
 class Test {
+
     #region FooBar
+
     #endregion
+
 }",
 			      @"
 class Test {
+
 	#region FooBar
+
 	#endregion
+
 }");
 		}
 
@@ -103,8 +110,10 @@ class Test {
 			policy.ClassBraceStyle = BraceStyle.DoNotChange;
 
 			Test(policy,
-			     @"			class Test {}",
-			     @"class Test {}");
+			     @"			class Test {
+}",
+			     @"class Test {
+}");
 		}
 
 		[Test]
@@ -117,11 +126,13 @@ class Test {
 			     @"/// <summary>
 		/// olwcowcolwc
 		/// </summary>
-			class Test {}",
+			class Test {
+}",
 			     @"/// <summary>
 /// olwcowcolwc
 /// </summary>
-class Test {}");
+class Test {
+}");
 		}
 
 		[Test]
@@ -133,10 +144,12 @@ class Test {}");
 			Test(policy,
 			      @"					[Attribute1]
 		[Attribute2()]
-          class Test {}",
+          class Test {
+}",
 			      @"[Attribute1]
-[Attribute2()]
-class Test {}");
+[Attribute2 ()]
+class Test {
+}");
 		}
 
 		[Test]
@@ -147,9 +160,11 @@ class Test {}");
 			policy.ClassBraceStyle = BraceStyle.DoNotChange;
 			
 			Test(policy,
-			      @"namespace A { class Test {} }",
+			      @"namespace A { class Test {
+} }",
 			      @"namespace A {
-	class Test {}
+	class Test {
+}
 }");
 		}
 
@@ -162,9 +177,11 @@ class Test {}");
 			policy.IndentNamespaceBody = false;
 			
 			Test(policy,
-			      @"namespace A { class Test {} }",
+			      @"namespace A { class Test {
+} }",
 			      @"namespace A {
-class Test {}
+class Test {
+}
 }");
 		}
 
@@ -473,10 +490,8 @@ set;
 		public void TestIndentPropertyOneLine()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
-			policy.PropertyFormatting = PropertyFormatting.AllowOneLine;
-			policy.AllowPropertyGetBlockInline = true;
-			policy.AllowPropertySetBlockInline = true;
-			
+			policy.SimplePropertyFormatting = PropertyFormatting.AllowOneLine;
+
 			Test(policy,
 			      @"class Test
 {
@@ -492,10 +507,10 @@ set;
 		public void TestIndentPropertyOneLineCase2()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
-			policy.PropertyFormatting = PropertyFormatting.AllowOneLine;
-			policy.AllowPropertyGetBlockInline = true;
-			policy.AllowPropertySetBlockInline = true;
-			
+			policy.SimplePropertyFormatting = PropertyFormatting.AllowOneLine;
+			policy.SimpleGetBlockFormatting = PropertyFormatting.AllowOneLine;
+			policy.SimpleSetBlockFormatting = PropertyFormatting.AllowOneLine;
+
 			Test(policy,
 			      @"class Test
 {
@@ -552,10 +567,10 @@ set {
 		}
 
 		[Test]
-		public void TestPropertyAlignment()
+		public void TestAutoPropertyAlignment()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
-			policy.PropertyFormatting = PropertyFormatting.AllowOneLine;
+			policy.AutoPropertyFormatting = PropertyFormatting.AllowOneLine;
 			var adapter = Test(policy,
 			                    @"class Test
 {
@@ -565,7 +580,7 @@ set {
 {
 	Test TestMe { get; set; }
 }");
-			policy.PropertyFormatting = PropertyFormatting.ForceNewLine;
+			policy.AutoPropertyFormatting = PropertyFormatting.ForceNewLine;
 			Continue(policy, adapter,
 			          @"class Test
 {
@@ -574,7 +589,7 @@ set {
 		set;
 	}
 }");
-			policy.PropertyFormatting = PropertyFormatting.ForceOneLine;
+			policy.AutoPropertyFormatting = PropertyFormatting.ForceOneLine;
 			
 			Continue(policy, adapter,
 			          @"class Test
@@ -583,6 +598,58 @@ set {
 }");
 		}
 
+		[Test]
+		public void TestSimplePropertyAlignment()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
+			policy.SimplePropertyFormatting = PropertyFormatting.AllowOneLine;
+			var adapter = Test(policy,
+			                   @"class Test
+{
+	Test TestMe { get { ; } set { ; } }
+}",
+			                   @"class Test
+{
+	Test TestMe { get { ; } set { ; } }
+}");
+			policy.SimplePropertyFormatting = PropertyFormatting.ForceNewLine;
+			Continue(policy, adapter,
+			         @"class Test
+{
+	Test TestMe {
+		get { ; }
+		set { ; }
+	}
+}");
+			policy.SimplePropertyFormatting = PropertyFormatting.ForceOneLine;
+
+			Continue(policy, adapter,
+			         @"class Test
+{
+	Test TestMe { get { ; } set { ; } }
+}");
+		}
+
+
+		[Test]
+		public void TestClashingPropertyAlignment()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
+			policy.SimplePropertyFormatting = PropertyFormatting.ForceOneLine;
+			policy.SimpleGetBlockFormatting = PropertyFormatting.ForceNewLine;
+			Test(policy, @"class Test
+{
+	Test TestMe {
+		get { FooBar (); }
+	}
+}", @"class Test
+{
+	Test TestMe { get { FooBar (); } }
+}");
+		}
+
+
+
 		[Test]
 		public void TestIndentNamespaceBody()
 		{
@@ -592,16 +659,19 @@ set {
 			policy.IndentNamespaceBody = true;
 			var adapter = Test(policy,
 			                    @"			namespace Test {
-class FooBar {}
+class FooBar {
+}
 		}",
 			                    @"namespace Test {
-	class FooBar {}
+	class FooBar {
+}
 }");
 			
 			policy.IndentNamespaceBody = false;
 			Continue(policy, adapter,
 			          @"namespace Test {
-class FooBar {}
+class FooBar {
+}
 }");
 		}
 
@@ -695,10 +765,10 @@ set;
 		}
 
 		[Test]
-		public void TestPropertyCorrection()
+		public void TestAutoPropertyCorrection()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
-			policy.PropertyFormatting = PropertyFormatting.ForceNewLine;
+			policy.AutoPropertyFormatting = PropertyFormatting.ForceNewLine;
 			Test(policy, 
 			     @"class Test
 {
@@ -712,6 +782,24 @@ set;
 }");
 		}
 
+		[Test]
+		public void TestSimplePropertyCorrection()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
+			policy.SimplePropertyFormatting = PropertyFormatting.ForceNewLine;
+			Test(policy, 
+			     @"class Test
+{
+				public int Prop { get { ; }         private set {; } }
+}", @"class Test
+{
+	public int Prop {
+		get { ; }
+		private set { ; }
+	}
+}");
+		}
+
 		[Test]
 		public void TestEventField()
 		{
@@ -783,7 +871,7 @@ remove {
 		public void TestBug9990()
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
-			policy.PropertyFormatting = PropertyFormatting.ForceNewLine;
+			policy.SimplePropertyFormatting = PropertyFormatting.ForceNewLine;
 			Test(policy, 
 			     @"class Test
 {
@@ -794,5 +882,144 @@ remove {
 	public event EventHandler<UpdateFinishedEventArgs> UpdateFinished = delegate { };
 }");
 		}
+
+		[Test]
+		public void TestPropertyOneLineCorrection()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
+
+			Test(policy,
+			      @"class Test
+{
+	int test { get { return test;}
+set { test = value; } }
+}",
+			      @"class Test
+{
+	int test { get { return test; } set { test = value; } }
+}");
+		}
+
+		[Test]
+		public void TestConstructorInitializer()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+			Test(policy, @"
+class Foo
+{
+	public Foo ():         base         (0)
+	{
+	}
+}
+", @"
+class Foo
+{
+	public Foo () : base (0)
+	{
+	}
+}
+");
+		}
+		[Test]
+		public void TestConstructorInitializerCase2()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+			Test(policy, @"
+class Foo
+{
+public Foo ()         :
+base         (0)
+{
+}
+}
+", @"
+class Foo
+{
+	public Foo () :
+		base (0)
+	{
+	}
+}
+");
+		}
+
+		[Test]
+		public void TestIndentPreprocessorStatementsAdd()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
+			policy.IndentPreprocessorDirectives = true;
+			
+			Test(policy,
+			     @"class Test
+{
+#region DEBUG
+#endregion
+}", @"class Test
+{
+
+	#region DEBUG
+
+	#endregion
+
+}");
+		}
+	
+		[Test]
+		public void TestIndentPreprocessorStatementsRemove()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
+			policy.IndentPreprocessorDirectives = false;
+			
+			Test(policy,
+			     @"class Test
+{
+
+	#region DEBUG
+
+	#endregion
+
+}", @"class Test
+{
+
+#region DEBUG
+
+#endregion
+
+}");
+		}
+
+
+		[Test]
+		public void TestCollectionFieldInitializer ()
+		{
+			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
+
+			Test(policy, 
+@"using System.Collections.Generic;
+
+class Foo
+{
+new Dictionary<int,int> o = new Dictionary<int,int> () { 
+		{1, 2 },
+	{1, 2 },
+				{1, 2 },
+		{1, 2 }
+				}; 
+}
+", 
+@"using System.Collections.Generic;
+
+class Foo
+{
+	new Dictionary<int,int> o = new Dictionary<int,int> () { 
+		{ 1, 2 },
+		{ 1, 2 },
+		{ 1, 2 },
+		{ 1, 2 }
+	};
+}
+");
+		}
+
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestWrapping.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestWrapping.cs
index 4d1d387f35..e34eb627ad 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestWrapping.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TestWrapping.cs
@@ -201,6 +201,7 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 			policy.MethodCallArgumentWrapping = Wrapping.WrapAlways;
 			policy.NewLineAferMethodCallOpenParentheses = NewLinePlacement.SameLine;
 			policy.MethodCallClosingParenthesesOnNewLine = NewLinePlacement.SameLine;
+			policy.AlignToFirstMethodCallArgument = true;
 
 			Test(policy, @"class Test
 {
@@ -553,6 +554,7 @@ int j,
 			policy.MethodCallArgumentWrapping = Wrapping.DoNotChange;
 			policy.NewLineAferMethodCallOpenParentheses = NewLinePlacement.NewLine;
 			policy.MethodCallClosingParenthesesOnNewLine = NewLinePlacement.NewLine;
+			policy.AlignToFirstMethodCallArgument = true;
 
 			Test(policy, @"class Test
 {
@@ -583,6 +585,7 @@ int j,
 			policy.MethodCallArgumentWrapping = Wrapping.DoNotChange;
 			policy.NewLineAferMethodCallOpenParentheses = NewLinePlacement.NewLine;
 			policy.MethodCallClosingParenthesesOnNewLine = NewLinePlacement.NewLine;
+			policy.AlignToFirstMethodCallArgument = true;
 
 			Test(policy, @"class Test
 {
@@ -609,7 +612,7 @@ int j,
 		{
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
 
-			var adapter = Test (policy, @"class Test
+			Test (policy, @"class Test
 {
 	int Foo (int i, double d, Action a)
 	{
@@ -631,7 +634,7 @@ int j,
 			CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono ();
 			policy.BlankLinesBetweenMembers = 1;
 
-			var adapter = Test (policy, @"class Test
+			Test (policy, @"class Test
 {
 	int Foo (int i, double d, Action a)
 	{
@@ -870,6 +873,7 @@ int foo)
 		public void TestWrappingWithSpaceIndent()
 		{
 			var policy = FormattingOptionsFactory.CreateMono();
+			policy.AlignToFirstMethodCallArgument = true;
 
 			TextEditorOptions options = new TextEditorOptions();
 			options.IndentSize = options.TabSize = 2;
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TextEditorTestAdapter.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TextEditorTestAdapter.cs
index 577ff7d8e3..7c6711b383 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TextEditorTestAdapter.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/FormattingTests/TextEditorTestAdapter.cs
@@ -11,6 +11,7 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 {
 	public abstract class TestBase
 	{
+
 		/*public static string ApplyChanges (string text, List<TextReplaceAction> changes)
 		{
 			changes.Sort ((x, y) => y.Offset.CompareTo (x.Offset));
@@ -28,24 +29,50 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 			return b.ToString();
 		}*/
 		
-		protected static IDocument GetResult(CSharpFormattingOptions policy, string input, FormattingMode mode = FormattingMode.Intrusive, TextEditorOptions options = null)
+		static TextEditorOptions GetActualOptions(TextEditorOptions options)
 		{
 			if (options == null) {
 				options = new TextEditorOptions();
 				options.EolMarker = "\n";
 				options.WrapLineLength = 80;
 			}
+			return options;
+		}
 
-
+		protected static FormattingChanges GetChanges(CSharpFormattingOptions policy, string input, out StringBuilderDocument document, FormattingMode mode = FormattingMode.Intrusive, TextEditorOptions options = null)
+		{
+			options = GetActualOptions(options);
 			input = NormalizeNewlines(input);
-			var document = new StringBuilderDocument(input);
-			var visitor = new CSharpFormatter (policy, options);
+
+			document = new StringBuilderDocument(input);
+			var visitor = new CSharpFormatter(policy, options);
 			visitor.FormattingMode = mode;
-			var syntaxTree = new CSharpParser ().Parse (document, "test.cs");
-			var changes = visitor.AnalyzeFormatting(document, syntaxTree);
+			var syntaxTree = new CSharpParser().Parse(document, "test.cs");
+
+			return visitor.AnalyzeFormatting(document, syntaxTree);
+		}
+
+		protected static IDocument GetResult(CSharpFormattingOptions policy, string input, FormattingMode mode = FormattingMode.Intrusive, TextEditorOptions options = null)
+		{
+			StringBuilderDocument document;
+			var changes = GetChanges(policy, input, out document, mode, options);
+			
 			changes.ApplyChanges();
 			return document;
 		}
+
+		protected static FormattingChanges GetChanges(CSharpFormattingOptions policy, string input, FormattingMode mode = FormattingMode.Intrusive, TextEditorOptions options = null)
+		{
+			StringBuilderDocument document;
+			return GetChanges(policy, input, out document, mode, options);
+		}
+
+		protected static void TestNoUnnecessaryChanges(CSharpFormattingOptions policy, string input, FormattingMode mode = FormattingMode.Intrusive, TextEditorOptions options = null)
+		{
+			var formatted = GetResult(policy, input, mode, options).Text;
+			var changes = GetChanges(policy, formatted, mode, options);
+			Assert.AreEqual(0, changes.Count, "Wrong amount of changes");
+		}
 		
 		protected static IDocument Test (CSharpFormattingOptions policy, string input, string expectedOutput, FormattingMode mode = FormattingMode.Intrusive, TextEditorOptions options = null)
 		{
@@ -89,7 +116,10 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 			formatter.FormattingMode = formattingMode;
 			string newText = formatter.Format (document);
 			if (expectedOutput != newText) {
-				Console.WriteLine (newText);
+				Console.WriteLine("expected:");
+				Console.WriteLine(expectedOutput);
+				Console.WriteLine("got:");
+				Console.WriteLine(newText);
 			}
 			Assert.AreEqual (expectedOutput, newText);
 		}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj
index 8bf7a1b19a..005628ea37 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj
@@ -1,455 +1,679 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <PropertyGroup>
-    <ProjectGuid>{63D3B27A-D966-4902-90B3-30290E1692F1}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <OutputType>Library</OutputType>
-    <RootNamespace>ICSharpCode.NRefactory</RootNamespace>
-    <AssemblyName>ICSharpCode.NRefactory.Tests</AssemblyName>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <NoStdLib>False</NoStdLib>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <OutputPath>..\bin\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>Full</DebugType>
-    <Optimize>False</Optimize>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugType>PdbOnly</DebugType>
-    <Optimize>True</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>4194304</BaseAddress>
-    <FileAlignment>4096</FileAlignment>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>4194304</BaseAddress>
-    <FileAlignment>4096</FileAlignment>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Debug' ">
-    <DebugType>Full</DebugType>
-    <Optimize>False</Optimize>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG;TRACE;NET_4_5</DefineConstants>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Release' ">
-    <DebugType>PdbOnly</DebugType>
-    <Optimize>True</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>TRACE;NET_4_5</DefineConstants>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <DebugSymbols>false</DebugSymbols>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|x86' ">
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|x86' ">
-    <DebugType>none</DebugType>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\cecil\Test\libs\nunit-2.5.10\nunit.framework.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Analysis\AbiComparerTests.cs" />
-    <Compile Include="CSharp\Analysis\DefiniteAssignmentTests.cs" />
-    <Compile Include="CSharp\AstStructureTests.cs" />
-    <Compile Include="CSharp\CodeActions\AddUsing\AddUsingActionAlphabeticalTests.cs" />
-    <Compile Include="CSharp\CodeActions\AddUsing\AddUsingActionInsideNamespaceTests.cs" />
-    <Compile Include="CSharp\CodeActions\AddUsing\AddUsingRunActionTests.cs" />
-    <Compile Include="CSharp\CodeActions\AddUsing\AddUsingActionTests.cs" />
-    <Compile Include="CSharp\CodeActions\ConvertAsToCastTests.cs" />
-    <Compile Include="CSharp\CodeActions\ConvertCastToAsTests.cs" />
-    <Compile Include="CSharp\CodeActions\ConvertConditionalToIfTests.cs" />
-    <Compile Include="CSharp\CodeActions\ConvertExplicitToImplicitImplementationTests.cs" />
-    <Compile Include="CSharp\CodeActions\ConvertIfToConditionalTests.cs" />
-    <Compile Include="CSharp\CodeActions\ConvertIfToSwtichTests.cs" />
-    <Compile Include="CSharp\CodeActions\ConvertImplicitToExplicittImplementationTests.cs" />
-    <Compile Include="CSharp\CodeActions\ConvertLambdaBodyExpressionToStatementTests.cs" />
-    <Compile Include="CSharp\CodeActions\ConvertLambdaBodyStatementToExpressionTests.cs" />
-    <Compile Include="CSharp\CodeActions\ConvertSwitchToIfTests.cs" />
-    <Compile Include="CSharp\CodeActions\CreateCustomEventImplementationTests.cs" />
-    <Compile Include="CSharp\CodeActions\CreateOverloadWithoutParameterTests.cs" />
-    <Compile Include="CSharp\CodeActions\ExtractAnonymousMethodTests.cs" />
-    <Compile Include="CSharp\CodeActions\JoinDeclarationAndAssignmentTests.cs" />
-    <Compile Include="CSharp\CodeActions\JoinStringTests.cs" />
-    <Compile Include="CSharp\CodeActions\MergeNestedIfTests.cs" />
-    <Compile Include="CSharp\CodeActions\NegateRelationalExpressionTests.cs" />
-    <Compile Include="CSharp\CodeActions\PutInsideUsingTests.cs" />
-    <Compile Include="CSharp\CodeActions\SplitDeclarationListTests.cs" />
-    <Compile Include="CSharp\CodeActions\UseStringFormatTests.cs" />
-    <Compile Include="CSharp\CodeIssues\AccessToDisposedClosureTests.cs" />
-    <Compile Include="CSharp\CodeIssues\AccessToModifiedClosureTests.cs" />
-    <Compile Include="CSharp\CodeIssues\AssignmentMadeToSameVariableIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\BitwiseOperationOnNonFlagsEnumIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\CastExpressionOfIncompatibleTypeIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\CompareFloatWithEqualityOperatorIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ConstantConditionIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\DoubleNegationIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ExplicitConversionInForEachIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ExpressionIsAlwaysOfProvidedTypeIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ExpressionIsNeverOfProvidedTypeIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ForControlVariableNotModifiedIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\IdenticalConditionalBranchIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\LocalVariableHidesMemberIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\LocalVariableNotUsedIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\MethodNeverReturnsIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\MethodOverloadHidesOptionalParameterIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\MissingStringComparisonIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\MultipleEnumerationIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\NegativeRelationalExpressionIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ParameterHidesMemberIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ParameterNotUsedIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ParameterOnlyAssignedIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantArrayInitializerCommaIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantAssignmentIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\CompareBooleanWithTrueOrFalseIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantAttributeParenthesesIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantCaseLabelIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantElseIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantFieldInitializerIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantObjectCreationArgumentListIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantObjectOrCollectionInitializerIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantTypeCastIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ReferenceEqualsCalledWithValueTypeIssueTest.cs" />
-    <Compile Include="CSharp\CodeIssues\TypeParameterNotUsedIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\UnreachableCodeIssueTests.cs" />
-    <Compile Include="CSharp\CSharpAmbienceTests.cs" />
-    <Compile Include="CSharp\CodeDomConvertVisitorTests.cs" />
-    <Compile Include="CSharp\DepthFirstVisitorTests.cs" />
-    <Compile Include="CSharp\InsertParenthesesVisitorTests.cs" />
-    <Compile Include="CSharp\CSharpOutputVisitorTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\AnonymousTypeCreateExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\ObjectCreateExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\UndocumentedExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\GeneralScope\CommentTests.cs" />
-    <Compile Include="CSharp\Parser\GeneralScope\DelegateDeclarationTests.cs" />
-    <Compile Include="CSharp\Parser\GeneralScope\NamespaceDeclarationTests.cs" />
-    <Compile Include="CSharp\Parser\GeneralScope\PreprocessorDirectiveTests.cs" />
-    <Compile Include="CSharp\Parser\GeneralScope\TypeDeclarationTests.cs" />
-    <Compile Include="CSharp\Parser\GeneralScope\UsingDeclarationTests.cs" />
-    <Compile Include="CSharp\Parser\ParseSelfTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\BlockStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\CheckedStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\EmptyStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\ExpressionStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\FixedStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\ForStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\GotoStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\IfElseStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\LabelStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\LockStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\ReturnStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\SwitchStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\ThrowStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\TryCatchStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\UnsafeStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\UsingStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\VariableDeclarationStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\WhileStatementTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\YieldStatementTests.cs" />
-    <Compile Include="CSharp\Parser\TypeMembers\ConstructorDeclarationTests.cs" />
-    <Compile Include="CSharp\Parser\TypeMembers\DestructorDeclarationTests.cs" />
-    <Compile Include="CSharp\Parser\TypeMembers\EventDeclarationTests.cs" />
-    <Compile Include="CSharp\Parser\TypeMembers\FieldDeclarationTests.cs" />
-    <Compile Include="CSharp\Parser\TypeMembers\IndexerDeclarationTests.cs" />
-    <Compile Include="CSharp\Parser\TypeMembers\MethodDeclarationTests.cs" />
-    <Compile Include="CSharp\Parser\TypeMembers\OperatorDeclarationTests.cs" />
-    <Compile Include="CSharp\Parser\TypeMembers\PropertyDeclarationTests.cs" />
-    <Compile Include="CSharp\Parser\TypeSystemConvertVisitorTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\AnonymousMethodExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\ArrayCreateExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\AssignmentExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\BaseReferenceExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\BinaryOperatorExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\CastExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\CheckedExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\ConditionalExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\DefaultValueExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\IdentifierExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\IndexerExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\InvocationExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\IsExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\LambdaExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\MemberReferenceExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\ParenthesizedExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\PointerReferenceExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\PrimitiveExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\QueryExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\SizeOfExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\StackAllocExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\ThisReferenceExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\TypeOfExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\TypeReferenceExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\Expression\UnaryOperatorExpressionTests.cs" />
-    <Compile Include="CSharp\Parser\GeneralScope\AttributeSectionTests.cs" />
-    <Compile Include="CSharp\Parser\ParseUtil.cs" />
-    <Compile Include="CSharp\QueryExpressionExpanderTests.cs" />
-    <Compile Include="CSharp\Refactoring\RefactoringStructureTests.cs" />
-    <Compile Include="CSharp\Refactoring\TypeSystemAstBuilderTests.cs" />
-    <Compile Include="CSharp\Resolver\AnonymousTypeTests.cs" />
-    <Compile Include="CSharp\Resolver\ArrayCreateTests.cs" />
-    <Compile Include="CSharp\Resolver\AttributeTests.cs" />
-    <Compile Include="CSharp\Resolver\BinaryOperatorTests.cs" />
-    <Compile Include="CSharp\Resolver\CastTests.cs" />
-    <Compile Include="CSharp\Resolver\ComTests.cs" />
-    <Compile Include="CSharp\Resolver\ConditionalOperatorTests.cs" />
-    <Compile Include="CSharp\Resolver\SizeOfTests.cs" />
-    <Compile Include="CSharp\Resolver\DynamicTests.cs" />
-    <Compile Include="CSharp\Resolver\ExplicitConversionsTest.cs" />
-    <Compile Include="CSharp\Resolver\ExtensionMethodTests.cs" />
-    <Compile Include="CSharp\Resolver\FindReferencesTest.cs" />
-    <Compile Include="CSharp\Resolver\InvocationTests.cs" />
-    <Compile Include="CSharp\Resolver\LambdaTests.cs" />
-    <Compile Include="CSharp\Resolver\LinqTests.cs" />
-    <Compile Include="CSharp\Resolver\LocalTypeInferenceTests.cs" />
-    <Compile Include="CSharp\Resolver\MemberLookupTests.cs" />
-    <Compile Include="CSharp\Resolver\MethodTests.cs" />
-    <Compile Include="CSharp\Resolver\NameLookupTests.cs" />
-    <Compile Include="CSharp\Resolver\ObjectCreationTests.cs" />
-    <Compile Include="CSharp\Resolver\ResolveAtLocationTests.cs" />
-    <Compile Include="CSharp\Resolver\TypeInferenceTests.cs" />
-    <Compile Include="CSharp\Resolver\ConversionsTest.cs" />
-    <Compile Include="CSharp\Resolver\OverloadResolutionTests.cs" />
-    <Compile Include="CSharp\Resolver\ResolverTestBase.cs" />
-    <Compile Include="CSharp\Resolver\UnaryOperatorTests.cs" />
-    <Compile Include="CSharp\Resolver\UnsafeCodeTests.cs" />
-    <Compile Include="Documentation\CSharpCrefLookupTests.cs" />
-    <Compile Include="Documentation\CSharpCrefParserTests.cs" />
-    <Compile Include="Documentation\CSharpDocumentationTests.cs" />
-    <Compile Include="Documentation\IDStringTests.cs" />
-    <Compile Include="Editor\ReadOnlyDocumentTests.cs" />
-    <Compile Include="FormattingTests\TestBraceStlye.cs" />
-    <Compile Include="FormattingTests\TestFormattingBugs.cs" />
-    <Compile Include="FormattingTests\TestSpacingVisitor.cs" />
-    <Compile Include="FormattingTests\TestStatementIndentation.cs" />
-    <Compile Include="FormattingTests\TestTypeLevelIndentation.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TypeSystem\BlobLoaderTests.cs" />
-    <Compile Include="TypeSystem\CecilLoaderTests.cs" />
-    <Compile Include="TypeSystem\CyclicProjectDependency.cs" />
-    <Compile Include="TypeSystem\GetAllBaseTypesTest.cs" />
-    <Compile Include="TypeSystem\GetMembersTests.cs" />
-    <Compile Include="TypeSystem\LazyLoadedCecilLoaderTests.cs" />
-    <Compile Include="TypeSystem\ReflectionHelperTests.cs" />
-    <Compile Include="TypeSystem\SerializedCecilLoaderTests.cs" />
-    <Compile Include="TypeSystem\StructureTests.cs" />
-    <Compile Include="TypeSystem\TestInterningProvider.cs" />
-    <Compile Include="TypeSystem\TypeParameterTests.cs" />
-    <Compile Include="TypeSystem\TypeSystemHelper.cs" />
-    <Compile Include="TypeSystem\TypeSystemTests.cs" />
-    <Compile Include="TypeSystem\TypeSystemTests.TestCase.cs" />
-    <EmbeddedResource Include="TypeSystem\TypeSystemTests.TestCase.cs" />
-    <Compile Include="Utils\CSharpPrimitiveCastTests.cs" />
-    <Compile Include="Utils\TreeTraversalTests.cs" />
-    <Compile Include="FormattingTests\TextEditorTestAdapter.cs" />
-    <Compile Include="FormattingTests\TestBlankLineFormatting.cs" />
-    <Compile Include="CSharp\CodeCompletion\CodeCompletionAccessibleTests.cs" />
-    <Compile Include="CSharp\CodeCompletion\CodeCompletionBugTests.cs" />
-    <Compile Include="CSharp\CodeCompletion\CodeCompletionCSharp3Tests.cs" />
-    <Compile Include="CSharp\CodeCompletion\CodeCompletionCSharpTests.cs" />
-    <Compile Include="CSharp\CodeCompletion\CodeComplteionOperatorTests.cs" />
-    <Compile Include="CSharp\CodeCompletion\CompletionDataList.cs" />
-    <Compile Include="CSharp\CodeCompletion\EnumContextTests.cs" />
-    <Compile Include="CSharp\CodeCompletion\KeywordTests.cs" />
-    <Compile Include="CSharp\CodeCompletion\ObjectInitializerTests.cs" />
-    <Compile Include="CSharp\CodeCompletion\ParameterCompletionTests.cs" />
-    <Compile Include="CSharp\CodeCompletion\PreProcessorTests.cs" />
-    <Compile Include="CSharp\CodeCompletion\TestBase.cs" />
-    <Compile Include="CSharp\CodeCompletion\VariableDeclarationStatementTests.cs" />
-    <Compile Include="CSharp\CodeCompletion\NameContextTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ConditionalToNullCoalescingInspectorTests.cs" />
-    <Compile Include="CSharp\CodeIssues\InspectionActionTestBase.cs" />
-    <Compile Include="CSharp\CodeIssues\NotImplementedExceptionInspectorTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantInternalInspectorTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantNamespaceUsageInspectorTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantPrivateInspectorTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantThisInspectorTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantUsingInspectorTests.cs" />
-    <Compile Include="CSharp\CodeIssues\StringIsNullOrEmptyInspectorTests.cs" />
-    <Compile Include="CSharp\CodeIssues\UseVarKeywordInspectorTests.cs" />
-    <Compile Include="CSharp\CodeActions\UseVarKeywordTests.cs" />
-    <Compile Include="CSharp\CodeActions\TestRefactoringContext.cs" />
-    <Compile Include="CSharp\CodeActions\ContextActionTestBase.cs" />
-    <Compile Include="CSharp\CodeActions\UseExplicitTypeTests.cs" />
-    <Compile Include="CSharp\CodeActions\SplitDeclarationAndAssignmentTests.cs" />
-    <Compile Include="CSharp\CodeActions\SplitStringTests.cs" />
-    <Compile Include="CSharp\CodeActions\ReplaceEmptyStringTests.cs" />
-    <Compile Include="CSharp\CodeActions\RemoveBracesTests.cs" />
-    <Compile Include="CSharp\CodeActions\RemoveBackingStoreTests.cs" />
-    <Compile Include="CSharp\CodeActions\InvertIfTests.cs" />
-    <Compile Include="CSharp\CodeActions\IntroduceFormatItemTests.cs" />
-    <Compile Include="CSharp\CodeActions\InsertAnonymousMethodSignatureTests.cs" />
-    <Compile Include="CSharp\CodeActions\GenerateSwitchLabelsTests.cs" />
-    <Compile Include="CSharp\CodeActions\GenerateGetterTests.cs" />
-    <Compile Include="CSharp\CodeActions\FlipOperatorArgumentsTests.cs" />
-    <Compile Include="CSharp\CodeActions\ConvertHexToDecTests.cs" />
-    <Compile Include="CSharp\CodeActions\ConvertDecToHexTests.cs" />
-    <Compile Include="CSharp\CodeActions\CheckIfParameterIsNullTests.cs" />
-    <Compile Include="CSharp\CodeActions\ConvertForeachToForTests.cs" />
-    <Compile Include="CSharp\CodeActions\AddAnotherAccessorTests.cs" />
-    <Compile Include="CSharp\CodeActions\RemoveRegionTests.cs" />
-    <Compile Include="CSharp\CodeActions\GeneratePropertyTests.cs" />
-    <Compile Include="CSharp\Inspector\InconsistentNamingIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\InconsistentNamingTests.cs" />
-    <Compile Include="CSharp\CodeActions\CreateLocalVariableTests.cs" />
-    <Compile Include="CSharp\CodeActions\CreateFieldTests.cs" />
-    <Compile Include="CSharp\CodeActions\CreatePropertyTests.cs" />
-    <Compile Include="CSharp\CodeActions\CreateMethodDeclarationTests.cs" />
-    <Compile Include="CSharp\CodeActions\CreateIndexerTests.cs" />
-    <Compile Include="CSharp\CodeActions\InlineLocalVariableTests.cs" />
-    <Compile Include="CSharp\CodeActions\DeclareLocalVariableTests.cs" />
-    <Compile Include="CSharp\CodeActions\CreateClassDeclarationTests.cs" />
-    <Compile Include="CSharp\CodeActions\CreateConstructorDeclarationTests.cs" />
-    <Compile Include="CSharp\CodeActions\CreateDelegateTests.cs" />
-    <Compile Include="CSharp\CodeActions\IntroduceConstantTests.cs" />
-    <Compile Include="CSharp\CodeActions\ExtractMethodTests.cs" />
-    <Compile Include="CSharp\Parser\Bugs\ParserBugTests.cs" />
-    <Compile Include="FormattingTests\TestKeepReformattingRules.cs" />
-    <Compile Include="FormattingTests\TestWrapping.cs" />
-    <Compile Include="CSharp\CodeCompletion\DelegateContextTests.cs" />
-    <Compile Include="CSharp\CodeActions\ImplementInterfaceTests.cs" />
-    <Compile Include="CSharp\CodeActions\ImplementInterfaceExplicitTests.cs" />
-    <Compile Include="CSharp\CodeActions\ImplementAbstractMembersTest.cs" />
-    <Compile Include="CSharp\CodeActions\RemoveRedundantCatchTypeTests.cs" />
-    <Compile Include="CSharp\CodeActions\AddCatchTypeTests.cs" />
-    <Compile Include="CSharp\CodeIssues\IncorrectExceptionParameterOrderingTests.cs" />
-    <Compile Include="CSharp\CodeIssues\CallToVirtualFunctionFromConstructorTests.cs" />
-    <Compile Include="CSharp\CodeActions\StaticMethodInvocationToExtensionMethodInvocationTests.cs" />
-    <Compile Include="CSharp\CodeActions\ExtensionMethodInvocationToStaticMethodInvocationTests.cs" />
-    <Compile Include="CSharp\CodeActions\IterateViaForeachTests.cs" />
-    <Compile Include="CSharp\CodeActions\ExtractFieldTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ValueParameterUnusedTests.cs" />
-    <Compile Include="CSharp\Parser\Statements\InvalidStatementsTests.cs" />
-    <Compile Include="CSharp\Refactoring\NamingHelperTests.cs" />
-    <Compile Include="CSharp\CodeActions\ConvertToInitializer\ConvertToInitializerTests.cs" />
-    <Compile Include="CSharp\CodeActions\MoveToOuterScopeTests.cs" />
-    <Compile Include="CSharp\CodeIssues\VariableDeclaredInWideScopeTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ParameterCanBeDemotedIssue\ParameterCanBeDemotedTests.cs" />
-    <Compile Include="CSharp\CodeCompletion\DocumentationContextTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ReferenceToStaticMemberViaDerivedTypeTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ParameterCanBeDemotedIssue\IsTypeCriterionTests.cs" />
-    <Compile Include="Utils\CompositeFormatStringParser\CompositeFormatStringParserTests.cs" />
-    <Compile Include="CSharp\CodeIssues\OptionalParameterCouldBeSkippedTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantCatchTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantToStringTests.cs" />
-    <Compile Include="CSharp\CodeIssues\CallToObjectEqualsViaBaseTests.cs" />
-    <Compile Include="CSharp\CodeIssues\IncorrectCallToGetHashCodeTests.cs" />
-    <Compile Include="CSharp\CodeIssues\FormatStringIssues\FormatStringTests.cs" />
-    <Compile Include="CSharp\CodeActions\ConvertToInitializer\ConvertInitializerToExplicitIntializationsTests.cs" />
-    <Compile Include="CSharp\CodeCompletion\BrowsableAttributeTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ExceptionRethrowTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ThreadStaticOnInstanceFieldTests.cs" />
-    <Compile Include="CSharp\CodeIssues\StaticFieldInGenericTypeTests.cs" />
-    <Compile Include="CSharp\CodeActions\ConvertAnonymousDelegateToLambdaTests.cs" />
-    <Compile Include="CSharp\CodeActions\ConvertLamdaToAnonymousDelegateTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ParameterCanBeDemotedIssue\SupportsIndexingCriterionTests.cs" />
-    <Compile Include="CSharp\CodeActions\CreateBackingStoreTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantWhereWithPredicateIssueTests.cs" />
-    <Compile Include="CSharp\CodeActions\SortUsingsTests.cs" />
-    <Compile Include="CSharp\CodeActions\CreateEventInvocatorTests.cs" />
-    <Compile Include="IndentationTests\IndentationTests.cs" />
-    <Compile Include="CSharp\CodeCompletion\ImportCompletionTests.cs" />
-    <Compile Include="CSharp\CodeActions\CreateEnumValueTests.cs" />
-    <Compile Include="CSharp\CodeCompletion\GetCurrentParameterIndexTests.cs" />
-    <Compile Include="CSharp\CodeIssues\SimplifyAnonymousMethodToDelegateIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\CS0127ReturnMustNotBeFollowedByAnyExpressionTests.cs" />
-    <Compile Include="CSharp\Analysis\SemanticHighlightingTests.cs" />
-    <Compile Include="CSharp\CodeActions\CreateChangedEventTests.cs" />
-    <Compile Include="CSharp\CodeActions\SimplifyIfFlowTests.cs" />
-    <Compile Include="CSharp\CodeActions\SimplifyIfFlowInLoopsTests.cs" />
-    <Compile Include="CSharp\CodeIssues\NoDefaultConstructorIssueTests.cs" />
-    <Compile Include="CSharp\CodeActions\InvertIfAndSimplifyTests.cs" />
-    <Compile Include="FormattingTests\TestExpressionFormatting.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantNullCheckTests.cs">
-    </Compile>
-    <Compile Include="CSharp\CodeIssues\StaticConstructorAccessModifierTest.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantBaseConstructorIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\RedundantConstructorTests.cs" />
-    <Compile Include="CSharp\CodeIssues\PublicConstructorInAbstractClassIssueTest.cs" />
-    <Compile Include="CSharp\CodeIssues\CS0029InvalidConversionIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ConvertToStaticMethodIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\ParameterCanBeDemotedIssue\ParameterCanBeIEnumerableTests.cs" />
-    <Compile Include="CSharp\CodeIssues\DuplicateBodyMethodIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\DuplicateExpressionsInConditionsIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\DuplicateIfInIfChainIssueTests.cs" />
-    <Compile Include="CSharp\CodeIssues\UseBlockInsteadColonIssueTests.cs" />
-    <Compile Include="CSharp\AstTests.cs" />
-    <Compile Include="Analysis\SymbolCollectorTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\cecil\Mono.Cecil.csproj">
-      <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
-      <Name>Mono.Cecil</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
-      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
-      <Name>ICSharpCode.NRefactory.CSharp</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\ICSharpCode.NRefactory.Xml\ICSharpCode.NRefactory.Xml.csproj">
-      <Project>{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}</Project>
-      <Name>ICSharpCode.NRefactory.Xml</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ProjectExtensions>
-    <MonoDevelop>
-      <Properties>
-        <Policies>
-          <TextStylePolicy TabsToSpaces="False" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/plain" />
-          <TextStylePolicy FileWidth="120" TabsToSpaces="False" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/x-csharp" />
-          <CSharpFormattingPolicy IndentSwitchBody="True" BeforeMethodDeclarationParentheses="False" BeforeMethodCallParentheses="False" BeforeConstructorDeclarationParentheses="False" BeforeDelegateDeclarationParentheses="False" NewParentheses="False" inheritsSet="Mono" inheritsScope="text/x-csharp" scope="text/x-csharp" />
-        </Policies>
-      </Properties>
-    </MonoDevelop>
-  </ProjectExtensions>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <PropertyGroup>
+    <ProjectGuid>{63D3B27A-D966-4902-90B3-30290E1692F1}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <OutputType>Library</OutputType>
+    <RootNamespace>ICSharpCode.NRefactory</RootNamespace>
+    <AssemblyName>ICSharpCode.NRefactory.Tests</AssemblyName>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <NoStdLib>False</NoStdLib>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <OutputPath>..\bin\$(Configuration)\</OutputPath>
+    <UseMSBuildEngine>False</UseMSBuildEngine>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugType>Full</DebugType>
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <FileAlignment>4096</FileAlignment>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <FileAlignment>4096</FileAlignment>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Debug' ">
+    <DebugType>Full</DebugType>
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE;NET_4_5</DefineConstants>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Release' ">
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE;NET_4_5</DefineConstants>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <DebugSymbols>false</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|x86' ">
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|x86' ">
+    <DebugType>none</DebugType>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\cecil\Test\libs\nunit-2.5.10\nunit.framework.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
+      <Link>Properties\GlobalAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="Analysis\AbiComparerTests.cs" />
+    <Compile Include="CSharp\Analysis\DefiniteAssignmentTests.cs" />
+    <Compile Include="CSharp\AstStructureTests.cs" />
+    <Compile Include="CSharp\CodeActions\AddUsing\AddUsingActionAlphabeticalTests.cs" />
+    <Compile Include="CSharp\CodeActions\AddUsing\AddUsingActionInsideNamespaceTests.cs" />
+    <Compile Include="CSharp\CodeActions\AddUsing\AddUsingRunActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\AddUsing\AddUsingActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertAsToCastTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertCastToAsTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertExplicitToImplicitImplementationTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertImplicitToExplicittImplementationTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertLambdaBodyExpressionToStatementTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertLambdaBodyStatementToExpressionTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertSwitchToIfTests.cs" />
+    <Compile Include="CSharp\CodeActions\CreateCustomEventImplementationTests.cs" />
+    <Compile Include="CSharp\CodeActions\CreateOverloadWithoutParameterTests.cs" />
+    <Compile Include="CSharp\CodeActions\ExtractAnonymousMethodTests.cs" />
+    <Compile Include="CSharp\CodeActions\JoinDeclarationAndAssignmentTests.cs" />
+    <Compile Include="CSharp\CodeActions\JoinStringTests.cs" />
+    <Compile Include="CSharp\CodeActions\MergeNestedIfTests.cs" />
+    <Compile Include="CSharp\CodeActions\NegateRelationalExpressionTests.cs" />
+    <Compile Include="CSharp\CodeActions\PutInsideUsingTests.cs" />
+    <Compile Include="CSharp\CodeActions\SplitDeclarationListTests.cs" />
+    <Compile Include="CSharp\CodeActions\UseStringFormatTests.cs" />
+    <Compile Include="CSharp\CodeIssues\AccessToDisposedClosureTests.cs">
+      <DependentUpon>AccessToModifiedClosureTests.cs</DependentUpon>
+    </Compile>
+    <Compile Include="CSharp\CodeIssues\AccessToModifiedClosureTests.cs" />
+    <Compile Include="CSharp\CodeIssues\CS1717AssignmentMadeToSameVariableIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\CastExpressionOfIncompatibleTypeIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ConstantConditionIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\DoubleNegationOperatorIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ExplicitConversionInForEachIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ExpressionIsNeverOfProvidedTypeIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ForControlVariableIsNeverModifiedIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\LocalVariableHidesMemberIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\LocalVariableNotUsedIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\MethodOverloadHidesOptionalParameterIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\NegativeRelationalExpressionIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ParameterHidesMemberIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ParameterOnlyAssignedIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantCommaInArrayInitializerIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantAssignmentIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantAttributeParenthesesIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantCaseLabelIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantIfElseBlockIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantDefaultFieldInitializerIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantObjectCreationArgumentListIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantObjectOrCollectionInitializerIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantCastIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithSingleCallToCountIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithSingleCallToFirstIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithSingleCallToFirstOrDefaultIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithSingleCallToLastIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithSingleCallToLastOrDefaultIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithSingleCallToLongCountIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithSingleCallToSingleIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithSingleCallToSingleOrDefaultIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\UnusedTypeParameterIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\UnreachableCodeIssueTests.cs" />
+    <Compile Include="CSharp\CSharpAmbienceTests.cs" />
+    <Compile Include="CSharp\CodeDomConvertVisitorTests.cs" />
+    <Compile Include="CSharp\DepthFirstVisitorTests.cs" />
+    <Compile Include="CSharp\InsertParenthesesVisitorTests.cs" />
+    <Compile Include="CSharp\CSharpOutputVisitorTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\AnonymousTypeCreateExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\ObjectCreateExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\UndocumentedExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\GeneralScope\CommentTests.cs" />
+    <Compile Include="CSharp\Parser\GeneralScope\DelegateDeclarationTests.cs" />
+    <Compile Include="CSharp\Parser\GeneralScope\NamespaceDeclarationTests.cs" />
+    <Compile Include="CSharp\Parser\GeneralScope\PreprocessorDirectiveTests.cs" />
+    <Compile Include="CSharp\Parser\GeneralScope\TypeDeclarationTests.cs" />
+    <Compile Include="CSharp\Parser\GeneralScope\UsingDeclarationTests.cs" />
+    <Compile Include="CSharp\Parser\ParseSelfTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\BlockStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\CheckedStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\EmptyStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\ExpressionStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\FixedStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\ForStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\GotoStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\IfElseStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\LabelStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\LockStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\ReturnStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\SwitchStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\ThrowStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\TryCatchStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\UnsafeStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\UsingStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\VariableDeclarationStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\WhileStatementTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\YieldStatementTests.cs" />
+    <Compile Include="CSharp\Parser\TypeMembers\ConstructorDeclarationTests.cs" />
+    <Compile Include="CSharp\Parser\TypeMembers\DestructorDeclarationTests.cs" />
+    <Compile Include="CSharp\Parser\TypeMembers\EventDeclarationTests.cs" />
+    <Compile Include="CSharp\Parser\TypeMembers\FieldDeclarationTests.cs" />
+    <Compile Include="CSharp\Parser\TypeMembers\IndexerDeclarationTests.cs" />
+    <Compile Include="CSharp\Parser\TypeMembers\MethodDeclarationTests.cs" />
+    <Compile Include="CSharp\Parser\TypeMembers\OperatorDeclarationTests.cs" />
+    <Compile Include="CSharp\Parser\TypeMembers\PropertyDeclarationTests.cs" />
+    <Compile Include="CSharp\Parser\TypeSystemConvertVisitorTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\AnonymousMethodExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\ArrayCreateExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\AssignmentExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\BaseReferenceExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\BinaryOperatorExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\CastExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\CheckedExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\ConditionalExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\DefaultValueExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\IdentifierExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\IndexerExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\InvocationExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\IsExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\LambdaExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\MemberReferenceExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\ParenthesizedExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\PointerReferenceExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\PrimitiveExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\QueryExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\SizeOfExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\StackAllocExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\ThisReferenceExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\TypeOfExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\TypeReferenceExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\Expression\UnaryOperatorExpressionTests.cs" />
+    <Compile Include="CSharp\Parser\GeneralScope\AttributeSectionTests.cs" />
+    <Compile Include="CSharp\Parser\ParseUtil.cs" />
+    <Compile Include="CSharp\QueryExpressionExpanderTests.cs" />
+    <Compile Include="CSharp\Refactoring\LambdaHelperTests.cs" />
+    <Compile Include="CSharp\Refactoring\RefactoringStructureTests.cs" />
+    <Compile Include="CSharp\Refactoring\TypeSystemAstBuilderTests.cs" />
+    <Compile Include="CSharp\Resolver\AnonymousTypeTests.cs" />
+    <Compile Include="CSharp\Resolver\ArrayCreateTests.cs" />
+    <Compile Include="CSharp\Resolver\AttributeTests.cs" />
+    <Compile Include="CSharp\Resolver\BinaryOperatorTests.cs" />
+    <Compile Include="CSharp\Resolver\CastTests.cs" />
+    <Compile Include="CSharp\Resolver\ComTests.cs" />
+    <Compile Include="CSharp\Resolver\ConditionalOperatorTests.cs" />
+    <Compile Include="CSharp\Resolver\SizeOfTests.cs" />
+    <Compile Include="CSharp\Resolver\DynamicTests.cs" />
+    <Compile Include="CSharp\Resolver\ExplicitConversionsTest.cs" />
+    <Compile Include="CSharp\Resolver\ExtensionMethodTests.cs" />
+    <Compile Include="CSharp\Resolver\FindReferencesTest.cs" />
+    <Compile Include="CSharp\Resolver\InvocationTests.cs" />
+    <Compile Include="CSharp\Resolver\LambdaTests.cs" />
+    <Compile Include="CSharp\Resolver\LinqTests.cs" />
+    <Compile Include="CSharp\Resolver\LocalTypeInferenceTests.cs" />
+    <Compile Include="CSharp\Resolver\MemberLookupTests.cs" />
+    <Compile Include="CSharp\Resolver\MethodTests.cs" />
+    <Compile Include="CSharp\Resolver\NameLookupTests.cs" />
+    <Compile Include="CSharp\Resolver\ObjectCreationTests.cs" />
+    <Compile Include="CSharp\Resolver\ResolveAtLocationTests.cs" />
+    <Compile Include="CSharp\Resolver\TypeInferenceTests.cs" />
+    <Compile Include="CSharp\Resolver\ConversionsTest.cs" />
+    <Compile Include="CSharp\Resolver\OverloadResolutionTests.cs" />
+    <Compile Include="CSharp\Resolver\ResolverTestBase.cs" />
+    <Compile Include="CSharp\Resolver\UnaryOperatorTests.cs" />
+    <Compile Include="CSharp\Resolver\UnsafeCodeTests.cs" />
+    <Compile Include="Documentation\CSharpCrefLookupTests.cs" />
+    <Compile Include="Documentation\CSharpCrefParserTests.cs" />
+    <Compile Include="Documentation\CSharpDocumentationTests.cs" />
+    <Compile Include="Documentation\IDStringTests.cs" />
+    <Compile Include="Editor\ReadOnlyDocumentTests.cs" />
+    <Compile Include="FormattingTests\TestBraceStlye.cs" />
+    <Compile Include="FormattingTests\TestFormattingBugs.cs" />
+    <Compile Include="FormattingTests\TestSpacingVisitor.cs" />
+    <Compile Include="FormattingTests\TestStatementIndentation.cs" />
+    <Compile Include="FormattingTests\TestTypeLevelIndentation.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TypeSystem\BinaryLoaderTests.cs" />
+    <Compile Include="TypeSystem\BlobLoaderTests.cs" />
+    <Compile Include="TypeSystem\CecilLoaderTests.cs" />
+    <Compile Include="TypeSystem\CyclicProjectDependency.cs" />
+    <Compile Include="TypeSystem\GetAllBaseTypesTest.cs" />
+    <Compile Include="TypeSystem\GetMembersTests.cs" />
+    <Compile Include="TypeSystem\IkvmLoaderTests.cs" Condition="Exists('..\..\ikvm\reflect\IKVM.Reflection.csproj')" />
+    <Compile Include="TypeSystem\InheritanceHelperTests.cs" />
+    <Compile Include="TypeSystem\LazyLoadedCecilLoaderTests.cs" />
+    <Compile Include="TypeSystem\ReflectionHelperTests.cs" />
+    <Compile Include="TypeSystem\SerializedCecilLoaderTests.cs" />
+    <Compile Include="TypeSystem\SerializedIkvmLoaderTests.cs" Condition="Exists('..\..\ikvm\reflect\IKVM.Reflection.csproj')" />
+    <Compile Include="TypeSystem\StructureTests.cs" />
+    <Compile Include="TypeSystem\TestInterningProvider.cs" />
+    <Compile Include="TypeSystem\TypeParameterTests.cs" />
+    <Compile Include="TypeSystem\TypeSystemHelper.cs" />
+    <Compile Include="TypeSystem\TypeSystemTests.cs" />
+    <Compile Include="TypeSystem\TypeSystemTests.TestCase.cs" />
+    <EmbeddedResource Include="TypeSystem\TypeSystemTests.TestCase.cs" />
+    <Compile Include="Utils\CSharpPrimitiveCastTests.cs" />
+    <Compile Include="Utils\TreeTraversalTests.cs" />
+    <Compile Include="FormattingTests\TextEditorTestAdapter.cs" />
+    <Compile Include="FormattingTests\TestBlankLineFormatting.cs" />
+    <Compile Include="CSharp\CodeCompletion\CodeCompletionAccessibleTests.cs" />
+    <Compile Include="CSharp\CodeCompletion\CodeCompletionBugTests.cs" />
+    <Compile Include="CSharp\CodeCompletion\CodeCompletionCSharp3Tests.cs" />
+    <Compile Include="CSharp\CodeCompletion\CodeCompletionCSharpTests.cs" />
+    <Compile Include="CSharp\CodeCompletion\CompletionDataList.cs" />
+    <Compile Include="CSharp\CodeCompletion\EnumContextTests.cs" />
+    <Compile Include="CSharp\CodeCompletion\KeywordTests.cs" />
+    <Compile Include="CSharp\CodeCompletion\ObjectInitializerTests.cs" />
+    <Compile Include="CSharp\CodeCompletion\ParameterCompletionTests.cs" />
+    <Compile Include="CSharp\CodeCompletion\PreProcessorTests.cs" />
+    <Compile Include="CSharp\CodeCompletion\TestBase.cs" />
+    <Compile Include="CSharp\CodeCompletion\VariableDeclarationStatementTests.cs" />
+    <Compile Include="CSharp\CodeCompletion\NameContextTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ConvertConditionalTernaryToNullCoalescingIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\InspectionActionTestBase.cs" />
+    <Compile Include="CSharp\CodeIssues\NotImplementedExceptionInspectorTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantInternalInspectorTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantNameQualifierIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantPrivateInspectorTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantThisQualifierIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantUsingDirectiveIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithStringIsNullOrEmptyIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\SuggestUseVarKeywordEvidentTests.cs" />
+    <Compile Include="CSharp\CodeActions\UseVarKeywordTests.cs" />
+    <Compile Include="CSharp\CodeActions\TestRefactoringContext.cs" />
+    <Compile Include="CSharp\CodeActions\ContextActionTestBase.cs" />
+    <Compile Include="CSharp\CodeActions\UseExplicitTypeTests.cs" />
+    <Compile Include="CSharp\CodeActions\SplitDeclarationAndAssignmentTests.cs" />
+    <Compile Include="CSharp\CodeActions\SplitStringTests.cs" />
+    <Compile Include="CSharp\CodeActions\ReplaceEmptyStringTests.cs" />
+    <Compile Include="CSharp\CodeActions\RemoveBracesTests.cs" />
+    <Compile Include="CSharp\CodeActions\RemoveBackingStoreTests.cs" />
+    <Compile Include="CSharp\CodeActions\InvertIfTests.cs" />
+    <Compile Include="CSharp\CodeActions\IntroduceFormatItemTests.cs" />
+    <Compile Include="CSharp\CodeActions\InsertAnonymousMethodSignatureTests.cs" />
+    <Compile Include="CSharp\CodeActions\GenerateSwitchLabelsTests.cs" />
+    <Compile Include="CSharp\CodeActions\GenerateGetterTests.cs" />
+    <Compile Include="CSharp\CodeActions\FlipOperatorArgumentsTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertHexToDecTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertDecToHexTests.cs" />
+    <Compile Include="CSharp\CodeActions\CheckIfParameterIsNullTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertForeachToForTests.cs" />
+    <Compile Include="CSharp\CodeActions\AddAnotherAccessorTests.cs" />
+    <Compile Include="CSharp\CodeActions\RemoveRegionTests.cs" />
+    <Compile Include="CSharp\CodeActions\GeneratePropertyTests.cs" />
+    <Compile Include="CSharp\Inspector\InconsistentNamingIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\InconsistentNamingTests.cs" />
+    <Compile Include="CSharp\CodeActions\CreateLocalVariableTests.cs" />
+    <Compile Include="CSharp\CodeActions\CreateFieldTests.cs">
+      <DependentUpon>CreateEventInvocatorTests.cs</DependentUpon>
+    </Compile>
+    <Compile Include="CSharp\CodeActions\CreatePropertyTests.cs" />
+    <Compile Include="CSharp\CodeActions\CreateMethodDeclarationTests.cs" />
+    <Compile Include="CSharp\CodeActions\CreateIndexerTests.cs" />
+    <Compile Include="CSharp\CodeActions\InlineLocalVariableTests.cs" />
+    <Compile Include="CSharp\CodeActions\DeclareLocalVariableTests.cs" />
+    <Compile Include="CSharp\CodeActions\CreateClassDeclarationTests.cs" />
+    <Compile Include="CSharp\CodeActions\CreateConstructorDeclarationTests.cs" />
+    <Compile Include="CSharp\CodeActions\CreateDelegateTests.cs" />
+    <Compile Include="CSharp\CodeActions\IntroduceConstantTests.cs" />
+    <Compile Include="CSharp\CodeActions\ExtractMethodTests.cs" />
+    <Compile Include="CSharp\Parser\Bugs\ParserBugTests.cs" />
+    <Compile Include="FormattingTests\TestKeepReformattingRules.cs" />
+    <Compile Include="FormattingTests\TestWrapping.cs" />
+    <Compile Include="CSharp\CodeCompletion\DelegateContextTests.cs" />
+    <Compile Include="CSharp\CodeActions\ImplementInterfaceTests.cs" />
+    <Compile Include="CSharp\CodeActions\ImplementInterfaceExplicitTests.cs" />
+    <Compile Include="CSharp\CodeActions\ImplementAbstractMembersTest.cs" />
+    <Compile Include="CSharp\CodeActions\RemoveRedundantCatchTypeTests.cs" />
+    <Compile Include="CSharp\CodeActions\AddCatchTypeTests.cs" />
+    <Compile Include="CSharp\CodeIssues\DoNotCallOverridableMethodsInConstructorIssueTests.cs" />
+    <Compile Include="CSharp\CodeActions\ExtensionMethodInvocationToStaticMethodInvocationTests.cs" />
+    <Compile Include="CSharp\CodeActions\IterateViaForeachTests.cs" />
+    <Compile Include="CSharp\CodeActions\ExtractFieldTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ValueParameterNotUsedIssueTests.cs" />
+    <Compile Include="CSharp\Parser\Statements\InvalidStatementsTests.cs" />
+    <Compile Include="CSharp\Refactoring\NamingHelperTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertToInitializer\ConvertToInitializerTests.cs" />
+    <Compile Include="CSharp\CodeActions\MoveToOuterScopeTests.cs" />
+    <Compile Include="CSharp\CodeIssues\VariableDeclaredInWideScopeTests.cs" />
+    <Compile Include="CSharp\CodeCompletion\DocumentationContextTests.cs" />
+    <Compile Include="CSharp\CodeIssues\AccessToStaticMemberViaDerivedTypeIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ParameterCanBeDemotedIssue\IsTypeCriterionTests.cs" />
+    <Compile Include="Utils\CompositeFormatStringParser\CompositeFormatStringParserTests.cs" />
+    <Compile Include="CSharp\CodeIssues\OptionalParameterCouldBeSkippedTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantToStringCallIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\CallToObjectEqualsViaBaseTests.cs" />
+    <Compile Include="CSharp\CodeIssues\IncorrectCallToGetHashCodeTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertToInitializer\ConvertInitializerToExplicitIntializationsTests.cs" />
+    <Compile Include="CSharp\CodeCompletion\BrowsableAttributeTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ExceptionRethrowTests.cs" />
+    <Compile Include="CSharp\CodeIssues\StaticFieldInGenericTypeTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertAnonymousDelegateToLambdaTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertLamdaToAnonymousDelegateTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ParameterCanBeDemotedIssue\SupportsIndexingCriterionTests.cs" />
+    <Compile Include="CSharp\CodeActions\CreateBackingStoreTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantWhereWithPredicateIssueTests.cs" />
+    <Compile Include="CSharp\CodeActions\SortUsingsTests.cs" />
+    <Compile Include="CSharp\CodeActions\CreateEventInvocatorTests.cs" />
+    <Compile Include="CSharp\CodeCompletion\ImportCompletionTests.cs" />
+    <Compile Include="CSharp\CodeActions\CreateEnumValueTests.cs" />
+    <Compile Include="CSharp\CodeCompletion\GetCurrentParameterIndexTests.cs" />
+    <Compile Include="CSharp\CodeIssues\CS0127ReturnMustNotBeFollowedByAnyExpressionTests.cs" />
+    <Compile Include="CSharp\Analysis\SemanticHighlightingTests.cs" />
+    <Compile Include="CSharp\CodeActions\CreateChangedEventTests.cs" />
+    <Compile Include="CSharp\CodeActions\SimplifyIfFlowTests.cs" />
+    <Compile Include="CSharp\CodeActions\SimplifyIfFlowInLoopsTests.cs" />
+    <Compile Include="CSharp\CodeIssues\CS1729TypeHasNoConstructorWithNArgumentsIssueTests.cs" />
+    <Compile Include="CSharp\CodeActions\InvertIfAndSimplifyTests.cs" />
+    <Compile Include="FormattingTests\TestExpressionFormatting.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantComparisonWithNullIssueTests.cs">
+    </Compile>
+    <Compile Include="CSharp\CodeIssues\RedundantBaseConstructorIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\EmptyConstructorIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\PublicConstructorInAbstractClassIssueTest.cs" />
+    <Compile Include="CSharp\CodeIssues\CS0029InvalidConversionIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ParameterCanBeDemotedIssue\ParameterCanBeIEnumerableTests.cs" />
+    <Compile Include="CSharp\CodeIssues\DuplicateBodyMethodIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\DuplicateExpressionsInConditionsIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\DuplicateIfInIfChainIssueTests.cs" />
+    <Compile Include="CSharp\AstTests.cs" />
+    <Compile Include="CSharp\CodeIssues\LockThisTests.cs" />
+    <Compile Include="Analysis\SymbolCollectorTests.cs" />
+    <Compile Include="CSharp\CodeActions\ImplementNotImplementedPropertyTests.cs" />
+    <Compile Include="CSharp\CodeActions\AutoLinqSumTests.cs" />
+    <Compile Include="CSharp\CodeIssues\DisposeMethodInNonIDisposableTypeTests.cs" />
+    <Compile Include="FormattingTests\TestGlobalLevelFormatting.cs" />
+    <Compile Include="CSharp\CodeIssues\ConditionalTernaryEqualBranchTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ThreadStaticAtInstanceFieldTests.cs" />
+    <Compile Include="CSharp\CodeActions\MetaTests.cs" />
+    <Compile Include="CSharp\CodeCompletion\FormatItemTests.cs" />
+    <Compile Include="CSharp\CodeActions\LinqFluentToQueryTests.cs" />
+    <Compile Include="CSharp\CodeActions\LinqQueryToFluentTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantExtendsListEntryIssueTests.cs" />
+    <Compile Include="CSharp\CodeActions\CopyCommentsFromBaseTests.cs" />
+    <Compile Include="CSharp\CodeActions\CopyCommentsFromIntefaceTests.cs" />
+    <Compile Include="CSharp\CodeActions\CS1520MethodMustHaveAReturnTypeTests.cs" />
+    <Compile Include="CSharp\CodeIssues\EmptyDestructorTests.cs" />
+    <Compile Include="CSharp\CodeIssues\EmptyNamespaceTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantBaseQualifierTests.cs" />
+    <Compile Include="CSharp\CodeIssues\CS0759RedundantPartialMethodIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantBoolCompareIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ConvertClosureToMethodGroupIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\EmptyEmbeddedStatementIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\PartialTypeWithSinglePartIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantOverridenMemberTests.cs" />
+    <Compile Include="CSharp\CodeIssues\EnumUnderlyingTypeIsIntTests.cs" />
+    <Compile Include="CSharp\CodeIssues\EmptyGeneralCatchClauseTests.cs" />
+    <Compile Include="CSharp\CodeIssues\NonPublicMethodWithTestAttributeIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\MemberCanBeMadeStaticIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantLambdaParameterTypeTests.cs" />
+    <Compile Include="CSharp\CodeIssues\OptionalParameterHierarchyMismatchIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\FunctionNeverReturnsIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\BitwiseOperatorOnEnumWithoutFlagsIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithOfTypeIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithOfTypeAnyIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithOfTypeCountIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithOfTypeFirstIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithOfTypeFirstOrDefaultIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithOfTypeLastIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithOfTypeLastOrDefaultIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithOfTypeLongCountIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithOfTypeSingleIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithOfTypeSingleOrDefaultIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithOfTypeWhereIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\LongLiteralEndingLowerLIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\CS0659OverrideEqualsWithoutGetHashCodeTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ConstantNullCoalescingConditionIssueTests.cs" />
+    <Compile Include="CSharp\Analysis\NullValueAnalysisTests.cs" />
+    <Compile Include="CSharp\CodeIssues\DuplicatedLinqToListOrArrayTests.cs" />
+    <Compile Include="CSharp\CodeActions\InvertLogicalExpressionTests.cs" />
+    <Compile Include="CSharp\CodeActions\ChangeAccessModifierTests.cs" />
+    <Compile Include="CSharp\CodeActions\AbstractAndVirtualConversionActionTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantToStringCallForValueTypesIssue.cs" />
+    <Compile Include="CSharp\CodeIssues\UseOfMemberOfNullReferenceTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ConvertToConstantIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\FieldCanBeMadeReadOnlyIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\UnassignedReadonlyFieldIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\UseMethodIsInstanceOfTypeIssueTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertWhileToDoWhileLoopTests.cs" />
+    <Compile Include="CSharp\CodeIssues\UseIsOperatorIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RewriteIfReturnToReturnIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ConvertIfStatementToConditionalTernaryExpressionIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ConvertIfStatementToNullCoalescingExpressionIssueTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertDoWhileToWhileLoopTests.cs" />
+    <Compile Include="CSharp\CodeIssues\EqualExpressionComparisonIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ConvertIfToOrExpressionIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ConvertIfToAndExpressionIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\EventUnsubscriptionViaAnonymousDelegateIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\BaseMemberHasParamsIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ConvertIfDoToWhileIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ConvertNullableToShortFormIssueTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertEqualityOperatorToEqualsActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertEqualsToEqualityOperatorActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\FlipEqualsTargetAndArgumentActionTests.cs" />
+    <Compile Include="CSharp\CodeIssues\CanBeReplacedWithTryCastAndCheckForNullIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\OptionalParameterRefOutIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithFirstOrDefaultIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithLastOrDefaultIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\UseMethodAnyIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\InvokeAsExtensionMethodIssueTests.cs" />
+    <Compile Include="CSharp\CodeActions\AddArgumentNameTests.cs" />
+    <Compile Include="CSharp\CodeIssues\StringIndexOfIsCultureSpecificIssueTest.cs" />
+    <Compile Include="CSharp\CodeIssues\StringLastIndexOfIsCultureSpecificIssueTest.cs" />
+    <Compile Include="CSharp\CodeIssues\StringStartsWithIsCultureSpecificIssueTest.cs" />
+    <Compile Include="CSharp\CodeIssues\StringEndsWithIsCultureSpecificIssueTest.cs" />
+    <Compile Include="CSharp\CodeActions\InvertConditionalOperatorActionTests.cs" />
+    <Compile Include="CSharp\CodeIssues\CompareOfFloatsByEqualityOperatorIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantTernaryExpressionIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\SimplifyConditionalTernaryExpressionIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\BaseMethodCallWithDefaultParameterIssueTests.cs" />
+    <Compile Include="CSharp\CodeActions\NegateIsExpressionActionTests.cs" />
+    <Compile Include="CSharp\Analysis\DeclarationSpace\LocalDeclarationSpaceTests.cs" />
+    <Compile Include="CSharp\Analysis\DeclarationSpace\LocalDeclarationSpaceVisitorTests.cs" />
+    <Compile Include="CSharp\CodeIssues\XmlDocIssueIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\CS1573ParameterHasNoMatchingParamTagIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\CS0126ReturnMustBeFollowedByAnyExpressionTestes.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertMethodGroupToLambdaActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertMethodGroupToAnonymousMethodActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\AddExceptionDescriptionActionTests.cs" />
+    <Compile Include="CSharp\CodeIssues\DontUseLinqWhenItsVerboseAndInefficientTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertIfStatementToConditionalTernaryExpressionActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertIfStatementToReturnStatementActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertIfStatementToNullCoalescingExpressionActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertIfStatementToSwitchStatementActionTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ConvertIfStatementToSwitchStatementIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantParamsIssueTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertNullCoalescingToConditionalExpressionActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertReturnStatementToIfActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertAssignmentToIfActionTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ForCanBeConvertedToForeachIssueTests.cs" />
+    <Compile Include="CSharp\CodeActions\UseAsAndNullCheckActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertForToWhileActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\AddBracesActionTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantEmptyDefaultSwitchBranchIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\CS0152DuplicateCaseLabelValueIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\SealedMemberInSealedClassIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\UnusedAnonymousMethodSignatureIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\EmptyStatementIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantArgumentDefaultValueIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantEmptyFinallyBlockIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\PartialMethodParameterNameMismatchIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReplaceWithSimpleAssignmentIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\StringCompareToIsCultureSpecificIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\StringCompareIsCultureSpecificIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\UseArrayCreationExpressionIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\UnusedLabelIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\BaseMethodParameterNameMismatchIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantExplicitArraySizeIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantUnsafeContextIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ProhibitedModifiersIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RemoveRedundantOrStatementIssueTests.cs" />
+    <Compile Include="CSharp\CodeActions\ExtractWhileConditionToInternalIfStatementActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\ReverseDirectionForForLoopTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantArgumentNameTests.cs" />
+    <Compile Include="CSharp\CodeIssues\AutoAsyncTests.cs" />
+    <Compile Include="CSharp\CodeIssues\AdditionalOfTypeIssuesTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantLambdaSignatureParenthesesIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantCheckBeforeAssignmentTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ConvertToLambdaExpressionIssueTests.cs" />
+    <Compile Include="CSharp\CodeActions\AddOptionalParameterToInvocationTests.cs" />
+    <Compile Include="CSharp\CodeActions\ComputeConstantValueTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertShiftToMultiplyActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertMultiplyToShiftActionTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ForStatementConditionIsTrueTests.cs" />
+    <Compile Include="CSharp\CodeActions\SplitIfActionTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantLogicalConditionalExpressionOperandIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ConvertToStaticTypeTests.cs" />
+    <Compile Include="CSharp\CodeActions\ReplaceAssignmentWithPostfixExpressionActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\ReplacePostfixExpressionWithAssignmentActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\ReplaceWithOperatorAssignmentActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\ReplaceOperatorAssignmentWithAssignmentActionTests.cs" />
+    <Compile Include="CSharp\CodeIssues\OperatorIsCanBeUsedIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\FormatStringProblemIssueTests.cs" />
+    <Compile Include="IndentationTests\AllInOneTests.cs" />
+    <Compile Include="IndentationTests\BlockTest.cs" />
+    <Compile Include="IndentationTests\CommentTests.cs" />
+    <Compile Include="IndentationTests\Helper.cs" />
+    <Compile Include="IndentationTests\PreProcessorTests.cs" />
+    <Compile Include="IndentationTests\StringTests.cs" />
+    <Compile Include="IndentationTests\TextPasteIndentEngineTests.cs" />
+    <Compile Include="IndentationTests\AlignmentTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantCatchClauseIssueTests.cs" />
+    <Compile Include="CSharp\CodeCompletion\CodeCompletionOperatorTests.cs" />
+    <Compile Include="CSharp\CodeIssues\CheckNamespaceIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\PossibleMultipleEnumerationIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ConditionIsAlwaysTrueOrFalseIssueTests.cs" />
+    <Compile Include="IndentationTests\GeneralTests.cs" />
+    <Compile Include="CSharp\CodeIssues\MemberHidesStaticFromOuterClassIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\MethodOverloadWithOptionalParameterIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ReferenceEqualsWithValueTypeIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\CompareNonConstrainedGenericWithNullIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantDelegateCreationIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantEnumerableCastCallIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\MissingInterfaceMemberImplementationIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\UnmatchedSizeSpeicificationInArrayCreationTests.cs" />
+    <Compile Include="FormattingTests\TestLinq.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantBlockInDifferentBranchesTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ParameterCanBeDemotedIssue\ParameterCanBeDeclaredWithBaseTypeIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\NonReadonlyReferencedInGetHashCodeTests.cs" />
+    <Compile Include="CSharp\CodeIssues\SameGuardConditionExpressionInIfElseBranchesTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertBitwiseFlagComparisonToHasFlagsActionTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertHasFlagsToBitwiseFlagComparisonActionTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantExplicitArrayCreationIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ArrayCreationCanBeReplacedWithArrayInitializerIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantAnonymousTypePropertyNameIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\PossibleAssignmentToReadonlyFieldIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ObjectCreationAsStatementIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\NotResolvedInTextIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\DelegateSubtractionIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\UnusedParameterIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\SimplifyLinqExpressionIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantExplicitNullableCreationIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantStringToCharArrayCallIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ConvertToAutoPropertyIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\StaticConstructorParameterIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\CS0183ExpressionIsAlwaysOfProvidedTypeIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\PolymorphicFieldLikeEventInvocationIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\ConvertTailRecursiveCallToLoopIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\LoopCanBeConvertedToQueryIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\PartOfBodyCanBeConvertedToQueryIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantTypeArgumentsOfMethodIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\PossibleMistakenCallToGetTypeIssueTests.cs" />
+    <Compile Include="CSharp\CodeIssues\RedundantNotNullAttributeInNonNullableTypeTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\cecil\Mono.Cecil.csproj">
+      <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
+      <Name>Mono.Cecil</Name>
+      <Private>True</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
+      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
+      <Name>ICSharpCode.NRefactory.CSharp</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.NRefactory.Xml\ICSharpCode.NRefactory.Xml.csproj">
+      <Project>{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}</Project>
+      <Name>ICSharpCode.NRefactory.Xml</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
+      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
+      <Name>ICSharpCode.NRefactory</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
+      <Project>{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}</Project>
+      <Name>ICSharpCode.NRefactory.Cecil</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.NRefactory.IKVM\ICSharpCode.NRefactory.IKVM.csproj" Condition="Exists('..\..\ikvm\reflect\IKVM.Reflection.csproj')">
+      <Project>{A727169F-D94F-443F-B305-B057D7F3B420}</Project>
+      <Name>ICSharpCode.NRefactory.IKVM</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory.CSharp.Refactoring.csproj">
+      <Project>{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}</Project>
+      <Name>ICSharpCode.NRefactory.CSharp.Refactoring</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties>
+        <Policies>
+          <TextStylePolicy TabsToSpaces="False" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/plain" />
+          <TextStylePolicy FileWidth="120" TabsToSpaces="False" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/x-csharp" />
+          <CSharpFormattingPolicy IndentSwitchBody="True" BeforeMethodDeclarationParentheses="False" BeforeMethodCallParentheses="False" BeforeConstructorDeclarationParentheses="False" BeforeDelegateDeclarationParentheses="False" NewParentheses="False" inheritsSet="Mono" inheritsScope="text/x-csharp" scope="text/x-csharp" />
+        </Policies>
+      </Properties>
+    </MonoDevelop>
+  </ProjectExtensions>
+  <ItemGroup>
+    <Folder Include="IndentationTests\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="IndentationTests\TestFiles\Comments.cs" />
+    <None Include="IndentationTests\TestFiles\IndentEngine.cs" />
+    <None Include="IndentationTests\TestFiles\IndentState.cs" />
+    <None Include="IndentationTests\TestFiles\PreProcessorDirectives.cs" />
+    <None Include="IndentationTests\TestFiles\Simple.cs" />
+    <None Include="IndentationTests\TestFiles\Strings.cs" />
+    <None Include="IndentationTests\TestFiles\SwitchCase.cs" />
+    <None Include="IndentationTests\TestFiles\CSharpParser.cs" />
+    <None Include="IndentationTests\TestFiles\TextArea.cs" />
+    <None Include="IndentationTests\TestFiles\InheritStatements.cs" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/AlignmentTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/AlignmentTests.cs
new file mode 100644
index 0000000000..ee68dbde9d
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/AlignmentTests.cs
@@ -0,0 +1,674 @@
+//
+// AlignmentTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp;
+
+namespace ICSharpCode.NRefactory.IndentationTests
+{
+	[TestFixture]
+	public class AlignmentTests
+	{
+		[Test]
+		public void MethodCallAlignment()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignToFirstMethodCallArgument = false;
+			var indent = Helper.CreateEngine(@"
+class Foo
+{
+	void Test ()
+	{
+		Call(A,$", fmt);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void IndexerAlignment()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignToFirstIndexerArgument = false;
+			var indent = Helper.CreateEngine(@"
+class Foo
+{
+void Test ()
+{
+Call[A,$", fmt);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void BinaryExpressionAlignment()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignToFirstIndexerArgument = false;
+			var indent = Helper.CreateEngine(@"
+class Foo
+{
+	void Test ()
+	{
+		public static bool IsComplexExpression(AstNode expr)
+		{
+			return expr.StartLocation.Line != expr.EndLocation.Line ||
+				expr is ConditionalExpression ||$", fmt);
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void MethodContinuation()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignToFirstMethodCallArgument = false;
+			var indent = Helper.CreateEngine(@"
+class Foo
+{
+	void Test ()
+	{
+		var a = Call(A)
+			.Foo ()$", fmt);
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+		}
+
+		[Test]
+		public void MethodContinuationDeep()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignToFirstMethodCallArgument = false;
+			var indent = Helper.CreateEngine(@"
+class Foo
+{
+	void Test ()
+	{
+		var a = Call(A)
+			.Foo ()
+			.Foo ()
+			.Foo ()$", fmt);
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+		}
+
+		[Test]
+		public void MethodContinuation_AlignToMemberReferenceDot()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignToFirstMethodCallArgument = false;
+			fmt.AlignToMemberReferenceDot = true;
+			var indent = Helper.CreateEngine(@"
+class Foo
+{
+	void Test ()
+	{
+		var a = Call(A).Foo ()
+		               .Foo ()
+		               .Foo ()$", fmt);
+			Assert.AreEqual("\t\t               ", indent.ThisLineIndent);
+		}
+
+		[Test]
+		public void AlignEmbeddedIfStatements()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedIfStatements = true;
+			var indent = Helper.CreateEngine(@"
+class Foo
+{
+	void Test ()
+	{
+		if (true)
+		if (true)
+		if (true) $", fmt);
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void UnalignEmbeddedIfStatements()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedIfStatements = false;
+			var indent = Helper.CreateEngine(@"
+class Foo
+{
+	void Test ()
+	{
+		if (true)
+			if (true)
+				if (true) $", fmt);
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void AlignEmbeddedUsingStatements()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedUsingStatements = true;
+			var indent = Helper.CreateEngine(@"
+class Foo
+{
+	void Test (IDisposable a, IDisposable b)
+	{
+		using (a)
+		using (a)
+		using (b) $", fmt);
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void UnalignEmbeddedUsingStatements()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedUsingStatements = false;
+			var indent = Helper.CreateEngine(@"
+class Foo
+{
+	void Test (IDisposable a, IDisposable b)
+	{
+		using (a)
+			using (a)
+				using (b) $", fmt);
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void AlignNamedAttributeArgument()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignToFirstMethodCallArgument = true;
+			var indent = Helper.CreateEngine(@"
+[Attr (1,
+       Foo = 2,$
+       Bar = 3", fmt);
+			Assert.AreEqual("       ", indent.ThisLineIndent, "this line indent doesn't match");
+			Assert.AreEqual("       ", indent.NextLineIndent, "next line indent doesn't match");
+		}
+
+		[Test]
+		public void UnalignNamedAttributeArguments()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignToFirstMethodCallArgument = false;
+			var indent = Helper.CreateEngine(@"
+[Attr (1,
+	Foo = 2,$
+	Bar = 3", fmt);
+			Assert.AreEqual("\t", indent.ThisLineIndent, "this line indent doesn't match");
+			Assert.AreEqual("\t", indent.NextLineIndent, "next line indent doesn't match");
+		}
+
+		[Test]
+		public void TestFormatFirstLineKeepFalse()
+		{
+			var fmt = FormattingOptionsFactory.CreateMono();
+			fmt.KeepCommentsAtFirstColumn = false;
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+ // Hello World$", fmt);
+			Assert.AreEqual("\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestFormatFirstLineKeepTrue()
+		{
+			var fmt = FormattingOptionsFactory.CreateMono();
+			fmt.KeepCommentsAtFirstColumn = true;
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+// Hello World$", fmt);
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestLongBinaryExpressionAlignmentBug()
+		{
+			var fmt = FormattingOptionsFactory.CreateMono();
+			fmt.KeepCommentsAtFirstColumn = true;
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	bool ISupportsInterning.EqualsForInterning(ISupportsInterning other)
+	{
+		return p != null && type == p.type && name == p.name &&
+			defaultValue == p.defaultValue && region == p.region && (flags & ~1) == (p.flags & ~1) && ListEquals(attributes, p.attributes);$", fmt);
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestIsRightHandExpression_MethodNamedArgs()
+		{
+			var fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignToFirstMethodCallArgument = false;
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		Bar (Named = $", fmt);
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestIsRightHandExpression_MethodNamedArgs2()
+		{
+			var fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignToFirstMethodCallArgument = true;
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		Bar (Named = $", fmt);
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t     ", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestIsRightHandExpression_MethodNamedArgs3()
+		{
+			var fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignToFirstMethodCallArgument = true;
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		Bar (Named = 1 +
+		     2, $", fmt);
+			Assert.AreEqual("\t\t     ", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t     ", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestIsRightHandExpression_RelationalOperator()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		return x == 1 $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+
+		[Test]
+		public void TestIsRightHandExpression_RelationalOperator2()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		return x >= 1 $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+
+		[Test]
+		public void TestIsRightHandExpression_RelationalOperator3()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		return x <= 1 $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+
+		[Test]
+		public void TestIsRightHandExpression_RelationalOperator4()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		return x != 1 $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+
+		[Test]
+		public void TestIsRightHandExpression_ShortHandOperator()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		x += 1 $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestIsRightHandExpression_ShortHandOperator2()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		x -= 1 $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestIsRightHandExpression_ShortHandOperator3()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		x *= 1 $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestIsRightHandExpression_ShortHandOperator4()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		x /= 1 $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestIsRightHandExpression_ShortHandOperator5()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		x %= 1 $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestIsRightHandExpression_ShortHandOperator6()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		x &= 1 $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestIsRightHandExpression_ShortHandOperator7()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		x |= 1 $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestIsRightHandExpression_ShortHandOperator8()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		x ^= 1 $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		[Ignore("fixme")]
+		public void TestIsRightHandExpression_ShortHandOperator9()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		x >>= 1 $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t     ", indent.NextLineIndent);
+		}
+
+		[Test]
+		[Ignore("fixme")]
+		public void TestIsRightHandExpression_ShortHandOperator10()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		x <<= 1 $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t     ", indent.NextLineIndent);
+		}
+
+
+		[Test]
+		public void TestIsRightHandExpression_Statement()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		if (1 == 1)
+			x = 
+				$");
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestIsRightHandExpression_Statement2()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		if (1 == 1)
+			x = 
+				1; $");
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestIsRightHandExpression_Statement3()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		if (1 == 1)
+			x = 1 +
+				2; $");
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestIsRightHandExpression_MultipleAssignments()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		x = y = z = 
+			$");
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestIsRightHandExpression_MultipleAssignments2()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test()
+	{ 
+		x = y = z = 1 +
+			2; $");
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void BasicMethodContinuation()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignToFirstMethodCallArgument = false;
+			var indent = Helper.CreateEngine(@"
+class Foo
+{
+	void Test ()
+	{
+		Call(A)
+			.Foo ()$", fmt);
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+		}
+
+		[Test]
+		public void DeepMethodContinuation()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignToFirstMethodCallArgument = false;
+			var indent = Helper.CreateEngine(@"
+class Foo
+{
+	void Test ()
+	{
+		Call(A)
+			.Foo ()
+			.Foo ()
+			.Foo ()$", fmt);
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+		}
+
+		[Test]
+		public void DeepMethodContinuationStatement()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignToFirstMethodCallArgument = false;
+			var indent = Helper.CreateEngine(@"
+class Foo
+{
+	void Test ()
+	{
+		if (true)
+			Call(A)
+				.Foo ()
+				.Foo ()
+				.Foo (); $", fmt);
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void DeepMethodContinuationStatement_AlignToMemberReferenceDot()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignToMemberReferenceDot = true;
+			var indent = Helper.CreateEngine(@"
+class Foo
+{
+	void Test ()
+	{
+		if (true)
+			Call(A).Foo ()
+			       .Foo ()
+			       .Foo (); $", fmt);
+			Assert.AreEqual("\t\t\t       ", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestMethodContinuation()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			var indent = Helper.CreateEngine(@"
+class Foo
+{
+	void Test ()
+	{
+		obj
+			.Foo (); $", fmt);
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestMethodContinuationCase2()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			var indent = Helper.CreateEngine(@"
+class Foo
+{
+	void Test ()
+	{
+		var foo = obj
+			.Foo (); $", fmt);
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/AllInOneTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/AllInOneTests.cs
new file mode 100644
index 0000000000..0cb216be65
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/AllInOneTests.cs
@@ -0,0 +1,122 @@
+//
+// AllInOneTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp;
+using NUnit.Framework;
+using System;
+
+namespace ICSharpCode.NRefactory.IndentationTests
+{
+	[TestFixture]
+	public class AllInOneTests
+	{
+		const string ProjectDir = "../../";
+		const string TestFilesPath = "ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles";
+
+		public void BeginFileTest(string fileName, CSharpFormattingOptions policy = null, TextEditorOptions options = null)
+		{
+			Helper.ReadAndTest(System.IO.Path.Combine(ProjectDir, TestFilesPath, fileName), policy, options);
+		}
+
+		[Test]
+		public void TestAllInOne_Simple()
+		{
+			BeginFileTest("Simple.cs");   
+		}
+
+		[Test]
+		public void TestAllInOne_PreProcessorDirectives()
+		{
+			BeginFileTest("PreProcessorDirectives.cs");
+		}
+
+		[Test]
+		public void TestAllInOne_Comments()
+		{
+			BeginFileTest("Comments.cs");
+		}
+
+		[Test]
+		public void TestAllInOne_Strings()
+		{
+			BeginFileTest("Strings.cs");
+		}
+
+		[Test]
+		public void TestAllInOne_IndentEngine()
+		{
+			BeginFileTest("IndentEngine.cs");
+		}
+
+		[Test]
+		public void TestAllInOne_CSharpParser()
+		{
+			BeginFileTest("CSharpParser.cs", FormattingOptionsFactory.CreateSharpDevelop());
+		}
+
+		[Test]
+		public void TestAllInOne_TextArea()
+		{
+			BeginFileTest("TextArea.cs");
+		}
+
+//		[Test]
+//		public void TestAll()
+//		{
+//			foreach (var file in System.IO.Directory.EnumerateFiles("/home/mkrueger/work/monodevelop", "*.cs", System.IO.SearchOption.AllDirectories)) {
+//				Helper.ReadAndTest(file, null, null);
+//			}
+//		}
+
+		[Test]
+		public void TestAllInOne_IndentState()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.IndentSwitchBody = true;
+			policy.IndentCaseBody = true;
+			policy.IndentBreakStatements = true;
+			policy.AlignToFirstIndexerArgument = policy.AlignToFirstMethodCallArgument = true;
+			BeginFileTest("IndentState.cs", policy);
+		}
+
+		[Test]
+		public void TestAllInOne_SwitchCase()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.IndentSwitchBody = true;
+			policy.IndentCaseBody = true;
+			policy.IndentBreakStatements = false;
+
+			BeginFileTest("SwitchCase.cs", policy);
+		}
+
+		[Test]
+		public void TestAllInOne_InheritStatements()
+		{
+			BeginFileTest("InheritStatements.cs");
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/BlockTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/BlockTest.cs
new file mode 100644
index 0000000000..a440ce1ceb
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/BlockTest.cs
@@ -0,0 +1,899 @@
+//
+// BlockTest.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp;
+
+namespace ICSharpCode.NRefactory.IndentationTests
+{
+	[TestFixture]
+	public class BracketsTest
+	{
+		[Test]
+		public void TestBrackets_Simple()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+		$");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_PreProcessor_If()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+#if NOTTHERE
+	{
+#endif
+		$");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_PreProcessor_If2()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+#if NOTTHERE || true
+		{
+#endif
+		$");
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_If()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		if (true)$");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_While()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		while (true)$");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_For()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		for (;;)$");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_Foreach()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		foreach (var v in V)$");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_Do()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		do
+			$");
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_Do2()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		do
+			;
+$");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_NestedDo()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		do do
+				$");
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_NestedDo2()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		do do
+				;
+$");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_NestedDoContinuationSetBack()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		do do do
+					foo();
+$");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_NestedDoContinuationSetBack2()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		do 
+			do
+				do
+					foo();
+$");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_NestedDoContinuation_ExpressionEnded()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		do do do foo(); $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_NestedDoContinuation_ExpressionNotEnded()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		do do do foo() $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_ThisLineIndentAfterCurlyBrace()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+	}$");
+			Assert.AreEqual("\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_ThisLineIndentAfterCurlyBrace2()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{ }$");
+			Assert.AreEqual("\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_Parameters()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		Foo(true,$");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t    ", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_Parameters2()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		Foo($");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_Parenthesis()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		Foooo(a, b, c, // ) 
+				$");
+			Assert.AreEqual("\t\t      ", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t      ", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_Parenthesis2()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		Foooo(a, b, c, // ) 
+				d) $");
+			Assert.AreEqual("\t\t      ", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_SquareBrackets()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		var v = [a, b, c, // ] 
+					$");
+			Assert.AreEqual("\t\t         ", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t         ", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_SquareBrackets2()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		var v = [a, b, c, // ]
+					d]; $");
+			Assert.AreEqual("\t\t         ", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_AngleBrackets()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		Func<a, b, c, // > 
+				$");
+			Assert.Inconclusive("Not implemented.");
+			Assert.AreEqual("\t\t     ", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t     ", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_AngleBrackets2()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		Func<a, b, c, // >
+				d> $");
+			Assert.Inconclusive("Not implemented.");
+			Assert.AreEqual("\t\t     ", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_Nested()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		Foo(a, b, bar(c, d[T,  // T
+		                   G], // G
+		              e), $    // e
+			f);");
+			Assert.AreEqual("\t\t              ", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t    ", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_NotLineStart()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+		void Test(int i,
+		          double d) { $");
+			Assert.AreEqual("\t\t          ", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_RightHandExpression()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		var v = from i in I
+				where i == ';'
+				select i; $");
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_DotExpression()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		var v = I.Where(i => i == ';')
+			.Select(i => i); $");
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_LambdaExpression()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		var v = () => { $
+		};");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_LambdaExpression2()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		var v = () => {
+		}; $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_EqualContinuation()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		var v = 
+			0; $");
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_EqualExtraSpaces()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		var v = 1 + $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_NamespaceIndentingOff()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.IndentNamespaceBody = false;
+			var indent = Helper.CreateEngine(@"
+namespace Bar {
+class Foo {
+void Test ()
+{
+	$", fmt);
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+		}
+
+		[Test]
+		public void ThisLineIndentInCollectionInitializer()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{ 
+		public static CSharpFormattingOptions CreateMono()
+		{
+			return new CSharpFormattingOptions {
+				IndentNamespaceBody = true,
+				IndentClassBody = true,
+				$
+");
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_AnonymousMethodAsParameter()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{ 
+		Foo (
+			a,
+			delegate {
+				evlel();
+				$
+");
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_AnonymousMethodAsParameterCase2()
+		{
+			var opt = FormattingOptionsFactory.CreateMono();
+			opt.AlignToFirstMethodCallArgument = false;
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{ 
+		Foo (a,
+			b,
+			delegate {
+				evlel();
+				$
+", opt);
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_StackedIfElse_AlignElseToCorrectIf()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedIfStatements = false;
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{ 
+		if (true)
+			if (true)
+			{ }
+			else $ ", fmt);
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_StackedIfElse_AlignElseToCorrectIf2()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedIfStatements = false;
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{ 
+		if (true)
+			lock (this)
+				if (true)
+					if (false)
+					{ }
+					else
+						;
+				else $ ", fmt);
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_StackedIfElse_BreakNestedStatementsOnSemicolon()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedIfStatements = false;
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{ 
+		if (true)
+			lock (this)
+				if (true)
+					if (false)
+						;
+		; // this should break the nested statements
+		else $ ", fmt);
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_StackedIfElse_ElseIf()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedIfStatements = false;
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{ 
+		if (true)
+			;
+		else if (false)
+			lock (this)
+				if (true)
+					;
+				else if (false)
+				{ }
+				else $ ", fmt);
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_StackedIfElse_BreakNestedStatementsOnIf()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedIfStatements = true;
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{ 
+		if (true)
+		if (true)
+			lock (this)
+				if (true)
+					lock(this)
+						if (true)
+							;
+						else if (false)
+						{ }
+						else 
+							;
+		if (true) // this if should break the nested statements
+			;
+		else 
+			;
+		else $ ", fmt);
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_StackedIfElse_BreakNestedStatementsOnAnyStatement()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedIfStatements = true;
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{ 
+		if (true)
+		if (true)
+			lock (this)
+				if (true)
+					lock(this)
+						if (true)
+							;
+						else if (false)
+						{ }
+						else 
+							;
+		lock (this) // any statement should break the nested statements
+			;
+		else $ ", fmt);
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_StackedIfElse_BreakNestedStatementsOnAnonymousBlock()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedIfStatements = false;
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{ 
+		if (true)
+			lock (this)
+				if (true)
+					if (false)
+						;
+		{ } // this should break the nested statements
+		else $ ", fmt);
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_StackedIfElseIf_IfInNewLine()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedIfStatements = false;
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{ 
+		if (true)
+			FooBar ();
+		else
+			if (true) {
+				$
+", fmt);
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_RemoveStatementContinuationWhenNoSemicolon()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedIfStatements = false;
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{ 
+		if (true)
+			using (this)
+				if (true)
+				{
+					// ...
+				} $ ", fmt);
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_CustomIndent()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedIfStatements = false;
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		// ...
+			if (true)
+			{
+				$ 
+			}", fmt);
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_CustomIndent2()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedIfStatements = false;
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+				if (true)
+				{
+					// ...
+				} $ ", fmt);
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_CustomIndent3()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedIfStatements = false;
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		using (this)
+					if (true)
+					{ } $ ", fmt);
+			Assert.AreEqual("\t\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_CustomIndent4()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedIfStatements = false;
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+			using (this)
+			{
+					if (true)
+					{ } $ 
+			}", fmt);
+			Assert.AreEqual("\t\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_CustomIndent5()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedIfStatements = false;
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		using (this)
+if (true)
+{ } $ ", fmt);
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_CustomIndent6()
+		{
+			CSharpFormattingOptions fmt = FormattingOptionsFactory.CreateMono();
+			fmt.AlignEmbeddedIfStatements = false;
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	void Test ()
+	{
+		using (this)
+			if (true)
+	{
+				$	
+	}", fmt);
+			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_AnonymousMethodAsFirstParameterWithoutAlignment()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.AlignToFirstMethodCallArgument = policy.AlignToFirstIndexerArgument = false;
+
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test ()
+	{ 
+		Foo (delegate {
+			$
+", policy);
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_ArrayCreationAsFirstParameterWithoutAlignment()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.AlignToFirstMethodCallArgument = policy.AlignToFirstIndexerArgument = false;
+
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test ()
+	{ 
+		Foo (new int[] {
+			$
+", policy);
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_ObjectCreationAsFirstParameterWithoutAlignment()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.AlignToFirstMethodCallArgument = policy.AlignToFirstIndexerArgument = false;
+
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test ()
+	{ 
+		Foo (new MyOBject {
+			$
+", policy);
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_ArrayCreationAsFirstIndexerParameterWithoutAlignment()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.AlignToFirstMethodCallArgument = policy.AlignToFirstIndexerArgument = false;
+
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test ()
+	{ 
+		Foo [new int[] {
+			$
+", policy);
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/CommentTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/CommentTests.cs
new file mode 100644
index 0000000000..5ed67a5997
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/CommentTests.cs
@@ -0,0 +1,137 @@
+//
+// CommentTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.IndentationTests
+{
+	[TestFixture]
+	public class CommentTests
+	{
+		[Test]
+		public void TestLineComment_Simple()
+		{
+			var indent = Helper.CreateEngine("// comment $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestLineComment_PreProcessor()
+		{
+			var indent = Helper.CreateEngine(@"
+#if NOTTHERE
+	// comment $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestLineComment_Class()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	// comment $");
+			Assert.AreEqual("\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestLineComment_For()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	for (;;)
+		// comment 
+		$");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestLineComment_For2()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	for (;;)
+		// comment 
+		Test();
+	$");
+			Assert.AreEqual("\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestLineComment_For3()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	for (;;) ;
+	// comment $");
+			Assert.AreEqual("\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestMultiLineComment_Simple()
+		{
+			var indent = Helper.CreateEngine(@"/* comment */$");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestMultiLineComment_ExtraSpaces()
+		{
+			var indent = Helper.CreateEngine(@"/* comment $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestMultiLineComment_MultiLines()
+		{
+			var indent = Helper.CreateEngine(@"
+class Foo {
+	/* line 1 
+	line 2
+	*/$");
+			Assert.AreEqual("\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestCommentBug()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace FooBar
+{
+//
+// $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/GeneralTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/GeneralTests.cs
new file mode 100644
index 0000000000..e351279ba3
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/GeneralTests.cs
@@ -0,0 +1,60 @@
+//
+// GeneralTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.IndentationTests
+{
+	[TestFixture]
+	public class GeneralTests
+	{
+		[Test]
+		public void UsingDeclarationTests()
+		{
+			var indent = Helper.CreateEngine("using NUnit.Framework;\n$");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void NestedUsingDeclarationTest()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	namespace Bar {
+		using NUnit.Framework;$");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestMixedLineEndingPosition()
+		{
+			var indent = Helper.CreateEngine("\n\r\n$");
+			Assert.AreEqual(new TextLocation(3, 1), indent.Location);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/Helper.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/Helper.cs
new file mode 100644
index 0000000000..8405819712
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/Helper.cs
@@ -0,0 +1,147 @@
+//
+// Helper.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory.Editor;
+using NUnit.Framework;
+using System.IO;
+using System.Text;
+using System;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.IndentationTests
+{
+	internal static class Helper
+	{
+		public static IDocumentIndentEngine CreateEngine(string text, CSharpFormattingOptions formatOptions = null, IEnumerable<string> symbols = null)
+		{
+			var policy = formatOptions;
+			if ( policy == null) {
+				policy = FormattingOptionsFactory.CreateMono();
+				policy.IndentPreprocessorDirectives = false;
+				policy.AlignToFirstMethodCallArgument = policy.AlignToFirstIndexerArgument = true;
+
+			}
+
+			var sb = new StringBuilder();
+			int offset = 0;
+			for (int i = 0; i < text.Length; i++)
+			{
+				var ch = text[i];
+				if (ch == '$')
+				{
+					offset = i;
+					continue;
+				}
+				sb.Append(ch);
+			}
+
+			var document = new ReadOnlyDocument(sb.ToString());
+			var options = new TextEditorOptions();
+
+			var csi = new CSharpIndentEngine(document, options, policy) {
+				EnableCustomIndentLevels = true
+			};
+			if (symbols != null) {
+				foreach (var sym in symbols) {
+					csi.DefineSymbol(sym);
+				}
+			}
+			var result = new CacheIndentEngine(csi);
+			result.Update(offset);
+			return result;
+		}
+
+
+		public static void RandomTests(string filePath, int count, CSharpFormattingOptions policy = null, TextEditorOptions options = null)
+		{
+			if (File.Exists(filePath))
+			{
+				var code = File.ReadAllText(filePath);
+				var document = new ReadOnlyDocument(code);
+				policy = policy ?? FormattingOptionsFactory.CreateMono();
+				options = options ?? new TextEditorOptions { IndentBlankLines = false };
+
+				var engine = new CacheIndentEngine(new CSharpIndentEngine(document, options, policy) { EnableCustomIndentLevels = true });
+				Random rnd = new Random();
+
+				for (int i = 0; i < count; i++) {
+					int offset = rnd.Next(document.TextLength);
+					engine.Update(offset);
+					if (engine.CurrentIndent.Length == 0)
+						continue;
+				}
+
+			}
+			else
+			{
+				Assert.Fail("File " + filePath + " doesn't exist.");
+			}
+		}
+
+
+		public static void ReadAndTest(string filePath, CSharpFormattingOptions policy = null, TextEditorOptions options = null)
+		{
+			if (File.Exists(filePath))
+			{
+				filePath = Path.GetFullPath(filePath);
+				var code = File.ReadAllText(filePath);
+				var document = new ReadOnlyDocument(code);
+				if (policy == null) {
+					policy = FormattingOptionsFactory.CreateMono();
+					policy.AlignToFirstIndexerArgument = policy.AlignToFirstMethodCallArgument = true;
+				}
+				options = options ?? new TextEditorOptions { IndentBlankLines = false, EolMarker = "\n" };
+
+				var engine = new CacheIndentEngine(new CSharpIndentEngine(document, options, policy) { EnableCustomIndentLevels = true });
+				int errors = 0;
+
+				foreach (var ch in code)
+				{
+					if (options.EolMarker[0] == ch)
+					{
+						if (!(engine.LineBeganInsideMultiLineComment || engine.LineBeganInsideVerbatimString)) {
+							if (engine.CurrentIndent.Length > 0) {
+								if (engine.NeedsReindent) {
+									errors++;
+									Console.WriteLine(string.Format("Indent: {2}, Current indent: {3} in {0}:{1}", filePath, engine.Location.Line, engine.ThisLineIndent.Length, engine.CurrentIndent.Length));
+								}
+							}
+						}
+					}
+
+					engine.Push(ch);
+				}
+				Assert.AreEqual(0, errors);
+
+			}
+			else
+			{
+				Assert.Fail("File " + filePath + " doesn't exist.");
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/IndentationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/IndentationTests.cs
deleted file mode 100644
index 8a3e061362..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/IndentationTests.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.Editor;
-using System.Text;
-
-namespace ICSharpCode.NRefactory.CSharp.Indentation
-{
-	[TestFixture]
-	public class IndentationTests
-	{
-		static CSharpIndentEngine CreateEngine (string text)
-		{
-			var policy = FormattingOptionsFactory.CreateMono ();
-
-			var sb = new StringBuilder();
-			int offset = 0;
-			for (int i = 0; i < text.Length; i++) {
-				var ch = text [i];
-				if (ch == '$') {
-					offset = i;
-					continue;
-				}
-				sb.Append (ch);
-			}
-			var document = new ReadOnlyDocument(sb.ToString ());
-
-			var options = new TextEditorOptions();
-
-			var result = new CSharpIndentEngine(document, options, policy);
-			result.UpdateToOffset(offset);
-			return result;
-		}
-
-		[Test]
-		public void TestNamespaceIndent ()
-		{
-			var indent = CreateEngine("namespace Foo {$");
-			Assert.AreEqual("", indent.ThisLineIndent);
-			Assert.AreEqual("\t", indent.NewLineIndent);
-		}
-
-		[Test]
-		public void TestPreProcessorDirectives ()
-		{
-			var indent = CreateEngine(@"
-namespace Foo {
-	class Foo {
-#if NOTTHERE
-	{
-#endif
-		$");
-			Assert.AreEqual("\t\t", indent.ThisLineIndent);
-			Assert.AreEqual("\t\t", indent.NewLineIndent);
-		}
-
-		[Test]
-		public void TestPreProcessorDirectives2 ()
-		{
-			var indent = CreateEngine(@"
-namespace Foo {
-	class Foo {
-#if NOTTHERE || true
-	{
-#endif
-		$");
-			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
-			Assert.AreEqual("\t\t\t", indent.NewLineIndent);
-		}
-
-		[Test]
-		public void TestIf ()
-		{
-			var indent = CreateEngine(@"
-class Foo {
-	void Test ()
-	{
-		if (true)$");
-			Assert.AreEqual("\t\t", indent.ThisLineIndent);
-			Assert.AreEqual("\t\t\t", indent.NewLineIndent);
-		}
-
-		[Test]
-		public void TestFor ()
-		{
-			var indent = CreateEngine(@"
-class Foo {
-	void Test ()
-	{
-		for (;;)$");
-			Assert.AreEqual("\t\t", indent.ThisLineIndent);
-			Assert.AreEqual("\t\t\t", indent.NewLineIndent);
-		}
-
-		[Test]
-		public void TestForEach ()
-		{
-			var indent = CreateEngine(@"
-class Foo {
-	void Test ()
-	{
-		foreach (;;)$");
-			Assert.AreEqual("\t\t", indent.ThisLineIndent);
-			Assert.AreEqual("\t\t\t", indent.NewLineIndent);
-		}
-
-
-		[Test]
-		public void TestDo ()
-		{
-			var indent = CreateEngine(@"
-class Foo {
-	void Test ()
-	{
-		do
-$");
-			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
-		}
-
-		[Test]
-		public void TestNestedDo ()
-		{
-			var indent = CreateEngine(@"
-class Foo {
-	void Test ()
-	{
-		do do
-$");
-			Assert.AreEqual("\t\t\t\t", indent.ThisLineIndent);
-		}
-
-		[Test]
-		public void TestNestedDoContinuationSetBack ()
-		{
-			var indent = CreateEngine(@"
-class Foo {
-	void Test ()
-	{
-		do do do
-foo();$");
-			Assert.AreEqual("\t\t\t\t\t", indent.ThisLineIndent);
-			Assert.AreEqual("\t\t\t\t", indent.NewLineIndent);
-		}
-
-		[Test]
-		public void TestWhile ()
-		{
-			var indent = CreateEngine(@"
-class Foo {
-	void Test ()
-	{
-		while(true)$");
-			Assert.AreEqual("\t\t", indent.ThisLineIndent);
-			Assert.AreEqual("\t\t\t", indent.NewLineIndent);
-		}
-
-		[Test]
-		public void TestParameters ()
-		{
-			var indent = CreateEngine(@"
-class Foo {
-	void Test ()
-	{
-		Foo(true,$");
-			Assert.AreEqual("\t\t", indent.ThisLineIndent);
-			Assert.AreEqual("\t\t   ", indent.NewLineIndent);
-		}
-		[Test]
-		public void TestThisLineIndentAfterCurlyBrace ()
-		{
-			var indent = CreateEngine(@"
-class Foo {
-	void Test ()
-	{
-	}$");
-			Assert.AreEqual("\t", indent.ThisLineIndent);
-			Assert.AreEqual("\t", indent.NewLineIndent);
-		}
-
-		[Test]
-		public void TestThisLineIndentAfterCurlyBraceCase2 ()
-		{
-			var indent = CreateEngine(@"
-class Foo {
-	void Test ()
-	{}$");
-			Assert.AreEqual("\t", indent.ThisLineIndent);
-			Assert.AreEqual("\t", indent.NewLineIndent);
-		}
-
-		[Test]
-		public void TestParametersCase2 ()
-		{
-			var indent = CreateEngine(@"
-class Foo {
-	void Test ()
-	{
-		Foo($");
-			Assert.AreEqual("\t\t", indent.ThisLineIndent);
-			Assert.AreEqual("\t\t\t", indent.NewLineIndent);
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/PreProcessorTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/PreProcessorTests.cs
new file mode 100644
index 0000000000..6ef4d46c28
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/PreProcessorTests.cs
@@ -0,0 +1,355 @@
+//
+// PreProcessorTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using ICSharpCode.NRefactory.CSharp;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.IndentationTests
+{
+	[TestFixture]
+	public class PreProcessorTests
+	{
+		[Test]
+		public void TestPreProcessor_Simple()
+		{
+			var indent = Helper.CreateEngine("#if MONO");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestPreProcessor_If()
+		{
+			var indent = Helper.CreateEngine(@"
+#if false
+{ $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestPreProcessor_If2()
+		{
+			var indent = Helper.CreateEngine(@"
+#if true
+{ $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestPreProcessorComment_NestedBlocks()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+#if false
+		{ $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestPreProcessorStatement_NestedBlocks()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+#if true
+		{ $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestPreProcessor_Elif()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+#if true
+		{
+#elif false
+		} 
+#endif
+			$");
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestPreProcessor_Elif2()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+#if false
+		{
+#elif true
+	}
+#endif
+	$");
+			Assert.AreEqual("\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestPreProcessor_Else()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+#if false
+		{
+#else
+	}
+#endif
+	$");
+			Assert.AreEqual("\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestPreProcessor_Else2()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+#if true
+		{
+#else
+		} 
+#endif
+			$");
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		#region Single-line directives
+
+		[Test]
+		public void TestPreProcessor_Region()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+		#region Foo $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestPreProcessor_Endegion()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+		#region
+		void Test() { }
+		#endregion $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestPreProcessor_Pragma()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+#pragma Foo 42 $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestPreProcessor_Warning()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+#warning Foo $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestPreProcessor_Error()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+#error Foo $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestPreProcessor_Line()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+#line 42 $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestPreProcessor_Define()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+#define Foo 42 $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestPreProcessor_Undef()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+#undef Foo $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		#endregion
+
+		[Test]
+		public void TestBrackets_PreProcessor_If_DefineDirective()
+		{
+			var indent = Helper.CreateEngine(@"
+#define NOTTHERE
+namespace Foo {
+	class Foo {
+#if NOTTHERE
+		{
+#endif
+		$");
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestBrackets_PreProcessor_If_UndefDirective()
+		{
+			var indent = Helper.CreateEngine(@"
+#define NOTTHERE
+namespace Foo {
+	class Foo {
+#undef NOTTHERE
+#if NOTTHERE
+		{
+#endif
+		$");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestPreProcessor_IndentPreprocessor()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.IndentPreprocessorDirectives = true;
+
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo {
+		#if true $ ", policy);
+
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestStateAfterDoublePreprocessorIf()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.AlignToFirstMethodCallArgument = policy.AlignToFirstIndexerArgument = false;
+
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test ()
+	{ 
+		#if true
+		#if true
+		if (true)
+			return;$
+", policy);
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+
+		[Test]
+		public void TestComplexIfElse()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.AlignToFirstMethodCallArgument = policy.AlignToFirstIndexerArgument = false;
+
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test ()
+	{ 
+		#if false
+		#elif true
+		#if false
+		#endif
+		if (true)
+			return;$
+		#endif
+", policy);
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+
+
+		[Test]
+		public void TestDefinedSymbol()
+		{
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.AlignToFirstMethodCallArgument = policy.AlignToFirstIndexerArgument = false;
+
+			var indent = Helper.CreateEngine(@"
+class Foo 
+{
+	void Test ()
+	{ 
+		#if DEBUG
+		if (true)
+			return;$
+", policy, new [] { "DEBUG"});
+			Assert.AreEqual("\t\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/StringTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/StringTests.cs
new file mode 100644
index 0000000000..3d5d02a622
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/StringTests.cs
@@ -0,0 +1,173 @@
+//
+// StringTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.IndentationTests
+{
+	[TestFixture]
+	public class StringTests
+	{
+		[Test]
+		public void TestString_Simple()
+		{
+			var indent = Helper.CreateEngine(@"""some string""$");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestString_Escaped()
+		{
+			var indent = Helper.CreateEngine(@"""some escaped \"" string "" { $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestString_NotEscaped()
+		{
+			var indent = Helper.CreateEngine(@"""some not escaped "" string "" { $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestString_NotEnded()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	""some string {
+#if true $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestChar_Simple()
+		{
+			var indent = Helper.CreateEngine(@"'X'$");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestChar_Escaped()
+		{
+			var indent = Helper.CreateEngine(@"'\'' { $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestChar_NotEscaped()
+		{
+			var indent = Helper.CreateEngine(@"''' { $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestChar_NotEnded()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	' { 
+#if true $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestVerbatim_Simple()
+		{
+			var indent = Helper.CreateEngine(@"@"" verbatim string "" $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestVerbatim_MultiLine()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo 
+	{
+		@"" verbatim string $");
+			Assert.AreEqual("\t\t", indent.ThisLineIndent);
+			Assert.AreEqual("", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestVerbatim_MultiLine2()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	class Foo 
+	{
+		@"" verbatim string 
+{ $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestVerbatim_Escaped()
+		{
+			var indent = Helper.CreateEngine(@"@"" some """"string { """" in a verbatim string "" $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestVerbatim_NotEscaped()
+		{
+			var indent = Helper.CreateEngine(@"@"" some ""string { "" in a verbatim string "" $");
+			Assert.AreEqual("", indent.ThisLineIndent);
+			Assert.AreEqual("\t", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestVerbatim_EscapedMultiLine()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	@"" some verbatim string """" { $");
+			Assert.AreEqual("\t", indent.ThisLineIndent);
+			Assert.AreEqual("", indent.NextLineIndent);
+		}
+
+		[Test]
+		public void TestVerbatim_EscapedMultiLine2()
+		{
+			var indent = Helper.CreateEngine(@"
+namespace Foo {
+	@"" some verbatim string """""" { $");
+			Assert.AreEqual("\t", indent.ThisLineIndent);
+			Assert.AreEqual("\t\t", indent.NextLineIndent);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/CSharpParser.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/CSharpParser.cs
new file mode 100644
index 0000000000..ebc6e3ac1e
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/CSharpParser.cs
@@ -0,0 +1,4073 @@
+// 
+// CSharpParser.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.IO;
+using ICSharpCode.NRefactory.Editor;
+using Mono.CSharp;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	public class CSharpParser
+	{
+		CompilerSettings compilerSettings;
+
+		class ConversionVisitor : StructuralVisitor
+		{
+			SyntaxTree unit = new SyntaxTree();
+			internal bool convertTypeSystemMode;
+
+			public SyntaxTree Unit {
+				get {
+					return unit;
+				}
+				set {
+					unit = value;
+				}
+			}
+
+			public LocationsBag LocationsBag {
+				get;
+				private set;
+			}
+
+			public ConversionVisitor(bool convertTypeSystemMode, LocationsBag locationsBag)
+			{
+				this.convertTypeSystemMode = convertTypeSystemMode;
+				this.LocationsBag = locationsBag;
+			}
+
+			public static TextLocation Convert(Location loc)
+			{
+				return new TextLocation(loc.Row, loc.Column);
+			}
+
+			public override void Visit(ModuleContainer mc)
+			{
+				bool first = true;
+				foreach (var container in mc.Containers) {
+					var nspace = container as NamespaceContainer;
+					if (nspace == null) {
+						container.Accept(this);
+						continue;
+					}
+					NamespaceDeclaration nDecl = null;
+					var loc = LocationsBag.GetLocations(nspace);
+					
+					if (nspace.NS != null && !string.IsNullOrEmpty(nspace.NS.Name)) {
+						nDecl = new NamespaceDeclaration();
+						if (loc != null) {
+							nDecl.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.NamespaceKeyword), Roles.NamespaceKeyword);
+						}
+						nDecl.AddChild(ConvertNamespaceName(nspace.RealMemberName), NamespaceDeclaration.NamespaceNameRole);
+						if (loc != null && loc.Count > 1) {
+							nDecl.AddChild(new CSharpTokenNode(Convert(loc [1]), Roles.LBrace), Roles.LBrace);
+						}
+						AddToNamespace(nDecl);
+						namespaceStack.Push(nDecl);
+					}
+					
+					if (nspace.Usings != null) {
+						foreach (var us in nspace.Usings) {
+							us.Accept(this);
+						}
+					}
+					
+					if (first) {
+						first = false;
+						if (mc.OptAttributes != null) {
+							foreach (var attr in mc.OptAttributes.Sections) {
+								var section = ConvertAttributeSection(attr);
+								if (section !=	null)
+									unit.AddChild(section, SyntaxTree.MemberRole);
+							}
+						}
+					}
+					
+					if (nspace.Containers != null) {
+						foreach (var subContainer in nspace.Containers) {
+							subContainer.Accept(this);
+						}
+					}
+					if (nDecl != null) {
+						AddAttributeSection(nDecl, nspace.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
+						if (loc != null && loc.Count > 2)
+							nDecl.AddChild(new CSharpTokenNode(Convert(loc [2]), Roles.RBrace), Roles.RBrace);
+						if (loc != null && loc.Count > 3)
+							nDecl.AddChild(new CSharpTokenNode(Convert(loc [3]), Roles.Semicolon), Roles.Semicolon);
+						
+						namespaceStack.Pop();
+					} else {
+						AddAttributeSection(unit, nspace.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
+					}
+				}
+				AddAttributeSection(unit, mc.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
+			}
+
+			#region Global
+
+			readonly Stack<NamespaceDeclaration> namespaceStack = new Stack<NamespaceDeclaration>();
+
+			void AddTypeArguments(ATypeNameExpression texpr, AstType result)
+			{
+				if (texpr.TypeArguments == null || texpr.TypeArguments.Args == null)
+					return;
+				var loc = LocationsBag.GetLocations(texpr.TypeArguments);
+				if (loc != null && loc.Count >= 2)
+					result.AddChild(new CSharpTokenNode(Convert(loc [loc.Count - 2]), Roles.LChevron), Roles.LChevron);
+				int i = 0;
+				foreach (var arg in texpr.TypeArguments.Args) {
+					result.AddChild(ConvertToType(arg), Roles.TypeArgument);
+					if (loc != null && i < loc.Count - 2)
+						result.AddChild(new CSharpTokenNode(Convert(loc [i++]), Roles.Comma), Roles.Comma);
+				}
+				if (loc != null && loc.Count >= 2)
+					result.AddChild(new CSharpTokenNode(Convert(loc [loc.Count - 1]), Roles.RChevron), Roles.RChevron);
+			}
+
+			static AstType ConvertToType(TypeParameter spec)
+			{
+				AstType result;
+				result = new SimpleType { IdentifierToken = Identifier.Create(spec.Name, Convert(spec.Location)) };
+				return result;
+			}
+
+			AstType ConvertToType(MemberName memberName)
+			{
+				AstType result;
+				if (memberName.Left != null) {
+					result = new MemberType();
+					result.AddChild(ConvertToType(memberName.Left), MemberType.TargetRole);
+					var loc = LocationsBag.GetLocations(memberName);
+					if (loc != null)
+						result.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Dot), Roles.Dot);
+					result.AddChild(Identifier.Create(memberName.Name, Convert(memberName.Location)), Roles.Identifier);
+				} else {
+					result = new SimpleType { IdentifierToken = Identifier.Create(memberName.Name, Convert(memberName.Location)) };
+				}
+				if (memberName.TypeParameters != null) {
+					var chevronLocs = LocationsBag.GetLocations(memberName.TypeParameters);
+					if (chevronLocs != null)
+						result.AddChild(new CSharpTokenNode(Convert(chevronLocs [chevronLocs.Count - 2]), Roles.LChevron), Roles.LChevron);
+					for (int i = 0; i < memberName.TypeParameters.Count; i++) {
+						var param = memberName.TypeParameters [i];
+						result.AddChild(new SimpleType(Identifier.Create(param.Name, Convert(param.Location))), Roles.TypeArgument);
+						if (chevronLocs != null && i < chevronLocs.Count - 2)
+							result.AddChild(new CSharpTokenNode(Convert(chevronLocs [i]), Roles.Comma), Roles.Comma);
+					}
+					if (chevronLocs != null)
+						result.AddChild(new CSharpTokenNode(Convert(chevronLocs [chevronLocs.Count - 1]), Roles.RChevron), Roles.RChevron);
+				}
+				return result;
+			}
+
+			AstType ConvertToType(Mono.CSharp.Expression typeName)
+			{
+				if (typeName == null) // may happen in typeof(Generic<,,,,>)
+					return new SimpleType();
+				
+				var typeExpr = typeName as TypeExpression;
+				if (typeExpr != null) {
+					return new PrimitiveType(typeExpr.GetSignatureForError(), Convert(typeExpr.Location));
+				}
+				
+				var qam = typeName as QualifiedAliasMember;
+				if (qam != null) {
+					var loc = LocationsBag.GetLocations(typeName);
+					var memberType = new MemberType();
+					memberType.Target = new SimpleType(qam.alias, Convert(qam.Location));
+					memberType.IsDoubleColon = true;
+
+					if (loc != null && loc.Count > 0)
+						memberType.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.DoubleColon), Roles.DoubleColon);
+
+					memberType.MemberNameToken = Identifier.Create(qam.Name, loc != null ? Convert(loc [1]) : TextLocation.Empty);
+					return memberType;
+				}
+				
+				var ma = typeName as MemberAccess;
+				if (ma != null) {
+					var memberType = new MemberType();
+					memberType.AddChild(ConvertToType(ma.LeftExpression), MemberType.TargetRole);
+					var loc = LocationsBag.GetLocations(ma);
+					if (loc != null)
+						memberType.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Dot), Roles.Dot);
+
+					memberType.MemberNameToken = Identifier.Create(ma.Name, Convert(ma.Location));
+					
+					AddTypeArguments(ma, memberType);
+					return memberType;
+				}
+				
+				var sn = typeName as SimpleName;
+				if (sn != null) {
+					var result = new SimpleType(sn.Name, Convert(sn.Location));
+					AddTypeArguments(sn, result);
+					return result;
+				}
+				
+				var cc = typeName as ComposedCast;
+				if (cc != null) {
+					var baseType = ConvertToType(cc.Left);
+					var result = new ComposedType { BaseType = baseType };
+					var ccSpec = cc.Spec;
+					while (ccSpec != null) {
+						if (ccSpec.IsNullable) {
+							result.AddChild(new CSharpTokenNode(Convert(ccSpec.Location), ComposedType.NullableRole), ComposedType.NullableRole);
+						} else if (ccSpec.IsPointer) {
+							result.AddChild(new CSharpTokenNode(Convert(ccSpec.Location), ComposedType.PointerRole), ComposedType.PointerRole);
+						} else {
+							var location = LocationsBag.GetLocations(ccSpec);
+							var spec = new ArraySpecifier { Dimensions = ccSpec.Dimension };
+							spec.AddChild(new CSharpTokenNode(Convert(ccSpec.Location), Roles.LBracket), Roles.LBracket);
+							if (location != null)
+								spec.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.RBracket), Roles.RBracket);
+							
+							result.ArraySpecifiers.Add(spec);
+						}
+						ccSpec = ccSpec.Next;
+					}
+					return result;
+				}
+				
+				var sce = typeName as SpecialContraintExpr;
+				if (sce != null) {
+					switch (sce.Constraint) {
+						case SpecialConstraint.Class:
+							return new PrimitiveType("class", Convert(sce.Location));
+						case SpecialConstraint.Struct:
+							return new PrimitiveType("struct", Convert(sce.Location));
+						case SpecialConstraint.Constructor:
+							return new PrimitiveType("new", Convert(sce.Location));
+					}
+				}
+				return new SimpleType("unknown");
+			}
+
+			IEnumerable<Attribute> GetAttributes(IEnumerable<Mono.CSharp.Attribute> optAttributes)
+			{
+				if (optAttributes == null)
+					yield break;
+				foreach (var attr in optAttributes) {
+					var result = new Attribute();
+					result.Type = ConvertToType(attr.TypeNameExpression);
+					var loc = LocationsBag.GetLocations(attr);
+					result.HasArgumentList = loc != null;
+					int pos = 0;
+					if (loc != null)
+						result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.LPar), Roles.LPar);
+					
+					if (attr.PositionalArguments != null) {
+						foreach (var arg in attr.PositionalArguments) {
+							if (arg == null)
+								continue;
+							var na = arg as NamedArgument;
+							if (na != null) {
+								var newArg = new NamedArgumentExpression();
+								newArg.AddChild(Identifier.Create(na.Name, Convert(na.Location)), Roles.Identifier);
+								
+								var argLoc = LocationsBag.GetLocations(na);
+								if (argLoc != null)
+									newArg.AddChild(new CSharpTokenNode(Convert(argLoc [0]), Roles.Colon), Roles.Colon);
+								if (na.Expr != null)
+									newArg.AddChild((Expression)na.Expr.Accept(this), Roles.Expression);
+								result.AddChild(newArg, Roles.Argument);
+							} else {
+								if (arg.Expr != null)
+									result.AddChild((Expression)arg.Expr.Accept(this), Roles.Argument);
+							}
+							if (loc != null && pos + 1 < loc.Count)
+								result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.Comma), Roles.Comma);
+						}
+					}
+					if (attr.NamedArguments != null) {
+						foreach (var arg in attr.NamedArguments) {
+							var na = (NamedArgument)arg;
+							var newArg = new NamedExpression();
+							newArg.AddChild(Identifier.Create(na.Name, Convert(na.Location)), Roles.Identifier);
+							
+							var argLoc = LocationsBag.GetLocations(na);
+							if (argLoc != null)
+								newArg.AddChild(new CSharpTokenNode(Convert(argLoc [0]), Roles.Assign), Roles.Assign);
+							if (na.Expr != null)
+								newArg.AddChild((Expression)na.Expr.Accept(this), Roles.Expression);
+							result.AddChild(newArg, Roles.Argument);
+							if (loc != null && pos + 1 < loc.Count)
+								result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.Comma), Roles.Comma);
+						}
+					}
+					if (loc != null && pos < loc.Count)
+						result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.RPar), Roles.RPar);
+					
+					yield return result;
+				}
+			}
+
+			AttributeSection ConvertAttributeSection(IEnumerable<Mono.CSharp.Attribute> optAttributes)
+			{
+				if (optAttributes == null)
+					return null;
+				var result = new AttributeSection();
+				var loc = LocationsBag.GetLocations(optAttributes);
+				int pos = 0;
+				if (loc != null)
+					result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.LBracket), Roles.LBracket);
+				var first = optAttributes.FirstOrDefault();
+				string target = first != null ? first.ExplicitTarget : null;
+				
+				if (!string.IsNullOrEmpty(target)) {
+					if (loc != null && pos < loc.Count - 1) {
+						result.AddChild(Identifier.Create(target, Convert(loc [pos++])), Roles.Identifier);
+					} else {
+						result.AddChild(Identifier.Create(target), Roles.Identifier);
+					}
+					if (loc != null && pos < loc.Count)
+						result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.Colon), Roles.Colon);
+				}
+
+				int attributeCount = 0;
+				foreach (var attr in GetAttributes (optAttributes)) {
+					result.AddChild(attr, Roles.Attribute);
+					if (loc != null && pos + 1 < loc.Count)
+						result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.Comma), Roles.Comma);
+
+					attributeCount++;
+				}
+				if (attributeCount == 0)
+					return null;
+				// Left and right bracket + commas between the attributes
+				int locCount = 2 + attributeCount - 1;
+				// optional comma
+				if (loc != null && pos < loc.Count - 1 && loc.Count == locCount + 1)
+					result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.Comma), Roles.Comma);
+				if (loc != null && pos < loc.Count)
+					result.AddChild(new CSharpTokenNode(Convert(loc [pos++]), Roles.RBracket), Roles.RBracket);
+				return result;
+			}
+
+			public override void Visit(NamespaceContainer ns)
+			{
+				NamespaceDeclaration nDecl = null;
+				var loc = LocationsBag.GetLocations(ns);
+				
+				if (ns.NS != null && !string.IsNullOrEmpty(ns.NS.Name)) {
+					nDecl = new NamespaceDeclaration();
+					if (loc != null) {
+						nDecl.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.NamespaceKeyword), Roles.NamespaceKeyword);
+					}
+					nDecl.AddChild(ConvertNamespaceName(ns.RealMemberName), NamespaceDeclaration.NamespaceNameRole);
+					if (loc != null && loc.Count > 1) {
+						nDecl.AddChild(new CSharpTokenNode(Convert(loc [1]), Roles.LBrace), Roles.LBrace);
+					}
+
+					AddToNamespace(nDecl);
+					namespaceStack.Push(nDecl);
+				}
+				
+				if (ns.Usings != null) {
+					foreach (var us in ns.Usings) {
+						us.Accept(this);
+					}
+				}
+				
+				if (ns.Containers != null) {
+					foreach (var container in ns.Containers) {
+						container.Accept(this);
+					}
+				}
+				
+				if (nDecl != null) {
+					AddAttributeSection(nDecl, ns.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
+					if (loc != null && loc.Count > 2)
+						nDecl.AddChild(new CSharpTokenNode(Convert(loc [2]), Roles.RBrace), Roles.RBrace);
+					if (loc != null && loc.Count > 3)
+						nDecl.AddChild(new CSharpTokenNode(Convert(loc [3]), Roles.Semicolon), Roles.Semicolon);
+					
+					namespaceStack.Pop();
+				}
+			}
+			//			public override void Visit (UsingsBag.Namespace nspace)
+			//			{
+			//
+			//
+			//				VisitNamespaceUsings (nspace);
+			//				VisitNamespaceBody (nspace);
+			//
+			//			}
+			//
+			AstType ConvertNamespaceName(MemberName memberName)
+			{
+				// HACK for a parser 'bug' - sometimes it generates "<invalid>" identifiers in namespace names (on certain bugs in the input file)
+				if (memberName.Name == "<invalid>")
+					return AstType.Null;
+				return ConvertToType(memberName);
+			}
+
+			public override void Visit(UsingNamespace un)
+			{
+				var ud = new UsingDeclaration();
+				var loc = LocationsBag.GetLocations(un);
+				ud.AddChild(new CSharpTokenNode(Convert(un.Location), UsingDeclaration.UsingKeywordRole), UsingDeclaration.UsingKeywordRole);
+				if (un.NamespaceExpression != null)
+					ud.AddChild(ConvertToType(un.NamespaceExpression), UsingDeclaration.ImportRole);
+				if (loc != null)
+					ud.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Semicolon), Roles.Semicolon);
+				AddToNamespace(ud);
+			}
+
+			public override void Visit(UsingAliasNamespace uan)
+			{
+				var ud = new UsingAliasDeclaration();
+				var loc = LocationsBag.GetLocations(uan);
+				
+				ud.AddChild(new CSharpTokenNode(Convert(uan.Location), UsingAliasDeclaration.UsingKeywordRole), UsingAliasDeclaration.UsingKeywordRole);
+				ud.AddChild(Identifier.Create(uan.Alias.Value, Convert(uan.Alias.Location)), UsingAliasDeclaration.AliasRole);
+				if (loc != null)
+					ud.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Assign), Roles.Assign);
+				if (uan.NamespaceExpression != null)
+					ud.AddChild(ConvertToType(uan.NamespaceExpression), UsingAliasDeclaration.ImportRole);
+				if (loc != null && loc.Count > 1)
+					ud.AddChild(new CSharpTokenNode(Convert(loc [1]), Roles.Semicolon), Roles.Semicolon);
+				AddToNamespace(ud);
+			}
+
+			public override void Visit(UsingExternAlias uea)
+			{
+				var ud = new ExternAliasDeclaration();
+				var loc = LocationsBag.GetLocations(uea);
+				ud.AddChild(new CSharpTokenNode(Convert(uea.Location), Roles.ExternKeyword), Roles.ExternKeyword);
+				if (loc != null)
+					ud.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.AliasKeyword), Roles.AliasKeyword);
+				ud.AddChild(Identifier.Create(uea.Alias.Value, Convert(uea.Alias.Location)), Roles.Identifier);
+				if (loc != null && loc.Count > 1)
+					ud.AddChild(new CSharpTokenNode(Convert(loc [1]), Roles.Semicolon), Roles.Semicolon);
+				AddToNamespace(ud);
+			}
+
+			AstType ConvertImport(MemberName memberName)
+			{
+				if (memberName.Left != null) {
+					// left.name
+					var t = new MemberType();
+//					t.IsDoubleColon = memberName.IsDoubleColon;
+					t.AddChild(ConvertImport(memberName.Left), MemberType.TargetRole);
+					var loc = LocationsBag.GetLocations(memberName);
+					if (loc != null)
+						t.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Dot), Roles.Dot);
+					
+					t.AddChild(Identifier.Create(memberName.Name, Convert(memberName.Location)), Roles.Identifier);
+					AddTypeArguments(t, memberName);
+					return t;
+				} else {
+					var t = new SimpleType();
+					t.AddChild(Identifier.Create(memberName.Name, Convert(memberName.Location)), Roles.Identifier);
+					AddTypeArguments(t, memberName);
+					return t;
+				}
+			}
+
+			public override void Visit(MemberCore member)
+			{
+				Console.WriteLine("Unknown member:");
+				Console.WriteLine(member.GetType() + "-> Member {0}", member.GetSignatureForError());
+			}
+
+			readonly Stack<TypeDeclaration> typeStack = new Stack<TypeDeclaration>();
+
+			public override void Visit(Class c)
+			{
+				var newType = new TypeDeclaration();
+				newType.ClassType = ClassType.Class;
+				AddAttributeSection(newType, c);
+				var location = LocationsBag.GetMemberLocation(c);
+				AddModifiers(newType, location);
+				int curLoc = 0;
+				if (location != null && location.Count > 0)
+					newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.ClassKeyword), Roles.ClassKeyword);
+				
+				newType.AddChild(Identifier.Create(c.MemberName.Name, Convert(c.MemberName.Location)), Roles.Identifier);
+				AddTypeParameters(newType, c.MemberName);
+				
+				if (c.TypeBaseExpressions != null) {
+					if (location != null && curLoc < location.Count)
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.Colon), Roles.Colon);
+					
+					var commaLocations = LocationsBag.GetLocations(c.TypeBaseExpressions);
+					int i = 0;
+					foreach (var baseTypes in c.TypeBaseExpressions) {
+						newType.AddChild(ConvertToType(baseTypes), Roles.BaseType);
+						if (commaLocations != null && i < commaLocations.Count) {
+							newType.AddChild(new CSharpTokenNode(Convert(commaLocations [i]), Roles.Comma), Roles.Comma);
+							i++;
+						}
+					}
+				}
+				
+				AddConstraints(newType, c.CurrentTypeParameters);
+				if (location != null && curLoc < location.Count)
+					newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.LBrace), Roles.LBrace);
+				typeStack.Push(newType);
+				base.Visit(c);
+				AddAttributeSection(newType, c.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
+
+				if (location != null && curLoc < location.Count) {
+					newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.RBrace), Roles.RBrace);
+					
+					if (location != null && curLoc < location.Count)
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.Semicolon), Roles.Semicolon);
+					
+				} else {
+					// parser error, set end node to max value.
+					newType.AddChild(new ErrorNode(), Roles.Error);
+				}
+				typeStack.Pop();
+				AddType(newType);
+			}
+
+			public override void Visit(Struct s)
+			{
+				var newType = new TypeDeclaration();
+				newType.ClassType = ClassType.Struct;
+				AddAttributeSection(newType, s);
+				var location = LocationsBag.GetMemberLocation(s);
+				AddModifiers(newType, location);
+				int curLoc = 0;
+				if (location != null && location.Count > 0)
+					newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.StructKeyword), Roles.StructKeyword);
+				newType.AddChild(Identifier.Create(s.MemberName.Name, Convert(s.MemberName.Location)), Roles.Identifier);
+				AddTypeParameters(newType, s.MemberName);
+				
+				if (s.TypeBaseExpressions != null) {
+					if (location != null && curLoc < location.Count)
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.Colon), Roles.Colon);
+					var commaLocations = LocationsBag.GetLocations(s.TypeBaseExpressions);
+					int i = 0;
+					foreach (var baseTypes in s.TypeBaseExpressions) {
+						newType.AddChild(ConvertToType(baseTypes), Roles.BaseType);
+						if (commaLocations != null && i < commaLocations.Count) {
+							newType.AddChild(new CSharpTokenNode(Convert(commaLocations [i]), Roles.Comma), Roles.Comma);
+							i++;
+						}
+					}
+				}
+				
+				AddConstraints(newType, s.CurrentTypeParameters);
+				if (location != null && curLoc < location.Count)
+					newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.LBrace), Roles.LBrace);
+				typeStack.Push(newType);
+				base.Visit(s);
+				if (location != null && location.Count > 2) {
+					if (location != null && curLoc < location.Count)
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.RBrace), Roles.RBrace);
+					if (location != null && curLoc < location.Count)
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.Semicolon), Roles.Semicolon);
+				} else {
+					// parser error, set end node to max value.
+					newType.AddChild(new ErrorNode(), Roles.Error);
+				}
+				typeStack.Pop();
+				AddType(newType);
+			}
+
+			public override void Visit(Interface i)
+			{
+				var newType = new TypeDeclaration();
+				newType.ClassType = ClassType.Interface;
+				AddAttributeSection(newType, i);
+				var location = LocationsBag.GetMemberLocation(i);
+				AddModifiers(newType, location);
+				int curLoc = 0;
+				if (location != null && location.Count > 0)
+					newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.InterfaceKeyword), Roles.InterfaceKeyword);
+				newType.AddChild(Identifier.Create(i.MemberName.Name, Convert(i.MemberName.Location)), Roles.Identifier);
+				AddTypeParameters(newType, i.MemberName);
+				
+				if (i.TypeBaseExpressions != null) {
+					if (location != null && curLoc < location.Count)
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.Colon), Roles.Colon);
+					var commaLocations = LocationsBag.GetLocations(i.TypeBaseExpressions);
+					int j = 0;
+					foreach (var baseTypes in i.TypeBaseExpressions) {
+						newType.AddChild(ConvertToType(baseTypes), Roles.BaseType);
+						if (commaLocations != null && j < commaLocations.Count) {
+							newType.AddChild(new CSharpTokenNode(Convert(commaLocations [j]), Roles.Comma), Roles.Comma);
+							j++;
+						}
+					}
+				}
+				
+				AddConstraints(newType, i.CurrentTypeParameters);
+				if (location != null && curLoc < location.Count)
+					newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.LBrace), Roles.LBrace);
+				typeStack.Push(newType);
+				base.Visit(i);
+				if (location != null && location.Count > 2) {
+					if (location != null && curLoc < location.Count)
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.RBrace), Roles.RBrace);
+					if (location != null && curLoc < location.Count)
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.Semicolon), Roles.Semicolon);
+				} else {
+					// parser error, set end node to max value.
+					newType.AddChild(new ErrorNode(), Roles.Error);
+				}
+				typeStack.Pop();
+				AddType(newType);
+			}
+
+			public override void Visit(Mono.CSharp.Delegate d)
+			{
+				var newDelegate = new DelegateDeclaration();
+				var location = LocationsBag.GetMemberLocation(d);
+				AddAttributeSection(newDelegate, d);
+				AddModifiers(newDelegate, location);
+				if (location != null && location.Count > 0) {
+					newDelegate.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.DelegateKeyword), Roles.DelegateKeyword);
+				}
+				if (d.ReturnType != null)
+					newDelegate.AddChild(ConvertToType(d.ReturnType), Roles.Type);
+				newDelegate.AddChild(Identifier.Create(d.MemberName.Name, Convert(d.MemberName.Location)), Roles.Identifier);
+				AddTypeParameters(newDelegate, d.MemberName);
+				
+				if (location != null && location.Count > 1)
+					newDelegate.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.LPar), Roles.LPar);
+				AddParameter(newDelegate, d.Parameters);
+				
+				if (location != null && location.Count > 2) {
+					newDelegate.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.RPar), Roles.RPar);
+				}
+				AddConstraints(newDelegate, d.CurrentTypeParameters);
+				if (location != null && location.Count > 3) {
+					newDelegate.AddChild(new CSharpTokenNode(Convert(location [3]), Roles.Semicolon), Roles.Semicolon);
+				}
+				AddType(newDelegate);
+			}
+
+			void AddType(EntityDeclaration child)
+			{
+				if (typeStack.Count > 0) {
+					typeStack.Peek().AddChild(child, Roles.TypeMemberRole);
+				} else {
+					AddToNamespace(child);
+				}
+			}
+
+			void AddToNamespace(AstNode child)
+			{
+				if (namespaceStack.Count > 0) {
+					namespaceStack.Peek().AddChild(child, NamespaceDeclaration.MemberRole);
+				} else {
+					unit.AddChild(child, SyntaxTree.MemberRole);
+				}
+			}
+
+			public override void Visit(Mono.CSharp.Enum e)
+			{
+				var newType = new TypeDeclaration();
+				newType.ClassType = ClassType.Enum;
+				AddAttributeSection(newType, e);
+				var location = LocationsBag.GetMemberLocation(e);
+				
+				AddModifiers(newType, location);
+				int curLoc = 0;
+				if (location != null && location.Count > 0)
+					newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.EnumKeyword), Roles.EnumKeyword);
+				newType.AddChild(Identifier.Create(e.MemberName.Name, Convert(e.MemberName.Location)), Roles.Identifier);
+				
+				if (e.BaseTypeExpression != null) {
+					if (location != null && curLoc < location.Count)
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.Colon), Roles.Colon);
+					newType.AddChild(ConvertToType(e.BaseTypeExpression), Roles.BaseType);
+				}
+
+				if (location != null && curLoc < location.Count)
+					newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.LBrace), Roles.LBrace);
+				typeStack.Push(newType);
+				
+				foreach (var m in e.Members) {
+					var member = m as EnumMember;
+					if (member == null) {
+						Console.WriteLine("WARNING - ENUM MEMBER: " + m);
+						continue;
+					}
+					Visit(member);
+					if (location != null && curLoc < location.Count - 1) //last one is closing brace
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.Comma), Roles.Comma);
+				}
+				
+				if (location != null && location.Count > 2) {
+					if (location != null && curLoc < location.Count)
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.RBrace), Roles.RBrace);
+					if (location != null && curLoc < location.Count)
+						newType.AddChild(new CSharpTokenNode(Convert(location [curLoc++]), Roles.Semicolon), Roles.Semicolon);
+				} else {
+					// parser error, set end node to max value.
+					newType.AddChild(new ErrorNode(), Roles.Error);
+				}
+
+				AddAttributeSection(newType, e.UnattachedAttributes, EntityDeclaration.UnattachedAttributeRole);
+				typeStack.Pop();
+				AddType(newType);
+			}
+
+			public override void Visit(EnumMember em)
+			{
+				var newField = new EnumMemberDeclaration();
+				AddAttributeSection(newField, em);
+				newField.AddChild(Identifier.Create(em.Name, Convert(em.Location)), Roles.Identifier);
+				if (em.Initializer != null) {
+					newField.AddChild(new CSharpTokenNode(Convert(em.Initializer.Location), Roles.Assign), Roles.Assign);
+					newField.AddChild((Expression)em.Initializer.Accept(this), EnumMemberDeclaration.InitializerRole);
+				}
+				//Console.WriteLine (newField.StartLocation +"-" + newField.EndLocation);
+				
+				typeStack.Peek().AddChild(newField, Roles.TypeMemberRole);
+			}
+
+			#endregion
+
+			#region Type members
+
+			public override void Visit(FixedField f)
+			{
+				var location = LocationsBag.GetMemberLocation(f);
+				int locationIdx = 0;
+				
+				var newField = new FixedFieldDeclaration();
+				AddAttributeSection(newField, f);
+				AddModifiers(newField, location);
+				if (location != null && location.Count > 0)
+					newField.AddChild(new CSharpTokenNode(Convert(location [locationIdx++]), FixedFieldDeclaration.FixedKeywordRole), FixedFieldDeclaration.FixedKeywordRole);
+
+				if (f.TypeExpression != null)
+					newField.AddChild(ConvertToType(f.TypeExpression), Roles.Type);
+				
+				var variable = new FixedVariableInitializer();
+				variable.AddChild(Identifier.Create(f.MemberName.Name, Convert(f.MemberName.Location)), Roles.Identifier);
+				if (f.Initializer != null && !f.Initializer.IsNull) {
+					variable.AddChild(new CSharpTokenNode(Convert(f.Initializer.Location), Roles.LBracket), Roles.LBracket);
+					
+					variable.AddChild((Expression)f.Initializer.Accept(this), Roles.Expression);
+					var bracketLocations = LocationsBag.GetLocations(f.Initializer);
+					if (bracketLocations != null)
+						variable.AddChild(new CSharpTokenNode(Convert(bracketLocations [0]), Roles.RBracket), Roles.RBracket);
+				}
+				newField.AddChild(variable, FixedFieldDeclaration.VariableRole);
+				
+				if (f.Declarators != null) {
+					foreach (var decl in f.Declarators) {
+						var declLoc = LocationsBag.GetLocations(decl);
+						if (declLoc != null)
+							newField.AddChild(new CSharpTokenNode(Convert(declLoc [0]), Roles.Comma), Roles.Comma);
+						
+						variable = new FixedVariableInitializer();
+						variable.AddChild(Identifier.Create(decl.Name.Value, Convert(decl.Name.Location)), Roles.Identifier);
+						variable.AddChild(new CSharpTokenNode(Convert(decl.Initializer.Location), Roles.LBracket), Roles.LBracket);
+						variable.AddChild((Expression)decl.Initializer.Accept(this), Roles.Expression);
+						var bracketLocations = LocationsBag.GetLocations(decl.Initializer);
+						if (bracketLocations != null)
+							variable.AddChild(new CSharpTokenNode(Convert(bracketLocations [0]), Roles.RBracket), Roles.RBracket);
+
+						newField.AddChild(variable, FixedFieldDeclaration.VariableRole);
+					}
+				}
+				if (location != null && location.Count > locationIdx)
+					newField.AddChild(new CSharpTokenNode(Convert(location [locationIdx]), Roles.Semicolon), Roles.Semicolon);
+				typeStack.Peek().AddChild(newField, Roles.TypeMemberRole);
+				
+			}
+
+			public override void Visit(Field f)
+			{
+				var location = LocationsBag.GetMemberLocation(f);
+				
+				var newField = new FieldDeclaration();
+				AddAttributeSection(newField, f);
+				AddModifiers(newField, location);
+				newField.AddChild(ConvertToType(f.TypeExpression), Roles.Type);
+				
+				var variable = new VariableInitializer();
+				variable.AddChild(Identifier.Create(f.MemberName.Name, Convert(f.MemberName.Location)), Roles.Identifier);
+				int locationIdx = 0;
+				if (f.Initializer != null) {
+					if (location != null)
+						variable.AddChild(new CSharpTokenNode(Convert(location [locationIdx++]), Roles.Assign), Roles.Assign);
+					variable.AddChild((Expression)f.Initializer.Accept(this), Roles.Expression);
+				}
+				newField.AddChild(variable, Roles.Variable);
+				if (f.Declarators != null) {
+					foreach (var decl in f.Declarators) {
+						var declLoc = LocationsBag.GetLocations(decl);
+						if (declLoc != null)
+							newField.AddChild(new CSharpTokenNode(Convert(declLoc [0]), Roles.Comma), Roles.Comma);
+						
+						variable = new VariableInitializer();
+						variable.AddChild(Identifier.Create(decl.Name.Value, Convert(decl.Name.Location)), Roles.Identifier);
+						if (decl.Initializer != null) {
+							if (declLoc != null)
+								variable.AddChild(new CSharpTokenNode(Convert(declLoc [1]), Roles.Assign), Roles.Assign);
+							variable.AddChild((Expression)decl.Initializer.Accept(this), Roles.Expression);
+						}
+						newField.AddChild(variable, Roles.Variable);
+					}
+				}
+				if (location != null && location.Count > locationIdx)
+					newField.AddChild(new CSharpTokenNode(Convert(location [locationIdx++]), Roles.Semicolon), Roles.Semicolon);
+
+				typeStack.Peek().AddChild(newField, Roles.TypeMemberRole);
+			}
+
+			public override void Visit(Const c)
+			{
+				var location = LocationsBag.GetMemberLocation(c);
+				
+				var newField = new FieldDeclaration();
+				AddAttributeSection(newField, c);
+				AddModifiers(newField, location);
+				if (location != null)
+					newField.AddChild(new CSharpModifierToken(Convert(location [0]), Modifiers.Const), EntityDeclaration.ModifierRole);
+				newField.AddChild(ConvertToType(c.TypeExpression), Roles.Type);
+				
+				var variable = new VariableInitializer();
+				variable.AddChild(Identifier.Create(c.MemberName.Name, Convert(c.MemberName.Location)), Roles.Identifier);
+				
+				if (c.Initializer != null) {
+					variable.AddChild(new CSharpTokenNode(Convert(c.Initializer.Location), Roles.Assign), Roles.Assign);
+					variable.AddChild((Expression)c.Initializer.Accept(this), Roles.Expression);
+				}
+				newField.AddChild(variable, Roles.Variable);
+				if (c.Declarators != null) {
+					foreach (var decl in c.Declarators) {
+						var declLoc = LocationsBag.GetLocations(decl);
+						if (declLoc != null)
+							newField.AddChild(new CSharpTokenNode(Convert(declLoc [0]), Roles.Comma), Roles.Comma);
+						
+						variable = new VariableInitializer();
+						variable.AddChild(Identifier.Create(decl.Name.Value, Convert(decl.Name.Location)), Roles.Identifier);
+						if (decl.Initializer != null) {
+							variable.AddChild(new CSharpTokenNode(Convert(decl.Initializer.Location), Roles.Assign), Roles.Assign);
+							variable.AddChild((Expression)decl.Initializer.Accept(this), Roles.Expression);
+						}
+						newField.AddChild(variable, Roles.Variable);
+					}
+				}
+				if (location != null)
+					newField.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Semicolon), Roles.Semicolon);
+				
+				typeStack.Peek().AddChild(newField, Roles.TypeMemberRole);
+
+				
+			}
+
+			public override void Visit(Operator o)
+			{
+				var newOperator = new OperatorDeclaration();
+				newOperator.OperatorType = (OperatorType)o.OperatorType;
+				
+				var location = LocationsBag.GetMemberLocation(o);
+				AddAttributeSection(newOperator, o);
+				AddModifiers(newOperator, location);
+				
+				
+				if (o.OperatorType == Operator.OpType.Implicit) {
+					if (location != null && location.Count > 0) {
+						newOperator.AddChild(new CSharpTokenNode(Convert(location [0]), OperatorDeclaration.ImplicitRole), OperatorDeclaration.ImplicitRole);
+						if (location.Count > 1)
+							newOperator.AddChild(new CSharpTokenNode(Convert(location [1]), OperatorDeclaration.OperatorKeywordRole), OperatorDeclaration.OperatorKeywordRole);
+					}
+					newOperator.AddChild(ConvertToType(o.TypeExpression), Roles.Type);
+				} else if (o.OperatorType == Operator.OpType.Explicit) {
+					if (location != null && location.Count > 0) {
+						newOperator.AddChild(new CSharpTokenNode(Convert(location [0]), OperatorDeclaration.ExplicitRole), OperatorDeclaration.ExplicitRole);
+						if (location.Count > 1)
+							newOperator.AddChild(new CSharpTokenNode(Convert(location [1]), OperatorDeclaration.OperatorKeywordRole), OperatorDeclaration.OperatorKeywordRole);
+					}
+					newOperator.AddChild(ConvertToType(o.TypeExpression), Roles.Type);
+				} else {
+					newOperator.AddChild(ConvertToType(o.TypeExpression), Roles.Type);
+
+					if (location != null && location.Count > 0)
+						newOperator.AddChild(new CSharpTokenNode(Convert(location [0]), OperatorDeclaration.OperatorKeywordRole), OperatorDeclaration.OperatorKeywordRole);
+					
+					if (location != null && location.Count > 1) {
+						var r = OperatorDeclaration.GetRole(newOperator.OperatorType);
+						newOperator.AddChild(new CSharpTokenNode(Convert(location [1]), r), r);
+					}
+				}
+				if (location != null && location.Count > 2)
+					newOperator.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.LPar), Roles.LPar);
+				AddParameter(newOperator, o.ParameterInfo);
+				if (location != null && location.Count > 3)
+					newOperator.AddChild(new CSharpTokenNode(Convert(location [3]), Roles.RPar), Roles.RPar);
+				
+				if (o.Block != null) {
+					newOperator.AddChild((BlockStatement)o.Block.Accept(this), Roles.Body);
+				} else {
+					if (location != null && location.Count >= 5)
+						newOperator.AddChild(new CSharpTokenNode(Convert(location [4]), Roles.Semicolon), Roles.Semicolon);
+				}
+				typeStack.Peek().AddChild(newOperator, Roles.TypeMemberRole);
+			}
+
+			public void AddAttributeSection(AstNode parent, Attributable a)
+			{
+				if (a == null || a.OptAttributes == null)
+					return;
+				AddAttributeSection(parent, a.OptAttributes);
+			}
+
+			public void AddAttributeSection(AstNode parent, Attributes attrs, Role<AttributeSection> role)
+			{
+				if (attrs == null)
+					return;
+				foreach (var attr in attrs.Sections) {
+					var section = ConvertAttributeSection(attr);
+					if (section == null)
+						continue;
+					parent.AddChild(section, role);
+				}
+			}
+
+			public void AddAttributeSection(AstNode parent, Attributes attrs)
+			{
+				AddAttributeSection(parent, attrs, EntityDeclaration.AttributeRole);
+			}
+
+			public override void Visit(Indexer i)
+			{
+				var newIndexer = new IndexerDeclaration();
+				AddAttributeSection(newIndexer, i);
+				var location = LocationsBag.GetMemberLocation(i);
+				AddModifiers(newIndexer, location);
+				newIndexer.AddChild(ConvertToType(i.TypeExpression), Roles.Type);
+				AddExplicitInterface(newIndexer, i.MemberName);
+				var name = i.MemberName;
+				newIndexer.AddChild(new CSharpTokenNode(Convert(name.Location), IndexerDeclaration.ThisKeywordRole), IndexerDeclaration.ThisKeywordRole);
+				
+				if (location != null && location.Count > 0)
+					newIndexer.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LBracket), Roles.LBracket);
+				AddParameter(newIndexer, i.ParameterInfo);
+				if (location != null && location.Count > 1)
+					newIndexer.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RBracket), Roles.RBracket);
+				
+				if (location != null && location.Count > 2)
+					newIndexer.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.LBrace), Roles.LBrace);
+				if (i.Get != null) {
+					var getAccessor = new Accessor();
+					var getLocation = LocationsBag.GetMemberLocation(i.Get);
+					AddAttributeSection(getAccessor, i.Get);
+					AddModifiers(getAccessor, getLocation);
+					if (getLocation != null)
+						getAccessor.AddChild(new CSharpTokenNode(Convert(i.Get.Location), PropertyDeclaration.GetKeywordRole), PropertyDeclaration.GetKeywordRole);
+					if (i.Get.Block != null) {
+						getAccessor.AddChild((BlockStatement)i.Get.Block.Accept(this), Roles.Body);
+					} else {
+						if (getLocation != null && getLocation.Count > 0)
+							newIndexer.AddChild(new CSharpTokenNode(Convert(getLocation [0]), Roles.Semicolon), Roles.Semicolon);
+					}
+					newIndexer.AddChild(getAccessor, PropertyDeclaration.GetterRole);
+				}
+				
+				if (i.Set != null) {
+					var setAccessor = new Accessor();
+					var setLocation = LocationsBag.GetMemberLocation(i.Set);
+					AddAttributeSection(setAccessor, i.Set);
+					AddModifiers(setAccessor, setLocation);
+					if (setLocation != null)
+						setAccessor.AddChild(new CSharpTokenNode(Convert(i.Set.Location), PropertyDeclaration.SetKeywordRole), PropertyDeclaration.SetKeywordRole);
+					
+					if (i.Set.Block != null) {
+						setAccessor.AddChild((BlockStatement)i.Set.Block.Accept(this), Roles.Body);
+					} else {
+						if (setLocation != null && setLocation.Count > 0)
+							newIndexer.AddChild(new CSharpTokenNode(Convert(setLocation [0]), Roles.Semicolon), Roles.Semicolon);
+					}
+					newIndexer.AddChild(setAccessor, PropertyDeclaration.SetterRole);
+				}
+				
+				if (location != null) {
+					if (location.Count > 3)
+						newIndexer.AddChild(new CSharpTokenNode(Convert(location [3]), Roles.RBrace), Roles.RBrace);
+				} else {
+					// parser error, set end node to max value.
+					newIndexer.AddChild(new ErrorNode(), Roles.Error);
+				}
+				typeStack.Peek().AddChild(newIndexer, Roles.TypeMemberRole);
+			}
+
+			public override void Visit(Method m)
+			{
+				var newMethod = new MethodDeclaration();
+				AddAttributeSection(newMethod, m);
+				var location = LocationsBag.GetMemberLocation(m);
+				AddModifiers(newMethod, location);
+				newMethod.AddChild(ConvertToType(m.TypeExpression), Roles.Type);
+				AddExplicitInterface(newMethod, m.MethodName);
+				newMethod.AddChild(Identifier.Create(m.MethodName.Name, Convert(m.Location)), Roles.Identifier);
+				
+				AddTypeParameters(newMethod, m.MemberName);
+				
+				if (location != null && location.Count > 0)
+					newMethod.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				AddParameter(newMethod, m.ParameterInfo);
+				
+				if (location != null && location.Count > 1)
+					newMethod.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				
+				AddConstraints(newMethod, m.CurrentTypeParameters);
+				
+				if (m.Block != null) {
+					var bodyBlock = (BlockStatement)m.Block.Accept(this);
+//					if (m.Block is ToplevelBlock) {
+//						newMethod.AddChild (bodyBlock.FirstChild.NextSibling, Roles.Body);
+//					} else {
+					newMethod.AddChild(bodyBlock, Roles.Body);
+//					}
+				} else if (location != null) {
+					if (location.Count < 3) {
+						// parser error, set end node to max value.
+						newMethod.AddChild(new ErrorNode(), Roles.Error);
+					} else {
+						newMethod.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.Semicolon), Roles.Semicolon);
+					}
+				}
+				typeStack.Peek().AddChild(newMethod, Roles.TypeMemberRole);
+			}
+
+			static readonly Dictionary<Mono.CSharp.Modifiers, Modifiers> modifierTable = new Dictionary<Mono.CSharp.Modifiers, Modifiers>();
+			static readonly string[] keywordTable;
+
+			static ConversionVisitor()
+			{
+				modifierTable [Mono.CSharp.Modifiers.NEW] = Modifiers.New;
+				modifierTable [Mono.CSharp.Modifiers.PUBLIC] = Modifiers.Public;
+				modifierTable [Mono.CSharp.Modifiers.PROTECTED] = Modifiers.Protected;
+				modifierTable [Mono.CSharp.Modifiers.PRIVATE] = Modifiers.Private;
+				modifierTable [Mono.CSharp.Modifiers.INTERNAL] = Modifiers.Internal;
+				modifierTable [Mono.CSharp.Modifiers.ABSTRACT] = Modifiers.Abstract;
+				modifierTable [Mono.CSharp.Modifiers.VIRTUAL] = Modifiers.Virtual;
+				modifierTable [Mono.CSharp.Modifiers.SEALED] = Modifiers.Sealed;
+				modifierTable [Mono.CSharp.Modifiers.STATIC] = Modifiers.Static;
+				modifierTable [Mono.CSharp.Modifiers.OVERRIDE] = Modifiers.Override;
+				modifierTable [Mono.CSharp.Modifiers.READONLY] = Modifiers.Readonly;
+				modifierTable [Mono.CSharp.Modifiers.PARTIAL] = Modifiers.Partial;
+				modifierTable [Mono.CSharp.Modifiers.EXTERN] = Modifiers.Extern;
+				modifierTable [Mono.CSharp.Modifiers.VOLATILE] = Modifiers.Volatile;
+				modifierTable [Mono.CSharp.Modifiers.UNSAFE] = Modifiers.Unsafe;
+				modifierTable [Mono.CSharp.Modifiers.ASYNC] = Modifiers.Async;
+				
+				keywordTable = new string[255];
+				for (int i = 0; i < keywordTable.Length; i++)
+					keywordTable [i] = "unknown";
+				
+				keywordTable [(int)BuiltinTypeSpec.Type.Other] = "void";
+				keywordTable [(int)BuiltinTypeSpec.Type.String] = "string";
+				keywordTable [(int)BuiltinTypeSpec.Type.Int] = "int";
+				keywordTable [(int)BuiltinTypeSpec.Type.Object] = "object";
+				keywordTable [(int)BuiltinTypeSpec.Type.Float] = "float";
+				keywordTable [(int)BuiltinTypeSpec.Type.Double] = "double";
+				keywordTable [(int)BuiltinTypeSpec.Type.Long] = "long";
+				keywordTable [(int)BuiltinTypeSpec.Type.Byte] = "byte";
+				keywordTable [(int)BuiltinTypeSpec.Type.UInt] = "uint";
+				keywordTable [(int)BuiltinTypeSpec.Type.ULong] = "ulong";
+				keywordTable [(int)BuiltinTypeSpec.Type.Short] = "short";
+				keywordTable [(int)BuiltinTypeSpec.Type.UShort] = "ushort";
+				keywordTable [(int)BuiltinTypeSpec.Type.SByte] = "sbyte";
+				keywordTable [(int)BuiltinTypeSpec.Type.Decimal] = "decimal";
+				keywordTable [(int)BuiltinTypeSpec.Type.Char] = "char";
+				keywordTable [(int)BuiltinTypeSpec.Type.Bool] = "bool";
+			}
+
+			static void AddModifiers(EntityDeclaration parent, LocationsBag.MemberLocations location)
+			{
+				if (location == null || location.Modifiers == null)
+					return;
+				foreach (var modifier in location.Modifiers) {
+					Modifiers mod;
+					if (!modifierTable.TryGetValue(modifier.Item1, out mod)) {
+						Console.WriteLine("modifier " + modifier.Item1 + " can't be converted,");
+					}
+					
+					parent.AddChild(new CSharpModifierToken(Convert(modifier.Item2), mod), EntityDeclaration.ModifierRole);
+				}
+			}
+
+			public override void Visit(Property p)
+			{
+				var newProperty = new PropertyDeclaration();
+				AddAttributeSection(newProperty, p);
+				var location = LocationsBag.GetMemberLocation(p);
+				AddModifiers(newProperty, location);
+				newProperty.AddChild(ConvertToType(p.TypeExpression), Roles.Type);
+				AddExplicitInterface(newProperty, p.MemberName);
+				newProperty.AddChild(Identifier.Create(p.MemberName.Name, Convert(p.Location)), Roles.Identifier);
+				
+				if (location != null && location.Count > 0)
+					newProperty.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LBrace), Roles.LBrace);
+				
+				Accessor getAccessor = null;
+				if (p.Get != null) {
+					getAccessor = new Accessor();
+					AddAttributeSection(getAccessor, p.Get);
+					var getLocation = LocationsBag.GetMemberLocation(p.Get);
+					AddModifiers(getAccessor, getLocation);
+					getAccessor.AddChild(new CSharpTokenNode(Convert(p.Get.Location), PropertyDeclaration.GetKeywordRole), PropertyDeclaration.GetKeywordRole);
+					
+					if (p.Get.Block != null) {
+						getAccessor.AddChild((BlockStatement)p.Get.Block.Accept(this), Roles.Body);
+					} else {
+						if (getLocation != null && getLocation.Count > 0)
+							getAccessor.AddChild(new CSharpTokenNode(Convert(getLocation [0]), Roles.Semicolon), Roles.Semicolon);
+					}
+				}
+				
+				Accessor setAccessor = null;
+				if (p.Set != null) {
+					setAccessor = new Accessor();
+					AddAttributeSection(setAccessor, p.Set);
+					var setLocation = LocationsBag.GetMemberLocation(p.Set);
+					AddModifiers(setAccessor, setLocation);
+					setAccessor.AddChild(new CSharpTokenNode(Convert(p.Set.Location), PropertyDeclaration.SetKeywordRole), PropertyDeclaration.SetKeywordRole);
+					
+					if (p.Set.Block != null) {
+						setAccessor.AddChild((BlockStatement)p.Set.Block.Accept(this), Roles.Body);
+					} else {
+						if (setLocation != null && setLocation.Count > 0)
+							setAccessor.AddChild(new CSharpTokenNode(Convert(setLocation [0]), Roles.Semicolon), Roles.Semicolon);
+					}
+				}
+				if (getAccessor != null && setAccessor != null) {
+					if (getAccessor.StartLocation < setAccessor.StartLocation) {
+						newProperty.AddChild(getAccessor, PropertyDeclaration.GetterRole);
+						newProperty.AddChild(setAccessor, PropertyDeclaration.SetterRole);
+					} else {
+						newProperty.AddChild(setAccessor, PropertyDeclaration.SetterRole);
+						newProperty.AddChild(getAccessor, PropertyDeclaration.GetterRole);
+					}
+				} else {
+					if (getAccessor != null)
+						newProperty.AddChild(getAccessor, PropertyDeclaration.GetterRole);
+					if (setAccessor != null)
+						newProperty.AddChild(setAccessor, PropertyDeclaration.SetterRole);
+				}
+				
+				if (location != null && location.Count > 1) {
+					newProperty.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RBrace), Roles.RBrace);
+				} else {
+					// parser error, set end node to max value.
+					newProperty.AddChild(new ErrorNode(), Roles.Error);
+				}
+				
+				typeStack.Peek().AddChild(newProperty, Roles.TypeMemberRole);
+			}
+
+			public override void Visit(Constructor c)
+			{
+				var newConstructor = new ConstructorDeclaration();
+				AddAttributeSection(newConstructor, c);
+				var location = LocationsBag.GetMemberLocation(c);
+				AddModifiers(newConstructor, location);
+				newConstructor.AddChild(Identifier.Create(c.MemberName.Name, Convert(c.MemberName.Location)), Roles.Identifier);
+				if (location != null && location.Count > 0)
+					newConstructor.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				
+				AddParameter(newConstructor, c.ParameterInfo);
+				if (location != null && location.Count > 1)
+					newConstructor.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				
+				if (c.Initializer != null) {
+					var initializer = new ConstructorInitializer();
+					initializer.ConstructorInitializerType = c.Initializer is ConstructorBaseInitializer ? ConstructorInitializerType.Base : ConstructorInitializerType.This;
+					var initializerLocation = LocationsBag.GetLocations(c.Initializer);
+					
+					if (initializerLocation != null)
+						newConstructor.AddChild(new CSharpTokenNode(Convert(initializerLocation [0]), Roles.Colon), Roles.Colon);
+					
+					if (initializerLocation != null && initializerLocation.Count > 1) {
+						// this and base has the same length
+						var r = initializer.ConstructorInitializerType == ConstructorInitializerType.This ? ConstructorInitializer.ThisKeywordRole : ConstructorInitializer.BaseKeywordRole;
+						initializer.AddChild(new CSharpTokenNode(Convert(c.Initializer.Location), r), r);
+						initializer.AddChild(new CSharpTokenNode(Convert(initializerLocation [1]), Roles.LPar), Roles.LPar);
+						AddArguments(initializer, c.Initializer.Arguments);
+						initializer.AddChild(new CSharpTokenNode(Convert(initializerLocation [2]), Roles.RPar), Roles.RPar);
+						newConstructor.AddChild(initializer, ConstructorDeclaration.InitializerRole);
+					}
+				}
+				
+				if (c.Block != null)
+					newConstructor.AddChild((BlockStatement)c.Block.Accept(this), Roles.Body);
+				typeStack.Peek().AddChild(newConstructor, Roles.TypeMemberRole);
+			}
+
+			public override void Visit(Destructor d)
+			{
+				var newDestructor = new DestructorDeclaration();
+				AddAttributeSection(newDestructor, d);
+				var location = LocationsBag.GetMemberLocation(d);
+				AddModifiers(newDestructor, location);
+				if (location != null && location.Count > 0)
+					newDestructor.AddChild(new CSharpTokenNode(Convert(location [0]), DestructorDeclaration.TildeRole), DestructorDeclaration.TildeRole);
+				newDestructor.AddChild(Identifier.Create(d.Identifier, Convert(d.MemberName.Location)), Roles.Identifier);
+				
+				if (location != null && location.Count > 1) {
+					newDestructor.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.LPar), Roles.LPar);
+					
+					if (location.Count > 2)
+						newDestructor.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.RPar), Roles.RPar);
+				}
+				
+				if (d.Block != null)
+					newDestructor.AddChild((BlockStatement)d.Block.Accept(this), Roles.Body);
+				
+				typeStack.Peek().AddChild(newDestructor, Roles.TypeMemberRole);
+			}
+
+			public override void Visit(EventField e)
+			{
+				var newEvent = new EventDeclaration();
+				AddAttributeSection(newEvent, e);
+				var location = LocationsBag.GetMemberLocation(e);
+				int l = 0;
+				AddModifiers(newEvent, location);
+				
+				if (location != null && location.Count > 0)
+					newEvent.AddChild(new CSharpTokenNode(Convert(location [l++]), EventDeclaration.EventKeywordRole), EventDeclaration.EventKeywordRole);
+				newEvent.AddChild(ConvertToType(e.TypeExpression), Roles.Type);
+				
+				var variable = new VariableInitializer();
+				variable.AddChild(Identifier.Create(e.MemberName.Name, Convert(e.MemberName.Location)), Roles.Identifier);
+				
+				if (e.Initializer != null) {
+					if (location != null && location.Count > l)
+						variable.AddChild(new CSharpTokenNode(Convert(location [l++]), Roles.Assign), Roles.Assign);
+					variable.AddChild((Expression)e.Initializer.Accept(this), Roles.Expression);
+				}
+				newEvent.AddChild(variable, Roles.Variable);
+				if (e.Declarators != null) {
+					foreach (var decl in e.Declarators) {
+						var declLoc = LocationsBag.GetLocations(decl);
+						if (declLoc != null)
+							newEvent.AddChild(new CSharpTokenNode(Convert(declLoc [0]), Roles.Comma), Roles.Comma);
+						
+						variable = new VariableInitializer();
+						variable.AddChild(Identifier.Create(decl.Name.Value, Convert(decl.Name.Location)), Roles.Identifier);
+
+						if (decl.Initializer != null) {
+							if (declLoc != null)
+								variable.AddChild(new CSharpTokenNode(Convert(declLoc [1]), Roles.Assign), Roles.Assign);
+							variable.AddChild((Expression)decl.Initializer.Accept(this), Roles.Expression);
+						}
+						newEvent.AddChild(variable, Roles.Variable);
+					}
+				}
+				
+				if (location != null && location.Count > l)
+					newEvent.AddChild(new CSharpTokenNode(Convert(location [l++]), Roles.Semicolon), Roles.Semicolon);
+				
+				typeStack.Peek().AddChild(newEvent, Roles.TypeMemberRole);
+			}
+
+			void AddExplicitInterface(AstNode parent, MemberName memberName)
+			{
+				if (memberName == null || memberName.ExplicitInterface == null)
+					return;
+				
+				parent.AddChild(ConvertToType(memberName.ExplicitInterface), EntityDeclaration.PrivateImplementationTypeRole);
+				var privateImplTypeLoc = LocationsBag.GetLocations(memberName.ExplicitInterface);
+				if (privateImplTypeLoc != null)
+					parent.AddChild(new CSharpTokenNode(Convert(privateImplTypeLoc [0]), Roles.Dot), Roles.Dot);
+			}
+
+			public override void Visit(EventProperty ep)
+			{
+				var newEvent = new CustomEventDeclaration();
+				AddAttributeSection(newEvent, ep);
+				var location = LocationsBag.GetMemberLocation(ep);
+				AddModifiers(newEvent, location);
+				
+				if (location != null && location.Count > 0)
+					newEvent.AddChild(new CSharpTokenNode(Convert(location [0]), CustomEventDeclaration.EventKeywordRole), CustomEventDeclaration.EventKeywordRole);
+				newEvent.AddChild(ConvertToType(ep.TypeExpression), Roles.Type);
+				
+				AddExplicitInterface(newEvent, ep.MemberName);
+				
+				newEvent.AddChild(Identifier.Create(ep.MemberName.Name, Convert(ep.Location)), Roles.Identifier);
+
+				if (location != null && location.Count >= 2)
+					newEvent.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.LBrace), Roles.LBrace);
+				
+				if (ep.Add != null) {
+					var addAccessor = new Accessor();
+					AddAttributeSection(addAccessor, ep.Add);
+					var addLocation = LocationsBag.GetMemberLocation(ep.Add);
+					AddModifiers(addAccessor, addLocation);
+					addAccessor.AddChild(new CSharpTokenNode(Convert(ep.Add.Location), CustomEventDeclaration.AddKeywordRole), CustomEventDeclaration.AddKeywordRole);
+					if (ep.Add.Block != null)
+						addAccessor.AddChild((BlockStatement)ep.Add.Block.Accept(this), Roles.Body);
+					newEvent.AddChild(addAccessor, CustomEventDeclaration.AddAccessorRole);
+				}
+				
+				if (ep.Remove != null) {
+					var removeAccessor = new Accessor();
+					AddAttributeSection(removeAccessor, ep.Remove);
+					var removeLocation = LocationsBag.GetMemberLocation(ep.Remove);
+					AddModifiers(removeAccessor, removeLocation);
+					removeAccessor.AddChild(new CSharpTokenNode(Convert(ep.Remove.Location), CustomEventDeclaration.RemoveKeywordRole), CustomEventDeclaration.RemoveKeywordRole);
+					
+					if (ep.Remove.Block != null)
+						removeAccessor.AddChild((BlockStatement)ep.Remove.Block.Accept(this), Roles.Body);
+					newEvent.AddChild(removeAccessor, CustomEventDeclaration.RemoveAccessorRole);
+				}
+				if (location != null && location.Count >= 3) {
+					newEvent.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.RBrace), Roles.RBrace);
+				} else {
+					// parser error, set end node to max value.
+					newEvent.AddChild(new ErrorNode(), Roles.Error);
+				}
+				
+				typeStack.Peek().AddChild(newEvent, Roles.TypeMemberRole);
+			}
+
+			#endregion
+
+			#region Statements
+
+			public override object Visit(Mono.CSharp.Statement stmt)
+			{
+				Console.WriteLine("unknown statement:" + stmt);
+				return null;
+			}
+
+			public override object Visit(BlockVariable blockVariableDeclaration)
+			{
+				var result = new VariableDeclarationStatement();
+				result.AddChild(ConvertToType(blockVariableDeclaration.TypeExpression), Roles.Type);
+				
+				var varInit = new VariableInitializer();
+				var location = LocationsBag.GetLocations(blockVariableDeclaration);
+				varInit.AddChild(Identifier.Create(blockVariableDeclaration.Variable.Name, Convert(blockVariableDeclaration.Variable.Location)), Roles.Identifier);
+				if (blockVariableDeclaration.Initializer != null) {
+					if (location != null && location.Count > 0)
+						varInit.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Assign), Roles.Assign);
+					varInit.AddChild((Expression)blockVariableDeclaration.Initializer.Accept(this), Roles.Expression);
+				}
+				
+				result.AddChild(varInit, Roles.Variable);
+				
+				if (blockVariableDeclaration.Declarators != null) {
+					foreach (var decl in blockVariableDeclaration.Declarators) {
+						var loc = LocationsBag.GetLocations(decl);
+						var init = new VariableInitializer();
+						if (loc != null && loc.Count > 0)
+							result.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Comma), Roles.Comma);
+						init.AddChild(Identifier.Create(decl.Variable.Name, Convert(decl.Variable.Location)), Roles.Identifier);
+						if (decl.Initializer != null) {
+							if (loc != null && loc.Count > 1)
+								init.AddChild(new CSharpTokenNode(Convert(loc [1]), Roles.Assign), Roles.Assign);
+							init.AddChild((Expression)decl.Initializer.Accept(this), Roles.Expression);
+						}
+						result.AddChild(init, Roles.Variable);
+					}
+				}
+				if (location != null && (blockVariableDeclaration.Initializer == null || location.Count > 1))
+					result.AddChild(new CSharpTokenNode(Convert(location [location.Count - 1]), Roles.Semicolon), Roles.Semicolon);
+				return result;
+			}
+
+			public override object Visit(BlockConstant blockConstantDeclaration)
+			{
+				var result = new VariableDeclarationStatement();
+				
+				var location = LocationsBag.GetLocations(blockConstantDeclaration);
+				if (location != null && location.Count > 0)
+					result.AddChild(new CSharpModifierToken(Convert(location [0]), Modifiers.Const), VariableDeclarationStatement.ModifierRole);
+				
+				result.AddChild(ConvertToType(blockConstantDeclaration.TypeExpression), Roles.Type);
+				
+				var varInit = new VariableInitializer();
+				varInit.AddChild(Identifier.Create(blockConstantDeclaration.Variable.Name, Convert(blockConstantDeclaration.Variable.Location)), Roles.Identifier);
+				if (blockConstantDeclaration.Initializer != null) {
+					if (location != null && location.Count > 1)
+						varInit.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Assign), Roles.Assign);
+					varInit.AddChild((Expression)blockConstantDeclaration.Initializer.Accept(this), Roles.Expression);
+				}
+				
+				result.AddChild(varInit, Roles.Variable);
+				
+				if (blockConstantDeclaration.Declarators != null) {
+					foreach (var decl in blockConstantDeclaration.Declarators) {
+						var loc = LocationsBag.GetLocations(decl);
+						var init = new VariableInitializer();
+						init.AddChild(Identifier.Create(decl.Variable.Name, Convert(decl.Variable.Location)), Roles.Identifier);
+						if (decl.Initializer != null) {
+							if (loc != null)
+								init.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Assign), Roles.Assign);
+							init.AddChild((Expression)decl.Initializer.Accept(this), Roles.Expression);
+							if (loc != null && loc.Count > 1)
+								result.AddChild(new CSharpTokenNode(Convert(loc [1]), Roles.Comma), Roles.Comma);
+						} else {
+							if (loc != null && loc.Count > 0)
+								result.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Comma), Roles.Comma);
+						}
+						result.AddChild(init, Roles.Variable);
+					}
+				}
+				if (location != null) {
+					result.AddChild(new CSharpTokenNode(Convert(location [location.Count - 1]), Roles.Semicolon), Roles.Semicolon);
+				} else {
+					// parser error, set end node to max value.
+					result.AddChild(new ErrorNode(), Roles.Error);
+				}
+				return result;
+			}
+
+			public override object Visit(Mono.CSharp.EmptyStatement emptyStatement)
+			{
+				var result = new EmptyStatement();
+				result.Location = Convert(emptyStatement.loc);
+				return result;
+			}
+
+			public override object Visit(Mono.CSharp.ErrorExpression errorExpression)
+			{
+				return new ErrorExpression(Convert(errorExpression.Location));
+			}
+
+			public override object Visit(EmptyExpressionStatement emptyExpressionStatement)
+			{
+				// Should never happen.
+				throw new NotSupportedException();
+			}
+
+			public override object Visit(If ifStatement)
+			{
+				var result = new IfElseStatement();
+				
+				var location = LocationsBag.GetLocations(ifStatement);
+				
+				result.AddChild(new CSharpTokenNode(Convert(ifStatement.loc), IfElseStatement.IfKeywordRole), IfElseStatement.IfKeywordRole);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				if (ifStatement.Expr != null)
+					result.AddChild((Expression)ifStatement.Expr.Accept(this), Roles.Condition);
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				
+				if (ifStatement.TrueStatement != null)
+					result.AddChild((Statement)ifStatement.TrueStatement.Accept(this), IfElseStatement.TrueRole);
+				
+				if (ifStatement.FalseStatement != null) {
+					if (location != null && location.Count > 2)
+						result.AddChild(new CSharpTokenNode(Convert(location [2]), IfElseStatement.ElseKeywordRole), IfElseStatement.ElseKeywordRole);
+					result.AddChild((Statement)ifStatement.FalseStatement.Accept(this), IfElseStatement.FalseRole);
+				}
+				
+				return result;
+			}
+
+			public override object Visit(Do doStatement)
+			{
+				var result = new DoWhileStatement();
+				var location = LocationsBag.GetLocations(doStatement);
+				result.AddChild(new CSharpTokenNode(Convert(doStatement.loc), DoWhileStatement.DoKeywordRole), DoWhileStatement.DoKeywordRole);
+				if (doStatement.EmbeddedStatement != null)
+					result.AddChild((Statement)doStatement.EmbeddedStatement.Accept(this), Roles.EmbeddedStatement);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), DoWhileStatement.WhileKeywordRole), DoWhileStatement.WhileKeywordRole);
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.LPar), Roles.LPar);
+				if (doStatement.expr != null)
+					result.AddChild((Expression)doStatement.expr.Accept(this), Roles.Condition);
+				if (location != null && location.Count > 2) {
+					result.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.RPar), Roles.RPar);
+					if (location.Count > 3)
+						result.AddChild(new CSharpTokenNode(Convert(location [3]), Roles.Semicolon), Roles.Semicolon);
+				}
+				
+				return result;
+			}
+
+			public override object Visit(While whileStatement)
+			{
+				var result = new WhileStatement();
+				var location = LocationsBag.GetLocations(whileStatement);
+				result.AddChild(new CSharpTokenNode(Convert(whileStatement.loc), WhileStatement.WhileKeywordRole), WhileStatement.WhileKeywordRole);
+				
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				if (whileStatement.expr != null)
+					result.AddChild((Expression)whileStatement.expr.Accept(this), Roles.Condition);
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				if (whileStatement.Statement != null)
+					result.AddChild((Statement)whileStatement.Statement.Accept(this), Roles.EmbeddedStatement);
+				return result;
+			}
+
+			void AddStatementOrList(ForStatement forStatement, Mono.CSharp.Statement init, Role<Statement> role)
+			{
+				if (init == null)
+					return;
+				var stmtList = init as StatementList;
+				if (stmtList != null) {
+					foreach (var stmt in stmtList.Statements) {
+						forStatement.AddChild((Statement)stmt.Accept(this), role);
+					}
+				} else if (init is Mono.CSharp.EmptyStatement) {
+					
+				} else {
+					forStatement.AddChild((Statement)init.Accept(this), role);
+				}
+			}
+
+			public override object Visit(For forStatement)
+			{
+				var result = new ForStatement();
+				
+				var location = LocationsBag.GetLocations(forStatement);
+				
+				result.AddChild(new CSharpTokenNode(Convert(forStatement.loc), ForStatement.ForKeywordRole), ForStatement.ForKeywordRole);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				
+				AddStatementOrList(result, forStatement.Initializer, ForStatement.InitializerRole);
+				
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Semicolon), Roles.Semicolon);
+				if (forStatement.Condition != null)
+					result.AddChild((Expression)forStatement.Condition.Accept(this), Roles.Condition);
+				if (location != null && location.Count >= 3)
+					result.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.Semicolon), Roles.Semicolon);
+				
+				AddStatementOrList(result, forStatement.Iterator, ForStatement.IteratorRole);
+				
+				if (location != null && location.Count >= 4)
+					result.AddChild(new CSharpTokenNode(Convert(location [3]), Roles.RPar), Roles.RPar);
+				
+				if (forStatement.Statement != null)
+					result.AddChild((Statement)forStatement.Statement.Accept(this), Roles.EmbeddedStatement);
+				
+				return result;
+			}
+
+			public override object Visit(StatementExpression statementExpression)
+			{
+				var result = new ExpressionStatement();
+				var expr = statementExpression.Expr.Accept(this) as Expression;
+				if (expr != null)
+					result.AddChild(expr, Roles.Expression);
+				var location = LocationsBag.GetLocations(statementExpression);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Semicolon), Roles.Semicolon);
+				return result;
+			}
+
+			public override object Visit(StatementErrorExpression errorStatement)
+			{
+				var result = new ExpressionStatement();
+				var expr = errorStatement.Expr.Accept(this) as Expression;
+				if (expr != null)
+					result.AddChild(expr, Roles.Expression);
+				var location = LocationsBag.GetLocations(errorStatement);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Semicolon), Roles.Semicolon);
+				return result;
+			}
+
+			public override object Visit(InvalidStatementExpression invalidStatementExpression)
+			{
+				var result = new ExpressionStatement();
+				if (invalidStatementExpression.Expression == null)
+					return result;
+				var expr = invalidStatementExpression.Expression.Accept(this) as Expression;
+				if (expr != null)
+					result.AddChild(expr, Roles.Expression);
+				var location = LocationsBag.GetLocations(invalidStatementExpression);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Semicolon), Roles.Semicolon);
+				return result;
+			}
+
+			public override object Visit(Return returnStatement)
+			{
+				var result = new ReturnStatement();
+				
+				result.AddChild(new CSharpTokenNode(Convert(returnStatement.loc), ReturnStatement.ReturnKeywordRole), ReturnStatement.ReturnKeywordRole);
+				if (returnStatement.Expr != null)
+					result.AddChild((Expression)returnStatement.Expr.Accept(this), Roles.Expression);
+				
+				var location = LocationsBag.GetLocations(returnStatement);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Semicolon), Roles.Semicolon);
+				
+				return result;
+			}
+
+			public override object Visit(Goto gotoStatement)
+			{
+				var result = new GotoStatement();
+				var location = LocationsBag.GetLocations(gotoStatement);
+				result.AddChild(new CSharpTokenNode(Convert(gotoStatement.loc), GotoStatement.GotoKeywordRole), GotoStatement.GotoKeywordRole);
+				var loc = location != null ? Convert(location [0]) : TextLocation.Empty;
+				result.AddChild(Identifier.Create(gotoStatement.Target, loc), Roles.Identifier);
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Semicolon), Roles.Semicolon);
+				
+				return result;
+			}
+
+			public override object Visit(LabeledStatement labeledStatement)
+			{
+				var result = new LabelStatement();
+				result.AddChild(Identifier.Create(labeledStatement.Name, Convert(labeledStatement.loc)), Roles.Identifier);
+				var location = LocationsBag.GetLocations(labeledStatement);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Colon), Roles.Colon);
+				return result;
+			}
+
+			public override object Visit(GotoDefault gotoDefault)
+			{
+				var result = new GotoDefaultStatement();
+				result.AddChild(new CSharpTokenNode(Convert(gotoDefault.loc), GotoDefaultStatement.GotoKeywordRole), GotoDefaultStatement.GotoKeywordRole);
+				var location = LocationsBag.GetLocations(gotoDefault);
+				if (location != null) {
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), GotoDefaultStatement.DefaultKeywordRole), GotoDefaultStatement.DefaultKeywordRole);
+					if (location.Count > 1)
+						result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Semicolon), Roles.Semicolon);
+				}
+				
+				return result;
+			}
+
+			public override object Visit(GotoCase gotoCase)
+			{
+				var result = new GotoCaseStatement();
+				result.AddChild(new CSharpTokenNode(Convert(gotoCase.loc), GotoCaseStatement.GotoKeywordRole), GotoCaseStatement.GotoKeywordRole);
+				
+				var location = LocationsBag.GetLocations(gotoCase);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), GotoCaseStatement.CaseKeywordRole), GotoCaseStatement.CaseKeywordRole);
+				if (gotoCase.Expr != null)
+					result.AddChild((Expression)gotoCase.Expr.Accept(this), Roles.Expression);
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Semicolon), Roles.Semicolon);
+				return result;
+			}
+
+			public override object Visit(Throw throwStatement)
+			{
+				var result = new ThrowStatement();
+				var location = LocationsBag.GetLocations(throwStatement);
+				
+				result.AddChild(new CSharpTokenNode(Convert(throwStatement.loc), ThrowStatement.ThrowKeywordRole), ThrowStatement.ThrowKeywordRole);
+				if (throwStatement.Expr != null)
+					result.AddChild((Expression)throwStatement.Expr.Accept(this), Roles.Expression);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Semicolon), Roles.Semicolon);
+				return result;
+			}
+
+			public override object Visit(Break breakStatement)
+			{
+				var result = new BreakStatement();
+				var location = LocationsBag.GetLocations(breakStatement);
+				
+				result.AddChild(new CSharpTokenNode(Convert(breakStatement.loc), BreakStatement.BreakKeywordRole), BreakStatement.BreakKeywordRole);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Semicolon), Roles.Semicolon);
+				return result;
+			}
+
+			public override object Visit(Continue continueStatement)
+			{
+				var result = new ContinueStatement();
+				var location = LocationsBag.GetLocations(continueStatement);
+				result.AddChild(new CSharpTokenNode(Convert(continueStatement.loc), ContinueStatement.ContinueKeywordRole), ContinueStatement.ContinueKeywordRole);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Semicolon), Roles.Semicolon);
+				return result;
+			}
+
+			public static bool IsLower(Location left, Location right)
+			{
+				return left.Row < right.Row || left.Row == right.Row && left.Column < right.Column;
+			}
+
+			public UsingStatement CreateUsingStatement(Block blockStatement)
+			{
+				var usingResult = new UsingStatement();
+				Mono.CSharp.Statement cur = blockStatement.Statements [0];
+				var u = cur as Using;
+				if (u != null) {
+					usingResult.AddChild(new CSharpTokenNode(Convert(u.loc), UsingStatement.UsingKeywordRole), UsingStatement.UsingKeywordRole);
+					usingResult.AddChild(new CSharpTokenNode(Convert(blockStatement.StartLocation), Roles.LPar), Roles.LPar);
+					if (u.Variables != null) {
+						var initializer = new VariableInitializer {
+							NameToken = Identifier.Create(u.Variables.Variable.Name, Convert(u.Variables.Variable.Location)),
+						};
+						
+						var loc = LocationsBag.GetLocations(u.Variables);
+						if (loc != null)
+							initializer.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Assign), Roles.Assign);
+						if (u.Variables.Initializer != null)
+							initializer.Initializer = u.Variables.Initializer.Accept(this) as Expression;
+						
+						
+						var varDec = new VariableDeclarationStatement {
+							Type = ConvertToType(u.Variables.TypeExpression),
+							Variables = { initializer }
+						};
+						
+						if (u.Variables.Declarators != null) {
+							foreach (var decl in u.Variables.Declarators) {
+								var declLoc = LocationsBag.GetLocations(decl);
+								var init = new VariableInitializer();
+								if (declLoc != null && declLoc.Count > 0)
+									varDec.AddChild(new CSharpTokenNode(Convert(declLoc [0]), Roles.Comma), Roles.Comma);
+								init.AddChild(Identifier.Create(decl.Variable.Name, Convert(decl.Variable.Location)), Roles.Identifier);
+								if (decl.Initializer != null) {
+									if (declLoc != null && declLoc.Count > 1)
+										init.AddChild(new CSharpTokenNode(Convert(declLoc [1]), Roles.Assign), Roles.Assign);
+									init.AddChild((Expression)decl.Initializer.Accept(this), Roles.Expression);
+								}
+								varDec.AddChild(init, Roles.Variable);
+							}
+						}
+						usingResult.AddChild(varDec, UsingStatement.ResourceAcquisitionRole);
+					}
+					cur = u.Statement;
+					usingResult.AddChild(new CSharpTokenNode(Convert(blockStatement.EndLocation), Roles.RPar), Roles.RPar);
+					if (cur != null)
+						usingResult.AddChild((Statement)cur.Accept(this), Roles.EmbeddedStatement);
+				}
+				return usingResult;
+			}
+
+			void AddBlockChildren(BlockStatement result, Block blockStatement, ref int curLocal)
+			{
+				if (convertTypeSystemMode) {
+					return;
+				}
+				foreach (Mono.CSharp.Statement stmt in blockStatement.Statements) {
+					if (stmt == null)
+						continue;
+					/*					if (curLocal < localVariables.Count && IsLower (localVariables[curLocal].Location, stmt.loc)) {
+						result.AddChild (CreateVariableDeclaration (localVariables[curLocal]), Roles.Statement);
+						curLocal++;
+					}*/
+					if (stmt is Block && !(stmt is ToplevelBlock || stmt is ExplicitBlock)) {
+						AddBlockChildren(result, (Block)stmt, ref curLocal);
+					} else {
+						result.AddChild((Statement)stmt.Accept(this), BlockStatement.StatementRole);
+					}
+				}
+			}
+
+			public override object Visit(Block blockStatement)
+			{
+				if (blockStatement.IsCompilerGenerated && blockStatement.Statements.Any()) {
+					if (blockStatement.Statements.First() is Using)
+						return CreateUsingStatement(blockStatement);
+					return blockStatement.Statements.Last().Accept(this);
+				}
+				var result = new BlockStatement();
+				result.AddChild(new CSharpTokenNode(Convert(blockStatement.StartLocation), Roles.LBrace), Roles.LBrace);
+				int curLocal = 0;
+				AddBlockChildren(result, blockStatement, ref curLocal);
+				
+				result.AddChild(new CSharpTokenNode(Convert(blockStatement.EndLocation), Roles.RBrace), Roles.RBrace);
+				return result;
+			}
+
+			public override object Visit(Switch switchStatement)
+			{
+				var result = new SwitchStatement();
+				
+				var location = LocationsBag.GetLocations(switchStatement);
+				result.AddChild(new CSharpTokenNode(Convert(switchStatement.loc), SwitchStatement.SwitchKeywordRole), SwitchStatement.SwitchKeywordRole);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				if (switchStatement.Expr != null)
+					result.AddChild((Expression)switchStatement.Expr.Accept(this), Roles.Expression);
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				if (location != null && location.Count > 2)
+					result.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.LBrace), Roles.LBrace);
+				SwitchSection newSection = null;
+				bool lastWasCase = false, added = true;
+				if (switchStatement.Block != null) {
+					foreach (var child in switchStatement.Block.Statements) {
+						var statement = child.Accept(this);
+						var caseLabel = statement as CaseLabel;
+						if (caseLabel != null) {
+							if (!lastWasCase) {
+								newSection = new SwitchSection();
+								added = false;
+							}
+							newSection.AddChild(caseLabel, SwitchSection.CaseLabelRole);
+							lastWasCase = true;
+						} else {
+							if (lastWasCase) {
+								result.AddChild(newSection, SwitchStatement.SwitchSectionRole);
+								lastWasCase = false;
+								added = true;
+							}
+							newSection.AddChild((Statement)statement, Roles.EmbeddedStatement);
+						}
+					}
+				}
+				if (!added)
+					result.AddChild(newSection, SwitchStatement.SwitchSectionRole);
+
+				if (location != null && location.Count > 3) {
+					result.AddChild(new CSharpTokenNode(Convert(location [3]), Roles.RBrace), Roles.RBrace);
+				} else {
+					// parser error, set end node to max value.
+					result.AddChild(new ErrorNode(), Roles.Error);
+				}
+				
+				return result;
+			}
+
+			public override object Visit(SwitchLabel switchLabel)
+			{
+				var newLabel = new CaseLabel();
+				if (!switchLabel.IsDefault) {
+					newLabel.AddChild(new CSharpTokenNode(Convert(switchLabel.Location), CaseLabel.CaseKeywordRole), CaseLabel.CaseKeywordRole);
+					if (switchLabel.Label != null)
+						newLabel.AddChild((Expression)switchLabel.Label.Accept(this), Roles.Expression);
+					var colonLocation = LocationsBag.GetLocations(switchLabel);
+					if (colonLocation != null)
+						newLabel.AddChild(new CSharpTokenNode(Convert(colonLocation [0]), Roles.Colon), Roles.Colon);
+				} else {
+					newLabel.AddChild(new CSharpTokenNode(Convert(switchLabel.Location), CaseLabel.DefaultKeywordRole), CaseLabel.DefaultKeywordRole);
+					newLabel.AddChild(new CSharpTokenNode(new TextLocation(switchLabel.Location.Row, switchLabel.Location.Column + "default".Length), Roles.Colon), Roles.Colon);
+				}
+				return newLabel;
+			}
+
+			public override object Visit(Lock lockStatement)
+			{
+				var result = new LockStatement();
+				var location = LocationsBag.GetLocations(lockStatement);
+				result.AddChild(new CSharpTokenNode(Convert(lockStatement.loc), LockStatement.LockKeywordRole), LockStatement.LockKeywordRole);
+				
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				if (lockStatement.Expr != null)
+					result.AddChild((Expression)lockStatement.Expr.Accept(this), Roles.Expression);
+				
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				if (lockStatement.Statement != null)
+					result.AddChild((Statement)lockStatement.Statement.Accept(this), Roles.EmbeddedStatement);
+				
+				return result;
+			}
+
+			public override object Visit(Unchecked uncheckedStatement)
+			{
+				var result = new UncheckedStatement();
+				result.AddChild(new CSharpTokenNode(Convert(uncheckedStatement.loc), UncheckedStatement.UncheckedKeywordRole), UncheckedStatement.UncheckedKeywordRole);
+				if (uncheckedStatement.Block != null)
+					result.AddChild((BlockStatement)uncheckedStatement.Block.Accept(this), Roles.Body);
+				return result;
+			}
+
+			public override object Visit(Checked checkedStatement)
+			{
+				var result = new CheckedStatement();
+				result.AddChild(new CSharpTokenNode(Convert(checkedStatement.loc), CheckedStatement.CheckedKeywordRole), CheckedStatement.CheckedKeywordRole);
+				if (checkedStatement.Block != null)
+					result.AddChild((BlockStatement)checkedStatement.Block.Accept(this), Roles.Body);
+				return result;
+			}
+
+			public override object Visit(Unsafe unsafeStatement)
+			{
+				var result = new UnsafeStatement();
+				result.AddChild(new CSharpTokenNode(Convert(unsafeStatement.loc), UnsafeStatement.UnsafeKeywordRole), UnsafeStatement.UnsafeKeywordRole);
+				if (unsafeStatement.Block != null)
+					result.AddChild((BlockStatement)unsafeStatement.Block.Accept(this), Roles.Body);
+				return result;
+			}
+
+			public override object Visit(Fixed fixedStatement)
+			{
+				var result = new FixedStatement();
+				var location = LocationsBag.GetLocations(fixedStatement);
+				
+				result.AddChild(new CSharpTokenNode(Convert(fixedStatement.loc), FixedStatement.FixedKeywordRole), FixedStatement.FixedKeywordRole);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				
+				if (fixedStatement.Variables != null) {
+					var blockVariableDeclaration = fixedStatement.Variables;
+					result.AddChild(ConvertToType(blockVariableDeclaration.TypeExpression), Roles.Type);
+					var varInit = new VariableInitializer();
+					var initLocation = LocationsBag.GetLocations(blockVariableDeclaration);
+					varInit.AddChild(Identifier.Create(blockVariableDeclaration.Variable.Name, Convert(blockVariableDeclaration.Variable.Location)), Roles.Identifier);
+					if (blockVariableDeclaration.Initializer != null) {
+						if (initLocation != null)
+							varInit.AddChild(new CSharpTokenNode(Convert(initLocation [0]), Roles.Assign), Roles.Assign);
+						varInit.AddChild((Expression)blockVariableDeclaration.Initializer.Accept(this), Roles.Expression);
+					}
+					
+					result.AddChild(varInit, Roles.Variable);
+					
+					if (blockVariableDeclaration.Declarators != null) {
+						foreach (var decl in blockVariableDeclaration.Declarators) {
+							var loc = LocationsBag.GetLocations(decl);
+							var init = new VariableInitializer();
+							if (loc != null && loc.Count > 0)
+								result.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Comma), Roles.Comma);
+							init.AddChild(Identifier.Create(decl.Variable.Name, Convert(decl.Variable.Location)), Roles.Identifier);
+							if (decl.Initializer != null) {
+								if (loc != null && loc.Count > 1)
+									init.AddChild(new CSharpTokenNode(Convert(loc [1]), Roles.Assign), Roles.Assign);
+								init.AddChild((Expression)decl.Initializer.Accept(this), Roles.Expression);
+							}
+							result.AddChild(init, Roles.Variable);
+						}
+					}
+				}
+				
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				if (fixedStatement.Statement != null)
+					result.AddChild((Statement)fixedStatement.Statement.Accept(this), Roles.EmbeddedStatement);
+				return result;
+			}
+
+			public override object Visit(TryFinally tryFinallyStatement)
+			{
+				TryCatchStatement result;
+				var location = LocationsBag.GetLocations(tryFinallyStatement);
+				
+				if (tryFinallyStatement.Stmt is TryCatch) {
+					result = (TryCatchStatement)tryFinallyStatement.Stmt.Accept(this);
+				} else {
+					result = new TryCatchStatement();
+					result.AddChild(new CSharpTokenNode(Convert(tryFinallyStatement.loc), TryCatchStatement.TryKeywordRole), TryCatchStatement.TryKeywordRole);
+					if (tryFinallyStatement.Stmt != null)
+						result.AddChild((BlockStatement)tryFinallyStatement.Stmt.Accept(this), TryCatchStatement.TryBlockRole);
+				}
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), TryCatchStatement.FinallyKeywordRole), TryCatchStatement.FinallyKeywordRole);
+				if (tryFinallyStatement.Fini != null)
+					result.AddChild((BlockStatement)tryFinallyStatement.Fini.Accept(this), TryCatchStatement.FinallyBlockRole);
+				
+				return result;
+			}
+
+			CatchClause ConvertCatch(Catch ctch)
+			{
+				var result = new CatchClause();
+				var location = LocationsBag.GetLocations(ctch);
+				result.AddChild(new CSharpTokenNode(Convert(ctch.loc), CatchClause.CatchKeywordRole), CatchClause.CatchKeywordRole);
+				if (ctch.TypeExpression != null) {
+					if (location != null)
+						result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+					
+					if (ctch.TypeExpression != null)
+						result.AddChild(ConvertToType(ctch.TypeExpression), Roles.Type);
+					if (ctch.Variable != null && !string.IsNullOrEmpty(ctch.Variable.Name))
+						result.AddChild(Identifier.Create(ctch.Variable.Name, Convert(ctch.Variable.Location)), Roles.Identifier);
+					
+					if (location != null && location.Count > 1)
+						result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				}
+
+				if (ctch.Block != null)
+					result.AddChild((BlockStatement)ctch.Block.Accept(this), Roles.Body);
+				
+				return result;
+			}
+
+			public override object Visit(TryCatch tryCatchStatement)
+			{
+				var result = new TryCatchStatement();
+				result.AddChild(new CSharpTokenNode(Convert(tryCatchStatement.loc), TryCatchStatement.TryKeywordRole), TryCatchStatement.TryKeywordRole);
+				if (tryCatchStatement.Block != null)
+					result.AddChild((BlockStatement)tryCatchStatement.Block.Accept(this), TryCatchStatement.TryBlockRole);
+				if (tryCatchStatement.Clauses != null) {
+					foreach (var ctch in tryCatchStatement.Clauses) {
+						result.AddChild(ConvertCatch(ctch), TryCatchStatement.CatchClauseRole);
+					}
+				}
+//				if (tryCatchStatement.General != null)
+//					result.AddChild (ConvertCatch (tryCatchStatement.General), TryCatchStatement.CatchClauseRole);
+				
+				return result;
+			}
+
+			public override object Visit(Using usingStatement)
+			{
+				var result = new UsingStatement();
+				var location = LocationsBag.GetLocations(usingStatement);
+				
+				result.AddChild(new CSharpTokenNode(Convert(usingStatement.loc), UsingStatement.UsingKeywordRole), UsingStatement.UsingKeywordRole);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				if (usingStatement.Expr != null)
+					result.AddChild((AstNode)usingStatement.Expr.Accept(this), UsingStatement.ResourceAcquisitionRole);
+				
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				
+				if (usingStatement.Statement != null)
+					result.AddChild((Statement)usingStatement.Statement.Accept(this), Roles.EmbeddedStatement);
+				return result;
+			}
+
+			public override object Visit(Foreach foreachStatement)
+			{
+				var result = new ForeachStatement();
+				
+				var location = LocationsBag.GetLocations(foreachStatement);
+				
+				result.AddChild(new CSharpTokenNode(Convert(foreachStatement.loc), ForeachStatement.ForeachKeywordRole), ForeachStatement.ForeachKeywordRole);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				
+				if (foreachStatement.TypeExpression != null)
+					result.AddChild(ConvertToType(foreachStatement.TypeExpression), Roles.Type);
+				
+				if (foreachStatement.Variable != null)
+					result.AddChild(Identifier.Create(foreachStatement.Variable.Name, Convert(foreachStatement.Variable.Location)), Roles.Identifier);
+				
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), ForeachStatement.InKeywordRole), ForeachStatement.InKeywordRole);
+				
+				if (foreachStatement.Expr != null)
+					result.AddChild((Expression)foreachStatement.Expr.Accept(this), Roles.Expression);
+				
+				if (location != null && location.Count > 2)
+					result.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.RPar), Roles.RPar);
+				
+				if (foreachStatement.Statement != null)
+					result.AddChild((Statement)foreachStatement.Statement.Accept(this), Roles.EmbeddedStatement);
+				
+				return result;
+			}
+
+			public override object Visit(Yield yieldStatement)
+			{
+				var result = new YieldReturnStatement();
+				var location = LocationsBag.GetLocations(yieldStatement);
+				
+				result.AddChild(new CSharpTokenNode(Convert(yieldStatement.loc), YieldReturnStatement.YieldKeywordRole), YieldReturnStatement.YieldKeywordRole);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), YieldReturnStatement.ReturnKeywordRole), YieldReturnStatement.ReturnKeywordRole);
+				if (yieldStatement.Expr != null)
+					result.AddChild((Expression)yieldStatement.Expr.Accept(this), Roles.Expression);
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Semicolon), Roles.Semicolon);
+				
+				return result;
+			}
+
+			public override object Visit(YieldBreak yieldBreakStatement)
+			{
+				var result = new YieldBreakStatement();
+				var location = LocationsBag.GetLocations(yieldBreakStatement);
+				result.AddChild(new CSharpTokenNode(Convert(yieldBreakStatement.loc), YieldBreakStatement.YieldKeywordRole), YieldBreakStatement.YieldKeywordRole);
+				if (location != null) {
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), YieldBreakStatement.BreakKeywordRole), YieldBreakStatement.BreakKeywordRole);
+					if (location.Count > 1)
+						result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Semicolon), Roles.Semicolon);
+				}
+				return result;
+			}
+
+			#endregion
+
+			#region Expression
+
+			public override object Visit(Mono.CSharp.Expression expression)
+			{
+				Console.WriteLine("Visit unknown expression:" + expression);
+				Console.WriteLine(Environment.StackTrace);
+				return null;
+			}
+
+			public override object Visit(DefaultParameterValueExpression defaultParameterValueExpression)
+			{
+				return defaultParameterValueExpression.Child.Accept(this);
+			}
+
+			public override object Visit(TypeExpression typeExpression)
+			{
+				return new TypeReferenceExpression(new PrimitiveType(keywordTable [(int)typeExpression.Type.BuiltinType], Convert(typeExpression.Location)));
+			}
+
+			public override object Visit(LocalVariableReference localVariableReference)
+			{
+				return Identifier.Create(localVariableReference.Name, Convert(localVariableReference.Location));
+			}
+
+			public override object Visit(MemberAccess memberAccess)
+			{
+				Expression result;
+				var ind = memberAccess.LeftExpression as Indirection;
+				if (ind != null) {
+					result = new PointerReferenceExpression();
+					result.AddChild((Expression)ind.Expr.Accept(this), Roles.TargetExpression);
+					result.AddChild(new CSharpTokenNode(Convert(ind.Location), PointerReferenceExpression.ArrowRole), PointerReferenceExpression.ArrowRole);
+				} else {
+					result = new MemberReferenceExpression();
+					if (memberAccess.LeftExpression != null) {
+						var leftExpr = memberAccess.LeftExpression.Accept(this);
+						result.AddChild((Expression)leftExpr, Roles.TargetExpression);
+					}
+					var loc = LocationsBag.GetLocations(memberAccess);
+
+					if (loc != null) {
+						result.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Dot), Roles.Dot);
+					}
+				}
+				
+				result.AddChild(Identifier.Create(memberAccess.Name, Convert(memberAccess.Location)), Roles.Identifier);
+				
+				AddTypeArguments(result, memberAccess);
+				return result;
+			}
+
+			public override object Visit(QualifiedAliasMember qualifiedAliasMember)
+			{
+				var result = new MemberType();
+				result.Target = new SimpleType(qualifiedAliasMember.alias, Convert(qualifiedAliasMember.Location));
+				result.IsDoubleColon = true;
+				var location = LocationsBag.GetLocations(qualifiedAliasMember);
+				if (location != null && location.Count > 0)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.DoubleColon), Roles.DoubleColon);
+
+				result.AddChild(Identifier.Create(qualifiedAliasMember.Name, location != null && location.Count > 1 ? Convert(location [1]) : TextLocation.Empty), Roles.Identifier);
+				return  new TypeReferenceExpression { Type = result };
+			}
+
+			public override object Visit(Constant constant)
+			{
+				if (constant.GetValue() == null)
+					return new NullReferenceExpression(Convert(constant.Location));
+				string literalValue;
+				var literalConstant = constant as ILiteralConstant;
+				literalValue = literalConstant != null ? new string(literalConstant.ParsedValue) : constant.GetValueAsLiteral();
+				object val = constant.GetValue();
+				if (val is bool)
+					literalValue = (bool)val ? "true" : "false";
+				var result = new PrimitiveExpression(val, Convert(constant.Location), literalValue);
+				return result;
+			}
+
+			public override object Visit(SimpleName simpleName)
+			{
+				var result = new IdentifierExpression();
+				result.AddChild(Identifier.Create(simpleName.Name, Convert(simpleName.Location)), Roles.Identifier);
+				AddTypeArguments(result, simpleName);
+				return result;
+			}
+
+			public override object Visit(BooleanExpression booleanExpression)
+			{
+				return booleanExpression.Expr.Accept(this);
+			}
+
+			public override object Visit(Mono.CSharp.ParenthesizedExpression parenthesizedExpression)
+			{
+				var result = new ParenthesizedExpression();
+				var location = LocationsBag.GetLocations(parenthesizedExpression);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				if (parenthesizedExpression.Expr != null)
+					result.AddChild((Expression)parenthesizedExpression.Expr.Accept(this), Roles.Expression);
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				return result;
+			}
+
+			public override object Visit(Unary unaryExpression)
+			{
+				var result = new UnaryOperatorExpression();
+				switch (unaryExpression.Oper) {
+					case Unary.Operator.UnaryPlus:
+						result.Operator = UnaryOperatorType.Plus;
+						break;
+					case Unary.Operator.UnaryNegation:
+						result.Operator = UnaryOperatorType.Minus;
+						break;
+					case Unary.Operator.LogicalNot:
+						result.Operator = UnaryOperatorType.Not;
+						break;
+					case Unary.Operator.OnesComplement:
+						result.Operator = UnaryOperatorType.BitNot;
+						break;
+					case Unary.Operator.AddressOf:
+						result.Operator = UnaryOperatorType.AddressOf;
+						break;
+				}
+				var r = UnaryOperatorExpression.GetOperatorRole(result.Operator);
+				result.AddChild(new CSharpTokenNode(Convert(unaryExpression.Location), r), r);
+				if (unaryExpression.Expr != null)
+					result.AddChild((Expression)unaryExpression.Expr.Accept(this), Roles.Expression);
+				return result;
+			}
+
+			public override object Visit(UnaryMutator unaryMutatorExpression)
+			{
+				var result = new UnaryOperatorExpression();
+				if (unaryMutatorExpression.Expr == null)
+					return result;
+				var expression = (Expression)unaryMutatorExpression.Expr.Accept(this);
+				switch (unaryMutatorExpression.UnaryMutatorMode) {
+					case UnaryMutator.Mode.PostDecrement:
+						result.Operator = UnaryOperatorType.PostDecrement;
+						result.AddChild(expression, Roles.Expression);
+						result.AddChild(new CSharpTokenNode(Convert(unaryMutatorExpression.Location), UnaryOperatorExpression.DecrementRole), UnaryOperatorExpression.DecrementRole);
+						break;
+					case UnaryMutator.Mode.PostIncrement:
+						result.Operator = UnaryOperatorType.PostIncrement;
+						result.AddChild(expression, Roles.Expression);
+						result.AddChild(new CSharpTokenNode(Convert(unaryMutatorExpression.Location), UnaryOperatorExpression.IncrementRole), UnaryOperatorExpression.IncrementRole);
+						break;
+						
+					case UnaryMutator.Mode.PreIncrement:
+						result.Operator = UnaryOperatorType.Increment;
+						result.AddChild(new CSharpTokenNode(Convert(unaryMutatorExpression.Location), UnaryOperatorExpression.IncrementRole), UnaryOperatorExpression.IncrementRole);
+						result.AddChild(expression, Roles.Expression);
+						break;
+					case UnaryMutator.Mode.PreDecrement:
+						result.Operator = UnaryOperatorType.Decrement;
+						result.AddChild(new CSharpTokenNode(Convert(unaryMutatorExpression.Location), UnaryOperatorExpression.DecrementRole), UnaryOperatorExpression.DecrementRole);
+						result.AddChild(expression, Roles.Expression);
+						break;
+				}
+				
+				return result;
+			}
+
+			public override object Visit(Indirection indirectionExpression)
+			{
+				var result = new UnaryOperatorExpression();
+				result.Operator = UnaryOperatorType.Dereference;
+				result.AddChild(new CSharpTokenNode(Convert(indirectionExpression.Location), UnaryOperatorExpression.DereferenceRole), UnaryOperatorExpression.DereferenceRole);
+				if (indirectionExpression.Expr != null)
+					result.AddChild((Expression)indirectionExpression.Expr.Accept(this), Roles.Expression);
+				return result;
+			}
+
+			public override object Visit(Is isExpression)
+			{
+				var result = new IsExpression();
+				if (isExpression.Expr != null)
+					result.AddChild((Expression)isExpression.Expr.Accept(this), Roles.Expression);
+				result.AddChild(new CSharpTokenNode(Convert(isExpression.Location), IsExpression.IsKeywordRole), IsExpression.IsKeywordRole);
+				
+				if (isExpression.ProbeType != null)
+					result.AddChild(ConvertToType(isExpression.ProbeType), Roles.Type);
+				return result;
+			}
+
+			public override object Visit(As asExpression)
+			{
+				var result = new AsExpression();
+				if (asExpression.Expr != null)
+					result.AddChild((Expression)asExpression.Expr.Accept(this), Roles.Expression);
+				result.AddChild(new CSharpTokenNode(Convert(asExpression.Location), AsExpression.AsKeywordRole), AsExpression.AsKeywordRole);
+				if (asExpression.ProbeType != null)
+					result.AddChild(ConvertToType(asExpression.ProbeType), Roles.Type);
+				return result;
+			}
+
+			public override object Visit(Cast castExpression)
+			{
+				var result = new CastExpression();
+				var location = LocationsBag.GetLocations(castExpression);
+				
+				result.AddChild(new CSharpTokenNode(Convert(castExpression.Location), Roles.LPar), Roles.LPar);
+				if (castExpression.TargetType != null)
+					result.AddChild(ConvertToType(castExpression.TargetType), Roles.Type);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.RPar), Roles.RPar);
+				if (castExpression.Expr != null)
+					result.AddChild((Expression)castExpression.Expr.Accept(this), Roles.Expression);
+				return result;
+			}
+
+			public override object Visit(ComposedCast composedCast)
+			{
+				var result = new ComposedType();
+				result.AddChild(ConvertToType(composedCast.Left), Roles.Type);
+				
+				var spec = composedCast.Spec;
+				while (spec != null) {
+					if (spec.IsNullable) {
+						result.AddChild(new CSharpTokenNode(Convert(spec.Location), ComposedType.NullableRole), ComposedType.NullableRole);
+					} else if (spec.IsPointer) {
+						result.AddChild(new CSharpTokenNode(Convert(spec.Location), ComposedType.PointerRole), ComposedType.PointerRole);
+					} else {
+						var aSpec = new ArraySpecifier();
+						aSpec.AddChild(new CSharpTokenNode(Convert(spec.Location), Roles.LBracket), Roles.LBracket);
+						var location = LocationsBag.GetLocations(spec);
+						if (location != null)
+							aSpec.AddChild(new CSharpTokenNode(Convert(spec.Location), Roles.RBracket), Roles.RBracket);
+						result.AddChild(aSpec, ComposedType.ArraySpecifierRole);
+					}
+					spec = spec.Next;
+				}
+				
+				return result;
+			}
+
+			public override object Visit(Mono.CSharp.DefaultValueExpression defaultValueExpression)
+			{
+				var result = new DefaultValueExpression();
+				result.AddChild(new CSharpTokenNode(Convert(defaultValueExpression.Location), DefaultValueExpression.DefaultKeywordRole), DefaultValueExpression.DefaultKeywordRole);
+				var location = LocationsBag.GetLocations(defaultValueExpression);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				result.AddChild(ConvertToType(defaultValueExpression.Expr), Roles.Type);
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				return result;
+			}
+
+			public override object Visit(Binary binaryExpression)
+			{
+				var result = new BinaryOperatorExpression();
+				switch (binaryExpression.Oper) {
+					case Binary.Operator.Multiply:
+						result.Operator = BinaryOperatorType.Multiply;
+						break;
+					case Binary.Operator.Division:
+						result.Operator = BinaryOperatorType.Divide;
+						break;
+					case Binary.Operator.Modulus:
+						result.Operator = BinaryOperatorType.Modulus;
+						break;
+					case Binary.Operator.Addition:
+						result.Operator = BinaryOperatorType.Add;
+						break;
+					case Binary.Operator.Subtraction:
+						result.Operator = BinaryOperatorType.Subtract;
+						break;
+					case Binary.Operator.LeftShift:
+						result.Operator = BinaryOperatorType.ShiftLeft;
+						break;
+					case Binary.Operator.RightShift:
+						result.Operator = BinaryOperatorType.ShiftRight;
+						break;
+					case Binary.Operator.LessThan:
+						result.Operator = BinaryOperatorType.LessThan;
+						break;
+					case Binary.Operator.GreaterThan:
+						result.Operator = BinaryOperatorType.GreaterThan;
+						break;
+					case Binary.Operator.LessThanOrEqual:
+						result.Operator = BinaryOperatorType.LessThanOrEqual;
+						break;
+					case Binary.Operator.GreaterThanOrEqual:
+						result.Operator = BinaryOperatorType.GreaterThanOrEqual;
+						break;
+					case Binary.Operator.Equality:
+						result.Operator = BinaryOperatorType.Equality;
+						break;
+					case Binary.Operator.Inequality:
+						result.Operator = BinaryOperatorType.InEquality;
+						break;
+					case Binary.Operator.BitwiseAnd:
+						result.Operator = BinaryOperatorType.BitwiseAnd;
+						break;
+					case Binary.Operator.ExclusiveOr:
+						result.Operator = BinaryOperatorType.ExclusiveOr;
+						break;
+					case Binary.Operator.BitwiseOr:
+						result.Operator = BinaryOperatorType.BitwiseOr;
+						break;
+					case Binary.Operator.LogicalAnd:
+						result.Operator = BinaryOperatorType.ConditionalAnd;
+						break;
+					case Binary.Operator.LogicalOr:
+						result.Operator = BinaryOperatorType.ConditionalOr;
+						break;
+				}
+				
+				if (binaryExpression.Left != null)
+					result.AddChild((Expression)binaryExpression.Left.Accept(this), BinaryOperatorExpression.LeftRole);
+				var location = LocationsBag.GetLocations(binaryExpression);
+				if (location != null) {
+					var r = BinaryOperatorExpression.GetOperatorRole(result.Operator);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), r), r);
+				}
+				if (binaryExpression.Right != null)
+					result.AddChild((Expression)binaryExpression.Right.Accept(this), BinaryOperatorExpression.RightRole);
+				return result;
+			}
+
+			public override object Visit(Mono.CSharp.Nullable.NullCoalescingOperator nullCoalescingOperator)
+			{
+				var result = new BinaryOperatorExpression();
+				result.Operator = BinaryOperatorType.NullCoalescing;
+				if (nullCoalescingOperator.LeftExpression != null)
+					result.AddChild((Expression)nullCoalescingOperator.LeftExpression.Accept(this), BinaryOperatorExpression.LeftRole);
+				var location = LocationsBag.GetLocations(nullCoalescingOperator);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), BinaryOperatorExpression.NullCoalescingRole), BinaryOperatorExpression.NullCoalescingRole);
+				if (nullCoalescingOperator.RightExpression != null)
+					result.AddChild((Expression)nullCoalescingOperator.RightExpression.Accept(this), BinaryOperatorExpression.RightRole);
+				return result;
+			}
+
+			public override object Visit(Conditional conditionalExpression)
+			{
+				var result = new ConditionalExpression();
+				
+				if (conditionalExpression.Expr != null)
+					result.AddChild((Expression)conditionalExpression.Expr.Accept(this), Roles.Condition);
+				var location = LocationsBag.GetLocations(conditionalExpression);
+				
+				result.AddChild(new CSharpTokenNode(Convert(conditionalExpression.Location), ConditionalExpression.QuestionMarkRole), ConditionalExpression.QuestionMarkRole);
+				if (conditionalExpression.TrueExpr != null)
+					result.AddChild((Expression)conditionalExpression.TrueExpr.Accept(this), ConditionalExpression.TrueRole);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), ConditionalExpression.ColonRole), ConditionalExpression.ColonRole);
+				if (conditionalExpression.FalseExpr != null)
+					result.AddChild((Expression)conditionalExpression.FalseExpr.Accept(this), ConditionalExpression.FalseRole);
+				return result;
+			}
+
+			void AddParameter(AstNode parent, AParametersCollection parameters)
+			{
+				if (parameters == null)
+					return;
+				var paramLocation = LocationsBag.GetLocations(parameters);
+				
+				for (int i = 0; i < parameters.Count; i++) {
+					var p = (Parameter)parameters.FixedParameters [i];
+					if (p == null)
+						continue;
+					var location = LocationsBag.GetLocations(p);
+					var parameterDeclarationExpression = new ParameterDeclaration();
+					AddAttributeSection(parameterDeclarationExpression, p);
+					switch (p.ModFlags) {
+						case Parameter.Modifier.OUT:
+							parameterDeclarationExpression.ParameterModifier = ParameterModifier.Out;
+							if (location != null)
+								parameterDeclarationExpression.AddChild(new CSharpTokenNode(Convert(location [0]), ParameterDeclaration.OutModifierRole), ParameterDeclaration.OutModifierRole);
+							break;
+						case Parameter.Modifier.REF:
+							parameterDeclarationExpression.ParameterModifier = ParameterModifier.Ref;
+							if (location != null)
+								parameterDeclarationExpression.AddChild(new CSharpTokenNode(Convert(location [0]), ParameterDeclaration.RefModifierRole), ParameterDeclaration.RefModifierRole);
+							break;
+						case Parameter.Modifier.PARAMS:
+							parameterDeclarationExpression.ParameterModifier = ParameterModifier.Params;
+							if (location != null)
+								parameterDeclarationExpression.AddChild(new CSharpTokenNode(Convert(location [0]), ParameterDeclaration.ParamsModifierRole), ParameterDeclaration.ParamsModifierRole);
+							break;
+						default:
+							if (p.HasExtensionMethodModifier) {
+								parameterDeclarationExpression.ParameterModifier = ParameterModifier.This;
+								if (location != null) {
+									parameterDeclarationExpression.AddChild(new CSharpTokenNode(Convert(location [0]), ParameterDeclaration.ThisModifierRole), ParameterDeclaration.ThisModifierRole);
+								}
+							}
+							break;
+					}
+					if (p.TypeExpression != null) // lambdas may have no types (a, b) => ...
+						parameterDeclarationExpression.AddChild(ConvertToType(p.TypeExpression), Roles.Type);
+					if (p.Name != null)
+						parameterDeclarationExpression.AddChild(Identifier.Create(p.Name, Convert(p.Location)), Roles.Identifier);
+					if (p.HasDefaultValue) {
+						if (location != null && location.Count > 1)
+							parameterDeclarationExpression.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.Assign), Roles.Assign);
+						parameterDeclarationExpression.AddChild((Expression)p.DefaultValue.Accept(this), Roles.Expression);
+					}
+					parent.AddChild(parameterDeclarationExpression, Roles.Parameter);
+					if (paramLocation != null && i < paramLocation.Count) {
+						parent.AddChild(new CSharpTokenNode(Convert(paramLocation [i]), Roles.Comma), Roles.Comma);
+					}
+				}
+			}
+
+			void AddTypeParameters(AstNode parent, MemberName memberName)
+			{
+				if (memberName == null || memberName.TypeParameters == null)
+					return;
+				var chevronLocs = LocationsBag.GetLocations(memberName.TypeParameters);
+				if (chevronLocs != null)
+					parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [chevronLocs.Count - 2]), Roles.LChevron), Roles.LChevron);
+				for (int i = 0; i < memberName.TypeParameters.Count; i++) {
+					if (chevronLocs != null && i > 0 && i - 1 < chevronLocs.Count)
+						parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [i - 1]), Roles.Comma), Roles.Comma);
+					var arg = memberName.TypeParameters [i];
+					if (arg == null)
+						continue;
+					var tp = new TypeParameterDeclaration();
+					
+					List<Location> varianceLocation;
+					switch (arg.Variance) {
+						case Variance.Contravariant:
+							tp.Variance = VarianceModifier.Contravariant;
+							varianceLocation = LocationsBag.GetLocations(arg);
+							if (varianceLocation != null)
+								tp.AddChild(new CSharpTokenNode(Convert(varianceLocation [0]), TypeParameterDeclaration.InVarianceKeywordRole), TypeParameterDeclaration.InVarianceKeywordRole);
+							break;
+						case Variance.Covariant:
+							tp.Variance = VarianceModifier.Covariant;
+							varianceLocation = LocationsBag.GetLocations(arg);
+							if (varianceLocation != null)
+								tp.AddChild(new CSharpTokenNode(Convert(varianceLocation [0]), TypeParameterDeclaration.OutVarianceKeywordRole), TypeParameterDeclaration.OutVarianceKeywordRole);
+							break;
+						default:
+							tp.Variance = VarianceModifier.Invariant;
+							break;
+							
+					}
+					
+					AddAttributeSection(tp, arg.OptAttributes);
+
+					switch (arg.Variance) {
+						case Variance.Covariant:
+							tp.Variance = VarianceModifier.Covariant;
+							break;
+						case Variance.Contravariant:
+							tp.Variance = VarianceModifier.Contravariant;
+							break;
+					}
+					tp.AddChild(Identifier.Create(arg.Name, Convert(arg.Location)), Roles.Identifier);
+					parent.AddChild(tp, Roles.TypeParameter);
+				}
+				if (chevronLocs != null)
+					parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [chevronLocs.Count - 1]), Roles.RChevron), Roles.RChevron);
+			}
+
+			void AddTypeArguments(AstNode parent, MemberName memberName)
+			{
+				if (memberName == null || memberName.TypeParameters == null)
+					return;
+				var chevronLocs = LocationsBag.GetLocations(memberName.TypeParameters);
+				if (chevronLocs != null)
+					parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [chevronLocs.Count - 2]), Roles.LChevron), Roles.LChevron);
+				
+				for (int i = 0; i < memberName.TypeParameters.Count; i++) {
+					var arg = memberName.TypeParameters [i];
+					if (arg == null)
+						continue;
+					parent.AddChild(ConvertToType(arg), Roles.TypeArgument);
+					if (chevronLocs != null && i < chevronLocs.Count - 2)
+						parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [i]), Roles.Comma), Roles.Comma);
+				}
+				
+				if (chevronLocs != null)
+					parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [chevronLocs.Count - 1]), Roles.RChevron), Roles.RChevron);
+			}
+
+			void AddTypeArguments(AstNode parent, ATypeNameExpression memberName)
+			{
+				if (memberName == null || !memberName.HasTypeArguments)
+					return;
+				var chevronLocs = LocationsBag.GetLocations(memberName.TypeArguments);
+				if (chevronLocs != null)
+					parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [chevronLocs.Count - 2]), Roles.LChevron), Roles.LChevron);
+				
+				for (int i = 0; i < memberName.TypeArguments.Count; i++) {
+					var arg = memberName.TypeArguments.Args [i];
+					if (arg == null)
+						continue;
+					parent.AddChild(ConvertToType(arg), Roles.TypeArgument);
+					if (chevronLocs != null && i < chevronLocs.Count - 2)
+						parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [i]), Roles.Comma), Roles.Comma);
+				}
+				
+				if (chevronLocs != null)
+					parent.AddChild(new CSharpTokenNode(Convert(chevronLocs [chevronLocs.Count - 1]), Roles.RChevron), Roles.RChevron);
+			}
+
+			void AddConstraints(AstNode parent, TypeParameters d)
+			{
+				if (d == null)
+					return;
+				for (int i = 0; i < d.Count; i++) {
+					var typeParameter = d [i];
+					if (typeParameter == null)
+						continue;
+					var c = typeParameter.Constraints;
+					if (c == null)
+						continue;
+					var location = LocationsBag.GetLocations(c);
+					var constraint = new Constraint();
+					constraint.AddChild(new CSharpTokenNode(Convert(c.Location), Roles.WhereKeyword), Roles.WhereKeyword);
+					constraint.AddChild(new SimpleType(Identifier.Create(c.TypeParameter.Value, Convert(c.TypeParameter.Location))), Roles.ConstraintTypeParameter);
+					if (location != null)
+						constraint.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Colon), Roles.Colon);
+					var commaLocs = LocationsBag.GetLocations(c.ConstraintExpressions);
+					int curComma = 0;
+					if (c.ConstraintExpressions != null) {
+						foreach (var expr in c.ConstraintExpressions) {
+							constraint.AddChild(ConvertToType(expr), Roles.BaseType);
+							var sce = expr as SpecialContraintExpr;
+							if (sce != null) {
+								switch (sce.Constraint) {
+									case SpecialConstraint.Class:
+										break;
+									case SpecialConstraint.Struct:
+										break;
+									case SpecialConstraint.Constructor:
+										var bl = LocationsBag.GetLocations(expr);
+										if (bl != null) {
+											constraint.AddChild(new CSharpTokenNode(Convert(bl [0]), Roles.LPar), Roles.LPar);
+											constraint.AddChild(new CSharpTokenNode(Convert(bl [1]), Roles.RPar), Roles.RPar);
+										}
+										break;
+								}
+							}
+
+							if (commaLocs != null && curComma < commaLocs.Count)
+								constraint.AddChild(new CSharpTokenNode(Convert(commaLocs [curComma++]), Roles.Comma), Roles.Comma);
+						}
+					}
+					
+					// We need to sort the constraints by position; as they might be in a different order than the type parameters
+					AstNode prevSibling = parent.LastChild;
+					while (prevSibling.StartLocation > constraint.StartLocation && prevSibling.PrevSibling != null)
+						prevSibling = prevSibling.PrevSibling;
+					parent.InsertChildAfter(prevSibling, constraint, Roles.Constraint);
+				}
+			}
+
+			Expression ConvertArgument(Argument arg)
+			{
+				var na = arg as NamedArgument;
+				if (na != null) {
+					var newArg = new NamedArgumentExpression();
+					newArg.AddChild(Identifier.Create(na.Name, Convert(na.Location)), Roles.Identifier);
+					
+					var loc = LocationsBag.GetLocations(na);
+					if (loc != null)
+						newArg.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.Colon), Roles.Colon);
+					
+					if (arg.ArgType == Argument.AType.Out || arg.ArgType == Argument.AType.Ref) {
+						var direction = new DirectionExpression();
+						direction.FieldDirection = arg.ArgType == Argument.AType.Out ? FieldDirection.Out : FieldDirection.Ref;
+						var argLocation = LocationsBag.GetLocations(arg);
+						if (argLocation != null) {
+							var r = arg.ArgType == Argument.AType.Out ? DirectionExpression.OutKeywordRole : DirectionExpression.RefKeywordRole;
+							direction.AddChild(new CSharpTokenNode(Convert(argLocation [0]), r), r);
+						}
+						direction.AddChild((Expression)arg.Expr.Accept(this), Roles.Expression);
+						newArg.AddChild(direction, Roles.Expression);
+					} else {
+						newArg.AddChild(na.Expr != null ? (Expression)na.Expr.Accept(this) : new ErrorExpression("Named argument expression parse error"), Roles.Expression);
+					}
+					return newArg;
+				}
+				
+				if (arg.ArgType == Argument.AType.Out || arg.ArgType == Argument.AType.Ref) {
+					var direction = new DirectionExpression();
+					direction.FieldDirection = arg.ArgType == Argument.AType.Out ? FieldDirection.Out : FieldDirection.Ref;
+					var argLocation = LocationsBag.GetLocations(arg);
+					if (argLocation != null) {
+						var r = arg.ArgType == Argument.AType.Out ? DirectionExpression.OutKeywordRole : DirectionExpression.RefKeywordRole;
+						direction.AddChild(new CSharpTokenNode(Convert(argLocation [0]), r), r);
+					}
+					direction.AddChild((Expression)arg.Expr.Accept(this), Roles.Expression);
+					return direction;
+				}
+				
+				return (Expression)arg.Expr.Accept(this);
+			}
+
+			void AddArguments(AstNode parent, Arguments args)
+			{
+				if (args == null)
+					return;
+				
+				var commaLocations = LocationsBag.GetLocations(args);
+				for (int i = 0; i < args.Count; i++) {
+					parent.AddChild(ConvertArgument(args [i]), Roles.Argument);
+					if (commaLocations != null && i < commaLocations.Count) {
+						parent.AddChild(new CSharpTokenNode(Convert(commaLocations [i]), Roles.Comma), Roles.Comma);
+					}
+				}
+				if (commaLocations != null && commaLocations.Count > args.Count)
+					parent.AddChild(new CSharpTokenNode(Convert(commaLocations [args.Count]), Roles.Comma), Roles.Comma);
+			}
+
+			public override object Visit(Invocation invocationExpression)
+			{
+				var result = new InvocationExpression();
+				var location = LocationsBag.GetLocations(invocationExpression);
+				if (invocationExpression.Exp != null)
+					result.AddChild((Expression)invocationExpression.Exp.Accept(this), Roles.TargetExpression);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				AddArguments(result, invocationExpression.Arguments);
+				
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				return result;
+			}
+
+			public override object Visit(New newExpression)
+			{
+				var result = new ObjectCreateExpression();
+				var location = LocationsBag.GetLocations(newExpression);
+				result.AddChild(new CSharpTokenNode(Convert(newExpression.Location), ObjectCreateExpression.NewKeywordRole), ObjectCreateExpression.NewKeywordRole);
+				
+				if (newExpression.TypeRequested != null)
+					result.AddChild(ConvertToType(newExpression.TypeRequested), Roles.Type);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				AddArguments(result, newExpression.Arguments);
+				
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				
+				return result;
+			}
+
+			public override object Visit(NewAnonymousType newAnonymousType)
+			{
+				var result = new AnonymousTypeCreateExpression();
+				var location = LocationsBag.GetLocations(newAnonymousType);
+				result.AddChild(new CSharpTokenNode(Convert(newAnonymousType.Location), ObjectCreateExpression.NewKeywordRole), ObjectCreateExpression.NewKeywordRole);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LBrace), Roles.LBrace);
+				if (newAnonymousType.Parameters != null) {
+					foreach (var par in newAnonymousType.Parameters) {
+						if (par == null)
+							continue;
+						var parLocation = LocationsBag.GetLocations(par);
+						
+						if (parLocation == null) {
+							if (par.Expr != null)
+								result.AddChild((Expression)par.Expr.Accept(this), Roles.Expression);
+						} else {
+							var namedExpression = new NamedExpression();
+							namedExpression.AddChild(Identifier.Create(par.Name, Convert(par.Location)), Roles.Identifier);
+							namedExpression.AddChild(new CSharpTokenNode(Convert(parLocation [0]), Roles.Assign), Roles.Assign);
+							if (par.Expr != null)
+								namedExpression.AddChild((Expression)par.Expr.Accept(this), Roles.Expression);
+							result.AddChild(namedExpression, Roles.Expression);
+						}
+					}
+				}
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RBrace), Roles.RBrace);
+				return result;
+			}
+
+			ArrayInitializerExpression ConvertCollectionOrObjectInitializers(CollectionOrObjectInitializers minit)
+			{
+				if (minit == null)
+					return null;
+				var init = new ArrayInitializerExpression();
+				AddConvertCollectionOrObjectInitializers(init, minit);
+				return init;
+			}
+
+			void AddConvertCollectionOrObjectInitializers(Expression init, CollectionOrObjectInitializers minit)
+			{
+				var initLoc = LocationsBag.GetLocations(minit);
+				var commaLoc = LocationsBag.GetLocations(minit.Initializers);
+				int curComma = 0;
+				init.AddChild(new CSharpTokenNode(Convert(minit.Location), Roles.LBrace), Roles.LBrace);
+				foreach (var expr in minit.Initializers) {
+					var collectionInit = expr as CollectionElementInitializer;
+					if (collectionInit != null) {
+						AstNode parent;
+						// For ease of use purposes in the resolver the ast representation
+						// of { a, b, c }  is { {a}, {b}, {c} } - but the generated ArrayInitializerExpression
+						// can be identified by expr.IsSingleElement.
+						if (!collectionInit.IsSingle) {
+							parent = new ArrayInitializerExpression();
+							parent.AddChild(new CSharpTokenNode(Convert(collectionInit.Location), Roles.LBrace), Roles.LBrace);
+						} else {
+							parent = ArrayInitializerExpression.CreateSingleElementInitializer();
+						}
+						for (int i = 0; i < collectionInit.Arguments.Count; i++) {
+							var arg = collectionInit.Arguments [i] as CollectionElementInitializer.ElementInitializerArgument;
+							if (arg == null)
+								continue;
+							parent.AddChild(
+								(Expression)arg.Expr.Accept(this),
+								Roles.Expression
+							);
+						}
+
+						if (!collectionInit.IsSingle) {
+							var braceLocs = LocationsBag.GetLocations(expr);
+							if (braceLocs != null)
+								parent.AddChild(new CSharpTokenNode(Convert(braceLocs [0]), Roles.RBrace), Roles.RBrace);
+						}
+						init.AddChild((ArrayInitializerExpression)parent, Roles.Expression);
+					} else {
+						var eleInit = expr as ElementInitializer;
+						if (eleInit != null) {
+							var nexpr = new NamedExpression();
+							nexpr.AddChild(
+								Identifier.Create(eleInit.Name, Convert(eleInit.Location)),
+								Roles.Identifier
+							);
+							var assignLoc = LocationsBag.GetLocations(eleInit);
+							if (assignLoc != null)
+								nexpr.AddChild(new CSharpTokenNode(Convert(assignLoc [0]), Roles.Assign), Roles.Assign);
+							if (eleInit.Source != null) {
+								var colInit = eleInit.Source as CollectionOrObjectInitializers;
+								if (colInit != null) {
+									var arrInit = new ArrayInitializerExpression();
+									AddConvertCollectionOrObjectInitializers(
+										arrInit,
+										colInit
+									);
+									nexpr.AddChild(arrInit, Roles.Expression);
+								} else {
+									nexpr.AddChild((Expression)eleInit.Source.Accept(this), Roles.Expression);
+								}
+							}
+
+							init.AddChild(nexpr, Roles.Expression);
+						}
+					}
+					if (commaLoc != null && curComma < commaLoc.Count)
+						init.AddChild(new CSharpTokenNode(Convert(commaLoc [curComma++]), Roles.Comma), Roles.Comma);
+				}
+
+				if (initLoc != null) {
+					if (initLoc.Count == 2) // optional comma
+						init.AddChild(new CSharpTokenNode(Convert(initLoc [0]), Roles.Comma), Roles.Comma);
+					init.AddChild(new CSharpTokenNode(Convert(initLoc [initLoc.Count - 1]), Roles.RBrace), Roles.RBrace);
+				}
+			}
+
+			public override object Visit(NewInitialize newInitializeExpression)
+			{
+				var result = new ObjectCreateExpression();
+				result.AddChild(new CSharpTokenNode(Convert(newInitializeExpression.Location), ObjectCreateExpression.NewKeywordRole), ObjectCreateExpression.NewKeywordRole);
+				
+				if (newInitializeExpression.TypeRequested != null)
+					result.AddChild(ConvertToType(newInitializeExpression.TypeRequested), Roles.Type);
+				
+				var location = LocationsBag.GetLocations(newInitializeExpression);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				AddArguments(result, newInitializeExpression.Arguments);
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				
+				var init = ConvertCollectionOrObjectInitializers(newInitializeExpression.Initializers);
+				if (init != null)
+					result.AddChild(init, ObjectCreateExpression.InitializerRole);
+				
+				return result;
+			}
+
+			public override object Visit(ArrayCreation arrayCreationExpression)
+			{
+				var result = new ArrayCreateExpression();
+				
+				var location = LocationsBag.GetLocations(arrayCreationExpression);
+				result.AddChild(new CSharpTokenNode(Convert(arrayCreationExpression.Location), ArrayCreateExpression.NewKeywordRole), ArrayCreateExpression.NewKeywordRole);
+				if (arrayCreationExpression.TypeExpression != null)
+					result.AddChild(ConvertToType(arrayCreationExpression.TypeExpression), Roles.Type);
+				
+				var next = arrayCreationExpression.Rank;
+				if (arrayCreationExpression.Arguments != null) {
+					// skip first array rank.
+					next = next.Next;
+					
+					if (location != null)
+						result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LBracket), Roles.LBracket);
+					
+					var commaLocations = LocationsBag.GetLocations(arrayCreationExpression.Arguments);
+					for (int i = 0; i < arrayCreationExpression.Arguments.Count; i++) {
+						var arg = arrayCreationExpression.Arguments [i];
+						if (arg != null)
+							result.AddChild((Expression)arg.Accept(this), Roles.Argument);
+						if (commaLocations != null && i < commaLocations.Count)
+							result.AddChild(new CSharpTokenNode(Convert(commaLocations [i]), Roles.Comma), Roles.Comma);
+					}
+					if (location != null && location.Count > 1)
+						result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RBracket), Roles.RBracket);
+					
+				}
+				
+				while (next != null) {
+					var spec = new ArraySpecifier(next.Dimension);
+					var loc = LocationsBag.GetLocations(next);
+					spec.AddChild(new CSharpTokenNode(Convert(next.Location), Roles.LBracket), Roles.LBracket);
+					result.AddChild(spec, ArrayCreateExpression.AdditionalArraySpecifierRole);
+					if (loc != null)
+						result.AddChild(new CSharpTokenNode(Convert(loc [0]), Roles.RBracket), Roles.RBracket);
+					next = next.Next;
+				}
+				
+				if (arrayCreationExpression.Initializers != null) {
+					var initLocation = LocationsBag.GetLocations(arrayCreationExpression.Initializers);
+					var initializer = new ArrayInitializerExpression();
+					
+					initializer.AddChild(new CSharpTokenNode(Convert(arrayCreationExpression.Initializers.Location), Roles.LBrace), Roles.LBrace);
+					var commaLocations = LocationsBag.GetLocations(arrayCreationExpression.Initializers.Elements);
+					for (int i = 0; i < arrayCreationExpression.Initializers.Count; i++) {
+						var init = arrayCreationExpression.Initializers [i];
+						if (init == null)
+							continue;
+						initializer.AddChild((Expression)init.Accept(this), Roles.Expression);
+						if (commaLocations != null && i < commaLocations.Count) {
+							initializer.AddChild(new CSharpTokenNode(Convert(commaLocations [i]), Roles.Comma), Roles.Comma);
+						}
+					}
+					if (initLocation != null) {
+						if (initLocation.Count == 2) // optional comma
+							initializer.AddChild(new CSharpTokenNode(Convert(initLocation [0]), Roles.Comma), Roles.Comma);
+						initializer.AddChild(new CSharpTokenNode(Convert(initLocation [initLocation.Count - 1]), Roles.RBrace), Roles.RBrace);
+					}
+					result.AddChild(initializer, ArrayCreateExpression.InitializerRole);
+				}
+				
+				return result;
+			}
+
+			public override object Visit(This thisExpression)
+			{
+				var result = new ThisReferenceExpression();
+				result.Location = Convert(thisExpression.Location);
+				return result;
+			}
+
+			public override object Visit(ArglistAccess argListAccessExpression)
+			{
+				var result = new UndocumentedExpression {
+					UndocumentedExpressionType = UndocumentedExpressionType.ArgListAccess
+				};
+				result.AddChild(new CSharpTokenNode(Convert(argListAccessExpression.Location), UndocumentedExpression.ArglistKeywordRole), UndocumentedExpression.ArglistKeywordRole);
+				return result;
+			}
+
+			#region Undocumented expressions
+
+			public override object Visit(Arglist argListExpression)
+			{
+				var result = new UndocumentedExpression { UndocumentedExpressionType = UndocumentedExpressionType.ArgList };
+				result.AddChild(new CSharpTokenNode(Convert(argListExpression.Location), UndocumentedExpression.ArglistKeywordRole), UndocumentedExpression.ArglistKeywordRole);
+				var location = LocationsBag.GetLocations(argListExpression);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				
+				AddArguments(result, argListExpression.Arguments);
+				
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				return result;
+			}
+
+			public override object Visit(MakeRefExpr makeRefExpr)
+			{
+				var result = new UndocumentedExpression { UndocumentedExpressionType = UndocumentedExpressionType.MakeRef };
+				result.AddChild(new CSharpTokenNode(Convert(makeRefExpr.Location), UndocumentedExpression.MakerefKeywordRole), UndocumentedExpression.MakerefKeywordRole);
+				var location = LocationsBag.GetLocations(makeRefExpr);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				if (makeRefExpr.Expr != null)
+					result.AddChild((Expression)makeRefExpr.Expr.Accept(this), Roles.Argument);
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				return result;
+			}
+
+			public override object Visit(RefTypeExpr refTypeExpr)
+			{
+				var result = new UndocumentedExpression { UndocumentedExpressionType = UndocumentedExpressionType.RefType };
+				result.AddChild(new CSharpTokenNode(Convert(refTypeExpr.Location), UndocumentedExpression.ReftypeKeywordRole), UndocumentedExpression.ReftypeKeywordRole);
+				var location = LocationsBag.GetLocations(refTypeExpr);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				
+				if (refTypeExpr.Expr != null)
+					result.AddChild((Expression)refTypeExpr.Expr.Accept(this), Roles.Argument);
+				
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				return result;
+			}
+
+			public override object Visit(RefValueExpr refValueExpr)
+			{
+				var result = new UndocumentedExpression { UndocumentedExpressionType = UndocumentedExpressionType.RefValue };
+				result.AddChild(new CSharpTokenNode(Convert(refValueExpr.Location), UndocumentedExpression.RefvalueKeywordRole), UndocumentedExpression.RefvalueKeywordRole);
+				var location = LocationsBag.GetLocations(refValueExpr);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				
+				
+				if (refValueExpr.Expr != null)
+					result.AddChild((Expression)refValueExpr.Expr.Accept(this), Roles.Argument);
+
+				if (refValueExpr.FullNamedExpression != null)
+					result.AddChild((Expression)refValueExpr.FullNamedExpression.Accept(this), Roles.Argument);
+				
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				return result;
+			}
+
+			#endregion
+
+			public override object Visit(TypeOf typeOfExpression)
+			{
+				var result = new TypeOfExpression();
+				var location = LocationsBag.GetLocations(typeOfExpression);
+				result.AddChild(new CSharpTokenNode(Convert(typeOfExpression.Location), TypeOfExpression.TypeofKeywordRole), TypeOfExpression.TypeofKeywordRole);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				if (typeOfExpression.TypeExpression != null)
+					result.AddChild(ConvertToType(typeOfExpression.TypeExpression), Roles.Type);
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				return result;
+			}
+
+			public override object Visit(SizeOf sizeOfExpression)
+			{
+				var result = new SizeOfExpression();
+				var location = LocationsBag.GetLocations(sizeOfExpression);
+				result.AddChild(new CSharpTokenNode(Convert(sizeOfExpression.Location), SizeOfExpression.SizeofKeywordRole), SizeOfExpression.SizeofKeywordRole);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				if (sizeOfExpression.TypeExpression != null)
+					result.AddChild(ConvertToType(sizeOfExpression.TypeExpression), Roles.Type);
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				return result;
+			}
+
+			public override object Visit(CheckedExpr checkedExpression)
+			{
+				var result = new CheckedExpression();
+				var location = LocationsBag.GetLocations(checkedExpression);
+				result.AddChild(new CSharpTokenNode(Convert(checkedExpression.Location), CheckedExpression.CheckedKeywordRole), CheckedExpression.CheckedKeywordRole);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				if (checkedExpression.Expr != null)
+					result.AddChild((Expression)checkedExpression.Expr.Accept(this), Roles.Expression);
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				return result;
+			}
+
+			public override object Visit(UnCheckedExpr uncheckedExpression)
+			{
+				var result = new UncheckedExpression();
+				var location = LocationsBag.GetLocations(uncheckedExpression);
+				result.AddChild(new CSharpTokenNode(Convert(uncheckedExpression.Location), UncheckedExpression.UncheckedKeywordRole), UncheckedExpression.UncheckedKeywordRole);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.LPar), Roles.LPar);
+				if (uncheckedExpression.Expr != null)
+					result.AddChild((Expression)uncheckedExpression.Expr.Accept(this), Roles.Expression);
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.RPar), Roles.RPar);
+				return result;
+			}
+
+			public override object Visit(ElementAccess elementAccessExpression)
+			{
+				var result = new IndexerExpression();
+				var location = LocationsBag.GetLocations(elementAccessExpression);
+				
+				if (elementAccessExpression.Expr != null)
+					result.AddChild((Expression)elementAccessExpression.Expr.Accept(this), Roles.TargetExpression);
+				result.AddChild(new CSharpTokenNode(Convert(elementAccessExpression.Location), Roles.LBracket), Roles.LBracket);
+				AddArguments(result, elementAccessExpression.Arguments);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.RBracket), Roles.RBracket);
+				return result;
+			}
+
+			public override object Visit(BaseThis baseAccessExpression)
+			{
+				var result = new BaseReferenceExpression();
+				result.Location = Convert(baseAccessExpression.Location);
+				return result;
+			}
+
+			public override object Visit(StackAlloc stackAllocExpression)
+			{
+				var result = new StackAllocExpression();
+				
+				var location = LocationsBag.GetLocations(stackAllocExpression);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), StackAllocExpression.StackallocKeywordRole), StackAllocExpression.StackallocKeywordRole);
+				if (stackAllocExpression.TypeExpression != null)
+					result.AddChild(ConvertToType(stackAllocExpression.TypeExpression), Roles.Type);
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), Roles.LBracket), Roles.LBracket);
+				if (stackAllocExpression.CountExpression != null)
+					result.AddChild((Expression)stackAllocExpression.CountExpression.Accept(this), Roles.Expression);
+				if (location != null && location.Count > 2)
+					result.AddChild(new CSharpTokenNode(Convert(location [2]), Roles.RBracket), Roles.RBracket);
+				return result;
+			}
+
+			public override object Visit(SimpleAssign simpleAssign)
+			{
+				var result = new AssignmentExpression();
+				
+				result.Operator = AssignmentOperatorType.Assign;
+				if (simpleAssign.Target != null)
+					result.AddChild((Expression)simpleAssign.Target.Accept(this), AssignmentExpression.LeftRole);
+				var location = LocationsBag.GetLocations(simpleAssign);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), AssignmentExpression.AssignRole), AssignmentExpression.AssignRole);
+				if (simpleAssign.Source != null) {
+					result.AddChild((Expression)simpleAssign.Source.Accept(this), AssignmentExpression.RightRole);
+				}
+				return result;
+			}
+
+			public override object Visit(CompoundAssign compoundAssign)
+			{
+				var result = new AssignmentExpression();
+				switch (compoundAssign.Op) {
+					case Binary.Operator.Multiply:
+						result.Operator = AssignmentOperatorType.Multiply;
+						break;
+					case Binary.Operator.Division:
+						result.Operator = AssignmentOperatorType.Divide;
+						break;
+					case Binary.Operator.Modulus:
+						result.Operator = AssignmentOperatorType.Modulus;
+						break;
+					case Binary.Operator.Addition:
+						result.Operator = AssignmentOperatorType.Add;
+						break;
+					case Binary.Operator.Subtraction:
+						result.Operator = AssignmentOperatorType.Subtract;
+						break;
+					case Binary.Operator.LeftShift:
+						result.Operator = AssignmentOperatorType.ShiftLeft;
+						break;
+					case Binary.Operator.RightShift:
+						result.Operator = AssignmentOperatorType.ShiftRight;
+						break;
+					case Binary.Operator.BitwiseAnd:
+						result.Operator = AssignmentOperatorType.BitwiseAnd;
+						break;
+					case Binary.Operator.BitwiseOr:
+						result.Operator = AssignmentOperatorType.BitwiseOr;
+						break;
+					case Binary.Operator.ExclusiveOr:
+						result.Operator = AssignmentOperatorType.ExclusiveOr;
+						break;
+				}
+				
+				if (compoundAssign.Target != null)
+					result.AddChild((Expression)compoundAssign.Target.Accept(this), AssignmentExpression.LeftRole);
+				var location = LocationsBag.GetLocations(compoundAssign);
+				if (location != null) {
+					var r = AssignmentExpression.GetOperatorRole(result.Operator);
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), r), r);
+				}
+				if (compoundAssign.Source != null)
+					result.AddChild((Expression)compoundAssign.Source.Accept(this), AssignmentExpression.RightRole);
+				return result;
+			}
+
+			public override object Visit(Mono.CSharp.AnonymousMethodExpression anonymousMethodExpression)
+			{
+				var result = new AnonymousMethodExpression();
+				var location = LocationsBag.GetLocations(anonymousMethodExpression);
+				int l = 0;
+				if (anonymousMethodExpression.IsAsync) {
+					result.IsAsync = true;
+					result.AddChild(new CSharpTokenNode(Convert(location [l++]), AnonymousMethodExpression.AsyncModifierRole), AnonymousMethodExpression.AsyncModifierRole);
+				}
+				if (location != null) {
+					result.AddChild(new CSharpTokenNode(Convert(location [l++]), AnonymousMethodExpression.DelegateKeywordRole), AnonymousMethodExpression.DelegateKeywordRole);
+					
+					if (location.Count > l) {
+						result.HasParameterList = true;
+						result.AddChild(new CSharpTokenNode(Convert(location [l++]), Roles.LPar), Roles.LPar);
+						AddParameter(result, anonymousMethodExpression.Parameters);
+						result.AddChild(new CSharpTokenNode(Convert(location [l++]), Roles.RPar), Roles.RPar);
+					}
+				}
+				if (anonymousMethodExpression.Block != null)
+					result.AddChild((BlockStatement)anonymousMethodExpression.Block.Accept(this), Roles.Body);
+				return result;
+			}
+
+			public override object Visit(Mono.CSharp.LambdaExpression lambdaExpression)
+			{
+				var result = new LambdaExpression();
+				var location = LocationsBag.GetLocations(lambdaExpression);
+				int l = 0;
+				if (lambdaExpression.IsAsync) {
+					result.IsAsync = true;
+					result.AddChild(new CSharpTokenNode(Convert(location [l++]), LambdaExpression.AsyncModifierRole), LambdaExpression.AsyncModifierRole);
+				}
+				if (location == null || location.Count == l + 1) {
+					if (lambdaExpression.Block != null)
+						AddParameter(result, lambdaExpression.Parameters);
+					if (location != null)
+						result.AddChild(new CSharpTokenNode(Convert(location [l++]), LambdaExpression.ArrowRole), LambdaExpression.ArrowRole);
+				} else {
+					result.AddChild(new CSharpTokenNode(Convert(location [l++]), Roles.LPar), Roles.LPar);
+					if (lambdaExpression.Block != null)
+						AddParameter(result, lambdaExpression.Parameters);
+					if (location != null) {
+						result.AddChild(new CSharpTokenNode(Convert(location [l++]), Roles.RPar), Roles.RPar);
+						result.AddChild(new CSharpTokenNode(Convert(location [l++]), LambdaExpression.ArrowRole), LambdaExpression.ArrowRole);
+					}
+				}
+				if (lambdaExpression.Block != null) {
+					if (lambdaExpression.Block.IsCompilerGenerated) {
+						var generatedReturn = (ContextualReturn)lambdaExpression.Block.Statements [0];
+						result.AddChild((AstNode)generatedReturn.Expr.Accept(this), LambdaExpression.BodyRole);
+					} else {
+						result.AddChild((AstNode)lambdaExpression.Block.Accept(this), LambdaExpression.BodyRole);
+					}
+				}
+				return result;
+			}
+
+			public override object Visit(ConstInitializer constInitializer)
+			{
+				return constInitializer.Expr.Accept(this);
+			}
+
+			public override object Visit(ArrayInitializer arrayInitializer)
+			{
+				var result = new ArrayInitializerExpression();
+				var location = LocationsBag.GetLocations(arrayInitializer);
+				result.AddChild(new CSharpTokenNode(Convert(arrayInitializer.Location), Roles.LBrace), Roles.LBrace);
+				var commaLocations = LocationsBag.GetLocations(arrayInitializer.Elements);
+				for (int i = 0; i < arrayInitializer.Count; i++) {
+					var init = arrayInitializer [i];
+					if (init == null)
+						continue;
+					result.AddChild((Expression)init.Accept(this), Roles.Expression);
+					if (commaLocations != null && i < commaLocations.Count)
+						result.AddChild(new CSharpTokenNode(Convert(commaLocations [i]), Roles.Comma), Roles.Comma);
+				}
+				
+				if (location != null) {
+					if (location.Count == 2) // optional comma
+						result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Comma), Roles.Comma);
+					result.AddChild(new CSharpTokenNode(Convert(location [location.Count - 1]), Roles.RBrace), Roles.RBrace);
+				}
+				return result;
+			}
+
+			#endregion
+
+			#region LINQ expressions
+
+			QueryOrderClause currentQueryOrderClause;
+
+			public override object Visit(Mono.CSharp.Linq.QueryExpression queryExpression)
+			{
+				var oldQueryOrderClause = currentQueryOrderClause;
+				try {
+					currentQueryOrderClause = null;
+					var result = new QueryExpression();
+					
+					var currentClause = queryExpression.next;
+					
+					while (currentClause != null) {
+						var clause = (QueryClause)currentClause.Accept(this);
+						if (clause is QueryContinuationClause) {
+							// insert preceding query at beginning of QueryContinuationClause
+							clause.InsertChildAfter(null, result, QueryContinuationClause.PrecedingQueryRole);
+							// create a new QueryExpression for the remaining query
+							result = new QueryExpression();
+						}
+						if (clause != null) {
+							result.AddChild(clause, QueryExpression.ClauseRole);
+						}
+						currentClause = currentClause.next;
+					}
+					
+					return result;
+				} finally {
+					currentQueryOrderClause = oldQueryOrderClause;
+				}
+			}
+
+			public override object Visit(Mono.CSharp.Linq.QueryStartClause queryExpression)
+			{
+				if (queryExpression.Expr == null) {
+					var intoClause = new QueryContinuationClause();
+					intoClause.AddChild(new CSharpTokenNode(Convert(queryExpression.Location), QueryContinuationClause.IntoKeywordRole), QueryContinuationClause.IntoKeywordRole);
+					intoClause.AddChild(Identifier.Create(queryExpression.IntoVariable.Name, Convert(queryExpression.IntoVariable.Location)), Roles.Identifier);
+					return intoClause;
+				}
+				
+				var fromClause = new QueryFromClause();
+
+				fromClause.AddChild(new CSharpTokenNode(Convert(queryExpression.Location), QueryFromClause.FromKeywordRole), QueryFromClause.FromKeywordRole);
+				
+				if (queryExpression.IdentifierType != null)
+					fromClause.AddChild(ConvertToType(queryExpression.IdentifierType), Roles.Type);
+				
+				fromClause.AddChild(Identifier.Create(queryExpression.IntoVariable.Name, Convert(queryExpression.IntoVariable.Location)), Roles.Identifier);
+				
+				var location = LocationsBag.GetLocations(queryExpression);
+				if (location != null)
+					fromClause.AddChild(new CSharpTokenNode(Convert(location [0]), QueryFromClause.InKeywordRole), QueryFromClause.InKeywordRole);
+
+				if (queryExpression.Expr != null)
+					fromClause.AddChild((Expression)queryExpression.Expr.Accept(this), Roles.Expression);
+				return fromClause;
+			}
+
+			public override object Visit(Mono.CSharp.Linq.SelectMany selectMany)
+			{
+				var fromClause = new QueryFromClause();
+
+				fromClause.AddChild(new CSharpTokenNode(Convert(selectMany.Location), QueryFromClause.FromKeywordRole), QueryFromClause.FromKeywordRole);
+				
+				if (selectMany.IdentifierType != null)
+					fromClause.AddChild(ConvertToType(selectMany.IdentifierType), Roles.Type);
+				
+				fromClause.AddChild(Identifier.Create(selectMany.IntoVariable.Name, Convert(selectMany.IntoVariable.Location)), Roles.Identifier);
+				
+				var location = LocationsBag.GetLocations(selectMany);
+				if (location != null)
+					fromClause.AddChild(new CSharpTokenNode(Convert(location [0]), QueryFromClause.InKeywordRole), QueryFromClause.InKeywordRole);
+
+				if (selectMany.Expr != null)
+					fromClause.AddChild((Expression)selectMany.Expr.Accept(this), Roles.Expression);
+				return fromClause;
+			}
+
+			public override object Visit(Mono.CSharp.Linq.Select select)
+			{
+				var result = new QuerySelectClause();
+				result.AddChild(new CSharpTokenNode(Convert(select.Location), QuerySelectClause.SelectKeywordRole), QuerySelectClause.SelectKeywordRole);
+				if (select.Expr != null)
+					result.AddChild((Expression)select.Expr.Accept(this), Roles.Expression);
+				return result;
+			}
+
+			public override object Visit(Mono.CSharp.Linq.GroupBy groupBy)
+			{
+				var result = new QueryGroupClause();
+				var location = LocationsBag.GetLocations(groupBy);
+				result.AddChild(new CSharpTokenNode(Convert(groupBy.Location), QueryGroupClause.GroupKeywordRole), QueryGroupClause.GroupKeywordRole);
+				if (groupBy.ElementSelector != null)
+					result.AddChild((Expression)groupBy.ElementSelector.Accept(this), QueryGroupClause.ProjectionRole);
+				if (location != null) {
+					var byLoc = Convert(location[0]);
+					if (byLoc.Line > 1 || byLoc.Column > 1)
+						result.AddChild(new CSharpTokenNode(byLoc, QueryGroupClause.ByKeywordRole), QueryGroupClause.ByKeywordRole);
+				}
+				if (groupBy.Expr != null)
+					result.AddChild((Expression)groupBy.Expr.Accept(this), QueryGroupClause.KeyRole);
+				return result;
+			}
+
+			public override object Visit(Mono.CSharp.Linq.Let let)
+			{
+				var result = new QueryLetClause();
+				var location = LocationsBag.GetLocations(let);
+				
+				result.AddChild(new CSharpTokenNode(Convert(let.Location), QueryLetClause.LetKeywordRole), QueryLetClause.LetKeywordRole);
+				result.AddChild(Identifier.Create(let.IntoVariable.Name, Convert(let.IntoVariable.Location)), Roles.Identifier);
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), Roles.Assign), Roles.Assign);
+				if (let.Expr != null)
+					result.AddChild((Expression)let.Expr.Accept(this), Roles.Expression);
+				return result;
+			}
+
+			public override object Visit(Mono.CSharp.Linq.Where where)
+			{
+				var result = new QueryWhereClause();
+				result.AddChild(new CSharpTokenNode(Convert(where.Location), QueryWhereClause.WhereKeywordRole), QueryWhereClause.WhereKeywordRole);
+				if (where.Expr != null)
+					result.AddChild((Expression)where.Expr.Accept(this), Roles.Condition);
+				return result;
+			}
+
+			public override object Visit(Mono.CSharp.Linq.Join join)
+			{
+				var result = new QueryJoinClause();
+				var location = LocationsBag.GetLocations(join);
+				result.AddChild(new CSharpTokenNode(Convert(join.Location), QueryJoinClause.JoinKeywordRole), QueryJoinClause.JoinKeywordRole);
+
+				if (join.IdentifierType != null)
+					result.AddChild(ConvertToType(join.IdentifierType), QueryJoinClause.TypeRole);
+
+				result.AddChild(Identifier.Create(join.JoinVariable.Name, Convert(join.JoinVariable.Location)), QueryJoinClause.JoinIdentifierRole);
+
+				if (join.IdentifierType != null)
+					result.AddChild(ConvertToType(join.IdentifierType), QueryJoinClause.TypeRole);
+
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), QueryJoinClause.InKeywordRole), QueryJoinClause.InKeywordRole);
+
+				if (join.Expr != null)
+					result.AddChild((Expression)join.Expr.Accept(this), QueryJoinClause.InExpressionRole);
+				
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), QueryJoinClause.OnKeywordRole), QueryJoinClause.OnKeywordRole);
+				
+				var outer = join.OuterSelector.Statements.FirstOrDefault() as ContextualReturn;
+				if (outer != null)
+					result.AddChild((Expression)outer.Expr.Accept(this), QueryJoinClause.OnExpressionRole);
+				
+				if (location != null && location.Count > 2)
+					result.AddChild(new CSharpTokenNode(Convert(location [2]), QueryJoinClause.EqualsKeywordRole), QueryJoinClause.EqualsKeywordRole);
+				
+				var inner = join.InnerSelector.Statements.FirstOrDefault() as ContextualReturn;
+				if (inner != null)
+					result.AddChild((Expression)inner.Expr.Accept(this), QueryJoinClause.EqualsExpressionRole);
+				
+				return result;
+			}
+
+			public override object Visit(Mono.CSharp.Linq.GroupJoin groupJoin)
+			{
+				var result = new QueryJoinClause();
+				var location = LocationsBag.GetLocations(groupJoin);
+				result.AddChild(new CSharpTokenNode(Convert(groupJoin.Location), QueryJoinClause.JoinKeywordRole), QueryJoinClause.JoinKeywordRole);
+				
+				// mcs seems to have swapped IntoVariable with JoinVariable, so we'll swap it back here
+				result.AddChild(Identifier.Create(groupJoin.IntoVariable.Name, Convert(groupJoin.IntoVariable.Location)), QueryJoinClause.JoinIdentifierRole);
+				
+				if (location != null)
+					result.AddChild(new CSharpTokenNode(Convert(location [0]), QueryJoinClause.InKeywordRole), QueryJoinClause.InKeywordRole);
+
+				if (groupJoin.Expr != null)
+					result.AddChild((Expression)groupJoin.Expr.Accept(this), QueryJoinClause.InExpressionRole);
+
+				if (location != null && location.Count > 1)
+					result.AddChild(new CSharpTokenNode(Convert(location [1]), QueryJoinClause.OnKeywordRole), QueryJoinClause.OnKeywordRole);
+
+				var outer = groupJoin.OuterSelector.Statements.FirstOrDefault() as ContextualReturn;
+				if (outer != null)
+					result.AddChild((Expression)outer.Expr.Accept(this), QueryJoinClause.OnExpressionRole);
+				
+
+				if (location != null && location.Count > 2)
+					result.AddChild(new CSharpTokenNode(Convert(location [2]), QueryJoinClause.EqualsKeywordRole), QueryJoinClause.EqualsKeywordRole);
+				var inner = groupJoin.InnerSelector.Statements.FirstOrDefault() as ContextualReturn;
+				if (inner != null)
+					result.AddChild((Expression)inner.Expr.Accept(this), QueryJoinClause.EqualsExpressionRole);
+				
+				if (location != null && location.Count > 3)
+					result.AddChild(new CSharpTokenNode(Convert(location [3]), QueryJoinClause.IntoKeywordRole), QueryJoinClause.IntoKeywordRole);
+				
+				result.AddChild(Identifier.Create(groupJoin.JoinVariable.Name, Convert(groupJoin.JoinVariable.Location)), QueryJoinClause.IntoIdentifierRole);
+				return result;
+			}
+
+			public override object Visit(Mono.CSharp.Linq.OrderByAscending orderByAscending)
+			{
+				currentQueryOrderClause = new QueryOrderClause();
+				var location2 = LocationsBag.GetLocations(orderByAscending.block);
+				if (location2 != null)
+					currentQueryOrderClause.AddChild(new CSharpTokenNode(Convert(location2 [0]), QueryOrderClause.OrderbyKeywordRole), QueryOrderClause.OrderbyKeywordRole);
+				var ordering = new QueryOrdering();
+				if (orderByAscending.Expr != null)
+					ordering.AddChild((Expression)orderByAscending.Expr.Accept(this), Roles.Expression);
+				var location = LocationsBag.GetLocations(orderByAscending);
+				if (location != null) {
+					ordering.Direction = QueryOrderingDirection.Ascending;
+					ordering.AddChild(new CSharpTokenNode(Convert(location [0]), QueryOrdering.AscendingKeywordRole), QueryOrdering.AscendingKeywordRole);
+				}
+				currentQueryOrderClause.AddChild(ordering, QueryOrderClause.OrderingRole);
+				return currentQueryOrderClause;
+			}
+
+			public override object Visit(Mono.CSharp.Linq.OrderByDescending orderByDescending)
+			{
+				currentQueryOrderClause = new QueryOrderClause();
+				
+				var ordering = new QueryOrdering();
+				if (orderByDescending.Expr != null)
+					ordering.AddChild((Expression)orderByDescending.Expr.Accept(this), Roles.Expression);
+				var location = LocationsBag.GetLocations(orderByDescending);
+				if (location != null) {
+					ordering.Direction = QueryOrderingDirection.Descending;
+					ordering.AddChild(new CSharpTokenNode(Convert(location [0]), QueryOrdering.DescendingKeywordRole), QueryOrdering.DescendingKeywordRole);
+				}
+				currentQueryOrderClause.AddChild(ordering, QueryOrderClause.OrderingRole);
+				return currentQueryOrderClause;
+			}
+
+			public override object Visit(Mono.CSharp.Linq.ThenByAscending thenByAscending)
+			{
+				var ordering = new QueryOrdering();
+				if (thenByAscending.Expr != null)
+					ordering.AddChild((Expression)thenByAscending.Expr.Accept(this), Roles.Expression);
+				var location = LocationsBag.GetLocations(thenByAscending);
+				if (location != null) {
+					ordering.Direction = QueryOrderingDirection.Ascending;
+					ordering.AddChild(new CSharpTokenNode(Convert(location [0]), QueryOrdering.AscendingKeywordRole), QueryOrdering.AscendingKeywordRole);
+				}
+				currentQueryOrderClause.AddChild(ordering, QueryOrderClause.OrderingRole);
+				return null;
+			}
+
+			public override object Visit(Mono.CSharp.Linq.ThenByDescending thenByDescending)
+			{
+				var ordering = new QueryOrdering();
+				if (thenByDescending.Expr != null)
+					ordering.AddChild((Expression)thenByDescending.Expr.Accept(this), Roles.Expression);
+				var location = LocationsBag.GetLocations(thenByDescending);
+				if (location != null) {
+					ordering.Direction = QueryOrderingDirection.Descending;
+					ordering.AddChild(new CSharpTokenNode(Convert(location [0]), QueryOrdering.DescendingKeywordRole), QueryOrdering.DescendingKeywordRole);
+				}
+				currentQueryOrderClause.AddChild(ordering, QueryOrderClause.OrderingRole);
+				return null;
+			}
+
+			public override object Visit(Await awaitExpr)
+			{
+				var result = new UnaryOperatorExpression();
+				result.Operator = UnaryOperatorType.Await;
+				result.AddChild(new CSharpTokenNode(Convert(awaitExpr.Location), UnaryOperatorExpression.AwaitRole), UnaryOperatorExpression.AwaitRole);
+				if (awaitExpr.Expression != null)
+					result.AddChild((Expression)awaitExpr.Expression.Accept(this), Roles.Expression);
+				return result;
+			}
+
+			#endregion
+
+			#region XmlDoc
+
+			public DocumentationReference ConvertXmlDoc(DocumentationBuilder doc)
+			{
+				var result = new DocumentationReference();
+				if (doc.ParsedName != null) {
+					if (doc.ParsedName.Name == "<this>") {
+						result.SymbolKind = SymbolKind.Indexer;
+					} else {
+						result.MemberName = doc.ParsedName.Name;
+					}
+					if (doc.ParsedName.Left != null) {
+						result.DeclaringType = ConvertToType(doc.ParsedName.Left);
+					} else if (doc.ParsedBuiltinType != null) {
+						result.DeclaringType = ConvertToType(doc.ParsedBuiltinType);
+					}
+					if (doc.ParsedName.TypeParameters != null) {
+						for (int i = 0; i < doc.ParsedName.TypeParameters.Count; i++) {
+							result.TypeArguments.Add(ConvertToType(doc.ParsedName.TypeParameters [i]));
+						}
+					}
+				} else if (doc.ParsedBuiltinType != null) {
+					result.SymbolKind = SymbolKind.TypeDefinition;
+					result.DeclaringType = ConvertToType(doc.ParsedBuiltinType);
+				}
+				if (doc.ParsedParameters != null) {
+					result.HasParameterList = true;
+					result.Parameters.AddRange(doc.ParsedParameters.Select(ConvertXmlDocParameter));
+				}
+				if (doc.ParsedOperator != null) {
+					result.SymbolKind = SymbolKind.Operator;
+					result.OperatorType = (OperatorType)doc.ParsedOperator;
+					if (result.OperatorType == OperatorType.Implicit || result.OperatorType == OperatorType.Explicit) {
+						var returnTypeParam = result.Parameters.LastOrNullObject();
+						returnTypeParam.Remove(); // detach from parameter list
+						var returnType = returnTypeParam.Type;
+						returnType.Remove();
+						result.ConversionOperatorReturnType = returnType;
+					}
+					if (result.Parameters.Count == 0) {
+						// reset HasParameterList if necessary
+						result.HasParameterList = false;
+					}
+				}
+				return result;
+			}
+
+			ParameterDeclaration ConvertXmlDocParameter(DocumentationParameter p)
+			{
+				var result = new ParameterDeclaration();
+				switch (p.Modifier) {
+					case Parameter.Modifier.OUT:
+						result.ParameterModifier = ParameterModifier.Out;
+						break;
+					case Parameter.Modifier.REF:
+						result.ParameterModifier = ParameterModifier.Ref;
+						break;
+					case Parameter.Modifier.PARAMS:
+						result.ParameterModifier = ParameterModifier.Params;
+						break;
+				}
+				if (p.Type != null) {
+					result.Type = ConvertToType(p.Type);
+				}
+				return result;
+			}
+
+			#endregion
+
+		}
+
+		public CSharpParser()
+		{
+			compilerSettings = new CompilerSettings();
+		}
+
+		public CSharpParser(CompilerSettings args)
+		{
+			compilerSettings = args ?? new CompilerSettings();
+		}
+
+		void InsertComments(CompilerCompilationUnit top, ConversionVisitor conversionVisitor)
+		{
+			AstNode insertionPoint = conversionVisitor.Unit.FirstChild;
+			foreach (var special in top.SpecialsBag.Specials) {
+				AstNode newLeaf = null;
+				Role role = null;
+				bool isDocumentationComment = false;
+				var comment = special as SpecialsBag.Comment;
+				if (comment != null) {
+					// HACK: multiline documentation comment detection; better move this logic into the mcs tokenizer
+					bool isMultilineDocumentationComment = (comment.CommentType == SpecialsBag.CommentType.Multi && comment.Content.StartsWith("*", StringComparison.Ordinal) && !comment.Content.StartsWith("**", StringComparison.Ordinal));
+					isDocumentationComment = comment.CommentType == SpecialsBag.CommentType.Documentation || isMultilineDocumentationComment;
+					if (conversionVisitor.convertTypeSystemMode && !isDocumentationComment)
+						continue;
+					var type = isMultilineDocumentationComment ? CommentType.MultiLineDocumentation : (CommentType)comment.CommentType;
+					var start = new TextLocation(comment.Line, comment.Col);
+					var end = new TextLocation(comment.EndLine, comment.EndCol);
+					newLeaf = new Comment(type, start, end) {
+						StartsLine = comment.StartsLine,
+						Content = isMultilineDocumentationComment ? comment.Content.Substring(1) : comment.Content
+					};
+					role = Roles.Comment;
+				} else if (!GenerateTypeSystemMode) {
+					var pragmaDirective = special as SpecialsBag.PragmaPreProcessorDirective;
+					if (pragmaDirective != null) {
+						var pragma = new PragmaWarningPreprocessorDirective(new TextLocation(pragmaDirective.Line, pragmaDirective.Col), new TextLocation(pragmaDirective.EndLine, pragmaDirective.EndCol));
+						pragma.AddChild(new CSharpTokenNode(new TextLocation(pragmaDirective.Line, pragmaDirective.Col), PragmaWarningPreprocessorDirective.PragmaKeywordRole), PragmaWarningPreprocessorDirective.PragmaKeywordRole);
+						pragma.AddChild(new CSharpTokenNode(new TextLocation(pragmaDirective.Line, pragmaDirective.WarningColumn), PragmaWarningPreprocessorDirective.WarningKeywordRole), PragmaWarningPreprocessorDirective.WarningKeywordRole);
+						var pragmaRole = pragmaDirective.Disalbe ? PragmaWarningPreprocessorDirective.DisableKeywordRole : PragmaWarningPreprocessorDirective.RestoreKeywordRole;
+						pragma.AddChild(new CSharpTokenNode(new TextLocation(pragmaDirective.Line, pragmaDirective.DisableRestoreColumn), pragmaRole), pragmaRole);
+						foreach (var code in pragmaDirective.Codes) {
+							pragma.AddChild((PrimitiveExpression)conversionVisitor.Visit(code), PragmaWarningPreprocessorDirective.WarningRole);
+						}
+						newLeaf = pragma;
+						role = Roles.PreProcessorDirective;
+						goto end;
+					}
+					var lineDirective = special as SpecialsBag.LineProcessorDirective;
+					if (lineDirective != null) {
+						var pragma = new LinePreprocessorDirective(new TextLocation(lineDirective.Line, lineDirective.Col), new TextLocation(lineDirective.EndLine, lineDirective.EndCol));
+						pragma.LineNumber = lineDirective.LineNumber;
+						pragma.FileName = lineDirective.FileName;
+						newLeaf = pragma;
+						role = Roles.PreProcessorDirective;
+						goto end;
+					}
+					var directive = special as SpecialsBag.PreProcessorDirective;
+					if (directive != null) {
+						newLeaf = new PreProcessorDirective((PreProcessorDirectiveType)((int)directive.Cmd & 0xF), new TextLocation(directive.Line, directive.Col), new TextLocation(directive.EndLine, directive.EndCol)) {
+							Argument = directive.Arg,
+							Take = directive.Take
+						};
+						role = Roles.PreProcessorDirective;
+					}
+					end:
+					;
+				}
+				if (newLeaf != null) {
+					InsertComment(ref insertionPoint, newLeaf, role, isDocumentationComment, conversionVisitor.Unit);
+				}
+			}
+			if (!GenerateTypeSystemMode) {
+				// We cannot insert newlines in the same loop as comments/preprocessor directives
+				// because they are not correctly ordered in the specials bag
+				insertionPoint = conversionVisitor.Unit.FirstChild;
+				for (int i = 0; i < top.SpecialsBag.Specials.Count; i++) {
+					var newLine = top.SpecialsBag.Specials [i] as SpecialsBag.NewLineToken;
+					if (newLine != null) {
+						var newLeaf = new NewLineNode(new TextLocation(newLine.Line, newLine.Col + 1));
+						newLeaf.NewLineType = newLine.NewLine == SpecialsBag.NewLine.Unix ? UnicodeNewline.LF : UnicodeNewline.CRLF;
+						InsertComment(ref insertionPoint, newLeaf, Roles.NewLine, false, conversionVisitor.Unit);
+					}
+				}
+			}
+		}
+
+		static void InsertComment(ref AstNode insertionPoint, AstNode newNode, Role role, bool isDocumentationComment, AstNode rootNode)
+		{
+			TextLocation insertAt = newNode.StartLocation;
+			// Advance insertionPoint to the first node that has a start location >= insertAt
+			while (insertionPoint != null && insertionPoint.StartLocation < insertAt) {
+				// Enter the current node if insertAt is within
+				while (insertAt < insertionPoint.EndLocation && insertionPoint.FirstChild != null) {
+					insertionPoint = insertionPoint.FirstChild;
+				}
+				// Go to next node (insertionPoint.NextSibling if it exists; otherwise the next sibling of the parent node etc.)
+				insertionPoint = insertionPoint.GetNextNode();
+			}
+			// As a special case, XmlDoc gets inserted at the beginning of the entity declaration
+			if (isDocumentationComment && insertionPoint is EntityDeclaration && insertionPoint.FirstChild != null) {
+				insertionPoint = insertionPoint.FirstChild;
+			}
+			if (insertionPoint == null) {
+				// we're at the end of the compilation unit
+				rootNode.AddChildUnsafe(newNode, role);
+			} else {
+				insertionPoint.Parent.InsertChildBeforeUnsafe(insertionPoint, newNode, role);
+			}
+		}
+
+		public class ErrorReportPrinter : ReportPrinter
+		{
+			readonly string fileName;
+			public readonly List<Error> Errors = new List<Error>();
+
+			public ErrorReportPrinter(string fileName)
+			{
+				this.fileName = fileName;
+			}
+
+			public override void Print(AbstractMessage msg, bool showFullPath)
+			{
+				base.Print(msg, showFullPath);
+				var newError = new Error(msg.IsWarning ? ErrorType.Warning : ErrorType.Error, msg.Text, new DomRegion(fileName, msg.Location.Row, msg.Location.Column));
+				Errors.Add(newError);
+			}
+		}
+
+		ErrorReportPrinter errorReportPrinter = new ErrorReportPrinter(null);
+
+		[Obsolete("Use the Errors/Warnings/ErrorsAndWarnings properties instead")]
+		public ErrorReportPrinter ErrorPrinter {
+			get {
+				return errorReportPrinter;
+			}
+		}
+
+		public bool HasErrors {
+			get {
+				return errorReportPrinter.ErrorsCount > 0;
+			}
+		}
+
+		public bool HasWarnings {
+			get {
+				return errorReportPrinter.WarningsCount > 0;
+			}
+		}
+
+		public IEnumerable<Error> Errors {
+			get {
+				return errorReportPrinter.Errors.Where(e => e.ErrorType == ErrorType.Error);
+			}
+		}
+
+		public IEnumerable<Error> Warnings {
+			get {
+				return errorReportPrinter.Errors.Where(e => e.ErrorType == ErrorType.Warning);
+			}
+		}
+
+		public IEnumerable<Error> ErrorsAndWarnings {
+			get { return errorReportPrinter.Errors; }
+		}
+
+		/// <summary>
+		/// Parses a C# code file.
+		/// </summary>
+		/// <param name="program">The source code to parse.</param>
+		/// <param name="fileName">The file name. Used to identify the file (e.g. when building a type system).
+		/// This can be an arbitrary identifier, NRefactory never tries to access the file on disk.</param>
+		/// <returns>Returns the syntax tree.</returns>
+		public SyntaxTree Parse(string program, string fileName = "")
+		{
+			return Parse(new StringTextSource(program), fileName);
+		}
+
+		/// <summary>
+		/// Parses a C# code file.
+		/// </summary>
+		/// <param name="reader">The text reader containing the source code to parse.</param>
+		/// <param name="fileName">The file name. Used to identify the file (e.g. when building a type system).
+		/// This can be an arbitrary identifier, NRefactory never tries to access the file on disk.</param>
+		/// <returns>Returns the syntax tree.</returns>
+		public SyntaxTree Parse(TextReader reader, string fileName = "")
+		{
+			return Parse(new StringTextSource(reader.ReadToEnd()), fileName);
+		}
+
+		/// <summary>
+		/// Converts a Mono.CSharp syntax tree into an NRefactory syntax tree.
+		/// </summary>
+		public SyntaxTree Parse(CompilerCompilationUnit top, string fileName)
+		{
+			if (top == null) {
+				return null;
+			}
+			CSharpParser.ConversionVisitor conversionVisitor = new ConversionVisitor(GenerateTypeSystemMode, top.LocationsBag);
+			top.ModuleCompiled.Accept(conversionVisitor);
+			InsertComments(top, conversionVisitor);
+			if (CompilationUnitCallback != null) {
+				CompilationUnitCallback(top);
+			}
+			var expr = top.LastYYValue as Mono.CSharp.Expression;
+			if (expr != null)
+				conversionVisitor.Unit.TopExpression = expr.Accept(conversionVisitor) as AstNode;
+
+			conversionVisitor.Unit.FileName = fileName;
+			var conditionals = new List<string>();
+			foreach (var settings in compilerSettings.ConditionalSymbols) {
+				if (top.Conditionals.ContainsKey(settings) && !top.Conditionals [settings])
+					continue;
+				conditionals.Add(settings);
+			}
+			foreach (var kv in top.Conditionals) {
+				if (!kv.Value || compilerSettings.ConditionalSymbols.Contains(kv.Key))
+					continue;
+				conditionals.Add(kv.Key);
+			}
+			conversionVisitor.Unit.ConditionalSymbols = conditionals;
+			return conversionVisitor.Unit;
+		}
+
+		public CompilerSettings CompilerSettings {
+			get { return compilerSettings; }
+			set {
+				if (value == null)
+					throw new ArgumentNullException();
+				compilerSettings = value;
+			}
+		}
+
+		/// <summary>
+		/// Callback that gets called with the Mono.CSharp syntax tree whenever some code is parsed.
+		/// </summary>
+		public Action<CompilerCompilationUnit> CompilationUnitCallback {
+			get;
+			set;
+		}
+
+		/// <summary>
+		/// Specifies whether to run the parser in a special mode for generating the type system.
+		/// If this property is true, the syntax tree will only contain nodes relevant for the
+		/// <see cref="SyntaxTree.ToTypeSystem()"/> call and might be missing other nodes (e.g. method bodies).
+		/// The default is false.
+		/// </summary>
+		public bool GenerateTypeSystemMode {
+			get;
+			set;
+		}
+
+		TextLocation initialLocation = new TextLocation(1, 1);
+
+		/// <summary>
+		/// Specifies the text location where parsing starts.
+		/// This property can be used when parsing a part of a file to make the locations of the AstNodes
+		/// refer to the position in the whole file.
+		/// The default is (1,1).
+		/// </summary>
+		public TextLocation InitialLocation {
+			get { return initialLocation; }
+			set { initialLocation = value; }
+		}
+
+		internal static object parseLock = new object();
+
+		/// <summary>
+		/// Parses a C# code file.
+		/// </summary>
+		/// <param name="stream">The stream containing the source code to parse.</param>
+		/// <param name="fileName">The file name. Used to identify the file (e.g. when building a type system).
+		/// This can be an arbitrary identifier, NRefactory never tries to access the file on disk.</param>
+		/// <returns>Returns the syntax tree.</returns>
+		public SyntaxTree Parse(Stream stream, string fileName = "")
+		{
+			return Parse(new StreamReader(stream), fileName);
+		}
+
+		/// <summary>
+		/// Parses a C# code file.
+		/// </summary>
+		/// <param name="program">The source code to parse.</param>
+		/// <param name="fileName">The file name. Used to identify the file (e.g. when building a type system).
+		/// This can be an arbitrary identifier, NRefactory never tries to access the file on disk.</param>
+		/// <returns>Returns the syntax tree.</returns>
+		public SyntaxTree Parse(ITextSource program, string fileName = "")
+		{
+			return Parse(program, fileName, initialLocation.Line, initialLocation.Column);
+		}
+
+		SyntaxTree Parse(ITextSource program, string fileName, int initialLine, int initialColumn)
+		{
+			lock (parseLock) {
+				errorReportPrinter = new ErrorReportPrinter("");
+				var ctx = new CompilerContext(compilerSettings.ToMono(), errorReportPrinter);
+				ctx.Settings.TabSize = 1;
+				var reader = new SeekableStreamReader(program);
+				var file = new SourceFile(fileName, fileName, 0);
+				Location.Initialize(new List<SourceFile>(new [] { file }));
+				var module = new ModuleContainer(ctx);
+				var session = new ParserSession();
+				session.LocationsBag = new LocationsBag();
+				var report = new Report(ctx, errorReportPrinter);
+				var parser = Driver.Parse(reader, file, module, session, report, initialLine - 1, initialColumn - 1);
+				var top = new CompilerCompilationUnit {
+					ModuleCompiled = module,
+					LocationsBag = session.LocationsBag,
+					SpecialsBag = parser.Lexer.sbag,
+					Conditionals = parser.Lexer.SourceFile.Conditionals
+				};
+				var unit = Parse(top, fileName);
+				unit.Errors.AddRange(errorReportPrinter.Errors);
+				CompilerCallableEntryPoint.Reset();
+				return unit;
+			}
+		}
+
+		public IEnumerable<EntityDeclaration> ParseTypeMembers(string code)
+		{
+			return ParseTypeMembers(code, initialLocation.Line, initialLocation.Column);
+		}
+
+		IEnumerable<EntityDeclaration> ParseTypeMembers(string code, int initialLine, int initialColumn)
+		{
+			const string prefix = "unsafe partial class MyClass { ";
+			var syntaxTree = Parse(new StringTextSource(prefix + code + "}"), "parsed.cs", initialLine, initialColumn - prefix.Length);
+			if (syntaxTree == null)
+				return Enumerable.Empty<EntityDeclaration>();
+			var td = syntaxTree.FirstChild as TypeDeclaration;
+			if (td != null) {
+				var members = td.Members.ToArray();
+				// detach members from parent
+				foreach (var m in members)
+					m.Remove();
+				return members;
+			}
+			return Enumerable.Empty<EntityDeclaration>();
+		}
+
+		public IEnumerable<Statement> ParseStatements(string code)
+		{
+			return ParseStatements(code, initialLocation.Line, initialLocation.Column);
+		}
+
+		IEnumerable<Statement> ParseStatements(string code, int initialLine, int initialColumn)
+		{
+			// the dummy method is async so that 'await' expressions are parsed as expected
+			const string prefix = "async void M() { ";
+			var members = ParseTypeMembers(prefix + code + "}", initialLine, initialColumn - prefix.Length);
+			var method = members.FirstOrDefault() as MethodDeclaration;
+			if (method != null && method.Body != null) {
+				var statements = method.Body.Statements.ToArray();
+				// detach statements from parent
+				foreach (var st in statements)
+					st.Remove();
+				return statements;
+			}
+			return Enumerable.Empty<Statement>();
+		}
+
+		public AstType ParseTypeReference(string code)
+		{
+			var members = ParseTypeMembers(code + " a;");
+			var field = members.FirstOrDefault() as FieldDeclaration;
+			if (field != null) {
+				AstType type = field.ReturnType;
+				type.Remove();
+				return type;
+			}
+			return AstType.Null;
+		}
+
+		public Expression ParseExpression(string code)
+		{
+			const string prefix = "tmp = ";
+			var statements = ParseStatements(prefix + code + ";", initialLocation.Line, initialLocation.Column - prefix.Length);
+			var es = statements.FirstOrDefault() as ExpressionStatement;
+			if (es != null) {
+				var ae = es.Expression as AssignmentExpression;
+				if (ae != null) {
+					Expression expr = ae.Right;
+					expr.Remove();
+					return expr;
+				}
+			}
+			return Expression.Null;
+		}
+		/*
+		/// <summary>
+		/// Parses a file snippet; guessing what the code snippet represents (whole file, type members, block, type reference, expression).
+		/// </summary>
+		public AstNode ParseSnippet (string code)
+		{
+			// TODO: add support for parsing a part of a file
+			throw new NotImplementedException ();
+		}
+		*/
+		public DocumentationReference ParseDocumentationReference(string cref)
+		{
+			// see Mono.CSharp.DocumentationBuilder.HandleXrefCommon
+			if (cref == null)
+				throw new ArgumentNullException("cref");
+			
+			// Additional symbols for < and > are allowed for easier XML typing
+			cref = cref.Replace('{', '<').Replace('}', '>');
+			
+			lock (parseLock) {
+				errorReportPrinter = new ErrorReportPrinter("");
+				var ctx = new CompilerContext(compilerSettings.ToMono(), errorReportPrinter);
+				ctx.Settings.TabSize = 1;
+				var reader = new SeekableStreamReader(new StringTextSource(cref));
+				var file = new SourceFile("", "", 0);
+				Location.Initialize(new List<SourceFile>(new [] { file }));
+				var module = new ModuleContainer(ctx);
+				module.DocumentationBuilder = new DocumentationBuilder(module);
+				var source_file = new CompilationSourceFile(module);
+				var report = new Report(ctx, errorReportPrinter);
+				var session = new ParserSession();
+				session.LocationsBag = new LocationsBag();
+				var parser = new Mono.CSharp.CSharpParser(reader, source_file, report, session);
+				parser.Lexer.Line += initialLocation.Line - 1;
+				parser.Lexer.Column += initialLocation.Column - 1;
+				parser.Lexer.putback_char = Tokenizer.DocumentationXref;
+				parser.Lexer.parsing_generic_declaration_doc = true;
+				parser.parse();
+				if (report.Errors > 0) {
+//					Report.Warning (1584, 1, mc.Location, "XML comment on `{0}' has syntactically incorrect cref attribute `{1}'",
+//					                mc.GetSignatureForError (), cref);
+				}
+				
+				var conversionVisitor = new ConversionVisitor(false, session.LocationsBag);
+				var docRef = conversionVisitor.ConvertXmlDoc(module.DocumentationBuilder);
+				CompilerCallableEntryPoint.Reset();
+				return docRef;
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/Comments.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/Comments.cs
new file mode 100644
index 0000000000..30716f4b7f
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/Comments.cs
@@ -0,0 +1,50 @@
+//
+// Comment.cs
+//
+// Author:
+//       Matej Mikle�ić <matej.miklecic@gmail.com>
+//
+// Copyright (c) 2013 Matej Mikle�ić (matej.miklecic@gmail.com)
+//
+
+namespace Comments
+{
+	/// <summary>
+	///     This is a test file for all types of comments.
+	/// </summary>
+	class Comments
+	{
+		/// <summary>
+		///     Comment method.
+		/// </summary>
+		/// <param name="id">
+		///     Id.
+		/// </param>
+		void Comment(int id,      // id
+		             string text) // text
+		{
+			int i; // i
+			
+			for (i = 0; i < 42 /* 42; */; i++) /*
+			* Multi-line 
+			*/
+			{
+				// break
+				break;
+			} // for
+			
+			/////////*
+			
+			while (true)
+				// comments don't affect continuation
+				;
+			
+			/********/ if (false) lock (this)
+					// /*
+					;
+			
+			{ /*/*/ }
+		}
+		/*/ still in comment } */
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/IndentEngine.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/IndentEngine.cs
new file mode 100644
index 0000000000..0605bfb0d8
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/IndentEngine.cs
@@ -0,0 +1,332 @@
+//
+// IndentEngine.cs
+//
+// Author:
+//       Matej Mikle�ić <matej.miklecic@gmail.com>
+//
+// Copyright (c) 2013 Matej Mikle�ić (matej.miklecic@gmail.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.Editor;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	/// <summary>
+	///     The indentation engine.
+	/// </summary>
+	/// <remarks>
+	///     Represents the context for transitions between <see cref="IndentState"/>.
+	///     Delegates the responsibility for pushing a new char to the current 
+	///     state and changes between states depending on the pushed chars.
+	/// </remarks>
+	public class IndentEngine : ICloneable
+	{
+		#region Properties
+
+		/// <summary>
+		///     Document that's parsed by the engine.
+		/// </summary>
+		internal readonly IDocument Document;
+
+		/// <summary>
+		///     Formatting options.
+		/// </summary>
+		internal readonly CSharpFormattingOptions Options;
+
+		/// <summary>
+		///     Text editor options.
+		/// </summary>
+		internal readonly TextEditorOptions TextEditorOptions;
+
+		/// <summary>
+		///     Represents the new line character.
+		/// </summary>
+		public char NewLineChar
+		{
+			get
+			{
+				return TextEditorOptions.EolMarker.Last();
+			}
+		}
+
+		/// <summary>
+		///     The current indentation state.
+		/// </summary>
+		public IndentState CurrentState;
+
+		/// <summary>
+		///     The current location of the engine in <see cref="Document"/>.
+		/// </summary>
+		public TextLocation Location
+		{
+			get
+			{
+				return new TextLocation(line, column);
+			}
+		}
+
+		/// <summary>
+		///     The current offset of the engine in <see cref="Document"/>.
+		/// </summary>
+		public int Offset
+		{
+			get
+			{
+				return offset;
+			}
+		}
+
+		/// <summary>
+		///     The indentation string of the current line.
+		/// </summary>
+		public string ThisLineIndent
+		{
+			get
+			{
+				return CurrentState.ThisLineIndent.IndentString;
+			}
+		}
+
+		/// <summary>
+		///     The indentation string of the next line.
+		/// </summary>
+		public string NewLineIndent
+		{
+			get
+			{
+				return CurrentState.NextLineIndent.IndentString;
+			}
+		}
+
+		/// <summary>
+		///     True if the current line needs to be reindented.
+		/// </summary>
+		/// <remarks>
+		///     This is set depending on the current <see cref="Location"/> and
+		///     can change its value until the <see cref="NewLineChar"/> char is
+		///     pushed. If this is true, that doesn't necessarily mean that the
+		///     current line has an incorrect indent (this can be determined
+		///     only at the end of the current line and the
+		///     <see cref="OnThisLineIndentFinalized"/> event will be raised.
+		/// </remarks>
+		public bool NeedsReindent
+		{
+			get
+			{
+				return !IsLineStart && (ThisLineIndent != CurrentIndent.ToString());
+			}
+		}
+
+		/// <summary>
+		///     Raised when the <see cref="NewLineChar"/> is pushed to the engine
+		///     and <see cref="ThisLineIndent"/> will no longer change.
+		/// </summary>
+		/// <remarks>
+		///     This is the only way to correctly get the calculated indent
+		///     since the <see cref="ThisLineIndent"/> is immediately
+		///     replaced with <see cref="NewLineIndent"/> afterwards.
+		/// </remarks>
+		public event EventHandler OnThisLineIndentFinalized;
+
+		/// <summary>
+		///     Stores the current indent on the beginning of the current line.
+		/// </summary>
+		public StringBuilder CurrentIndent = new StringBuilder();
+
+		/// <summary>
+		///     Stores conditional symbols of the #define directives.
+		/// </summary>
+		public HashSet<string> ConditionalSymbols = new HashSet<string>();
+
+		/// <summary>
+		///     True if any of the preprocessor if/elif directives in the current
+		///     block (between #if and #endif) were evaluated to true.
+		/// </summary>
+		public bool IfDirectiveEvalResult;
+
+		#endregion
+
+		#region Fields
+
+		internal int offset = 0;
+		internal int line = 1;
+		internal int column = 1;
+
+		public bool IsLineStart = true;
+		public char CurrentChar = '\0';
+		public char PreviousChar = '\0';
+
+		#endregion
+
+		#region Constructors
+
+		public IndentEngine(IDocument document, TextEditorOptions textEditorOptions, CSharpFormattingOptions formattingOptions)
+		{
+			this.Document = document;
+			this.Options = formattingOptions;
+			this.TextEditorOptions = textEditorOptions;
+			this.CurrentState = IndentStateFactory.Default(this);
+		}
+
+		public IndentEngine(IndentEngine prototype)
+		{
+			this.Document = prototype.Document;
+			this.Options = prototype.Options;
+			this.TextEditorOptions = prototype.TextEditorOptions;
+
+			this.CurrentState = prototype.CurrentState.Clone();
+			this.ConditionalSymbols = new HashSet<string>(prototype.ConditionalSymbols);
+			this.IfDirectiveEvalResult = prototype.IfDirectiveEvalResult;
+			this.CurrentIndent = new StringBuilder(prototype.CurrentIndent.ToString());
+
+			this.offset = prototype.offset;
+			this.line = prototype.line;
+			this.column = prototype.column;
+			this.IsLineStart = prototype.IsLineStart;
+			this.CurrentChar = prototype.CurrentChar;
+			this.PreviousChar = prototype.PreviousChar;
+		}
+
+		#endregion
+
+		#region IClonable
+
+		object ICloneable.Clone()
+		{
+			return Clone();
+		}
+
+		public IndentEngine Clone()
+		{
+			return new IndentEngine(this);
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		///     Resets the engine.
+		/// </summary>
+		public void Reset()
+		{
+			CurrentState = IndentStateFactory.Default(this);
+			ConditionalSymbols.Clear();
+			IfDirectiveEvalResult = false;
+			CurrentIndent.Length = 0;
+
+			offset = 0;
+			line = 1;
+			column = 1;
+			IsLineStart = true;
+			CurrentChar = '\0';
+			PreviousChar = '\0';
+		}
+
+		/// <summary>
+		///     Calls the <see cref="OnThisLineIndentFinalized"/> event.
+		/// </summary>
+		internal void ThisLineIndentFinalized()
+		{
+			if (OnThisLineIndentFinalized != null)
+			{
+				OnThisLineIndentFinalized(this, EventArgs.Empty);
+			}
+		}
+
+		/// <summary>
+		///     Pushes a new char into the current state which calculates the new
+		///     indentation level.
+		/// </summary>
+		/// <param name="ch">
+		///     A new character.
+		/// </param>
+		public void Push(char ch)
+		{
+			CurrentState.Push(CurrentChar = ch);
+
+			if (!TextEditorOptions.EolMarker.Contains(ch))
+			{
+				IsLineStart &= char.IsWhiteSpace(ch);
+
+				if (IsLineStart)
+				{
+					CurrentIndent.Append(ch);
+				}
+
+				if (ch == '\t')
+				{
+					var nextTabStop = (column - 1 + TextEditorOptions.IndentSize) / TextEditorOptions.IndentSize;
+					column = 1 + nextTabStop * TextEditorOptions.IndentSize;
+				}
+				else
+				{
+					column++;
+				}
+			}
+			else
+			{
+				if (ch != NewLineChar)
+				{
+					// there can be more than one chars that determine the EOL,
+					// the engine uses only one of them defined with NewLineChar
+					return;
+				}
+
+				CurrentIndent.Length = 0;
+				IsLineStart = true;
+				column = 1;
+				line++;
+			}
+
+			offset++;
+			// ignore whitespace and newline chars
+			if (!char.IsWhiteSpace(CurrentChar) && !TextEditorOptions.EolMarker.Contains(CurrentChar))
+			{
+				PreviousChar = CurrentChar;
+			}
+		}
+
+		/// <summary>
+		///     Parses the <see cref="Document"/> from <see cref="offset"/>
+		///     to <paramref name="toOffset"/>.
+		/// </summary>
+		/// <param name="toOffset">
+		///     End offset.
+		/// </param>
+		public void UpdateToOffset(int toOffset)
+		{
+			if (toOffset < offset)
+			{
+				Reset();
+			}
+
+			for (int i = offset; i < toOffset; i++)
+			{
+				Push(Document.GetCharAt(i));
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/IndentState.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/IndentState.cs
new file mode 100644
index 0000000000..7dac56a982
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/IndentState.cs
@@ -0,0 +1,1687 @@
+//
+// IndentState.cs
+//
+// Author:
+//       Matej Mikle�ić <matej.miklecic@gmail.com>
+//
+// Copyright (c) 2013 Matej Mikle�ić (matej.miklecic@gmail.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	#region IndentState
+
+	/// <summary>
+	///     The base class for all indentation states. 
+	///     Each state defines the logic for indentation based on chars that
+	///     are pushed to it.
+	/// </summary>
+	public abstract class IndentState : ICloneable
+	{
+		#region Properties
+
+		/// <summary>
+		///     The indentation engine using this state.
+		/// </summary>
+		public IndentEngine Engine;
+
+		/// <summary>
+		///     The parent state. 
+		///     This state can use the indentation levels of its parent.
+		///     When this state exits, the engine returns to the parent.
+		/// </summary>
+		public IndentState Parent;
+
+		/// <summary>
+		///     The indentation of the current line.
+		///     This is set when the state is created and will be changed to
+		///     <see cref="NextLineIndent"/> when the <see cref="IndentEngine.NewLineChar"/> 
+		///     is pushed.
+		/// </summary>
+		public Indent ThisLineIndent;
+
+		/// <summary>
+		///     The indentation of the next line.
+		///     This is set when the state is created and can change depending
+		///     on the pushed chars.
+		/// </summary>
+		public Indent NextLineIndent;
+
+		/// <summary>
+		///     Stores the last sequence of characters that can form a
+		///     valid keyword or variable name.
+		/// </summary>
+		public StringBuilder WordToken;
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		///     Creates a new indentation state.
+		/// </summary>
+		/// <param name="engine">
+		///     The indentation engine that uses this state.
+		/// </param>
+		/// <param name="parent">
+		///     The parent state, or null if this state doesn't have one ->
+		///         e.g. the state represents the global space.
+		/// </param>
+		protected IndentState(IndentEngine engine, IndentState parent = null)
+		{
+			WordToken = new StringBuilder();
+
+			Parent = parent;
+			Engine = engine;
+
+			InitializeState();
+		}
+
+		/// <summary>
+		///     Creates a new indentation state that is a copy of the given
+		///     prototype.
+		/// </summary>
+		/// <param name="prototype">
+		///     The prototype state.
+		/// </param>
+		protected IndentState(IndentState prototype)
+		{
+			Engine = prototype.Engine;
+			Parent = prototype.Parent.Clone();
+
+			WordToken = new StringBuilder(prototype.WordToken.ToString());
+			ThisLineIndent = prototype.ThisLineIndent.Clone();
+			NextLineIndent = prototype.NextLineIndent.Clone();
+		}
+
+		#endregion
+
+		#region IClonable
+
+		object ICloneable.Clone()
+		{
+			return Clone();
+		}
+
+		public abstract IndentState Clone();
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		///     Initializes the state:
+		///       - sets the default indentation levels.
+		/// </summary>
+		/// <remarks>
+		///     Each state can override this method if it needs a different
+		///     logic for setting up the default indentations.
+		/// </remarks>
+		public virtual void InitializeState()
+		{
+			ThisLineIndent = new Indent(Engine.TextEditorOptions);
+			NextLineIndent = ThisLineIndent.Clone();
+		}
+
+		/// <summary>
+		///     Actions performed when this state exits.
+		/// </summary>
+		public virtual void OnExit()
+		{
+			// if a state exits on the newline character, it has to push
+			// it back to its parent (and so on recursively if the parent 
+			// state also exits). Otherwise, the parent state wouldn't
+			// know that the engine isn't on the same line anymore.
+			if (Engine.CurrentChar == Engine.NewLineChar)
+			{
+				Parent.Push(Engine.NewLineChar);
+			}
+
+			// when a state exits the engine stays on the same line and this
+			// state has to adjust the current indent of its parent so that 
+			// it's equal to this line indent.
+			Parent.ThisLineIndent = ThisLineIndent.Clone();
+		}
+
+		/// <summary>
+		///     Changes the current state of the <see cref="IndentEngine"/> using the current
+		///     state as the parent for the new one.
+		/// </summary>
+		/// <typeparam name="T">
+		///     The type of the new state. Must be assignable from <see cref="IndentState"/>.
+		/// </typeparam>
+		public void ChangeState<T>()
+			where T : IndentState
+		{
+			Engine.CurrentState = IndentStateFactory.Create<T>(Engine.CurrentState);
+		}
+
+		/// <summary>
+		///     Exits this state by setting the current state of the
+		///     <see cref="IndentEngine"/> to this state's parent.
+		/// </summary>
+		public void ExitState()
+		{
+			OnExit();
+			Engine.CurrentState = Engine.CurrentState.Parent;
+		}
+
+		/// <summary>
+		///     Common logic behind the push method.
+		///     Each state can override this method and implement its own logic.
+		/// </summary>
+		/// <param name="ch">
+		///     The current character that's being pushed.
+		/// </param>
+		public virtual void Push(char ch)
+		{
+			// append this char to the wordbuf if it can form a valid keyword, otherwise check
+			// if the last sequence of chars form a valid keyword and reset the wordbuf.
+			if ((WordToken.Length == 0 ? char.IsLetter(ch) : char.IsLetterOrDigit(ch)) || ch == '_')
+			{
+				WordToken.Append(ch);
+			}
+			else
+			{
+				CheckKeyword(WordToken.ToString());
+				WordToken.Length = 0;
+			}
+
+			if (ch == Engine.NewLineChar)
+			{
+				if (Engine.IsLineStart && !Engine.TextEditorOptions.IndentBlankLines)
+				{
+					ThisLineIndent = new Indent(Engine.TextEditorOptions);
+				}
+
+				if (Engine.CurrentState == this)
+				{
+					// if we got this far, the current line indent becomes permanent,
+					// it's replaced with the next line indent and we can raise an
+					// event that can perform text-replace actions on the document.
+					// NOTE: It's possible that multiple states will execute its push
+					// methods on the same newline char, but only the current state of
+					// the engine should raise this event. See the OnExit method for
+					// an example when this will happen.
+					Engine.ThisLineIndentFinalized();
+				}
+
+				ThisLineIndent = NextLineIndent.Clone();
+			}
+		}
+
+		/// <summary>
+		///     When derived, checks if the given sequence of chars form
+		///     a valid keyword or variable name, depending on the state.
+		/// </summary>
+		/// <param name="keyword">
+		///     A possible keyword.
+		/// </param>
+		public virtual void CheckKeyword(string keyword)
+		{ }
+
+		#endregion
+	}
+
+	#endregion
+
+	#region IndentStateFactory
+
+	/// <summary>
+	///     Indentation state factory.
+	/// </summary>
+	public static class IndentStateFactory
+	{
+		/// <summary>
+		///     Creates a new state.
+		/// </summary>
+		/// <param name="stateType">
+		///     Type of the state. Must be assignable from <see cref="IndentState"/>.
+		/// </param>
+		/// <param name="engine">
+		///     Indentation engine for the state.
+		/// </param>
+		/// <param name="parent">
+		///     Parent state.
+		/// </param>
+		/// <returns>
+		///     A new state of type <paramref name="stateType"/>.
+		/// </returns>
+		static IndentState Create(Type stateType, IndentEngine engine, IndentState parent = null)
+		{
+			return (IndentState)Activator.CreateInstance(stateType, engine, parent);
+		}
+
+		/// <summary>
+		///     Creates a new state.
+		/// </summary>
+		/// <typeparam name="T">
+		///     Type of the state. Must be assignable from <see cref="IndentState"/>.
+		/// </typeparam>
+		/// <param name="engine">
+		///     Indentation engine for the state.
+		/// </param>
+		/// <param name="parent">
+		///     Parent state.
+		/// </param>
+		/// <returns>
+		///     A new state of type <typeparamref name="T"/>.
+		/// </returns>
+		public static IndentState Create<T>(IndentEngine engine, IndentState parent = null)
+			where T : IndentState
+		{
+			return Create(typeof(T), engine, parent);
+		}
+
+		/// <summary>
+		///     Creates a new state.
+		/// </summary>
+		/// <typeparam name="T">
+		///     Type of the state. Must be assignable from <see cref="IndentState"/>.
+		/// </typeparam>
+		/// <param name="prototype">
+		///     Parent state. Also, the indentation engine of the prototype is
+		///     used as the engine for the new state.
+		/// </param>
+		/// <returns>
+		///     A new state of type <typeparamref name="T"/>.
+		/// </returns>
+		public static IndentState Create<T>(IndentState prototype)
+			where T : IndentState
+		{
+			return Create(typeof(T), prototype.Engine, prototype);
+		}
+
+		/// <summary>
+		///     The default state, used for the global space.
+		/// </summary>
+		public static Func<IndentEngine, IndentState> Default = engine => Create<GlobalBodyState>(engine);
+	}
+
+	#endregion
+
+	#region Null state
+
+	/// <summary>
+	///     Null state.
+	/// </summary>
+	/// <remarks>
+	///     Doesn't define any transitions to new states.
+	/// </remarks>
+	public class NullState : IndentState
+	{
+		public NullState(IndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public NullState(NullState prototype)
+			: base(prototype)
+		{ }
+
+		public override void Push(char ch)
+		{ }
+
+		public override IndentState Clone()
+		{
+			return new NullState(this);
+		}
+	}
+
+	#endregion
+
+	#region Brackets body states
+
+	#region Brackets body base
+
+	/// <summary>
+	///     The base for all brackets body states.
+	/// </summary>
+	/// <remarks>
+	///     Represents a block of code between a pair of brackets.
+	/// </remarks>
+	public abstract class BracketsBodyBaseState : IndentState
+	{
+		/// <summary>
+		///     Defines transitions for all types of open brackets.
+		/// </summary>
+		public static Dictionary<char, Action<IndentState>> OpenBrackets =
+			new Dictionary<char, Action<IndentState>>
+		{ 
+			{ '{', state => state.ChangeState<BracesBodyState>() }, 
+			{ '(', state => state.ChangeState<ParenthesesBodyState>() }, 
+			{ '[', state => state.ChangeState<SquareBracketsBodyState>() },
+			// since the '<' char is also used as the 'less-than' operator,
+			// until the logic for distinguishing this two cases is implemented
+			// this state must not define this next transition.
+			// { '<', state => state.ChangeState<AngleBracketsBody>() }
+		};
+
+		/// <summary>
+		///     When derived in a concrete bracket body state, represents
+		///     the closed bracket character pair.
+		/// </summary>
+		public abstract char ClosedBracket { get; }
+
+		protected BracketsBodyBaseState(IndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		protected BracketsBodyBaseState(BracketsBodyBaseState prototype)
+			: base(prototype)
+		{ }
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == '#' && Engine.IsLineStart)
+			{
+				ChangeState<PreProcessorState>();
+			}
+			else if (ch == '/' && Engine.PreviousChar == '/')
+			{
+				ChangeState<LineCommentState>();
+			}
+			else if (ch == '*' && Engine.PreviousChar == '/')
+			{
+				ChangeState<MultiLineCommentState>();
+			}
+			else if (ch == '"')
+			{
+				if (Engine.PreviousChar == '@')
+				{
+					ChangeState<VerbatimStringState>();
+				}
+				else
+				{
+					ChangeState<StringLiteralState>();
+				}
+			}
+			else if (ch == '\'')
+			{
+				ChangeState<CharacterState>();
+			}
+			else if (OpenBrackets.ContainsKey(ch))
+			{
+				OpenBrackets[ch](this);
+			}
+			else if (ch == ClosedBracket)
+			{
+				ExitState();
+			}
+		}
+	}
+
+	#endregion
+
+	#region Global body state
+
+	/// <summary>
+	///     Global body state.
+	/// </summary>
+	/// <remarks>
+	///     Represents the global space of the program.
+	/// </remarks>
+	public class GlobalBodyState : BracketsBodyBaseState
+	{
+		public override char ClosedBracket
+		{
+			get { return '\0'; }
+		}
+
+		public GlobalBodyState(IndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public GlobalBodyState(GlobalBodyState prototype)
+			: base(prototype)
+		{ }
+
+
+		public override IndentState Clone()
+		{
+			return new GlobalBodyState(this);
+		}
+	}
+
+	#endregion
+
+	#region Braces body state
+
+	/// <summary>
+	///     Braces body state.
+	/// </summary>
+	/// <remarks>
+	///     Represents a block of code between { and }.
+	/// </remarks>
+	public class BracesBodyState : BracketsBodyBaseState
+	{
+		public override char ClosedBracket
+		{
+			get { return '}'; }
+		}
+
+		/// <summary>
+		///     Type of the current block body.
+		/// </summary>
+		public Body CurrentBody;
+
+		/// <summary>
+		///     Type of the next block body.
+		///     Same as <see cref="CurrentBody"/> if none of the
+		///     <see cref="Body"/> keywords have been read.
+		/// </summary>
+		public Body NextBody;
+
+		/// <summary>
+		///     Type of the current statement.
+		/// </summary>
+		public Statement CurrentStatement;
+
+		/// <summary>
+		///     True if the '=' char has been pushed.
+		/// </summary>
+		public bool IsRightHandExpression;
+
+		public BracesBodyState(IndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{
+			CurrentBody = NextBody = BracesBodyState.extractBody(Parent);
+			CurrentStatement = Statement.None;
+		}
+
+		public BracesBodyState(BracesBodyState prototype)
+			: base(prototype)
+		{
+			CurrentBody = prototype.CurrentBody;
+			NextBody = prototype.NextBody;
+			CurrentStatement = prototype.CurrentStatement;
+			IsRightHandExpression = prototype.IsRightHandExpression;
+		}
+
+		/// <summary>
+		///     Extracts the <see cref="CurrentBody"/> from the given state.
+		/// </summary>
+		/// <returns>
+		///     The correct <see cref="Body"/> type for this state.
+		/// </returns>
+		static Body extractBody(IndentState state)
+		{
+			if (state != null && state is BracesBodyState)
+			{
+				return ((BracesBodyState)state).NextBody;
+			}
+
+			return Body.None;
+		}
+
+		public override void Push(char ch)
+		{
+			if (ch == ':' && Engine.IsLineStart)
+			{
+				ThisLineIndent.Push(IndentType.Continuation);
+			}
+
+			if (ch == ';' || ch == ':')
+			{
+				while (NextLineIndent.Count > 0 && NextLineIndent.Peek() == IndentType.Continuation)
+				{
+					NextLineIndent.Pop();
+				}
+				NextLineIndent.ExtraSpaces = 0;
+				IsRightHandExpression = false;
+			}
+			else if (ch == '=' && !IsRightHandExpression)
+			{
+				IsRightHandExpression = true;
+				NextLineIndent.ExtraSpaces = Engine.column - NextLineIndent.CurIndent + 1;
+			}
+			else if (ch == '.' && IsRightHandExpression)
+			{
+				NextLineIndent.ExtraSpaces = Engine.column - NextLineIndent.CurIndent - 1;
+			}
+			else if (ch == Engine.NewLineChar && NextLineIndent.ExtraSpaces > 0 &&
+			         (Engine.PreviousChar == '=' || Engine.PreviousChar == '.'))
+			{
+				// the last significant pushed char was '=' or '.' and we added
+				// extra spaces to align the next line, but the newline char was
+				// pushed afterwards so it's better to replace the extra spaces
+				// with one continuation indent.
+				NextLineIndent.ExtraSpaces = 0;
+				NextLineIndent.Push(IndentType.Continuation);
+			}
+			else if (ch == ClosedBracket && Engine.IsLineStart)
+			{
+				ThisLineIndent = Parent.ThisLineIndent.Clone();
+			}
+
+			base.Push(ch);
+		}
+
+		public override void InitializeState()
+		{
+			// remove all continuations and extra spaces from the previous state
+			Parent.ThisLineIndent.ExtraSpaces = 0;
+			Parent.NextLineIndent.ExtraSpaces = 0;
+			if (Parent.NextLineIndent.Count > 0 && Parent.NextLineIndent.Peek() == IndentType.Continuation)
+			{
+				Parent.NextLineIndent.Pop();
+				Parent.ThisLineIndent = Parent.NextLineIndent.Clone();
+			}
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = ThisLineIndent.Clone();
+			AddIndentation(CurrentBody);
+		}
+
+		public override IndentState Clone()
+		{
+			return new BracesBodyState(this);
+		}
+
+		#region Helpers
+
+		/// <summary>
+		///     Types of braces bodies.
+		/// </summary>
+		public enum Body
+		{
+			None,
+			Namespace,
+			Class,
+			Struct,
+			Interface,
+			Enum,
+			Switch,
+			Case
+		}
+
+		/// <summary>
+		///     Types of statements.
+		/// </summary>
+		public enum Statement
+		{
+			None,
+			If,
+			Else,
+			Do,
+			While,
+			For,
+			Foreach,
+			Lock,
+			Using
+		}
+
+		/// <summary>
+		///     Checks if the given string is a keyword and sets the
+		///     <see cref="NextBody"/> and the <see cref="CurrentStatement"/>
+		///     variables appropriately.
+		/// </summary>
+		/// <param name="keyword">
+		///     A possible keyword.
+		/// </param>
+		public override void CheckKeyword(string keyword)
+		{
+			var blocks = new Dictionary<string, Body>
+			{
+				{ "namespace", Body.Namespace },
+				{ "class", Body.Class },
+				{ "struct", Body.Struct },
+				{ "interface", Body.Interface },
+				{ "enum", Body.Enum },
+				{ "switch", Body.Switch },
+			};
+
+			var statements = new Dictionary<string, Statement>
+			{
+				{ "if", Statement.If },
+				{ "else", Statement.Else },
+				{ "do", Statement.Do },
+				{ "while", Statement.While },
+				{ "for", Statement.For },
+				{ "foreach", Statement.Foreach },
+				{ "lock", Statement.Lock },
+				{ "using", Statement.Using },
+			};
+
+			if (blocks.ContainsKey(keyword))
+			{
+				NextBody = blocks[keyword];
+			}
+			else if (new string[] { "case", "default" }.Contains(keyword) && NextBody == Body.Switch)
+			{
+				ChangeState<SwitchCaseState>();
+			}
+			else if (keyword == "where" && !IsRightHandExpression)
+			{
+				ThisLineIndent.Push(IndentType.Continuation);
+			}
+			else if (statements.ContainsKey(keyword))
+			{
+				// only add continuation for 'else' in 'else if' statement.
+				if (!(statements[keyword] == Statement.If && CurrentStatement == Statement.Else))
+				{
+					NextLineIndent.Push(IndentType.Continuation);
+				}
+				CurrentStatement = statements[keyword];
+			}
+		}
+
+		/// <summary>
+		///     Pushes a new level of indentation depending on the given
+		///     <paramref name="braceStyle"/>.
+		/// </summary>
+		void AddIndentation(BraceStyle braceStyle)
+		{
+			switch (braceStyle)
+			{
+				case BraceStyle.DoNotChange:
+				case BraceStyle.EndOfLine:
+				case BraceStyle.EndOfLineWithoutSpace:
+				case BraceStyle.NextLine:
+				case BraceStyle.NextLineShifted:
+				case BraceStyle.BannerStyle:
+					NextLineIndent.Push(IndentType.Block);
+					break;
+				case BraceStyle.NextLineShifted2:
+					NextLineIndent.Push(IndentType.DoubleBlock);
+					break;
+			}
+		}
+
+		/// <summary>
+		///     Pushes a new level of indentation depending on the given
+		///     <paramref name="body"/>.
+		/// </summary>
+		void AddIndentation(Body body)
+		{
+			switch (body)
+			{
+				case Body.None:
+					NextLineIndent.Push(IndentType.Block);
+					break;
+				case Body.Namespace:
+					AddIndentation(Engine.Options.NamespaceBraceStyle);
+					break;
+				case Body.Class:
+					AddIndentation(Engine.Options.ClassBraceStyle);
+					break;
+				case Body.Struct:
+					AddIndentation(Engine.Options.StructBraceStyle);
+					break;
+				case Body.Interface:
+					AddIndentation(Engine.Options.InterfaceBraceStyle);
+					break;
+				case Body.Enum:
+					AddIndentation(Engine.Options.EnumBraceStyle);
+					break;
+				case Body.Switch:
+					if (Engine.Options.IndentSwitchBody)
+						NextLineIndent.Push(IndentType.Empty);
+					break;
+				default:
+					throw new ArgumentOutOfRangeException();
+			}
+		}
+
+		#endregion
+	}
+
+	#endregion
+
+	#region Switch-case body state
+
+	/// <summary>
+	///     Switch-case statement state.
+	/// </summary>
+	/// <remarks>
+	///     Represents the block of code in one switch case (including default).
+	/// </remarks>
+	public class SwitchCaseState : BracesBodyState
+	{
+		public SwitchCaseState(IndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public SwitchCaseState(SwitchCaseState prototype)
+			: base(prototype)
+		{ }
+
+		public override void Push(char ch)
+		{
+			if (ch == ClosedBracket)
+			{
+				ExitState();
+			}
+
+			base.Push(ch);
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+
+			// remove all continuations and extra spaces from this line indent
+			ThisLineIndent.ExtraSpaces = 0;
+			if (ThisLineIndent.Count > 0 && ThisLineIndent.Peek() == IndentType.Continuation)
+			{
+				ThisLineIndent.Pop();
+			}
+
+			NextLineIndent = ThisLineIndent.Clone();
+			NextLineIndent.Push(IndentType.Block);
+		}
+
+		public override void CheckKeyword(string keyword)
+		{
+			if (new string[] { "case", "default" }.Contains(keyword))
+			{
+				ExitState();
+			}
+
+			base.CheckKeyword(keyword);
+		}
+
+		public override void OnExit()
+		{ }
+
+		public override IndentState Clone()
+		{
+			return new SwitchCaseState(this);
+		}
+	}
+
+	#endregion
+
+	#region Parentheses body state
+
+	/// <summary>
+	///     Parentheses body state.
+	/// </summary>
+	/// <remarks>
+	///     Represents a block of code between ( and ).
+	/// </remarks>
+	public class ParenthesesBodyState : BracketsBodyBaseState
+	{
+		public override char ClosedBracket
+		{
+			get { return ')'; }
+		}
+
+		public ParenthesesBodyState(IndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public ParenthesesBodyState(ParenthesesBodyState prototype)
+			: base(prototype)
+		{ }
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = ThisLineIndent.Clone();
+			// align the next line at the beginning of the open bracket
+			NextLineIndent.ExtraSpaces = Math.Max(0, Engine.column - NextLineIndent.CurIndent);
+		}
+
+		public override IndentState Clone()
+		{
+			return new ParenthesesBodyState(this);
+		}
+	}
+
+	#endregion
+
+	#region Square brackets body state
+
+	/// <summary>
+	///     Square brackets body state.
+	/// </summary>
+	/// <remarks>
+	///     Represents a block of code between [ and ].
+	/// </remarks>
+	public class SquareBracketsBodyState : BracketsBodyBaseState
+	{
+		public override char ClosedBracket
+		{
+			get { return ']'; }
+		}
+
+		public SquareBracketsBodyState(IndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public SquareBracketsBodyState(SquareBracketsBodyState prototype)
+			: base(prototype)
+		{ }
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = ThisLineIndent.Clone();
+			// align the next line at the beginning of the open bracket
+			NextLineIndent.ExtraSpaces = Math.Max(0, Engine.column - NextLineIndent.CurIndent);
+		}
+
+		public override IndentState Clone()
+		{
+			return new SquareBracketsBodyState(this);
+		}
+	}
+
+	#endregion
+
+	#region Angle brackets body state
+
+	/// <summary>
+	///     Angle brackets body state.
+	/// </summary>
+	/// <remarks>
+	///     Represents a block of code between < and >.
+	/// </remarks>
+	public class AngleBracketsBodyState : BracketsBodyBaseState
+	{
+		public override char ClosedBracket
+		{
+			get { return '>'; }
+		}
+
+		public AngleBracketsBodyState(IndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public AngleBracketsBodyState(AngleBracketsBodyState prototype)
+			: base(prototype)
+		{ }
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = ThisLineIndent.Clone();
+			// align the next line at the beginning of the open bracket
+			NextLineIndent.ExtraSpaces = Math.Max(0, Engine.column - NextLineIndent.CurIndent);
+		}
+
+		public override IndentState Clone()
+		{
+			return new AngleBracketsBodyState(this);
+		}
+	}
+
+	#endregion
+
+	#endregion
+
+	#region PreProcessor state
+
+	/// <summary>
+	///     PreProcessor directive state.
+	/// </summary>
+	/// <remarks>
+	///     Activated when the '#' char is pushed and the 
+	///     <see cref="IndentEngine.IsLineStart"/> is true.
+	/// </remarks>
+	public class PreProcessorState : IndentState
+	{
+		/// <summary>
+		///     The type of the preprocessor directive.
+		/// </summary>
+		public PreProcessorDirective DirectiveType;
+
+		/// <summary>
+		///     If <see cref="DirectiveType"/> is set (not equal to 'None'), this
+		///     stores the expression of the directive.
+		/// </summary>
+		public StringBuilder DirectiveStatement;
+
+		public PreProcessorState(IndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{
+			DirectiveType = PreProcessorDirective.None;
+			DirectiveStatement = new StringBuilder();
+		}
+
+		public PreProcessorState(PreProcessorState prototype)
+			: base(prototype)
+		{
+			DirectiveType = prototype.DirectiveType;
+			DirectiveStatement = new StringBuilder(prototype.DirectiveStatement.ToString());
+		}
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (DirectiveType != PreProcessorDirective.None)
+			{
+				DirectiveStatement.Append(ch);
+			}
+
+			if (ch == Engine.NewLineChar)
+			{
+				ExitState();
+
+				switch (DirectiveType)
+				{
+					case PreProcessorDirective.If:
+						if (!Engine.IfDirectiveEvalResult)
+						{
+							Engine.IfDirectiveEvalResult = eval(DirectiveStatement.ToString());
+							if (Engine.IfDirectiveEvalResult)
+							{
+								// the if/elif directive is true -> continue with the previous state
+							}
+							else
+							{
+								// the if/elif directive is false -> change to a state that will 
+								// ignore any chars until #endif or #elif
+								ChangeState<PreProcessorCommentState>();
+							}
+						}
+						else
+						{
+							// one of the if/elif directives in this block was true -> 
+							// change to a state that will ignore any chars until #endif
+							ChangeState<PreProcessorCommentState>();
+						}
+						break;
+					case PreProcessorDirective.Else:
+						if (Engine.IfDirectiveEvalResult)
+						{
+							// some if/elif directive was true -> change to a state that will 
+							// ignore any chars until #endif
+							ChangeState<PreProcessorCommentState>();
+						}
+						else
+						{
+							// none if/elif directives were true -> continue with the previous state
+						}
+						break;
+					case PreProcessorDirective.Define:
+						var defineSymbol = DirectiveStatement.ToString().Trim();
+						if (!Engine.ConditionalSymbols.Contains(defineSymbol))
+						{
+							Engine.ConditionalSymbols.Add(defineSymbol);
+						}
+						break;
+					case PreProcessorDirective.Undef:
+						var undefineSymbol = DirectiveStatement.ToString().Trim();
+						if (Engine.ConditionalSymbols.Contains(undefineSymbol))
+						{
+							Engine.ConditionalSymbols.Remove(undefineSymbol);
+						}
+						break;
+					case PreProcessorDirective.Endif:
+						// marks the end of this block
+						Engine.IfDirectiveEvalResult = false;
+						break;
+					case PreProcessorDirective.Region:
+					case PreProcessorDirective.Pragma:
+					case PreProcessorDirective.Warning:
+					case PreProcessorDirective.Error:
+					case PreProcessorDirective.Line:
+						// continue with the previous state
+						break;
+				}
+			}
+		}
+
+		public override void InitializeState()
+		{
+			if (Engine.Options.IndentPreprocessorStatements)
+			{
+				ThisLineIndent = Parent.ThisLineIndent.Clone();
+			}
+			else
+			{
+				ThisLineIndent = new Indent(Engine.TextEditorOptions);
+			}
+
+			NextLineIndent = Parent.NextLineIndent.Clone();
+		}
+
+		public override void CheckKeyword(string keyword)
+		{
+			if (DirectiveType != PreProcessorDirective.None)
+			{
+				// the directive type has already been set
+				return;
+			}
+
+			var preProcessorDirectives = new Dictionary<string, PreProcessorDirective>
+			{
+				{ "if", PreProcessorDirective.If },
+				{ "elif", PreProcessorDirective.If },
+				{ "else", PreProcessorDirective.Else },
+				{ "endif", PreProcessorDirective.Endif },
+				{ "region", PreProcessorDirective.Region },
+				{ "endregion", PreProcessorDirective.Region },
+				{ "pragma", PreProcessorDirective.Pragma },
+				{ "warning", PreProcessorDirective.Warning },
+				{ "error", PreProcessorDirective.Error },
+				{ "line", PreProcessorDirective.Line },
+				{ "define", PreProcessorDirective.Define },
+				{ "undef", PreProcessorDirective.Undef }
+			};
+
+			if (preProcessorDirectives.ContainsKey(keyword))
+			{
+				DirectiveType = preProcessorDirectives[keyword];
+
+				if (DirectiveType == PreProcessorDirective.Region)
+				{
+					// adjust the indentation for the region/endregion directives
+					ThisLineIndent = Parent.NextLineIndent.Clone();
+				}
+			}
+		}
+
+		public override IndentState Clone()
+		{
+			return new PreProcessorState(this);
+		}
+
+		/// <summary>
+		///     Types of preprocessor directives.
+		/// </summary>
+		public enum PreProcessorDirective
+		{
+			None,
+			If,
+			// Elif, // use If instead
+			Else,
+			Endif,
+			Region,
+			// EndRegion, // use Region instead
+			Pragma,
+			Warning,
+			Error,
+			Line,
+			Define,
+			Undef
+		}
+
+		#region Pre processor evaluation (from cs-tokenizer.cs)
+
+		static bool is_identifier_start_character(int c)
+		{
+			return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_' || Char.IsLetter((char)c);
+		}
+
+		static bool is_identifier_part_character(char c)
+		{
+			if (c >= 'a' && c <= 'z')
+				return true;
+
+			if (c >= 'A' && c <= 'Z')
+				return true;
+
+			if (c == '_' || (c >= '0' && c <= '9'))
+				return true;
+
+			if (c < 0x80)
+				return false;
+
+			return Char.IsLetter(c) || Char.GetUnicodeCategory(c) == UnicodeCategory.ConnectorPunctuation;
+		}
+
+		bool eval_val(string s)
+		{
+			if (s == "true")
+				return true;
+			if (s == "false")
+				return false;
+
+			return Engine.ConditionalSymbols != null && Engine.ConditionalSymbols.Contains(s);
+		}
+
+		bool pp_primary(ref string s)
+		{
+			s = s.Trim();
+			int len = s.Length;
+
+			if (len > 0)
+			{
+				char c = s[0];
+
+				if (c == '(')
+				{
+					s = s.Substring(1);
+					bool val = pp_expr(ref s, false);
+					f (s.Length > 0 && s[0] == ')')
+					{
+						s = s.Substring(1);
+						return val;
+					}
+					return false;
+				}
+
+				if (is_identifier_start_character(c))
+				{
+					int j = 1;
+
+					while (j < len)
+					{
+						c = s[j];
+
+						if (is_identifier_part_character(c))
+						{
+							j++;
+							continue;
+						}
+						bool v = eval_val(s.Substring(0, j));
+						s = s.Substring(j);
+						return v;
+					}
+					bool vv = eval_val(s);
+					s = "";
+					return vv;
+				}
+			}
+			return false;
+		}
+
+		bool pp_unary(ref string s)
+		{
+			s = s.Trim();
+			int len = s.Length;
+
+			if (len > 0)
+			{
+				if (s[0] == '!')
+				{
+					if (len > 1 && s[1] == '=')
+					{
+						return false;
+					}
+					s = s.Substring(1);
+					return !pp_primary(ref s);
+				}
+				else
+					return pp_primary(ref s);
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		bool pp_eq(ref string s)
+		{
+			bool va = pp_unary(ref s);
+
+			s = s.Trim();
+			int len = s.Length;
+			if (len > 0)
+			{
+				if (s[0] == '=')
+				{
+					if (len > 2 && s[1] == '=')
+					{
+						s = s.Substring(2);
+						return va == pp_unary(ref s);
+					}
+					else
+					{
+						return false;
+					}
+				}
+				else if (s[0] == '!' && len > 1 && s[1] == '=')
+				{
+					s = s.Substring(2);
+
+					return va != pp_unary(ref s);
+
+				}
+			}
+
+			return va;
+
+		}
+
+		bool pp_and(ref string s)
+		{
+			bool va = pp_eq(ref s);
+
+			s = s.Trim();
+			int len = s.Length;
+			if (len > 0)
+			{
+				if (s[0] == '&')
+				{
+					if (len > 2 && s[1] == '&')
+					{
+						s = s.Substring(2);
+						return (va & pp_and(ref s));
+					}
+					else
+					{
+						return false;
+					}
+				}
+			}
+			return va;
+		}
+
+		//
+		// Evaluates an expression for `#if' or `#elif'
+		//
+		bool pp_expr(ref string s, bool isTerm)
+		{
+			bool va = pp_and(ref s);
+			s = s.Trim();
+			int len = s.Length;
+			if (len > 0)
+			{
+				char c = s[0];
+
+				if (c == '|')
+				{
+					if (len > 2 && s[1] == '|')
+					{
+						s = s.Substring(2);
+						return va | pp_expr(ref s, isTerm);
+					}
+					else
+					{
+
+						return false;
+					}
+				}
+				if (isTerm)
+				{
+					return false;
+				}
+			}
+
+			return va;
+		}
+
+		bool eval(string s)
+		{
+			bool v = pp_expr(ref s, true);
+			s = s.Trim();
+			if (s.Length != 0)
+			{
+				return false;
+			}
+
+			return v;
+		}
+
+		#endregion
+	}
+
+	#endregion
+
+	#region PreProcessorComment state
+
+	/// <summary>
+	///     PreProcessor comment state.
+	/// </summary>
+	/// <remarks>
+	///     Activates when the #if or #elif directive is false and ignores
+	///     all pushed chars until the next '#'.
+	/// </remarks>
+	public class PreProcessorCommentState : IndentState
+	{
+		public PreProcessorCommentState(IndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public PreProcessorCommentState(PreProcessorCommentState prototype)
+			: base(prototype)
+		{ }
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == '#' && Engine.IsLineStart)
+			{
+				// TODO: Return back only on #if/#elif/#else/#endif
+				// Ignore any of the other directives (especially #define/#undef)
+				ExitState();
+				ChangeState<PreProcessorState>();
+			}
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.NextLineIndent.Clone();
+			NextLineIndent = ThisLineIndent.Clone();
+		}
+
+		public override IndentState Clone()
+		{
+			return new PreProcessorCommentState(this);
+		}
+	}
+
+	#endregion
+
+	#region LineComment state
+
+	/// <summary>
+	///     Single-line comment state.
+	/// </summary>
+	public class LineCommentState : IndentState
+	{
+		/// <summary>
+		///     It's possible that this should be the DocComment state ->
+		///     Check if the first next pushed char is equal to '/'.
+		/// </summary>
+		public bool CheckForDocComment = true;
+
+		public LineCommentState(IndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public LineCommentState(LineCommentState prototype)
+			: base(prototype)
+		{
+			CheckForDocComment = prototype.CheckForDocComment;
+		}
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == Engine.NewLineChar)
+			{
+				ExitState();
+			}
+			else if (ch == '/' && CheckForDocComment)
+			{
+				// wrong state, should be DocComment.
+				ExitState();
+				ChangeState<DocCommentState>();
+			}
+
+			CheckForDocComment = false;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = Parent.NextLineIndent.Clone();
+		}
+
+		public override IndentState Clone()
+		{
+			return new LineCommentState(this);
+		}
+	}
+
+	#endregion
+
+	#region DocComment state
+
+	/// <summary>
+	///     XML documentation comment state.
+	/// </summary>
+	public class DocCommentState : IndentState
+	{
+		public DocCommentState(IndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public DocCommentState(DocCommentState prototype)
+			: base(prototype)
+		{ }
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == Engine.NewLineChar)
+			{
+				ExitState();
+			}
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = Parent.NextLineIndent.Clone();
+		}
+
+		public override IndentState Clone()
+		{
+			return new DocCommentState(this);
+		}
+	}
+
+	#endregion
+
+	#region MultiLineComment state
+
+	/// <summary>
+	///     Multi-line comment state.
+	/// </summary>
+	public class MultiLineCommentState : IndentState
+	{
+		/// <summary>
+		///     True if any char has been pushed to this state.
+		/// </summary>
+		/// <remarks>
+		///     Needed to resolve an issue when the first pushed char is '/'.
+		///     The state would falsely exit on this sequence of chars '/*/',
+		///     since it only checks if the last two chars are '/' and '*'.
+		/// </remarks>
+		public bool IsAnyCharPushed;
+
+		public MultiLineCommentState(IndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public MultiLineCommentState(MultiLineCommentState prototype)
+			: base(prototype)
+		{
+			IsAnyCharPushed = prototype.IsAnyCharPushed;
+		}
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == '/' && Engine.PreviousChar == '*' && IsAnyCharPushed)
+			{
+				ExitState();
+			}
+
+			IsAnyCharPushed = true;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = ThisLineIndent.Clone();
+			// add extra spaces so that the next line of the comment is align
+			// to the first character in the first line of the comment
+			NextLineIndent.ExtraSpaces = Math.Max(0, Engine.column - NextLineIndent.CurIndent + 1);
+		}
+
+		public override IndentState Clone()
+		{
+			return new MultiLineCommentState(this);
+		}
+	}
+
+	#endregion
+
+	#region StringLiteral state
+
+	/// <summary>
+	///     StringLiteral state.
+	/// </summary>
+	public class StringLiteralState : IndentState
+	{
+		/// <summary>
+		///     True if the next char is escaped with '\'.
+		/// </summary>
+		public bool IsEscaped;
+
+		public StringLiteralState(IndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public StringLiteralState(StringLiteralState prototype)
+			: base(prototype)
+		{
+			IsEscaped = prototype.IsEscaped;
+		}
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == Engine.NewLineChar)
+			{
+				ExitState();
+			}
+			else if (!IsEscaped && ch == '"')
+			{
+				ExitState();
+			}
+
+			IsEscaped = ch == '\\' && !IsEscaped;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = Parent.NextLineIndent.Clone();
+		}
+
+		public override IndentState Clone()
+		{
+			return new StringLiteralState(this);
+		}
+	}
+
+	#endregion
+
+	#region Verbatim string state
+
+	/// <summary>
+	///     Verbatim string state.
+	/// </summary>
+	public class VerbatimStringState : IndentState
+	{
+		/// <summary>
+		///     True if there is an odd number of '"' in a row.
+		/// </summary>
+		public bool IsEscaped;
+
+		public VerbatimStringState(IndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public VerbatimStringState(VerbatimStringState prototype)
+			: base(prototype)
+		{
+			IsEscaped = prototype.IsEscaped;
+		}
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (IsEscaped && ch != '"')
+			{
+				ExitState();
+				// the char has been pushed to the wrong state, push it back
+				Engine.CurrentState.Push(ch);
+			}
+
+			IsEscaped = ch == '"' && !IsEscaped;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = new Indent(Engine.TextEditorOptions);
+		}
+
+		public override IndentState Clone()
+		{
+			return new VerbatimStringState(this);
+		}
+	}
+
+	#endregion
+
+	#region Character state
+
+	/// <summary>
+	///     Character state.
+	/// </summary>
+	public class CharacterState : IndentState
+	{
+		/// <summary>
+		///     True if the next char is escaped with '\'.
+		/// </summary>
+		public bool IsEscaped;
+
+		public CharacterState(IndentEngine engine, IndentState parent = null)
+			: base(engine, parent)
+		{ }
+
+		public CharacterState(CharacterState prototype)
+			: base(prototype)
+		{
+			IsEscaped = prototype.IsEscaped;
+		}
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == Engine.NewLineChar)
+			{
+				ExitState();
+			}
+			else if (!IsEscaped && ch == '\'')
+			{
+				ExitState();
+			}
+
+			IsEscaped = ch == '\\' && !IsEscaped;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = Parent.NextLineIndent.Clone();
+		}
+
+		public override IndentState Clone()
+		{
+			return new CharacterState(this);
+		}
+	}
+
+	#endregion
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/InheritStatements.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/InheritStatements.cs
new file mode 100644
index 0000000000..840db06f32
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/InheritStatements.cs
@@ -0,0 +1,59 @@
+namespace InheritStatements
+{
+	class A<T> : B where T : B
+	{
+		A() : base()
+		{
+			base();
+		}
+	}
+
+	class C<T> 
+		: D where T 
+		: D
+	{
+		C()
+			: this(this.ToString())
+		{
+			throw this;
+		}
+
+		C(object c)
+			: base()
+		{
+			base();
+		}
+	}
+
+	class E<T> : 
+	F 
+		where T : F
+	{
+		E() : 
+		base()
+		{
+			base();
+		}
+	}
+
+	class X
+	{
+		X()
+		{
+			var t = this.ToString();
+			var b = t == "X"
+			        ? true
+			        : false;
+
+			if (b) goto x;
+
+			switch (t)
+			{
+			default:
+				y: throw null;
+			}
+
+			x: ;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/PreProcessorDirectives.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/PreProcessorDirectives.cs
new file mode 100644
index 0000000000..d2842b5f09
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/PreProcessorDirectives.cs
@@ -0,0 +1,61 @@
+#if !DEBUG
+#define DEBUG
+#endif
+
+#if TRACE
+#undef TRACE
+#endif
+
+namespace PreProcessorDirectives
+{
+	class PreProcessorDirectives
+	{
+		void IfDebug()
+		{
+			#region If/Elif Directives
+			
+#if DEBUG
+			{
+				// This block should be correctly indented
+			}
+#elif true
+			{
+			// This comment is not indented since the #if was true
+			}
+#endif
+			
+#if TRACE
+			{
+			// Not indented
+			}
+#elif debug
+			{
+			// Also not indented
+			}
+#else
+			{
+				// This should be indented
+			}
+#endif
+			
+			#endregion 
+		}
+		
+		#region One-line directives
+		
+		void OneLiners
+		{
+			//
+#pragma warning disable 649
+			//
+#warning 649
+			//
+#line 649
+			//
+#error 649
+			//
+		}
+		
+		#endregion 
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/Simple.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/Simple.cs
new file mode 100644
index 0000000000..7f93d859ea
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/Simple.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace SimpleNamespace
+{
+	class SimpleClass
+	{
+		void SimpleMethod()
+		{
+			// simple comment
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/Strings.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/Strings.cs
new file mode 100644
index 0000000000..a282895f58
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/Strings.cs
@@ -0,0 +1,28 @@
+namespace Strings
+{
+	class Strings
+	{
+		void Strings(string s = "")
+		{
+			s = @"""
+can't escape a verbatim string \";
+			s = @"" "not in verbatim anymore
+				;
+			s = "";
+			s = "\\";
+			s = "\\\\\\\"";
+			s = " // syntax error, but on the next line we start with the previous state
+				;
+			s = "'c\'";
+			string concat = "line 1" +
+				"line 2" +
+				"line 3";
+			
+			var c = '\\';
+			c = '\'';
+			c = ' // syntax error, but on the next line we start with the previous state
+				;
+			c = ';';
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/SwitchCase.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/SwitchCase.cs
new file mode 100644
index 0000000000..53a38b42ff
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/SwitchCase.cs
@@ -0,0 +1,34 @@
+/// <summary>
+///     Switch case with CSharpFormattingOptions.IndentBreakStatements = false;
+/// </summary>
+class SwitchCase
+{
+	void Main(int param)
+	{
+		switch (param)
+		{
+			case 1:
+				while (true)
+				{
+					break;
+					continue;
+					return;
+					goto case 2;
+					goto default;
+				}
+			break;
+			case 2:
+				// ...
+			continue;
+			case 3:
+				// ...
+			return;
+			case 4:
+				// ...
+			goto default;
+			default:
+				// ...
+			goto case 1;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/TextArea.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/TextArea.cs
new file mode 100644
index 0000000000..ad5df76991
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/TextArea.cs
@@ -0,0 +1,3283 @@
+//
+// TextEditor.cs
+//
+// Author:
+//   Mike Krüger <mkrueger@novell.com>
+//
+// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+//#define DEBUG_EXPOSE
+
+using System;
+using System.Linq;
+using System.Diagnostics;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using Mono.TextEditor.Highlighting;
+using Mono.TextEditor.PopupWindow;
+using Mono.TextEditor.Theatrics;
+using Gdk;
+using Gtk;
+
+namespace Mono.TextEditor
+{
+	public class TextArea : Container, ITextEditorDataProvider
+	{
+		TextEditorData textEditorData;
+		protected IconMargin iconMargin;
+		protected ActionMargin actionMargin;
+		protected GutterMargin gutterMargin;
+		protected FoldMarkerMargin foldMarkerMargin;
+		protected TextViewMargin textViewMargin;
+		DocumentLine longestLine = null;
+		double longestLineWidth = -1;
+		List<Margin> margins = new List<Margin> ();
+		int oldRequest = -1;
+		bool isDisposed = false;
+		IMMulticontext imContext;
+		Gdk.EventKey lastIMEvent;
+		Gdk.Key lastIMEventMappedKey;
+		uint lastIMEventMappedChar;
+		Gdk.ModifierType lastIMEventMappedModifier;
+		bool sizeHasBeenAllocated;
+		bool imContextNeedsReset;
+		string currentStyleName;
+		double mx, my;
+
+		public TextDocument Document {
+			get {
+				return textEditorData.Document;
+			}
+		}
+
+		public bool IsDisposed {
+			get {
+				return textEditorData.IsDisposed;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether this <see cref="Mono.TextEditor.TextEditor"/> converts tabs to spaces.
+		/// It is possible to overwrite the default options value for certain languages (like F#).
+		/// </summary>
+		/// <value>
+		/// <c>true</c> if tabs to spaces should be converted; otherwise, <c>false</c>.
+		/// </value>
+		public bool TabsToSpaces {
+			get {
+				return textEditorData.TabsToSpaces;
+			}
+			set {
+				textEditorData.TabsToSpaces = value;
+			}
+		}
+
+		public Mono.TextEditor.Caret Caret {
+			get {
+				return textEditorData.Caret;
+			}
+		}
+
+		protected internal IMMulticontext IMContext {
+			get { return imContext; }
+		}
+
+		public MenuItem CreateInputMethodMenuItem (string label)
+		{
+			if (GtkWorkarounds.GtkMinorVersion >= 16) {
+				bool showMenu = (bool)GtkWorkarounds.GetProperty (Settings, "gtk-show-input-method-menu").Val;
+				if (!showMenu)
+					return null;
+			}
+			MenuItem imContextMenuItem = new MenuItem (label);
+			Menu imContextMenu = new Menu ();
+			imContextMenuItem.Submenu = imContextMenu;
+			IMContext.AppendMenuitems (imContextMenu);
+			return imContextMenuItem;
+		}
+
+		[DllImport (PangoUtil.LIBGTK, CallingConvention = CallingConvention.Cdecl)]
+		static extern void gtk_im_multicontext_set_context_id (IntPtr context, string context_id);
+
+		[DllImport (PangoUtil.LIBGTK, CallingConvention = CallingConvention.Cdecl)]
+		static extern string gtk_im_multicontext_get_context_id (IntPtr context);
+
+		[GLib.Property ("im-module")]
+		public string IMModule {
+			get {
+				if (GtkWorkarounds.GtkMinorVersion < 16 || imContext == null)
+					return null;
+				return gtk_im_multicontext_get_context_id (imContext.Handle);
+			}
+			set {
+				if (GtkWorkarounds.GtkMinorVersion < 16 || imContext == null)
+					return;
+				gtk_im_multicontext_set_context_id (imContext.Handle, value);
+			}
+		}
+
+		public ITextEditorOptions Options {
+			get {
+				return textEditorData.Options;
+			}
+			set {
+				if (textEditorData.Options != null)
+					textEditorData.Options.Changed -= OptionsChanged;
+				textEditorData.Options = value;
+				if (textEditorData.Options != null) {
+					textEditorData.Options.Changed += OptionsChanged;
+					OptionsChanged (null, null);
+				}
+			}
+		}
+
+		public string FileName {
+			get {
+				return Document.FileName;
+			}
+		}
+
+		public string MimeType {
+			get {
+				return Document.MimeType;
+			}
+		}
+
+		void HandleTextEditorDataDocumentMarkerChange (object sender, TextMarkerEvent e)
+		{
+			if (e.TextMarker is IExtendingTextLineMarker) {
+				int lineNumber = e.Line.LineNumber;
+				if (lineNumber <= LineCount) {
+					try {
+						textEditorData.HeightTree.SetLineHeight (lineNumber, GetLineHeight (e.Line));
+					} catch (Exception ex) {
+						Console.WriteLine (ex);
+					}
+				}
+			}
+		}
+
+		void HAdjustmentValueChanged (object sender, EventArgs args)
+		{
+			var alloc = this.Allocation;
+			alloc.X = alloc.Y = 0;
+
+			HAdjustmentValueChanged ();
+		}
+
+		protected virtual void HAdjustmentValueChanged ()
+		{
+			HideTooltip (false);
+			double value = this.textEditorData.HAdjustment.Value;
+			if (value != System.Math.Round (value)) {
+				this.textEditorData.HAdjustment.Value = System.Math.Round (value);
+				return;
+			}
+			textViewMargin.HideCodeSegmentPreviewWindow ();
+			QueueDrawArea ((int)this.textViewMargin.XOffset, 0, this.Allocation.Width - (int)this.textViewMargin.XOffset, this.Allocation.Height);
+			OnHScroll (EventArgs.Empty);
+			SetChildrenPositions (Allocation);
+		}
+
+		void VAdjustmentValueChanged (object sender, EventArgs args)
+		{
+			var alloc = this.Allocation;
+			alloc.X = alloc.Y = 0;
+
+			VAdjustmentValueChanged ();
+			SetChildrenPositions (alloc);
+		}
+
+		protected virtual void VAdjustmentValueChanged ()
+		{
+			HideTooltip (false);
+			textViewMargin.HideCodeSegmentPreviewWindow ();
+			double value = this.textEditorData.VAdjustment.Value;
+			if (value != System.Math.Round (value)) {
+				this.textEditorData.VAdjustment.Value = System.Math.Round (value);
+				return;
+			}
+			if (isMouseTrapped)
+				FireMotionEvent (mx + textViewMargin.XOffset, my, lastState);
+			
+			double delta = value - this.oldVadjustment;
+			oldVadjustment = value;
+			TextViewMargin.caretY -= delta;
+			
+			if (System.Math.Abs (delta) >= Allocation.Height - this.LineHeight * 2 || this.TextViewMargin.InSelectionDrag) {
+				this.QueueDraw ();
+				OnVScroll (EventArgs.Empty);
+				return;
+			}
+			
+			if (GdkWindow != null)
+				GdkWindow.Scroll (0, (int)-delta);
+
+			OnVScroll (EventArgs.Empty);
+		}
+
+		protected virtual void OnVScroll (EventArgs e)
+		{
+			EventHandler handler = this.VScroll;
+			if (handler != null)
+				handler (this, e);
+		}
+
+		protected virtual void OnHScroll (EventArgs e)
+		{
+			EventHandler handler = this.HScroll;
+			if (handler != null)
+				handler (this, e);
+		}
+
+		public event EventHandler VScroll;
+		public event EventHandler HScroll;
+
+		void UnregisterAdjustments ()
+		{
+			if (textEditorData.HAdjustment != null)
+				textEditorData.HAdjustment.ValueChanged -= HAdjustmentValueChanged;
+			if (textEditorData.VAdjustment != null)
+				textEditorData.VAdjustment.ValueChanged -= VAdjustmentValueChanged;
+		}
+
+		internal void SetTextEditorScrollAdjustments (Adjustment hAdjustement, Adjustment vAdjustement)
+		{
+			if (textEditorData == null)
+				return;
+			UnregisterAdjustments ();
+			
+			if (hAdjustement == null || vAdjustement == null)
+				return;
+
+			this.textEditorData.HAdjustment = hAdjustement;
+			this.textEditorData.VAdjustment = vAdjustement;
+			
+			this.textEditorData.HAdjustment.ValueChanged += HAdjustmentValueChanged;
+			this.textEditorData.VAdjustment.ValueChanged += VAdjustmentValueChanged;
+		}
+
+		internal TextArea (TextDocument doc, ITextEditorOptions options, EditMode initialMode)
+		{
+			GtkWorkarounds.FixContainerLeak (this);
+			this.Events = EventMask.PointerMotionMask | EventMask.ButtonPressMask | EventMask.ButtonReleaseMask | EventMask.EnterNotifyMask | EventMask.LeaveNotifyMask | EventMask.VisibilityNotifyMask | EventMask.FocusChangeMask | EventMask.ScrollMask | EventMask.KeyPressMask | EventMask.KeyReleaseMask;
+			base.CanFocus = true;
+
+			// This is required to properly handle resizing and rendering of children
+			ResizeMode = ResizeMode.Queue;
+		}
+
+		TextEditor editor;
+
+		internal void Initialize (TextEditor editor, TextDocument doc, ITextEditorOptions options, EditMode initialMode)
+		{
+			if (doc == null)
+				throw new ArgumentNullException ("doc");
+			this.editor = editor;
+			textEditorData = new TextEditorData (doc);
+			textEditorData.RecenterEditor += delegate {
+				CenterToCaret ();
+				StartCaretPulseAnimation ();
+			};
+			textEditorData.Document.TextReplaced += OnDocumentStateChanged;
+			textEditorData.Document.TextSet += OnTextSet;
+			textEditorData.Document.LineChanged += UpdateLinesOnTextMarkerHeightChange; 
+			textEditorData.Document.MarkerAdded += HandleTextEditorDataDocumentMarkerChange;
+			textEditorData.Document.MarkerRemoved += HandleTextEditorDataDocumentMarkerChange;
+			
+			textEditorData.CurrentMode = initialMode;
+			
+			this.textEditorData.Options = options ?? TextEditorOptions.DefaultOptions;
+
+
+			textEditorData.Parent = editor;
+
+			iconMargin = new IconMargin (editor);
+			gutterMargin = new GutterMargin (editor);
+			actionMargin = new ActionMargin (editor);
+			foldMarkerMargin = new FoldMarkerMargin (editor);
+			textViewMargin = new TextViewMargin (editor);
+
+			margins.Add (iconMargin);
+			margins.Add (gutterMargin);
+			margins.Add (actionMargin);
+			margins.Add (foldMarkerMargin);
+
+			margins.Add (textViewMargin);
+			this.textEditorData.SelectionChanged += TextEditorDataSelectionChanged;
+			this.textEditorData.UpdateAdjustmentsRequested += TextEditorDatahandleUpdateAdjustmentsRequested;
+			Document.DocumentUpdated += DocumentUpdatedHandler;
+			
+			this.textEditorData.Options.Changed += OptionsChanged;
+			
+			
+			Gtk.TargetList list = new Gtk.TargetList ();
+			list.AddTextTargets (ClipboardActions.CopyOperation.TextType);
+			Gtk.Drag.DestSet (this, DestDefaults.All, (TargetEntry[])list, DragAction.Move | DragAction.Copy);
+			
+			imContext = new IMMulticontext ();
+			imContext.Commit += IMCommit;
+			
+			imContext.UsePreedit = true;
+			imContext.PreeditChanged += PreeditStringChanged;
+			
+			imContext.RetrieveSurrounding += delegate (object o, RetrieveSurroundingArgs args) {
+				//use a single line of context, whole document would be very expensive
+				//FIXME: UTF16 surrogates handling for caret offset? only matters for astral plane
+				imContext.SetSurrounding (Document.GetLineText (Caret.Line, false), Caret.Column);
+				args.RetVal = true;
+			};
+			
+			imContext.SurroundingDeleted += delegate (object o, SurroundingDeletedArgs args) {
+				//FIXME: UTF16 surrogates handling for offset and NChars? only matters for astral plane
+				var line = Document.GetLine (Caret.Line);
+				Document.Remove (line.Offset + args.Offset, args.NChars);
+				args.RetVal = true;
+			};
+			
+			using (Pixmap inv = new Pixmap (null, 1, 1, 1)) {
+				invisibleCursor = new Cursor (inv, inv, Gdk.Color.Zero, Gdk.Color.Zero, 0, 0);
+			}
+			
+			InitAnimations ();
+			this.Document.EndUndo += HandleDocumenthandleEndUndo;
+			this.textEditorData.HeightTree.LineUpdateFrom += delegate(object sender, HeightTree.HeightChangedEventArgs e) {
+				//Console.WriteLine ("redraw from :" + e.Line);
+				RedrawFromLine (e.Line);
+			};
+#if ATK
+			TextEditorAccessible.Factory.Init (this);
+#endif
+
+			if (GtkGestures.IsSupported) {
+				this.AddGestureMagnifyHandler ((sender, args) => {
+					Options.Zoom += Options.Zoom * (args.Magnification / 4d);
+				});
+			}
+			OptionsChanged (this, EventArgs.Empty);
+		}
+
+		public void RunAction (Action<TextEditorData> action)
+		{
+			try {
+				action (GetTextEditorData ());
+			} catch (Exception e) {
+				Console.WriteLine ("Error while executing " + action + " :" + e);
+			}
+		}
+
+		void HandleDocumenthandleEndUndo (object sender, TextDocument.UndoOperationEventArgs e)
+		{
+			if (this.Document.HeightChanged) {
+				this.Document.HeightChanged = false;
+				SetAdjustments ();
+			}
+		}
+
+		void TextEditorDatahandleUpdateAdjustmentsRequested (object sender, EventArgs e)
+		{
+			SetAdjustments ();
+		}
+
+		public void ShowListWindow<T> (ListWindow<T> window, DocumentLocation loc)
+		{
+			var p = LocationToPoint (loc);
+			int ox = 0, oy = 0;
+			GdkWindow.GetOrigin (out ox, out oy);
+	
+			window.Move (ox + p.X - window.TextOffset, oy + p.Y + (int)LineHeight);
+			window.ShowAll ();
+		}
+
+		internal int preeditOffset = -1, preeditLine, preeditCursorCharIndex;
+		internal string preeditString;
+		internal Pango.AttrList preeditAttrs;
+		internal bool preeditHeightChange;
+
+		internal bool ContainsPreedit (int offset, int length)
+		{
+			if (string.IsNullOrEmpty (preeditString))
+				return false;
+			
+			return offset <= preeditOffset && preeditOffset <= offset + length;
+		}
+
+		void PreeditStringChanged (object sender, EventArgs e)
+		{
+			imContext.GetPreeditString (out preeditString, out preeditAttrs, out preeditCursorCharIndex);
+			if (!string.IsNullOrEmpty (preeditString)) {
+				if (preeditOffset < 0) {
+					preeditOffset = Caret.Offset;
+					preeditLine = Caret.Line;
+				}
+				if (UpdatePreeditLineHeight ())
+					QueueDraw ();
+			} else {
+				preeditOffset = -1;
+				preeditString = null;
+				preeditAttrs = null;
+				preeditCursorCharIndex = 0;
+				if (UpdatePreeditLineHeight ())
+					QueueDraw ();
+			}
+			this.textViewMargin.ForceInvalidateLine (preeditLine);
+			this.textEditorData.Document.CommitLineUpdate (preeditLine);
+		}
+
+		internal bool UpdatePreeditLineHeight ()
+		{
+			if (!string.IsNullOrEmpty (preeditString)) {
+				using (var preeditLayout = PangoUtil.CreateLayout (this)) {
+					preeditLayout.SetText (preeditString);
+					preeditLayout.Attributes = preeditAttrs;
+					int w, h;
+					preeditLayout.GetSize (out w, out h);
+					var calcHeight = System.Math.Ceiling (h / Pango.Scale.PangoScale);
+					if (LineHeight < calcHeight) {
+						textEditorData.HeightTree.SetLineHeight (preeditLine, calcHeight);
+						preeditHeightChange = true;
+						return true;
+					}
+				}
+			} else if (preeditHeightChange) {
+				preeditHeightChange = false;
+				textEditorData.HeightTree.Rebuild ();
+				return true;
+			}
+			return false;
+		}
+
+		void CaretPositionChanged (object sender, DocumentLocationEventArgs args)
+		{
+			HideTooltip ();
+			ResetIMContext ();
+			
+			if (Caret.AutoScrollToCaret && HasFocus)
+				ScrollToCaret ();
+			
+//			Rectangle rectangle = textViewMargin.GetCaretRectangle (Caret.Mode);
+			RequestResetCaretBlink ();
+			
+			textEditorData.CurrentMode.InternalCaretPositionChanged (textEditorData.Parent, textEditorData);
+			
+			if (!IsSomethingSelected) {
+				if (/*Options.HighlightCaretLine && */args.Location.Line != Caret.Line)
+					RedrawMarginLine (TextViewMargin, args.Location.Line);
+				RedrawMarginLine (TextViewMargin, Caret.Line);
+			}
+		}
+
+		Selection oldSelection = Selection.Empty;
+
+		void TextEditorDataSelectionChanged (object sender, EventArgs args)
+		{
+			if (IsSomethingSelected) {
+				var selectionRange = MainSelection.GetSelectionRange (textEditorData);
+				if (selectionRange.Offset >= 0 && selectionRange.EndOffset < Document.TextLength) {
+					ClipboardActions.CopyToPrimary (this.textEditorData);
+				} else {
+					ClipboardActions.ClearPrimary ();
+				}
+			} else {
+				ClipboardActions.ClearPrimary ();
+			}
+			// Handle redraw
+			Selection selection = MainSelection;
+			int startLine = !selection.IsEmpty ? selection.Anchor.Line : -1;
+			int endLine = !selection.IsEmpty ? selection.Lead.Line : -1;
+			int oldStartLine = !oldSelection.IsEmpty ? oldSelection.Anchor.Line : -1;
+			int oldEndLine = !oldSelection.IsEmpty ? oldSelection.Lead.Line : -1;
+			if (SelectionMode == SelectionMode.Block) {
+				this.RedrawMarginLines (this.textViewMargin, 
+				                        System.Math.Min (System.Math.Min (oldStartLine, oldEndLine), System.Math.Min (startLine, endLine)),
+				                        System.Math.Max (System.Math.Max (oldStartLine, oldEndLine), System.Math.Max (startLine, endLine)));
+			} else {
+				if (endLine < 0 && startLine >= 0)
+					endLine = Document.LineCount;
+				if (oldEndLine < 0 && oldStartLine >= 0)
+					oldEndLine = Document.LineCount;
+				int from = oldEndLine, to = endLine;
+				if (!selection.IsEmpty && !oldSelection.IsEmpty) {
+					if (startLine != oldStartLine && endLine != oldEndLine) {
+						from = System.Math.Min (startLine, oldStartLine);
+						to = System.Math.Max (endLine, oldEndLine);
+					} else if (startLine != oldStartLine) {
+						from = startLine;
+						to = oldStartLine;
+					} else if (endLine != oldEndLine) {
+						from = endLine;
+						to = oldEndLine;
+					} else if (startLine == oldStartLine && endLine == oldEndLine) {
+						if (selection.Anchor == oldSelection.Anchor) {
+							this.RedrawMarginLine (this.textViewMargin, endLine);
+						} else if (selection.Lead == oldSelection.Lead) {
+							this.RedrawMarginLine (this.textViewMargin, startLine);
+						} else { // 3rd case - may happen when changed programmatically
+							this.RedrawMarginLine (this.textViewMargin, endLine);
+							this.RedrawMarginLine (this.textViewMargin, startLine);
+						}
+						from = to = -1;
+					}
+				} else {
+					if (selection.IsEmpty) {
+						from = oldStartLine;
+						to = oldEndLine;
+					} else if (oldSelection.IsEmpty) {
+						from = startLine;
+						to = endLine;
+					} 
+				}
+				
+				if (from >= 0 && to >= 0) {
+					this.RedrawMarginLines (this.textViewMargin, 
+					                        System.Math.Max (0, System.Math.Min (from, to) - 1),
+					                        System.Math.Max (from, to));
+				}
+			}
+			oldSelection = selection;
+			OnSelectionChanged (EventArgs.Empty);
+		}
+
+		internal void ResetIMContext ()
+		{
+			if (imContextNeedsReset) {
+				imContext.Reset ();
+				imContextNeedsReset = false;
+			}
+		}
+
+		void IMCommit (object sender, Gtk.CommitArgs ca)
+		{
+			if (!IsRealized || !IsFocus)
+				return;
+			
+			//this, if anywhere, is where we should handle UCS4 conversions
+			for (int i = 0; i < ca.Str.Length; i++) {
+				int utf32Char;
+				if (char.IsHighSurrogate (ca.Str, i)) {
+					utf32Char = char.ConvertToUtf32 (ca.Str, i);
+					i++;
+				} else {
+					utf32Char = (int)ca.Str [i];
+				}
+				
+				//include the other pre-IM state *if* the post-IM char matches the pre-IM (key-mapped) one
+				if (lastIMEventMappedChar == utf32Char && lastIMEventMappedChar == (uint)lastIMEventMappedKey) {
+					editor.OnIMProcessedKeyPressEvent (lastIMEventMappedKey, lastIMEventMappedChar, lastIMEventMappedModifier);
+				} else {
+					editor.OnIMProcessedKeyPressEvent ((Gdk.Key)0, (uint)utf32Char, Gdk.ModifierType.None);
+				}
+			}
+			
+			//the IME can commit while there's still a pre-edit string
+			//since we cached the pre-edit offset when it started, need to update it
+			if (preeditOffset > -1) {
+				preeditOffset = Caret.Offset;
+			}
+		}
+
+		protected override bool OnFocusInEvent (EventFocus evnt)
+		{
+			var result = base.OnFocusInEvent (evnt);
+			imContextNeedsReset = true;
+			IMContext.FocusIn ();
+			RequestResetCaretBlink ();
+			Document.CommitLineUpdate (Caret.Line);
+			return result;
+		}
+
+		uint focusOutTimerId = 0;
+
+		void RemoveFocusOutTimerId ()
+		{
+			if (focusOutTimerId == 0)
+				return;
+			GLib.Source.Remove (focusOutTimerId);
+			focusOutTimerId = 0;
+		}
+
+		protected override bool OnFocusOutEvent (EventFocus evnt)
+		{
+			var result = base.OnFocusOutEvent (evnt);
+			imContextNeedsReset = true;
+			imContext.FocusOut ();
+			RemoveFocusOutTimerId ();
+
+			if (tipWindow != null && currentTooltipProvider != null) {
+				if (!currentTooltipProvider.IsInteractive (textEditorData.Parent, tipWindow))
+					DelayedHideTooltip ();
+			} else {
+				HideTooltip ();
+			}
+
+			TextViewMargin.StopCaretThread ();
+			Document.CommitLineUpdate (Caret.Line);
+			return result;
+		}
+
+		protected override void OnRealized ()
+		{
+			WidgetFlags |= WidgetFlags.Realized;
+			WindowAttr attributes = new WindowAttr () {
+				WindowType = Gdk.WindowType.Child,
+				X = Allocation.X,
+				Y = Allocation.Y,
+				Width = Allocation.Width,
+				Height = Allocation.Height,
+				Wclass = WindowClass.InputOutput,
+				Visual = this.Visual,
+				Colormap = this.Colormap,
+				EventMask = (int)(this.Events | Gdk.EventMask.ExposureMask),
+				Mask = this.Events | Gdk.EventMask.ExposureMask,
+			};
+			
+			WindowAttributesType mask = WindowAttributesType.X | WindowAttributesType.Y | WindowAttributesType.Colormap | WindowAttributesType.Visual;
+			GdkWindow = new Gdk.Window (ParentWindow, attributes, mask);
+			GdkWindow.UserData = Raw;
+			GdkWindow.Background = Style.Background (StateType.Normal);
+			Style = Style.Attach (GdkWindow);
+
+			imContext.ClientWindow = this.GdkWindow;
+			Caret.PositionChanged += CaretPositionChanged;
+		}
+
+		protected override void OnUnrealized ()
+		{
+			imContext.ClientWindow = null;
+			CancelScheduledHide ();
+			base.OnUnrealized ();
+		}
+
+		void DocumentUpdatedHandler (object sender, EventArgs args)
+		{
+			foreach (DocumentUpdateRequest request in Document.UpdateRequests) {
+				request.Update (textEditorData.Parent);
+			}
+		}
+
+		public event EventHandler EditorOptionsChanged;
+
+		protected virtual void OptionsChanged (object sender, EventArgs args)
+		{
+			if (Options == null)
+				return;
+			if (currentStyleName != Options.ColorScheme) {
+				currentStyleName = Options.ColorScheme;
+				this.textEditorData.ColorStyle = Options.GetColorStyle ();
+				SetWidgetBgFromStyle ();
+			}
+			
+			iconMargin.IsVisible = Options.ShowIconMargin;
+			gutterMargin.IsVisible = Options.ShowLineNumberMargin;
+			foldMarkerMargin.IsVisible = Options.ShowFoldMargin || Options.EnableQuickDiff;
+//			dashedLineMargin.IsVisible = foldMarkerMargin.IsVisible || gutterMargin.IsVisible;
+			
+			if (EditorOptionsChanged != null)
+				EditorOptionsChanged (this, args);
+			
+			textViewMargin.OptionsChanged ();
+			foreach (Margin margin in this.margins) {
+				if (margin == textViewMargin)
+					continue;
+				margin.OptionsChanged ();
+			}
+			SetAdjustments (Allocation);
+			textEditorData.HeightTree.Rebuild ();
+			this.QueueResize ();
+		}
+
+		void SetWidgetBgFromStyle ()
+		{
+			// This is a hack around a problem with repainting the drag widget.
+			// When this is not set a white square is drawn when the drag widget is moved
+			// when the bg color is differs from the color style bg color (e.g. oblivion style)
+			if (this.textEditorData.ColorStyle != null && GdkWindow != null) {
+				settingWidgetBg = true; //prevent infinite recusion
+				
+				this.ModifyBg (StateType.Normal, (HslColor)this.textEditorData.ColorStyle.PlainText.Background);
+				settingWidgetBg = false;
+			}
+		}
+
+		bool settingWidgetBg = false;
+
+		protected override void OnStyleSet (Gtk.Style previous_style)
+		{
+			base.OnStyleSet (previous_style);
+			if (!settingWidgetBg && textEditorData.ColorStyle != null) {
+//				textEditorData.ColorStyle.UpdateFromGtkStyle (this.Style);
+				SetWidgetBgFromStyle ();
+			}
+		}
+
+		protected override bool OnVisibilityNotifyEvent (EventVisibility evnt)
+		{
+			if (evnt.State == VisibilityState.FullyObscured)
+				HideTooltip ();
+			return base.OnVisibilityNotifyEvent (evnt);
+		}
+
+		protected override void OnDestroyed ()
+		{
+			if (popupWindow != null)
+				popupWindow.Destroy ();
+
+			HideTooltip ();
+			Document.EndUndo -= HandleDocumenthandleEndUndo;
+			Document.TextReplaced -= OnDocumentStateChanged;
+			Document.TextSet -= OnTextSet;
+			Document.LineChanged -= UpdateLinesOnTextMarkerHeightChange; 
+			Document.MarkerAdded -= HandleTextEditorDataDocumentMarkerChange;
+			Document.MarkerRemoved -= HandleTextEditorDataDocumentMarkerChange;
+
+			DisposeAnimations ();
+			
+			RemoveFocusOutTimerId ();
+			RemoveScrollWindowTimer ();
+			if (invisibleCursor != null)
+				invisibleCursor.Dispose ();
+			
+			Caret.PositionChanged -= CaretPositionChanged;
+			
+			Document.DocumentUpdated -= DocumentUpdatedHandler;
+			if (textEditorData.Options != null)
+				textEditorData.Options.Changed -= OptionsChanged;
+			
+			if (imContext != null) {
+				ResetIMContext ();
+				imContext = imContext.Kill (x => x.Commit -= IMCommit);
+			}
+
+			UnregisterAdjustments ();
+
+			foreach (Margin margin in this.margins) {
+				if (margin is IDisposable)
+					((IDisposable)margin).Dispose ();
+			}
+			textEditorData.ClearTooltipProviders ();
+			
+			this.textEditorData.SelectionChanged -= TextEditorDataSelectionChanged;
+			this.textEditorData.Dispose (); 
+			longestLine = null;
+
+			base.OnDestroyed ();
+		}
+
+		[Obsolete ("This method has been moved to TextEditorData. Will be removed in future versions.")]
+		public void ClearTooltipProviders ()
+		{
+			textEditorData.ClearTooltipProviders ();
+		}
+
+		[Obsolete ("This method has been moved to TextEditorData. Will be removed in future versions.")]
+		public void AddTooltipProvider (TooltipProvider provider)
+		{
+			textEditorData.AddTooltipProvider (provider);
+		}
+
+		[Obsolete ("This method has been moved to TextEditorData. Will be removed in future versions.")]
+		public void RemoveTooltipProvider (TooltipProvider provider)
+		{
+			textEditorData.RemoveTooltipProvider (provider);
+		}
+
+		public void RedrawMargin (Margin margin)
+		{
+			if (isDisposed)
+				return;
+			QueueDrawArea ((int)margin.XOffset, 0, GetMarginWidth (margin), this.Allocation.Height);
+		}
+
+		public void RedrawMarginLine (Margin margin, int logicalLine)
+		{
+			if (isDisposed)
+				return;
+			
+			double y = LineToY (logicalLine) - this.textEditorData.VAdjustment.Value;
+			double h = GetLineHeight (logicalLine);
+			
+			if (y + h > 0)
+				QueueDrawArea ((int)margin.XOffset, (int)y, (int)GetMarginWidth (margin), (int)h);
+		}
+
+		int GetMarginWidth (Margin margin)
+		{
+			if (margin.Width < 0)
+				return Allocation.Width - (int)margin.XOffset;
+			return (int)margin.Width;
+		}
+
+		internal void RedrawLine (int logicalLine)
+		{
+			if (isDisposed || logicalLine > LineCount || logicalLine < DocumentLocation.MinLine)
+				return;
+			double y = LineToY (logicalLine) - this.textEditorData.VAdjustment.Value;
+			double h = GetLineHeight (logicalLine);
+
+			if (y + h > 0)
+				QueueDrawArea (0, (int)y, this.Allocation.Width, (int)h);
+		}
+
+		public new void QueueDrawArea (int x, int y, int w, int h)
+		{
+			if (GdkWindow != null) {
+				GdkWindow.InvalidateRect (new Rectangle (x, y, w, h), false);
+#if DEBUG_EXPOSE
+				Console.WriteLine ("invalidated {0},{1} {2}x{3}", x, y, w, h);
+#endif
+			}
+		}
+
+		public new void QueueDraw ()
+		{
+			base.QueueDraw ();
+#if DEBUG_EXPOSE
+			Console.WriteLine ("invalidated entire widget");
+#endif
+		}
+
+		internal void RedrawPosition (int logicalLine, int logicalColumn)
+		{
+			if (isDisposed)
+				return;
+//				Console.WriteLine ("Redraw position: logicalLine={0}, logicalColumn={1}", logicalLine, logicalColumn);
+			RedrawLine (logicalLine);
+		}
+
+		public void RedrawMarginLines (Margin margin, int start, int end)
+		{
+			if (isDisposed)
+				return;
+			if (start < 0)
+				start = 0;
+			double visualStart = -this.textEditorData.VAdjustment.Value + LineToY (start);
+			if (end < 0)
+				end = Document.LineCount;
+			double visualEnd = -this.textEditorData.VAdjustment.Value + LineToY (end) + GetLineHeight (end);
+			QueueDrawArea ((int)margin.XOffset, (int)visualStart, GetMarginWidth (margin), (int)(visualEnd - visualStart));
+		}
+
+		internal void RedrawLines (int start, int end)
+		{
+//			Console.WriteLine ("redraw lines: start={0}, end={1}", start, end);
+			if (isDisposed)
+				return;
+			if (start < 0)
+				start = 0;
+			double visualStart = -this.textEditorData.VAdjustment.Value + LineToY (start);
+			if (end < 0)
+				end = Document.LineCount;
+			double visualEnd = -this.textEditorData.VAdjustment.Value + LineToY (end) + GetLineHeight (end);
+			QueueDrawArea (0, (int)visualStart, this.Allocation.Width, (int)(visualEnd - visualStart));
+		}
+
+		public void RedrawFromLine (int logicalLine)
+		{
+//			Console.WriteLine ("Redraw from line: logicalLine={0}", logicalLine);
+			if (isDisposed)
+				return;
+			int y = System.Math.Max (0, (int)(-this.textEditorData.VAdjustment.Value + LineToY (logicalLine)));
+			QueueDrawArea (0, y,
+			               this.Allocation.Width, this.Allocation.Height - y);
+		}
+
+		/// <summary>Handles key input after key mapping and input methods.</summary>
+		/// <param name="key">The mapped keycode.</param>
+		/// <param name="unicodeChar">A UCS4 character. If this is nonzero, it overrides the keycode.</param>
+		/// <param name="modifier">Keyboard modifier, excluding any consumed by key mapping or IM.</param>
+		public void SimulateKeyPress (Gdk.Key key, uint unicodeChar, ModifierType modifier)
+		{
+			ModifierType filteredModifiers = modifier & (ModifierType.ShiftMask | ModifierType.Mod1Mask |
+			                                             ModifierType.ControlMask | ModifierType.MetaMask |
+			                                             ModifierType.SuperMask);
+			CurrentMode.InternalHandleKeypress (textEditorData.Parent, textEditorData, key, unicodeChar, filteredModifiers);
+			RequestResetCaretBlink ();
+		}
+
+		bool IMFilterKeyPress (Gdk.EventKey evt, Gdk.Key mappedKey, uint mappedChar, Gdk.ModifierType mappedModifiers)
+		{
+			if (lastIMEvent == evt)
+				return false;
+			
+			if (evt.Type == EventType.KeyPress) {
+				lastIMEvent = evt;
+				lastIMEventMappedChar = mappedChar;
+				lastIMEventMappedKey = mappedKey;
+				lastIMEventMappedModifier = mappedModifiers;
+			}
+			
+			if (imContext.FilterKeypress (evt)) {
+				imContextNeedsReset = true;
+				return true;
+			} else {
+				return false;
+			}
+		}
+
+		Gdk.Cursor invisibleCursor;
+
+		internal void HideMouseCursor ()
+		{
+			if (GdkWindow != null)
+				GdkWindow.Cursor = invisibleCursor;
+		}
+
+		protected override bool OnKeyPressEvent (Gdk.EventKey evt)
+		{
+			Gdk.Key key;
+			Gdk.ModifierType mod;
+			KeyboardShortcut[] accels;
+			GtkWorkarounds.MapKeys (evt, out key, out mod, out accels);
+			//HACK: we never call base.OnKeyPressEvent, so implement the popup key manually
+			if (key == Gdk.Key.Menu || (key == Gdk.Key.F10 && mod.HasFlag (ModifierType.ShiftMask))) {
+				OnPopupMenu ();
+				return true;
+			}
+			uint keyVal = (uint)key;
+			CurrentMode.SelectValidShortcut (accels, out key, out mod);
+			if (key == Gdk.Key.F1 && (mod & (ModifierType.ControlMask | ModifierType.ShiftMask)) == ModifierType.ControlMask) {
+				var p = LocationToPoint (Caret.Location);
+				ShowTooltip (Gdk.ModifierType.None, Caret.Offset, p.X, p.Y);
+				return true;
+			}
+			if (key == Gdk.Key.F2 && textViewMargin.IsCodeSegmentPreviewWindowShown) {
+				textViewMargin.OpenCodeSegmentEditor ();
+				return true;
+			}
+			
+			//FIXME: why are we doing this?
+			if ((key == Gdk.Key.space || key == Gdk.Key.parenleft || key == Gdk.Key.parenright) && (mod & Gdk.ModifierType.ShiftMask) == Gdk.ModifierType.ShiftMask)
+				mod = Gdk.ModifierType.None;
+			
+			uint unicodeChar = Gdk.Keyval.ToUnicode (keyVal);
+			
+			if (CurrentMode.WantsToPreemptIM || CurrentMode.PreemptIM (key, unicodeChar, mod)) {
+				ResetIMContext ();
+				//FIXME: should call base.OnKeyPressEvent when SimulateKeyPress didn't handle the event
+				SimulateKeyPress (key, unicodeChar, mod);
+				return true;
+			}
+			bool filter = IMFilterKeyPress (evt, key, unicodeChar, mod);
+			if (filter)
+				return true;
+			
+			//FIXME: OnIMProcessedKeyPressEvent should return false when it didn't handle the event
+			if (editor.OnIMProcessedKeyPressEvent (key, unicodeChar, mod))
+				return true;
+			
+			return base.OnKeyPressEvent (evt);
+		}
+
+		protected override bool OnKeyReleaseEvent (EventKey evnt)
+		{
+			if (IMFilterKeyPress (evnt, 0, 0, ModifierType.None)) {
+				imContextNeedsReset = true;
+			}
+			return true;
+		}
+
+		uint mouseButtonPressed = 0;
+		uint lastTime;
+		double pressPositionX, pressPositionY;
+
+		protected override bool OnButtonPressEvent (Gdk.EventButton e)
+		{
+			if (overChildWidget)
+				return true;
+
+			pressPositionX = e.X;
+			pressPositionY = e.Y;
+			base.IsFocus = true;
+			
+
+			if (lastTime != e.Time) {// filter double clicks
+				if (e.Type == EventType.TwoButtonPress) {
+					lastTime = e.Time;
+				} else {
+					lastTime = 0;
+				}
+				mouseButtonPressed = e.Button;
+				double startPos;
+				Margin margin = GetMarginAtX (e.X, out startPos);
+				if (margin == textViewMargin) {
+					//main context menu
+					if (DoPopupMenu != null && e.TriggersContextMenu ()) {
+						DoClickedPopupMenu (e);
+						return true;
+					}
+				}
+				if (margin != null)
+					margin.MousePressed (new MarginMouseEventArgs (textEditorData.Parent, e, e.Button, e.X - startPos, e.Y, e.State));
+			}
+			return base.OnButtonPressEvent (e);
+		}
+
+		bool DoClickedPopupMenu (Gdk.EventButton e)
+		{
+			double tmOffset = e.X - textViewMargin.XOffset;
+			if (tmOffset >= 0) {
+				DocumentLocation loc;
+				if (textViewMargin.CalculateClickLocation (tmOffset, e.Y, out loc)) {
+					if (!this.IsSomethingSelected || !this.SelectionRange.Contains (Document.LocationToOffset (loc))) {
+						Caret.Location = loc;
+					}
+				}
+				DoPopupMenu (e);
+				this.ResetMouseState ();
+				return true;
+			}
+			return false;
+		}
+
+		public Action<Gdk.EventButton> DoPopupMenu { get; set; }
+
+		protected override bool OnPopupMenu ()
+		{
+			if (DoPopupMenu != null) {
+				DoPopupMenu (null);
+				return true;
+			}
+			return base.OnPopupMenu ();
+		}
+
+		public Margin LockedMargin {
+			get;
+			set;
+		}
+
+		Margin GetMarginAtX (double x, out double startingPos)
+		{
+			double curX = 0;
+			foreach (Margin margin in this.margins) {
+				if (!margin.IsVisible)
+					continue;
+				if (LockedMargin != null) {
+					if (LockedMargin == margin) {
+						startingPos = curX;
+						return margin;
+					}
+				} else {
+					if (curX <= x && (x <= curX + margin.Width || margin.Width < 0)) {
+						startingPos = curX;
+						return margin;
+					}
+				}
+				curX += margin.Width;
+			}
+			startingPos = -1;
+			return null;
+		}
+
+		protected override bool OnButtonReleaseEvent (EventButton e)
+		{
+			RemoveScrollWindowTimer ();
+			
+			//main context menu
+			if (DoPopupMenu != null && e.IsContextMenuButton ()) {
+				return true;
+			}
+			
+			double startPos;
+			Margin margin = GetMarginAtX (e.X, out startPos);
+			if (margin != null)
+				margin.MouseReleased (new MarginMouseEventArgs (textEditorData.Parent, e, e.Button, e.X - startPos, e.Y, e.State));
+			ResetMouseState ();
+			return base.OnButtonReleaseEvent (e);
+		}
+
+		/// <summary>
+		/// Use this method with care.
+		/// </summary>
+		public void ResetMouseState ()
+		{
+			mouseButtonPressed = 0;
+			textViewMargin.inDrag = false;
+			textViewMargin.InSelectionDrag = false;
+		}
+
+		bool dragOver = false;
+		ClipboardActions.CopyOperation dragContents = null;
+		DocumentLocation defaultCaretPos, dragCaretPos;
+		Selection selection = Selection.Empty;
+
+		public bool IsInDrag {
+			get {
+				return dragOver;
+			}
+		}
+
+		public void CaretToDragCaretPosition ()
+		{
+			Caret.Location = defaultCaretPos = dragCaretPos;
+		}
+
+		protected override void OnDragLeave (DragContext context, uint time_)
+		{
+			if (dragOver) {
+				Caret.PreserveSelection = true;
+				Caret.Location = defaultCaretPos;
+				Caret.PreserveSelection = false;
+				ResetMouseState ();
+				dragOver = false;
+			}
+			base.OnDragLeave (context, time_);
+		}
+
+		protected override void OnDragDataGet (DragContext context, SelectionData selection_data, uint info, uint time_)
+		{
+			if (this.dragContents != null) {
+				this.dragContents.SetData (selection_data, info);
+				this.dragContents = null;
+			}
+			base.OnDragDataGet (context, selection_data, info, time_);
+		}
+
+		protected override void OnDragDataReceived (DragContext context, int x, int y, SelectionData selection_data, uint info, uint time_)
+		{
+			var undo = OpenUndoGroup ();
+			int dragOffset = Document.LocationToOffset (dragCaretPos);
+			if (context.Action == DragAction.Move) {
+				if (CanEdit (Caret.Line) && !selection.IsEmpty) {
+					var selectionRange = selection.GetSelectionRange (textEditorData);
+					if (selectionRange.Offset < dragOffset)
+						dragOffset -= selectionRange.Length;
+					Caret.PreserveSelection = true;
+					textEditorData.DeleteSelection (selection);
+					Caret.PreserveSelection = false;
+
+					selection = Selection.Empty;
+				}
+			}
+			if (selection_data.Length > 0 && selection_data.Format == 8) {
+				Caret.Offset = dragOffset;
+				if (CanEdit (dragCaretPos.Line)) {
+					int offset = Caret.Offset;
+					if (!selection.IsEmpty && selection.GetSelectionRange (textEditorData).Offset >= offset) {
+						var start = Document.OffsetToLocation (selection.GetSelectionRange (textEditorData).Offset + selection_data.Text.Length);
+						var end = Document.OffsetToLocation (selection.GetSelectionRange (textEditorData).Offset + selection_data.Text.Length + selection.GetSelectionRange (textEditorData).Length);
+						selection = new Selection (start, end);
+					}
+					textEditorData.PasteText (offset, selection_data.Text, null, ref undo);
+					Caret.Offset = offset + selection_data.Text.Length;
+					MainSelection = new Selection (Document.OffsetToLocation (offset), Document.OffsetToLocation (offset + selection_data.Text.Length));
+				}
+				dragOver = false;
+				context = null;
+			}
+			mouseButtonPressed = 0;
+			undo.Dispose ();
+			base.OnDragDataReceived (context, x, y, selection_data, info, time_);
+		}
+
+		protected override bool OnDragMotion (DragContext context, int x, int y, uint time)
+		{
+			if (!this.HasFocus)
+				this.GrabFocus ();
+			if (!dragOver) {
+				defaultCaretPos = Caret.Location;
+			}
+			
+			DocumentLocation oldLocation = Caret.Location;
+			dragOver = true;
+			Caret.PreserveSelection = true;
+			dragCaretPos = PointToLocation (x - textViewMargin.XOffset, y);
+			int offset = Document.LocationToOffset (dragCaretPos);
+			if (!selection.IsEmpty && offset >= this.selection.GetSelectionRange (textEditorData).Offset && offset < this.selection.GetSelectionRange (textEditorData).EndOffset) {
+				Gdk.Drag.Status (context, DragAction.Default, time);
+				Caret.Location = defaultCaretPos;
+			} else {
+				Gdk.Drag.Status (context, (context.Actions & DragAction.Move) == DragAction.Move ? DragAction.Move : DragAction.Copy, time);
+				Caret.Location = dragCaretPos; 
+			}
+			this.RedrawLine (oldLocation.Line);
+			if (oldLocation.Line != Caret.Line)
+				this.RedrawLine (Caret.Line);
+			Caret.PreserveSelection = false;
+			return base.OnDragMotion (context, x, y, time);
+		}
+
+		Margin oldMargin = null;
+		bool overChildWidget;
+
+		public event EventHandler BeginHover;
+
+		protected virtual void OnBeginHover (EventArgs e)
+		{
+			var handler = BeginHover;
+			if (handler != null)
+				handler (this, e);
+		}
+
+		protected override bool OnMotionNotifyEvent (Gdk.EventMotion e)
+		{
+			OnBeginHover (EventArgs.Empty);
+			try {
+				// The coordinates have to be properly adjusted to the origin since
+				// the event may come from a child widget
+				int rx, ry;
+				GdkWindow.GetOrigin (out rx, out ry);
+				double x = (int)e.XRoot - rx;
+				double y = (int)e.YRoot - ry;
+				overChildWidget = containerChildren.Any (w => w.Child.Allocation.Contains ((int)x, (int)y));
+
+				RemoveScrollWindowTimer ();
+				Gdk.ModifierType mod = e.State;
+				double startPos;
+				Margin margin = GetMarginAtX (x, out startPos);
+				if (textViewMargin.inDrag && margin == this.textViewMargin && Gtk.Drag.CheckThreshold (this, (int)pressPositionX, (int)pressPositionY, (int)x, (int)y)) {
+					dragContents = new ClipboardActions.CopyOperation ();
+					dragContents.CopyData (textEditorData);
+					DragContext context = Gtk.Drag.Begin (this, ClipboardActions.CopyOperation.TargetList, DragAction.Move | DragAction.Copy, 1, e);
+					if (!Platform.IsMac) {
+						CodeSegmentPreviewWindow window = new CodeSegmentPreviewWindow (textEditorData.Parent, true, textEditorData.SelectionRange, 300, 300);
+						Gtk.Drag.SetIconWidget (context, window, 0, 0);
+					}
+					selection = MainSelection;
+					textViewMargin.inDrag = false;
+				} else {
+					FireMotionEvent (x, y, mod);
+					if (mouseButtonPressed != 0) {
+						UpdateScrollWindowTimer (x, y, mod);
+					}
+				}
+			} catch (Exception ex) {
+				GLib.ExceptionManager.RaiseUnhandledException (ex, false);
+			}
+			return base.OnMotionNotifyEvent (e);
+		}
+
+		uint scrollWindowTimer = 0;
+		double scrollWindowTimer_x;
+		double scrollWindowTimer_y;
+		Gdk.ModifierType scrollWindowTimer_mod;
+
+		void UpdateScrollWindowTimer (double x, double y, Gdk.ModifierType mod)
+		{
+			scrollWindowTimer_x = x;
+			scrollWindowTimer_y = y;
+			scrollWindowTimer_mod = mod;
+			if (scrollWindowTimer == 0) {
+				scrollWindowTimer = GLib.Timeout.Add (50, delegate {
+					FireMotionEvent (scrollWindowTimer_x, scrollWindowTimer_y, scrollWindowTimer_mod);
+					return true;
+				});
+			}
+		}
+
+		void RemoveScrollWindowTimer ()
+		{
+			if (scrollWindowTimer != 0) {
+				GLib.Source.Remove (scrollWindowTimer);
+				
+				scrollWindowTimer = 0;
+			}
+		}
+
+		Gdk.ModifierType lastState = ModifierType.None;
+
+		void FireMotionEvent (double x, double y, Gdk.ModifierType state)
+		{
+			lastState = state;
+			mx = x - textViewMargin.XOffset;
+			my = y;
+
+			ShowTooltip (state);
+
+			double startPos;
+			Margin margin;
+			if (textViewMargin.InSelectionDrag) {
+				margin = textViewMargin;
+				startPos = textViewMargin.XOffset;
+			} else {
+				margin = GetMarginAtX (x, out startPos);
+				if (margin != null && GdkWindow != null) {
+					if (!overChildWidget)
+						GdkWindow.Cursor = margin.MarginCursor;
+					else {
+						// Set the default cursor when the mouse is over an embedded widget
+						GdkWindow.Cursor = null;
+					}
+				}
+			}
+
+			if (oldMargin != margin && oldMargin != null)
+				oldMargin.MouseLeft ();
+			
+			if (margin != null)
+				margin.MouseHover (new MarginMouseEventArgs (textEditorData.Parent, EventType.MotionNotify,
+				                                             mouseButtonPressed, x - startPos, y, state));
+			oldMargin = margin;
+		}
+
+		#region CustomDrag (for getting dnd data from toolbox items for example)
+
+		string customText;
+		Gtk.Widget customSource;
+
+		public void BeginDrag (string text, Gtk.Widget source, DragContext context)
+		{
+			customText = text;
+			customSource = source;
+			source.DragDataGet += CustomDragDataGet;
+			source.DragEnd += CustomDragEnd;
+		}
+
+		void CustomDragDataGet (object sender, Gtk.DragDataGetArgs args)
+		{
+			args.SelectionData.Text = customText;
+		}
+
+		void CustomDragEnd (object sender, Gtk.DragEndArgs args)
+		{
+			customSource.DragDataGet -= CustomDragDataGet;
+			customSource.DragEnd -= CustomDragEnd;
+			customSource = null;
+			customText = null;
+		}
+
+		#endregion
+
+		bool isMouseTrapped = false;
+
+		protected override bool OnEnterNotifyEvent (EventCrossing evnt)
+		{
+			isMouseTrapped = true;
+			return base.OnEnterNotifyEvent (evnt);
+		}
+
+		protected override bool OnLeaveNotifyEvent (Gdk.EventCrossing e)
+		{
+			isMouseTrapped = false;
+			if (tipWindow != null && currentTooltipProvider != null) {
+				if (!currentTooltipProvider.IsInteractive (textEditorData.Parent, tipWindow))
+					DelayedHideTooltip ();
+			} else {
+				HideTooltip ();
+			}
+			textViewMargin.HideCodeSegmentPreviewWindow ();
+			
+			if (GdkWindow != null)
+				GdkWindow.Cursor = null;
+			if (oldMargin != null)
+				oldMargin.MouseLeft ();
+			
+			return base.OnLeaveNotifyEvent (e); 
+		}
+
+		public double LineHeight {
+			get {
+				return this.textEditorData.LineHeight;
+			}
+			internal set {
+				this.textEditorData.LineHeight = value;
+			}
+		}
+
+		public TextViewMargin TextViewMargin {
+			get {
+				return textViewMargin;
+			}
+		}
+
+		public Margin IconMargin {
+			get { return iconMargin; }
+		}
+
+		public ActionMargin ActionMargin {
+			get { return actionMargin; }
+		}
+
+		public DocumentLocation LogicalToVisualLocation (DocumentLocation location)
+		{
+			return textEditorData.LogicalToVisualLocation (location);
+		}
+
+		public DocumentLocation LogicalToVisualLocation (int line, int column)
+		{
+			return textEditorData.LogicalToVisualLocation (line, column);
+		}
+
+		public void CenterToCaret ()
+		{
+			CenterTo (Caret.Location);
+		}
+
+		public void CenterTo (int offset)
+		{
+			CenterTo (Document.OffsetToLocation (offset));
+		}
+
+		public void CenterTo (int line, int column)
+		{
+			CenterTo (new DocumentLocation (line, column));
+		}
+
+		public void CenterTo (DocumentLocation p)
+		{
+			if (isDisposed || p.Line < 0 || p.Line > Document.LineCount)
+				return;
+			SetAdjustments (this.Allocation);
+			//			Adjustment adj;
+			//adj.Upper
+			if (this.textEditorData.VAdjustment.Upper < Allocation.Height) {
+				this.textEditorData.VAdjustment.Value = 0;
+				return;
+			}
+			
+			//	int yMargin = 1 * this.LineHeight;
+			double caretPosition = LineToY (p.Line);
+			caretPosition -= this.textEditorData.VAdjustment.PageSize / 2;
+
+			// Make sure the caret position is inside the bounds. This avoids an unnecessary bump of the scrollview.
+			// The adjustment does this check, but does it after assigning the value, so the value may be out of bounds for a while.
+			if (caretPosition + this.textEditorData.VAdjustment.PageSize > this.textEditorData.VAdjustment.Upper)
+				caretPosition = this.textEditorData.VAdjustment.Upper - this.textEditorData.VAdjustment.PageSize;
+
+			this.textEditorData.VAdjustment.Value = caretPosition;
+			
+			if (this.textEditorData.HAdjustment.Upper < Allocation.Width) {
+				this.textEditorData.HAdjustment.Value = 0;
+			} else {
+				double caretX = ColumnToX (Document.GetLine (p.Line), p.Column);
+				double textWith = Allocation.Width - textViewMargin.XOffset;
+				if (this.textEditorData.HAdjustment.Value > caretX) {
+					this.textEditorData.HAdjustment.Value = caretX;
+				} else if (this.textEditorData.HAdjustment.Value + textWith < caretX + TextViewMargin.CharWidth) {
+					double adjustment = System.Math.Max (0, caretX - textWith + TextViewMargin.CharWidth);
+					this.textEditorData.HAdjustment.Value = adjustment;
+				}
+			}
+		}
+
+		public void ScrollTo (int offset)
+		{
+			ScrollTo (Document.OffsetToLocation (offset));
+		}
+
+		public void ScrollTo (int line, int column)
+		{
+			ScrollTo (new DocumentLocation (line, column));
+		}
+		//		class ScrollingActor
+		//		{
+		//			readonly TextEditor editor;
+		//			readonly double targetValue;
+		//			readonly double initValue;
+		//
+		//			public ScrollingActor (Mono.TextEditor.TextEditor editor, double targetValue)
+		//			{
+		//				this.editor = editor;
+		//				this.targetValue = targetValue;
+		//				this.initValue = editor.VAdjustment.Value;
+		//			}
+		//
+		//			public bool Step (Actor<ScrollingActor> actor)
+		//			{
+		//				if (actor.Expired) {
+		//					editor.VAdjustment.Value = targetValue;
+		//					return false;
+		//				}
+		//				var newValue = initValue + (targetValue - initValue) / 100   * actor.Percent;
+		//				editor.VAdjustment.Value = newValue;
+		//				return true;
+		//			}
+		//		}
+		internal void SmoothScrollTo (double value)
+		{
+			this.textEditorData.VAdjustment.Value = value;
+/*			Stage<ScrollingActor> scroll = new Stage<ScrollingActor> (50);
+			scroll.UpdateFrequency = 10;
+			var scrollingActor = new ScrollingActor (this, value);
+			scroll.Add (scrollingActor, 50);
+
+			scroll.ActorStep += scrollingActor.Step;
+			scroll.Play ();*/
+		}
+
+		public void ScrollTo (DocumentLocation p)
+		{
+			if (isDisposed || p.Line < 0 || p.Line > Document.LineCount || inCaretScroll)
+				return;
+			inCaretScroll = true;
+			try {
+				if (this.textEditorData.VAdjustment.Upper < Allocation.Height) {
+					this.textEditorData.VAdjustment.Value = 0;
+				} else {
+					double caretPosition = LineToY (p.Line);
+					if (this.textEditorData.VAdjustment.Value > caretPosition) {
+						this.textEditorData.VAdjustment.Value = caretPosition;
+					} else if (this.textEditorData.VAdjustment.Value + this.textEditorData.VAdjustment.PageSize - this.LineHeight < caretPosition) {
+						this.textEditorData.VAdjustment.Value = caretPosition - this.textEditorData.VAdjustment.PageSize + this.LineHeight;
+					}
+				}
+				
+				if (this.textEditorData.HAdjustment.Upper < Allocation.Width) {
+					this.textEditorData.HAdjustment.Value = 0;
+				} else {
+					double caretX = ColumnToX (Document.GetLine (p.Line), p.Column);
+					double textWith = Allocation.Width - textViewMargin.XOffset;
+					if (this.textEditorData.HAdjustment.Value > caretX) {
+						this.textEditorData.HAdjustment.Value = caretX;
+					} else if (this.textEditorData.HAdjustment.Value + textWith < caretX + TextViewMargin.CharWidth) {
+						double adjustment = System.Math.Max (0, caretX - textWith + TextViewMargin.CharWidth);
+						this.textEditorData.HAdjustment.Value = adjustment;
+					}
+				}
+			} finally {
+				inCaretScroll = false;
+			}
+		}
+
+		/// <summary>
+		/// Scrolls the editor as required for making the specified area visible 
+		/// </summary>
+		public void ScrollTo (Gdk.Rectangle rect)
+		{
+			inCaretScroll = true;
+			try {
+				var vad = this.textEditorData.VAdjustment;
+				if (vad.Upper < Allocation.Height) {
+					vad.Value = 0;
+				} else {
+					if (vad.Value >= rect.Top) {
+						vad.Value = rect.Top;
+					} else if (vad.Value + vad.PageSize - rect.Height < rect.Top) {
+						vad.Value = rect.Top - vad.PageSize + rect.Height;
+					}
+				}
+
+				var had = this.textEditorData.HAdjustment;
+				if (had.Upper < Allocation.Width) {
+					had.Value = 0;
+				} else {
+					if (had.Value >= rect.Left) {
+						had.Value = rect.Left;
+					} else if (had.Value + had.PageSize - rect.Width < rect.Left) {
+						had.Value = rect.Left - had.PageSize + rect.Width;
+					}
+				}
+			} finally {
+				inCaretScroll = false;
+			}
+		}
+
+		bool inCaretScroll = false;
+
+		public void ScrollToCaret ()
+		{
+			ScrollTo (Caret.Location);
+		}
+
+		public void TryToResetHorizontalScrollPosition ()
+		{
+			int caretX = (int)ColumnToX (Document.GetLine (Caret.Line), Caret.Column);
+			int textWith = Allocation.Width - (int)textViewMargin.XOffset;
+			if (caretX < textWith - TextViewMargin.CharWidth)
+				this.textEditorData.HAdjustment.Value = 0;
+		}
+
+		protected override void OnSizeAllocated (Gdk.Rectangle allocation)
+		{
+			base.OnSizeAllocated (allocation);
+			SetAdjustments (Allocation);
+			sizeHasBeenAllocated = true;
+			if (Options.WrapLines)
+				textViewMargin.PurgeLayoutCache ();
+			SetChildrenPositions (allocation);
+		}
+
+		uint lastScrollTime;
+
+		protected override bool OnScrollEvent (EventScroll evnt)
+		{
+			var modifier = !Platform.IsMac ? Gdk.ModifierType.ControlMask
+				//Mac window manager already uses control-scroll, so use command
+				//Command might be either meta or mod1, depending on GTK version
+				: (Gdk.ModifierType.MetaMask | Gdk.ModifierType.Mod1Mask);
+
+			var hasZoomModifier = (evnt.State & modifier) != 0;
+			if (hasZoomModifier && lastScrollTime != 0 && (evnt.Time - lastScrollTime) < 100)
+				hasZoomModifier = false;
+
+			if (hasZoomModifier) {
+				if (evnt.Direction == ScrollDirection.Up)
+					Options.ZoomIn ();
+				else if (evnt.Direction == ScrollDirection.Down)
+					Options.ZoomOut ();
+				
+				this.QueueDraw ();
+				if (isMouseTrapped)
+					FireMotionEvent (mx + textViewMargin.XOffset, my, lastState);
+				return true;
+			}
+			lastScrollTime = evnt.Time;
+			return base.OnScrollEvent (evnt); 
+		}
+
+		void SetHAdjustment ()
+		{
+			textEditorData.HeightTree.Rebuild ();
+			
+			if (textEditorData.HAdjustment == null || Options == null)
+				return;
+			textEditorData.HAdjustment.ValueChanged -= HAdjustmentValueChanged;
+			if (Options.WrapLines) {
+				this.textEditorData.HAdjustment.SetBounds (0, 0, 0, 0, 0);
+			} else {
+				if (longestLine != null && this.textEditorData.HAdjustment != null) {
+					double maxX = longestLineWidth;
+					if (maxX > Allocation.Width)
+						maxX += 2 * this.textViewMargin.CharWidth;
+					double width = Allocation.Width - this.TextViewMargin.XOffset;
+					var realMaxX = System.Math.Max (maxX, this.textEditorData.HAdjustment.Value + width);
+
+					foreach (var containerChild in editor.containerChildren.Concat (containerChildren)) {
+						if (containerChild.Child == this)
+							continue;
+						realMaxX = System.Math.Max (realMaxX, containerChild.X + containerChild.Child.Allocation.Width);
+					}
+
+					this.textEditorData.HAdjustment.SetBounds (
+						0,
+						realMaxX,
+						this.textViewMargin.CharWidth,
+						width,
+						width);
+					if (realMaxX < width)
+						this.textEditorData.HAdjustment.Value = 0;
+				}
+			}
+			textEditorData.HAdjustment.ValueChanged += HAdjustmentValueChanged;
+		}
+
+		internal void SetAdjustments ()
+		{
+			SetAdjustments (Allocation);
+		}
+
+		public const int EditorLineThreshold = 0;
+
+		internal void SetAdjustments (Gdk.Rectangle allocation)
+		{
+			SetHAdjustment ();
+			
+			if (this.textEditorData.VAdjustment != null) {
+				double maxY = textEditorData.HeightTree.TotalHeight;
+				if (maxY > allocation.Height)
+					maxY += EditorLineThreshold * this.LineHeight;
+
+				foreach (var containerChild in editor.containerChildren.Concat (containerChildren)) {
+					maxY = System.Math.Max (maxY, containerChild.Y + containerChild.Child.SizeRequest ().Height);
+				}
+
+				if (VAdjustment.Value > maxY - allocation.Height) {
+					VAdjustment.Value = System.Math.Max (0, maxY - allocation.Height);
+					QueueDraw ();
+				}
+				this.textEditorData.VAdjustment.SetBounds (0, 
+				                                           System.Math.Max (allocation.Height, maxY), 
+				                                           LineHeight,
+				                                           allocation.Height,
+				                                           allocation.Height);
+				if (maxY < allocation.Height)
+					this.textEditorData.VAdjustment.Value = 0;
+			}
+		}
+
+		public int GetWidth (string text)
+		{
+			return this.textViewMargin.GetWidth (text);
+		}
+
+		void UpdateMarginXOffsets ()
+		{
+			double curX = 0;
+			foreach (Margin margin in this.margins) {
+				if (!margin.IsVisible)
+					continue;
+				margin.XOffset = curX;
+				curX += margin.Width;
+			}
+		}
+
+		void RenderMargins (Cairo.Context cr, Cairo.Context textViewCr, Cairo.Rectangle cairoRectangle)
+		{
+			this.TextViewMargin.rulerX = Options.RulerColumn * this.TextViewMargin.CharWidth - this.textEditorData.HAdjustment.Value;
+			int startLine = YToLine (cairoRectangle.Y + this.textEditorData.VAdjustment.Value);
+			double startY = LineToY (startLine);
+			double curY = startY - this.textEditorData.VAdjustment.Value;
+			bool setLongestLine = false;
+			foreach (var margin in this.margins) {
+				if (margin.BackgroundRenderer != null)
+					margin.BackgroundRenderer.Draw (cr, cairoRectangle);
+			}
+
+
+			for (int visualLineNumber = textEditorData.LogicalToVisualLine (startLine);; visualLineNumber++) {
+				int logicalLineNumber = textEditorData.VisualToLogicalLine (visualLineNumber);
+				var line = Document.GetLine (logicalLineNumber);
+
+				// Ensure that the correct line height is set.
+				if (line != null) {
+					var wrapper = textViewMargin.GetLayout (line);
+					if (wrapper.IsUncached)
+						wrapper.Dispose ();
+				}
+
+				double lineHeight = GetLineHeight (line);
+				foreach (var margin in this.margins) {
+					if (!margin.IsVisible)
+						continue;
+					try {
+						margin.Draw (margin == textViewMargin ? textViewCr : cr, cairoRectangle, line, logicalLineNumber, margin.XOffset, curY, lineHeight);
+					} catch (Exception e) {
+						System.Console.WriteLine (e);
+					}
+				}
+				// take the line real render width from the text view margin rendering (a line can consist of more than 
+				// one line and be longer (foldings!) ex. : someLine1[...]someLine2[...]someLine3)
+				double lineWidth = textViewMargin.lastLineRenderWidth + HAdjustment.Value;
+				if (longestLine == null || lineWidth > longestLineWidth) {
+					longestLine = line;
+					longestLineWidth = lineWidth;
+					setLongestLine = true;
+				}
+				curY += lineHeight;
+				if (curY > cairoRectangle.Y + cairoRectangle.Height)
+					break;
+			}
+			
+			foreach (var margin in this.margins) {
+				if (!margin.IsVisible)
+					continue;
+				foreach (var drawer in margin.MarginDrawer)
+					drawer.Draw (cr, cairoRectangle);
+			}
+			
+			if (setLongestLine)
+				SetHAdjustment ();
+		}
+		/*
+		protected override bool OnWidgetEvent (Event evnt)
+		{
+		System.Console.WriteLine(evnt);
+		return base.OnWidgetEvent (evnt);
+		}*/
+		double oldVadjustment = 0;
+
+		void UpdateAdjustments ()
+		{
+			int lastVisibleLine = textEditorData.LogicalToVisualLine (Document.LineCount);
+			if (oldRequest != lastVisibleLine) {
+				SetAdjustments (this.Allocation);
+				oldRequest = lastVisibleLine;
+			}
+		}
+		#if DEBUG_EXPOSE
+		DateTime started = DateTime.Now;
+#endif
+		protected override bool OnExposeEvent (Gdk.EventExpose e)
+		{
+			if (this.isDisposed)
+				return false;
+			UpdateAdjustments ();
+
+
+			var area = e.Region.Clipbox;
+			var cairoArea = new Cairo.Rectangle (area.X, area.Y, area.Width, area.Height);
+			using (Cairo.Context cr = Gdk.CairoHelper.Create (e.Window))
+			using (Cairo.Context textViewCr = Gdk.CairoHelper.Create (e.Window)) {
+				if (!Options.UseAntiAliasing) {
+					textViewCr.Antialias = Cairo.Antialias.None;
+					cr.Antialias = Cairo.Antialias.None;
+				}
+				
+				UpdateMarginXOffsets ();
+				
+				cr.LineWidth = Options.Zoom;
+				textViewCr.LineWidth = Options.Zoom;
+				textViewCr.Rectangle (textViewMargin.XOffset, 0, Allocation.Width - textViewMargin.XOffset, Allocation.Height);
+				textViewCr.Clip ();
+				
+				RenderMargins (cr, textViewCr, cairoArea);
+			
+#if DEBUG_EXPOSE
+				Console.WriteLine ("{0} expose {1},{2} {3}x{4}", (long)(DateTime.Now - started).TotalMilliseconds,
+				e.Area.X, e.Area.Y, e.Area.Width, e.Area.Height);
+#endif
+				if (requestResetCaretBlink && HasFocus) {
+					textViewMargin.ResetCaretBlink (200);
+					requestResetCaretBlink = false;
+				}
+				
+				foreach (Animation animation in actors) {
+					animation.Drawer.Draw (cr);
+				}
+				
+				if (HasFocus)
+					textViewMargin.DrawCaret (e.Window, e.Area);
+				
+				OnPainted (new PaintEventArgs (cr, cairoArea));
+			}
+
+			if (Caret.IsVisible)
+				textViewMargin.DrawCaret (e.Window, Allocation);
+
+			return base.OnExposeEvent (e);
+		}
+
+		protected virtual void OnPainted (PaintEventArgs e)
+		{
+			EventHandler<PaintEventArgs> handler = this.Painted;
+			if (handler != null)
+				handler (this, e);
+		}
+
+		public event EventHandler<PaintEventArgs> Painted;
+
+		#region TextEditorData delegation
+
+		public string EolMarker {
+			get {
+				return textEditorData.EolMarker;
+			}
+		}
+
+		public Mono.TextEditor.Highlighting.ColorScheme ColorStyle {
+			get {
+				return this.textEditorData.ColorStyle;
+			}
+		}
+
+		public EditMode CurrentMode {
+			get {
+				return this.textEditorData.CurrentMode;
+			}
+			set {
+				this.textEditorData.CurrentMode = value;
+			}
+		}
+
+		public bool IsSomethingSelected {
+			get {
+				return this.textEditorData.IsSomethingSelected;
+			}
+		}
+
+		public Selection MainSelection {
+			get {
+				return textEditorData.MainSelection;
+			}
+			set {
+				textEditorData.MainSelection = value;
+			}
+		}
+
+		public SelectionMode SelectionMode {
+			get {
+				return textEditorData.SelectionMode;
+			}
+			set {
+				textEditorData.SelectionMode = value;
+			}
+		}
+
+		public TextSegment SelectionRange {
+			get {
+				return this.textEditorData.SelectionRange;
+			}
+			set {
+				this.textEditorData.SelectionRange = value;
+			}
+		}
+
+		public string SelectedText {
+			get {
+				return this.textEditorData.SelectedText;
+			}
+			set {
+				this.textEditorData.SelectedText = value;
+			}
+		}
+
+		public int SelectionAnchor {
+			get {
+				return this.textEditorData.SelectionAnchor;
+			}
+			set {
+				this.textEditorData.SelectionAnchor = value;
+			}
+		}
+
+		public IEnumerable<DocumentLine> SelectedLines {
+			get {
+				return this.textEditorData.SelectedLines;
+			}
+		}
+
+		public Adjustment HAdjustment {
+			get {
+				return this.textEditorData.HAdjustment;
+			}
+		}
+
+		public Adjustment VAdjustment {
+			get {
+				return this.textEditorData.VAdjustment;
+			}
+		}
+
+		public int Insert (int offset, string value)
+		{
+			return textEditorData.Insert (offset, value);
+		}
+
+		public void Remove (DocumentRegion region)
+		{
+			textEditorData.Remove (region);
+		}
+
+		public void Remove (TextSegment removeSegment)
+		{
+			textEditorData.Remove (removeSegment);
+		}
+
+		public void Remove (int offset, int count)
+		{
+			textEditorData.Remove (offset, count);
+		}
+
+		public int Replace (int offset, int count, string value)
+		{
+			return textEditorData.Replace (offset, count, value);
+		}
+
+		public void ClearSelection ()
+		{
+			this.textEditorData.ClearSelection ();
+		}
+
+		public void DeleteSelectedText ()
+		{
+			this.textEditorData.DeleteSelectedText ();
+		}
+
+		public void DeleteSelectedText (bool clearSelection)
+		{
+			this.textEditorData.DeleteSelectedText (clearSelection);
+		}
+
+		public void RunEditAction (Action<TextEditorData> action)
+		{
+			action (this.textEditorData);
+		}
+
+		public void SetSelection (int anchorOffset, int leadOffset)
+		{
+			this.textEditorData.SetSelection (anchorOffset, leadOffset);
+		}
+
+		public void SetSelection (DocumentLocation anchor, DocumentLocation lead)
+		{
+			this.textEditorData.SetSelection (anchor, lead);
+		}
+
+		public void SetSelection (int anchorLine, int anchorColumn, int leadLine, int leadColumn)
+		{
+			this.textEditorData.SetSelection (anchorLine, anchorColumn, leadLine, leadColumn);
+		}
+
+		public void ExtendSelectionTo (DocumentLocation location)
+		{
+			this.textEditorData.ExtendSelectionTo (location);
+		}
+
+		public void ExtendSelectionTo (int offset)
+		{
+			this.textEditorData.ExtendSelectionTo (offset);
+		}
+
+		public void SetSelectLines (int from, int to)
+		{
+			this.textEditorData.SetSelectLines (from, to);
+		}
+
+		public void InsertAtCaret (string text)
+		{
+			textEditorData.InsertAtCaret (text);
+		}
+
+		public bool CanEdit (int line)
+		{
+			return textEditorData.CanEdit (line);
+		}
+
+		public string GetLineText (int line)
+		{
+			return textEditorData.GetLineText (line);
+		}
+
+		public string GetLineText (int line, bool includeDelimiter)
+		{
+			return textEditorData.GetLineText (line, includeDelimiter);
+		}
+
+		/// <summary>
+		/// Use with care.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="TextEditorData"/>
+		/// </returns>
+		public TextEditorData GetTextEditorData ()
+		{
+			return this.textEditorData;
+		}
+
+		public event EventHandler SelectionChanged;
+
+		protected virtual void OnSelectionChanged (EventArgs args)
+		{
+			CurrentMode.InternalSelectionChanged (editor, textEditorData);
+			if (SelectionChanged != null)
+				SelectionChanged (this, args);
+		}
+
+		#endregion
+
+		#region Document delegation
+
+		public int Length {
+			get {
+				return Document.TextLength;
+			}
+		}
+
+		public string Text {
+			get {
+				return Document.Text;
+			}
+			set {
+				Document.Text = value;
+			}
+		}
+
+		public string GetTextBetween (int startOffset, int endOffset)
+		{
+			return Document.GetTextBetween (startOffset, endOffset);
+		}
+
+		public string GetTextBetween (DocumentLocation start, DocumentLocation end)
+		{
+			return Document.GetTextBetween (start, end);
+		}
+
+		public string GetTextBetween (int startLine, int startColumn, int endLine, int endColumn)
+		{
+			return Document.GetTextBetween (startLine, startColumn, endLine, endColumn);
+		}
+
+		public string GetTextAt (int offset, int count)
+		{
+			return Document.GetTextAt (offset, count);
+		}
+
+		public string GetTextAt (TextSegment segment)
+		{
+			return Document.GetTextAt (segment);
+		}
+
+		public string GetTextAt (DocumentRegion region)
+		{
+			return Document.GetTextAt (region);
+		}
+
+		public char GetCharAt (int offset)
+		{
+			return Document.GetCharAt (offset);
+		}
+
+		public IEnumerable<DocumentLine> Lines {
+			get {
+				return Document.Lines;
+			}
+		}
+
+		public int LineCount {
+			get {
+				return Document.LineCount;
+			}
+		}
+
+		public int LocationToOffset (int line, int column)
+		{
+			return Document.LocationToOffset (line, column);
+		}
+
+		public int LocationToOffset (DocumentLocation location)
+		{
+			return Document.LocationToOffset (location);
+		}
+
+		public DocumentLocation OffsetToLocation (int offset)
+		{
+			return Document.OffsetToLocation (offset);
+		}
+
+		public string GetLineIndent (int lineNumber)
+		{
+			return Document.GetLineIndent (lineNumber);
+		}
+
+		public string GetLineIndent (DocumentLine segment)
+		{
+			return Document.GetLineIndent (segment);
+		}
+
+		public DocumentLine GetLine (int lineNumber)
+		{
+			return Document.GetLine (lineNumber);
+		}
+
+		public DocumentLine GetLineByOffset (int offset)
+		{
+			return Document.GetLineByOffset (offset);
+		}
+
+		public int OffsetToLineNumber (int offset)
+		{
+			return Document.OffsetToLineNumber (offset);
+		}
+
+		public IDisposable OpenUndoGroup ()
+		{
+			return Document.OpenUndoGroup ();
+		}
+
+		#endregion
+
+		#region Search & Replace
+
+		bool highlightSearchPattern = false;
+
+		public string SearchPattern {
+			get {
+				return this.textEditorData.SearchRequest.SearchPattern;
+			}
+			set {
+				if (this.textEditorData.SearchRequest.SearchPattern != value) {
+					this.textEditorData.SearchRequest.SearchPattern = value;
+				}
+			}
+		}
+
+		public ISearchEngine SearchEngine {
+			get {
+				return this.textEditorData.SearchEngine;
+			}
+			set {
+				Debug.Assert (value != null);
+				this.textEditorData.SearchEngine = value;
+			}
+		}
+
+		public event EventHandler HighlightSearchPatternChanged;
+
+		public bool HighlightSearchPattern {
+			get {
+				return highlightSearchPattern;
+			}
+			set {
+				if (highlightSearchPattern != value) {
+					this.highlightSearchPattern = value;
+					if (HighlightSearchPatternChanged != null)
+						HighlightSearchPatternChanged (this, EventArgs.Empty);
+					textViewMargin.DisposeLayoutDict ();
+					this.QueueDraw ();
+				}
+			}
+		}
+
+		public bool IsCaseSensitive {
+			get {
+				return this.textEditorData.SearchRequest.CaseSensitive;
+			}
+			set {
+				this.textEditorData.SearchRequest.CaseSensitive = value;
+			}
+		}
+
+		public bool IsWholeWordOnly {
+			get {
+				return this.textEditorData.SearchRequest.WholeWordOnly;
+			}
+			
+			set {
+				this.textEditorData.SearchRequest.WholeWordOnly = value;
+			}
+		}
+
+		public TextSegment SearchRegion {
+			get {
+				return this.textEditorData.SearchRequest.SearchRegion;
+			}
+			
+			set {
+				this.textEditorData.SearchRequest.SearchRegion = value;
+			}
+		}
+
+		public SearchResult SearchForward (int fromOffset)
+		{
+			return textEditorData.SearchForward (fromOffset);
+		}
+
+		public SearchResult SearchBackward (int fromOffset)
+		{
+			return textEditorData.SearchBackward (fromOffset);
+		}
+
+		class CaretPulseAnimation : IAnimationDrawer
+		{
+			TextEditor editor;
+
+			public double Percent { get; set; }
+
+			public Gdk.Rectangle AnimationBounds {
+				get {
+					double x = editor.TextViewMargin.caretX;
+					double y = editor.TextViewMargin.caretY;
+					double extend = 100 * 5;
+					int width = (int)(editor.TextViewMargin.charWidth + 2 * extend * editor.Options.Zoom / 2);
+					return new Gdk.Rectangle ((int)(x - extend * editor.Options.Zoom / 2), 
+					                          (int)(y - extend * editor.Options.Zoom),
+					                          width,
+					                          (int)(editor.LineHeight + 2 * extend * editor.Options.Zoom));
+				}
+			}
+
+			public CaretPulseAnimation (TextEditor editor)
+			{
+				this.editor = editor;
+			}
+
+			public void Draw (Cairo.Context cr)
+			{
+				double x = editor.TextViewMargin.caretX;
+				double y = editor.TextViewMargin.caretY;
+				if (editor.Caret.Mode != CaretMode.Block)
+					x -= editor.TextViewMargin.charWidth / 2;
+				cr.Rectangle (editor.TextViewMargin.XOffset, 0, editor.Allocation.Width - editor.TextViewMargin.XOffset, editor.Allocation.Height);
+				cr.Clip ();
+
+				double extend = Percent * 5;
+				double width = editor.TextViewMargin.charWidth + 2 * extend * editor.Options.Zoom / 2;
+				FoldingScreenbackgroundRenderer.DrawRoundRectangle (cr, true, true, 
+				                                                    x - extend * editor.Options.Zoom / 2, 
+				                                                    y - extend * editor.Options.Zoom, 
+				                                                    System.Math.Min (editor.TextViewMargin.charWidth / 2, width), 
+				                                                    width,
+				                                                    editor.LineHeight + 2 * extend * editor.Options.Zoom);
+				Cairo.Color color = editor.ColorStyle.PlainText.Foreground;
+				color.A = 0.8;
+				cr.LineWidth = editor.Options.Zoom;
+				cr.SetSourceColor (color);
+				cr.Stroke ();
+				cr.ResetClip ();
+			}
+		}
+
+		public enum PulseKind
+		{
+			In,
+			Out,
+			Bounce
+		}
+
+		public class RegionPulseAnimation : IAnimationDrawer
+		{
+			TextEditor editor;
+
+			public PulseKind Kind { get; set; }
+
+			public double Percent { get; set; }
+
+			Gdk.Rectangle region;
+
+			public Gdk.Rectangle AnimationBounds {
+				get {
+					int x = region.X;
+					int y = region.Y;
+					int animationPosition = (int)(100 * 100);
+					int width = (int)(region.Width + 2 * animationPosition * editor.Options.Zoom / 2);
+					
+					return new Gdk.Rectangle ((int)(x - animationPosition * editor.Options.Zoom / 2), 
+					                          (int)(y - animationPosition * editor.Options.Zoom),
+					                          width,
+					                          (int)(region.Height + 2 * animationPosition * editor.Options.Zoom));
+				}
+			}
+
+			public RegionPulseAnimation (TextEditor editor, Gdk.Point position, Gdk.Size size)
+				: this (editor, new Gdk.Rectangle (position, size))
+			{
+			}
+
+			public RegionPulseAnimation (TextEditor editor, Gdk.Rectangle region)
+			{
+				if (region.X < 0 || region.Y < 0 || region.Width < 0 || region.Height < 0)
+					throw new ArgumentException ("region is invalid");
+				
+				this.editor = editor;
+				this.region = region;
+			}
+
+			public void Draw (Cairo.Context cr)
+			{
+				int x = region.X;
+				int y = region.Y;
+				int animationPosition = (int)(Percent * 100);
+				
+				cr.Rectangle (editor.TextViewMargin.XOffset, 0, editor.Allocation.Width - editor.TextViewMargin.XOffset, editor.Allocation.Height);
+				cr.Clip ();
+
+				int width = (int)(region.Width + 2 * animationPosition * editor.Options.Zoom / 2);
+				FoldingScreenbackgroundRenderer.DrawRoundRectangle (cr, true, true, 
+				                                                    (int)(x - animationPosition * editor.Options.Zoom / 2), 
+				                                                    (int)(y - animationPosition * editor.Options.Zoom), 
+				                                                    System.Math.Min (editor.TextViewMargin.charWidth / 2, width), 
+				                                                    width,
+				                                                    (int)(region.Height + 2 * animationPosition * editor.Options.Zoom));
+				Cairo.Color color = editor.ColorStyle.PlainText.Foreground;
+				color.A = 0.8;
+				cr.LineWidth = editor.Options.Zoom;
+				cr.SetSourceColor (color);
+				cr.Stroke ();
+				cr.ResetClip ();
+			}
+		}
+
+		Gdk.Rectangle RangeToRectangle (DocumentLocation start, DocumentLocation end)
+		{
+			if (start.Column < 0 || start.Line < 0 || end.Column < 0 || end.Line < 0)
+				return Gdk.Rectangle.Zero;
+			
+			var startPt = this.LocationToPoint (start);
+			var endPt = this.LocationToPoint (end);
+			int width = endPt.X - startPt.X;
+			
+			if (startPt.Y != endPt.Y || startPt.X < 0 || startPt.Y < 0 || width < 0)
+				return Gdk.Rectangle.Zero;
+			
+			return new Gdk.Rectangle (startPt.X, startPt.Y, width, (int)this.LineHeight);
+		}
+
+		/// <summary>
+		/// Initiate a pulse at the specified document location
+		/// </summary>
+		/// <param name="pulseStart">
+		/// A <see cref="DocumentLocation"/>
+		/// </param>
+		public void PulseCharacter (DocumentLocation pulseStart)
+		{
+			if (pulseStart.Column < 0 || pulseStart.Line < 0)
+				return;
+			var rect = RangeToRectangle (pulseStart, new DocumentLocation (pulseStart.Line, pulseStart.Column + 1));
+			if (rect.X < 0 || rect.Y < 0 || System.Math.Max (rect.Width, rect.Height) <= 0)
+				return;
+			StartAnimation (new RegionPulseAnimation (editor, rect) {
+				Kind = PulseKind.Bounce
+			});
+		}
+
+		public SearchResult FindNext (bool setSelection)
+		{
+			SearchResult result = textEditorData.FindNext (setSelection);
+			TryToResetHorizontalScrollPosition ();
+			AnimateSearchResult (result);
+			return result;
+		}
+
+		public void StartCaretPulseAnimation ()
+		{
+			StartAnimation (new CaretPulseAnimation (editor));
+		}
+
+		SearchHighlightPopupWindow popupWindow = null;
+
+		public void StopSearchResultAnimation ()
+		{
+			if (popupWindow == null)
+				return;
+			popupWindow.StopPlaying ();
+		}
+
+		public void AnimateSearchResult (SearchResult result)
+		{
+			if (!IsComposited || !Options.EnableAnimations || result == null)
+				return;
+			
+			// Don't animate multi line search results
+			if (OffsetToLineNumber (result.Segment.Offset) != OffsetToLineNumber (result.Segment.EndOffset))
+				return;
+			
+			TextViewMargin.MainSearchResult = result.Segment;
+			if (!TextViewMargin.MainSearchResult.IsInvalid) {
+				if (popupWindow != null) {
+					popupWindow.StopPlaying ();
+					popupWindow.Destroy ();
+				}
+				popupWindow = new SearchHighlightPopupWindow (editor);
+				popupWindow.Result = result;
+				popupWindow.Popup ();
+				popupWindow.Destroyed += delegate {
+					popupWindow = null;
+				};
+			}
+		}
+
+		class SearchHighlightPopupWindow : BounceFadePopupWidget
+		{
+			public SearchResult Result {
+				get;
+				set;
+			}
+
+			public SearchHighlightPopupWindow (TextEditor editor) : base (editor)
+			{
+			}
+
+			public override void Popup ()
+			{
+				ExpandWidth = (uint)Editor.LineHeight;
+				ExpandHeight = (uint)Editor.LineHeight / 2;
+				BounceEasing = Easing.Sine;
+				Duration = 150;
+				base.Popup ();
+			}
+
+			protected override void OnAnimationCompleted ()
+			{
+				base.OnAnimationCompleted ();
+				Destroy ();
+			}
+
+			protected override void OnDestroyed ()
+			{
+				base.OnDestroyed ();
+				if (layout != null)
+					layout.Dispose ();
+			}
+
+			protected override Cairo.Rectangle CalculateInitialBounds ()
+			{
+				DocumentLine line = Editor.Document.GetLineByOffset (Result.Offset);
+				int lineNr = Editor.Document.OffsetToLineNumber (Result.Offset);
+				ISyntaxMode mode = Editor.Document.SyntaxMode != null && Editor.Options.EnableSyntaxHighlighting ? Editor.Document.SyntaxMode : new SyntaxMode (Editor.Document);
+				int logicalRulerColumn = line.GetLogicalColumn (Editor.GetTextEditorData (), Editor.Options.RulerColumn);
+				var lineLayout = Editor.TextViewMargin.CreateLinePartLayout (mode, line, logicalRulerColumn, line.Offset, line.Length, -1, -1);
+				if (lineLayout == null)
+					return new Cairo.Rectangle ();
+				
+				int l, x1, x2;
+				int index = Result.Offset - line.Offset - 1;
+				if (index >= 0) {
+					lineLayout.Layout.IndexToLineX (index, true, out l, out x1);
+				} else {
+					l = x1 = 0;
+				}
+				
+				index = Result.Offset - line.Offset - 1 + Result.Length;
+				if (index >= 0) {
+					lineLayout.Layout.IndexToLineX (index, true, out l, out x2);
+				} else {
+					x2 = 0;
+					Console.WriteLine ("Invalid end index :" + index);
+				}
+				
+				double y = Editor.LineToY (lineNr);
+				double w = (x2 - x1) / Pango.Scale.PangoScale;
+				double x = (x1 / Pango.Scale.PangoScale + Editor.TextViewMargin.XOffset + Editor.TextViewMargin.TextStartPosition);
+				var h = Editor.LineHeight;
+
+				//adjust the width to match TextViewMargin
+				w = System.Math.Ceiling (w + 1);
+
+				//add space for the shadow
+				w += shadowOffset;
+				h += shadowOffset;
+
+				return new Cairo.Rectangle (x, y, w, h);
+			}
+
+			const int shadowOffset = 1;
+			Pango.Layout layout = null;
+
+			protected override void Draw (Cairo.Context cr, Cairo.Rectangle area)
+			{
+				if (!Editor.Options.UseAntiAliasing)
+					cr.Antialias = Cairo.Antialias.None;
+				cr.LineWidth = Editor.Options.Zoom;
+
+				if (layout == null) {
+					layout = cr.CreateLayout ();
+					layout.FontDescription = Editor.Options.Font;
+					string markup = Editor.GetTextEditorData ().GetMarkup (Result.Offset, Result.Length, true);
+					layout.SetMarkup (markup);
+				}
+
+				// subtract off the shadow again
+				var width = area.Width - shadowOffset;
+				var height = area.Height - shadowOffset;
+
+				//from TextViewMargin's actual highlighting
+				double corner = System.Math.Min (4, width) * Editor.Options.Zoom;
+
+				//fill in the highlight rect with solid white to prevent alpha blending artifacts on the corners
+				FoldingScreenbackgroundRenderer.DrawRoundRectangle (cr, true, true, 0, 0, corner, width, height);
+				cr.SetSourceRGB (1, 1, 1);
+				cr.Fill ();
+
+				//draw the shadow
+				FoldingScreenbackgroundRenderer.DrawRoundRectangle (cr, true, true,
+				                                                    shadowOffset, shadowOffset, corner, width, height);
+				var color = TextViewMargin.DimColor (Editor.ColorStyle.SearchResultMain.Color, 0.3);
+				color.A = 0.5 * opacity * opacity;
+				cr.SetSourceColor (color);
+				cr.Fill ();
+
+				//draw the highlight rectangle
+				FoldingScreenbackgroundRenderer.DrawRoundRectangle (cr, true, true, 0, 0, corner, width, height);
+				using (var gradient = new Cairo.LinearGradient (0, 0, 0, height)) {
+					color = ColorLerp (
+						TextViewMargin.DimColor (Editor.ColorStyle.SearchResultMain.Color, 1.1),
+						Editor.ColorStyle.SearchResultMain.Color,
+						1 - opacity);
+					gradient.AddColorStop (0, color);
+					color = ColorLerp (
+						TextViewMargin.DimColor (Editor.ColorStyle.SearchResultMain.Color, 0.9),
+						Editor.ColorStyle.SearchResultMain.Color,
+						1 - opacity);
+					gradient.AddColorStop (1, color);
+					cr.SetSource (gradient);
+					cr.Fill ();
+				}
+
+				//and finally the text
+				cr.Translate (area.X, area.Y);
+				cr.SetSourceRGB (0, 0, 0);
+				cr.ShowLayout (layout);
+			}
+
+			static Cairo.Color ColorLerp (Cairo.Color from, Cairo.Color to, double scale)
+			{
+				return new Cairo.Color (
+					Lerp (from.R, to.R, scale),
+					Lerp (from.G, to.G, scale),
+					Lerp (from.B, to.B, scale),
+					Lerp (from.A, to.A, scale)
+				);
+			}
+
+			static double Lerp (double from, double to, double scale)
+			{
+				return from + scale * (to - from);
+			}
+		}
+
+		public SearchResult FindPrevious (bool setSelection)
+		{
+			SearchResult result = textEditorData.FindPrevious (setSelection);
+			TryToResetHorizontalScrollPosition ();
+			AnimateSearchResult (result);
+			return result;
+		}
+
+		public bool Replace (string withPattern)
+		{
+			return textEditorData.SearchReplace (withPattern, true);
+		}
+
+		public int ReplaceAll (string withPattern)
+		{
+			return textEditorData.SearchReplaceAll (withPattern);
+		}
+
+		#endregion
+
+		#region Tooltips
+
+		[Obsolete ("This property has been moved to TextEditorData.  Will be removed in future versions.")]
+		public IEnumerable<TooltipProvider> TooltipProviders {
+			get { return textEditorData.TooltipProviders; }
+		}
+		// Tooltip fields
+		const int TooltipTimeout = 650;
+		TooltipItem tipItem;
+		int tipX, tipY;
+		uint tipHideTimeoutId = 0;
+		uint tipShowTimeoutId = 0;
+		static Gtk.Window tipWindow;
+		static TooltipProvider currentTooltipProvider;
+		// Data for the next tooltip to be shown
+		int nextTipOffset = 0;
+		int nextTipX = 0;
+		int nextTipY = 0;
+		Gdk.ModifierType nextTipModifierState = ModifierType.None;
+		DateTime nextTipScheduledTime;
+		// Time at which we want the tooltip to show
+		void ShowTooltip (Gdk.ModifierType modifierState)
+		{
+			if (mx < TextViewMargin.XOffset + TextViewMargin.TextStartPosition) {
+				HideTooltip ();
+				return;
+			}
+
+			var loc = PointToLocation (mx, my, true);
+			if (loc.IsEmpty) {
+				HideTooltip ();
+				return;
+			}
+
+			// Hide editor tooltips for text marker extended regions (message bubbles)
+			double y = LineToY (loc.Line);
+			if (y + LineHeight < my) {
+				HideTooltip ();
+				return;
+			}
+			
+			ShowTooltip (modifierState, 
+			             Document.LocationToOffset (loc),
+			             (int)mx,
+			             (int)my);
+		}
+
+		void ShowTooltip (Gdk.ModifierType modifierState, int offset, int xloc, int yloc)
+		{
+			CancelScheduledShow ();
+			if (textEditorData.SuppressTooltips)
+				return;
+			if (tipWindow != null && currentTooltipProvider != null && currentTooltipProvider.IsInteractive (editor, tipWindow)) {
+				int wx, ww, wh;
+				tipWindow.GetSize (out ww, out wh);
+				wx = tipX - ww / 2;
+				if (xloc >= wx && xloc < wx + ww && yloc >= tipY && yloc < tipY + 20 + wh)
+					return;
+			}
+			if (tipItem != null && !tipItem.ItemSegment.IsInvalid && !tipItem.ItemSegment.Contains (offset))
+				HideTooltip ();
+			nextTipX = xloc;
+			nextTipY = yloc;
+			nextTipOffset = offset;
+			nextTipModifierState = modifierState;
+			nextTipScheduledTime = DateTime.Now + TimeSpan.FromMilliseconds (TooltipTimeout);
+
+			// If a tooltip is already scheduled, there is no need to create a new timer.
+			if (tipShowTimeoutId == 0)
+				tipShowTimeoutId = GLib.Timeout.Add (TooltipTimeout, TooltipTimer);
+		}
+
+		bool TooltipTimer ()
+		{
+			// This timer can't be reused, so reset the var now
+			tipShowTimeoutId = 0;
+			
+			// Cancelled?
+			if (nextTipOffset == -1)
+				return false;
+			
+			int remainingMs = (int)(nextTipScheduledTime - DateTime.Now).TotalMilliseconds;
+			if (remainingMs > 50) {
+				// Still some significant time left. Re-schedule the timer
+				tipShowTimeoutId = GLib.Timeout.Add ((uint)remainingMs, TooltipTimer);
+				return false;
+			}
+			
+			// Find a provider
+			TooltipProvider provider = null;
+			TooltipItem item = null;
+			
+			foreach (TooltipProvider tp in textEditorData.tooltipProviders) {
+				try {
+					item = tp.GetItem (editor, nextTipOffset);
+				} catch (Exception e) {
+					System.Console.WriteLine ("Exception in tooltip provider " + tp + " GetItem:");
+					System.Console.WriteLine (e);
+				}
+				if (item != null) {
+					provider = tp;
+					break;
+				}
+			}
+			
+			if (item != null) {
+				// Tip already being shown for this item?
+				if (tipWindow != null && tipItem != null && tipItem.Equals (item)) {
+					CancelScheduledHide ();
+					return false;
+				}
+				
+				tipX = nextTipX;
+				tipY = nextTipY;
+				tipItem = item;
+				Gtk.Window tw = null;
+				try {
+					tw = provider.ShowTooltipWindow (editor, nextTipOffset, nextTipModifierState, tipX + (int)TextViewMargin.XOffset, tipY, item);
+				} catch (Exception e) {
+					Console.WriteLine ("-------- Exception while creating tooltip:");
+					Console.WriteLine (e);
+				}
+				if (tw == tipWindow)
+					return false;
+				HideTooltip ();
+				if (tw == null)
+					return false;
+				
+				CancelScheduledShow ();
+
+				tipWindow = tw;
+				currentTooltipProvider = provider;
+				
+				tipShowTimeoutId = 0;
+			} else
+				HideTooltip ();
+			return false;
+		}
+
+		public void HideTooltip (bool checkMouseOver = true)
+		{
+			CancelScheduledHide ();
+			CancelScheduledShow ();
+			
+			if (tipWindow != null) {
+				if (checkMouseOver && tipWindow.GdkWindow != null) {
+					// Don't hide the tooltip window if the mouse pointer is inside it.
+					int x, y, w, h;
+					Gdk.ModifierType m;
+					tipWindow.GdkWindow.GetPointer (out x, out y, out m);
+					tipWindow.GdkWindow.GetSize (out w, out h);
+					if (x >= 0 && y >= 0 && x < w && y < h)
+						return;
+				}
+				tipWindow.Destroy ();
+				tipWindow = null;
+			}
+		}
+
+		void DelayedHideTooltip ()
+		{
+			CancelScheduledHide ();
+			tipHideTimeoutId = GLib.Timeout.Add (300, delegate {
+				HideTooltip ();
+				tipHideTimeoutId = 0;
+				return false;
+			});
+		}
+
+		void CancelScheduledHide ()
+		{
+			CancelScheduledShow ();
+			if (tipHideTimeoutId != 0) {
+				GLib.Source.Remove (tipHideTimeoutId);
+				tipHideTimeoutId = 0;
+			}
+		}
+
+		void CancelScheduledShow ()
+		{
+			// Don't remove the timeout handler since it may be reused
+			nextTipOffset = -1;
+		}
+
+		void OnDocumentStateChanged (object s, EventArgs a)
+		{
+			HideTooltip ();
+		}
+
+		void OnTextSet (object sender, EventArgs e)
+		{
+			DocumentLine longest = longestLine;
+			foreach (DocumentLine line in Document.Lines) {
+				if (longest == null || line.Length > longest.Length)
+					longest = line;
+			}
+			if (longest != longestLine) {
+				var layoutWrapper = textViewMargin.GetLayout (longest);
+				int width = (int)(layoutWrapper.Width);
+				if (layoutWrapper.IsUncached)
+					layoutWrapper.Dispose ();
+				if (width > this.longestLineWidth) {
+					this.longestLineWidth = width;
+					this.longestLine = longest;
+				}
+			}
+		}
+
+		#endregion
+
+		#region Coordinate transformation
+
+		public DocumentLocation PointToLocation (double xp, double yp, bool endAtEol = false)
+		{
+			return TextViewMargin.PointToLocation (xp, yp, endAtEol);
+		}
+
+		public DocumentLocation PointToLocation (Cairo.Point p)
+		{
+			return TextViewMargin.PointToLocation (p);
+		}
+
+		public DocumentLocation PointToLocation (Cairo.PointD p)
+		{
+			return TextViewMargin.PointToLocation (p);
+		}
+
+		public Cairo.Point LocationToPoint (DocumentLocation loc)
+		{
+			return TextViewMargin.LocationToPoint (loc);
+		}
+
+		public Cairo.Point LocationToPoint (int line, int column)
+		{
+			return TextViewMargin.LocationToPoint (line, column);
+		}
+
+		public Cairo.Point LocationToPoint (int line, int column, bool useAbsoluteCoordinates)
+		{
+			return TextViewMargin.LocationToPoint (line, column, useAbsoluteCoordinates);
+		}
+
+		public Cairo.Point LocationToPoint (DocumentLocation loc, bool useAbsoluteCoordinates)
+		{
+			return TextViewMargin.LocationToPoint (loc, useAbsoluteCoordinates);
+		}
+
+		public double ColumnToX (DocumentLine line, int column)
+		{
+			return TextViewMargin.ColumnToX (line, column);
+		}
+
+		/// <summary>
+		/// Calculates the line number at line start (in one visual line could be several logical lines be displayed).
+		/// </summary>
+		public int YToLine (double yPos)
+		{
+			return TextViewMargin.YToLine (yPos);
+		}
+
+		public double LineToY (int logicalLine)
+		{
+			return TextViewMargin.LineToY (logicalLine);
+		}
+
+		public double GetLineHeight (DocumentLine line)
+		{
+			return TextViewMargin.GetLineHeight (line);
+		}
+
+		public double GetLineHeight (int logicalLineNumber)
+		{
+			return TextViewMargin.GetLineHeight (logicalLineNumber);
+		}
+
+		#endregion
+
+		#region Animation
+
+		Stage<Animation> animationStage = new Stage<Animation> ();
+		List<Animation> actors = new List<Animation> ();
+
+		protected void InitAnimations ()
+		{
+			animationStage.ActorStep += OnAnimationActorStep;
+			animationStage.Iteration += OnAnimationIteration;
+		}
+
+		void DisposeAnimations ()
+		{
+			if (animationStage != null) {
+				animationStage.Playing = false;
+				animationStage.ActorStep -= OnAnimationActorStep;
+				animationStage.Iteration -= OnAnimationIteration;
+				animationStage = null;
+			}
+			
+			if (actors != null) {
+				foreach (Animation actor in actors) {
+					if (actor is IDisposable)
+						((IDisposable)actor).Dispose ();
+				}
+				actors.Clear ();
+				actors = null;
+			}
+		}
+
+		Animation StartAnimation (IAnimationDrawer drawer)
+		{
+			return StartAnimation (drawer, 300);
+		}
+
+		Animation StartAnimation (IAnimationDrawer drawer, uint duration)
+		{
+			return StartAnimation (drawer, duration, Easing.Linear);
+		}
+
+		Animation StartAnimation (IAnimationDrawer drawer, uint duration, Easing easing)
+		{
+			if (!Options.EnableAnimations)
+				return null;
+			Animation animation = new Animation (drawer, duration, easing, Blocking.Upstage);
+			animationStage.Add (animation, duration);
+			actors.Add (animation);
+			return animation;
+		}
+
+		bool OnAnimationActorStep (Actor<Animation> actor)
+		{
+			switch (actor.Target.AnimationState) {
+			case AnimationState.Coming:
+				actor.Target.Drawer.Percent = actor.Percent;
+				if (actor.Expired) {
+					actor.Target.AnimationState = AnimationState.Going;
+					actor.Reset ();
+					return true;
+				}
+				break;
+			case AnimationState.Going:
+				if (actor.Expired) {
+					RemoveAnimation (actor.Target);
+					return false;
+				}
+				actor.Target.Drawer.Percent = 1.0 - actor.Percent;
+				break;
+			}
+			return true;
+		}
+
+		void RemoveAnimation (Animation animation)
+		{
+			if (animation == null)
+				return;
+			Rectangle bounds = animation.Drawer.AnimationBounds;
+			actors.Remove (animation);
+			if (animation is IDisposable)
+				((IDisposable)animation).Dispose ();
+			QueueDrawArea (bounds.X, bounds.Y, bounds.Width, bounds.Height);
+		}
+
+		void OnAnimationIteration (object sender, EventArgs args)
+		{
+			foreach (Animation actor in actors) {
+				Rectangle bounds = actor.Drawer.AnimationBounds;
+				QueueDrawArea (bounds.X, bounds.Y, bounds.Width, bounds.Height);
+			}
+		}
+
+		#endregion
+
+		internal void FireLinkEvent (string link, uint button, ModifierType modifierState)
+		{
+			if (LinkRequest != null)
+				LinkRequest (this, new LinkEventArgs (link, button, modifierState));
+		}
+
+		public event EventHandler<LinkEventArgs> LinkRequest;
+
+		/// <summary>
+		/// Inserts a margin at the specified list position
+		/// </summary>
+		public void InsertMargin (int index, Margin margin)
+		{
+			margins.Insert (index, margin);
+			RedrawFromLine (0);
+		}
+
+		/// <summary>
+		/// Checks whether the editor has a margin of a given type
+		/// </summary>
+		public bool HasMargin (Type marginType)
+		{
+			return margins.Exists ((margin) => {
+				return marginType.IsAssignableFrom (margin.GetType ());
+			});
+		}
+
+		/// <summary>
+		/// Gets the first margin of a given type
+		/// </summary>
+		public Margin GetMargin (Type marginType)
+		{
+			return margins.Find ((margin) => {
+				return marginType.IsAssignableFrom (margin.GetType ());
+			});
+		}
+
+		bool requestResetCaretBlink = false;
+
+		public void RequestResetCaretBlink ()
+		{
+			if (this.IsFocus)
+				requestResetCaretBlink = true;
+		}
+
+		void UpdateLinesOnTextMarkerHeightChange (object sender, LineEventArgs e)
+		{
+			if (Document.CurrentAtomicUndoOperationType == OperationType.Format)
+				return;
+			if (!e.Line.Markers.Any (m => m is IExtendingTextLineMarker))
+				return;
+			var line = e.Line.LineNumber;
+			textEditorData.HeightTree.SetLineHeight (line, GetLineHeight (e.Line));
+			RedrawLine (line);
+		}
+
+		class SetCaret
+		{
+			TextEditor view;
+			int line, column;
+			bool highlightCaretLine;
+			bool centerCaret;
+
+			public SetCaret (TextEditor view, int line, int column, bool highlightCaretLine, bool centerCaret)
+			{
+				this.view = view;
+				this.line = line;
+				this.column = column;
+				this.highlightCaretLine = highlightCaretLine;
+				this.centerCaret = centerCaret;
+			}
+
+			public void Run (object sender, EventArgs e)
+			{
+				if (view.IsDisposed)
+					return;
+				line = System.Math.Min (line, view.Document.LineCount);
+				view.Caret.AutoScrollToCaret = false;
+				try {
+					view.Caret.Location = new DocumentLocation (line, column);
+					view.GrabFocus ();
+					if (centerCaret)
+						view.CenterToCaret ();
+					if (view.TextViewMargin.XOffset == 0)
+						view.HAdjustment.Value = 0;
+					view.TextArea.SizeAllocated -= Run;
+				} finally {
+					view.Caret.AutoScrollToCaret = true;
+					if (highlightCaretLine) {
+						view.TextViewMargin.HighlightCaretLine = true;
+						view.StartCaretPulseAnimation ();
+					}
+				}
+			}
+		}
+
+		public void SetCaretTo (int line, int column)
+		{
+			SetCaretTo (line, column, true);
+		}
+
+		public void SetCaretTo (int line, int column, bool highlight)
+		{
+			SetCaretTo (line, column, highlight, true);
+		}
+
+		public void SetCaretTo (int line, int column, bool highlight, bool centerCaret)
+		{
+			if (line < DocumentLocation.MinLine)
+				throw new ArgumentException ("line < MinLine");
+			if (column < DocumentLocation.MinColumn)
+				throw new ArgumentException ("column < MinColumn");
+			
+			if (!sizeHasBeenAllocated) {
+				SetCaret setCaret = new SetCaret (editor, line, column, highlight, centerCaret);
+				SizeAllocated += setCaret.Run;
+			} else {
+				new SetCaret (editor, line, column, highlight, centerCaret).Run (null, null);
+			}
+		}
+
+		#region Container
+
+		public override ContainerChild this [Widget w] {
+			get {
+				return containerChildren.FirstOrDefault (info => info.Child == w || (info.Child is AnimatedWidget && ((AnimatedWidget)info.Child).Widget == w));
+			}
+		}
+
+		public override GLib.GType ChildType ()
+		{
+			return Gtk.Widget.GType;
+		}
+
+		internal List<TextEditor.EditorContainerChild> containerChildren = new List<TextEditor.EditorContainerChild> ();
+
+		public void AddTopLevelWidget (Gtk.Widget widget, int x, int y)
+		{
+			widget.Parent = this;
+			TextEditor.EditorContainerChild info = new TextEditor.EditorContainerChild (this, widget);
+			info.X = x;
+			info.Y = y;
+			containerChildren.Add (info);
+			ResizeChild (Allocation, info);
+			SetAdjustments ();
+		}
+
+		public void MoveTopLevelWidget (Gtk.Widget widget, int x, int y)
+		{
+			foreach (var info in containerChildren.ToArray ()) {
+				if (info.Child == widget || (info.Child is AnimatedWidget && ((AnimatedWidget)info.Child).Widget == widget)) {
+					if (info.X == x && info.Y == y)
+						break;
+					info.X = x;
+					info.Y = y;
+					if (widget.Visible)
+						ResizeChild (Allocation, info);
+					break;
+				}
+			}
+			SetAdjustments ();
+		}
+
+		/// <summary>
+		/// Returns the position of an embedded widget
+		/// </summary>
+		public void GetTopLevelWidgetPosition (Gtk.Widget widget, out int x, out int y)
+		{
+			foreach (var info in containerChildren.ToArray ()) {
+				if (info.Child == widget || (info.Child is AnimatedWidget && ((AnimatedWidget)info.Child).Widget == widget)) {
+					x = info.X;
+					y = info.Y;
+					return;
+				}
+			}
+			x = y = 0;
+		}
+
+		public void MoveToTop (Gtk.Widget widget)
+		{
+			var editorContainerChild = containerChildren.FirstOrDefault (c => c.Child == widget);
+			if (editorContainerChild == null)
+				throw new Exception ("child " + widget + " not found.");
+			var newChilds = containerChildren.Where (child => child != editorContainerChild).ToList ();
+			newChilds.Add (editorContainerChild);
+			this.containerChildren = newChilds;
+			widget.GdkWindow.Raise ();
+		}
+
+		protected override void OnAdded (Widget widget)
+		{
+			AddTopLevelWidget (widget, 0, 0);
+		}
+
+		protected override void OnRemoved (Widget widget)
+		{
+			foreach (var info in containerChildren.ToArray ()) {
+				if (info.Child == widget) {
+					widget.Unparent ();
+					containerChildren.Remove (info);
+					SetAdjustments ();
+					break;
+				}
+			}
+		}
+
+		protected override void ForAll (bool include_internals, Gtk.Callback callback)
+		{
+			containerChildren.ForEach (child => callback (child.Child));
+		}
+
+		protected override void OnMapped ()
+		{
+			WidgetFlags |= WidgetFlags.Mapped;
+			// Note: SourceEditorWidget.ShowAutoSaveWarning() might have set TextEditor.Visible to false,
+			// in which case we want to not map it (would cause a gtk+ critical error).
+			containerChildren.ForEach (child => {
+				if (child.Child.Visible)
+					child.Child.Map ();
+			});
+			GdkWindow.Show ();
+		}
+
+		protected override void OnUnmapped ()
+		{
+			WidgetFlags &= ~WidgetFlags.Mapped;
+			
+			// We hide the window first so that the user doesn't see widgets disappearing one by one.
+			GdkWindow.Hide ();
+			
+			containerChildren.ForEach (child => child.Child.Unmap ());
+		}
+
+		void ResizeChild (Rectangle allocation, TextEditor.EditorContainerChild child)
+		{
+			Requisition req = child.Child.SizeRequest ();
+			var childRectangle = new Gdk.Rectangle (child.X, child.Y, req.Width, req.Height);
+			if (!child.FixedPosition) {
+//				double zoom = Options.Zoom;
+				childRectangle.X = (int)(child.X /* * zoom */ - HAdjustment.Value);
+				childRectangle.Y = (int)(child.Y /* * zoom */ - VAdjustment.Value);
+			}
+			//			childRectangle.X += allocation.X;
+			//			childRectangle.Y += allocation.Y;
+			child.Child.SizeAllocate (childRectangle);
+		}
+
+		void SetChildrenPositions (Rectangle allocation)
+		{
+			foreach (var child in containerChildren.ToArray ()) {
+				ResizeChild (allocation, child);
+			}
+		}
+
+		#endregion
+
+	}
+
+	public interface ITextEditorDataProvider
+	{
+		TextEditorData GetTextEditorData ();
+	}
+
+	[Serializable]
+	public sealed class PaintEventArgs : EventArgs
+	{
+		public Cairo.Context Context {
+			get;
+			set;
+		}
+
+		public Cairo.Rectangle Area {
+			get;
+			set;
+		}
+
+		public PaintEventArgs (Cairo.Context context, Cairo.Rectangle area)
+		{
+			this.Context = context;
+			this.Area = area;
+		}
+	}
+}
+
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TextPasteIndentEngineTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TextPasteIndentEngineTests.cs
new file mode 100644
index 0000000000..6da6bea9a1
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/IndentationTests/TextPasteIndentEngineTests.cs
@@ -0,0 +1,297 @@
+//
+// TextPasteIndentEngineTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory.Editor;
+using System.Text;
+
+namespace ICSharpCode.NRefactory.IndentationTests
+{
+	[TestFixture]
+	public class TextPasteIndentEngineTests
+	{
+		public static CacheIndentEngine CreateEngine(string text, CSharpFormattingOptions formatOptions = null, TextEditorOptions options = null)
+		{
+			if (formatOptions == null) {
+				formatOptions = FormattingOptionsFactory.CreateMono();
+				formatOptions.AlignToFirstIndexerArgument = formatOptions.AlignToFirstMethodCallArgument = true;
+			}
+			
+			var sb = new StringBuilder();
+			int offset = 0;
+			for (int i = 0; i < text.Length; i++) {
+				var ch = text [i];
+				if (ch == '$') {
+					offset = i;
+					continue;
+				}
+				sb.Append(ch);
+			}
+			
+			var document = new ReadOnlyDocument(sb.ToString());
+			options = options ?? new TextEditorOptions { EolMarker = "\n" };
+			
+			var result = new CacheIndentEngine(new CSharpIndentEngine(document, options, formatOptions));
+			result.Update(offset);
+			return result;
+		}
+
+		static TextEditorOptions CreateInvariantOptions()
+		{
+			var options = new TextEditorOptions();
+			options.EolMarker = "\n";
+			return options;
+		}
+
+		[Test]
+		public void TestSimplePaste()
+		{
+			var indent = CreateEngine(@"
+class Foo
+{
+	void Bar ()
+	{
+		System.Console.WriteLine ($);
+	}
+}");
+			ITextPasteHandler handler = new TextPasteIndentEngine(indent, CreateInvariantOptions (), FormattingOptionsFactory.CreateMono());
+			var text = handler.FormatPlainText(indent.Offset, "Foo", null);
+			Assert.AreEqual("Foo", text);
+		}
+
+		[Test]
+		public void TestMultiLinePaste()
+		{
+			var indent = CreateEngine(@"
+namespace FooBar
+{
+	class Foo
+	{
+		void Bar ()
+		{
+			System.Console.WriteLine ();
+		}
+		$
+	}
+}
+");
+			ITextPasteHandler handler = new TextPasteIndentEngine(indent, new TextEditorOptions { EolMarker = "\n" }, FormattingOptionsFactory.CreateMono());
+			
+			var text = handler.FormatPlainText(indent.Offset, "void Bar ()\n{\nSystem.Console.WriteLine ();\n}", null);
+			Assert.AreEqual("void Bar ()\n\t\t{\n\t\t\tSystem.Console.WriteLine ();\n\t\t}", text);
+		}
+
+		[Test]
+		public void TestMultiplePastes()
+		{
+			var indent = CreateEngine(@"
+class Foo
+{
+	void Bar ()
+	{
+		System.Console.WriteLine ();
+	}
+	$
+}
+
+
+");
+			ITextPasteHandler handler = new TextPasteIndentEngine(indent, new TextEditorOptions { EolMarker = "\n" }, FormattingOptionsFactory.CreateMono());
+			
+			for (int i = 0; i < 2; i++) {
+				var text = handler.FormatPlainText(indent.Offset, "void Bar ()\n{\nSystem.Console.WriteLine ();\n}", null);
+				Assert.AreEqual("void Bar ()\n\t{\n\t\tSystem.Console.WriteLine ();\n\t}", text);
+			}
+		}
+		
+
+		[Test]
+		public void TestPasteNewLine()
+		{
+			var indent = CreateEngine(@"
+class Foo
+{
+	$void Bar ()
+	{
+	}
+}");
+			ITextPasteHandler handler = new TextPasteIndentEngine(indent, new TextEditorOptions { EolMarker = "\n" }, FormattingOptionsFactory.CreateMono());
+			var text = handler.FormatPlainText(indent.Offset, "int i;\n", null);
+			Assert.AreEqual("int i;\n\t", text);
+		}
+
+		[Test]
+		public void TestPasteNewLineCase2()
+		{
+			var indent = CreateEngine(@"
+class Foo
+{
+$	void Bar ()
+	{
+	}
+}");
+			ITextPasteHandler handler = new TextPasteIndentEngine(indent, new TextEditorOptions { EolMarker = "\n" }, FormattingOptionsFactory.CreateMono());
+			var text = handler.FormatPlainText(indent.Offset, "int i;\n", null);
+			Assert.AreEqual("\tint i;\n", text);
+		}
+
+		[Test]
+		public void PasteVerbatimString()
+		{
+			var indent = CreateEngine(@"
+class Foo
+{
+void Bar ()
+{
+	
+}
+}");
+			ITextPasteHandler handler = new TextPasteIndentEngine(indent, new TextEditorOptions { EolMarker = "\n" }, FormattingOptionsFactory.CreateMono());
+			var str = "string str = @\"\n1\n\t2 \n\t\t3\n\";";
+			var text = handler.FormatPlainText(indent.Offset, str, null);
+			Assert.AreEqual(str, text);
+		}
+
+		[Test]
+		public void TestWindowsLineEnding()
+		{
+			var indent = CreateEngine("\r\nclass Foo\r\n{\r\n\tvoid Bar ()\r\n\t{\r\n\t\t$\r\n\t}\r\n}");
+			ITextPasteHandler handler = new TextPasteIndentEngine(indent, CreateInvariantOptions (), FormattingOptionsFactory.CreateMono());
+			var text = handler.FormatPlainText(indent.Offset, "Foo();\r\nBar();\r\nTest();", null);
+			Assert.AreEqual("Foo();\n\t\tBar();\n\t\tTest();", text);
+		}
+
+		[Test]
+		public void TestPasteBlankLines()
+		{
+			var indent = CreateEngine("class Foo\n{\n\tvoid Bar ()\n\t{\n\t\tSystem.Console.WriteLine ($);\n\t}\n}");
+			ITextPasteHandler handler = new TextPasteIndentEngine(indent, CreateInvariantOptions (), FormattingOptionsFactory.CreateMono());
+			var text = handler.FormatPlainText(indent.Offset, "\n\n\n", null);
+			Assert.AreEqual("\n\n\n\t\t\t", text);
+		}
+
+		[Test]
+		public void TestPasteBlankLinesAndIndent()
+		{
+			var indent = CreateEngine("class Foo\n{\n\tvoid Bar ()\n\t{\n\t\tSystem.Console.WriteLine ($);\n\t}\n}");
+			var options = FormattingOptionsFactory.CreateMono();
+			options.EmptyLineFormatting = EmptyLineFormatting.Indent;
+			ITextPasteHandler handler = new TextPasteIndentEngine(indent, CreateInvariantOptions (), options);
+			var text = handler.FormatPlainText(indent.Offset, "\n\n\n", null);
+			Assert.AreEqual("\n\t\t\t\n\t\t\t\n\t\t\t", text);
+		}
+
+		[Test]
+		public void TestWindowsLineEndingCase2()
+		{
+			var textEditorOptions = CreateInvariantOptions ();
+			textEditorOptions.EolMarker = "\r\n";
+			var indent = CreateEngine("\r\nclass Foo\r\n{\r\n\tvoid Bar ()\r\n\t{\r\n\t\t$\r\n\t}\r\n}", FormattingOptionsFactory.CreateMono(), textEditorOptions);
+			ITextPasteHandler handler = new TextPasteIndentEngine(indent, textEditorOptions, FormattingOptionsFactory.CreateMono());
+			var text = handler.FormatPlainText(indent.Offset, "if (true)\r\nBar();\r\nTest();", null);
+			Assert.AreEqual("if (true)\r\n\t\t\tBar();\r\n\t\tTest();", text);
+		}
+
+		[Test]
+		public void PasteVerbatimStringBug1()
+		{
+			var textEditorOptions = CreateInvariantOptions ();
+			textEditorOptions.EolMarker = "\r\n";
+			var indent = CreateEngine("\r\nclass Foo\r\n{\r\n\tvoid Bar ()\r\n\t{\r\n\t\t$\r\n\t}\r\n}", FormattingOptionsFactory.CreateMono(), textEditorOptions);
+			ITextPasteHandler handler = new TextPasteIndentEngine(indent, textEditorOptions, FormattingOptionsFactory.CreateMono());
+			var text = handler.FormatPlainText(indent.Offset, "Console.WriteLine (@\"Hello World!\");\n", null);
+			Assert.AreEqual("Console.WriteLine (@\"Hello World!\");\r\n\t\t", text);
+		}
+
+		[Test]
+		public void PasteVerbatimStringBug2()
+		{
+			var indent = CreateEngine("\nclass Foo\n{\n\tvoid Bar ()\n\t{\n\t\t$\n\t}\n}");
+			ITextPasteHandler handler = new TextPasteIndentEngine(indent, CreateInvariantOptions (), FormattingOptionsFactory.CreateMono());
+			var text = handler.FormatPlainText(indent.Offset, "if (true)\nConsole.WriteLine (@\"Hello\n World!\");\n", null);
+			Assert.AreEqual("if (true)\n\t\t\tConsole.WriteLine (@\"Hello\n World!\");\n\t\t", text);
+		}
+
+		[Test]
+		public void PasteVerbatimStringBug3()
+		{
+			var indent = CreateEngine("\nclass Foo\n{\n\tvoid Bar ()\n\t{\n$\n\t}\n}");
+			ITextPasteHandler handler = new TextPasteIndentEngine(indent, CreateInvariantOptions (), FormattingOptionsFactory.CreateMono());
+
+			var text = handler.FormatPlainText(indent.Offset, "\t\tSystem.Console.WriteLine(@\"<evlevlle>\");\n", null);
+			Assert.AreEqual("\t\tSystem.Console.WriteLine(@\"<evlevlle>\");\n\t\t", text);
+		}
+
+
+		[Test]
+		public void TestPasteComments()
+		{
+			var indent = CreateEngine(@"
+class Foo
+{
+	$
+}");
+			ITextPasteHandler handler = new TextPasteIndentEngine(indent, CreateInvariantOptions (), FormattingOptionsFactory.CreateMono());
+			var text = handler.FormatPlainText(indent.Offset, "// Foo\n\t// Foo 2\n\t// Foo 3", null);
+			Assert.AreEqual("// Foo\n\t// Foo 2\n\t// Foo 3", text);
+		}
+
+		[Test]
+		public void PastemultilineAtFirstColumnCorrection()
+		{
+			var indent = CreateEngine("class Foo\n{\n$\n}");
+			ITextPasteHandler handler = new TextPasteIndentEngine(indent, CreateInvariantOptions (), FormattingOptionsFactory.CreateMono());
+			var text = handler.FormatPlainText(indent.Offset, "void Bar ()\n{\n\tSystem.Console.WriteLine ();\n}", null);
+			Assert.AreEqual("\tvoid Bar ()\n\t{\n\t\tSystem.Console.WriteLine ();\n\t}", text);
+		}
+
+		[Test]
+		public void TestPasteToWindowsEol()
+		{
+			var indent = CreateEngine("$");
+			ITextPasteHandler handler = new TextPasteIndentEngine(indent, new TextEditorOptions { EolMarker = "\r\n" }, FormattingOptionsFactory.CreateMono());
+			var text = handler.FormatPlainText(indent.Offset, "namespace Foo\n{\n\tpublic static class FooExtensions\n\t{\n\t\tpublic static int ObjectExtension (this object value)\n\t\t{\n\t\t\treturn 0;\n\t\t}\n\n\t\tpublic static int IntExtension (this int value)\n\t\t{\n\t\t\treturn 0;\n\t\t}\n\t}\n\n\tpublic class Client\n\t{\n\t\tpublic void Method ()\n\t\t{\n\t\t\t0.ToString ();\n\t\t}\n\t}\n}", null);
+			Assert.AreEqual("namespace Foo\r\n{\r\n\tpublic static class FooExtensions\r\n\t{\r\n\t\tpublic static int ObjectExtension (this object value)\r\n\t\t{\r\n\t\t\treturn 0;\r\n\t\t}\r\n\r\n\t\tpublic static int IntExtension (this int value)\r\n\t\t{\r\n\t\t\treturn 0;\r\n\t\t}\r\n\t}\r\n\r\n\tpublic class Client\r\n\t{\r\n\t\tpublic void Method ()\r\n\t\t{\r\n\t\t\t0.ToString ();\r\n\t\t}\r\n\t}\r\n}", text);
+		}
+
+		[Test]
+		public void PastePreProcessorDirectivesNoIndent()
+		{
+			var opt = FormattingOptionsFactory.CreateMono();
+			opt.IndentPreprocessorDirectives = false;
+
+			var indent = CreateEngine(@"
+class Foo
+{
+$
+}", opt);
+			ITextPasteHandler handler = new TextPasteIndentEngine(indent, CreateInvariantOptions (), opt);
+			var text = handler.FormatPlainText(indent.Offset, "#if DEBUG\n\tvoid Foo()\n\t{\n\t}\n#endif", null);
+			Assert.AreEqual("#if DEBUG\n\tvoid Foo()\n\t{\n\t}\n#endif", text);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/BinaryLoaderTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/BinaryLoaderTests.cs
new file mode 100644
index 0000000000..a50b51139a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/BinaryLoaderTests.cs
@@ -0,0 +1,306 @@
+// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.TypeSystem
+{
+	[TestFixture]
+	public abstract class BinaryLoaderTests : TypeSystemTests
+	{
+		public abstract IUnresolvedAssembly MscorlibInstance { get; }
+		public abstract IUnresolvedAssembly SystemCoreInstance { get; }
+
+		[Test]
+		public void InheritanceTest()
+		{
+			ITypeDefinition c = compilation.FindType(typeof(SystemException)).GetDefinition();
+			ITypeDefinition c2 = compilation.FindType(typeof(Exception)).GetDefinition();
+			Assert.IsNotNull(c, "c is null");
+			Assert.IsNotNull(c2, "c2 is null");
+			//Assert.AreEqual(3, c.BaseTypes.Count); // Inherited interfaces are not reported by Cecil
+			// which matches the behaviour of our C#/VB parsers
+			Assert.AreEqual("System.Exception", c.DirectBaseTypes.First().FullName);
+			Assert.AreSame(c2, c.DirectBaseTypes.First());
+			
+			string[] superTypes = c.GetAllBaseTypes().Select(t => t.ReflectionName).ToArray();
+			Assert.AreEqual(new string[] {
+			                	"System.Object",
+			                	"System.Runtime.Serialization.ISerializable", "System.Runtime.InteropServices._Exception",
+			                	"System.Exception", "System.SystemException"
+			                }, superTypes);
+		}
+		
+		[Test]
+		public void GenericPropertyTest()
+		{
+			ITypeDefinition c = compilation.FindType(typeof(Comparer<>)).GetDefinition();
+			IProperty def = c.Properties.Single(p => p.Name == "Default");
+			ParameterizedType pt = (ParameterizedType)def.ReturnType;
+			Assert.AreEqual("System.Collections.Generic.Comparer", pt.FullName);
+			Assert.AreEqual(c.TypeParameters[0], pt.TypeArguments[0]);
+		}
+		
+		[Test]
+		public void PointerTypeTest()
+		{
+			ITypeDefinition c = compilation.FindType(typeof(IntPtr)).GetDefinition();
+			IMethod toPointer = c.Methods.Single(p => p.Name == "ToPointer");
+			Assert.AreEqual("System.Void*", toPointer.ReturnType.ReflectionName);
+			Assert.IsTrue (toPointer.ReturnType is PointerType);
+			Assert.AreEqual("System.Void", ((PointerType)toPointer.ReturnType).ElementType.FullName);
+		}
+		
+		[Test]
+		public void DateTimeDefaultConstructor()
+		{
+			ITypeDefinition c = compilation.FindType(typeof(DateTime)).GetDefinition();
+			Assert.AreEqual(1, c.Methods.Count(m => m.IsConstructor && m.Parameters.Count == 0));
+			Assert.AreEqual(1, c.GetConstructors().Count(m => m.Parameters.Count == 0));
+		}
+		
+		[Test]
+		public void NoEncodingInfoDefaultConstructor()
+		{
+			ITypeDefinition c = compilation.FindType(typeof(EncodingInfo)).GetDefinition();
+			// EncodingInfo only has an internal constructor
+			Assert.IsFalse(c.Methods.Any(m => m.IsConstructor));
+			// and no implicit ctor should be added:
+			Assert.AreEqual(0, c.GetConstructors().Count());
+		}
+		
+		[Test]
+		public void StaticModifierTest()
+		{
+			ITypeDefinition c = compilation.FindType(typeof(Environment)).GetDefinition();
+			Assert.IsNotNull(c, "System.Environment not found");
+			Assert.IsTrue(c.IsAbstract, "class should be abstract");
+			Assert.IsTrue(c.IsSealed, "class should be sealed");
+			Assert.IsTrue(c.IsStatic, "class should be static");
+		}
+		
+		[Test]
+		public void InnerClassReferenceTest()
+		{
+			ITypeDefinition c = compilation.FindType(typeof(Environment)).GetDefinition();
+			Assert.IsNotNull(c, "System.Environment not found");
+			IType rt = c.Methods.First(m => m.Name == "GetFolderPath").Parameters[0].Type;
+			Assert.AreSame(c.NestedTypes.Single(ic => ic.Name == "SpecialFolder"), rt);
+		}
+		
+		[Test]
+		public void NestedTypesTest()
+		{
+			ITypeDefinition c = compilation.FindType(typeof(Environment.SpecialFolder)).GetDefinition();
+			Assert.IsNotNull(c, "c is null");
+			Assert.AreEqual("System.Environment.SpecialFolder", c.FullName);
+			Assert.AreEqual("System.Environment+SpecialFolder", c.ReflectionName);
+		}
+		
+		[Test]
+		public void VoidHasNoMembers()
+		{
+			ITypeDefinition c = compilation.FindType(typeof(void)).GetDefinition();
+			Assert.IsNotNull(c, "System.Void not found");
+			Assert.AreEqual(0, c.GetMethods().Count());
+			Assert.AreEqual(0, c.GetProperties().Count());
+			Assert.AreEqual(0, c.GetEvents().Count());
+			Assert.AreEqual(0, c.GetFields().Count());
+		}
+		
+		[Test]
+		public void Void_SerializableAttribute()
+		{
+			ITypeDefinition c = compilation.FindType(typeof(void)).GetDefinition();
+			var attr = c.Attributes.Single(a => a.AttributeType.FullName == "System.SerializableAttribute");
+			Assert.AreEqual(0, attr.Constructor.Parameters.Count);
+			Assert.AreEqual(0, attr.PositionalArguments.Count);
+			Assert.AreEqual(0, attr.NamedArguments.Count);
+		}
+		
+		[Test]
+		public void Void_StructLayoutAttribute()
+		{
+			ITypeDefinition c = compilation.FindType(typeof(void)).GetDefinition();
+			var attr = c.Attributes.Single(a => a.AttributeType.FullName == "System.Runtime.InteropServices.StructLayoutAttribute");
+			Assert.AreEqual(1, attr.Constructor.Parameters.Count);
+			Assert.AreEqual(1, attr.PositionalArguments.Count);
+			Assert.AreEqual(0, attr.PositionalArguments[0].ConstantValue);
+			Assert.AreEqual(1, attr.NamedArguments.Count);
+			Assert.AreEqual("System.Runtime.InteropServices.StructLayoutAttribute.Size", attr.NamedArguments[0].Key.FullName);
+			Assert.AreEqual(1, attr.NamedArguments[0].Value.ConstantValue);
+		}
+		
+		[Test]
+		public void Void_ComVisibleAttribute()
+		{
+			ITypeDefinition c = compilation.FindType(typeof(void)).GetDefinition();
+			var attr = c.Attributes.Single(a => a.AttributeType.FullName == "System.Runtime.InteropServices.ComVisibleAttribute");
+			Assert.AreEqual(1, attr.Constructor.Parameters.Count);
+			Assert.AreEqual(1, attr.PositionalArguments.Count);
+			Assert.AreEqual(true, attr.PositionalArguments[0].ConstantValue);
+			Assert.AreEqual(0, attr.NamedArguments.Count);
+		}
+		
+		[Test]
+		public void NestedClassInGenericClassTest()
+		{
+			ITypeDefinition dictionary = compilation.FindType(typeof(Dictionary<,>)).GetDefinition();
+			Assert.IsNotNull(dictionary);
+			ITypeDefinition valueCollection = compilation.FindType(typeof(Dictionary<,>.ValueCollection)).GetDefinition();
+			Assert.IsNotNull(valueCollection);
+			var dictionaryRT = new ParameterizedType(dictionary, new[] { compilation.FindType(typeof(string)).GetDefinition(), compilation.FindType(typeof(int)).GetDefinition() });
+			IProperty valueProperty = dictionaryRT.GetProperties(p => p.Name == "Values").Single();
+			IType parameterizedValueCollection = valueProperty.ReturnType;
+			Assert.AreEqual("System.Collections.Generic.Dictionary`2+ValueCollection[[System.String],[System.Int32]]", parameterizedValueCollection.ReflectionName);
+			Assert.AreSame(valueCollection, parameterizedValueCollection.GetDefinition());
+		}
+		
+		[Test]
+		public void ValueCollectionCountModifiers()
+		{
+			ITypeDefinition valueCollection = compilation.FindType(typeof(Dictionary<,>.ValueCollection)).GetDefinition();
+			Assert.AreEqual(Accessibility.Public, valueCollection.Accessibility);
+			Assert.IsTrue(valueCollection.IsSealed);
+			Assert.IsFalse(valueCollection.IsAbstract);
+			Assert.IsFalse(valueCollection.IsStatic);
+			
+			IProperty count = valueCollection.Properties.Single(p => p.Name == "Count");
+			Assert.AreEqual(Accessibility.Public, count.Accessibility);
+			// It's sealed on the IL level; but in C# it's just a normal non-virtual method that happens to implement an interface
+			Assert.IsFalse(count.IsSealed);
+			Assert.IsFalse(count.IsVirtual);
+			Assert.IsFalse(count.IsAbstract);
+		}
+		
+		[Test]
+		public void MathAcosModifiers()
+		{
+			ITypeDefinition math = compilation.FindType(typeof(Math)).GetDefinition();
+			Assert.AreEqual(Accessibility.Public, math.Accessibility);
+			Assert.IsTrue(math.IsSealed);
+			Assert.IsTrue(math.IsAbstract);
+			Assert.IsTrue(math.IsStatic);
+			
+			IMethod acos = math.Methods.Single(p => p.Name == "Acos");
+			Assert.AreEqual(Accessibility.Public, acos.Accessibility);
+			Assert.IsTrue(acos.IsStatic);
+			Assert.IsFalse(acos.IsAbstract);
+			Assert.IsFalse(acos.IsSealed);
+			Assert.IsFalse(acos.IsVirtual);
+			Assert.IsFalse(acos.IsOverride);
+		}
+		
+		[Test]
+		public void EncodingModifiers()
+		{
+			ITypeDefinition encoding = compilation.FindType(typeof(Encoding)).GetDefinition();
+			Assert.AreEqual(Accessibility.Public, encoding.Accessibility);
+			Assert.IsFalse(encoding.IsSealed);
+			Assert.IsTrue(encoding.IsAbstract);
+			
+			IMethod getDecoder = encoding.Methods.Single(p => p.Name == "GetDecoder");
+			Assert.AreEqual(Accessibility.Public, getDecoder.Accessibility);
+			Assert.IsFalse(getDecoder.IsStatic);
+			Assert.IsFalse(getDecoder.IsAbstract);
+			Assert.IsFalse(getDecoder.IsSealed);
+			Assert.IsTrue(getDecoder.IsVirtual);
+			Assert.IsFalse(getDecoder.IsOverride);
+			
+			IMethod getMaxByteCount = encoding.Methods.Single(p => p.Name == "GetMaxByteCount");
+			Assert.AreEqual(Accessibility.Public, getMaxByteCount.Accessibility);
+			Assert.IsFalse(getMaxByteCount.IsStatic);
+			Assert.IsTrue(getMaxByteCount.IsAbstract);
+			Assert.IsFalse(getMaxByteCount.IsSealed);
+			Assert.IsFalse(getMaxByteCount.IsVirtual);
+			Assert.IsFalse(getMaxByteCount.IsOverride);
+			
+			IProperty encoderFallback = encoding.Properties.Single(p => p.Name == "EncoderFallback");
+			Assert.AreEqual(Accessibility.Public, encoderFallback.Accessibility);
+			Assert.IsFalse(encoderFallback.IsStatic);
+			Assert.IsFalse(encoderFallback.IsAbstract);
+			Assert.IsFalse(encoderFallback.IsSealed);
+			Assert.IsFalse(encoderFallback.IsVirtual);
+			Assert.IsFalse(encoderFallback.IsOverride);
+		}
+		
+		[Test]
+		public void UnicodeEncodingModifiers()
+		{
+			ITypeDefinition encoding = compilation.FindType(typeof(UnicodeEncoding)).GetDefinition();
+			Assert.AreEqual(Accessibility.Public, encoding.Accessibility);
+			Assert.IsFalse(encoding.IsSealed);
+			Assert.IsFalse(encoding.IsAbstract);
+			
+			IMethod getDecoder = encoding.Methods.Single(p => p.Name == "GetDecoder");
+			Assert.AreEqual(Accessibility.Public, getDecoder.Accessibility);
+			Assert.IsFalse(getDecoder.IsStatic);
+			Assert.IsFalse(getDecoder.IsAbstract);
+			Assert.IsFalse(getDecoder.IsSealed);
+			Assert.IsFalse(getDecoder.IsVirtual);
+			Assert.IsTrue(getDecoder.IsOverride);
+		}
+		
+		[Test]
+		public void UTF32EncodingModifiers()
+		{
+			ITypeDefinition encoding = compilation.FindType(typeof(UTF32Encoding)).GetDefinition();
+			Assert.AreEqual(Accessibility.Public, encoding.Accessibility);
+			Assert.IsTrue(encoding.IsSealed);
+			Assert.IsFalse(encoding.IsAbstract);
+			
+			IMethod getDecoder = encoding.Methods.Single(p => p.Name == "GetDecoder");
+			Assert.AreEqual(Accessibility.Public, getDecoder.Accessibility);
+			Assert.IsFalse(getDecoder.IsStatic);
+			Assert.IsFalse(getDecoder.IsAbstract);
+			Assert.IsFalse(getDecoder.IsSealed);
+			Assert.IsFalse(getDecoder.IsVirtual);
+			Assert.IsTrue(getDecoder.IsOverride);
+		}
+		
+		[Test]
+		public void FindRedirectedType()
+		{
+			var compilationWithSystemCore = new SimpleCompilation(SystemCoreInstance, MscorlibInstance);
+			
+			var typeRef = ReflectionHelper.ParseReflectionName("System.Func`2, System.Core");
+			ITypeDefinition c = typeRef.Resolve(compilationWithSystemCore.TypeResolveContext).GetDefinition();
+			Assert.IsNotNull(c, "System.Func<,> not found");
+			Assert.AreEqual("mscorlib", c.ParentAssembly.AssemblyName);
+		}
+		
+		public void DelegateIsClass()
+		{
+			var @delegate = compilation.FindType(KnownTypeCode.Delegate).GetDefinition();
+			Assert.AreEqual(TypeKind.Class, @delegate);
+			Assert.IsFalse(@delegate.IsSealed);
+		}
+		
+		public void MulticastDelegateIsClass()
+		{
+			var multicastDelegate = compilation.FindType(KnownTypeCode.MulticastDelegate).GetDefinition();
+			Assert.AreEqual(TypeKind.Class, multicastDelegate);
+			Assert.IsFalse(multicastDelegate.IsSealed);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/CecilLoaderTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/CecilLoaderTests.cs
index f7243e2c8a..54bed1bafc 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/CecilLoaderTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/CecilLoaderTests.cs
@@ -26,7 +26,7 @@ using NUnit.Framework;
 namespace ICSharpCode.NRefactory.TypeSystem
 {
 	[TestFixture]
-	public class CecilLoaderTests : TypeSystemTests
+	public class CecilLoaderTests : BinaryLoaderTests
 	{
 		static readonly Lazy<IUnresolvedAssembly> mscorlib = new Lazy<IUnresolvedAssembly>(
 			delegate {
@@ -41,285 +41,16 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		public static IUnresolvedAssembly Mscorlib { get { return mscorlib.Value; } }
 		public static IUnresolvedAssembly SystemCore { get { return systemCore.Value; } }
 
+		public override IUnresolvedAssembly MscorlibInstance { get { return mscorlib.Value; } }
+		public override IUnresolvedAssembly SystemCoreInstance { get { return systemCore.Value; } }
+
 		[TestFixtureSetUp]
 		public void FixtureSetUp()
 		{
 			// use "IncludeInternalMembers" so that Cecil results match C# parser results
 			CecilLoader loader = new CecilLoader() { IncludeInternalMembers = true };
 			IUnresolvedAssembly asm = loader.LoadAssemblyFile(typeof(TestCase.SimplePublicClass).Assembly.Location);
-			compilation = new SimpleCompilation(asm, CecilLoaderTests.Mscorlib);
-		}
-		
-		[Test]
-		public void InheritanceTest()
-		{
-			ITypeDefinition c = compilation.FindType(typeof(SystemException)).GetDefinition();
-			ITypeDefinition c2 = compilation.FindType(typeof(Exception)).GetDefinition();
-			Assert.IsNotNull(c, "c is null");
-			Assert.IsNotNull(c2, "c2 is null");
-			//Assert.AreEqual(3, c.BaseTypes.Count); // Inherited interfaces are not reported by Cecil
-			// which matches the behaviour of our C#/VB parsers
-			Assert.AreEqual("System.Exception", c.DirectBaseTypes.First().FullName);
-			Assert.AreSame(c2, c.DirectBaseTypes.First());
-			
-			string[] superTypes = c.GetAllBaseTypes().Select(t => t.ReflectionName).ToArray();
-			Assert.AreEqual(new string[] {
-			                	"System.Object",
-			                	"System.Runtime.Serialization.ISerializable", "System.Runtime.InteropServices._Exception",
-			                	"System.Exception", "System.SystemException"
-			                }, superTypes);
-		}
-		
-		[Test]
-		public void GenericPropertyTest()
-		{
-			ITypeDefinition c = compilation.FindType(typeof(Comparer<>)).GetDefinition();
-			IProperty def = c.Properties.Single(p => p.Name == "Default");
-			ParameterizedType pt = (ParameterizedType)def.ReturnType;
-			Assert.AreEqual("System.Collections.Generic.Comparer", pt.FullName);
-			Assert.AreEqual(c.TypeParameters[0], pt.TypeArguments[0]);
-		}
-		
-		[Test]
-		public void PointerTypeTest()
-		{
-			ITypeDefinition c = compilation.FindType(typeof(IntPtr)).GetDefinition();
-			IMethod toPointer = c.Methods.Single(p => p.Name == "ToPointer");
-			Assert.AreEqual("System.Void*", toPointer.ReturnType.ReflectionName);
-			Assert.IsTrue (toPointer.ReturnType is PointerType);
-			Assert.AreEqual("System.Void", ((PointerType)toPointer.ReturnType).ElementType.FullName);
-		}
-		
-		[Test]
-		public void DateTimeDefaultConstructor()
-		{
-			ITypeDefinition c = compilation.FindType(typeof(DateTime)).GetDefinition();
-			Assert.AreEqual(1, c.Methods.Count(m => m.IsConstructor && m.Parameters.Count == 0));
-			Assert.AreEqual(1, c.GetConstructors().Count(m => m.Parameters.Count == 0));
-		}
-		
-		[Test]
-		public void NoEncodingInfoDefaultConstructor()
-		{
-			ITypeDefinition c = compilation.FindType(typeof(EncodingInfo)).GetDefinition();
-			// EncodingInfo only has an internal constructor
-			Assert.IsFalse(c.Methods.Any(m => m.IsConstructor));
-			// and no implicit ctor should be added:
-			Assert.AreEqual(0, c.GetConstructors().Count());
-		}
-		
-		[Test]
-		public void StaticModifierTest()
-		{
-			ITypeDefinition c = compilation.FindType(typeof(Environment)).GetDefinition();
-			Assert.IsNotNull(c, "System.Environment not found");
-			Assert.IsTrue(c.IsAbstract, "class should be abstract");
-			Assert.IsTrue(c.IsSealed, "class should be sealed");
-			Assert.IsTrue(c.IsStatic, "class should be static");
-		}
-		
-		[Test]
-		public void InnerClassReferenceTest()
-		{
-			ITypeDefinition c = compilation.FindType(typeof(Environment)).GetDefinition();
-			Assert.IsNotNull(c, "System.Environment not found");
-			IType rt = c.Methods.First(m => m.Name == "GetFolderPath").Parameters[0].Type;
-			Assert.AreSame(c.NestedTypes.Single(ic => ic.Name == "SpecialFolder"), rt);
-		}
-		
-		[Test]
-		public void NestedTypesTest()
-		{
-			ITypeDefinition c = compilation.FindType(typeof(Environment.SpecialFolder)).GetDefinition();
-			Assert.IsNotNull(c, "c is null");
-			Assert.AreEqual("System.Environment.SpecialFolder", c.FullName);
-			Assert.AreEqual("System.Environment+SpecialFolder", c.ReflectionName);
-		}
-		
-		[Test]
-		public void VoidHasNoMembers()
-		{
-			ITypeDefinition c = compilation.FindType(typeof(void)).GetDefinition();
-			Assert.IsNotNull(c, "System.Void not found");
-			Assert.AreEqual(0, c.GetMethods().Count());
-			Assert.AreEqual(0, c.GetProperties().Count());
-			Assert.AreEqual(0, c.GetEvents().Count());
-			Assert.AreEqual(0, c.GetFields().Count());
-		}
-		
-		[Test]
-		public void Void_SerializableAttribute()
-		{
-			ITypeDefinition c = compilation.FindType(typeof(void)).GetDefinition();
-			var attr = c.Attributes.Single(a => a.AttributeType.FullName == "System.SerializableAttribute");
-			Assert.AreEqual(0, attr.Constructor.Parameters.Count);
-			Assert.AreEqual(0, attr.PositionalArguments.Count);
-			Assert.AreEqual(0, attr.NamedArguments.Count);
-		}
-		
-		[Test]
-		public void Void_StructLayoutAttribute()
-		{
-			ITypeDefinition c = compilation.FindType(typeof(void)).GetDefinition();
-			var attr = c.Attributes.Single(a => a.AttributeType.FullName == "System.Runtime.InteropServices.StructLayoutAttribute");
-			Assert.AreEqual(1, attr.Constructor.Parameters.Count);
-			Assert.AreEqual(1, attr.PositionalArguments.Count);
-			Assert.AreEqual(0, attr.PositionalArguments[0].ConstantValue);
-			Assert.AreEqual(1, attr.NamedArguments.Count);
-			Assert.AreEqual("System.Runtime.InteropServices.StructLayoutAttribute.Size", attr.NamedArguments[0].Key.FullName);
-			Assert.AreEqual(1, attr.NamedArguments[0].Value.ConstantValue);
-		}
-		
-		[Test]
-		public void Void_ComVisibleAttribute()
-		{
-			ITypeDefinition c = compilation.FindType(typeof(void)).GetDefinition();
-			var attr = c.Attributes.Single(a => a.AttributeType.FullName == "System.Runtime.InteropServices.ComVisibleAttribute");
-			Assert.AreEqual(1, attr.Constructor.Parameters.Count);
-			Assert.AreEqual(1, attr.PositionalArguments.Count);
-			Assert.AreEqual(true, attr.PositionalArguments[0].ConstantValue);
-			Assert.AreEqual(0, attr.NamedArguments.Count);
-		}
-		
-		[Test]
-		public void NestedClassInGenericClassTest()
-		{
-			ITypeDefinition dictionary = compilation.FindType(typeof(Dictionary<,>)).GetDefinition();
-			Assert.IsNotNull(dictionary);
-			ITypeDefinition valueCollection = compilation.FindType(typeof(Dictionary<,>.ValueCollection)).GetDefinition();
-			Assert.IsNotNull(valueCollection);
-			var dictionaryRT = new ParameterizedType(dictionary, new[] { compilation.FindType(typeof(string)).GetDefinition(), compilation.FindType(typeof(int)).GetDefinition() });
-			IProperty valueProperty = dictionaryRT.GetProperties(p => p.Name == "Values").Single();
-			IType parameterizedValueCollection = valueProperty.ReturnType;
-			Assert.AreEqual("System.Collections.Generic.Dictionary`2+ValueCollection[[System.String],[System.Int32]]", parameterizedValueCollection.ReflectionName);
-			Assert.AreSame(valueCollection, parameterizedValueCollection.GetDefinition());
-		}
-		
-		[Test]
-		public void ValueCollectionCountModifiers()
-		{
-			ITypeDefinition valueCollection = compilation.FindType(typeof(Dictionary<,>.ValueCollection)).GetDefinition();
-			Assert.AreEqual(Accessibility.Public, valueCollection.Accessibility);
-			Assert.IsTrue(valueCollection.IsSealed);
-			Assert.IsFalse(valueCollection.IsAbstract);
-			Assert.IsFalse(valueCollection.IsStatic);
-			
-			IProperty count = valueCollection.Properties.Single(p => p.Name == "Count");
-			Assert.AreEqual(Accessibility.Public, count.Accessibility);
-			// It's sealed on the IL level; but in C# it's just a normal non-virtual method that happens to implement an interface
-			Assert.IsFalse(count.IsSealed);
-			Assert.IsFalse(count.IsVirtual);
-			Assert.IsFalse(count.IsAbstract);
-		}
-		
-		[Test]
-		public void MathAcosModifiers()
-		{
-			ITypeDefinition math = compilation.FindType(typeof(Math)).GetDefinition();
-			Assert.AreEqual(Accessibility.Public, math.Accessibility);
-			Assert.IsTrue(math.IsSealed);
-			Assert.IsTrue(math.IsAbstract);
-			Assert.IsTrue(math.IsStatic);
-			
-			IMethod acos = math.Methods.Single(p => p.Name == "Acos");
-			Assert.AreEqual(Accessibility.Public, acos.Accessibility);
-			Assert.IsTrue(acos.IsStatic);
-			Assert.IsFalse(acos.IsAbstract);
-			Assert.IsFalse(acos.IsSealed);
-			Assert.IsFalse(acos.IsVirtual);
-			Assert.IsFalse(acos.IsOverride);
-		}
-		
-		[Test]
-		public void EncodingModifiers()
-		{
-			ITypeDefinition encoding = compilation.FindType(typeof(Encoding)).GetDefinition();
-			Assert.AreEqual(Accessibility.Public, encoding.Accessibility);
-			Assert.IsFalse(encoding.IsSealed);
-			Assert.IsTrue(encoding.IsAbstract);
-			
-			IMethod getDecoder = encoding.Methods.Single(p => p.Name == "GetDecoder");
-			Assert.AreEqual(Accessibility.Public, getDecoder.Accessibility);
-			Assert.IsFalse(getDecoder.IsStatic);
-			Assert.IsFalse(getDecoder.IsAbstract);
-			Assert.IsFalse(getDecoder.IsSealed);
-			Assert.IsTrue(getDecoder.IsVirtual);
-			Assert.IsFalse(getDecoder.IsOverride);
-			
-			IMethod getMaxByteCount = encoding.Methods.Single(p => p.Name == "GetMaxByteCount");
-			Assert.AreEqual(Accessibility.Public, getMaxByteCount.Accessibility);
-			Assert.IsFalse(getMaxByteCount.IsStatic);
-			Assert.IsTrue(getMaxByteCount.IsAbstract);
-			Assert.IsFalse(getMaxByteCount.IsSealed);
-			Assert.IsFalse(getMaxByteCount.IsVirtual);
-			Assert.IsFalse(getMaxByteCount.IsOverride);
-			
-			IProperty encoderFallback = encoding.Properties.Single(p => p.Name == "EncoderFallback");
-			Assert.AreEqual(Accessibility.Public, encoderFallback.Accessibility);
-			Assert.IsFalse(encoderFallback.IsStatic);
-			Assert.IsFalse(encoderFallback.IsAbstract);
-			Assert.IsFalse(encoderFallback.IsSealed);
-			Assert.IsFalse(encoderFallback.IsVirtual);
-			Assert.IsFalse(encoderFallback.IsOverride);
-		}
-		
-		[Test]
-		public void UnicodeEncodingModifiers()
-		{
-			ITypeDefinition encoding = compilation.FindType(typeof(UnicodeEncoding)).GetDefinition();
-			Assert.AreEqual(Accessibility.Public, encoding.Accessibility);
-			Assert.IsFalse(encoding.IsSealed);
-			Assert.IsFalse(encoding.IsAbstract);
-			
-			IMethod getDecoder = encoding.Methods.Single(p => p.Name == "GetDecoder");
-			Assert.AreEqual(Accessibility.Public, getDecoder.Accessibility);
-			Assert.IsFalse(getDecoder.IsStatic);
-			Assert.IsFalse(getDecoder.IsAbstract);
-			Assert.IsFalse(getDecoder.IsSealed);
-			Assert.IsFalse(getDecoder.IsVirtual);
-			Assert.IsTrue(getDecoder.IsOverride);
-		}
-		
-		[Test]
-		public void UTF32EncodingModifiers()
-		{
-			ITypeDefinition encoding = compilation.FindType(typeof(UTF32Encoding)).GetDefinition();
-			Assert.AreEqual(Accessibility.Public, encoding.Accessibility);
-			Assert.IsTrue(encoding.IsSealed);
-			Assert.IsFalse(encoding.IsAbstract);
-			
-			IMethod getDecoder = encoding.Methods.Single(p => p.Name == "GetDecoder");
-			Assert.AreEqual(Accessibility.Public, getDecoder.Accessibility);
-			Assert.IsFalse(getDecoder.IsStatic);
-			Assert.IsFalse(getDecoder.IsAbstract);
-			Assert.IsFalse(getDecoder.IsSealed);
-			Assert.IsFalse(getDecoder.IsVirtual);
-			Assert.IsTrue(getDecoder.IsOverride);
-		}
-		
-		[Test]
-		public void FindRedirectedType()
-		{
-			var compilationWithSystemCore = new SimpleCompilation(systemCore.Value, mscorlib.Value);
-			
-			var typeRef = ReflectionHelper.ParseReflectionName("System.Func`2, System.Core");
-			ITypeDefinition c = typeRef.Resolve(compilationWithSystemCore.TypeResolveContext).GetDefinition();
-			Assert.IsNotNull(c, "System.Func<,> not found");
-			Assert.AreEqual("mscorlib", c.ParentAssembly.AssemblyName);
-		}
-		
-		public void DelegateIsClass()
-		{
-			var @delegate = compilation.FindType(KnownTypeCode.Delegate).GetDefinition();
-			Assert.AreEqual(TypeKind.Class, @delegate);
-			Assert.IsFalse(@delegate.IsSealed);
-		}
-		
-		public void MulticastDelegateIsClass()
-		{
-			var multicastDelegate = compilation.FindType(KnownTypeCode.MulticastDelegate).GetDefinition();
-			Assert.AreEqual(TypeKind.Class, multicastDelegate);
-			Assert.IsFalse(multicastDelegate.IsSealed);
+			compilation = new SimpleCompilation(asm, Mscorlib);
 		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/GetMembersTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/GetMembersTests.cs
index 41645472bf..6d9da16ae5 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/GetMembersTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/GetMembersTests.cs
@@ -92,7 +92,7 @@ namespace ICSharpCode.NRefactory.TypeSystem
 			
 			var compilation = TypeSystemHelper.CreateCompilation(a, b);
 			ITypeDefinition resolvedA = compilation.MainAssembly.GetTypeDefinition(a.FullTypeName);
-			ITypeDefinition resolvedB = compilation.MainAssembly.GetTypeDefinition(b.FullTypeName);
+//			ITypeDefinition resolvedB = compilation.MainAssembly.GetTypeDefinition(b.FullTypeName);
 			
 			// A<> gets self-parameterized, B<> stays unbound
 			Assert.AreEqual("A`1+B`1[[`0],[]]", resolvedA.GetNestedTypes().Single().ReflectionName);
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/IkvmLoaderTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/IkvmLoaderTests.cs
new file mode 100644
index 0000000000..9ea9d188e7
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/IkvmLoaderTests.cs
@@ -0,0 +1,61 @@
+// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.TypeSystem
+{
+	[TestFixture]
+	public class IkvmLoaderTests : BinaryLoaderTests
+	{
+		static readonly Lazy<IUnresolvedAssembly> mscorlib = new Lazy<IUnresolvedAssembly>(
+			delegate {
+				return new IkvmLoader().LoadAssemblyFile(typeof(object).Assembly.Location);
+			});
+		
+		static readonly Lazy<IUnresolvedAssembly> systemCore = new Lazy<IUnresolvedAssembly>(
+			delegate {
+			return new IkvmLoader().LoadAssemblyFile(typeof(System.Linq.Enumerable).Assembly.Location);
+		});
+
+		public static IUnresolvedAssembly Mscorlib { get { return mscorlib.Value; } }
+		public static IUnresolvedAssembly SystemCore { get { return systemCore.Value; } }
+
+		public override IUnresolvedAssembly MscorlibInstance { get { return mscorlib.Value; } }
+		public override IUnresolvedAssembly SystemCoreInstance { get { return systemCore.Value; } }
+
+		[TestFixtureSetUp]
+		public void FixtureSetUp()
+		{
+			try {
+				// use "IncludeInternalMembers" so that Cecil results match C# parser results
+				IkvmLoader loader = new IkvmLoader() { IncludeInternalMembers = true };
+				IUnresolvedAssembly asm = loader.LoadAssemblyFile(typeof(TestCase.SimplePublicClass).Assembly.Location);
+				compilation = new SimpleCompilation(asm, IkvmLoaderTests.Mscorlib);
+			} catch (Exception e) {
+				Console.WriteLine(e);
+				throw;
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/InheritanceHelperTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/InheritanceHelperTests.cs
new file mode 100644
index 0000000000..36a2cefcc5
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/InheritanceHelperTests.cs
@@ -0,0 +1,78 @@
+//
+// BlobReader.cs
+//
+// Author:
+//       Erik Källen
+//
+// Copyright (c) 2010-2013
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using ICSharpCode.NRefactory.CSharp;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.TypeSystem
+{
+	[TestFixture]
+	public class InheritanceHelperTests
+	{
+		[Test]
+		public void DynamicAndObjectShouldBeConsideredTheSameTypeWhenMatchingSignatures()
+		{
+			string program = @"using System.Collections.Generic;
+public class Base {
+  public virtual void M1(object p) {}
+  public virtual void M2(List<object> p) {}
+  public virtual object M3() { return null; }
+  public virtual List<object> M4() { return null; }
+  public virtual void M5(dynamic p) {}
+  public virtual void M6(List<dynamic> p) {}
+  public virtual dynamic M7() { return null; }
+  public virtual List<dynamic> M8() { return null; }
+}
+
+public class Derived : Base {
+  public override void M1(dynamic p) {}
+  public override void M2(List<dynamic> p) {}
+  public override dynamic M3() { return null; }
+  public override List<dynamic> M4() { return null; }
+  public override void M5(object p) {}
+  public override void M6(List<object> p) {}
+  public override object M7() { return null; }
+  public override List<object> M8() { return null; }
+}";
+
+			var unresolvedFile = new CSharpParser().Parse(program, "program.cs").ToTypeSystem();
+			var compilation = new CSharpProjectContent().AddAssemblyReferences(CecilLoaderTests.Mscorlib).AddOrUpdateFiles(unresolvedFile).CreateCompilation();
+
+			var dtype = (ITypeDefinition)ReflectionHelper.ParseReflectionName("Derived").Resolve(compilation);
+			var btype = (ITypeDefinition)ReflectionHelper.ParseReflectionName("Base").Resolve(compilation);
+
+			foreach (var name in new[] { "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8" }) {
+				Assert.That(InheritanceHelper.GetBaseMember(dtype.Methods.Single(m => m.Name == name)), Is.EqualTo(btype.Methods.Single(m => m.Name == name)), name + " does not match");
+			}
+
+			foreach (var name in new[] { "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8" }) {
+				Assert.That(InheritanceHelper.GetDerivedMember(btype.Methods.Single(m => m.Name == name), dtype), Is.EqualTo(dtype.Methods.Single(m => m.Name == name)), name + " does not match");
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/SerializedIkvmLoaderTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/SerializedIkvmLoaderTests.cs
new file mode 100644
index 0000000000..38eb592702
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/SerializedIkvmLoaderTests.cs
@@ -0,0 +1,44 @@
+// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.IO;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using ICSharpCode.NRefactory.Utils;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.TypeSystem
+{
+	[TestFixture]
+	public class SerializedIkvmLoaderTests : TypeSystemTests
+	{
+		[TestFixtureSetUp]
+		public void FixtureSetUp()
+		{
+			IkvmLoader loader = new IkvmLoader() { IncludeInternalMembers = true };
+			IUnresolvedAssembly pc = loader.LoadAssemblyFile(typeof(TestCase.SimplePublicClass).Assembly.Location);
+			FastSerializer serializer = new FastSerializer();
+			using (MemoryStream ms = new MemoryStream()) {
+				serializer.Serialize(ms, pc);
+				ms.Position = 0;
+				var asm = (IUnresolvedAssembly)serializer.Deserialize(ms);
+				base.compilation = new SimpleCompilation(asm, IkvmLoaderTests.Mscorlib);
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/TypeSystemTests.TestCase.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/TypeSystemTests.TestCase.cs
index cea7a115f1..7ac6b656ec 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/TypeSystemTests.TestCase.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/TypeSystemTests.TestCase.cs
@@ -46,7 +46,11 @@ namespace ICSharpCode.NRefactory.TypeSystem.TestCase
 		public ParamsAttribute(params object[] x) {}
 		
 		[Params(Property = new string[] { "a", "b" })]
-		public string[] Property { get; set; }
+		public string[] Property { 
+			[return: Params("Attribute on return type of getter")]
+			get { return null; }
+			set { }
+		}
 	}
 	
 	[Double(1)]
@@ -153,6 +157,9 @@ namespace ICSharpCode.NRefactory.TypeSystem.TestCase
 		public void MethodWithOptionalParameter(int x = 4) {}
 		public void MethodWithExplicitOptionalParameter([Optional] int x) {}
 		public void MethodWithEnumOptionalParameter(StringComparison x = StringComparison.OrdinalIgnoreCase) {}
+		public void MethodWithOptionalNullableParameter(int? x = null) {}
+		public void MethodWithOptionalLongParameter(long x = 1) {}
+		public void MethodWithOptionalNullableLongParameter(long? x = 1) {}
 	}
 	
 	[ComImport(), Guid("21B8916C-F28E-11D2-A473-00C04F8EF448"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
@@ -393,4 +400,220 @@ namespace ICSharpCode.NRefactory.TypeSystem.TestCase
 		event Action IExplicitImplementationTests.E { add {} remove {} }
 		int IExplicitImplementationTests.this[int x] { get { return 0; } set {} }
 	}
+
+	[TypeTest(C, typeof(Inner), typeof(int)), My]
+	public class ClassWithAttributesUsingNestedMembers {
+		sealed class MyAttribute : Attribute {}
+
+		const int C = 42;
+		class Inner {
+		}
+
+		[TypeTest(C, typeof(Inner), typeof(int)), My]
+		public int P { get; set; }
+
+		[TypeTest(C, typeof(Inner), typeof(int)), My]
+		class AttributedInner {
+		}
+
+		[TypeTest(C, typeof(Inner), typeof(int)), My]
+		class AttributedInner2 {
+			sealed class MyAttribute : Attribute {}
+
+			const int C = 43;
+			class Inner {}
+		}
+	}
+
+	[Guid ("790C6E0B-9194-4cc9-9426-A48A63185696"), InterfaceType (ComInterfaceType.InterfaceIsDual)]
+	[ComImport]
+	public interface IMarshalAsTests
+	{
+		[DispId (48)]
+		void AliasComponent ([MarshalAs (UnmanagedType.BStr)] [In] string bstrSrcApplicationIDOrName, [MarshalAs (UnmanagedType.BStr)] [In] string bstrCLSIDOrProgID, [MarshalAs (UnmanagedType.BStr)] [In] string bstrDestApplicationIDOrName, [MarshalAs (UnmanagedType.BStr)] [In] string bstrNewProgId, [MarshalAs (UnmanagedType.BStr)] [In] string bstrNewClsid);
+
+		[DispId (33)]
+		[return: MarshalAs (UnmanagedType.VariantBool)]
+		bool AreApplicationInstancesPaused ([MarshalAs (UnmanagedType.LPStruct)] [In] object pVarApplicationInstanceID);
+
+		[DispId (19)]
+		void BackupREGDB ([MarshalAs (UnmanagedType.BStr)] [In] string bstrBackupFilePath);
+
+		[DispId (2)]
+		[return: MarshalAs (UnmanagedType.Interface)]
+		object Connect ([MarshalAs (UnmanagedType.BStr)] [In] string connectStr);
+
+		[DispId (45)]
+		void CopyApplications ([MarshalAs (UnmanagedType.BStr)] [In] string bstrSourcePartitionIDOrName, [MarshalAs (UnmanagedType.LPStruct)] [In] object pVarApplicationID, [MarshalAs (UnmanagedType.BStr)] [In] string bstrDestinationPartitionIDOrName);
+
+		[DispId (46)]
+		void CopyComponents ([MarshalAs (UnmanagedType.BStr)] [In] string bstrSourceApplicationIDOrName, [MarshalAs (UnmanagedType.LPStruct)] [In] object pVarCLSIDOrProgID, [MarshalAs (UnmanagedType.BStr)] [In] string bstrDestinationApplicationIDOrName);
+
+		[DispId (36)]
+		void CreateServiceForApplication ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplicationIDOrName, [MarshalAs (UnmanagedType.BStr)] [In] string bstrServiceName, [MarshalAs (UnmanagedType.BStr)] [In] string bstrStartType, [MarshalAs (UnmanagedType.BStr)] [In] string bstrErrorControl, [MarshalAs (UnmanagedType.BStr)] [In] string bstrDependencies, [MarshalAs (UnmanagedType.BStr)] [In] string bstrRunAs, [MarshalAs (UnmanagedType.BStr)] [In] string bstrPassword, [MarshalAs (UnmanagedType.VariantBool)] [In] bool bDesktopOk);
+
+		[DispId (40)]
+		void CurrentPartition ([MarshalAs (UnmanagedType.BStr)] [In] string bstrPartitionIDOrName);
+
+		[DispId (41)]
+		[return: MarshalAs (UnmanagedType.BStr)]
+		string CurrentPartitionID ();
+
+		[DispId (42)]
+		[return: MarshalAs (UnmanagedType.BStr)]
+		string CurrentPartitionName ();
+
+		[DispId (37)]
+		void DeleteServiceForApplication ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplicationIDOrName);
+
+		[DispId (34)]
+		[return: MarshalAs (UnmanagedType.BStr)]
+		string DumpApplicationInstance ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplicationInstanceID, [MarshalAs (UnmanagedType.BStr)] [In] string bstrDirectory, [MarshalAs (UnmanagedType.I4)] [In] int lMaxImages);
+
+		[DispId (9)]
+		void ExportApplication ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplIdOrName, [MarshalAs (UnmanagedType.BStr)] [In] string bstrApplicationFile, [In] int lOptions);
+
+		[DispId (54)]
+		void ExportPartition ([MarshalAs (UnmanagedType.BStr)] [In] string bstrPartitionIDOrName, [MarshalAs (UnmanagedType.BStr)] [In] string bstrPartitionFileName, [MarshalAs (UnmanagedType.I4)] [In] int lOptions);
+
+		[DispId (44)]
+		void FlushPartitionCache ();
+
+		[DispId (28)]
+		[return: MarshalAs (UnmanagedType.BStr)]
+		string GetApplicationInstanceIDFromProcessID ([MarshalAs (UnmanagedType.I4)] [In] int lProcessID);
+
+		[DispId (1)]
+		[return: MarshalAs (UnmanagedType.Interface)]
+		object GetCollection ([MarshalAs (UnmanagedType.BStr)] [In] string bstrCollName);
+
+		[DispId (5)]
+		[return: MarshalAs (UnmanagedType.Interface)]
+		object GetCollectionByQuery ([MarshalAs (UnmanagedType.BStr)] [In] string collName, [MarshalAs (UnmanagedType.SafeArray)] [In] ref object[] aQuery);
+
+		[DispId (27)]
+		[return: MarshalAs (UnmanagedType.Interface)]
+		object GetCollectionByQuery2 ([MarshalAs (UnmanagedType.BStr)] [In] string bstrCollectionName, [MarshalAs (UnmanagedType.LPStruct)] [In] object pVarQueryStrings);
+
+		[DispId (57)]
+		[return: MarshalAs (UnmanagedType.I4)]
+		int GetComponentVersionCount ([MarshalAs (UnmanagedType.BStr)] [In] string bstrCLSIDOrProgID);
+
+		[DispId (26)]
+		void GetEventClassesForIID ([In] string bstrIID, [MarshalAs (UnmanagedType.SafeArray)] [In] [Out] ref object[] varCLSIDS, [MarshalAs (UnmanagedType.SafeArray)] [In] [Out] ref object[] varProgIDs, [MarshalAs (UnmanagedType.SafeArray)] [In] [Out] ref object[] varDescriptions);
+
+		[DispId (17)]
+		void GetMultipleComponentsInfo ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplIdOrName, [In] object varFileNames, [MarshalAs (UnmanagedType.SafeArray)] out object[] varCLSIDS, [MarshalAs (UnmanagedType.SafeArray)] out object[] varClassNames, [MarshalAs (UnmanagedType.SafeArray)] out object[] varFileFlags, [MarshalAs (UnmanagedType.SafeArray)] out object[] varComponentFlags);
+
+		[DispId (38)]
+		[return: MarshalAs (UnmanagedType.BStr)]
+		string GetPartitionID ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplicationIDOrName);
+
+		[DispId (39)]
+		[return: MarshalAs (UnmanagedType.BStr)]
+		string GetPartitionName ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplicationIDOrName);
+
+		[DispId (43)]
+		[return: MarshalAs (UnmanagedType.BStr)]
+		string GlobalPartitionID ();
+
+		[DispId (6)]
+		void ImportComponent ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplIdOrName, [MarshalAs (UnmanagedType.BStr)] [In] string bstrCLSIDOrProgId);
+
+		[DispId (52)]
+		void ImportComponents ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplicationIDOrName, [MarshalAs (UnmanagedType.LPStruct)] [In] object pVarCLSIDOrProgID, [MarshalAs (UnmanagedType.LPStruct)] [In] object pVarComponentType);
+
+		[DispId (50)]
+		void ImportUnconfiguredComponents ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplicationIDOrName, [MarshalAs (UnmanagedType.LPStruct)] [In] object pVarCLSIDOrProgID, [MarshalAs (UnmanagedType.LPStruct)] [In] object pVarComponentType);
+
+		[DispId (10)]
+		void InstallApplication ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplicationFile, [MarshalAs (UnmanagedType.BStr)] [In] string bstrDestinationDirectory, [In] int lOptions, [MarshalAs (UnmanagedType.BStr)] [In] string bstrUserId, [MarshalAs (UnmanagedType.BStr)] [In] string bstrPassword, [MarshalAs (UnmanagedType.BStr)] [In] string bstrRSN);
+
+		[DispId (7)]
+		void InstallComponent ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplIdOrName, [MarshalAs (UnmanagedType.BStr)] [In] string bstrDLL, [MarshalAs (UnmanagedType.BStr)] [In] string bstrTLB, [MarshalAs (UnmanagedType.BStr)] [In] string bstrPSDLL);
+
+		[DispId (25)]
+		void InstallEventClass ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplIdOrName, [MarshalAs (UnmanagedType.BStr)] [In] string bstrDLL, [MarshalAs (UnmanagedType.BStr)] [In] string bstrTLB, [MarshalAs (UnmanagedType.BStr)] [In] string bstrPSDLL);
+
+		[DispId (16)]
+		void InstallMultipleComponents ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplIdOrName, [MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] [In] ref object[] fileNames, [MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] [In] ref object[] CLSIDS);
+
+		[DispId (24)]
+		void InstallMultipleEventClasses ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplIdOrName, [MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] [In] ref object[] fileNames, [MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] [In] ref object[] CLSIDS);
+
+		[DispId (55)]
+		void InstallPartition ([MarshalAs (UnmanagedType.BStr)] [In] string bstrFileName, [MarshalAs (UnmanagedType.BStr)] [In] string bstrDestDirectory, [MarshalAs (UnmanagedType.I4)] [In] int lOptions, [MarshalAs (UnmanagedType.BStr)] [In] string bstrUserID, [MarshalAs (UnmanagedType.BStr)] [In] string bstrPassword, [MarshalAs (UnmanagedType.BStr)] [In] string bstrRSN);
+
+		[DispId (53)]
+		[return: MarshalAs (UnmanagedType.VariantBool)]
+		bool Is64BitCatalogServer ();
+
+		[DispId (35)]
+		[return: MarshalAs (UnmanagedType.VariantBool)]
+		bool IsApplicationInstanceDumpSupported ();
+
+		[DispId (49)]
+		[return: MarshalAs (UnmanagedType.Interface)]
+		object IsSafeToDelete ([MarshalAs (UnmanagedType.BStr)] [In] string bstrDllName);
+
+		[DispId (3)]
+		int MajorVersion ();
+
+		[DispId (4)]
+		int MinorVersion ();
+
+		[DispId (47)]
+		void MoveComponents ([MarshalAs (UnmanagedType.BStr)] [In] string bstrSourceApplicationIDOrName, [MarshalAs (UnmanagedType.LPStruct)] [In] object pVarCLSIDOrProgID, [MarshalAs (UnmanagedType.BStr)] [In] string bstrDestinationApplicationIDOrName);
+
+		[DispId (30)]
+		void PauseApplicationInstances ([MarshalAs (UnmanagedType.LPStruct)] [In] object pVarApplicationInstanceID);
+
+		[DispId (51)]
+		void PromoteUnconfiguredComponents ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplicationIDOrName, [MarshalAs (UnmanagedType.LPStruct)] [In] object pVarCLSIDOrProgID, [MarshalAs (UnmanagedType.LPStruct)] [In] object pVarComponentType);
+
+		[DispId (21)]
+		void QueryApplicationFile ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplicationFile, [MarshalAs (UnmanagedType.BStr)] out string bstrApplicationName, [MarshalAs (UnmanagedType.BStr)] out string bstrApplicationDescription, [MarshalAs (UnmanagedType.VariantBool)] out bool bHasUsers, [MarshalAs (UnmanagedType.VariantBool)] out bool bIsProxy, [MarshalAs (UnmanagedType.SafeArray)] out object[] varFileNames);
+
+		[DispId (56)]
+		[return: MarshalAs (UnmanagedType.IDispatch)]
+		object QueryApplicationFile2 ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplicationFile);
+
+		[DispId (32)]
+		void RecycleApplicationInstances ([MarshalAs (UnmanagedType.LPStruct)] [In] object pVarApplicationInstanceID, [MarshalAs (UnmanagedType.I4)] [In] int lReasonCode);
+
+		[DispId (18)]
+		void RefreshComponents ();
+
+		[DispId (12)]
+		void RefreshRouter ();
+
+		[DispId (14)]
+		void Reserved1 ();
+
+		[DispId (15)]
+		void Reserved2 ();
+
+		[DispId (20)]
+		void RestoreREGDB ([MarshalAs (UnmanagedType.BStr)] [In] string bstrBackupFilePath);
+
+		[DispId (31)]
+		void ResumeApplicationInstances ([MarshalAs (UnmanagedType.LPStruct)] [In] object pVarApplicationInstanceID);
+
+		[DispId (23)]
+		int ServiceCheck ([In] int lService);
+
+		[DispId (8)]
+		void ShutdownApplication ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplIdOrName);
+
+		[DispId (29)]
+		void ShutdownApplicationInstances ([MarshalAs (UnmanagedType.LPStruct)] [In] object pVarApplicationInstanceID);
+
+		[DispId (22)]
+		void StartApplication ([MarshalAs (UnmanagedType.BStr)] [In] string bstrApplIdOrName);
+
+		[DispId (13)]
+		void StartRouter ();
+
+		[DispId (11)]
+		void StopRouter ();	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/TypeSystemTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/TypeSystemTests.cs
index 6ff2780bfa..adc2f30afa 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/TypeSystemTests.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/TypeSystem/TypeSystemTests.cs
@@ -83,7 +83,8 @@ namespace ICSharpCode.NRefactory.TypeSystem
 			Assert.AreEqual(SpecialType.Dynamic, testClass.Properties.Single().ReturnType);
 			Assert.AreEqual(0, testClass.Properties.Single().Attributes.Count);
 		}
-		
+		#if !__MonoCS__
+
 		[Test]
 		public void DynamicTypeInGenerics()
 		{
@@ -111,7 +112,8 @@ namespace ICSharpCode.NRefactory.TypeSystem
 			IMethod m7 = testClass.Methods.Single(me => me.Name == "DynamicGenerics7");
 			Assert.AreEqual("System.Action`3[[System.Int32[][,]],[dynamic],[System.Object]]", m7.Parameters[0].Type.ReflectionName);
 		}
-		
+		#endif
+
 		[Test]
 		public void DynamicParameterHasNoAttributes()
 		{
@@ -653,6 +655,42 @@ namespace ICSharpCode.NRefactory.TypeSystem
 			Assert.AreEqual((int)StringComparison.OrdinalIgnoreCase, p.ConstantValue);
 		}
 		
+		[Test]
+		public void MethodWithOptionalNullableParameter()
+		{
+			IParameter p = GetTypeDefinition(typeof(ParameterTests)).Methods.Single(m => m.Name == "MethodWithOptionalNullableParameter").Parameters.Single();
+			Assert.IsTrue(p.IsOptional);
+			Assert.IsFalse(p.IsRef);
+			Assert.IsFalse(p.IsOut);
+			Assert.IsFalse(p.IsParams);
+			Assert.AreEqual(0, p.Attributes.Count);
+			Assert.IsNull(p.ConstantValue);
+		}
+		
+		[Test]
+		public void MethodWithOptionalLongParameter()
+		{
+			IParameter p = GetTypeDefinition(typeof(ParameterTests)).Methods.Single(m => m.Name == "MethodWithOptionalLongParameter").Parameters.Single();
+			Assert.IsTrue(p.IsOptional);
+			Assert.IsFalse(p.IsRef);
+			Assert.IsFalse(p.IsOut);
+			Assert.IsFalse(p.IsParams);
+			Assert.AreEqual(1L, p.ConstantValue);
+			Assert.AreEqual(typeof(long), p.ConstantValue.GetType());
+		}
+		
+		[Test]
+		public void MethodWithOptionalNullableLongParameter()
+		{
+			IParameter p = GetTypeDefinition(typeof(ParameterTests)).Methods.Single(m => m.Name == "MethodWithOptionalNullableLongParameter").Parameters.Single();
+			Assert.IsTrue(p.IsOptional);
+			Assert.IsFalse(p.IsRef);
+			Assert.IsFalse(p.IsOut);
+			Assert.IsFalse(p.IsParams);
+			Assert.AreEqual(1L, p.ConstantValue);
+			Assert.AreEqual(typeof(long), p.ConstantValue.GetType());
+		}
+		
 		[Test]
 		public void GenericDelegate_Variance()
 		{
@@ -874,6 +912,15 @@ namespace ICSharpCode.NRefactory.TypeSystem
 			Assert.AreEqual(2, arrayElements.Count);
 		}
 		
+		[Test]
+		public void ParamsAttribute_Getter_ReturnType()
+		{
+			ITypeDefinition type = GetTypeDefinition(typeof(ParamsAttribute));
+			IProperty prop = type.Properties.Single(p => p.Name == "Property");
+			Assert.AreEqual(0, prop.Getter.Attributes.Count);
+			Assert.AreEqual(1, prop.Getter.ReturnTypeAttributes.Count);
+		}
+		
 		[Test]
 		public void DoubleAttribute_ImplicitNumericConversion()
 		{
@@ -947,6 +994,16 @@ namespace ICSharpCode.NRefactory.TypeSystem
 			Assert.IsFalse(prop4.Setter.IsStatic);
 		}
 		
+		[Test]
+		public void PropertyAccessorsHaveBody()
+		{
+			ITypeDefinition type = GetTypeDefinition(typeof(ClassWithStaticAndNonStaticMembers));
+			foreach (var prop in type.Properties) {
+				Assert.IsTrue(prop.Getter.HasBody, prop.Getter.Name);
+				Assert.IsTrue(prop.Setter.HasBody, prop.Setter.Name);
+			}
+		}
+		
 		[Test]
 		public void EventAccessorNames()
 		{
@@ -959,6 +1016,16 @@ namespace ICSharpCode.NRefactory.TypeSystem
 			Assert.AreEqual("add_Event3", normalEvent.AddAccessor.Name);
 			Assert.AreEqual("remove_Event3", normalEvent.RemoveAccessor.Name);
 		}
+		
+		[Test]
+		public void EventAccessorHaveBody()
+		{
+			ITypeDefinition type = GetTypeDefinition(typeof(ClassWithStaticAndNonStaticMembers));
+			foreach (var ev in type.Events) {
+				Assert.IsTrue(ev.AddAccessor.HasBody, ev.AddAccessor.Name);
+				Assert.IsTrue(ev.RemoveAccessor.HasBody, ev.RemoveAccessor.Name);
+			}
+		}
 
 		[Test]
 		public void InterfacePropertyAccessorsShouldNotBeOverrides() {
@@ -1346,5 +1413,53 @@ namespace ICSharpCode.NRefactory.TypeSystem
 			Assert.That(events.Select(e => e.RemoveAccessor.ImplementedInterfaceMembers.Count).ToList(), Is.EquivalentTo(new[] { 0, 1 }));
 			Assert.AreEqual(events.SelectMany(e => e.RemoveAccessor.ImplementedInterfaceMembers).Single(), ievent.RemoveAccessor);
 		}
+
+
+		[Test]
+		public void MarshalTests()
+		{
+			ITypeDefinition c = compilation.FindType(typeof(IMarshalAsTests)).GetDefinition();
+			Assert.AreEqual(1, c.GetMethods(m => m.Name == "GetCollectionByQuery2").Count());
+		}
+
+
+		[Test]
+		public void AttributesUsingNestedMembers() {
+			var type = GetTypeDefinition(typeof(ClassWithAttributesUsingNestedMembers));
+			var inner = type.GetNestedTypes().Single(t => t.Name == "Inner");
+			var myAttribute = type.GetNestedTypes().Single(t => t.Name == "MyAttribute");
+			var typeTypeTestAttr = type.Attributes.Single(a => a.AttributeType.Name == "TypeTestAttribute");
+			Assert.AreEqual(42, typeTypeTestAttr.PositionalArguments[0].ConstantValue);
+			Assert.IsInstanceOf<TypeOfResolveResult>(typeTypeTestAttr.PositionalArguments[1]);
+			Assert.AreEqual(inner, ((TypeOfResolveResult)typeTypeTestAttr.PositionalArguments[1]).ReferencedType);
+			var typeMyAttr = type.Attributes.Single(a => a.AttributeType.Name == "MyAttribute");
+			Assert.AreEqual(myAttribute, typeMyAttr.AttributeType);
+
+			var prop = type.GetProperties().Single(p => p.Name == "P");
+			var propTypeTestAttr = prop.Attributes.Single(a => a.AttributeType.Name == "TypeTestAttribute");
+			Assert.AreEqual(42, propTypeTestAttr.PositionalArguments[0].ConstantValue);
+			Assert.IsInstanceOf<TypeOfResolveResult>(propTypeTestAttr.PositionalArguments[1]);
+			Assert.AreEqual(inner, ((TypeOfResolveResult)propTypeTestAttr.PositionalArguments[1]).ReferencedType);
+			var propMyAttr = prop.Attributes.Single(a => a.AttributeType.Name == "MyAttribute");
+			Assert.AreEqual(myAttribute, propMyAttr.AttributeType);
+
+			var attributedInner = (ITypeDefinition)type.GetNestedTypes().Single(t => t.Name == "AttributedInner");
+			var innerTypeTestAttr = attributedInner.Attributes.Single(a => a.AttributeType.Name == "TypeTestAttribute");
+			Assert.AreEqual(42, innerTypeTestAttr.PositionalArguments[0].ConstantValue);
+			Assert.IsInstanceOf<TypeOfResolveResult>(innerTypeTestAttr.PositionalArguments[1]);
+			Assert.AreEqual(inner, ((TypeOfResolveResult)innerTypeTestAttr.PositionalArguments[1]).ReferencedType);
+			var innerMyAttr = attributedInner.Attributes.Single(a => a.AttributeType.Name == "MyAttribute");
+			Assert.AreEqual(myAttribute, innerMyAttr.AttributeType);
+
+			var attributedInner2 = (ITypeDefinition)type.GetNestedTypes().Single(t => t.Name == "AttributedInner2");
+			var inner2 = attributedInner2.GetNestedTypes().Single(t => t.Name == "Inner");
+			var myAttribute2 = attributedInner2.GetNestedTypes().Single(t => t.Name == "MyAttribute");
+			var inner2TypeTestAttr = attributedInner2.Attributes.Single(a => a.AttributeType.Name == "TypeTestAttribute");
+			Assert.AreEqual(43, inner2TypeTestAttr.PositionalArguments[0].ConstantValue);
+			Assert.IsInstanceOf<TypeOfResolveResult>(inner2TypeTestAttr.PositionalArguments[1]);
+			Assert.AreEqual(inner2, ((TypeOfResolveResult)inner2TypeTestAttr.PositionalArguments[1]).ReferencedType);
+			var inner2MyAttr = attributedInner2.Attributes.Single(a => a.AttributeType.Name == "MyAttribute");
+			Assert.AreEqual(myAttribute2, inner2MyAttr.AttributeType);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/AssemblyInfo.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/AssemblyInfo.cs
deleted file mode 100644
index 065e001fe5..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("NRefactory Test")]
-[assembly: AssemblyDescription("Unit tests for the parser and refactoring library for C# and VB.NET")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("ic#code")]
-[assembly: AssemblyProduct("SharpDevelop")]
-[assembly: AssemblyCopyright("2004-2006 AlphaSierraPapa")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("2.0.0.1")]
-
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/General/UnitTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/General/UnitTest.cs
deleted file mode 100644
index def7d7d0f5..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/General/UnitTest.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.Reflection;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Ast;
-using ICSharpCode.NRefactory.VB.Parser;
-
-namespace ICSharpCode.NRefactory.VB.Tests
-{
-	[TestFixture]
-	public class StructuralTest
-	{
-//		[Test]
-//		public void TestToStringMethods()
-//		{
-//			Type[] allTypes = typeof(INode).Assembly.GetTypes();
-//			
-//			foreach (Type type in allTypes) {
-//				if (type.IsClass && !type.IsAbstract && !type.IsNested && type.GetInterface(typeof(INode).FullName) != null) {
-//					MethodInfo methodInfo = type.GetMethod("ToString", BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public);
-//					Assert.IsNotNull(methodInfo, "ToString() not found in " + type.FullName);
-//				}
-//			}
-//		}
-//		
-//		[Test]
-//		public void TestUnitTests()
-//		{
-//			Type[] allTypes = typeof(StructuralTest).Assembly.GetTypes();
-//			
-//			foreach (Type type in allTypes) {
-//				if (type.GetCustomAttributes(typeof(TestFixtureAttribute), true).Length > 0) {
-//					foreach (MethodInfo m in type.GetMethods()) {
-//						if (m.IsPublic && m.ReturnType == typeof(void) && m.GetParameters().Length == 0) {
-//							if (m.GetCustomAttributes(typeof(TestAttribute), true).Length == 0) {
-//								Assert.Fail(type.Name + "." + m.Name + " should have the [Test] attribute!");
-//							}
-//						}
-//					}
-//				}
-//			}
-//		}
-//		
-//		[Test]
-//		public void TestAcceptVisitorMethods()
-//		{
-//			Type[] allTypes = typeof(AbstractNode).Assembly.GetTypes();
-//
-//			foreach (Type type in allTypes) {
-//				if (type.IsClass && !type.IsAbstract && type.GetInterface(typeof(INode).FullName) != null) {
-//					MethodInfo methodInfo = type.GetMethod("AcceptVisitor", BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public);
-//					Assertion.AssertNotNull("AcceptVisitor() not found in " + type.FullName, methodInfo);
-//				}
-//			}
-//		}
-//		
-//		[Test]
-//		public void TestIAstVisitor()
-//		{
-//			Type[] allTypes = typeof(AbstractNode).Assembly.GetTypes();
-//			Type visitor = typeof(IAstVisitor);
-//			
-//			foreach (Type type in allTypes) {
-//				if (type.IsClass && !type.IsAbstract && !type.IsNested && type.GetInterface(typeof(INode).FullName) != null && !type.Name.StartsWith("Null")) {
-//					MethodInfo methodInfo = visitor.GetMethod("Visit" + type.Name, BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.ExactBinding, null, new Type[] {type, typeof(object)}, null);
-//					Assert.IsNotNull(methodInfo, "Visit with parameter " + type.FullName + " not found");
-//					Assert.AreEqual(2, methodInfo.GetParameters().Length);
-//					ParameterInfo first = methodInfo.GetParameters()[0];
-//					Assert.AreEqual(Char.ToLower(first.ParameterType.Name[0]) + first.ParameterType.Name.Substring(1), first.Name);
-//					
-//					ParameterInfo second = methodInfo.GetParameters()[1];
-//					Assert.AreEqual(typeof(System.Object), second.ParameterType);
-//					Assert.AreEqual("data", second.Name);
-//				}
-//			}
-//		}
-//		
-//		[Test]
-//		public void TestAbstractAstVisitorVisitor()
-//		{
-//			Type[] allTypes = typeof(AbstractNode).Assembly.GetTypes();
-//			Type visitor = typeof(AbstractAstVisitor);
-//			
-//			foreach (Type type in allTypes) {
-//				if (type.IsClass && !type.IsAbstract && !type.IsNested && type.GetInterface(typeof(INode).FullName) != null && !type.Name.StartsWith("Null")) {
-//					MethodInfo methodInfo = visitor.GetMethod("Visit" + type.Name, BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.ExactBinding, null, new Type[] {type, typeof(object)}, null);
-//					Assert.IsNotNull(methodInfo, "Visit with parameter " + type.FullName + " not found");
-//					
-//					Assert.AreEqual(2, methodInfo.GetParameters().Length);
-//					ParameterInfo first = methodInfo.GetParameters()[0];
-//					Assert.AreEqual(Char.ToLower(first.ParameterType.Name[0]) + first.ParameterType.Name.Substring(1), first.Name);
-//					
-//					ParameterInfo second = methodInfo.GetParameters()[1];
-//					Assert.AreEqual(typeof(System.Object), second.ParameterType);
-//					Assert.AreEqual("data", second.Name);
-//				}
-//			}
-//		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/ICSharpCode.NRefactory.VB.Tests.csproj b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/ICSharpCode.NRefactory.VB.Tests.csproj
deleted file mode 100644
index aab1620cb7..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/ICSharpCode.NRefactory.VB.Tests.csproj
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50215</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{870115DD-960A-4406-A6B9-600BCDC36A03}</ProjectGuid>
-    <RootNamespace>ICSharpCode.NRefactory.VB.Tests</RootNamespace>
-    <AssemblyName>ICSharpCode.NRefactory.VB.Tests</AssemblyName>
-    <OutputTarget>Library</OutputTarget>
-    <NoStdLib>False</NoStdLib>
-    <NoConfig>False</NoConfig>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <OutputType>Library</OutputType>
-    <OutputPath>..\..\..\..\bin\UnitTests\</OutputPath>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG</DefineConstants>
-    <Optimize>False</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>True</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>Full</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-    <StartAction>Project</StartAction>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugSymbols>False</DebugSymbols>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>4194304</BaseAddress>
-    <FileAlignment>4096</FileAlignment>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG</DefineConstants>
-    <Optimize>False</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <Optimize>True</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>4194304</BaseAddress>
-    <FileAlignment>4096</FileAlignment>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\Mono.Cecil\Test\libs\nunit-2.4.8\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="General\UnitTest.cs" />
-    <Compile Include="Lexer\CustomLexerTests.cs" />
-    <Compile Include="Lexer\ImplicitLineContinuationTests.cs" />
-    <Compile Include="Lexer\LATextReaderTests.cs" />
-    <Compile Include="Lexer\LexerContextTests.cs" />
-    <Compile Include="Lexer\LexerPositionTests.cs" />
-    <Compile Include="Lexer\LexerTests.cs" />
-    <Compile Include="Lexer\LiteralsTests.cs" />
-    <Compile Include="Lexer\TokenTests.cs" />
-    <Compile Include="Lexer\XmlModeLexerTests.cs" />
-    <Compile Include="Parser\GlobalScope\AttributeSectionTests.cs" />
-    <Compile Include="Parser\GlobalScope\NamespaceDeclarationTests.cs" />
-    <Compile Include="Parser\GlobalScope\ImportsStatementTests.cs" />
-    <Compile Include="Parser\GlobalScope\TypeDeclarationTests.cs" />
-    <Compile Include="Parser\SnippetParserTests.cs" />
-    <Compile Include="Parser\ParseUtil.cs" />
-    <Compile Include="Parser\GlobalScope\OptionStatementTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ICSharpCode.NRefactory.VB\ICSharpCode.NRefactory.VB.csproj">
-      <Project>{7B82B671-419F-45F4-B778-D9286F996EFA}</Project>
-      <Name>ICSharpCode.NRefactory.VB</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/CustomLexerTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/CustomLexerTests.cs
deleted file mode 100644
index c37cf1b02d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/CustomLexerTests.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Lexer
-{
-	[TestFixture]
-	public class CustomLexerTests
-	{
-		VBLexer GenerateLexer(StringReader sr)
-		{
-			return new VBLexer(sr);
-		}
-		
-		[Test]
-		public void TestSingleEOLForMulitpleLines()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Stop\n\n\nEnd"));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.Stop));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOL));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.End));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOL));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOF));
-		}
-		
-		[Test]
-		public void TestSingleEOLForMulitpleLinesWithContinuation()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Stop\n _\n\nEnd"));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.Stop));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOL));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.End));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOL));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOF));
-		}
-		
-		[Test]
-		public void EscapedIdentifier()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("[Stop]"));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.Identifier));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOL));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOF));
-		}
-		
-		[Test]
-		public void IdentifierWithTypeCharacter()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Stop$"));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.Identifier));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOL));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOF));
-		}
-		
-		[Test]
-		public void ExclamationMarkIsTypeCharacter()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("a!=b"));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.Identifier));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.Assign));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.Identifier));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOL));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOF));
-		}
-		
-		[Test]
-		public void ExclamationMarkIsTypeCharacter2()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("a! b"));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.Identifier));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.Identifier));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOL));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOF));
-		}
-		
-		[Test]
-		public void ExclamationMarkIsIdentifier()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("a!b"));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.Identifier));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.ExclamationMark));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.Identifier));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOL));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOF));
-		}
-		
-		[Test]
-		public void ExclamationMarkIsIdentifier2()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("a![b]"));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.Identifier));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.ExclamationMark));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.Identifier));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOL));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOF));
-		}
-		
-		[Test]
-		public void RemCommentTest()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("a rem b"));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.Identifier));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOL));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOF));
-		}
-		
-		[Test]
-		public void RemCommentTest2()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("REM c"));
-			Assert.That(lexer.NextToken().Kind, Is.EqualTo(Tokens.EOF));
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/ImplicitLineContinuationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/ImplicitLineContinuationTests.cs
deleted file mode 100644
index 8e5bcdb71d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/ImplicitLineContinuationTests.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using ICSharpCode.NRefactory.VB.Parser;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Lexer
-{
-	[TestFixture]
-	public class ImplicitLineContinuationTests
-	{
-		[Test]
-		public void Example1()
-		{
-			string code = @"Module Test
-    Sub Print(
-        Param1 As Integer,
-        Param2 As Integer)
-
-        If (Param1 < Param2) Or
-           (Param1 > Param2) Then
-            Console.WriteLine(""Not equal"")
-        End If
-    End Sub
-End Module";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(code));
-			
-			CheckTokens(lexer, Tokens.Module, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Sub, Tokens.Identifier, Tokens.OpenParenthesis,
-			            Tokens.Identifier, Tokens.As, Tokens.Integer, Tokens.Comma,
-			            Tokens.Identifier, Tokens.As, Tokens.Integer, Tokens.CloseParenthesis, Tokens.EOL,
-			            Tokens.If, Tokens.OpenParenthesis, Tokens.Identifier, Tokens.LessThan, Tokens.Identifier, Tokens.CloseParenthesis, Tokens.Or,
-			            Tokens.OpenParenthesis, Tokens.Identifier, Tokens.GreaterThan, Tokens.Identifier, Tokens.CloseParenthesis, Tokens.Then, Tokens.EOL,
-			            Tokens.Identifier, Tokens.Dot, Tokens.Identifier, Tokens.OpenParenthesis, Tokens.LiteralString, Tokens.CloseParenthesis, Tokens.EOL,
-			            Tokens.End, Tokens.If, Tokens.EOL,
-			            Tokens.End, Tokens.Sub, Tokens.EOL,
-			            Tokens.End, Tokens.Module);
-		}
-		
-		[Test]
-		public void QualifierInWith()
-		{
-			string code = @"Module Test
-	Sub Print
-		With xml
-			Dim a = b.
-				d
-			Dim c = .
-				Count
-		End With
-	End Sub
-End Module";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(code));
-			
-			CheckTokens(lexer, Tokens.Module, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Sub, Tokens.Identifier, Tokens.EOL,
-			            Tokens.With, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Dim, Tokens.Identifier, Tokens.Assign, Tokens.Identifier, Tokens.Dot, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Dim, Tokens.Identifier, Tokens.Assign, Tokens.Dot, Tokens.EOL,
-			            Tokens.Identifier, Tokens.EOL,
-			            Tokens.End, Tokens.With, Tokens.EOL,
-			            Tokens.End, Tokens.Sub, Tokens.EOL,
-			            Tokens.End, Tokens.Module);
-		}
-		
-		[Test]
-		public void Example2()
-		{
-			string code = @"Module Test
-	Sub Print
-		Dim a = _
-			
-			y
-	End Sub
-End Module";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(code));
-			
-			CheckTokens(lexer, Tokens.Module, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Sub, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Dim, Tokens.Identifier, Tokens.Assign, Tokens.EOL, Tokens.Identifier, Tokens.EOL,
-			            Tokens.End, Tokens.Sub, Tokens.EOL,
-			            Tokens.End, Tokens.Module);
-		}
-		
-		[Test]
-		public void Query()
-		{
-			string code = @"Module Test
-	Sub A
-		Dim q = From x In a
-			Select x
-	End Sub
-End Module";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(code));
-			
-			CheckTokens(lexer, Tokens.Module, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Sub, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Dim, Tokens.Identifier, Tokens.Assign, Tokens.From, Tokens.Identifier, Tokens.In, Tokens.Identifier,
-			            Tokens.Select, Tokens.Identifier, Tokens.EOL,
-			            Tokens.End, Tokens.Sub, Tokens.EOL,
-			            Tokens.End, Tokens.Module);
-		}
-		
-		[Test]
-		public void Query1()
-		{
-			string code = @"Module Test
-	Sub A
-		Dim actions = From a in b Select Sub()
-									    Dim i = 1
-									    Select Case i
-									    End Select
-									End Sub
-	End Sub
-End Module";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(code));
-			
-			CheckTokens(lexer, Tokens.Module, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Sub, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Dim, Tokens.Identifier, Tokens.Assign, Tokens.From, Tokens.Identifier, Tokens.In, Tokens.Identifier, Tokens.Select, Tokens.Sub, Tokens.OpenParenthesis, Tokens.CloseParenthesis, Tokens.EOL,
-			            Tokens.Dim, Tokens.Identifier, Tokens.Assign, Tokens.LiteralInteger, Tokens.EOL,
-			            Tokens.Select, Tokens.Case, Tokens.Identifier, Tokens.EOL,
-			            Tokens.End, Tokens.Select, Tokens.EOL,
-			            Tokens.End, Tokens.Sub, Tokens.EOL,
-			            Tokens.End, Tokens.Sub, Tokens.EOL,
-			            Tokens.End, Tokens.Module);
-		}
-		
-		/// <remarks>tests http://community.sharpdevelop.net/forums/p/12068/32893.aspx#32893</remarks>
-		[Test]
-		public void Bug_Thread12068()
-		{
-			string code = @"Class MainClass
-  Public Shared Sub Main()
-	Dim categoryNames = From p In AList  _
-           Select p.AFunction(1,2,3) _
-           Distinct
-  End Sub
-End Class";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(code));
-			
-			CheckTokens(
-				lexer, Tokens.Class, Tokens.Identifier, Tokens.EOL,
-				Tokens.Public, Tokens.Shared, Tokens.Sub, Tokens.Identifier, Tokens.OpenParenthesis, Tokens.CloseParenthesis, Tokens.EOL,
-				Tokens.Dim, Tokens.Identifier, Tokens.Assign, Tokens.From, Tokens.Identifier, Tokens.In, Tokens.Identifier,
-				Tokens.Select, Tokens.Identifier, Tokens.Dot, Tokens.Identifier, Tokens.OpenParenthesis, Tokens.LiteralInteger,
-				Tokens.Comma, Tokens.LiteralInteger, Tokens.Comma, Tokens.LiteralInteger, Tokens.CloseParenthesis,
-				Tokens.Distinct, Tokens.EOL,
-				Tokens.End, Tokens.Sub, Tokens.EOL,
-				Tokens.End, Tokens.Class
-			);
-		}
-		
-		[Test]
-		public void LineContinuationAfterAttributes()
-		{
-			string code = @"<TestFixture>
-Public Class TestContinuation
-    <Test>
-    Public Sub TestMethod
-        Assert.Fail
-    End Sub
-    
-    <Test> _
-    Public Sub TestMethod2
-        Assert.Fail
-    End Sub
-End Class";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(code));
-			
-			CheckTokens(
-				lexer, Tokens.LessThan, Tokens.Identifier, Tokens.GreaterThan,
-				Tokens.Public, Tokens.Class, Tokens.Identifier, Tokens.EOL,
-				Tokens.LessThan, Tokens.Identifier, Tokens.GreaterThan,
-				Tokens.Public, Tokens.Sub, Tokens.Identifier, Tokens.EOL,
-				Tokens.Identifier, Tokens.Dot, Tokens.Identifier, Tokens.EOL,
-				Tokens.End, Tokens.Sub, Tokens.EOL,
-				Tokens.LessThan, Tokens.Identifier, Tokens.GreaterThan,
-				Tokens.Public, Tokens.Sub, Tokens.Identifier, Tokens.EOL,
-				Tokens.Identifier, Tokens.Dot, Tokens.Identifier, Tokens.EOL,
-				Tokens.End, Tokens.Sub, Tokens.EOL,
-				Tokens.End, Tokens.Class
-			);
-		}
-		
-		[Test]
-		public void NoILCAfterGlobalAttributes()
-		{
-			string code = "<Assembly: AssemblyTitle(\"My.UnitTests\")>" + Environment.NewLine +
-				"<Assembly: AssemblyDescription(\"\")>";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(code));
-			
-			CheckTokens(
-				lexer, Tokens.LessThan, Tokens.Assembly, Tokens.Colon,
-				Tokens.Identifier, Tokens.OpenParenthesis, Tokens.LiteralString,
-				Tokens.CloseParenthesis, Tokens.GreaterThan, Tokens.EOL,
-				Tokens.LessThan, Tokens.Assembly, Tokens.Colon,
-				Tokens.Identifier, Tokens.OpenParenthesis, Tokens.LiteralString,
-				Tokens.CloseParenthesis, Tokens.GreaterThan
-			);
-		}
-		
-		#region Helpers
-		VBLexer GenerateLexer(StringReader sr)
-		{
-			return new VBLexer(sr);
-		}
-		
-		void CheckTokens(VBLexer lexer, params int[] tokens)
-		{
-			for (int i = 0; i < tokens.Length; i++) {
-				int token = tokens[i];
-				Token t = lexer.NextToken();
-				int next = t.Kind;
-				Assert.AreEqual(token, next, "{2} of {3}: {0} != {1}; at {4}", Tokens.GetTokenString(token), Tokens.GetTokenString(next), i + 1, tokens.Length, t.Location);
-			}
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LATextReaderTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LATextReaderTests.cs
deleted file mode 100644
index 2671dad2ea..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LATextReaderTests.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using ICSharpCode.NRefactory.VB.Parser;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Lexer
-{
-	[TestFixture]
-	public class LATextReaderTests
-	{
-		[Test]
-		public void TestPeek()
-		{
-			LATextReader reader = new LATextReader(new StringReader("abcd"));
-			
-			CheckPeek(reader, 0, 'a');
-			CheckPeek(reader, 2, 'c');
-			CheckPeek(reader, 3, 'd');
-			CheckPeek(reader, 1, 'b');
-			CheckPeek(reader, 0, 'a');
-			Assert.AreEqual((int)'a', reader.Read());
-			CheckPeek(reader, 1, 'c');
-			CheckPeek(reader, 2, 'd');
-			CheckPeek(reader, 0, 'b');
-		}
-		
-		void CheckPeek(LATextReader reader, int num1, char char2)
-		{
-			Assert.AreEqual((int)char2, reader.Peek(num1));
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LexerContextTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LexerContextTests.cs
deleted file mode 100644
index f04ab84692..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LexerContextTests.cs
+++ /dev/null
@@ -1,574 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Lexer
-{
-	[TestFixture]
-	public class LexerContextTests
-	{
-		[Test]
-		public void SimpleGlobal()
-		{
-			RunTest(
-				@"Option Explicit",
-				@"enter Global
-exit Global
-"
-			);
-		}
-		
-		[Test]
-		public void VariableWithXmlLiteral()
-		{
-			RunTest(
-				@"Class Test
-	Public Sub New()
-		Dim x = <a />
-	End Sub
-End Class
-",
-				@"enter Global
-	enter TypeDeclaration
-		enter Identifier
-		exit Identifier
-		enter Member
-			enter Identifier
-			exit Identifier
-			enter Body
-				enter Identifier
-				exit Identifier
-				enter Expression
-					enter Expression
-						enter Expression
-							enter Xml
-								enter Xml
-								exit Xml
-							exit Xml
-						exit Expression
-					exit Expression
-				exit Expression
-			exit Body
-		exit Member
-	exit TypeDeclaration
-exit Global
-"
-			);
-		}
-		
-		[Test]
-		public void MemberWithXmlLiteral()
-		{
-			RunTest(
-				@"Class Test
-	Private xml As XElement = <b />
-	
-	Public Sub New()
-		Dim x = <a />
-	End Sub
-End Class
-",
-				@"enter Global
-	enter TypeDeclaration
-		enter Identifier
-		exit Identifier
-		enter Member
-			enter Identifier
-			exit Identifier
-			enter Type
-			exit Type
-			enter Expression
-				enter Expression
-					enter Expression
-						enter Xml
-							enter Xml
-							exit Xml
-						exit Xml
-					exit Expression
-				exit Expression
-			exit Expression
-		exit Member
-		enter Member
-			enter Identifier
-			exit Identifier
-			enter Body
-				enter Identifier
-				exit Identifier
-				enter Expression
-					enter Expression
-						enter Expression
-							enter Xml
-								enter Xml
-								exit Xml
-							exit Xml
-						exit Expression
-					exit Expression
-				exit Expression
-			exit Body
-		exit Member
-	exit TypeDeclaration
-exit Global
-"
-			);
-		}
-		
-		[Test]
-		public void GlobalAttributeTest()
-		{
-			RunTest(
-				@"<assembly: CLSCompliant(True)>
-Class Test
-	Public Sub New()
-		Dim x = 5
-	End Sub
-End Class
-",
-				@"enter Global
-	enter Attribute
-	exit Attribute
-	enter TypeDeclaration
-		enter Identifier
-		exit Identifier
-		enter Member
-			enter Identifier
-			exit Identifier
-			enter Body
-				enter Identifier
-				exit Identifier
-				enter Expression
-					enter Expression
-						enter Expression
-						exit Expression
-					exit Expression
-				exit Expression
-			exit Body
-		exit Member
-	exit TypeDeclaration
-exit Global
-"
-			);
-		}
-		
-		[Test]
-		public void ClassAttributeTest()
-		{
-			RunTest(
-				@"<Serializable>
-Class Test
-	Public Sub New()
-		Dim x = 5
-	End Sub
-End Class
-",
-				@"enter Global
-	enter Attribute
-	exit Attribute
-	enter TypeDeclaration
-		enter Identifier
-		exit Identifier
-		enter Member
-			enter Identifier
-			exit Identifier
-			enter Body
-				enter Identifier
-				exit Identifier
-				enter Expression
-					enter Expression
-						enter Expression
-						exit Expression
-					exit Expression
-				exit Expression
-			exit Body
-		exit Member
-	exit TypeDeclaration
-exit Global
-"
-			);
-		}
-		
-		[Test]
-		public void MethodAttributeTest()
-		{
-			RunTest(
-				@"Class Test
-	<Test>
-	Public Sub New()
-		Dim x = 5
-	End Sub
-End Class
-",
-				@"enter Global
-	enter TypeDeclaration
-		enter Identifier
-		exit Identifier
-		enter Attribute
-		exit Attribute
-		enter Member
-			enter Identifier
-			exit Identifier
-			enter Body
-				enter Identifier
-				exit Identifier
-				enter Expression
-					enter Expression
-						enter Expression
-						exit Expression
-					exit Expression
-				exit Expression
-			exit Body
-		exit Member
-	exit TypeDeclaration
-exit Global
-"
-			);
-		}
-		
-		[Test]
-		public void WithBlockTest()
-		{
-			RunTest(
-				@"Class Test
-	Public Sub New()
-		With x
-			
-		End With
-	End Sub
-End Class
-",
-				@"enter Global
-	enter TypeDeclaration
-		enter Identifier
-		exit Identifier
-		enter Member
-			enter Identifier
-			exit Identifier
-			enter Body
-				enter Expression
-					enter Expression
-						enter Expression
-						exit Expression
-					exit Expression
-				exit Expression
-				enter Body
-				exit Body
-			exit Body
-		exit Member
-	exit TypeDeclaration
-exit Global
-"
-			);
-		}
-		
-		[Test]
-		public void StatementsTest()
-		{
-			RunTest(
-				@"Class Test
-	Public Sub New()
-		For i As Integer = 0 To 10
-		
-		Next
-	
-		For Each x As Integer In list
-		
-		Next
-		
-		Try
-		
-		Catch e As Exception
-		
-		End Try
-	End Sub
-End Class
-",
-				@"enter Global
-	enter TypeDeclaration
-		enter Identifier
-		exit Identifier
-		enter Member
-			enter Identifier
-			exit Identifier
-			enter Body
-				enter Identifier
-					enter Expression
-					exit Expression
-				exit Identifier
-				enter Type
-				exit Type
-				enter Expression
-					enter Expression
-						enter Expression
-						exit Expression
-					exit Expression
-					enter Expression
-						enter Expression
-						exit Expression
-					exit Expression
-				exit Expression
-				enter Body
-				exit Body
-				enter Identifier
-					enter Expression
-					exit Expression
-				exit Identifier
-				enter Type
-				exit Type
-				enter Expression
-					enter Expression
-						enter Expression
-						exit Expression
-					exit Expression
-				exit Expression
-				enter Body
-				exit Body
-				enter Body
-				exit Body
-				enter Identifier
-				exit Identifier
-				enter Type
-				exit Type
-				enter Body
-				exit Body
-			exit Body
-		exit Member
-	exit TypeDeclaration
-exit Global
-"
-			);
-		}
-		
-		[Test]
-		public void ClassTest()
-		{
-			RunTest(
-				@"Class MainClass ' a comment
-	Dim under_score_field As Integer
-	Sub SomeMethod()
-		simple += 1
-		For Each loopVarName In collection
-		Next
-	End Sub
-End Class",
-				@"enter Global
-	enter TypeDeclaration
-		enter Identifier
-		exit Identifier
-		enter Member
-			enter Identifier
-			exit Identifier
-			enter Type
-			exit Type
-		exit Member
-		enter Member
-			enter Identifier
-			exit Identifier
-			enter Body
-				enter Expression
-					enter Expression
-						enter Expression
-						exit Expression
-					exit Expression
-					enter Expression
-						enter Expression
-						exit Expression
-					exit Expression
-				exit Expression
-				enter Identifier
-					enter Expression
-					exit Expression
-				exit Identifier
-				enter Expression
-					enter Expression
-						enter Expression
-						exit Expression
-					exit Expression
-				exit Expression
-				enter Body
-				exit Body
-			exit Body
-		exit Member
-	exit TypeDeclaration
-exit Global
-");
-		}
-		
-		[Test]
-		public void CollectionInitializer()
-		{
-			RunTest(@"'
-' Created by SharpDevelop.
-' User: Siegfried
-' Date: 22.06.2010
-' Time: 21:29
-'
-' To change this template use Tools | Options | Coding | Edit Standard Headers.
-'
-
-Option Infer On
-
-Imports System.Linq
-Imports System.Xml.Linq
-
-Module Program
-	Sub Main()
-		Console.WriteLine(""Hello World!"")
-		
-		Dim name = ""Test""
-		Dim content = { 4, 5, New XAttribute(""a"", 3) }
-		
-		Dim xml = <<%= name %> <%= content %> />
-		
-		Console.ReadKey()
-	End Sub
-End Module",
-			        @"enter Global
-	enter Importable
-	exit Importable
-	enter Importable
-	exit Importable
-	enter TypeDeclaration
-		enter Identifier
-		exit Identifier
-		enter Member
-			enter Identifier
-			exit Identifier
-			enter Body
-				enter Expression
-					enter Expression
-						enter Expression
-						exit Expression
-						enter Expression
-							enter Expression
-								enter Expression
-									enter Expression
-									exit Expression
-								exit Expression
-							exit Expression
-						exit Expression
-					exit Expression
-				exit Expression
-				enter Identifier
-				exit Identifier
-				enter Expression
-					enter Expression
-						enter Expression
-						exit Expression
-					exit Expression
-				exit Expression
-				enter Identifier
-				exit Identifier
-				enter Expression
-					enter Expression
-						enter Expression
-							enter Expression
-								enter Expression
-								exit Expression
-							exit Expression
-						exit Expression
-						enter Expression
-							enter Expression
-								enter Expression
-								exit Expression
-							exit Expression
-						exit Expression
-						enter Expression
-							enter Expression
-								enter ObjectCreation
-									enter Expression
-										enter Expression
-											enter Expression
-												enter Expression
-												exit Expression
-											exit Expression
-										exit Expression
-										enter Expression
-											enter Expression
-												enter Expression
-												exit Expression
-											exit Expression
-										exit Expression
-									exit Expression
-								exit ObjectCreation
-							exit Expression
-						exit Expression
-					exit Expression
-				exit Expression
-				enter Identifier
-				exit Identifier
-				enter Expression
-					enter Expression
-						enter Expression
-							enter Xml
-								enter Xml
-									enter Expression
-										enter Expression
-											enter Expression
-											exit Expression
-										exit Expression
-									exit Expression
-									enter Expression
-										enter Expression
-											enter Expression
-											exit Expression
-										exit Expression
-									exit Expression
-								exit Xml
-							exit Xml
-						exit Expression
-					exit Expression
-				exit Expression
-				enter Expression
-					enter Expression
-						enter Expression
-						exit Expression
-						enter Expression
-						exit Expression
-					exit Expression
-				exit Expression
-			exit Body
-		exit Member
-	exit TypeDeclaration
-exit Global
-");
-		}
-		
-		[Test]
-		public void Imports()
-		{
-			RunTest(@"Imports System
-Imports System.Linq
-Imports System.Collections.Generic",
-			        @"enter Global
-	enter Importable
-	exit Importable
-	enter Importable
-	exit Importable
-	enter Importable
-	exit Importable
-exit Global
-");
-		}
-		
-		void RunTest(string code, string expectedOutput)
-		{
-			ExpressionFinder p = new ExpressionFinder();
-			VBLexer lexer = new VBLexer(new StringReader(code));
-			Token t;
-			
-			do {
-				t = lexer.NextToken();
-				p.InformToken(t);
-			} while (t.Kind != Tokens.EOF);
-			
-			Console.WriteLine(p.Output);
-			
-			Assert.IsEmpty(p.Errors);
-			
-			Assert.AreEqual(expectedOutput, p.Output);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LexerPositionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LexerPositionTests.cs
deleted file mode 100644
index 8525f63f8e..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LexerPositionTests.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using ICSharpCode.NRefactory.VB.Parser;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Lexer
-{
-	[TestFixture]
-	public class LexerPositionTests
-	{
-		VBLexer GenerateLexer(string s)
-		{
-			return new VBLexer(new StringReader(s));
-		}
-		
-		[Test]
-		public void TestNewLine()
-		{
-			VBLexer l = GenerateLexer("public\nstatic");
-			Token t = l.NextToken();
-			Assert.AreEqual(Tokens.Public, t.Kind);
-			Assert.AreEqual(new AstLocation(1, 1), t.Location);
-			Assert.AreEqual(new AstLocation(1, 7), t.EndLocation);
-			t = l.NextToken();
-			Assert.AreEqual(Tokens.EOL, t.Kind);
-			Assert.AreEqual(new AstLocation(1, 7), t.Location);
-			Assert.AreEqual(new AstLocation(2, 1), t.EndLocation);
-			t = l.NextToken();
-			Assert.AreEqual(Tokens.Static, t.Kind);
-			Assert.AreEqual(new AstLocation(2, 1), t.Location);
-			Assert.AreEqual(new AstLocation(2, 7), t.EndLocation);
-		}
-		
-		[Test]
-		public void TestCarriageReturnNewLine()
-		{
-			VBLexer l = GenerateLexer("public\r\nstatic");
-			Token t = l.NextToken();
-			Assert.AreEqual(Tokens.Public, t.Kind);
-			Assert.AreEqual(new AstLocation(1, 1), t.Location);
-			Assert.AreEqual(new AstLocation(1, 7), t.EndLocation);
-			t = l.NextToken();
-			Assert.AreEqual(Tokens.EOL, t.Kind);
-			Assert.AreEqual(new AstLocation(1, 7), t.Location);
-			Assert.AreEqual(new AstLocation(2, 1), t.EndLocation);
-			t = l.NextToken();
-			Assert.AreEqual(Tokens.Static, t.Kind);
-			Assert.AreEqual(new AstLocation(2, 1), t.Location);
-			Assert.AreEqual(new AstLocation(2, 7), t.EndLocation);
-		}
-		
-		[Test]
-		public void TestPositionOfEOF1()
-		{
-			VBLexer l = GenerateLexer("public");
-			l.NextToken(); // public
-			Token t = l.NextToken();
-			Assert.AreEqual(Tokens.EOL, t.Kind);
-			Assert.AreEqual(new AstLocation(1, 7), t.Location);
-			Assert.AreEqual(new AstLocation(1, 7), t.EndLocation);
-			
-			t = l.NextToken();
-			Assert.AreEqual(Tokens.EOF, t.Kind);
-			Assert.AreEqual(new AstLocation(1, 7), t.Location);
-			Assert.AreEqual(new AstLocation(1, 7), t.EndLocation);
-		}
-		
-		[Test]
-		public void TestPositionOfEOF2()
-		{
-			VBLexer l = GenerateLexer("public _\n ");
-			l.NextToken(); // public
-			Token t = l.NextToken();
-			Assert.AreEqual(Tokens.EOL, t.Kind);
-			Assert.AreEqual(new AstLocation(2, 2), t.Location);
-			Assert.AreEqual(new AstLocation(2, 2), t.EndLocation);
-			
-			t = l.NextToken();
-			Assert.AreEqual(Tokens.EOF, t.Kind);
-			Assert.AreEqual(new AstLocation(2, 2), t.Location);
-			Assert.AreEqual(new AstLocation(2, 2), t.EndLocation);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LexerTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LexerTests.cs
deleted file mode 100644
index 9b2ec83867..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LexerTests.cs
+++ /dev/null
@@ -1,1538 +0,0 @@
-// this file was autogenerated by a tool.
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.PrettyPrinter;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Lexer
-{
-	[TestFixture]
-	public sealed class LexerTests
-	{
-		VBLexer GenerateLexer(StringReader sr)
-		{
-			return new VBLexer(sr);
-		}
-
-		[Test]
-		public void TestAssign()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("="));
-			Assert.AreEqual(Tokens.Assign, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestColon()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(":"));
-			Assert.AreEqual(Tokens.Colon, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestComma()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(","));
-			Assert.AreEqual(Tokens.Comma, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestConcatString()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("&"));
-			Assert.AreEqual(Tokens.ConcatString, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestDiv()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("/"));
-			Assert.AreEqual(Tokens.Div, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestDivInteger()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("\\"));
-			Assert.AreEqual(Tokens.DivInteger, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestDot()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("."));
-			Assert.AreEqual(Tokens.Dot, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestTripleDot()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("..."));
-			Assert.AreEqual(Tokens.TripleDot, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestDotAt()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(".@"));
-			Assert.AreEqual(Tokens.DotAt, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestExclamationMark()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("!"));
-			Assert.AreEqual(Tokens.ExclamationMark, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestMinus()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("-"));
-			Assert.AreEqual(Tokens.Minus, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestPlus()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("+"));
-			Assert.AreEqual(Tokens.Plus, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestPower()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("^"));
-			Assert.AreEqual(Tokens.Power, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestQuestionMark()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("?"));
-			Assert.AreEqual(Tokens.QuestionMark, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestTimes()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("*"));
-			Assert.AreEqual(Tokens.Times, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestOpenCurlyBrace()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("{"));
-			Assert.AreEqual(Tokens.OpenCurlyBrace, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCloseCurlyBrace()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("}"));
-			Assert.AreEqual(Tokens.CloseCurlyBrace, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestOpenParenthesis()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("("));
-			Assert.AreEqual(Tokens.OpenParenthesis, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCloseParenthesis()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(")"));
-			Assert.AreEqual(Tokens.CloseParenthesis, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestGreaterThan()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(">"));
-			Assert.AreEqual(Tokens.GreaterThan, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestLessThan()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("<"));
-			Assert.AreEqual(Tokens.LessThan, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestNotEqual()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("<>"));
-			Assert.AreEqual(Tokens.NotEqual, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestGreaterEqual()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(">="));
-			Assert.AreEqual(Tokens.GreaterEqual, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestLessEqual()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("<="));
-			Assert.AreEqual(Tokens.LessEqual, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestShiftLeft()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("<<"));
-			Assert.AreEqual(Tokens.ShiftLeft, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestShiftRight()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(">>"));
-			Assert.AreEqual(Tokens.ShiftRight, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestPlusAssign()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("+="));
-			Assert.AreEqual(Tokens.PlusAssign, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestPowerAssign()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("^="));
-			Assert.AreEqual(Tokens.PowerAssign, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestMinusAssign()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("-="));
-			Assert.AreEqual(Tokens.MinusAssign, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestTimesAssign()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("*="));
-			Assert.AreEqual(Tokens.TimesAssign, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestDivAssign()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("/="));
-			Assert.AreEqual(Tokens.DivAssign, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestDivIntegerAssign()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("\\="));
-			Assert.AreEqual(Tokens.DivIntegerAssign, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestShiftLeftAssign()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("<<="));
-			Assert.AreEqual(Tokens.ShiftLeftAssign, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestShiftRightAssign()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(">>="));
-			Assert.AreEqual(Tokens.ShiftRightAssign, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestConcatStringAssign()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("&="));
-			Assert.AreEqual(Tokens.ConcatStringAssign, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestColonAssign()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(":="));
-			Assert.AreEqual(Tokens.ColonAssign, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestAddHandler()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("AddHandler"));
-			Assert.AreEqual(Tokens.AddHandler, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestAddressOf()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("AddressOf"));
-			Assert.AreEqual(Tokens.AddressOf, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestAggregate()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Aggregate"));
-			Assert.AreEqual(Tokens.Aggregate, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestAlias()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Alias"));
-			Assert.AreEqual(Tokens.Alias, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestAnd()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("And"));
-			Assert.AreEqual(Tokens.And, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestAndAlso()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("AndAlso"));
-			Assert.AreEqual(Tokens.AndAlso, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestAnsi()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Ansi"));
-			Assert.AreEqual(Tokens.Ansi, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestAs()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("As"));
-			Assert.AreEqual(Tokens.As, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestAscending()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Ascending"));
-			Assert.AreEqual(Tokens.Ascending, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestAssembly()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Assembly"));
-			Assert.AreEqual(Tokens.Assembly, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestAuto()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Auto"));
-			Assert.AreEqual(Tokens.Auto, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestBinary()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Binary"));
-			Assert.AreEqual(Tokens.Binary, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestBoolean()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Boolean"));
-			Assert.AreEqual(Tokens.Boolean, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestByRef()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("ByRef"));
-			Assert.AreEqual(Tokens.ByRef, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestBy()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("By"));
-			Assert.AreEqual(Tokens.By, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestByte()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Byte"));
-			Assert.AreEqual(Tokens.Byte, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestByVal()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("ByVal"));
-			Assert.AreEqual(Tokens.ByVal, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCall()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Call"));
-			Assert.AreEqual(Tokens.Call, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCase()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Case"));
-			Assert.AreEqual(Tokens.Case, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCatch()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Catch"));
-			Assert.AreEqual(Tokens.Catch, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCBool()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("CBool"));
-			Assert.AreEqual(Tokens.CBool, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCByte()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("CByte"));
-			Assert.AreEqual(Tokens.CByte, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCChar()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("CChar"));
-			Assert.AreEqual(Tokens.CChar, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCDate()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("CDate"));
-			Assert.AreEqual(Tokens.CDate, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCDbl()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("CDbl"));
-			Assert.AreEqual(Tokens.CDbl, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCDec()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("CDec"));
-			Assert.AreEqual(Tokens.CDec, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestChar()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Char"));
-			Assert.AreEqual(Tokens.Char, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCInt()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("CInt"));
-			Assert.AreEqual(Tokens.CInt, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestClass()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Class"));
-			Assert.AreEqual(Tokens.Class, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCLng()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("CLng"));
-			Assert.AreEqual(Tokens.CLng, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCObj()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("CObj"));
-			Assert.AreEqual(Tokens.CObj, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCompare()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Compare"));
-			Assert.AreEqual(Tokens.Compare, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestConst()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Const"));
-			Assert.AreEqual(Tokens.Const, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestContinue()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Continue"));
-			Assert.AreEqual(Tokens.Continue, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCSByte()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("CSByte"));
-			Assert.AreEqual(Tokens.CSByte, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCShort()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("CShort"));
-			Assert.AreEqual(Tokens.CShort, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCSng()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("CSng"));
-			Assert.AreEqual(Tokens.CSng, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCStr()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("CStr"));
-			Assert.AreEqual(Tokens.CStr, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCType()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("CType"));
-			Assert.AreEqual(Tokens.CType, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCUInt()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("CUInt"));
-			Assert.AreEqual(Tokens.CUInt, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCULng()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("CULng"));
-			Assert.AreEqual(Tokens.CULng, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCUShort()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("CUShort"));
-			Assert.AreEqual(Tokens.CUShort, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestCustom()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Custom"));
-			Assert.AreEqual(Tokens.Custom, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestDate()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Date"));
-			Assert.AreEqual(Tokens.Date, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestDecimal()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Decimal"));
-			Assert.AreEqual(Tokens.Decimal, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestDeclare()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Declare"));
-			Assert.AreEqual(Tokens.Declare, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestDefault()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Default"));
-			Assert.AreEqual(Tokens.Default, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestDelegate()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Delegate"));
-			Assert.AreEqual(Tokens.Delegate, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestDescending()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Descending"));
-			Assert.AreEqual(Tokens.Descending, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestDim()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Dim"));
-			Assert.AreEqual(Tokens.Dim, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestDirectCast()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("DirectCast"));
-			Assert.AreEqual(Tokens.DirectCast, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestDistinct()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Distinct"));
-			Assert.AreEqual(Tokens.Distinct, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestDo()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Do"));
-			Assert.AreEqual(Tokens.Do, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestDouble()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Double"));
-			Assert.AreEqual(Tokens.Double, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestEach()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Each"));
-			Assert.AreEqual(Tokens.Each, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestElse()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Else"));
-			Assert.AreEqual(Tokens.Else, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestElseIf()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("ElseIf"));
-			Assert.AreEqual(Tokens.ElseIf, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestEnd()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("End"));
-			Assert.AreEqual(Tokens.End, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestEndIf()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("EndIf"));
-			Assert.AreEqual(Tokens.EndIf, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestEnum()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Enum"));
-			Assert.AreEqual(Tokens.Enum, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestEquals()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Equals"));
-			Assert.AreEqual(Tokens.Equals, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestErase()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Erase"));
-			Assert.AreEqual(Tokens.Erase, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestError()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Error"));
-			Assert.AreEqual(Tokens.Error, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestEvent()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Event"));
-			Assert.AreEqual(Tokens.Event, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestExit()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Exit"));
-			Assert.AreEqual(Tokens.Exit, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestExplicit()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Explicit"));
-			Assert.AreEqual(Tokens.Explicit, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestFalse()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("False"));
-			Assert.AreEqual(Tokens.False, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestFinally()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Finally"));
-			Assert.AreEqual(Tokens.Finally, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestFor()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("For"));
-			Assert.AreEqual(Tokens.For, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestFriend()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Friend"));
-			Assert.AreEqual(Tokens.Friend, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestFrom()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("From"));
-			Assert.AreEqual(Tokens.From, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestFunction()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Function"));
-			Assert.AreEqual(Tokens.Function, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestGet()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Get"));
-			Assert.AreEqual(Tokens.Get, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestGetType()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("GetType"));
-			Assert.AreEqual(Tokens.GetType, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestGlobal()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Global"));
-			Assert.AreEqual(Tokens.Global, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestGoSub()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("GoSub"));
-			Assert.AreEqual(Tokens.GoSub, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestGoTo()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("GoTo"));
-			Assert.AreEqual(Tokens.GoTo, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestGroup()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Group"));
-			Assert.AreEqual(Tokens.Group, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestHandles()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Handles"));
-			Assert.AreEqual(Tokens.Handles, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestIf()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("If"));
-			Assert.AreEqual(Tokens.If, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestImplements()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Implements"));
-			Assert.AreEqual(Tokens.Implements, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestImports()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Imports"));
-			Assert.AreEqual(Tokens.Imports, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestIn()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("In"));
-			Assert.AreEqual(Tokens.In, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestInfer()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Infer"));
-			Assert.AreEqual(Tokens.Infer, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestInherits()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Inherits"));
-			Assert.AreEqual(Tokens.Inherits, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestInteger()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Integer"));
-			Assert.AreEqual(Tokens.Integer, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestInterface()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Interface"));
-			Assert.AreEqual(Tokens.Interface, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestInto()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Into"));
-			Assert.AreEqual(Tokens.Into, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestIs()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Is"));
-			Assert.AreEqual(Tokens.Is, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestIsNot()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("IsNot"));
-			Assert.AreEqual(Tokens.IsNot, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestJoin()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Join"));
-			Assert.AreEqual(Tokens.Join, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestKey()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Key"));
-			Assert.AreEqual(Tokens.Key, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestLet()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Let"));
-			Assert.AreEqual(Tokens.Let, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestLib()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Lib"));
-			Assert.AreEqual(Tokens.Lib, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestLike()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Like"));
-			Assert.AreEqual(Tokens.Like, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestLong()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Long"));
-			Assert.AreEqual(Tokens.Long, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestLoop()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Loop"));
-			Assert.AreEqual(Tokens.Loop, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestMe()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Me"));
-			Assert.AreEqual(Tokens.Me, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestMod()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Mod"));
-			Assert.AreEqual(Tokens.Mod, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestModule()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Module"));
-			Assert.AreEqual(Tokens.Module, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestMustInherit()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("MustInherit"));
-			Assert.AreEqual(Tokens.MustInherit, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestMustOverride()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("MustOverride"));
-			Assert.AreEqual(Tokens.MustOverride, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestMyBase()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("MyBase"));
-			Assert.AreEqual(Tokens.MyBase, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestMyClass()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("MyClass"));
-			Assert.AreEqual(Tokens.MyClass, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestNamespace()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Namespace"));
-			Assert.AreEqual(Tokens.Namespace, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestNarrowing()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Narrowing"));
-			Assert.AreEqual(Tokens.Narrowing, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestNew()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("New"));
-			Assert.AreEqual(Tokens.New, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestNext()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Next"));
-			Assert.AreEqual(Tokens.Next, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestNot()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Not"));
-			Assert.AreEqual(Tokens.Not, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestNothing()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Nothing"));
-			Assert.AreEqual(Tokens.Nothing, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestNotInheritable()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("NotInheritable"));
-			Assert.AreEqual(Tokens.NotInheritable, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestNotOverridable()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("NotOverridable"));
-			Assert.AreEqual(Tokens.NotOverridable, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestObject()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Object"));
-			Assert.AreEqual(Tokens.Object, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestOf()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Of"));
-			Assert.AreEqual(Tokens.Of, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestOff()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Off"));
-			Assert.AreEqual(Tokens.Off, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestOn()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("On"));
-			Assert.AreEqual(Tokens.On, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestOperator()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Operator"));
-			Assert.AreEqual(Tokens.Operator, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestOption()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Option"));
-			Assert.AreEqual(Tokens.Option, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestOptional()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Optional"));
-			Assert.AreEqual(Tokens.Optional, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestOr()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Or"));
-			Assert.AreEqual(Tokens.Or, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestOrder()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Order"));
-			Assert.AreEqual(Tokens.Order, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestOrElse()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("OrElse"));
-			Assert.AreEqual(Tokens.OrElse, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestOut()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Out"));
-			Assert.AreEqual(Tokens.Out, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestOverloads()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Overloads"));
-			Assert.AreEqual(Tokens.Overloads, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestOverridable()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Overridable"));
-			Assert.AreEqual(Tokens.Overridable, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestOverrides()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Overrides"));
-			Assert.AreEqual(Tokens.Overrides, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestParamArray()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("ParamArray"));
-			Assert.AreEqual(Tokens.ParamArray, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestPartial()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Partial"));
-			Assert.AreEqual(Tokens.Partial, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestPreserve()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Preserve"));
-			Assert.AreEqual(Tokens.Preserve, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestPrivate()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Private"));
-			Assert.AreEqual(Tokens.Private, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestProperty()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Property"));
-			Assert.AreEqual(Tokens.Property, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestProtected()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Protected"));
-			Assert.AreEqual(Tokens.Protected, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestPublic()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Public"));
-			Assert.AreEqual(Tokens.Public, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestRaiseEvent()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("RaiseEvent"));
-			Assert.AreEqual(Tokens.RaiseEvent, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestReadOnly()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("ReadOnly"));
-			Assert.AreEqual(Tokens.ReadOnly, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestReDim()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("ReDim"));
-			Assert.AreEqual(Tokens.ReDim, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestRemoveHandler()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("RemoveHandler"));
-			Assert.AreEqual(Tokens.RemoveHandler, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestResume()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Resume"));
-			Assert.AreEqual(Tokens.Resume, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestReturn()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Return"));
-			Assert.AreEqual(Tokens.Return, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestSByte()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("SByte"));
-			Assert.AreEqual(Tokens.SByte, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestSelect()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Select"));
-			Assert.AreEqual(Tokens.Select, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestSet()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Set"));
-			Assert.AreEqual(Tokens.Set, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestShadows()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Shadows"));
-			Assert.AreEqual(Tokens.Shadows, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestShared()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Shared"));
-			Assert.AreEqual(Tokens.Shared, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestShort()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Short"));
-			Assert.AreEqual(Tokens.Short, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestSingle()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Single"));
-			Assert.AreEqual(Tokens.Single, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestSkip()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Skip"));
-			Assert.AreEqual(Tokens.Skip, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestStatic()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Static"));
-			Assert.AreEqual(Tokens.Static, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestStep()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Step"));
-			Assert.AreEqual(Tokens.Step, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestStop()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Stop"));
-			Assert.AreEqual(Tokens.Stop, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestStrict()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Strict"));
-			Assert.AreEqual(Tokens.Strict, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestString()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("String"));
-			Assert.AreEqual(Tokens.String, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestStructure()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Structure"));
-			Assert.AreEqual(Tokens.Structure, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestSub()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Sub"));
-			Assert.AreEqual(Tokens.Sub, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestSyncLock()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("SyncLock"));
-			Assert.AreEqual(Tokens.SyncLock, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestTake()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Take"));
-			Assert.AreEqual(Tokens.Take, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestText()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Text"));
-			Assert.AreEqual(Tokens.Text, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestThen()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Then"));
-			Assert.AreEqual(Tokens.Then, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestThrow()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Throw"));
-			Assert.AreEqual(Tokens.Throw, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestTo()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("To"));
-			Assert.AreEqual(Tokens.To, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestTrue()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("True"));
-			Assert.AreEqual(Tokens.True, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestTry()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Try"));
-			Assert.AreEqual(Tokens.Try, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestTryCast()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("TryCast"));
-			Assert.AreEqual(Tokens.TryCast, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestTypeOf()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("TypeOf"));
-			Assert.AreEqual(Tokens.TypeOf, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestUInteger()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("UInteger"));
-			Assert.AreEqual(Tokens.UInteger, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestULong()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("ULong"));
-			Assert.AreEqual(Tokens.ULong, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestUnicode()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Unicode"));
-			Assert.AreEqual(Tokens.Unicode, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestUntil()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Until"));
-			Assert.AreEqual(Tokens.Until, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestUShort()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("UShort"));
-			Assert.AreEqual(Tokens.UShort, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestUsing()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Using"));
-			Assert.AreEqual(Tokens.Using, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestVariant()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Variant"));
-			Assert.AreEqual(Tokens.Variant, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestWend()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Wend"));
-			Assert.AreEqual(Tokens.Wend, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestWhen()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("When"));
-			Assert.AreEqual(Tokens.When, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestWhere()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Where"));
-			Assert.AreEqual(Tokens.Where, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestWhile()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("While"));
-			Assert.AreEqual(Tokens.While, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestWidening()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Widening"));
-			Assert.AreEqual(Tokens.Widening, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestWith()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("With"));
-			Assert.AreEqual(Tokens.With, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestWithEvents()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("WithEvents"));
-			Assert.AreEqual(Tokens.WithEvents, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestWriteOnly()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("WriteOnly"));
-			Assert.AreEqual(Tokens.WriteOnly, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestXor()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("Xor"));
-			Assert.AreEqual(Tokens.Xor, lexer.NextToken().Kind);
-		}
-
-		[Test]
-		public void TestGetXmlNamespace()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("GetXmlNamespace"));
-			Assert.AreEqual(Tokens.GetXmlNamespace, lexer.NextToken().Kind);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LiteralsTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LiteralsTests.cs
deleted file mode 100644
index 7572b916c8..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/LiteralsTests.cs
+++ /dev/null
@@ -1,194 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using ICSharpCode.NRefactory.VB.Parser;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Lexer
-{
-	[TestFixture]
-	public sealed class LiteralsTests
-	{
-		VBLexer GenerateLexer(StringReader sr)
-		{
-			return new VBLexer(sr);
-		}
-		
-		Token GetSingleToken(string text)
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(text));
-			Token t = lexer.NextToken();
-			Assert.AreEqual(Tokens.EOL, lexer.NextToken().Kind, "Tokens.EOL");
-			Assert.AreEqual(Tokens.EOF, lexer.NextToken().Kind, "Tokens.EOF");
-			Assert.AreEqual("", lexer.Errors.ErrorOutput);
-			return t;
-		}
-		
-		void CheckToken(string text, int tokenType, object val)
-		{
-			Token t = GetSingleToken(text);
-			Assert.AreEqual(tokenType, t.Kind, "Tokens.Literal");
-			Assert.IsNotNull(t.LiteralValue, "literalValue is null");
-			Assert.AreEqual(val.GetType(), t.LiteralValue.GetType(), "literalValue.GetType()");
-			Assert.AreEqual(val, t.LiteralValue, "literalValue");
-		}
-		
-		[Test]
-		public void TestSingleDigit()
-		{
-			CheckToken("5", Tokens.LiteralInteger, 5);
-		}
-		
-		[Test]
-		public void TestZero()
-		{
-			CheckToken("0", Tokens.LiteralInteger, 0);
-		}
-		
-		[Test]
-		public void TestInteger()
-		{
-			CheckToken("15", Tokens.LiteralInteger, 15);
-			CheckToken("8581", Tokens.LiteralInteger, 8581);
-		}
-		
-		[Test]
-		public void InvalidTypeCharacter()
-		{
-			// just check that we don't get exceptions:
-			GenerateLexer(new StringReader(".5s")).NextToken();
-			GenerateLexer(new StringReader(".5ul")).NextToken();
-		}
-		
-		[Test]
-		public void TestHexadecimalInteger()
-		{
-			CheckToken("&H10", Tokens.LiteralInteger, 0x10);
-			CheckToken("&H10&", Tokens.LiteralInteger, (long)0x10);
-			CheckToken("&h3ff%", Tokens.LiteralInteger, 0x3ff);
-			CheckToken("&h8000s", Tokens.LiteralInteger, short.MinValue);
-			CheckToken("&h8000us", Tokens.LiteralInteger, (ushort)0x8000);
-			CheckToken("&HffffFFFF", Tokens.LiteralInteger, -1);
-			CheckToken("&HffffFFFF%", Tokens.LiteralInteger, -1);
-			CheckToken("&HffffFFFFui", Tokens.LiteralInteger, uint.MaxValue);
-			CheckToken("&HffffFFFF&", Tokens.LiteralInteger, (long)uint.MaxValue);
-		}
-		
-		[Test]
-		public void TestLongHexadecimalInteger()
-		{
-			CheckToken("&H4244636f446c6d58", Tokens.LiteralInteger, 0x4244636f446c6d58);
-			CheckToken("&hf244636f446c6d58", Tokens.LiteralInteger, -989556688574190248);
-			CheckToken("&hf244636f446c6d58&", Tokens.LiteralInteger, -989556688574190248);
-			CheckToken("&hf244636f446c6d58ul", Tokens.LiteralInteger, 0xf244636f446c6d58);
-		}
-		
-		[Test]
-		public void InvalidHexadecimalInteger()
-		{
-			// just check that we don't get exceptions:
-			GenerateLexer(new StringReader("&H")).NextToken();
-			// >ulong.MaxValue
-			GenerateLexer(new StringReader("&hff244636f446c6d58")).NextToken();
-			// needs an ulong, but "i" postfix specified integer
-			GenerateLexer(new StringReader("&hf244636f446c6d58i")).NextToken();
-			GenerateLexer(new StringReader("&hf244636f446c6d58ui")).NextToken();
-		}
-		
-		[Test]
-		public void TestIncompleteHexadecimal()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader("&H\r\nabc"));
-			Token t = lexer.NextToken();
-			Assert.AreEqual(Tokens.LiteralInteger, t.Kind);
-			Assert.AreEqual(0, (int)t.LiteralValue);
-			Assert.AreEqual(Tokens.EOL, lexer.NextToken().Kind, "Tokens.EOL (1)");
-			Assert.AreEqual(Tokens.Identifier, lexer.NextToken().Kind, "Tokens.Identifier");
-			Assert.AreEqual(Tokens.EOL, lexer.NextToken().Kind, "Tokens.EOL (2)");
-			Assert.AreEqual(Tokens.EOF, lexer.NextToken().Kind, "Tokens.EOF");
-			Assert.AreNotEqual("", lexer.Errors.ErrorOutput);
-		}
-		
-		[Test]
-		public void TestStringLiterals()
-		{
-			CheckToken("\"\"", Tokens.LiteralString, "");
-			CheckToken("\"Hello, World!\"", Tokens.LiteralString, "Hello, World!");
-			CheckToken("\"\"\"\"", Tokens.LiteralString, "\"");
-		}
-		
-		[Test]
-		public void TestCharacterLiterals()
-		{
-			CheckToken("\" \"c", Tokens.LiteralCharacter, ' ');
-			CheckToken("\"!\"c", Tokens.LiteralCharacter, '!');
-			CheckToken("\"\"\"\"c", Tokens.LiteralCharacter, '"');
-		}
-		
-		[Test]
-		public void TestDateLiterals()
-		{
-			CheckToken("# 8/23/1970 #", Tokens.LiteralDate, new DateTime(1970, 8, 23, 0, 0, 0));
-			CheckToken("#8/23/1970#", Tokens.LiteralDate, new DateTime(1970, 8, 23, 0, 0, 0));
-			CheckToken("# 8/23/1970  3:45:39AM #", Tokens.LiteralDate, new DateTime(1970, 8, 23, 3, 45, 39));
-			CheckToken("# 3:45:39AM #", Tokens.LiteralDate, new DateTime(1, 1, 1, 3, 45, 39));
-			CheckToken("# 3:45:39  PM #", Tokens.LiteralDate, new DateTime(1, 1, 1, 15, 45, 39));
-			CheckToken("# 3:45:39 #", Tokens.LiteralDate, new DateTime(1, 1, 1, 3, 45, 39));
-			CheckToken("# 13:45:39 #", Tokens.LiteralDate, new DateTime(1, 1, 1, 13, 45, 39));
-			CheckToken("# 1AM #", Tokens.LiteralDate, new DateTime(1, 1, 1, 1, 0, 0));
-		}
-		
-		[Test]
-		public void TestDouble()
-		{
-			CheckToken("1.0", Tokens.LiteralDouble, 1.0);
-			CheckToken("1.1", Tokens.LiteralDouble, 1.1);
-			CheckToken("2e-5", Tokens.LiteralDouble, 2e-5);
-			CheckToken("2.0e-5", Tokens.LiteralDouble, 2e-5);
-			CheckToken("2e5", Tokens.LiteralDouble, 2e5);
-			CheckToken("2.2e5", Tokens.LiteralDouble, 2.2e5);
-			CheckToken("2e+5", Tokens.LiteralDouble, 2e5);
-			CheckToken("2.2e+5", Tokens.LiteralDouble, 2.2e5);
-			
-			CheckToken("1r", Tokens.LiteralDouble, 1.0);
-			CheckToken("1.0r", Tokens.LiteralDouble, 1.0);
-			CheckToken("1.1r", Tokens.LiteralDouble, 1.1);
-			CheckToken("2e-5r", Tokens.LiteralDouble, 2e-5);
-			CheckToken("2.0e-5r", Tokens.LiteralDouble, 2e-5);
-			CheckToken("2e5r", Tokens.LiteralDouble, 2e5);
-			CheckToken("2.2e5r", Tokens.LiteralDouble, 2.2e5);
-			CheckToken("2e+5r", Tokens.LiteralDouble, 2e5);
-			CheckToken("2.2e+5r", Tokens.LiteralDouble, 2.2e5);
-		}
-		
-		[Test]
-		public void TestSingle()
-		{
-			CheckToken("1f", Tokens.LiteralSingle, 1.0f);
-			CheckToken("1.0f", Tokens.LiteralSingle, 1.0f);
-			CheckToken("1.1f", Tokens.LiteralSingle, 1.1f);
-			CheckToken("2e-5f", Tokens.LiteralSingle, 2e-5f);
-			CheckToken("2.0e-5f", Tokens.LiteralSingle, 2e-5f);
-			CheckToken("2e5f", Tokens.LiteralSingle, 2e5f);
-			CheckToken("2.2e5f", Tokens.LiteralSingle, 2.2e5f);
-			CheckToken("2e+5f", Tokens.LiteralSingle, 2e5f);
-			CheckToken("2.2e+5f", Tokens.LiteralSingle, 2.2e5f);
-		}
-		
-		[Test]
-		public void TestDecimal()
-		{
-			CheckToken("1d", Tokens.LiteralDecimal, 1m);
-			CheckToken("1.0d", Tokens.LiteralDecimal, 1.0m);
-			CheckToken("1.1d", Tokens.LiteralDecimal, 1.1m);
-			CheckToken("2e-5d", Tokens.LiteralDecimal, 2e-5m);
-			CheckToken("2.0e-5d", Tokens.LiteralDecimal, 2.0e-5m);
-			CheckToken("2e5d", Tokens.LiteralDecimal, 2e5m);
-			CheckToken("2.2e5d", Tokens.LiteralDecimal, 2.2e5m);
-			CheckToken("2e+5d", Tokens.LiteralDecimal, 2e5m);
-			CheckToken("2.2e+5d", Tokens.LiteralDecimal, 2.2e5m);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/TokenTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/TokenTests.cs
deleted file mode 100644
index 5b21fe89af..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/TokenTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using ICSharpCode.NRefactory.VB.Parser;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Lexer
-{
-	[TestFixture]
-	public class TokenTests
-	{
-		[Test]
-		public void TokenToStringDoesNotThrowException()
-		{
-			Assert.DoesNotThrow(
-				() => {
-					string text = new Token(71, 1, 1).ToString();
-				}
-			);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/XmlModeLexerTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/XmlModeLexerTests.cs
deleted file mode 100644
index e55c4f9b53..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Lexer/XmlModeLexerTests.cs
+++ /dev/null
@@ -1,993 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using ICSharpCode.NRefactory.VB;
-using ICSharpCode.NRefactory.VB.Parser;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Lexer
-{
-	[TestFixture]
-	public class XmlModeLexerTests
-	{
-		#region Xml Tests
-		[Test]
-		public void TagWithContent()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement("Dim x = <Test>Hello World</Test>")));
-			
-			CheckHead(lexer);
-			
-			Assert.AreEqual(Tokens.Dim, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.Identifier, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.Assign, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.XmlOpenTag, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.Identifier, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.XmlCloseTag, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.XmlContent, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.XmlOpenEndTag, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.Identifier, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.XmlCloseTag, lexer.NextToken().Kind);
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void HtmlText()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement("Dim x = <div><h1>Title</h1>" +
-			                                                            "<p>test test <br /> test</p></div>")));
-			
-			CheckHead(lexer);
-			
-			Assert.AreEqual(Tokens.Dim, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.Identifier, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.Assign, lexer.NextToken().Kind);
-			
-			// <div>
-			Assert.AreEqual(Tokens.XmlOpenTag, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.Identifier, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.XmlCloseTag, lexer.NextToken().Kind);
-			
-			// <h1>
-			Assert.AreEqual(Tokens.XmlOpenTag, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.Identifier, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.XmlCloseTag, lexer.NextToken().Kind);
-			
-			// Title
-			Assert.AreEqual(Tokens.XmlContent, lexer.NextToken().Kind);
-			
-			// </h1>
-			Assert.AreEqual(Tokens.XmlOpenEndTag, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.Identifier, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.XmlCloseTag, lexer.NextToken().Kind);
-			
-			// <p>
-			Assert.AreEqual(Tokens.XmlOpenTag, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.Identifier, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.XmlCloseTag, lexer.NextToken().Kind);
-			
-			// test test
-			Assert.AreEqual(Tokens.XmlContent, lexer.NextToken().Kind);
-			
-			// <br />
-			Assert.AreEqual(Tokens.XmlOpenTag, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.Identifier, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.XmlCloseTagEmptyElement, lexer.NextToken().Kind);
-			
-			// test
-			Assert.AreEqual(Tokens.XmlContent, lexer.NextToken().Kind);
-			
-			// </p>
-			Assert.AreEqual(Tokens.XmlOpenEndTag, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.Identifier, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.XmlCloseTag, lexer.NextToken().Kind);
-			
-			// </div>
-			Assert.AreEqual(Tokens.XmlOpenEndTag, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.Identifier, lexer.NextToken().Kind);
-			Assert.AreEqual(Tokens.XmlCloseTag, lexer.NextToken().Kind);
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void XmlLiteralsExample1()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement("Dim xml = <menu>\n" +
-			                                                            "              <course name=\"appetizer\">\n" +
-			                                                            "                  <dish>Shrimp Cocktail</dish>\n" +
-			                                                            "                  <dish>Escargot</dish>\n" +
-			                                                            "              </course>\n" +
-			                                                            "              <course name=\"main\">\n" +
-			                                                            "                  <dish>Filet Mignon</dish>\n" +
-			                                                            "                  <dish>Garlic Potatoes</dish>\n" +
-			                                                            "                  <dish>Broccoli</dish>\n" +
-			                                                            "              </course>\n" +
-			                                                            "              <course name=\"dessert\">\n" +
-			                                                            "                  <dish>Chocolate Cheesecake</dish>\n" +
-			                                                            "              </course>\n" +
-			                                                            "          </menu>")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Dim, Tokens.Identifier, Tokens.Assign,
-			            // <menu>
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag,
-			            // whitespaces
-			            Tokens.XmlContent,
-			            // <course name=\"appetizer\">
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.Identifier, Tokens.Assign, Tokens.LiteralString, Tokens.XmlCloseTag,
-			            // whitespaces
-			            Tokens.XmlContent,
-			            // <dish>Shrimp Cocktail</dish>
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag,
-			            // whitespaces
-			            Tokens.XmlContent,
-			            // <dish>Escargot</dish>
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag,
-			            // whitespaces
-			            Tokens.XmlContent,
-			            // </course>
-			            Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag,
-			            // whitespaces
-			            Tokens.XmlContent,
-			            // <course name=\"main\">
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.Identifier, Tokens.Assign, Tokens.LiteralString, Tokens.XmlCloseTag,
-			            // whitespaces
-			            Tokens.XmlContent,
-			            // <dish>Filet Mignon</dish>
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag,
-			            // whitespaces
-			            Tokens.XmlContent,
-			            // <dish>Garlic Potatoes</dish>
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag,
-			            // whitespaces
-			            Tokens.XmlContent,
-			            // <dish>Broccoli</dish>
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag,
-			            // whitespaces
-			            Tokens.XmlContent,
-			            // </course>
-			            Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag,
-			            // whitespaces
-			            Tokens.XmlContent,
-			            // <course name=\"dessert\">
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.Identifier, Tokens.Assign, Tokens.LiteralString, Tokens.XmlCloseTag,
-			            // whitespaces
-			            Tokens.XmlContent,
-			            // <dish>Chocolate Cheesecake</dish>
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag,
-			            // whitespaces
-			            Tokens.XmlContent,
-			            // </course>
-			            Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag,
-			            // whitespaces
-			            Tokens.XmlContent,
-			            // </menu>
-			            Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag
-			           );
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void SimpleXmlWithComments()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(@"Dim x = <?xml version=""1.0""?> <!-- Test file -->
-			                                                                      <Test>
-			                                                                        <!-- Test data -->
-			                                                                        <Data />
-			                                                                      </Test>
-			                                                                      <!-- eof -->
-			                                                                      <!-- hey, wait! -->
-			                                                                      <?target some data?>")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Dim, Tokens.Identifier, Tokens.Assign,
-			            Tokens.XmlProcessingInstruction, Tokens.XmlContent, Tokens.XmlComment, Tokens.XmlContent, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag,
-			            Tokens.XmlContent, Tokens.XmlComment, Tokens.XmlContent, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement,
-			            Tokens.XmlContent, Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlComment, Tokens.XmlComment, Tokens.XmlProcessingInstruction);
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void SimpleEmptyTag()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement("Dim x = <Test />")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Dim, Tokens.Identifier, Tokens.Assign,
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement);
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void SimpleTag()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement("Dim x = <Test></Test>")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Dim, Tokens.Identifier, Tokens.Assign, Tokens.XmlOpenTag,
-			            Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlOpenEndTag,
-			            Tokens.Identifier, Tokens.XmlCloseTag);
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void XmlImport()
-		{
-			string code = @"Imports System
-Imports System.Linq
-
-Imports <xmlns='http://icsharpcode.net/sharpdevelop/avalonedit'>
-Imports <xmlns:h='http://www.w3.org/TR/html4/'>
-
-Class TestClass
-	Sub TestSub()
-		Dim xml = <h:table>
-					<h:tr>
-						<h:td>1. Cell</h:td>
-					</h:tr>
-				  </h:table>
-	End Sub
-End Class";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(code));
-			
-			CheckTokens(lexer, Tokens.Imports, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Imports, Tokens.Identifier, Tokens.Dot, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Imports, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.Assign, Tokens.LiteralString, Tokens.XmlCloseTag, Tokens.EOL,
-			            Tokens.Imports, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.Assign, Tokens.LiteralString, Tokens.XmlCloseTag, Tokens.EOL,
-			            Tokens.Class, Tokens.Identifier, Tokens.EOL, Tokens.Sub, Tokens.Identifier, Tokens.OpenParenthesis, Tokens.CloseParenthesis, Tokens.EOL,
-			            Tokens.Dim, Tokens.Identifier, Tokens.Assign, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag,
-			            Tokens.XmlContent, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag,
-			            Tokens.XmlContent, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag,
-			            Tokens.XmlContent, Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag,
-			            Tokens.EOL, Tokens.End, Tokens.Sub, Tokens.EOL, Tokens.End, Tokens.Class
-			           );
-		}
-		
-		[Test]
-		public void CDataSection()
-		{
-			string xml = @"Dim xml = <template>
-				<name>test</name>
-				<language>VB</languge>
-				<file language='XAML'>
-					<![CDATA[<Window x:Class='DefaultNamespace.Window1'
-	xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'
-	xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
-	Title='DefaultNamespace' Height='300' Width='300'>
-	<Grid>
-		
-	</Grid>
-</Window>]]>
-				</file>
-				<file language='CSharp'>
-				<![CDATA[using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-
-namespace DefaultNamespace
-{
-	/// <summary>
-	/// Interaction logic for Window1.xaml
-	/// </summary>
-	public partial class Window1 : Window
-	{
-		public Window1()
-		{
-			InitializeComponent();
-		}
-	}
-}]]>
-				</file>
-			</template>
-			";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(xml)));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Dim, Tokens.Identifier, Tokens.Assign, // 2
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, // 6
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, // 10
-			            Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, // 14
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, // 18
-			            Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, // 22
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.Identifier, Tokens.Assign, Tokens.LiteralString, Tokens.XmlCloseTag, // 28
-			            Tokens.XmlContent, Tokens.XmlCData, Tokens.XmlContent, Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag, // 34
-			            Tokens.XmlContent, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.Identifier, Tokens.Assign, Tokens.LiteralString, Tokens.XmlCloseTag,
-			            Tokens.XmlContent, Tokens.XmlCData, Tokens.XmlContent, Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag,
-			            Tokens.XmlContent, Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag
-			           );
-			
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void InlineVB()
-		{
-			string code = @"Dim xml = <?xml version='1.0'?>
-                  <menu>
-                      <course name=""appetizer"">
-                          <%= From m In menu _
-                              Where m.Course = ""appetizer"" _
-                              Select <dish><%= m.Food %></dish> _
-                          %>
-                      </course>
-                      <course name=""main"">
-                          <%= From m In menu _
-                              Where m.Course = ""main"" _
-                              Select <dish><%= m.Food %></dish> _
-                          %>
-                      </course>
-                      <course name=""dessert"">
-                          <%= From m In menu _
-                              Where m.Course = ""dessert"" _
-                              Select <dish><%= m.Food %></dish> _
-                          %>
-                      </course>
-                  </menu>";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(code)));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Dim, Tokens.Identifier, Tokens.Assign, Tokens.XmlProcessingInstruction, Tokens.XmlContent,
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, Tokens.XmlOpenTag, Tokens.Identifier,
-			            Tokens.Identifier, Tokens.Assign, Tokens.LiteralString, Tokens.XmlCloseTag, Tokens.XmlContent, Tokens.XmlStartInlineVB,
-			            Tokens.From, Tokens.Identifier, Tokens.In, Tokens.Identifier, Tokens.Where, Tokens.Identifier, Tokens.Dot,
-			            Tokens.Identifier, Tokens.Assign, Tokens.LiteralString, Tokens.Select, Tokens.XmlOpenTag, Tokens.Identifier,
-			            Tokens.XmlCloseTag, Tokens.XmlStartInlineVB, Tokens.Identifier, Tokens.Dot, Tokens.Identifier, Tokens.XmlEndInlineVB,
-			            Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlEndInlineVB, Tokens.XmlContent, Tokens.XmlOpenEndTag,
-			            Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, Tokens.XmlOpenTag, Tokens.Identifier,
-			            Tokens.Identifier, Tokens.Assign, Tokens.LiteralString, Tokens.XmlCloseTag, Tokens.XmlContent, Tokens.XmlStartInlineVB,
-			            Tokens.From, Tokens.Identifier, Tokens.In, Tokens.Identifier, Tokens.Where, Tokens.Identifier, Tokens.Dot,
-			            Tokens.Identifier, Tokens.Assign, Tokens.LiteralString, Tokens.Select, Tokens.XmlOpenTag, Tokens.Identifier,
-			            Tokens.XmlCloseTag, Tokens.XmlStartInlineVB, Tokens.Identifier, Tokens.Dot, Tokens.Identifier, Tokens.XmlEndInlineVB,
-			            Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlEndInlineVB, Tokens.XmlContent, Tokens.XmlOpenEndTag,
-			            Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, Tokens.XmlOpenTag, Tokens.Identifier,
-			            Tokens.Identifier, Tokens.Assign, Tokens.LiteralString, Tokens.XmlCloseTag, Tokens.XmlContent, Tokens.XmlStartInlineVB,
-			            Tokens.From, Tokens.Identifier, Tokens.In, Tokens.Identifier, Tokens.Where, Tokens.Identifier, Tokens.Dot,
-			            Tokens.Identifier, Tokens.Assign, Tokens.LiteralString, Tokens.Select, Tokens.XmlOpenTag, Tokens.Identifier,
-			            Tokens.XmlCloseTag, Tokens.XmlStartInlineVB, Tokens.Identifier, Tokens.Dot, Tokens.Identifier, Tokens.XmlEndInlineVB,
-			            Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlEndInlineVB, Tokens.XmlContent, Tokens.XmlOpenEndTag,
-			            Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag
-			           );
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void InlineVB2()
-		{
-			string code = @"Dim contact As XElement =  <<%=elementName %>>
-                               <name><%= MyName %></name>
-                           </>";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(code)));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Dim, Tokens.Identifier, Tokens.As, Tokens.Identifier, Tokens.Assign, Tokens.XmlOpenTag,
-			            Tokens.XmlStartInlineVB, Tokens.Identifier, Tokens.XmlEndInlineVB, Tokens.XmlCloseTag, Tokens.XmlContent,
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlStartInlineVB, Tokens.Identifier, Tokens.XmlEndInlineVB,
-			            Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, Tokens.XmlOpenEndTag, Tokens.XmlCloseTag);
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void XmlAccessOperators()
-		{
-			string code = @"Dim childAxis = xml.<menu>.<course>
-Dim course3 = xml...<course>(2)
-Dim childAxis = xml...<course>
-For Each item In childAxis
-    Console.WriteLine(item.@name)
-Next";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(code)));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Dim, Tokens.Identifier, Tokens.Assign, Tokens.Identifier, Tokens.Dot, Tokens.XmlOpenTag,
-			            Tokens.Identifier, Tokens.XmlCloseTag, Tokens.Dot, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag,
-			            Tokens.EOL, Tokens.Dim, Tokens.Identifier, Tokens.Assign, Tokens.Identifier, Tokens.TripleDot, Tokens.XmlOpenTag,
-			            Tokens.Identifier, Tokens.XmlCloseTag, Tokens.OpenParenthesis, Tokens.LiteralInteger, Tokens.CloseParenthesis,
-			            Tokens.EOL, Tokens.Dim, Tokens.Identifier, Tokens.Assign, Tokens.Identifier, Tokens.TripleDot, Tokens.XmlOpenTag,
-			            Tokens.Identifier, Tokens.XmlCloseTag, Tokens.EOL, Tokens.For, Tokens.Each, Tokens.Identifier, Tokens.In, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Identifier, Tokens.Dot, Tokens.Identifier, Tokens.OpenParenthesis, Tokens.Identifier, Tokens.DotAt, Tokens.Identifier, Tokens.CloseParenthesis, Tokens.EOL,
-			            Tokens.Next);
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void GetXmlNamespace()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement("Dim name = GetXmlNamespace(x)")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Dim, Tokens.Identifier, Tokens.Assign,
-			            Tokens.GetXmlNamespace, Tokens.OpenParenthesis, Tokens.Identifier, Tokens.CloseParenthesis);
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void GetXmlNamespace2()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement("Dim name = GetXmlNamespace(db-name)")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Dim, Tokens.Identifier, Tokens.Assign,
-			            Tokens.GetXmlNamespace, Tokens.OpenParenthesis, Tokens.Identifier, Tokens.CloseParenthesis);
-			
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void XmlInSelect()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement("Dim data = From x In list Select <test>x</test>")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Dim, Tokens.Identifier, Tokens.Assign,
-			            Tokens.From, Tokens.Identifier, Tokens.In, Tokens.Identifier, Tokens.Select,
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent, Tokens.XmlOpenEndTag,
-			            Tokens.Identifier, Tokens.XmlCloseTag);
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void IfExpressionTest()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement("Dim name = If(a <> 2, 4, 8)")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Dim, Tokens.Identifier, Tokens.Assign,
-			            Tokens.If, Tokens.OpenParenthesis, Tokens.Identifier, Tokens.NotEqual, Tokens.LiteralInteger,
-			            Tokens.Comma, Tokens.LiteralInteger, Tokens.Comma, Tokens.LiteralInteger, Tokens.CloseParenthesis);
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void IfStatementTest()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement("If a <> 2 Then Return")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.If, Tokens.Identifier, Tokens.NotEqual, Tokens.LiteralInteger,
-			            Tokens.Then, Tokens.Return);
-			
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void Bug1()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(@"Dim xml = <!-- test -->")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Dim, Tokens.Identifier, Tokens.Assign, Tokens.XmlComment);
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void Bug2()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(@"Dim xml = <?xml?><Data /><!-- test -->")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Dim, Tokens.Identifier, Tokens.Assign,
-			            Tokens.XmlProcessingInstruction, Tokens.XmlOpenTag, Tokens.Identifier,
-			            Tokens.XmlCloseTagEmptyElement, Tokens.XmlComment);
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void Bug3()
-		{
-			VBLexer lexer = GenerateLexerForSnippet(new StringReader("New String() {}"), SnippetType.Expression);
-			
-			CheckTokens(lexer, Tokens.New, Tokens.String, Tokens.OpenParenthesis,
-			            Tokens.CloseParenthesis, Tokens.OpenCurlyBrace, Tokens.CloseCurlyBrace);
-		}
-		
-		[Test]
-		public void Bug4()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(@"Dim x = From kvp As KeyValuePair(Of String, DataGridViewCellStyle) In styleCache.CellStyleCache _
-                            Select includeStyle(kvp.Key, kvp.Value)")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Dim, Tokens.Identifier, Tokens.Assign, Tokens.From, Tokens.Identifier, Tokens.As, Tokens.Identifier,
-			            Tokens.OpenParenthesis, Tokens.Of, Tokens.String, Tokens.Comma, Tokens.Identifier, Tokens.CloseParenthesis,
-			            Tokens.In, Tokens.Identifier, Tokens.Dot, Tokens.Identifier,
-			            Tokens.Select, Tokens.Identifier, Tokens.OpenParenthesis, Tokens.Identifier, Tokens.Dot, Tokens.Key, Tokens.Comma,
-			            Tokens.Identifier, Tokens.Dot, Tokens.Identifier, Tokens.CloseParenthesis);
-						
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void LessThanCheck()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(@"Dim xml = <!-- test --><Data")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Dim, Tokens.Identifier, Tokens.Assign,
-			            Tokens.XmlComment, Tokens.LessThan, Tokens.Identifier);
-			
-			CheckFoot(lexer);
-		}
-		#endregion
-		
-		#region Context Tests
-		[Test]
-		public void MethodInvocation()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement("DoSomething(<Test />, True)")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Identifier, Tokens.OpenParenthesis, Tokens.XmlOpenTag,
-			            Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.Comma, Tokens.True,
-			            Tokens.CloseParenthesis);
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void AddHandlerStatement()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement("AddHandler <Test />, True")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.AddHandler, Tokens.XmlOpenTag,
-			            Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.Comma, Tokens.True);
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void AddHandlerStatement2()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement("AddHandler <x />, <y />")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.AddHandler, Tokens.XmlOpenTag,
-			            Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.Comma, Tokens.XmlOpenTag,
-			            Tokens.Identifier, Tokens.XmlCloseTagEmptyElement);
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void RemoveHandlerStatement()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement("RemoveHandler <x />, <Data>5</Data>")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.RemoveHandler, Tokens.XmlOpenTag,
-			            Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.Comma,
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlContent,
-			            Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag
-			           );
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void ErrorHandlingStatement()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement("On Error Resume Next\n" +
-			                                                            "On Error GoTo -1\n" +
-			                                                            "On Error GoTo 0\n" +
-			                                                            "On Error GoTo Test\n" +
-			                                                            "Error 5\n" +
-			                                                            "Error <Test />\n" +
-			                                                            "Resume Next\n" +
-			                                                            "Resume Label\n" +
-			                                                            "Resume 4")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.On, Tokens.Error, Tokens.Resume, Tokens.Next, Tokens.EOL,
-			            Tokens.On, Tokens.Error, Tokens.GoTo, Tokens.Minus, Tokens.LiteralInteger, Tokens.EOL,
-			            Tokens.On, Tokens.Error, Tokens.GoTo, Tokens.LiteralInteger, Tokens.EOL,
-			            Tokens.On, Tokens.Error, Tokens.GoTo, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Error, Tokens.LiteralInteger, Tokens.EOL,
-			            Tokens.Error, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.EOL,
-			            Tokens.Resume, Tokens.Next, Tokens.EOL,
-			            Tokens.Resume, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Resume, Tokens.LiteralInteger
-			           );
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void ForLoopStatement()
-		{
-			string statement = @"For <Test /> = <Test /> To <Test /> Step <Test />
-Next <Test />, <Test />
-
-For Each <Test /> In <Test />
-Next <Test />";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(statement)));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.For, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement,
-			            Tokens.Assign, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement,
-			            Tokens.To, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement,
-			            Tokens.Step, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.EOL,
-			            Tokens.Next, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.Comma,
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.EOL,
-			            Tokens.For, Tokens.Each, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement,
-			            Tokens.In, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.EOL,
-			            Tokens.Next, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement
-			           );
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void WhileLoopStatement()
-		{
-			string statement = @"While <Test />
-End While";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(statement)));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.While, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.EOL,
-			            Tokens.End, Tokens.While
-			           );
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void WhileLoopStatement2()
-		{
-			string statement = @"Do While <Test />
-Loop";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(statement)));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Do, Tokens.While, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.EOL,
-			            Tokens.Loop
-			           );
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void WhileLoopStatement3()
-		{
-			string statement = @"Do
-Loop While <Test />";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(statement)));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Do, Tokens.EOL,
-			            Tokens.Loop, Tokens.While, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement
-			           );
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void UntilLoopStatement()
-		{
-			string statement = @"Do Until <Test />
-Loop";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(statement)));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Do, Tokens.Until, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.EOL,
-			            Tokens.Loop
-			           );
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void UntilLoopStatement2()
-		{
-			string statement = @"Do
-Loop Until <Test />";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(statement)));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Do, Tokens.EOL,
-			            Tokens.Loop, Tokens.Until, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement
-			           );
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void IfStatementLarge()
-		{
-			string statement = @"If <Test /> Then
-Else If <Test /> Then
-ElseIf <Test></Test> Then
-Else
-End If";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(statement)));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.If, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.Then, Tokens.EOL,
-			            Tokens.Else, Tokens.If, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.Then, Tokens.EOL,
-			            Tokens.ElseIf, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.XmlOpenEndTag, Tokens.Identifier, Tokens.XmlCloseTag, Tokens.Then, Tokens.EOL,
-			            Tokens.Else, Tokens.EOL,
-			            Tokens.End, Tokens.If
-			           );
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void SelectStatement()
-		{
-			string statement = @"Select Case <Test />
-	Case <Test />, <Test />
-	Case Else
-End Select";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(statement)));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Select, Tokens.Case, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.EOL,
-			            Tokens.Case, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.Comma,
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.EOL,
-			            Tokens.Case, Tokens.Else, Tokens.EOL,
-			            Tokens.End, Tokens.Select
-			           );
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void TryStatement()
-		{
-			string statement = @"Try
-	Catch x
-	Catch y As Exception
-	Catch When <Test />
-	Finally
-End Try";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(statement)));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Try, Tokens.EOL,
-			            Tokens.Catch, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Catch, Tokens.Identifier, Tokens.As, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Catch, Tokens.When, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.EOL,
-			            Tokens.Finally, Tokens.EOL,
-			            Tokens.End, Tokens.Try
-			           );
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void ThrowStatement()
-		{
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement("Throw <Test />")));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Throw, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement);
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void BranchStatements()
-		{
-			string statement = @"GoTo 5
-GoTo LabelName
-Exit Do
-Exit For
-Exit While
-Exit Select
-Exit Sub
-Exit Function
-Exit Property
-Exit Try
-Continue Do
-Continue For
-Continue While
-Stop
-End
-Return
-Return 5
-Return <Test />";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(statement)));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.GoTo, Tokens.LiteralInteger, Tokens.EOL,
-			            Tokens.GoTo, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Exit, Tokens.Do, Tokens.EOL,
-			            Tokens.Exit, Tokens.For, Tokens.EOL,
-			            Tokens.Exit, Tokens.While, Tokens.EOL,
-			            Tokens.Exit, Tokens.Select, Tokens.EOL,
-			            Tokens.Exit, Tokens.Sub, Tokens.EOL,
-			            Tokens.Exit, Tokens.Function, Tokens.EOL,
-			            Tokens.Exit, Tokens.Property, Tokens.EOL,
-			            Tokens.Exit, Tokens.Try, Tokens.EOL,
-			            Tokens.Continue, Tokens.Do, Tokens.EOL,
-			            Tokens.Continue, Tokens.For, Tokens.EOL,
-			            Tokens.Continue, Tokens.While, Tokens.EOL,
-			            Tokens.Stop, Tokens.EOL,
-			            Tokens.End, Tokens.EOL,
-			            Tokens.Return, Tokens.EOL,
-			            Tokens.Return, Tokens.LiteralInteger, Tokens.EOL,
-			            Tokens.Return, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement
-			           );
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void ArrayHandlingStatements()
-		{
-			string statement = @"Erase <Test />
-Erase <Test />, <Test />
-ReDim Preserve <Test />";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(statement)));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Erase, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.EOL,
-			            Tokens.Erase, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.Comma,
-			            Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.EOL,
-			            Tokens.ReDim, Tokens.Preserve, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement
-			           );
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void UsingStatement()
-		{
-			string statement = @"Using <Test />
-End Using";
-			
-			VBLexer lexer = GenerateLexer(new StringReader(TestStatement(statement)));
-			
-			CheckHead(lexer);
-			
-			CheckTokens(lexer, Tokens.Using, Tokens.XmlOpenTag, Tokens.Identifier, Tokens.XmlCloseTagEmptyElement, Tokens.EOL,
-			            Tokens.End, Tokens.Using
-			           );
-			
-			CheckFoot(lexer);
-		}
-		
-		[Test]
-		public void NewExpressionWithObjectInitializer()
-		{
-			string code = @"New Common.ComboBoxItem With {.Item = _
-                            Localizer.GetString(""Month"" & initParameters.SelectedDate.FirstDayOfPreviousMonth.Month) & "" "" &
-                            initParameters.SelectedDate.FirstDayOfPreviousMonth.Year, .Value = New Date(2010, initParameters.SelectedDate.FirstDayOfPreviousMonth.Month, 1)}";
-			
-			VBLexer lexer = GenerateLexerForSnippet(new StringReader(code), SnippetType.Expression);
-			
-			CheckTokens(lexer, Tokens.New, Tokens.Identifier, Tokens.Dot, Tokens.Identifier,
-			            Tokens.With, Tokens.OpenCurlyBrace, Tokens.Dot, Tokens.Identifier, Tokens.Assign,
-			            Tokens.Identifier, Tokens.Dot, Tokens.Identifier, Tokens.OpenParenthesis, Tokens.LiteralString,
-			            Tokens.ConcatString, Tokens.Identifier, Tokens.Dot, Tokens.Identifier, Tokens.Dot,
-			            Tokens.Identifier, Tokens.Dot, Tokens.Identifier, Tokens.CloseParenthesis, Tokens.ConcatString,
-			            Tokens.LiteralString, Tokens.ConcatString, Tokens.Identifier, Tokens.Dot, Tokens.Identifier,
-			            Tokens.Dot, Tokens.Identifier, Tokens.Dot, Tokens.Identifier, Tokens.Comma, Tokens.Dot,
-			            Tokens.Identifier, Tokens.Assign, Tokens.New, Tokens.Date, Tokens.OpenParenthesis, Tokens.LiteralInteger,
-			            Tokens.Comma, Tokens.Identifier, Tokens.Dot, Tokens.Identifier, Tokens.Dot, Tokens.Identifier, Tokens.Dot,
-			            Tokens.Identifier, Tokens.Comma, Tokens.LiteralInteger, Tokens.CloseParenthesis, Tokens.CloseCurlyBrace);
-		}
-		#endregion
-		
-		#region Helpers
-		VBLexer GenerateLexer(StringReader sr)
-		{
-			return new VBLexer(sr);
-		}
-		
-		VBLexer GenerateLexerForSnippet(StringReader sr, SnippetType type)
-		{
-			var lexer = new VBLexer(sr);
-			lexer.SetInitialContext(type);
-			return lexer;
-		}
-		
-		string TestStatement(string stmt)
-		{
-			return "Class Test\n" +
-				"Sub A\n" +
-				stmt + "\n" +
-				"End Sub\n" +
-				"End Class";
-		}
-		
-		void CheckFoot(VBLexer lexer)
-		{
-			CheckTokens(lexer, Tokens.EOL, Tokens.End, Tokens.Sub, Tokens.EOL, Tokens.End, Tokens.Class);
-		}
-		
-		void CheckHead(VBLexer lexer)
-		{
-			CheckTokens(lexer, Tokens.Class, Tokens.Identifier, Tokens.EOL,
-			            Tokens.Sub, Tokens.Identifier, Tokens.EOL);
-		}
-		
-		void CheckTokens(VBLexer lexer, params int[] tokens)
-		{
-			for (int i = 0; i < tokens.Length; i++) {
-				int token = tokens[i];
-				Token t = lexer.NextToken();
-				int next = t.Kind;
-				Assert.IsEmpty(lexer.Errors.ErrorOutput);
-				Assert.AreEqual(token, next, "{2} of {3}: expected: \"{0}\", was: \"{1}\"; at {4}", Tokens.GetTokenString(token), Tokens.GetTokenString(next), i + 1, tokens.Length, t.Location);
-			}
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/CodeDOM/CodeDOMParenthesizedExpressionTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/CodeDOM/CodeDOMParenthesizedExpressionTest.cs
deleted file mode 100644
index 6d4bb2da99..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/CodeDOM/CodeDOMParenthesizedExpressionTest.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.CodeDom;
-using ICSharpCode.NRefactory.VB.Ast;
-using ICSharpCode.NRefactory.VB.Visitors;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Output.CodeDom.Tests
-{
-	[TestFixture]
-	public class CodeDOMParenthesizedExpressionTest
-	{
-		[Test]
-		public void TestParenthesizedExpression()
-		{
-			object output = new ParenthesizedExpression(new PrimitiveExpression(5, "5")).AcceptVisitor(new CodeDomVisitor(), null);
-			Assert.IsTrue(output is CodePrimitiveExpression);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/CodeDOM/CodeDOMPrimitiveExpressionTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/CodeDOM/CodeDOMPrimitiveExpressionTest.cs
deleted file mode 100644
index 2d1c89d1b3..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/CodeDOM/CodeDOMPrimitiveExpressionTest.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.CodeDom;
-using ICSharpCode.NRefactory.VB.Ast;
-using ICSharpCode.NRefactory.VB.Visitors;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Output.CodeDom.Tests
-{
-	[TestFixture]
-	public class CodeDOMPrimitiveExpressionsTests
-	{
-		[Test]
-		public void TestPrimitiveExpression()
-		{
-			object output = new PrimitiveExpression(5, "5").AcceptVisitor(new CodeDomVisitor(), null);
-			Assert.IsTrue(output is CodePrimitiveExpression);
-			Assert.AreEqual(((CodePrimitiveExpression)output).Value, 5);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/CodeDOM/CodeDOMTypeReferenceTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/CodeDOM/CodeDOMTypeReferenceTest.cs
deleted file mode 100644
index fffd395c1e..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/CodeDOM/CodeDOMTypeReferenceTest.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.CodeDom;
-using System.Collections.Generic;
-
-using ICSharpCode.NRefactory.VB.Ast;
-using ICSharpCode.NRefactory.VB.Visitors;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Output.CodeDom.Tests
-{
-	[TestFixture]
-	public class CodeDOMTypeReferenceTest
-	{
-		[TestAttribute]
-		public void InnerClassTypeReferencTest()
-		{
-			InnerClassTypeReference ictr = new InnerClassTypeReference(
-				new TypeReference("OuterClass", new List<TypeReference> { new TypeReference("String") }),
-				"InnerClass",
-				new List<TypeReference> { new TypeReference("Int32"), new TypeReference("Int64") });
-			Assert.AreEqual("OuterClass<String>+InnerClass<Int32,Int64>", ictr.ToString());
-			CodeTypeOfExpression result = (CodeTypeOfExpression)new TypeOfExpression(ictr).AcceptVisitor(new CodeDomVisitor(), null);
-			Assert.AreEqual("OuterClass`1+InnerClass`2", result.Type.BaseType);
-			Assert.AreEqual(3, result.Type.TypeArguments.Count);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/CodeDOM/InvocationExpressionTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/CodeDOM/InvocationExpressionTest.cs
deleted file mode 100644
index 443dcfe3ce..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/CodeDOM/InvocationExpressionTest.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.CodeDom;
-using System.Collections.Generic;
-
-using ICSharpCode.NRefactory.VB.Ast;
-using ICSharpCode.NRefactory.VB.Visitors;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Output.CodeDom.Tests
-{
-	[TestFixture]
-	public class InvocationExpressionsTests
-	{
-		[Test]
-		public void IdentifierOnlyInvocation()
-		{
-			// InitializeComponents();
-			SimpleNameExpression identifier = new SimpleNameExpression("InitializeComponents");
-			InvocationExpression invocation = new InvocationExpression(identifier, new List<Expression>());
-			object output = invocation.AcceptVisitor(new CodeDomVisitor(), null);
-			Assert.IsTrue(output is CodeMethodInvokeExpression);
-			CodeMethodInvokeExpression mie = (CodeMethodInvokeExpression)output;
-			Assert.AreEqual("InitializeComponents", mie.Method.MethodName);
-			Assert.IsTrue(mie.Method.TargetObject is CodeThisReferenceExpression);
-		}
-		
-		[Test]
-		public void MethodOnThisReferenceInvocation()
-		{
-			// InitializeComponents();
-			MemberReferenceExpression field = new MemberReferenceExpression(new ThisReferenceExpression(), "InitializeComponents");
-			InvocationExpression invocation = new InvocationExpression(field, new List<Expression>());
-			object output = invocation.AcceptVisitor(new CodeDomVisitor(), null);
-			Assert.IsTrue(output is CodeMethodInvokeExpression);
-			CodeMethodInvokeExpression mie = (CodeMethodInvokeExpression)output;
-			Assert.AreEqual("InitializeComponents", mie.Method.MethodName);
-			Assert.IsTrue(mie.Method.TargetObject is CodeThisReferenceExpression);
-		}
-		
-		[Test]
-		public void InvocationOfStaticMethod()
-		{
-			// System.Drawing.Color.FromArgb();
-			MemberReferenceExpression field = new MemberReferenceExpression(new SimpleNameExpression("System"), "Drawing");
-			field = new MemberReferenceExpression(field, "Color");
-			field = new MemberReferenceExpression(field, "FromArgb");
-			InvocationExpression invocation = new InvocationExpression(field, new List<Expression>());
-			object output = invocation.AcceptVisitor(new CodeDomVisitor(), null);
-			Assert.IsTrue(output is CodeMethodInvokeExpression);
-			CodeMethodInvokeExpression mie = (CodeMethodInvokeExpression)output;
-			Assert.AreEqual("FromArgb", mie.Method.MethodName);
-			Assert.IsTrue(mie.Method.TargetObject is CodeTypeReferenceExpression);
-			Assert.AreEqual("System.Drawing.Color", (mie.Method.TargetObject as CodeTypeReferenceExpression).Type.BaseType);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/SpecialOutputVisitorTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/SpecialOutputVisitorTest.cs
deleted file mode 100644
index 5c0328ec29..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/SpecialOutputVisitorTest.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-using ICSharpCode.NRefactory.VB.Ast;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.PrettyPrinter;
-
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.PrettyPrinter
-{
-	[TestFixture]
-	public class SpecialOutputVisitorTest
-	{
-		void TestProgram(string program)
-		{
-			VBParser parser = ParserFactory.CreateParser(new StringReader(program));
-			parser.Parse();
-			Assert.AreEqual("", parser.Errors.ErrorOutput);
-			VBNetOutputVisitor outputVisitor = new VBNetOutputVisitor();
-			outputVisitor.Options.IndentationChar = ' ';
-			outputVisitor.Options.TabSize = 2;
-			outputVisitor.Options.IndentSize = 2;
-			using (SpecialNodesInserter.Install(parser.Lexer.SpecialTracker.RetrieveSpecials(),
-			                                    outputVisitor)) {
-				outputVisitor.VisitCompilationUnit(parser.CompilationUnit, null);
-			}
-			Assert.AreEqual("", outputVisitor.Errors.ErrorOutput);
-			Assert.AreEqual(program.Replace("\r", ""), outputVisitor.Text.TrimEnd().Replace("\r", ""));
-			parser.Dispose();
-		}
-		
-		[Test]
-		public void Enum()
-		{
-			TestProgram("Enum Test\n" +
-			              "  ' a\n" +
-			              "  m1\n" +
-			              "  ' b\n" +
-			              "  m2\n" +
-			              "  ' c\n" +
-			              "End Enum\n" +
-			              "' d");
-		}
-		
-		[Test]
-		public void CommentsInsideMethod()
-		{
-			TestProgram(@"Public Class Class1
-  Private Function test(l As Integer, lvw As Integer) As Boolean
-    ' Begin
-    Dim i As Integer = 1
-    Return False
-    ' End of method
-  End Function
-End Class");
-		}
-		
-		[Test]
-		public void BlankLines()
-		{
-			TestProgram("Imports System\n" +
-			              "\n" +
-			              "Imports System.IO");
-			TestProgram("Imports System\n" +
-			              "\n" +
-			              "\n" +
-			              "Imports System.IO");
-			TestProgram("\n" +
-			              "' Some comment\n" +
-			              "\n" +
-			              "Imports System.IO");
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/VBNet/VBNetOutputTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/VBNet/VBNetOutputTest.cs
deleted file mode 100644
index dc81606383..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Output/VBNet/VBNetOutputTest.cs
+++ /dev/null
@@ -1,670 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using ICSharpCode.NRefactory.VB.Ast;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.PrettyPrinter;
-using ICSharpCode.NRefactory.VB.Visitors;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.PrettyPrinter
-{
-	[TestFixture]
-	public class VBNetOutputTest
-	{
-		void TestProgram(string program)
-		{
-			VBParser parser = ParserFactory.CreateParser(new StringReader(program));
-			parser.Parse();
-			Assert.AreEqual("", parser.Errors.ErrorOutput);
-			VBNetOutputVisitor outputVisitor = new VBNetOutputVisitor();
-			outputVisitor.Options.OutputByValModifier = true;
-			outputVisitor.VisitCompilationUnit(parser.CompilationUnit, null);
-			Assert.AreEqual("", outputVisitor.Errors.ErrorOutput);
-			Assert.AreEqual(StripWhitespace(program), StripWhitespace(outputVisitor.Text));
-		}
-		
-		string StripWhitespace(string text)
-		{
-			text = text.Trim().Replace("\t", "").Replace("\r", "").Replace("\n", " ").Replace("  ", " ");
-			while (text.Contains("  ")) {
-				text = text.Replace("  ", " ");
-			}
-			return text;
-		}
-		
-		void TestTypeMember(string program)
-		{
-			TestProgram("Class A\n" + program + "\nEnd Class");
-		}
-		
-		void TestStatement(string statement)
-		{
-			TestTypeMember("Sub Method()\n" + statement + "\nEnd Sub");
-		}
-		
-		void TestExpression(string expression)
-		{
-			VBParser parser = ParserFactory.CreateParser(new StringReader(expression));
-			Expression e = parser.ParseExpression();
-			Assert.AreEqual("", parser.Errors.ErrorOutput);
-			VBNetOutputVisitor outputVisitor = new VBNetOutputVisitor();
-			e.AcceptVisitor(outputVisitor, null);
-			Assert.AreEqual("", outputVisitor.Errors.ErrorOutput);
-			Assert.AreEqual(StripWhitespace(expression), StripWhitespace(outputVisitor.Text));
-		}
-		
-		[Test]
-		public void Field()
-		{
-			TestTypeMember("Private a As Integer");
-		}
-		
-		[Test]
-		public void Method()
-		{
-			TestTypeMember("Sub Method()\nEnd Sub");
-		}
-		
-		[Test]
-		public void EnumWithBaseType()
-		{
-			TestProgram("Public Enum Foo As UShort\nEnd Enum");
-		}
-		
-		[Test]
-		public void PartialModifier()
-		{
-			TestProgram("Public Partial Class Foo\nEnd Class");
-		}
-		
-		[Test]
-		public void MustInheritClass()
-		{
-			TestProgram("Public MustInherit Class Foo\nEnd Class");
-		}
-		
-		[Test]
-		public void GenericClassDefinition()
-		{
-			TestProgram("Public Class Foo(Of T As {IDisposable, ICloneable})\nEnd Class");
-		}
-		
-		[Test]
-		public void GenericClassDefinitionWithBaseType()
-		{
-			TestProgram("Public Class Foo(Of T As IDisposable)\nInherits BaseType\nEnd Class");
-		}
-		
-		[Test]
-		public void GenericMethodDefinition()
-		{
-			TestTypeMember("Public Sub Foo(Of T As {IDisposable, ICloneable})(ByVal arg As T)\nEnd Sub");
-		}
-		
-		[Test]
-		public void ArrayRank()
-		{
-			TestStatement("Dim a As Object(,,)");
-		}
-		
-		[Test]
-		public void ArrayInitialization()
-		{
-			TestStatement("Dim a As Object() = New Object(10) {}");
-			TestTypeMember("Private MultiDim As Integer(,) = {{1, 2}, {1, 3}}");
-			TestExpression("New Integer(, ) {{1, 1}, {1, 1}}");
-			TestTypeMember("Private _titles As String() = New String() {}");
-		}
-		
-		[Test]
-		public void MethodCallWithOptionalArguments()
-		{
-			TestExpression("M(, )");
-		}
-		
-		[Test]
-		public void IfStatement()
-		{
-			TestStatement("If a Then\n" +
-			              "\tm1()\n" +
-			              "ElseIf b Then\n" +
-			              "\tm2()\n" +
-			              "Else\n" +
-			              "\tm3()\n" +
-			              "End If");
-		}
-		
-		[Test]
-		public void ForNextLoop()
-		{
-			TestStatement("For i = 0 To 10\n" +
-			              "Next");
-			TestStatement("For i As Long = 10 To 0 Step -1\n" +
-			              "Next");
-		}
-		
-		[Test]
-		public void DoLoop()
-		{
-			TestStatement("Do\n" +
-			              "Loop");
-			TestStatement("Do\n" +
-			              "Loop While Not (i = 10)");
-		}
-		
-		[Test]
-		public void SelectCase()
-		{
-			TestStatement(@"Select Case i
-	Case 0
-	Case 1 To 4
-	Case Else
-End Select");
-		}
-		
-		[Test]
-		public void UsingStatement()
-		{
-			TestStatement(@"Using nf As New Font(), nf2 As New List(Of Font)(), nf3 = Nothing
-	Bla(nf)
-End Using");
-		}
-		
-		[Test]
-		public void UntypedVariable()
-		{
-			TestStatement("Dim x = 0");
-		}
-		
-		[Test]
-		public void UntypedField()
-		{
-			TestTypeMember("Dim x = 0");
-		}
-		
-		[Test]
-		public void Assignment()
-		{
-			TestExpression("a = b");
-		}
-		
-		[Test]
-		public void SpecialIdentifiers()
-		{
-			// Assembly, Ansi and Until are contextual keywords
-			// Custom is valid inside methods, but not valid for field names
-			TestExpression("Assembly = Ansi * [For] + Until - [Custom]");
-		}
-		
-		[Test]
-		public void DictionaryAccess()
-		{
-			TestExpression("c!key");
-		}
-		
-		[Test]
-		public void GenericMethodInvocation()
-		{
-			TestExpression("GenericMethod(Of T)(arg)");
-		}
-		
-		[Test]
-		public void SpecialIdentifierName()
-		{
-			TestExpression("[Class]");
-		}
-		
-		[Test]
-		public void GenericDelegate()
-		{
-			TestProgram("Public Delegate Function Predicate(Of T)(ByVal item As T) As String");
-		}
-		
-		[Test]
-		public void Enum()
-		{
-			TestProgram("Enum MyTest\nRed\n Green\n Blue\nYellow\n End Enum");
-		}
-		
-		[Test]
-		public void EnumWithInitializers()
-		{
-			TestProgram("Enum MyTest\nRed = 1\n Green = 2\n Blue = 4\n Yellow = 8\n End Enum");
-		}
-		
-		[Test]
-		public void SyncLock()
-		{
-			TestStatement("SyncLock a\nWork()\nEnd SyncLock");
-		}
-		
-		[Test]
-		public void Using()
-		{
-			TestStatement("Using a As New A()\na.Work()\nEnd Using");
-		}
-		
-		[Test]
-		public void Cast()
-		{
-			TestExpression("CType(a, T)");
-		}
-		
-		[Test]
-		public void DirectCast()
-		{
-			TestExpression("DirectCast(a, T)");
-		}
-		
-		[Test]
-		public void TryCast()
-		{
-			TestExpression("TryCast(a, T)");
-		}
-		
-		[Test]
-		public void PrimitiveCast()
-		{
-			TestExpression("CStr(a)");
-		}
-		
-		[Test]
-		public void TypeOfIs()
-		{
-			TestExpression("TypeOf a Is String");
-		}
-		
-		[Test]
-		public void PropertyWithAccessorAccessModifiers()
-		{
-			TestTypeMember("Public Property ExpectsValue() As Boolean\n" +
-			               "\tPublic Get\n" +
-			               "\tEnd Get\n" +
-			               "\tProtected Set\n" +
-			               "\tEnd Set\n" +
-			               "End Property");
-		}
-		
-		[Test]
-		public void AutoProperty()
-		{
-			TestTypeMember("Public Property Value()");
-			TestTypeMember("Public Property Value() As Integer");
-			TestTypeMember("Public Property Value() As Integer = 5");
-			TestTypeMember("Public Property Value() As New List()");
-		}
-		
-		[Test]
-		public void AbstractProperty()
-		{
-			TestTypeMember("Public MustOverride Property ExpectsValue() As Boolean");
-			TestTypeMember("Public MustOverride ReadOnly Property ExpectsValue() As Boolean");
-			TestTypeMember("Public MustOverride WriteOnly Property ExpectsValue() As Boolean");
-		}
-		
-		[Test]
-		public void AbstractMethod()
-		{
-			TestTypeMember("Public MustOverride Sub Run()");
-			TestTypeMember("Public MustOverride Function Run() As Boolean");
-		}
-		
-		[Test]
-		public void InterfaceImplementingMethod()
-		{
-			TestTypeMember("Public Sub Run() Implements SomeInterface.Run\nEnd Sub");
-			TestTypeMember("Public Function Run() As Boolean Implements SomeInterface.Bla\nEnd Function");
-		}
-		
-		[Test]
-		public void NamedAttributeArgument()
-		{
-			TestProgram("<Attribute(ArgName := \"value\")> _\n" +
-			            "Class Test\n" +
-			            "End Class");
-		}
-		
-		[Test]
-		public void ReturnTypeAttribute()
-		{
-			TestTypeMember("Function A() As <Attribute> String\n" +
-			               "End Function");
-		}
-		
-		[Test]
-		public void AssemblyAttribute()
-		{
-			TestProgram("<Assembly: CLSCompliant>");
-		}
-		
-		[Test]
-		public void ModuleAttribute()
-		{
-			TestProgram("<Module: SuppressMessageAttribute>");
-		}
-		
-		[Test]
-		public void Interface()
-		{
-			TestProgram("Interface ITest\n" +
-			            "Property GetterAndSetter() As Boolean\n" +
-			            "ReadOnly Property GetterOnly() As Boolean\n" +
-			            "WriteOnly Property SetterOnly() As Boolean\n" +
-			            "Sub InterfaceMethod()\n" +
-			            "Function InterfaceMethod2() As String\n" +
-			            "End Interface");
-		}
-		
-		[Test]
-		public void OnErrorStatement()
-		{
-			TestStatement("On Error Resume Next");
-		}
-		
-		[Test]
-		public void OverloadedConversionOperators()
-		{
-			TestTypeMember("Public Shared Narrowing Operator CType(ByVal xmlNode As XmlNode) As TheBug\nEnd Operator");
-			TestTypeMember("Public Shared Widening Operator CType(ByVal bugNode As TheBug) As XmlNode\nEnd Operator");
-		}
-		
-		[Test]
-		public void OverloadedTrueFalseOperators()
-		{
-			TestTypeMember("Public Shared Operator IsTrue(ByVal a As TheBug) As Boolean\nEnd Operator");
-			TestTypeMember("Public Shared Operator IsFalse(ByVal a As TheBug) As Boolean\nEnd Operator");
-		}
-		
-		[Test]
-		public void OverloadedOperators()
-		{
-			TestTypeMember("Public Shared Operator +(ByVal bugNode As TheBug, ByVal bugNode2 As TheBug) As TheBug\nEnd Operator");
-			TestTypeMember("Public Shared Operator >>(ByVal bugNode As TheBug, ByVal b As Integer) As TheBug\nEnd Operator");
-		}
-		
-		[Test]
-		public void AttributeOnParameter()
-		{
-			TestTypeMember("Sub Main(ByRef one As Integer, ByRef two As Integer, <Out> ByRef three As Integer)\nEnd Sub");
-		}
-		
-		[Test]
-		public void FieldWithoutType()
-		{
-			TestTypeMember("Dim X");
-		}
-		
-		[Test]
-		public void UsingStatementForExistingVariable()
-		{
-			TestStatement("Using obj\nEnd Using");
-		}
-		
-		[Test]
-		public void ContinueFor()
-		{
-			TestStatement("Continue For");
-		}
-		
-		[Test]
-		public void ForNextStatementWithFieldLoopVariable()
-		{
-			TestStatement("For Me.Field = 0 To 10\n" +
-			              "Next Me.Field");
-		}
-		
-		[Test]
-		public void WithStatement()
-		{
-			TestStatement("With Ejes\n" +
-			              "\t.AddLine(New Point(Me.ClientSize.Width / 2, 0), (New Point(Me.ClientSize.Width / 2, Me.ClientSize.Height)))\n" +
-			              "End With");
-		}
-		
-		[Test]
-		public void NewConstraint()
-		{
-			TestProgram("Public Class Rational(Of T, O As {IRationalMath(Of T), New})\nEnd Class");
-		}
-		
-		[Test]
-		public void StructConstraint()
-		{
-			TestProgram("Public Class Rational(Of T, O As {IRationalMath(Of T), Structure})\nEnd Class");
-		}
-		
-		[Test]
-		public void ClassConstraint()
-		{
-			TestProgram("Public Class Rational(Of T, O As {IRationalMath(Of T), Class})\nEnd Class");
-		}
-		
-		[Test]
-		public void Integer()
-		{
-			TestExpression("16");
-		}
-		
-		[Test]
-		public void Double()
-		{
-			TestExpression("1.0");
-		}
-		
-		[Test]
-		public void HexadecimalInteger()
-		{
-			TestExpression("&H10");
-		}
-		
-		[Test]
-		public void HexadecimalMinusOne()
-		{
-			TestExpression("&Hffffffff");
-		}
-		
-		[Test]
-		public void TypeCharacters()
-		{
-			TestExpression("347S");
-			TestExpression("347L");
-			TestExpression("347D");
-			TestExpression("347F");
-			TestExpression("347US");
-			TestExpression("347UI");
-			TestExpression("347UL");
-			TestExpression("\".\"C");
-		}
-		
-		[Test]
-		public void AddressOf()
-		{
-			TestExpression("AddressOf Abc");
-		}
-		
-		[Test]
-		public void ChainedConstructorCall()
-		{
-			TestExpression("MyBase.New()");
-			TestExpression("Me.New()");
-			TestExpression("MyClass.New()");
-		}
-		
-		[Test]
-		public void NewMethodCall()
-		{
-			TestExpression("something.[New]()");
-		}
-		
-		[Test]
-		public void ObjectInitializer()
-		{
-			TestExpression("New StringWriter() With { _\n" +
-			               " .NewLine = Environment.NewLine, _\n" +
-			               " .Encoding = Encoding.UTF8 _\n" +
-			               "}");
-		}
-		
-		[Test]
-		public void EventDefinition()
-		{
-			TestTypeMember("Public Event MyEvent(ByVal sender As Object)");
-		}
-		
-		[Test]
-		public void Options()
-		{
-			TestProgram("Option Strict On\n" +
-			            "Option Explicit On\n" +
-			            "Option Infer On\n" +
-			            "Option Compare Text");
-		}
-		
-		[Test]
-		public void UntypedForeach()
-		{
-			TestStatement("For Each x In myGuidArray\nNext");
-		}
-		
-		[Test]
-		public void MethodDefinitionWithOptionalParameter()
-		{
-			TestTypeMember("Sub M(Optional ByVal msg As String = Nothing, Optional ByRef output As String = Nothing)\nEnd Sub");
-		}
-		
-		[Test]
-		public void Module()
-		{
-			TestProgram("Module Test\n" +
-			            " Sub M()\n" +
-			            " End Sub\n" +
-			            "End Module");
-		}
-		
-		[Test]
-		public void WithEvents()
-		{
-			TestTypeMember("Dim WithEvents a As Button");
-		}
-				
-		[Test]
-		public void FriendWithEventsField()
-		{
-			TestTypeMember("Friend WithEvents Button1 As System.Windows.Forms.Button");
-		}
-		
-		[Test]
-		public void SimpleFunctionLambda()
-		{
-			TestExpression("Function(x) x * x");
-		}
-		
-		[Test]
-		public void SimpleFunctionLambdaWithType()
-		{
-			TestExpression("Function(x As Integer) x * x");
-		}
-		
-		[Test]
-		public void SimpleSubLambdaWithType()
-		{
-			TestExpression("Sub(x As Integer) Console.WriteLine(x)");
-		}
-		
-		[Test]
-		public void BlockSubLambdaWithType()
-		{
-			TestExpression("Sub(x As Integer)\n" +
-			               "	Console.WriteLine(x)\n" +
-			               "End Sub");
-		}
-		
-		[Test]
-		public void BlockFunctionLambdaWithType()
-		{
-			TestExpression("Function(x As Integer) As Integer\n" +
-			               "	If x < 2 Then\n" +
-			               "		Return x\n" +
-			               "	End If\n" +
-			               "	Return x * x\n" +
-			               "End Function");
-		}
-		
-		[Test]
-		public void XmlSimple()
-		{
-			TestExpression("<?xml?>\n" +
-			               "<!-- test -->\n" +
-			               "<Test>\n" +
-			               "	<A />\n" +
-			               "	<B test='a' <%= test %> />\n" +
-			               "</Test>");
-		}
-		
-		[Test]
-		public void XmlNested()
-		{
-			TestExpression(@"<menu>
-              <course name=""appetizer"">
-                  <dish>Shrimp Cocktail</dish>
-                  <dish>Escargot</dish>
-              </course>
-              <course name=""main"">
-                  <dish>Filet Mignon</dish>
-                  <dish>Garlic Potatoes</dish>
-                  <dish>Broccoli</dish>
-              </course>
-              <course name=""dessert"">
-                  <dish>Chocolate Cheesecake</dish>
-              </course>
-          </menu>");
-		}
-		
-		[Test]
-		public void XmlDocument()
-		{
-			TestExpression(@"<?xml version=""1.0""?>
-                  <menu>
-                      <course name=""appetizer"">
-                          <dish>Shrimp Cocktail</dish>
-                          <dish>Escargot</dish>
-                      </course>
-                  </menu>");
-		}
-		
-		[Test]
-		public void XmlNestedWithExpressions()
-		{
-			TestExpression(@"<?xml version=""1.0""?>
-          <menu>
-              <course name=""appetizer"">
-                  <%= From m In menu _
-                      Where m.Course = ""appetizer"" _
-                      Select <dish><%= m.Food %></dish> %>
-              </course>
-              <course name=""main"">
-                  <%= From m In menu _
-                      Where m.Course = ""main"" _
-                      Select <dish><%= m.Food %></dish> %>
-              </course>
-              <course name=""dessert"">
-                  <%= From m In menu _
-                      Where m.Course = ""dessert"" _
-                      Select <dish><%= m.Food %></dish> %>
-              </course>
-          </menu>");
-		}
-		
-		[Test]
-		public void XmlAccessExpressions()
-		{
-			TestExpression("xml.<menu>.<course>");
-			TestExpression("xml...<course>");
-			TestExpression("xml...<course>(2)");
-			TestExpression("item.@name");
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/AddressOfExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/AddressOfExpressionTests.cs
deleted file mode 100644
index 40df05fefe..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/AddressOfExpressionTests.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class AddressOfExpressionTests
-	{
-		[Test]
-		public void SimpleAddressOfExpressionTest()
-		{
-			AddressOfExpression ae = ParseUtil.ParseExpression<AddressOfExpression>("AddressOf t");
-			Assert.IsNotNull(ae);
-			Assert.IsInstanceOf(typeof(IdentifierExpression), ae.Expression);
-			Assert.AreEqual("t", ((IdentifierExpression)ae.Expression).Identifier, "t");
-		}
-		
-		[Test]
-		public void GenericAddressOfExpressionTest()
-		{
-			AddressOfExpression ae = ParseUtil.ParseExpression<AddressOfExpression>("AddressOf t(Of X)");
-			Assert.IsNotNull(ae);
-			Assert.IsInstanceOf(typeof(IdentifierExpression), ae.Expression);
-			Assert.AreEqual("t", ((IdentifierExpression)ae.Expression).Identifier, "t");
-			Assert.AreEqual(1, ((IdentifierExpression)ae.Expression).TypeArguments.Count);
-			Assert.AreEqual("X", ((IdentifierExpression)ae.Expression).TypeArguments[0].Type);
-		}
-		
-		[Test]
-		public void MemberReferenceAddressOfExpressionTest()
-		{
-			AddressOfExpression ae = ParseUtil.ParseExpression<AddressOfExpression>("AddressOf Me.t(Of X)");
-			Assert.IsNotNull(ae);
-			Assert.IsInstanceOf(typeof(MemberReferenceExpression), ae.Expression);
-			Assert.AreEqual("t", ((MemberReferenceExpression)ae.Expression).MemberName, "t");
-			Assert.IsInstanceOf(typeof(ThisReferenceExpression), ((MemberReferenceExpression)ae.Expression).TargetObject);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ArrayCreateExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ArrayCreateExpressionTests.cs
deleted file mode 100644
index 673c6f8ab3..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ArrayCreateExpressionTests.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class ArrayCreateExpressionTests
-	{
-		[Test]
-		public void ArrayCreateExpressionTest1()
-		{
-			ArrayCreateExpression ace = ParseUtil.ParseExpression<ArrayCreateExpression>("new Integer() {1, 2, 3, 4}");
-			
-			Assert.AreEqual("System.Int32", ace.CreateType.Type);
-			Assert.AreEqual(0, ace.Arguments.Count);
-			Assert.AreEqual(new int[] {0}, ace.CreateType.RankSpecifier);
-		}
-		
-		[Test]
-		public void ArrayCreateExpressionTest2()
-		{
-			ArrayCreateExpression ace = ParseUtil.ParseExpression<ArrayCreateExpression>("New Integer(0 To 5){0, 1, 2, 3, 4, 5}");
-			
-			Assert.AreEqual("System.Int32", ace.CreateType.Type);
-			Assert.AreEqual(1, ace.Arguments.Count);
-			Assert.AreEqual(5, (ace.Arguments[0] as PrimitiveExpression).Value);
-			Assert.AreEqual(new int[] {0}, ace.CreateType.RankSpecifier);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/AssignmentExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/AssignmentExpressionTests.cs
deleted file mode 100644
index f01c4e2729..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/AssignmentExpressionTests.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class AssignmentExpressionTests
-	{
-		void TestAssignmentExpression(string program, AssignmentOperatorType op)
-		{
-			ExpressionStatement se = ParseUtil.ParseStatement<ExpressionStatement>(program);
-			AssignmentExpression ae = se.Expression as AssignmentExpression;
-			Assert.AreEqual(op, ae.Op);
-			
-			Assert.IsTrue(ae.Left is IdentifierExpression);
-			Assert.IsTrue(ae.Right is IdentifierExpression);
-		}
-
-		[Test]
-		public void AssignTest()
-		{
-			TestAssignmentExpression("a = b", AssignmentOperatorType.Assign);
-		}
-		
-		[Test]
-		public void AddTest()
-		{
-			TestAssignmentExpression("a += b", AssignmentOperatorType.Add);
-		}
-		
-		[Test]
-		public void SubtractTest()
-		{
-			TestAssignmentExpression("a -= b", AssignmentOperatorType.Subtract);
-		}
-		
-		[Test]
-		public void MultiplyTest()
-		{
-			TestAssignmentExpression("a *= b", AssignmentOperatorType.Multiply);
-		}
-		
-		[Test]
-		public void DivideTest()
-		{
-			TestAssignmentExpression("a /= b", AssignmentOperatorType.Divide);
-		}
-		
-		[Test]
-		public void ExclusiveOrTest()
-		{
-			TestAssignmentExpression("a ^= b", AssignmentOperatorType.Power);
-		}
-		
-		[Test]
-		public void StringConcatTest()
-		{
-			TestAssignmentExpression("a &= b", AssignmentOperatorType.ConcatString);
-		}
-
-		[Test]
-		public void ModulusTest()
-		{
-			TestAssignmentExpression("a \\= b", AssignmentOperatorType.DivideInteger);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/BaseReferenceExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/BaseReferenceExpressionTests.cs
deleted file mode 100644
index 0747f40f6c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/BaseReferenceExpressionTests.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class BaseReferenceExpressionTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetBaseReferenceExpressionTest1()
-		{
-			MemberReferenceExpression fre = ParseUtil.ParseExpression<MemberReferenceExpression>("MyBase.myField");
-			Assert.IsTrue(fre.TargetObject is BaseReferenceExpression);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/BinaryOperatorExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/BinaryOperatorExpressionTests.cs
deleted file mode 100644
index 256144aaeb..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/BinaryOperatorExpressionTests.cs
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-using ICSharpCode.NRefactory.VB.PrettyPrinter;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class BinaryOperatorExpressionTests
-	{
-		void OperatorPrecedenceTest(string strongOperator, BinaryOperatorType strongOperatorType,
-		                            string weakOperator, BinaryOperatorType weakOperatorType)
-		{
-			string program = "a " + weakOperator + " b " + strongOperator + " c";
-			BinaryOperatorExpression boe;
-			boe = ParseUtil.ParseExpression<BinaryOperatorExpression>(program);
-			Assert.AreEqual(weakOperatorType, boe.Op);
-			Assert.IsTrue(boe.Left is SimpleNameExpression);
-			boe = (BinaryOperatorExpression)boe.Right;
-			Assert.AreEqual(strongOperatorType, boe.Op);
-			Assert.IsTrue(boe.Left is SimpleNameExpression);
-			Assert.IsTrue(boe.Right is SimpleNameExpression);
-			
-			program = "a " + strongOperator + " b " + weakOperator + " c";
-			boe = ParseUtil.ParseExpression<BinaryOperatorExpression>(program);
-			Assert.AreEqual(weakOperatorType, boe.Op);
-			Assert.IsTrue(boe.Right is SimpleNameExpression);
-			boe = (BinaryOperatorExpression)boe.Left;
-			Assert.AreEqual(strongOperatorType, boe.Op);
-			Assert.IsTrue(boe.Left is SimpleNameExpression);
-			Assert.IsTrue(boe.Right is SimpleNameExpression);
-		}
-		
-		void SameOperatorPrecedenceTest(string firstOperator, BinaryOperatorType firstOperatorType,
-		                                string secondOperator, BinaryOperatorType secondOperatorType)
-		{
-			string program = "a " + secondOperator + " b " + firstOperator + " c";
-			BinaryOperatorExpression boe;
-			boe = ParseUtil.ParseExpression<BinaryOperatorExpression>(program);
-			Assert.AreEqual(firstOperatorType, boe.Op);
-			Assert.IsTrue(boe.Right is SimpleNameExpression);
-			boe = (BinaryOperatorExpression)boe.Left;
-			Assert.AreEqual(secondOperatorType, boe.Op);
-			Assert.IsTrue(boe.Left is SimpleNameExpression);
-			Assert.IsTrue(boe.Right is SimpleNameExpression);
-			
-			program = "a " + firstOperator + " b " + secondOperator + " c";
-			boe = ParseUtil.ParseExpression<BinaryOperatorExpression>(program);
-			Assert.AreEqual(secondOperatorType, boe.Op);
-			Assert.IsTrue(boe.Right is SimpleNameExpression);
-			boe = (BinaryOperatorExpression)boe.Left;
-			Assert.AreEqual(firstOperatorType, boe.Op);
-			Assert.IsTrue(boe.Left is SimpleNameExpression);
-			Assert.IsTrue(boe.Right is SimpleNameExpression);
-		}
-		
-		#region VB.NET
-		void VBNetTestBinaryOperatorExpressionTest(string program, BinaryOperatorType op)
-		{
-			BinaryOperatorExpression boe = ParseUtil.ParseExpression<BinaryOperatorExpression>(program);
-			Assert.AreEqual(op, boe.Op);
-			
-			Assert.IsTrue(boe.Left is SimpleNameExpression);
-			Assert.IsTrue(boe.Right is SimpleNameExpression);
-		}
-		
-		[Test]
-		public void VBOperatorPrecedenceTest()
-		{
-			OperatorPrecedenceTest("^", BinaryOperatorType.Power, "*", BinaryOperatorType.Multiply);
-			SameOperatorPrecedenceTest("*", BinaryOperatorType.Multiply, "/", BinaryOperatorType.Divide);
-			OperatorPrecedenceTest("/", BinaryOperatorType.Divide, "\\", BinaryOperatorType.DivideInteger);
-			OperatorPrecedenceTest("\\", BinaryOperatorType.DivideInteger, "Mod", BinaryOperatorType.Modulus);
-			OperatorPrecedenceTest("Mod", BinaryOperatorType.Modulus, "+", BinaryOperatorType.Add);
-			SameOperatorPrecedenceTest("+", BinaryOperatorType.Add, "-", BinaryOperatorType.Subtract);
-			OperatorPrecedenceTest("-", BinaryOperatorType.Subtract, "&", BinaryOperatorType.Concat);
-			OperatorPrecedenceTest("&", BinaryOperatorType.Concat, "<<", BinaryOperatorType.ShiftLeft);
-			SameOperatorPrecedenceTest("<<", BinaryOperatorType.ShiftLeft, ">>", BinaryOperatorType.ShiftRight);
-			OperatorPrecedenceTest("<<", BinaryOperatorType.ShiftLeft, "=", BinaryOperatorType.Equality);
-			SameOperatorPrecedenceTest("<>", BinaryOperatorType.InEquality, "=", BinaryOperatorType.Equality);
-			SameOperatorPrecedenceTest("<", BinaryOperatorType.LessThan, "=", BinaryOperatorType.Equality);
-			SameOperatorPrecedenceTest("<=", BinaryOperatorType.LessThanOrEqual, "=", BinaryOperatorType.Equality);
-			SameOperatorPrecedenceTest(">", BinaryOperatorType.GreaterThan, "=", BinaryOperatorType.Equality);
-			SameOperatorPrecedenceTest(">=", BinaryOperatorType.GreaterThanOrEqual, "=", BinaryOperatorType.Equality);
-			SameOperatorPrecedenceTest("Like", BinaryOperatorType.Like, "=", BinaryOperatorType.Equality);
-			SameOperatorPrecedenceTest("Is", BinaryOperatorType.ReferenceEquality, "=", BinaryOperatorType.Equality);
-			SameOperatorPrecedenceTest("IsNot", BinaryOperatorType.ReferenceInequality, "=", BinaryOperatorType.Equality);
-			OperatorPrecedenceTest("=", BinaryOperatorType.Equality, "And", BinaryOperatorType.BitwiseAnd);
-			SameOperatorPrecedenceTest("And", BinaryOperatorType.BitwiseAnd, "AndAlso", BinaryOperatorType.LogicalAnd);
-			OperatorPrecedenceTest("And", BinaryOperatorType.BitwiseAnd, "Or", BinaryOperatorType.BitwiseOr);
-			SameOperatorPrecedenceTest("Or", BinaryOperatorType.BitwiseOr, "OrElse", BinaryOperatorType.LogicalOr);
-			SameOperatorPrecedenceTest("Or", BinaryOperatorType.BitwiseOr, "Xor", BinaryOperatorType.ExclusiveOr);
-		}
-		
-		[Test]
-		public void VBNetPowerTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a ^ b", BinaryOperatorType.Power);
-		}
-		
-		[Test]
-		public void VBNetConcatTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a & b", BinaryOperatorType.Concat);
-		}
-		
-		[Test]
-		public void VBNetLogicalAndTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a AndAlso b", BinaryOperatorType.LogicalAnd);
-		}
-		[Test]
-		public void VBNetLogicalAndNotLazyTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a And b", BinaryOperatorType.BitwiseAnd);
-		}
-		
-		[Test]
-		public void VBNetLogicalOrTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a OrElse b", BinaryOperatorType.LogicalOr);
-		}
-		[Test]
-		public void VBNetLogicalOrNotLazyTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a Or b", BinaryOperatorType.BitwiseOr);
-		}
-		
-		[Test]
-		public void VBNetExclusiveOrTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a Xor b", BinaryOperatorType.ExclusiveOr);
-		}
-		
-		
-		[Test]
-		public void VBNetGreaterThanTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a > b", BinaryOperatorType.GreaterThan);
-		}
-		
-		[Test]
-		public void VBNetGreaterThanOrEqualTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a >= b", BinaryOperatorType.GreaterThanOrEqual);
-		}
-		
-		[Test]
-		public void VBNetEqualityTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a = b", BinaryOperatorType.Equality);
-		}
-		
-		[Test]
-		public void VBNetInEqualityTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a <> b", BinaryOperatorType.InEquality);
-		}
-		
-		[Test]
-		public void VBNetLessThanTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a < b", BinaryOperatorType.LessThan);
-		}
-		
-		[Test]
-		public void VBNetLessThanOrEqualTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a <= b", BinaryOperatorType.LessThanOrEqual);
-		}
-		
-		[Test]
-		public void VBNetAddTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a + b", BinaryOperatorType.Add);
-		}
-		
-		[Test]
-		public void VBNetSubtractTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a - b", BinaryOperatorType.Subtract);
-		}
-		
-		[Test]
-		public void VBNetMultiplyTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a * b", BinaryOperatorType.Multiply);
-		}
-		
-		[Test]
-		public void VBNetDivideTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a / b", BinaryOperatorType.Divide);
-		}
-		
-		[Test]
-		public void VBNetDivideIntegerTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a \\ b", BinaryOperatorType.DivideInteger);
-		}
-		
-		[Test]
-		public void VBNetModulusTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a Mod b", BinaryOperatorType.Modulus);
-		}
-		
-		[Test]
-		public void VBNetShiftLeftTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a << b", BinaryOperatorType.ShiftLeft);
-		}
-		
-		[Test]
-		public void VBNetShiftRightTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a >> b", BinaryOperatorType.ShiftRight);
-		}
-		
-		[Test]
-		public void VBNetISTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a is b", BinaryOperatorType.ReferenceEquality);
-		}
-		
-		[Test]
-		public void VBNetISNotTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a IsNot b", BinaryOperatorType.ReferenceInequality);
-		}
-		
-		[Test]
-		public void VBNetLikeTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("a Like b", BinaryOperatorType.Like);
-		}
-		
-		[Test]
-		public void VBNetNullCoalescingTest()
-		{
-			VBNetTestBinaryOperatorExpressionTest("If(a, b)", BinaryOperatorType.NullCoalescing);
-		}
-		
-		[Test]
-		public void VBNetDictionaryAccess()
-		{
-			BinaryOperatorExpression boe = ParseUtil.ParseExpression<BinaryOperatorExpression>("a!b");
-			Assert.AreEqual(BinaryOperatorType.DictionaryAccess, boe.Op);
-			Assert.IsTrue(boe.Left is SimpleNameExpression);
-			Assert.IsTrue(boe.Right is PrimitiveExpression);
-		}
-		
-		[Test]
-		public void VBNetWithDictionaryAccess()
-		{
-			BinaryOperatorExpression boe = ParseUtil.ParseExpression<BinaryOperatorExpression>("!b");
-			Assert.AreEqual(BinaryOperatorType.DictionaryAccess, boe.Op);
-			Assert.IsTrue(boe.Left.IsNull);
-			Assert.IsTrue(boe.Right is PrimitiveExpression);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/CastExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/CastExpressionTests.cs
deleted file mode 100644
index d93aa709d6..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/CastExpressionTests.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class CastExpressionTests
-	{
-		#region VB.NET
-		void TestSpecializedCast(string castExpression, Type castType)
-		{
-			CastExpression ce = ParseUtil.ParseExpression<CastExpression>(castExpression);
-			Assert.AreEqual(castType.FullName, ce.CastTo.Type);
-			Assert.IsTrue(ce.Expression is SimpleNameExpression);
-			Assert.AreEqual(CastType.PrimitiveConversion, ce.CastType);
-		}
-		
-		
-		[Test]
-		public void VBNetSimpleCastExpression()
-		{
-			CastExpression ce = ParseUtil.ParseExpression<CastExpression>("CType(o, MyObject)");
-			Assert.AreEqual("MyObject", ce.CastTo.Type);
-			Assert.IsTrue(ce.Expression is SimpleNameExpression);
-			Assert.AreEqual(CastType.Conversion, ce.CastType);
-		}
-		
-		[Test]
-		public void VBNetGenericCastExpression()
-		{
-			CastExpression ce = ParseUtil.ParseExpression<CastExpression>("CType(o, List(of T))");
-			Assert.AreEqual("List", ce.CastTo.Type);
-			Assert.AreEqual("T", ce.CastTo.GenericTypes[0].Type);
-			Assert.IsTrue(ce.Expression is SimpleNameExpression);
-			Assert.AreEqual(CastType.Conversion, ce.CastType);
-		}
-		
-		[Test]
-		public void VBNetSimpleDirectCastExpression()
-		{
-			CastExpression ce = ParseUtil.ParseExpression<CastExpression>("DirectCast(o, MyObject)");
-			Assert.AreEqual("MyObject", ce.CastTo.Type);
-			Assert.IsTrue(ce.Expression is SimpleNameExpression);
-			Assert.AreEqual(CastType.Cast, ce.CastType);
-		}
-		
-		[Test]
-		public void VBNetGenericDirectCastExpression()
-		{
-			CastExpression ce = ParseUtil.ParseExpression<CastExpression>("DirectCast(o, List(of T))");
-			Assert.AreEqual("List", ce.CastTo.Type);
-			Assert.AreEqual("T", ce.CastTo.GenericTypes[0].Type);
-			Assert.IsTrue(ce.Expression is SimpleNameExpression);
-			Assert.AreEqual(CastType.Cast, ce.CastType);
-		}
-		
-		[Test]
-		public void VBNetSimpleTryCastExpression()
-		{
-			CastExpression ce = ParseUtil.ParseExpression<CastExpression>("TryCast(o, MyObject)");
-			Assert.AreEqual("MyObject", ce.CastTo.Type);
-			Assert.IsTrue(ce.Expression is SimpleNameExpression);
-			Assert.AreEqual(CastType.TryCast, ce.CastType);
-		}
-		
-		[Test]
-		public void VBNetGenericTryCastExpression()
-		{
-			CastExpression ce = ParseUtil.ParseExpression<CastExpression>("TryCast(o, List(of T))");
-			Assert.AreEqual("List", ce.CastTo.Type);
-			Assert.AreEqual("T", ce.CastTo.GenericTypes[0].Type);
-			Assert.IsTrue(ce.Expression is SimpleNameExpression);
-			Assert.AreEqual(CastType.TryCast, ce.CastType);
-		}
-		
-		[Test]
-		public void VBNetSpecializedBoolCastExpression()
-		{
-			TestSpecializedCast("CBool(o)", typeof(System.Boolean));
-		}
-		
-		[Test]
-		public void VBNetSpecializedCharCastExpression()
-		{
-			TestSpecializedCast("CChar(o)", typeof(System.Char));
-		}
-		
-		
-		[Test]
-		public void VBNetSpecializedStringCastExpression()
-		{
-			TestSpecializedCast("CStr(o)", typeof(System.String));
-		}
-		
-		[Test]
-		public void VBNetSpecializedDateTimeCastExpression()
-		{
-			TestSpecializedCast("CDate(o)", typeof(System.DateTime));
-		}
-		
-		[Test]
-		public void VBNetSpecializedDecimalCastExpression()
-		{
-			TestSpecializedCast("CDec(o)", typeof(System.Decimal));
-		}
-		
-		[Test]
-		public void VBNetSpecializedSingleCastExpression()
-		{
-			TestSpecializedCast("CSng(o)", typeof(System.Single));
-		}
-		
-		[Test]
-		public void VBNetSpecializedDoubleCastExpression()
-		{
-			TestSpecializedCast("CDbl(o)", typeof(System.Double));
-		}
-		
-		[Test]
-		public void VBNetSpecializedByteCastExpression()
-		{
-			TestSpecializedCast("CByte(o)", typeof(System.Byte));
-		}
-		
-		[Test]
-		public void VBNetSpecializedInt16CastExpression()
-		{
-			TestSpecializedCast("CShort(o)", typeof(System.Int16));
-		}
-		
-		[Test]
-		public void VBNetSpecializedInt32CastExpression()
-		{
-			TestSpecializedCast("CInt(o)", typeof(System.Int32));
-		}
-		
-		[Test]
-		public void VBNetSpecializedInt64CastExpression()
-		{
-			TestSpecializedCast("CLng(o)", typeof(System.Int64));
-		}
-		
-		[Test]
-		public void VBNetSpecializedSByteCastExpression()
-		{
-			TestSpecializedCast("CSByte(o)", typeof(System.SByte));
-		}
-		
-		[Test]
-		public void VBNetSpecializedUInt16CastExpression()
-		{
-			TestSpecializedCast("CUShort(o)", typeof(System.UInt16));
-		}
-		
-		[Test]
-		public void VBNetSpecializedUInt32CastExpression()
-		{
-			TestSpecializedCast("CUInt(o)", typeof(System.UInt32));
-		}
-		
-		[Test]
-		public void VBNetSpecializedUInt64CastExpression()
-		{
-			TestSpecializedCast("CULng(o)", typeof(System.UInt64));
-		}
-		
-		
-		[Test]
-		public void VBNetSpecializedObjectCastExpression()
-		{
-			TestSpecializedCast("CObj(o)", typeof(System.Object));
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ClassReferenceExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ClassReferenceExpressionTests.cs
deleted file mode 100644
index b9b8929561..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ClassReferenceExpressionTests.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class ClassReferenceExpressionTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetClassReferenceExpressionTest1()
-		{
-			MemberReferenceExpression fre = ParseUtil.ParseExpression<MemberReferenceExpression>("MyClass.myField");
-			Assert.IsTrue(fre.TargetObject is ClassReferenceExpression);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ConditionalExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ConditionalExpressionTests.cs
deleted file mode 100644
index 715d716f7d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ConditionalExpressionTests.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class ConditionalExpressionTests
-	{
-		#region VB.NET
-		
-		[Test]
-		public void VBNetConditionalExpressionTest()
-		{
-			ConditionalExpression ce = ParseUtil.ParseExpression<ConditionalExpression>("If(x IsNot Nothing, x.Test, \"nothing\")");
-			
-			Assert.IsTrue(ce.Condition is BinaryOperatorExpression);
-			Assert.IsTrue(ce.TrueExpression is MemberReferenceExpression);
-			Assert.IsTrue(ce.FalseExpression is PrimitiveExpression);
-		}
-		
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/GlobalReferenceExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/GlobalReferenceExpressionTests.cs
deleted file mode 100644
index 54445299fe..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/GlobalReferenceExpressionTests.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class GlobalReferenceExpressionTests
-	{
-		[Test]
-		public void VBNetGlobalReferenceExpressionTest()
-		{
-			TypeReferenceExpression tre = ParseUtil.ParseExpression<TypeReferenceExpression>("Global.System");
-			Assert.IsTrue(tre.TypeReference.IsGlobal);
-			Assert.AreEqual("System", tre.TypeReference.Type);
-		}
-		
-		[Test]
-		public void VBNetGlobalTypeDeclaration()
-		{
-			LocalVariableDeclaration lvd = ParseUtil.ParseStatement<LocalVariableDeclaration>("Dim a As Global.System.String");
-			TypeReference typeRef = lvd.GetTypeForVariable(0);
-			Assert.IsTrue(typeRef.IsGlobal);
-			Assert.AreEqual("System.String", typeRef.Type);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/IdentifierExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/IdentifierExpressionTests.cs
deleted file mode 100644
index 9c929a2e52..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/IdentifierExpressionTests.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class IdentifierExpressionTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetIdentifierExpressionTest1()
-		{
-			IdentifierExpression ie = ParseUtil.ParseExpression<IdentifierExpression>("MyIdentifier");
-			Assert.AreEqual("MyIdentifier", ie.Identifier);
-		}
-		
-		[Test]
-		public void VBNetIdentifierExpressionTest2()
-		{
-			IdentifierExpression ie = ParseUtil.ParseExpression<IdentifierExpression>("[Public]");
-			Assert.AreEqual("Public", ie.Identifier);
-		}
-		
-		[Test]
-		public void VBNetContextKeywordsTest()
-		{
-			Assert.AreEqual("Assembly", ParseUtil.ParseExpression<IdentifierExpression>("Assembly").Identifier);
-			Assert.AreEqual("Custom", ParseUtil.ParseExpression<IdentifierExpression>("Custom").Identifier);
-			Assert.AreEqual("Off", ParseUtil.ParseExpression<IdentifierExpression>("Off").Identifier);
-			Assert.AreEqual("Explicit", ParseUtil.ParseExpression<IdentifierExpression>("Explicit").Identifier);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/InvocationExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/InvocationExpressionTests.cs
deleted file mode 100644
index dcc4e731c9..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/InvocationExpressionTests.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class InvocationExpressionTests
-	{
-		void CheckSimpleInvoke(InvocationExpression ie)
-		{
-			Assert.AreEqual(0, ie.Arguments.Count);
-			Assert.IsTrue(ie.TargetObject is SimpleNameExpression);
-			Assert.AreEqual("myMethod", ((SimpleNameExpression)ie.TargetObject).Identifier);
-		}
-		
-		void CheckGenericInvoke(InvocationExpression expr)
-		{
-			Assert.AreEqual(1, expr.Arguments.Count);
-			Assert.IsTrue(expr.TargetObject is SimpleNameExpression);
-			SimpleNameExpression ident = (SimpleNameExpression)expr.TargetObject;
-			Assert.AreEqual("myMethod", ident.Identifier);
-			Assert.AreEqual(1, ident.TypeArguments.Count);
-			Assert.AreEqual("System.Char", ident.TypeArguments[0].Type);
-		}
-		
-		void CheckGenericInvoke2(InvocationExpression expr)
-		{
-			Assert.AreEqual(0, expr.Arguments.Count);
-			Assert.IsTrue(expr.TargetObject is SimpleNameExpression);
-			SimpleNameExpression ident = (SimpleNameExpression)expr.TargetObject;
-			Assert.AreEqual("myMethod", ident.Identifier);
-			Assert.AreEqual(2, ident.TypeArguments.Count);
-			Assert.AreEqual("T", ident.TypeArguments[0].Type);
-			Assert.IsFalse(ident.TypeArguments[0].IsKeyword);
-			Assert.AreEqual("System.Boolean", ident.TypeArguments[1].Type);
-			Assert.IsTrue(ident.TypeArguments[1].IsKeyword);
-		}
-		
-		#region VB.NET
-		[Test]
-		public void VBNetSimpleInvocationExpressionTest()
-		{
-			CheckSimpleInvoke(ParseUtil.ParseExpression<InvocationExpression>("myMethod()"));
-		}
-		
-		[Test]
-		public void VBNetGenericInvocationExpressionTest()
-		{
-			CheckGenericInvoke(ParseUtil.ParseExpression<InvocationExpression>("myMethod(Of Char)(\"a\"c)"));
-		}
-		
-		[Test]
-		public void VBNetGenericInvocation2ExpressionTest()
-		{
-			CheckGenericInvoke2(ParseUtil.ParseExpression<InvocationExpression>("myMethod(Of T, Boolean)()"));
-		}
-		
-		[Test]
-		public void PrimitiveExpression1Test()
-		{
-			InvocationExpression ie = ParseUtil.ParseExpression<InvocationExpression>("546.ToString()");
-			Assert.AreEqual(0, ie.Arguments.Count);
-		}
-		
-		[Test]
-		public void VBInvocationOnGenericType()
-		{
-			InvocationExpression expr = ParseUtil.ParseExpression<InvocationExpression>("A(Of T).Foo()");
-			MemberReferenceExpression mre = (MemberReferenceExpression)expr.TargetObject;
-			Assert.AreEqual("Foo", mre.MemberName);
-			SimpleNameExpression tre = (SimpleNameExpression)mre.TargetObject;
-			Assert.AreEqual("A", tre.Identifier);
-			Assert.AreEqual("T", tre.TypeArguments[0].Type);
-		}
-		
-		[Test]
-		public void VBInvocationOnInnerClassInGenericType()
-		{
-			InvocationExpression expr = ParseUtil.ParseExpression<InvocationExpression>("A(Of T).B.Foo()");
-			MemberReferenceExpression mre = (MemberReferenceExpression)expr.TargetObject;
-			Assert.AreEqual("Foo", mre.MemberName);
-			MemberReferenceExpression mre2 = (MemberReferenceExpression)mre.TargetObject;
-			Assert.AreEqual("B", mre2.MemberName);
-			SimpleNameExpression tre = (SimpleNameExpression)mre2.TargetObject;
-			Assert.AreEqual("A", tre.Identifier);
-			Assert.AreEqual("T", tre.TypeArguments[0].Type);
-		}
-		
-		[Test]
-		public void VBInvocationOnGenericInnerClassInGenericType()
-		{
-			InvocationExpression expr = ParseUtil.ParseExpression<InvocationExpression>("A(Of T).B.C(Of U).Foo()");
-			MemberReferenceExpression mre = (MemberReferenceExpression)expr.TargetObject;
-			Assert.AreEqual("Foo", mre.MemberName);
-			
-			MemberReferenceExpression mre2 = (MemberReferenceExpression)mre.TargetObject;
-			Assert.AreEqual("C", mre2.MemberName);
-			Assert.AreEqual("U", mre2.TypeArguments[0].Type);
-			
-			MemberReferenceExpression mre3 = (MemberReferenceExpression)mre2.TargetObject;
-			Assert.AreEqual("B", mre3.MemberName);
-			
-			SimpleNameExpression tre = (SimpleNameExpression)mre3.TargetObject;
-			Assert.AreEqual("A", tre.Identifier);
-			Assert.AreEqual("T", tre.TypeArguments[0].Type);
-		}
-		
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/LambdaExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/LambdaExpressionTests.cs
deleted file mode 100644
index b88297f046..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/LambdaExpressionTests.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class LambdaExpressionTests
-	{
-		static LambdaExpression Parse(string program)
-		{
-			return ParseUtil.ParseExpression<LambdaExpression>(program);
-		}
-		
-		[Test]
-		public void LambdaWithParameters()
-		{
-			LambdaExpression e = Parse("Function(x As Boolean) x Or True");
-			Assert.AreEqual(1, e.Parameters.Count);
-			Assert.AreEqual("x", e.Parameters[0].ParameterName);
-			Assert.AreEqual("System.Boolean", e.Parameters[0].TypeReference.Type);
-			Assert.IsTrue(e.ExpressionBody is BinaryOperatorExpression);
-			Assert.IsTrue(e.ReturnType.IsNull);
-		}
-
-		[Test]
-		public void LambdaWithoutParameters()
-		{
-			LambdaExpression e = Parse("Function() x Or True");
-			Assert.AreEqual(0, e.Parameters.Count);
-			Assert.IsTrue(e.ExpressionBody is BinaryOperatorExpression);
-			Assert.IsTrue(e.ReturnType.IsNull, "ReturnType");
-		}
-		
-		[Test]
-		public void NestedLambda()
-		{
-			LambdaExpression e = Parse("Function(x As Boolean) Function(y As Boolean) x And y");
-			Assert.AreEqual(1, e.Parameters.Count);
-			Assert.IsTrue(e.ExpressionBody is LambdaExpression);
-			Assert.IsTrue(e.ReturnType.IsNull, "ReturnType");
-		}
-		
-		[Test]
-		public void SubLambda()
-		{
-			LambdaExpression e = Parse("Sub(x As Integer) Console.WriteLine(x)");
-			Assert.AreEqual(1, e.Parameters.Count);
-			Assert.IsTrue(e.StatementBody is ExpressionStatement);
-			Assert.IsNotNull(e.ReturnType);
-			Assert.AreEqual("System.Void", e.ReturnType.Type);
-			Assert.IsTrue(e.ReturnType.IsKeyword);
-		}
-		
-		[Test]
-		public void SubWithStatementLambda()
-		{
-			LambdaExpression e = Parse("Sub(x As Integer) Call Console.WriteLine(x)");
-			Assert.AreEqual(1, e.Parameters.Count);
-			Assert.IsTrue(e.StatementBody is ExpressionStatement);
-			Assert.IsNotNull(e.ReturnType);
-			Assert.AreEqual("System.Void", e.ReturnType.Type);
-			Assert.IsTrue(e.ReturnType.IsKeyword);
-		}
-		
-		[Test]
-		public void MultilineSubLambda()
-		{
-			LambdaExpression e = Parse("Sub(x As Integer)\n" +
-			                                "	For i As Integer = 0 To x\n" +
-			                                "		Console.WriteLine(i)\n" +
-			                                "	Next\n" +
-			                                "End Sub");
-			Assert.AreEqual(1, e.Parameters.Count);
-			Assert.IsTrue(e.StatementBody is BlockStatement);
-			Assert.IsNotNull(e.ReturnType);
-			Assert.AreEqual("System.Void", e.ReturnType.Type);
-			Assert.IsTrue(e.ReturnType.IsKeyword);
-			
-			BlockStatement b = e.StatementBody as BlockStatement;
-			
-			Assert.AreEqual(1, b.Children.Count);
-			Assert.IsTrue(b.Children[0] is ForNextStatement);
-		}
-		
-		[Test]
-		public void MultilineFunctionLambda()
-		{
-			LambdaExpression e = Parse("Function(x As Integer)\n" +
-			                                "	Dim prod As Integer = 1\n" +
-			                                "	For i As Integer = 1 To x\n" +
-			                                "		prod = prod * i\n" +
-			                                "	Next\n" +
-			                                "	Return prod\n" +
-			                                "End Function");
-			Assert.AreEqual(1, e.Parameters.Count);
-			Assert.IsTrue(e.StatementBody is BlockStatement);
-			Assert.IsTrue(e.ReturnType.IsNull);
-			
-			BlockStatement b = e.StatementBody as BlockStatement;
-			
-			Assert.AreEqual(3, b.Children.Count);
-			Assert.IsTrue(b.Children[0] is LocalVariableDeclaration);
-			Assert.IsTrue(b.Children[1] is ForNextStatement);
-			Assert.IsTrue(b.Children[2] is ReturnStatement);
-		}
-		
-		[Test]
-		public void MultilineFunctionWithReturnTypeLambda()
-		{
-			LambdaExpression e = Parse("Function(x As Integer) As Integer\n" +
-			                                "	Dim prod As Integer = 1\n" +
-			                                "	For i As Integer = 1 To x\n" +
-			                                "		prod = prod * i\n" +
-			                                "	Next\n" +
-			                                "	Return prod\n" +
-			                                "End Function");
-			Assert.AreEqual(1, e.Parameters.Count);
-			Assert.IsTrue(e.StatementBody is BlockStatement);
-			Assert.IsNotNull(e.ReturnType);
-			Assert.AreEqual("System.Int32", e.ReturnType.Type);
-			Assert.IsTrue(e.ReturnType.IsKeyword);
-			
-			BlockStatement b = e.StatementBody as BlockStatement;
-			
-			Assert.AreEqual(3, b.Children.Count);
-			Assert.IsTrue(b.Children[0] is LocalVariableDeclaration);
-			Assert.IsTrue(b.Children[1] is ForNextStatement);
-			Assert.IsTrue(b.Children[2] is ReturnStatement);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/MemberReferenceExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/MemberReferenceExpressionTests.cs
deleted file mode 100644
index 94efda65b8..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/MemberReferenceExpressionTests.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class MemberReferenceExpressionTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetSimpleFieldReferenceExpressionTest()
-		{
-			MemberReferenceExpression fre = ParseUtil.ParseExpression<MemberReferenceExpression>("myTargetObject.myField");
-			Assert.AreEqual("myField", fre.MemberName);
-			Assert.IsTrue(fre.TargetObject is SimpleNameExpression);
-			Assert.AreEqual("myTargetObject", ((SimpleNameExpression)fre.TargetObject).Identifier);
-		}
-		
-		[Test]
-		public void VBNetFieldReferenceExpressionWithoutTargetTest()
-		{
-			MemberReferenceExpression fre = ParseUtil.ParseExpression<MemberReferenceExpression>(".myField");
-			Assert.AreEqual("myField", fre.MemberName);
-			Assert.IsTrue(fre.TargetObject.IsNull);
-		}
-		
-		[Test]
-		public void VBNetGenericFieldReferenceExpressionTest()
-		{
-			MemberReferenceExpression fre = ParseUtil.ParseExpression<MemberReferenceExpression>("SomeClass(of string).myField");
-			Assert.AreEqual("myField", fre.MemberName);
-			Assert.IsInstanceOf(typeof(SimpleNameExpression), fre.TargetObject);
-			TypeReference tr = ((SimpleNameExpression)fre.TargetObject).TypeArguments[0];
-			Assert.AreEqual("System.String", tr.Type);
-		}
-		
-		[Test]
-		public void VBNetFullNamespaceGenericFieldReferenceExpressionTest()
-		{
-			MemberReferenceExpression fre = ParseUtil.ParseExpression<MemberReferenceExpression>("System.Subnamespace.SomeClass(of string).myField");
-			Assert.AreEqual("myField", fre.MemberName);
-			Assert.IsInstanceOf(typeof(MemberReferenceExpression), fre.TargetObject);
-			
-			MemberReferenceExpression inner = (MemberReferenceExpression)fre.TargetObject;
-			Assert.AreEqual("SomeClass", inner.MemberName);
-			Assert.AreEqual(1, inner.TypeArguments.Count);
-			Assert.AreEqual("System.String", inner.TypeArguments[0].Type);
-		}
-		
-		[Test]
-		public void VBNetGlobalFullNamespaceGenericFieldReferenceExpressionTest()
-		{
-			MemberReferenceExpression fre = ParseUtil.ParseExpression<MemberReferenceExpression>("Global.System.Subnamespace.SomeClass(of string).myField");
-			Assert.AreEqual("myField", fre.MemberName);
-			Assert.IsInstanceOf(typeof(MemberReferenceExpression), fre.TargetObject);
-			MemberReferenceExpression inner = (MemberReferenceExpression)fre.TargetObject;
-			
-			Assert.AreEqual("SomeClass", inner.MemberName);
-			Assert.AreEqual(1, inner.TypeArguments.Count);
-			Assert.AreEqual("System.String", inner.TypeArguments[0].Type);
-		}
-		
-		[Test]
-		public void VBNetNestedGenericFieldReferenceExpressionTest()
-		{
-			MemberReferenceExpression fre = ParseUtil.ParseExpression<MemberReferenceExpression>("MyType(of string).InnerClass(of integer).myField");
-			Assert.AreEqual("myField", fre.MemberName);
-			Assert.IsInstanceOf(typeof(MemberReferenceExpression), fre.TargetObject);
-			
-			MemberReferenceExpression inner = (MemberReferenceExpression)fre.TargetObject;
-			Assert.AreEqual("InnerClass", inner.MemberName);
-		}
-		
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ObjectCreateExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ObjectCreateExpressionTests.cs
deleted file mode 100644
index 2b6a8f886c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ObjectCreateExpressionTests.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class ObjectCreateExpressionTests
-	{
-		void CheckSimpleObjectCreateExpression(ObjectCreateExpression oce)
-		{
-			Assert.AreEqual("MyObject", oce.CreateType.Type);
-			Assert.AreEqual(3, oce.Parameters.Count);
-			Assert.IsTrue(oce.ObjectInitializer.IsNull);
-			
-			for (int i = 0; i < oce.Parameters.Count; ++i) {
-				Assert.IsTrue(oce.Parameters[i] is PrimitiveExpression);
-			}
-		}
-		
-		Expression CheckPropertyInitializationExpression(Expression e, string name)
-		{
-			Assert.IsInstanceOf(typeof(MemberInitializerExpression), e);
-			Assert.AreEqual(name, ((MemberInitializerExpression)e).Name);
-			return ((MemberInitializerExpression)e).Expression;
-		}
-		
-		[Test]
-		public void VBNetAnonymousType()
-		{
-			ObjectCreateExpression oce = ParseUtil.ParseExpression<ObjectCreateExpression>(
-				"New With {.Id = 1, .Name= \"Bill Gates\" }");
-			
-			Assert.IsTrue(oce.CreateType.IsNull);
-			Assert.AreEqual(0, oce.Parameters.Count);
-			Assert.AreEqual(2, oce.ObjectInitializer.CreateExpressions.Count);
-			
-			Assert.IsInstanceOf(typeof(PrimitiveExpression), CheckPropertyInitializationExpression(oce.ObjectInitializer.CreateExpressions[0], "Id"));
-			Assert.IsInstanceOf(typeof(MemberInitializerExpression), oce.ObjectInitializer.CreateExpressions[1]);
-		}
-		
-		[Test]
-		public void VBNetAnonymousTypeWithoutProperty()
-		{
-			ObjectCreateExpression oce = ParseUtil.ParseExpression<ObjectCreateExpression>("New With { c }");
-			
-			Assert.IsTrue(oce.CreateType.IsNull);
-			Assert.AreEqual(0, oce.Parameters.Count);
-			Assert.AreEqual(1, oce.ObjectInitializer.CreateExpressions.Count);
-			
-			Assert.IsInstanceOf(typeof(SimpleNameExpression), oce.ObjectInitializer.CreateExpressions[0]);
-			Assert.AreEqual("c", (oce.ObjectInitializer.CreateExpressions[0] as SimpleNameExpression).Identifier);
-		}
-		
-		[Test]
-		public void VBNetSimpleObjectCreateExpressionTest()
-		{
-			CheckSimpleObjectCreateExpression(ParseUtil.ParseExpression<ObjectCreateExpression>("New MyObject(1, 2, 3)"));
-		}
-		
-		[Test]
-		public void VBNetInvalidTypeArgumentListObjectCreateExpressionTest()
-		{
-			// this test was written because this bug caused the AbstractDomVisitor to crash
-			
-			InvocationExpression expr = ParseUtil.ParseExpression<InvocationExpression>("WriteLine(New SomeGenericType(Of Integer, )())", true);
-			Assert.IsTrue(expr.TargetObject is SimpleNameExpression);
-			Assert.AreEqual("WriteLine", ((SimpleNameExpression)expr.TargetObject).Identifier);
-			Assert.AreEqual(1, expr.Arguments.Count); // here a second null parameter was added incorrectly
-			
-			Assert.IsTrue(expr.Arguments[0] is ObjectCreateExpression);
-			TypeReference typeRef = ((ObjectCreateExpression)expr.Arguments[0]).CreateType;
-			Assert.AreEqual("SomeGenericType", typeRef.Type);
-			Assert.AreEqual(1, typeRef.GenericTypes.Count);
-			Assert.AreEqual("System.Int32", typeRef.GenericTypes[0].Type);
-		}
-		
-		[Test]
-		public void VBNetMemberInitializationTest()
-		{
-			ObjectCreateExpression oce = ParseUtil.ParseExpression<ObjectCreateExpression>("new Contact() With { .FirstName = \"Bill\", .LastName = \"Gates\" }");
-			Assert.AreEqual(2, oce.ObjectInitializer.CreateExpressions.Count);
-			
-			Assert.AreEqual("FirstName", ((MemberInitializerExpression)oce.ObjectInitializer.CreateExpressions[0]).Name);
-			Assert.AreEqual("LastName", ((MemberInitializerExpression)oce.ObjectInitializer.CreateExpressions[1]).Name);
-			
-			Assert.IsInstanceOf(typeof(PrimitiveExpression), ((MemberInitializerExpression)oce.ObjectInitializer.CreateExpressions[0]).Expression);
-			Assert.IsInstanceOf(typeof(PrimitiveExpression), ((MemberInitializerExpression)oce.ObjectInitializer.CreateExpressions[1]).Expression);
-		}
-		
-		[Test]
-		public void VBNetNullableObjectCreateExpressionTest()
-		{
-			ObjectCreateExpression oce = ParseUtil.ParseExpression<ObjectCreateExpression>("New Integer?");
-			Assert.AreEqual("System.Nullable", oce.CreateType.Type);
-			Assert.AreEqual(1, oce.CreateType.GenericTypes.Count);
-			Assert.AreEqual("System.Int32", oce.CreateType.GenericTypes[0].Type);
-		}
-
-		[Test]
-		public void VBNetNullableObjectArrayCreateExpressionTest()
-		{
-			ObjectCreateExpression oce = ParseUtil.ParseExpression<ObjectCreateExpression>("New Integer?()");
-			Assert.AreEqual("System.Nullable", oce.CreateType.Type);
-			Assert.AreEqual(1, oce.CreateType.GenericTypes.Count);
-			Assert.AreEqual("System.Int32", oce.CreateType.GenericTypes[0].Type);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ParenthesizedExpressionTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ParenthesizedExpressionTest.cs
deleted file mode 100644
index b3ed4f87a0..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ParenthesizedExpressionTest.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class ParenthesizedExpressionTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetPrimitiveParenthesizedExpression()
-		{
-			ParenthesizedExpression p = ParseUtil.ParseExpression<ParenthesizedExpression>("((1))");
-			Assert.IsTrue(p.Expression is ParenthesizedExpression);
-			p = p.Expression as ParenthesizedExpression;;
-			Assert.IsTrue(p.Expression is PrimitiveExpression);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/PrimitiveExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/PrimitiveExpressionTests.cs
deleted file mode 100644
index af197957fc..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/PrimitiveExpressionTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class PrimitiveExpressionTests
-	{
-		#region VB.NET
-		[Test]
-		public void PrimitiveExpression1Test()
-		{
-			InvocationExpression ie = ParseUtil.ParseExpression<InvocationExpression>("546.ToString()");
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/QueryExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/QueryExpressionTests.cs
deleted file mode 100644
index 8d46f278eb..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/QueryExpressionTests.cs
+++ /dev/null
@@ -1,635 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using System.Linq;
-
-using ICSharpCode.NRefactory.VB.Ast;
-using ICSharpCode.NRefactory.VB.Parser;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class QueryExpressionTests
-	{
-		void RunTest(string expression, int expectedCount, Action<QueryExpression> constraint, params Type[] expectedTypes)
-		{
-			var expr = ParseUtil.ParseExpression<QueryExpression>(expression);
-			
-			Assert.AreEqual(expectedCount, expr.Clauses.Count);
-			
-			for (int i = 0; i < expectedTypes.Length; i++) {
-				Assert.IsTrue(expectedTypes[i] == expr.Clauses[i].GetType());
-			}
-			
-			constraint(expr);
-		}
-		
-		[Test]
-		public void SimpleQueryTest()
-		{
-			RunTest("From o In db.Orders Select o.OrderID", 2,
-			        expr => {
-			        	var fromClause = expr.Clauses[0] as QueryExpressionFromClause;
-			        	var selectClause = expr.Clauses[1] as QueryExpressionSelectVBClause;
-			        	
-			        	Assert.AreEqual(1, fromClause.Sources.Count);
-			        	
-			        	var var1 = fromClause.Sources.First();
-			        	
-			        	Assert.AreEqual("o", var1.Identifier);
-			        	Assert.IsTrue(var1.Expression is MemberReferenceExpression);
-			        	var inExpr = var1.Expression as MemberReferenceExpression;
-			        	Assert.IsTrue(inExpr.MemberName == "Orders" && inExpr.TargetObject is IdentifierExpression && (inExpr.TargetObject as IdentifierExpression).Identifier == "db");
-			        	
-			        	Assert.AreEqual(1, selectClause.Variables.Count);
-			        	Assert.IsTrue(selectClause.Variables[0].Expression is MemberReferenceExpression);
-			        	var member = selectClause.Variables[0].Expression as MemberReferenceExpression;
-			        	
-			        	Assert.IsTrue(member.MemberName == "OrderID" && member.TargetObject is IdentifierExpression && (member.TargetObject as IdentifierExpression).Identifier == "o");
-			        },
-			        typeof(QueryExpressionFromClause), typeof(QueryExpressionSelectVBClause)
-			       );
-		}
-		
-		[Test]
-		public void SkipTakeQueryTest()
-		{
-			RunTest("From o In db.Orders Select o.OrderID Skip 10 Take 5", 4,
-			        expr => {
-			        	var fromClause = expr.Clauses[0] as QueryExpressionFromClause;
-			        	var selectClause = expr.Clauses[1] as QueryExpressionSelectVBClause;
-			        	var skipClause = expr.Clauses[2] as QueryExpressionPartitionVBClause;
-			        	var takeClause = expr.Clauses[3] as QueryExpressionPartitionVBClause;
-			        	
-			        	Assert.AreEqual(1, fromClause.Sources.Count);
-			        	
-			        	var var1 = fromClause.Sources.First();
-			        	
-			        	Assert.AreEqual("o", var1.Identifier);
-			        	Assert.IsTrue(var1.Expression is MemberReferenceExpression);
-			        	var inExpr = var1.Expression as MemberReferenceExpression;
-			        	Assert.IsTrue(inExpr.MemberName == "Orders" && inExpr.TargetObject is IdentifierExpression && (inExpr.TargetObject as IdentifierExpression).Identifier == "db");
-			        	
-			        	Assert.AreEqual(1, selectClause.Variables.Count);
-			        	Assert.IsTrue(selectClause.Variables[0].Expression is MemberReferenceExpression);
-			        	var member = selectClause.Variables[0].Expression as MemberReferenceExpression;
-			        	
-			        	Assert.IsTrue(member.MemberName == "OrderID" && member.TargetObject is IdentifierExpression && (member.TargetObject as IdentifierExpression).Identifier == "o");
-			        	
-			        	Assert.AreEqual(QueryExpressionPartitionType.Skip, skipClause.PartitionType);
-			        	Assert.IsTrue(skipClause.Expression is PrimitiveExpression &&
-			        	              (skipClause.Expression as PrimitiveExpression).StringValue == "10");
-			        	
-			        	Assert.AreEqual(QueryExpressionPartitionType.Take, takeClause.PartitionType);
-			        	Assert.IsTrue(takeClause.Expression is PrimitiveExpression &&
-			        	              (takeClause.Expression as PrimitiveExpression).StringValue == "5");
-			        },
-			        typeof(QueryExpressionFromClause), typeof(QueryExpressionSelectVBClause),
-			        typeof(QueryExpressionPartitionVBClause), typeof(QueryExpressionPartitionVBClause)
-			       );
-		}
-		
-		[Test]
-		public void SkipWhileTakeWhileQueryTest()
-		{
-			RunTest("From o In db.Orders Select o.OrderID Skip While o.OrderId > 2 Take While o.OrderId < 5", 4,
-			        expr => {
-			        	var fromClause = expr.Clauses[0] as QueryExpressionFromClause;
-			        	var selectClause = expr.Clauses[1] as QueryExpressionSelectVBClause;
-			        	var skipClause = expr.Clauses[2] as QueryExpressionPartitionVBClause;
-			        	var takeClause = expr.Clauses[3] as QueryExpressionPartitionVBClause;
-			        	
-			        	Assert.AreEqual(1, fromClause.Sources.Count);
-			        	
-			        	var var1 = fromClause.Sources.First();
-			        	
-			        	Assert.AreEqual("o", var1.Identifier);
-			        	Assert.IsTrue(var1.Expression is MemberReferenceExpression);
-			        	var inExpr = var1.Expression as MemberReferenceExpression;
-			        	Assert.IsTrue(inExpr.MemberName == "Orders" && inExpr.TargetObject is IdentifierExpression && (inExpr.TargetObject as IdentifierExpression).Identifier == "db");
-			        	
-			        	Assert.AreEqual(1, selectClause.Variables.Count);
-			        	Assert.IsTrue(selectClause.Variables[0].Expression is MemberReferenceExpression);
-			        	var member = selectClause.Variables[0].Expression as MemberReferenceExpression;
-			        	
-			        	Assert.IsTrue(member.MemberName == "OrderID" && member.TargetObject is IdentifierExpression && (member.TargetObject as IdentifierExpression).Identifier == "o");
-			        	
-			        	Assert.AreEqual(QueryExpressionPartitionType.SkipWhile, skipClause.PartitionType);
-			        	Assert.IsTrue(skipClause.Expression is BinaryOperatorExpression);
-			        	
-			        	Assert.AreEqual(QueryExpressionPartitionType.TakeWhile, takeClause.PartitionType);
-			        	Assert.IsTrue(takeClause.Expression is BinaryOperatorExpression);
-			        },
-			        typeof(QueryExpressionFromClause), typeof(QueryExpressionSelectVBClause),
-			        typeof(QueryExpressionPartitionVBClause), typeof(QueryExpressionPartitionVBClause)
-			       );
-		}
-		
-		[Test]
-		public void MultipleValuesSelectTest()
-		{
-			RunTest(@"From i In list Select i, x2 = i^2",
-			        2, expr => {
-			        	var fromClause = expr.Clauses[0] as QueryExpressionFromClause;
-			        	var selectClause = expr.Clauses[1] as QueryExpressionSelectVBClause;
-			        	
-			        	Assert.AreEqual(1, fromClause.Sources.Count);
-			        	
-			        	var var1 = fromClause.Sources.First();
-			        	
-			        	Assert.AreEqual("i", var1.Identifier);
-			        	Assert.IsTrue(var1.Expression is IdentifierExpression);
-			        	Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "list");
-			        	
-			        	Assert.AreEqual(2, selectClause.Variables.Count);
-			        	
-			        	var selectExpr1 = selectClause.Variables[0];
-			        	var selectExpr2 = selectClause.Variables[1];
-			        	
-			        	Assert.IsEmpty(selectExpr1.Identifier);
-			        	Assert.IsTrue(selectExpr1.Expression is IdentifierExpression &&
-			        	              (selectExpr1.Expression as IdentifierExpression).Identifier == "i");
-			        	
-			        	Assert.AreEqual("x2", selectExpr2.Identifier);
-			        	Assert.IsTrue(selectExpr2.Type.IsNull);
-			        	Assert.IsTrue(selectExpr2.Expression is BinaryOperatorExpression);
-			        	
-			        	var binOp = selectExpr2.Expression as BinaryOperatorExpression;
-			        	
-			        	Assert.AreEqual(BinaryOperatorType.Power, binOp.Op);
-			        	Assert.IsTrue(binOp.Left is IdentifierExpression && (binOp.Left as IdentifierExpression).Identifier == "i");
-			        	Assert.IsTrue(binOp.Right is PrimitiveExpression && (binOp.Right as PrimitiveExpression).StringValue == "2");
-			        },
-			        typeof(QueryExpressionFromClause), typeof(QueryExpressionSelectVBClause)
-			       );
-		}
-		
-		[Test]
-		public void GroupTest()
-		{
-			Action<QueryExpression> constraint = expr => {
-				var fromClause = expr.Clauses[0] as QueryExpressionFromClause;
-				var groupClause = expr.Clauses[1] as QueryExpressionGroupVBClause;
-				var selectClause = expr.Clauses[2] as QueryExpressionSelectVBClause;
-				
-				Assert.AreEqual(1, fromClause.Sources.Count);
-				
-				var fromVar1 = fromClause.Sources.First();
-				
-				Assert.AreEqual("p", fromVar1.Identifier);
-				Assert.IsTrue(fromVar1.Expression is IdentifierExpression);
-				Assert.IsTrue((fromVar1.Expression as IdentifierExpression).Identifier == "products");
-				
-				Assert.AreEqual(1, groupClause.GroupVariables.Count);
-				Assert.AreEqual(1, groupClause.ByVariables.Count);
-				Assert.AreEqual(1, groupClause.IntoVariables.Count);
-				
-				var gv = groupClause.GroupVariables.First();
-				var bv = groupClause.ByVariables.First();
-				var iv = groupClause.IntoVariables.First();
-				
-				Assert.IsTrue(gv.Expression is IdentifierExpression && (gv.Expression as IdentifierExpression).Identifier == "p");
-				Assert.IsTrue(bv.Expression is MemberReferenceExpression &&
-				              (bv.Expression as MemberReferenceExpression).MemberName == "Category");
-				Assert.IsTrue((bv.Expression as MemberReferenceExpression).TargetObject is IdentifierExpression &&
-				              ((bv.Expression as MemberReferenceExpression).TargetObject as IdentifierExpression).Identifier == "p");
-				Assert.IsTrue(iv.Expression is IdentifierExpression &&
-				              (iv.Expression as IdentifierExpression).Identifier == "Group");
-				
-				Assert.AreEqual(2, selectClause.Variables.Count);
-				
-				var var1 = selectClause.Variables.First();
-				var var2 = selectClause.Variables.Skip(1).First();
-				
-				Assert.IsTrue(var1.Expression is IdentifierExpression &&
-				              (var1.Expression as IdentifierExpression).Identifier == "Category");
-				Assert.IsTrue(var2.Expression is InvocationExpression &&
-				              (var2.Expression as InvocationExpression).TargetObject is MemberReferenceExpression &&
-				              ((var2.Expression as InvocationExpression).TargetObject as MemberReferenceExpression).MemberName == "Average" &&
-				              ((var2.Expression as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject is IdentifierExpression &&
-				              (((var2.Expression as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject as IdentifierExpression).Identifier == "Group");
-			};
-			
-			RunTest(@"From p In products _
-            Group p By p.Category Into Group _
-            Select Category, AveragePrice = Group.Average(Function(p) p.UnitPrice)", 3, constraint,
-			        typeof(QueryExpressionFromClause), typeof(QueryExpressionGroupVBClause), typeof(QueryExpressionSelectVBClause));
-		}
-		
-		[Test]
-		public void LetTest()
-		{
-			Action<QueryExpression> constraint = expr => {
-				var fromClause = expr.Clauses[0] as QueryExpressionFromClause;
-				var groupClause = expr.Clauses[1] as QueryExpressionGroupVBClause;
-				var letClause = expr.Clauses[2] as QueryExpressionLetClause;
-				var selectClause = expr.Clauses[3] as QueryExpressionSelectVBClause;
-				
-				// From
-				Assert.AreEqual(1, fromClause.Sources.Count);
-				
-				var fromVar1 = fromClause.Sources.First();
-				
-				Assert.AreEqual("p", fromVar1.Identifier);
-				Assert.IsTrue(fromVar1.Expression is IdentifierExpression);
-				Assert.IsTrue((fromVar1.Expression as IdentifierExpression).Identifier == "products");
-				
-				// Group By Into
-				Assert.AreEqual(1, groupClause.GroupVariables.Count);
-				Assert.AreEqual(1, groupClause.ByVariables.Count);
-				Assert.AreEqual(1, groupClause.IntoVariables.Count);
-				
-				var gv = groupClause.GroupVariables.First();
-				var bv = groupClause.ByVariables.First();
-				var iv = groupClause.IntoVariables.First();
-				
-				Assert.IsTrue(gv.Expression is IdentifierExpression && (gv.Expression as IdentifierExpression).Identifier == "p");
-				CheckMemberReferenceExpression(bv.Expression, "Category", "p");
-				Assert.IsTrue(iv.Expression is IdentifierExpression &&
-				              (iv.Expression as IdentifierExpression).Identifier == "Group");
-				
-				// Let
-				Assert.AreEqual(1, letClause.Variables.Count);
-				
-				var letVariable = letClause.Variables.First();
-				
-				Assert.AreEqual("minPrice", letVariable.Identifier);
-				Assert.IsTrue(letVariable.Expression is InvocationExpression);
-				CheckMemberReferenceExpression((letVariable.Expression as InvocationExpression).TargetObject, "Min", "Group");
-
-				// Select
-				Assert.AreEqual(2, selectClause.Variables.Count);
-				
-				var var1 = selectClause.Variables.First();
-				var var2 = selectClause.Variables.Skip(1).First();
-				
-				Assert.IsTrue(var1.Expression is IdentifierExpression &&
-				              (var1.Expression as IdentifierExpression).Identifier == "Category");
-				Assert.IsTrue(var2.Expression is InvocationExpression);
-				CheckMemberReferenceExpression((var2.Expression as InvocationExpression).TargetObject, "Where", "Group");
-			};
-			
-			RunTest(@"From p In products _
-            Group p By p.Category Into Group _
-            Let minPrice = Group.Min(Function(p) p.UnitPrice) _
-            Select Category, CheapestProducts = Group.Where(Function(p) p.UnitPrice = minPrice)", 4, constraint,
-			        typeof(QueryExpressionFromClause), typeof(QueryExpressionGroupVBClause), typeof(QueryExpressionLetClause), typeof(QueryExpressionSelectVBClause));
-		}
-		
-		[Test]
-		public void CrossJoinTest()
-		{
-			Action<QueryExpression> constraint = expr => {
-				var fromClause = expr.Clauses[0] as QueryExpressionFromClause;
-				var joinClause = expr.Clauses[1] as QueryExpressionJoinVBClause;
-				var selectClause = expr.Clauses[2] as QueryExpressionSelectVBClause;
-				
-				// From
-				Assert.AreEqual(1, fromClause.Sources.Count);
-				
-				var fromVar1 = fromClause.Sources.First();
-				
-				Assert.AreEqual("c", fromVar1.Identifier);
-				Assert.IsTrue(fromVar1.Expression is IdentifierExpression);
-				Assert.IsTrue((fromVar1.Expression as IdentifierExpression).Identifier == "categories");
-				
-				// Join In On Equals
-				var inClause = joinClause.JoinVariable as CollectionRangeVariable;
-				
-				Assert.AreEqual("p", inClause.Identifier);
-				Assert.IsTrue(inClause.Expression is IdentifierExpression &&
-				              (inClause.Expression as IdentifierExpression).Identifier == "products");
-				
-				Assert.IsTrue(joinClause.SubJoin.IsNull);
-				
-				Assert.AreEqual(1, joinClause.Conditions.Count);
-				
-				var condition1 = joinClause.Conditions.First();
-				
-				Assert.IsTrue(condition1.LeftSide is IdentifierExpression && (condition1.LeftSide as IdentifierExpression).Identifier == "c");
-				
-				CheckMemberReferenceExpression(condition1.RightSide, "Category", "p");
-				
-				// Select
-				Assert.AreEqual(2, selectClause.Variables.Count);
-				
-				var var1 = selectClause.Variables.First();
-				var var2 = selectClause.Variables.Skip(1).First();
-				
-				Assert.AreEqual("Category", var1.Identifier);
-				Assert.IsEmpty(var2.Identifier);
-				
-				Assert.IsTrue(var1.Expression is IdentifierExpression &&
-				              (var1.Expression as IdentifierExpression).Identifier == "c");
-				CheckMemberReferenceExpression(var2.Expression, "ProductName", "p");
-			};
-			
-			RunTest(@"From c In categories _
-                Join p In products On c Equals p.Category _
-                Select Category = c, p.ProductName", 3, constraint,
-			        typeof(QueryExpressionFromClause), typeof(QueryExpressionJoinVBClause), typeof(QueryExpressionSelectVBClause));
-		}
-		
-		[Test]
-		public void OrderByTest()
-		{
-			Action<QueryExpression> constraint = expr => {
-				var fromClause = expr.Clauses[0] as QueryExpressionFromClause;
-				var orderClause = expr.Clauses[1] as QueryExpressionOrderClause;
-				
-				// From
-				Assert.AreEqual(1, fromClause.Sources.Count);
-				
-				var var1 = fromClause.Sources.First();
-				
-				Assert.AreEqual("i", var1.Identifier);
-				Assert.IsTrue(var1.Expression is IdentifierExpression);
-				Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "list");
-				
-				// Order By
-				Assert.AreEqual(1, orderClause.Orderings.Count);
-				
-				var ordering1 = orderClause.Orderings.First();
-				
-				Assert.IsTrue(ordering1.Criteria is IdentifierExpression &&
-				              (ordering1.Criteria as IdentifierExpression).Identifier == "i");
-				Assert.AreEqual(QueryExpressionOrderingDirection.None, ordering1.Direction);
-			};
-			
-			RunTest(@"From i In list Order By i", 2, constraint, typeof(QueryExpressionFromClause), typeof(QueryExpressionOrderClause));
-		}
-		
-		[Test]
-		public void OrderByTest2()
-		{
-			Action<QueryExpression> constraint = expr => {
-				var fromClause = expr.Clauses[0] as QueryExpressionFromClause;
-				var orderClause = expr.Clauses[1] as QueryExpressionOrderClause;
-				
-				// From
-				Assert.AreEqual(1, fromClause.Sources.Count);
-				
-				var var1 = fromClause.Sources.First();
-				
-				Assert.AreEqual("i", var1.Identifier);
-				Assert.IsTrue(var1.Expression is IdentifierExpression);
-				Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "list");
-				
-				// Order By
-				Assert.AreEqual(1, orderClause.Orderings.Count);
-				
-				var ordering1 = orderClause.Orderings.First();
-				
-				Assert.IsTrue(ordering1.Criteria is IdentifierExpression &&
-				              (ordering1.Criteria as IdentifierExpression).Identifier == "i");
-				Assert.AreEqual(QueryExpressionOrderingDirection.Ascending, ordering1.Direction);
-			};
-			
-			RunTest(@"From i In list Order By i Ascending", 2, constraint, typeof(QueryExpressionFromClause), typeof(QueryExpressionOrderClause));
-		}
-		
-		[Test]
-		public void OrderByTest3()
-		{
-			Action<QueryExpression> constraint = expr => {
-				var fromClause = expr.Clauses[0] as QueryExpressionFromClause;
-				var orderClause = expr.Clauses[1] as QueryExpressionOrderClause;
-				
-				// From
-				Assert.AreEqual(1, fromClause.Sources.Count);
-				
-				var var1 = fromClause.Sources.First();
-				
-				Assert.AreEqual("i", var1.Identifier);
-				Assert.IsTrue(var1.Expression is IdentifierExpression);
-				Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "list");
-				
-				// Order By
-				Assert.AreEqual(1, orderClause.Orderings.Count);
-				
-				var ordering1 = orderClause.Orderings.First();
-				
-				Assert.IsTrue(ordering1.Criteria is IdentifierExpression &&
-				              (ordering1.Criteria as IdentifierExpression).Identifier == "i");
-				Assert.AreEqual(QueryExpressionOrderingDirection.Descending, ordering1.Direction);
-			};
-			
-			RunTest(@"From i In list Order By i Descending", 2, constraint, typeof(QueryExpressionFromClause), typeof(QueryExpressionOrderClause));
-		}
-		
-		[Test]
-		public void OrderByThenByTest()
-		{
-			Action<QueryExpression> constraint = expr => {
-				var fromClause = expr.Clauses[0] as QueryExpressionFromClause;
-				var orderClause = expr.Clauses[1] as QueryExpressionOrderClause;
-				
-				// From
-				Assert.AreEqual(1, fromClause.Sources.Count);
-				
-				var var1 = fromClause.Sources.First();
-				
-				Assert.AreEqual("d", var1.Identifier);
-				Assert.IsTrue(var1.Expression is IdentifierExpression);
-				Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "digits");
-				
-				// Order By
-				Assert.AreEqual(2, orderClause.Orderings.Count);
-				
-				var ordering1 = orderClause.Orderings.First();
-				var ordering2 = orderClause.Orderings.Skip(1).First();
-				
-				CheckMemberReferenceExpression(ordering1.Criteria, "Length", "d");
-
-				Assert.IsTrue(ordering2.Criteria is IdentifierExpression &&
-				              (ordering2.Criteria as IdentifierExpression).Identifier == "d");
-				
-				Assert.AreEqual(QueryExpressionOrderingDirection.None, ordering1.Direction);
-				Assert.AreEqual(QueryExpressionOrderingDirection.None, ordering2.Direction);
-
-			};
-			
-			RunTest(@"From d In digits _
-        Order By d.Length, d", 2, constraint,
-			        typeof(QueryExpressionFromClause), typeof(QueryExpressionOrderClause));
-		}
-		
-		[Test]
-		public void DistinctTest()
-		{
-			Action<QueryExpression> constraint = expr => {
-				var fromClause = expr.Clauses[0] as QueryExpressionFromClause;
-				
-				// From
-				Assert.AreEqual(1, fromClause.Sources.Count);
-				
-				var var1 = fromClause.Sources.First();
-				
-				Assert.AreEqual("d", var1.Identifier);
-				Assert.IsTrue(var1.Expression is IdentifierExpression);
-				Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "digits");
-			};
-			
-			RunTest(@"From d In digits Distinct", 2, constraint,
-			        typeof(QueryExpressionFromClause), typeof(QueryExpressionDistinctClause));
-		}
-		
-		[Test]
-		public void AggregateTest()
-		{
-			Action<QueryExpression> constraint = expr => {
-				var clause = expr.Clauses[0] as QueryExpressionAggregateClause;
-				
-				Assert.AreEqual("p", clause.Source.Identifier);
-				CheckMemberReferenceExpression(clause.Source.Expression, "GetProcesses", "Process");
-				
-				Assert.AreEqual(1, clause.IntoVariables.Count);
-				
-				var into1 = clause.IntoVariables.First();
-				
-				Assert.AreEqual("virtualMemory", into1.Identifier);
-				
-				Assert.IsTrue(into1.Expression is InvocationExpression &&
-				              (into1.Expression as InvocationExpression).TargetObject is IdentifierExpression &&
-				              ((into1.Expression as InvocationExpression).TargetObject as IdentifierExpression).Identifier == "Sum");
-				Assert.AreEqual(1, (into1.Expression as InvocationExpression).Arguments.Count);
-				CheckMemberReferenceExpression((into1.Expression as InvocationExpression).Arguments.First(), "VirtualMemorySize64", "p");
-			};
-			
-			RunTest(@"Aggregate p In Process.GetProcesses _
-			Into virtualMemory = Sum(p.VirtualMemorySize64)", 1, constraint, typeof(QueryExpressionAggregateClause));
-		}
-		
-		[Test]
-		public void GroupJoinTest()
-		{
-			Action<QueryExpression> constraint = expr => {
-				var fromClause1 = expr.Clauses[0] as QueryExpressionFromClause;
-				var groupJoinClause = expr.Clauses[1] as QueryExpressionGroupJoinVBClause;
-				var fromClause2 = expr.Clauses[2] as QueryExpressionFromClause;
-				var selectClause = expr.Clauses[3] as QueryExpressionSelectVBClause;
-				
-				// From 1
-				Assert.AreEqual(1, fromClause1.Sources.Count);
-				
-				var var1 = fromClause1.Sources.First();
-				
-				Assert.AreEqual("s", var1.Identifier);
-				Assert.IsTrue(var1.Expression is IdentifierExpression &&
-				              (var1.Expression as IdentifierExpression).Identifier == "fileList");
-				
-				// From 2
-				Assert.AreEqual(1, fromClause2.Sources.Count);
-				
-				var var2 = fromClause2.Sources.First();
-				
-				Assert.AreEqual("p", var2.Identifier);
-				Assert.IsTrue(var2.Expression is IdentifierExpression &&
-				              (var2.Expression as IdentifierExpression).Identifier == "Group");
-				
-				// Select
-				Assert.AreEqual(1, selectClause.Variables.Count);
-				
-				var var3 = selectClause.Variables.First();
-				
-				Assert.IsEmpty(var3.Identifier);
-				Assert.IsTrue(var3.Expression is IdentifierExpression &&
-				              (var3.Expression as IdentifierExpression).Identifier == "s");
-				
-				// Group Join
-				var joinClause = groupJoinClause.JoinClause;
-				
-				// Join In On Equals
-				var inClause = joinClause.JoinVariable as CollectionRangeVariable;
-				
-				Assert.AreEqual("p", inClause.Identifier);
-				Assert.IsTrue(inClause.Expression is IdentifierExpression &&
-				              (inClause.Expression as IdentifierExpression).Identifier == "IMAGES");
-				
-				Assert.IsTrue(joinClause.SubJoin.IsNull);
-				
-				Assert.AreEqual(1, joinClause.Conditions.Count);
-				
-				var condition1 = joinClause.Conditions.First();
-				
-				Assert.IsTrue(condition1.LeftSide is InvocationExpression);
-				Assert.IsTrue((condition1.LeftSide as InvocationExpression).TargetObject is MemberReferenceExpression);
-				Assert.IsTrue(((condition1.LeftSide as InvocationExpression).TargetObject as MemberReferenceExpression).MemberName == "ToUpper");
-				Assert.IsTrue(((condition1.LeftSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject is MemberReferenceExpression);
-				Assert.IsTrue((((condition1.LeftSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject as MemberReferenceExpression).MemberName == "Extension");
-				Assert.IsTrue((((condition1.LeftSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject as MemberReferenceExpression).TargetObject is IdentifierExpression);
-				Assert.IsTrue(((((condition1.LeftSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject as MemberReferenceExpression).TargetObject as IdentifierExpression).Identifier == "s");
-				
-				Assert.IsTrue(condition1.RightSide is InvocationExpression);
-				Assert.IsTrue((condition1.RightSide as InvocationExpression).TargetObject is MemberReferenceExpression);
-				Assert.IsTrue(((condition1.RightSide as InvocationExpression).TargetObject as MemberReferenceExpression).MemberName == "ToUpper");
-				Assert.IsTrue(((condition1.RightSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject is IdentifierExpression);
-				Assert.IsTrue((((condition1.RightSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject as IdentifierExpression).Identifier == "p");
-			};
-			
-			RunTest(@"From s In fileList _
-Group Join p In IMAGES On s.Extension.ToUpper() Equals p.ToUpper() Into Group _
-From p In Group _
-Select s", 4, constraint,
-			        typeof(QueryExpressionFromClause), typeof(QueryExpressionGroupJoinVBClause), typeof(QueryExpressionFromClause), typeof(QueryExpressionSelectVBClause));
-		}
-		
-		[Test]
-		public void SelectManyTest()
-		{
-			Action<QueryExpression> constraint = expr => {
-				var fromClause = expr.Clauses[0] as QueryExpressionFromClause;
-				var whereClause = expr.Clauses[1] as QueryExpressionWhereClause;
-				var selectClause = expr.Clauses[2] as QueryExpressionSelectVBClause;
-				
-				// From
-				Assert.AreEqual(2, fromClause.Sources.Count);
-				
-				var fromVar1 = fromClause.Sources.First();
-				var fromVar2 = fromClause.Sources.Skip(1).First();
-				
-				Assert.AreEqual("c", fromVar1.Identifier);
-				Assert.IsTrue(fromVar1.Expression is IdentifierExpression);
-				Assert.IsTrue((fromVar1.Expression as IdentifierExpression).Identifier == "customers");
-				
-				Assert.AreEqual("o", fromVar2.Identifier);
-				CheckMemberReferenceExpression(fromVar2.Expression, "Orders", "c");
-				
-				// Where
-				Assert.IsTrue(whereClause.Condition is BinaryOperatorExpression);
-				Assert.IsTrue((whereClause.Condition as BinaryOperatorExpression).Op == BinaryOperatorType.LessThan);
-				CheckMemberReferenceExpression((whereClause.Condition as BinaryOperatorExpression).Left, "Total", "o");
-				Assert.IsTrue((whereClause.Condition as BinaryOperatorExpression).Right is PrimitiveExpression);
-				Assert.IsTrue((double)((whereClause.Condition as BinaryOperatorExpression).Right as PrimitiveExpression).Value == 500.0);
-				
-				// Select
-				foreach (var v in selectClause.Variables) {
-					Assert.IsEmpty(v.Identifier);
-				}
-				
-				var var1 = selectClause.Variables.First();
-				var var2 = selectClause.Variables.Skip(1).First();
-				var var3 = selectClause.Variables.Skip(2).First();
-				
-				CheckMemberReferenceExpression(var1.Expression, "CustomerID", "c");
-				CheckMemberReferenceExpression(var2.Expression, "OrderID", "o");
-				CheckMemberReferenceExpression(var3.Expression, "Total", "o");
-			};
-			
-			RunTest(@"From c In customers, o In c.Orders _
-        Where o.Total < 500.0 _
-        Select c.CustomerID, o.OrderID, o.Total", 3, constraint, typeof(QueryExpressionFromClause), typeof(QueryExpressionWhereClause), typeof(QueryExpressionSelectVBClause));
-		}
-		
-		void CheckMemberReferenceExpression(Expression expr, string memberName, string targetObjectIdentifier)
-		{
-			Assert.IsTrue(expr is MemberReferenceExpression);
-			Assert.IsTrue((expr as MemberReferenceExpression).MemberName == memberName &&
-			              (expr as MemberReferenceExpression).TargetObject is IdentifierExpression &&
-			              ((expr as MemberReferenceExpression).TargetObject as IdentifierExpression).Identifier == targetObjectIdentifier);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ThisReferenceExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ThisReferenceExpressionTests.cs
deleted file mode 100644
index 4762bbeb08..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/ThisReferenceExpressionTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class ThisReferenceExpressionTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetThisReferenceExpressionTest1()
-		{
-			ThisReferenceExpression ie = ParseUtil.ParseExpression<ThisReferenceExpression>("Me");
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/TypeOfExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/TypeOfExpressionTests.cs
deleted file mode 100644
index a86a722a87..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/TypeOfExpressionTests.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class TypeOfExpressionTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBSimpleTypeOfExpressionTest()
-		{
-			TypeOfExpression toe = ParseUtil.ParseExpression<TypeOfExpression>("GetType(MyNamespace.N1.MyType)");
-			Assert.AreEqual("MyNamespace.N1.MyType", toe.TypeReference.Type);
-		}
-		
-		
-		[Test]
-		public void VBGlobalTypeOfExpressionTest()
-		{
-			TypeOfExpression toe = ParseUtil.ParseExpression<TypeOfExpression>("GetType(Global.System.Console)");
-			Assert.AreEqual("System.Console", toe.TypeReference.Type);
-		}
-		
-		[Test]
-		public void VBPrimitiveTypeOfExpressionTest()
-		{
-			TypeOfExpression toe = ParseUtil.ParseExpression<TypeOfExpression>("GetType(integer)");
-			Assert.AreEqual("System.Int32", toe.TypeReference.Type);
-		}
-		
-		[Test]
-		public void VBVoidTypeOfExpressionTest()
-		{
-			TypeOfExpression toe = ParseUtil.ParseExpression<TypeOfExpression>("GetType(void)");
-			Assert.AreEqual("void", toe.TypeReference.Type);
-		}
-		
-		[Test]
-		public void VBArrayTypeOfExpressionTest()
-		{
-			TypeOfExpression toe = ParseUtil.ParseExpression<TypeOfExpression>("GetType(MyType())");
-			Assert.AreEqual("MyType", toe.TypeReference.Type);
-			Assert.AreEqual(new int[] {0}, toe.TypeReference.RankSpecifier);
-		}
-		
-		[Test]
-		public void VBGenericTypeOfExpressionTest()
-		{
-			TypeOfExpression toe = ParseUtil.ParseExpression<TypeOfExpression>("GetType(MyNamespace.N1.MyType(Of string))");
-			Assert.AreEqual("MyNamespace.N1.MyType", toe.TypeReference.Type);
-			Assert.AreEqual("System.String", toe.TypeReference.GenericTypes[0].Type);
-		}
-		
-		[Test]
-		public void VBUnboundTypeOfExpressionTest()
-		{
-			TypeOfExpression toe = ParseUtil.ParseExpression<TypeOfExpression>("GetType(MyType(Of ,))");
-			Assert.AreEqual("MyType", toe.TypeReference.Type);
-			Assert.IsTrue(toe.TypeReference.GenericTypes[0].IsNull);
-			Assert.IsTrue(toe.TypeReference.GenericTypes[1].IsNull);
-		}
-		
-		[Test]
-		public void VBNestedGenericTypeOfExpressionTest()
-		{
-			TypeOfExpression toe = ParseUtil.ParseExpression<TypeOfExpression>("GetType(MyType(Of string).InnerClass(of integer).InnerInnerClass)");
-			InnerClassTypeReference ic = (InnerClassTypeReference)toe.TypeReference;
-			Assert.AreEqual("InnerInnerClass", ic.Type);
-			Assert.AreEqual(0, ic.GenericTypes.Count);
-			ic = (InnerClassTypeReference)ic.BaseType;
-			Assert.AreEqual("InnerClass", ic.Type);
-			Assert.AreEqual(1, ic.GenericTypes.Count);
-			Assert.AreEqual("System.Int32", ic.GenericTypes[0].Type);
-			Assert.AreEqual("MyType", ic.BaseType.Type);
-			Assert.AreEqual(1, ic.BaseType.GenericTypes.Count);
-			Assert.AreEqual("System.String", ic.BaseType.GenericTypes[0].Type);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/TypeOfIsExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/TypeOfIsExpressionTests.cs
deleted file mode 100644
index 46f7e959e9..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/TypeOfIsExpressionTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class TypeOfIsExpressionTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetSimpleTypeOfIsExpression()
-		{
-			TypeOfIsExpression ce = ParseUtil.ParseExpression<TypeOfIsExpression>("TypeOf o Is MyObject");
-			Assert.AreEqual("MyObject", ce.TypeReference.Type);
-			Assert.IsTrue(ce.Expression is SimpleNameExpression);
-		}
-		
-		[Test]
-		public void VBNetGenericTypeOfIsExpression()
-		{
-			TypeOfIsExpression ce = ParseUtil.ParseExpression<TypeOfIsExpression>("TypeOf o Is List(of T)");
-			Assert.AreEqual("List", ce.TypeReference.Type);
-			Assert.AreEqual("T", ce.TypeReference.GenericTypes[0].Type);
-			Assert.IsTrue(ce.Expression is SimpleNameExpression);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/TypeReferenceExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/TypeReferenceExpressionTests.cs
deleted file mode 100644
index c002b4b540..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/TypeReferenceExpressionTests.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class TypeReferenceExpressionTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBIntReferenceExpression()
-		{
-			MemberReferenceExpression fre = ParseUtil.ParseExpression<MemberReferenceExpression>("inTeGer.MaxValue");
-			Assert.AreEqual("MaxValue", fre.MemberName);
-			Assert.AreEqual("System.Int32", ((TypeReferenceExpression)fre.TargetObject).TypeReference.Type);
-		}
-		
-		[Test]
-		public void VBStandaloneIntReferenceExpression()
-		{
-			TypeReferenceExpression tre = ParseUtil.ParseExpression<TypeReferenceExpression>("inTeGer");
-			Assert.AreEqual("System.Int32", tre.TypeReference.Type);
-		}
-		
-		[Test]
-		public void VBObjectReferenceExpression()
-		{
-			MemberReferenceExpression fre = ParseUtil.ParseExpression<MemberReferenceExpression>("Object.ReferenceEquals");
-			Assert.AreEqual("ReferenceEquals", fre.MemberName);
-			Assert.AreEqual("System.Object", ((TypeReferenceExpression)fre.TargetObject).TypeReference.Type);
-		}
-		
-		[Test]
-		public void VBStandaloneObjectReferenceExpression()
-		{
-			TypeReferenceExpression tre = ParseUtil.ParseExpression<TypeReferenceExpression>("obJect");
-			Assert.AreEqual("System.Object", tre.TypeReference.Type);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/UnaryOperatorExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/UnaryOperatorExpressionTests.cs
deleted file mode 100644
index b5100b2cdf..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/UnaryOperatorExpressionTests.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class UnaryOperatorExpressionTests
-	{
-		#region VB.NET
-		void VBNetTestUnaryOperatorExpressionTest(string program, UnaryOperatorType op)
-		{
-			UnaryOperatorExpression uoe = ParseUtil.ParseExpression<UnaryOperatorExpression>(program);
-			Assert.AreEqual(op, uoe.Op);
-			
-			Assert.IsTrue(uoe.Expression is SimpleNameExpression);
-		}
-		
-		[Test]
-		public void VBNetNotTest()
-		{
-			VBNetTestUnaryOperatorExpressionTest("Not a", UnaryOperatorType.Not);
-		}
-		
-		[Test]
-		public void VBNetInEqualsNotTest()
-		{
-			BinaryOperatorExpression e = ParseUtil.ParseExpression<BinaryOperatorExpression>("b <> Not a");
-			Assert.AreEqual(BinaryOperatorType.InEquality, e.Op);
-			UnaryOperatorExpression ue = (UnaryOperatorExpression)e.Right;
-			Assert.AreEqual(UnaryOperatorType.Not, ue.Op);
-		}
-		
-		[Test]
-		public void VBNetNotEqualTest()
-		{
-			UnaryOperatorExpression e = ParseUtil.ParseExpression<UnaryOperatorExpression>("Not a = b");
-			Assert.AreEqual(UnaryOperatorType.Not, e.Op);
-			BinaryOperatorExpression boe = (BinaryOperatorExpression)e.Expression;
-			Assert.AreEqual(BinaryOperatorType.Equality, boe.Op);
-		}
-		
-		[Test]
-		public void VBNetPlusTest()
-		{
-			VBNetTestUnaryOperatorExpressionTest("+a", UnaryOperatorType.Plus);
-		}
-		
-		[Test]
-		public void VBNetMinusTest()
-		{
-			VBNetTestUnaryOperatorExpressionTest("-a", UnaryOperatorType.Minus);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/XmlExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/XmlExpressionTests.cs
deleted file mode 100644
index e36b43b0d7..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/XmlExpressionTests.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class XmlExpressionTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetSimpleCommentTest()
-		{
-			XmlContentExpression content = ParseUtil.ParseExpression<XmlContentExpression>("<!-- test -->");
-			Assert.AreEqual(XmlContentType.Comment, content.Type);
-			Assert.AreEqual(" test ", content.Content);
-			Assert.AreEqual(new Location(1,1), content.StartLocation);
-			Assert.AreEqual(new Location(14,1), content.EndLocation);
-		}
-		
-		[Test]
-		public void VBNetSimplePreprocessingInstructionTest()
-		{
-			XmlContentExpression content = ParseUtil.ParseExpression<XmlContentExpression>("<?xml version='1.0'?>");
-			Assert.AreEqual(XmlContentType.ProcessingInstruction, content.Type);
-			Assert.AreEqual("xml version='1.0'", content.Content);
-			Assert.AreEqual(new Location(1,1), content.StartLocation);
-			Assert.AreEqual(new Location(22,1), content.EndLocation);
-		}
-		
-		[Test]
-		public void VBNetSimpleCDataTest()
-		{
-			XmlContentExpression content = ParseUtil.ParseExpression<XmlContentExpression>("<![CDATA[<simple> <cdata>]]>");
-			Assert.AreEqual(XmlContentType.CData, content.Type);
-			Assert.AreEqual("<simple> <cdata>", content.Content);
-			Assert.AreEqual(new Location(1,1), content.StartLocation);
-			Assert.AreEqual(new Location(29,1), content.EndLocation);
-		}
-		
-		[Test]
-		public void VBNetSimpleEmptyElementTest()
-		{
-			XmlElementExpression element = ParseUtil.ParseExpression<XmlElementExpression>("<Test />");
-			Assert.IsFalse(element.NameIsExpression);
-			Assert.AreEqual("Test", element.XmlName);
-			Assert.IsEmpty(element.Attributes);
-			Assert.IsEmpty(element.Children);
-			Assert.AreEqual(new Location(1,1), element.StartLocation);
-			Assert.AreEqual(new Location(9,1), element.EndLocation);
-		}
-		
-		[Test]
-		public void VBNetSimpleEmptyElementWithAttributeTest()
-		{
-			XmlElementExpression element = ParseUtil.ParseExpression<XmlElementExpression>("<Test id='0' />");
-			Assert.IsFalse(element.NameIsExpression);
-			Assert.AreEqual("Test", element.XmlName);
-			Assert.IsNotEmpty(element.Attributes);
-			Assert.AreEqual(1, element.Attributes.Count);
-			Assert.IsTrue(element.Attributes[0] is XmlAttributeExpression);
-			XmlAttributeExpression attribute = element.Attributes[0] as XmlAttributeExpression;
-			Assert.AreEqual("id", attribute.Name);
-			Assert.IsTrue(attribute.IsLiteralValue);
-			Assert.IsTrue(attribute.ExpressionValue.IsNull);
-			Assert.AreEqual("0", attribute.LiteralValue);
-			Assert.AreEqual(new Location(7,1), attribute.StartLocation);
-			Assert.AreEqual(new Location(13,1), attribute.EndLocation);
-			Assert.IsEmpty(element.Children);
-			Assert.AreEqual(new Location(1,1), element.StartLocation);
-			Assert.AreEqual(new Location(16,1), element.EndLocation);
-		}
-		
-		[Test]
-		public void VBNetSimpleEmptyElementWithAttributesTest()
-		{
-			XmlElementExpression element = ParseUtil.ParseExpression<XmlElementExpression>("<Test id='0' name=<%= name %> <%= contentData %> />");			Assert.IsFalse(element.NameIsExpression);
-			Assert.AreEqual("Test", element.XmlName);
-			Assert.IsNotEmpty(element.Attributes);
-			Assert.AreEqual(3, element.Attributes.Count);
-			
-			Assert.IsTrue(element.Attributes[0] is XmlAttributeExpression);
-			XmlAttributeExpression attribute = element.Attributes[0] as XmlAttributeExpression;
-			Assert.AreEqual("id", attribute.Name);
-			Assert.IsTrue(attribute.IsLiteralValue);
-			Assert.IsTrue(attribute.ExpressionValue.IsNull);
-			Assert.AreEqual("0", attribute.LiteralValue);
-			Assert.AreEqual(new Location(7,1), attribute.StartLocation);
-			Assert.AreEqual(new Location(13,1), attribute.EndLocation);
-			
-			Assert.IsTrue(element.Attributes[1] is XmlAttributeExpression);
-			XmlAttributeExpression attribute2 = element.Attributes[1] as XmlAttributeExpression;
-			Assert.AreEqual("name", attribute2.Name);
-			Assert.IsFalse(attribute2.IsLiteralValue);
-			Assert.IsFalse(attribute2.ExpressionValue.IsNull);
-			
-			Assert.IsTrue(attribute2.ExpressionValue is IdentifierExpression);
-			IdentifierExpression identifier = attribute2.ExpressionValue as IdentifierExpression;
-			Assert.AreEqual("name", identifier.Identifier);
-			Assert.AreEqual(new Location(23,1), identifier.StartLocation);
-			Assert.AreEqual(new Location(27,1), identifier.EndLocation);
-			
-			Assert.AreEqual(new Location(14,1), attribute2.StartLocation);
-			Assert.AreEqual(new Location(30,1), attribute2.EndLocation);
-			
-			Assert.IsTrue(element.Attributes[2] is XmlEmbeddedExpression);
-			XmlEmbeddedExpression attribute3 = element.Attributes[2] as XmlEmbeddedExpression;
-			
-			Assert.IsTrue(attribute3.InlineVBExpression is IdentifierExpression);
-			IdentifierExpression identifier2 = attribute3.InlineVBExpression as IdentifierExpression;
-			
-			Assert.AreEqual("contentData", identifier2.Identifier);
-			Assert.AreEqual(new Location(35,1), identifier2.StartLocation);
-			Assert.AreEqual(new Location(46,1), identifier2.EndLocation);
-			
-			Assert.AreEqual(new Location(31,1), attribute3.StartLocation);
-			Assert.AreEqual(new Location(49,1), attribute3.EndLocation);
-			
-			Assert.IsEmpty(element.Children);
-			Assert.AreEqual(new Location(1,1), element.StartLocation);
-			Assert.AreEqual(new Location(52,1), element.EndLocation);
-		}
-		
-		[Test]
-		public void VBNetElementWithAttributeTest()
-		{
-			XmlElementExpression element = ParseUtil.ParseExpression<XmlElementExpression>("<Test id='0'>\n" +
-			                                                                                    "	<Item />\n" +
-			                                                                                    "	<Item />\n" +
-			                                                                                    "</Test>");
-			Assert.IsFalse(element.NameIsExpression);
-			Assert.AreEqual("Test", element.XmlName);
-			
-			Assert.IsNotEmpty(element.Attributes);
-			Assert.AreEqual(1, element.Attributes.Count);
-			Assert.IsTrue(element.Attributes[0] is XmlAttributeExpression);
-			XmlAttributeExpression attribute = element.Attributes[0] as XmlAttributeExpression;
-			Assert.AreEqual("id", attribute.Name);
-			Assert.IsTrue(attribute.IsLiteralValue);
-			Assert.IsTrue(attribute.ExpressionValue.IsNull);
-			Assert.AreEqual("0", attribute.LiteralValue);
-			Assert.AreEqual(new Location(7,1), attribute.StartLocation);
-			Assert.AreEqual(new Location(13,1), attribute.EndLocation);
-			
-			Assert.IsNotEmpty(element.Children);
-			Assert.AreEqual(5, element.Children.Count);
-			
-			CheckContent(element.Children[0], "\n\t", XmlContentType.Text, new Location(14,1), new Location(2,2));
-			CheckContent(element.Children[2], "\n\t", XmlContentType.Text, new Location(10,2), new Location(2,3));
-			CheckContent(element.Children[4], "\n", XmlContentType.Text, new Location(10,3), new Location(1,4));
-			
-			CheckElement(element.Children[1], "Item", new Location(2,2), new Location(10,2));
-			CheckElement(element.Children[3], "Item", new Location(2,3), new Location(10,3));
-			
-			Assert.AreEqual(new Location(1,1), element.StartLocation);
-			Assert.AreEqual(new Location(8,4), element.EndLocation);
-		}
-		
-		[Test]
-		public void VBNetElementWithMixedContentTest()
-		{
-			XmlElementExpression element = ParseUtil.ParseExpression<XmlElementExpression>("<Test id='0'>\n" +
-			                                                                                    "	<!-- test -->\n" +
-			                                                                                    "	<Item />\n" +
-			                                                                                    "	<Item />\n" +
-			                                                                                    "	<![CDATA[<cdata> section]]>\n" +
-			                                                                                    "</Test>");
-			Assert.IsFalse(element.NameIsExpression);
-			Assert.AreEqual("Test", element.XmlName);
-			
-			Assert.IsNotEmpty(element.Attributes);
-			Assert.AreEqual(1, element.Attributes.Count);
-			Assert.IsTrue(element.Attributes[0] is XmlAttributeExpression);
-			XmlAttributeExpression attribute = element.Attributes[0] as XmlAttributeExpression;
-			Assert.AreEqual("id", attribute.Name);
-			Assert.IsTrue(attribute.IsLiteralValue);
-			Assert.IsTrue(attribute.ExpressionValue.IsNull);
-			Assert.AreEqual("0", attribute.LiteralValue);
-			Assert.AreEqual(new Location(7,1), attribute.StartLocation);
-			Assert.AreEqual(new Location(13,1), attribute.EndLocation);
-			
-			Assert.IsNotEmpty(element.Children);
-			Assert.AreEqual(9, element.Children.Count);
-			
-			CheckContent(element.Children[0], "\n\t", XmlContentType.Text, new Location(14,1), new Location(2,2));
-			CheckContent(element.Children[2], "\n\t", XmlContentType.Text, new Location(15,2), new Location(2,3));
-			CheckContent(element.Children[4], "\n\t", XmlContentType.Text, new Location(10,3), new Location(2,4));
-			CheckContent(element.Children[6], "\n\t", XmlContentType.Text, new Location(10,4), new Location(2,5));
-			CheckContent(element.Children[7], "<cdata> section", XmlContentType.CData, new Location(2,5), new Location(29,5));
-			CheckContent(element.Children[8], "\n", XmlContentType.Text, new Location(29,5), new Location(1,6));
-			
-			CheckContent(element.Children[1], " test ", XmlContentType.Comment, new Location(2,2), new Location(15,2));
-			CheckElement(element.Children[3], "Item", new Location(2,3), new Location(10,3));
-			CheckElement(element.Children[5], "Item", new Location(2,4), new Location(10,4));
-			
-			Assert.AreEqual(new Location(1,1), element.StartLocation);
-			Assert.AreEqual(new Location(8,6), element.EndLocation);
-		}
-		
-		[Test]
-		public void VBNetElementWithMixedContentTest2()
-		{
-			XmlElementExpression element = ParseUtil.ParseExpression<XmlElementExpression>("<Test>  aaaa	</Test>");
-			Assert.IsFalse(element.NameIsExpression);
-			Assert.AreEqual("Test", element.XmlName);
-			
-			Assert.IsNotEmpty(element.Children);
-			Assert.AreEqual(1, element.Children.Count);
-			
-			CheckContent(element.Children[0], "  aaaa	", XmlContentType.Text, new Location(7,1), new Location(14,1));
-		}
-		
-		[Test]
-		public void VBNetProcessingInstructionAndCommentAtEndTest()
-		{
-			XmlDocumentExpression document = ParseUtil.ParseExpression<XmlDocumentExpression>("<Test />\n" +
-			                                                                                       "<!-- test -->\n" +
-			                                                                                       "<?target some text?>");
-			Assert.IsNotEmpty(document.Expressions);
-			Assert.AreEqual(3, document.Expressions.Count);
-			
-			CheckElement(document.Expressions[0], "Test", new Location(1,1), new Location(9,1));
-			CheckContent(document.Expressions[1], " test ", XmlContentType.Comment, new Location(1,2), new Location(14,2));
-			CheckContent(document.Expressions[2], "target some text", XmlContentType.ProcessingInstruction, new Location(1,3), new Location(21,3));
-		}
-		#endregion
-		
-		void CheckElement(AstNode node, string name, AstLocation start, AstLocation end)
-		{
-			Assert.IsTrue(node is XmlElementExpression);
-			XmlElementExpression expr = node as XmlElementExpression;
-			Assert.IsEmpty(expr.Attributes);
-			Assert.IsEmpty(expr.Children);
-			Assert.IsFalse(expr.NameIsExpression);
-			Assert.AreEqual(name, expr.XmlName);
-			Assert.AreEqual(start, expr.StartLocation);
-			Assert.AreEqual(end, expr.EndLocation);
-		}
-		
-		void CheckContent(AstNode node, string content, XmlContentType type, AstLocation start, AstLocation end)
-		{
-			Assert.IsTrue(node is XmlContentExpression);
-			XmlContentExpression expr = node as XmlContentExpression;
-			Assert.AreEqual(type, expr.Type);
-			Assert.AreEqual(content, expr.Content);
-			Assert.AreEqual(start, expr.StartLocation);
-			Assert.AreEqual(end, expr.EndLocation);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/XmlMemberAccessExpressionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/XmlMemberAccessExpressionTests.cs
deleted file mode 100644
index 23f39194b3..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Expressions/XmlMemberAccessExpressionTests.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class XmlMemberAccessExpressionTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetSimpleElementReferenceTest()
-		{
-			XmlMemberAccessExpression xmae = ParseUtil.ParseExpression<XmlMemberAccessExpression>("xml.<ns:MyElement>");
-			Assert.AreEqual("ns:MyElement", xmae.Identifier);
-			Assert.IsTrue(xmae.IsXmlIdentifier);
-			Assert.AreEqual(XmlAxisType.Element, xmae.AxisType);
-			Assert.IsTrue(xmae.TargetObject is IdentifierExpression);
-			Assert.AreEqual("xml", ((IdentifierExpression)xmae.TargetObject).Identifier);
-		}
-		
-		[Test]
-		public void VBNetSimpleAttributeReferenceTest()
-		{
-			XmlMemberAccessExpression xmae = ParseUtil.ParseExpression<XmlMemberAccessExpression>("xml.@attribute");
-			Assert.AreEqual("attribute", xmae.Identifier);
-			Assert.IsFalse(xmae.IsXmlIdentifier);
-			Assert.AreEqual(XmlAxisType.Attribute, xmae.AxisType);
-			Assert.IsTrue(xmae.TargetObject is IdentifierExpression);
-			Assert.AreEqual("xml", ((IdentifierExpression)xmae.TargetObject).Identifier);
-		}
-		
-		[Test]
-		public void VBNetXmlNameAttributeReferenceTest()
-		{
-			XmlMemberAccessExpression xmae = ParseUtil.ParseExpression<XmlMemberAccessExpression>("xml.@<ns:attribute>");
-			Assert.AreEqual("ns:attribute", xmae.Identifier);
-			Assert.IsTrue(xmae.IsXmlIdentifier);
-			Assert.AreEqual(XmlAxisType.Attribute, xmae.AxisType);
-			Assert.IsTrue(xmae.TargetObject is IdentifierExpression);
-			Assert.AreEqual("xml", ((IdentifierExpression)xmae.TargetObject).Identifier);
-		}
-		
-		[Test]
-		public void VBNetSimpleDescendentsReferenceTest()
-		{
-			XmlMemberAccessExpression xmae = ParseUtil.ParseExpression<XmlMemberAccessExpression>("xml...<ns:Element>");
-			Assert.AreEqual("ns:Element", xmae.Identifier);
-			Assert.IsTrue(xmae.IsXmlIdentifier);
-			Assert.AreEqual(XmlAxisType.Descendents, xmae.AxisType);
-			Assert.IsTrue(xmae.TargetObject is IdentifierExpression);
-			Assert.AreEqual("xml", ((IdentifierExpression)xmae.TargetObject).Identifier);
-		}
-		
-		[Test]
-		public void VBNetSimpleElementReferenceWithDotTest()
-		{
-			XmlMemberAccessExpression xmae = ParseUtil.ParseExpression<XmlMemberAccessExpression>(".<ns:MyElement>");
-			Assert.AreEqual("ns:MyElement", xmae.Identifier);
-			Assert.IsTrue(xmae.IsXmlIdentifier);
-			Assert.AreEqual(XmlAxisType.Element, xmae.AxisType);
-			Assert.IsTrue(xmae.TargetObject.IsNull);
-		}
-		
-		[Test]
-		public void VBNetSimpleAttributeReferenceWithDotTest()
-		{
-			XmlMemberAccessExpression xmae = ParseUtil.ParseExpression<XmlMemberAccessExpression>(".@attribute");
-			Assert.AreEqual("attribute", xmae.Identifier);
-			Assert.IsFalse(xmae.IsXmlIdentifier);
-			Assert.AreEqual(XmlAxisType.Attribute, xmae.AxisType);
-			Assert.IsTrue(xmae.TargetObject.IsNull);
-		}
-		
-		[Test]
-		public void VBNetXmlNameAttributeReferenceWithDotTest()
-		{
-			XmlMemberAccessExpression xmae = ParseUtil.ParseExpression<XmlMemberAccessExpression>(".@<ns:attribute>");
-			Assert.AreEqual("ns:attribute", xmae.Identifier);
-			Assert.IsTrue(xmae.IsXmlIdentifier);
-			Assert.AreEqual(XmlAxisType.Attribute, xmae.AxisType);
-			Assert.IsTrue(xmae.TargetObject.IsNull);
-		}
-		
-		[Test]
-		public void VBNetSimpleDescendentsReferenceWithDotTest()
-		{
-			XmlMemberAccessExpression xmae = ParseUtil.ParseExpression<XmlMemberAccessExpression>("...<ns:Element>");
-			Assert.AreEqual("ns:Element", xmae.Identifier);
-			Assert.IsTrue(xmae.IsXmlIdentifier);
-			Assert.AreEqual(XmlAxisType.Descendents, xmae.AxisType);
-			Assert.IsTrue(xmae.TargetObject.IsNull);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/AttributeSectionTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/AttributeSectionTests.cs
deleted file mode 100644
index 997e2dc111..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/AttributeSectionTests.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class AttributeSectionTests
-	{
-//		[Test]
-//		public void AttributeOnStructure()
-//		{
-//			string program = @"
-//<StructLayout( LayoutKind.Explicit )> _
-//Public Structure MyUnion
-//
-//	<FieldOffset( 0 )> Public i As Integer
-//	< FieldOffset( 0 )> Public d As Double
-//	
-//End Structure 'MyUnion
-//";
-//			TypeDeclaration decl = ParseUtil.ParseGlobal<TypeDeclaration>(program);
-//			Assert.AreEqual("StructLayout", decl.Attributes[0].Attributes[0].Type);
-//		}
-//		
-//		[Test]
-//		public void AttributeOnModule()
-//		{
-//			string program = @"
-//<HideModule> _
-//Public Module MyExtra
-//
-//	Public i As Integer
-//	Public d As Double
-//	
-//End Module
-//";
-//			TypeDeclaration decl = ParseUtil.ParseGlobal<TypeDeclaration>(program);
-//			Assert.AreEqual("HideModule", decl.Attributes[0].Attributes[0].Type);
-//		}
-//		
-//		[Test]
-//		public void GlobalAttribute()
-//		{
-//			string program = @"<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-//Public Class Form1
-//	
-//End Class";
-//			TypeDeclaration decl = ParseUtil.ParseGlobal<TypeDeclaration>(program);
-//			Assert.AreEqual("Microsoft.VisualBasic.CompilerServices.DesignerGenerated", decl.Attributes[0].Attributes[0].Type);
-//		}
-//		
-//		[Test]
-//		public void AssemblyAttribute()
-//		{
-//			string program = @"<assembly: System.Attribute()>";
-//			AttributeSection decl = ParseUtil.ParseGlobal<AttributeSection>(program);
-//			Assert.AreEqual(new Location(1, 1), decl.StartLocation);
-//			Assert.AreEqual("assembly", decl.AttributeTarget);
-//		}
-//		
-//		[Test]
-//		public void ModuleAttributeTargetEscaped()
-//		{
-//			// check that this doesn't crash the parser:
-//			ParseUtil.ParseGlobal<AttributeSection>("<[Module]: SuppressMessageAttribute>", true);
-//		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/ImportsStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/ImportsStatementTests.cs
deleted file mode 100644
index 56c7d8ee9f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/ImportsStatementTests.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class ImportsStatementTests
-	{
-		[Test]
-		public void InvalidImportsStatement()
-		{
-			string program = "Imports\n";
-			ParseUtil.ParseGlobal<ImportsStatement>(program, true);
-		}
-		
-		[Test]
-		public void InvalidImportsStatement2()
-		{
-			string program = "Imports ,\n";
-			ParseUtil.ParseGlobal<ImportsStatement>(program, true);
-		}
-		
-		[Test]
-		public void SimpleImportsStatement()
-		{
-			string program = "Imports System\n";
-			
-			var clause1 = new MemberImportsClause {
-				Member = new SimpleType("System")
-			};
-			
-			var node = new ImportsStatement();
-			node.AddChild(clause1, ImportsStatement.ImportsClauseRole);
-			
-			ParseUtil.AssertGlobal(program, node);
-		}
-		
-		[Test]
-		public void QualifiedTypeImportsStatement()
-		{
-			string program = "Imports My.Name.Space\n";
-			
-			var clause2 = new MemberImportsClause {
-				Member = new QualifiedType(new QualifiedType(new SimpleType("My"), new Identifier ("Name", AstLocation.Empty)), new Identifier ("Space", AstLocation.Empty))
-			};
-			
-			var node = new ImportsStatement();
-			node.AddChild(clause2, ImportsStatement.ImportsClauseRole);
-			
-			ParseUtil.AssertGlobal(program, node);
-		}
-//
-//		[Test]
-//		public void VBNetUsingAliasDeclarationTest()
-//		{
-//			string program = "Imports TESTME=System\n" +
-//				"Imports myAlias=My.Name.Space\n" +
-//				"Imports StringCollection = System.Collections.Generic.List(Of string)\n";
-//			VBParser parser = ParserFactory.CreateParser(new StringReader(program));
-//			parser.Parse();
-//
-//			Assert.AreEqual("", parser.Errors.ErrorOutput);
-//			CheckAliases(parser.CompilationUnit);
-//		}
-//
-//		[Test]
-//		public void VBNetComplexUsingAliasDeclarationTest()
-//		{
-//			string program = "Imports NS1, AL=NS2, NS3, AL2=NS4, NS5\n";
-//			VBParser parser = ParserFactory.CreateParser(new StringReader(program));
-//			parser.Parse();
-//
-//			Assert.AreEqual("", parser.Errors.ErrorOutput);
-//			// TODO : Extend test ...
-//		}
-//
-//		[Test]
-//		public void VBNetXmlNamespaceUsingTest()
-//		{
-//			string program = "Imports <xmlns=\"http://icsharpcode.net/sharpdevelop/avalonedit\">";
-//			VBParser parser = ParserFactory.CreateParser(new StringReader(program));
-//			parser.Parse();
-//
-//			Assert.AreEqual("", parser.Errors.ErrorOutput);
-//			CompilationUnit unit = parser.CompilationUnit;
-//
-//			Assert.AreEqual(1, unit.Children.Count);
-//			Assert.IsTrue(unit.Children[0] is ImportsStatement);
-//			ImportsStatement ud = (ImportsStatement)unit.Children[0];
-//			Assert.AreEqual(1, ud.ImportsClauses.Count);
-//			Assert.IsFalse(ud.ImportsClauses[0].IsAlias);
-//			Assert.IsTrue(ud.ImportsClauses[0].IsXml);
-//
-//			Assert.AreEqual("xmlns", ud.ImportsClauses[0].XmlPrefix);
-//			Assert.AreEqual("http://icsharpcode.net/sharpdevelop/avalonedit", ud.ImportsClauses[0].Name);
-//		}
-//
-//		[Test]
-//		public void VBNetXmlNamespaceWithPrefixUsingTest()
-//		{
-//			string program = "Imports <xmlns:avalonedit=\"http://icsharpcode.net/sharpdevelop/avalonedit\">";
-//			VBParser parser = ParserFactory.CreateParser(new StringReader(program));
-//			parser.Parse();
-//
-//			Assert.AreEqual("", parser.Errors.ErrorOutput);
-//			CompilationUnit unit = parser.CompilationUnit;
-//
-//			Assert.AreEqual(1, unit.Children.Count);
-//			Assert.IsTrue(unit.Children[0] is ImportsStatement);
-//			ImportsStatement ud = (ImportsStatement)unit.Children[0];
-//			Assert.AreEqual(1, ud.ImportsClauses.Count);
-//			Assert.IsFalse(ud.ImportsClauses[0].IsAlias);
-//			Assert.IsTrue(ud.ImportsClauses[0].IsXml);
-//
-//			Assert.AreEqual("xmlns:avalonedit", ud.ImportsClauses[0].XmlPrefix);
-//			Assert.AreEqual("http://icsharpcode.net/sharpdevelop/avalonedit", ud.ImportsClauses[0].Name);
-//		}
-//
-//		[Test]
-//		public void VBNetXmlNamespaceSingleQuotedUsingTest()
-//		{
-//			string program = "Imports <xmlns='http://icsharpcode.net/sharpdevelop/avalonedit'>";
-//			VBParser parser = ParserFactory.CreateParser(new StringReader(program));
-//			parser.Parse();
-//
-//			Assert.AreEqual("", parser.Errors.ErrorOutput);
-//			CompilationUnit unit = parser.CompilationUnit;
-//
-//			Assert.AreEqual(1, unit.Children.Count);
-//			Assert.IsTrue(unit.Children[0] is ImportsStatement);
-//			ImportsStatement ud = (ImportsStatement)unit.Children[0];
-//			Assert.AreEqual(1, ud.ImportsClauses.Count);
-//			Assert.IsFalse(ud.ImportsClauses[0].IsAlias);
-//			Assert.IsTrue(ud.ImportsClauses[0].IsXml);
-//
-//			Assert.AreEqual("xmlns", ud.ImportsClauses[0].XmlPrefix);
-//			Assert.AreEqual("http://icsharpcode.net/sharpdevelop/avalonedit", ud.ImportsClauses[0].Name);
-//		}
-//
-//		[Test]
-//		public void VBNetXmlNamespaceSingleQuotedWithPrefixUsingTest()
-//		{
-//			string program = "Imports <xmlns:avalonedit='http://icsharpcode.net/sharpdevelop/avalonedit'>";
-//			VBParser parser = ParserFactory.CreateParser(new StringReader(program));
-//			parser.Parse();
-//
-//			Assert.AreEqual("", parser.Errors.ErrorOutput);
-//			CompilationUnit unit = parser.CompilationUnit;
-//
-//			Assert.AreEqual(1, unit.Children.Count);
-//			Assert.IsTrue(unit.Children[0] is ImportsStatement);
-//			ImportsStatement ud = (ImportsStatement)unit.Children[0];
-//			Assert.AreEqual(1, ud.ImportsClauses.Count);
-//			Assert.IsFalse(ud.ImportsClauses[0].IsAlias);
-//			Assert.IsTrue(ud.ImportsClauses[0].IsXml);
-//
-//			Assert.AreEqual("xmlns:avalonedit", ud.ImportsClauses[0].XmlPrefix);
-//			Assert.AreEqual("http://icsharpcode.net/sharpdevelop/avalonedit", ud.ImportsClauses[0].Name);
-//		}
-//		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/NamespaceDeclarationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/NamespaceDeclarationTests.cs
deleted file mode 100644
index 33f994443d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/NamespaceDeclarationTests.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using ICSharpCode.NRefactory.VB.Ast;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class NamespaceDeclarationTests
-	{
-//		#region VB.NET
-//		[Test]
-//		public void VBNetSimpleNamespaceTest()
-//		{
-//			string program = "Namespace TestNamespace" + Environment.NewLine +
-//			                 "End Namespace" +Environment.NewLine;
-//			NamespaceDeclaration ns = ParseUtil.ParseGlobal<NamespaceDeclaration>(program);
-//			Assert.AreEqual("TestNamespace", ns.Name);
-//		}
-//		
-//		[Test]
-//		public void VBNetJuggedNamespaceTest()
-//		{
-//			string program = "Namespace N1 'TestNamespace\n" +
-//			                 "    Namespace N2   ' Declares a namespace named N2 within N1.\n" +
-//			                 "    End Namespace\n" +
-//			                 "End Namespace\n";
-//			
-//			NamespaceDeclaration ns = ParseUtil.ParseGlobal<NamespaceDeclaration>(program);
-//			
-//			Assert.AreEqual("N1", ns.Name);
-//			
-//			Assert.IsTrue(ns.Children[0] is NamespaceDeclaration);
-//			
-//			ns = (NamespaceDeclaration)ns.Children[0];
-//			
-//			Assert.AreEqual("N2", ns.Name);
-//		}
-//		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/OptionStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/OptionStatementTests.cs
deleted file mode 100644
index a3b28897a6..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/OptionStatementTests.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class OptionStatementTests
-	{
-		[Test]
-		public void InvalidOptionSyntax()
-		{
-			string program = "Option\n";
-			ParseUtil.ParseGlobal<OptionStatement>(program, true);
-		}
-		
-		[Test]
-		public void StrictOption()
-		{
-			string program = "Option Strict On\n";
-			
-			var node = new OptionStatement {
-				OptionType = OptionType.Strict,
-				OptionValue = OptionValue.On
-			};
-			
-			ParseUtil.AssertGlobal(program, node);
-		}
-		
-		[Test]
-		public void ExplicitOption()
-		{
-			string program = "Option Explicit Off\n";
-			
-			var node = new OptionStatement {
-				OptionType = OptionType.Explicit,
-				OptionValue = OptionValue.Off
-			};
-			
-			ParseUtil.AssertGlobal(program, node);
-		}
-		
-		[Test]
-		public void CompareBinaryOption()
-		{
-			string program = "Option Compare Binary\n";
-			
-			var node = new OptionStatement {
-				OptionType = OptionType.Compare,
-				OptionValue = OptionValue.Binary
-			};
-			
-			ParseUtil.AssertGlobal(program, node);
-		}
-
-		[Test]
-		public void CompareTextOption()
-		{
-			string program = "Option Compare Text\n";
-			
-			var node = new OptionStatement {
-				OptionType = OptionType.Compare,
-				OptionValue = OptionValue.Text
-			};
-			
-			ParseUtil.AssertGlobal(program, node);
-		}
-
-		[Test]
-		public void InferOnOption()
-		{
-			string program = "Option Infer On\n";
-			
-			var node = new OptionStatement {
-				OptionType = OptionType.Infer,
-				OptionValue = OptionValue.On
-			};
-			
-			ParseUtil.AssertGlobal(program, node);
-		}
-
-		[Test]
-		public void InferOffOption()
-		{
-			string program = "Option Infer Off\n";
-			
-			var node = new OptionStatement {
-				OptionType = OptionType.Infer,
-				OptionValue = OptionValue.Off
-			};
-			
-			ParseUtil.AssertGlobal(program, node);
-		}
-
-		[Test]
-		public void InferOption()
-		{
-			string program = "Option Infer\n";
-			
-			var node = new OptionStatement {
-				OptionType = OptionType.Infer,
-				OptionValue = OptionValue.On
-			};
-			
-			ParseUtil.AssertGlobal(program, node);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/TypeDeclarationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/TypeDeclarationTests.cs
deleted file mode 100644
index cc71f4c093..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/GlobalScope/TypeDeclarationTests.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using ICSharpCode.NRefactory.VB.Ast;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class TypeDeclarationTests
-	{
-//		#region VB.NET
-//		[Test]
-//		public void VBNetSimpleClassTypeDeclarationTest()
-//		{
-//			string program = "Class TestClass\n" +
-//				"End Class\n";
-//			TypeDeclaration td = ParseUtil.ParseGlobal<TypeDeclaration>(program);
-//			
-//			Assert.AreEqual("TestClass", td.Name);
-//			Assert.AreEqual(ClassType.Class, td.Type);
-//			Assert.AreEqual(1, td.StartLocation.Line, "start line");
-//			Assert.AreEqual(1, td.BodyStartLocation.Line, "bodystart line");
-//			Assert.AreEqual(16, td.BodyStartLocation.Column, "bodystart col");
-//			Assert.AreEqual(2, td.EndLocation.Line, "end line");
-//			Assert.AreEqual(10, td.EndLocation.Column, "end col");
-//		}
-//		
-//		[Test]
-//		public void VBNetMissingBaseClassTest()
-//		{
-//			// SD2-1499: test that this invalid code doesn't crash
-//			TypeDeclaration td = ParseUtil.ParseGlobal<TypeDeclaration>("public class test inherits", true);
-//			Assert.AreEqual(0, td.BaseTypes.Count);
-//		}
-//		
-//		[Test]
-//		public void VBNetEnumWithBaseClassDeclarationTest()
-//		{
-//			string program = "Enum TestEnum As Byte\n" +
-//				"End Enum\n";
-//			TypeDeclaration td = ParseUtil.ParseGlobal<TypeDeclaration>(program);
-//			
-//			Assert.AreEqual("TestEnum", td.Name);
-//			Assert.AreEqual(ClassType.Enum, td.Type);
-//			Assert.AreEqual("System.Byte", td.BaseTypes[0].Type);
-//			Assert.AreEqual(0, td.Children.Count);
-//		}
-//		
-//		[Test]
-//		public void VBNetEnumOnSingleLine()
-//		{
-//			string program = "Enum TestEnum : A : B = 1 : C : End Enum";
-//			TypeDeclaration td = ParseUtil.ParseGlobal<TypeDeclaration>(program);
-//			
-//			Assert.AreEqual("TestEnum", td.Name);
-//			Assert.AreEqual(ClassType.Enum, td.Type);
-//			Assert.AreEqual(3, td.Children.Count);
-//		}
-//		
-//		[Test]
-//		public void VBNetEnumOnSingleLine2()
-//		{
-//			string program = "Enum TestEnum : A : : B = 1 :: C : End Enum";
-//			TypeDeclaration td = ParseUtil.ParseGlobal<TypeDeclaration>(program);
-//			
-//			Assert.AreEqual("TestEnum", td.Name);
-//			Assert.AreEqual(ClassType.Enum, td.Type);
-//			Assert.AreEqual(3, td.Children.Count);
-//		}
-//		
-//		
-//		[Test]
-//		public void VBNetEnumWithSystemBaseClassDeclarationTest()
-//		{
-//			string program = "Enum TestEnum As System.UInt16\n" +
-//				"End Enum\n";
-//			TypeDeclaration td = ParseUtil.ParseGlobal<TypeDeclaration>(program);
-//			
-//			Assert.AreEqual("TestEnum", td.Name);
-//			Assert.AreEqual(ClassType.Enum, td.Type);
-//			Assert.AreEqual("System.UInt16", td.BaseTypes[0].Type);
-//			Assert.AreEqual(0, td.Children.Count);
-//		}
-//		
-//		[Test]
-//		public void VBNetSimpleClassTypeDeclarationWithoutLastNewLineTest()
-//		{
-//			string program = "Class TestClass\n" +
-//				"End Class";
-//			TypeDeclaration td = ParseUtil.ParseGlobal<TypeDeclaration>(program);
-//			
-//			Assert.AreEqual("TestClass", td.Name);
-//			Assert.AreEqual(ClassType.Class, td.Type);
-//			Assert.AreEqual(1, td.StartLocation.Line, "start line");
-//			Assert.AreEqual(2, td.EndLocation.Line, "end line");
-//		}
-//		
-//		[Test]
-//		public void VBNetSimpleClassTypeDeclarationWithColon()
-//		{
-//			string program = "Class TestClass\n" +
-//				" : \n" +
-//				"End Class";
-//			TypeDeclaration td = ParseUtil.ParseGlobal<TypeDeclaration>(program);
-//			
-//			Assert.AreEqual("TestClass", td.Name);
-//			Assert.AreEqual(ClassType.Class, td.Type);
-//		}
-//		
-//		[Test]
-//		public void VBNetSimplePartialClassTypeDeclarationTest()
-//		{
-//			string program = "Partial Class TestClass\n" +
-//				"End Class\n";
-//			TypeDeclaration td = ParseUtil.ParseGlobal<TypeDeclaration>(program);
-//			
-//			Assert.AreEqual("TestClass", td.Name);
-//			Assert.AreEqual(ClassType.Class, td.Type);
-//			Assert.AreEqual(Modifiers.Partial, td.Modifier);
-//		}
-//		
-//		[Test]
-//		public void VBNetPartialPublicClass()
-//		{
-//			string program = "Partial Public Class TestClass\nEnd Class\n";
-//			TypeDeclaration td = ParseUtil.ParseGlobal<TypeDeclaration>(program);
-//			
-//			Assert.AreEqual("TestClass", td.Name);
-//			Assert.AreEqual(ClassType.Class, td.Type);
-//			Assert.AreEqual(Modifiers.Partial | Modifiers.Public, td.Modifier);
-//		}
-//		
-//		[Test]
-//		public void VBNetGenericClassTypeDeclarationTest()
-//		{
-//			string declr = @"
-//Public Class Test(Of T)
-//
-//End Class
-//";
-//			TypeDeclaration td = ParseUtil.ParseGlobal<TypeDeclaration>(declr);
-//			
-//			Assert.AreEqual(ClassType.Class, td.Type);
-//			Assert.AreEqual("Test", td.Name);
-//			Assert.AreEqual(Modifiers.Public, td.Modifier);
-//			Assert.AreEqual(0, td.BaseTypes.Count);
-//			Assert.AreEqual(1, td.Templates.Count);
-//			Assert.AreEqual("T", td.Templates[0].Name);
-//		}
-//		
-//		[Test]
-//		public void VBNetGenericClassWithConstraint()
-//		{
-//			string declr = @"
-//Public Class Test(Of T As IMyInterface)
-//
-//End Class
-//";
-//			TypeDeclaration td = ParseUtil.ParseGlobal<TypeDeclaration>(declr);
-//			
-//			Assert.AreEqual(ClassType.Class, td.Type);
-//			Assert.AreEqual("Test", td.Name);
-//			
-//			Assert.AreEqual(1, td.Templates.Count);
-//			Assert.AreEqual("T", td.Templates[0].Name);
-//			Assert.AreEqual("IMyInterface", td.Templates[0].Bases[0].Type);
-//		}
-//		
-//		[Test]
-//		public void VBNetComplexGenericClassTypeDeclarationTest()
-//		{
-//			string declr = @"
-//Public Class Generic(Of T As MyNamespace.IMyInterface, S As {G(Of T()), IAnotherInterface})
-//	Implements System.IComparable
-//
-//End Class
-//";
-//			TypeDeclaration td = ParseUtil.ParseGlobal<TypeDeclaration>(declr);
-//			
-//			Assert.AreEqual(ClassType.Class, td.Type);
-//			Assert.AreEqual("Generic", td.Name);
-//			Assert.AreEqual(Modifiers.Public, td.Modifier);
-//			Assert.AreEqual(1, td.BaseTypes.Count);
-//			Assert.AreEqual("System.IComparable", td.BaseTypes[0].Type);
-//			
-//			Assert.AreEqual(2, td.Templates.Count);
-//			Assert.AreEqual("T", td.Templates[0].Name);
-//			Assert.AreEqual("MyNamespace.IMyInterface", td.Templates[0].Bases[0].Type);
-//			
-//			Assert.AreEqual("S", td.Templates[1].Name);
-//			Assert.AreEqual(2, td.Templates[1].Bases.Count);
-//			Assert.AreEqual("G", td.Templates[1].Bases[0].Type);
-//			Assert.AreEqual(1, td.Templates[1].Bases[0].GenericTypes.Count);
-//			Assert.IsTrue(td.Templates[1].Bases[0].GenericTypes[0].IsArrayType);
-//			Assert.AreEqual("T", td.Templates[1].Bases[0].GenericTypes[0].Type);
-//			Assert.AreEqual(new int[] {0}, td.Templates[1].Bases[0].GenericTypes[0].RankSpecifier);
-//			Assert.AreEqual("IAnotherInterface", td.Templates[1].Bases[1].Type);
-//		}
-//		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/ParseUtil.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/ParseUtil.cs
deleted file mode 100644
index 5704c031e9..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/ParseUtil.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using System.Linq;
-
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.VB.Ast;
-using ICSharpCode.NRefactory.VB.Parser;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	public class ParseUtil
-	{
-		public static T ParseGlobal<T>(string code, bool expectErrors = false) where T : AstNode
-		{
-			VBParser parser = new VBParser();
-			CompilationUnit cu = parser.Parse(new StringReader(code));
-			
-			Assert.AreEqual(expectErrors, parser.HasErrors, "HasErrors");
-			
-			AstNode node = cu.Children.Single();
-			Type type = typeof(T);
-			Assert.IsTrue(type.IsAssignableFrom(node.GetType()), String.Format("Parsed node was {0} instead of {1} ({2})", node.GetType(), type, node));
-			return (T)node;
-		}
-		
-		public static void AssertGlobal(string code, AstNode expectedNode)
-		{
-			var node = ParseGlobal<AstNode>(code);
-			if (!expectedNode.IsMatch(node)) {
-				Assert.Fail("Expected '{0}' but was '{1}'", ToVB(expectedNode), ToVB(node));
-			}
-		}
-		
-//		public static T ParseStatement<T>(string stmt, bool expectErrors = false) where T : AstNode
-//		{
-//			VBParser parser = new VBParser();
-//			var statements = parser.ParseStatements(new StringReader(stmt));
-//			
-//			Assert.AreEqual(expectErrors, parser.HasErrors, "HasErrors");
-//			
-//			AstNode statement = statements.Single();
-//			Type type = typeof(T);
-//			Assert.IsTrue(type.IsAssignableFrom(statement.GetType()), String.Format("Parsed statement was {0} instead of {1} ({2})", statement.GetType(), type, statement));
-//			return (T)statement;
-//		}
-//		
-//		public static void AssertStatement(string code, VB.Ast.Statement expectedStmt)
-//		{
-//			var stmt = ParseStatement<VB.Ast.Statement>(code);
-//			if (!expectedStmt.IsMatch(stmt)) {
-//				Assert.Fail("Expected '{0}' but was '{1}'", ToCSharp(expectedStmt), ToCSharp(stmt));
-//			}
-//		}
-//		
-//		public static T ParseExpression<T>(string expr, bool expectErrors = false) where T : AstNode
-//		{
-//			VBParser parser = new VBParser();
-//			AstNode parsedExpression = parser.ParseExpression(new StringReader(expr));
-//			
-//			Assert.AreEqual(expectErrors, parser.HasErrors, "HasErrors");
-//			if (expectErrors && parsedExpression == null)
-//				return default (T);
-//			Type type = typeof(T);
-//			Assert.IsTrue(type.IsAssignableFrom(parsedExpression.GetType()), String.Format("Parsed expression was {0} instead of {1} ({2})", parsedExpression.GetType(), type, parsedExpression));
-//			return (T)parsedExpression;
-//		}
-//		
-//		public static void AssertExpression(string code, VB.Ast.Expression expectedExpr)
-//		{
-//			var expr = ParseExpression<CSharp.Expression>(code);
-//			if (!expectedExpr.IsMatch(expr)) {
-//				Assert.Fail("Expected '{0}' but was '{1}'", ToCSharp(expectedExpr), ToCSharp(expr));
-//			}
-//		}
-//		
-//		public static T ParseTypeMember<T>(string expr, bool expectErrors = false) where T : AttributedNode
-//		{
-//			VBParser parser = new VBParser();
-//			var members = parser.ParseTypeMembers(new StringReader(expr));
-//			
-//			Assert.AreEqual(expectErrors, parser.HasErrors, "HasErrors");
-//			
-//			AttributedNode m = members.Single();
-//			Type type = typeof(T);
-//			Assert.IsTrue(type.IsAssignableFrom(m.GetType()), String.Format("Parsed member was {0} instead of {1} ({2})", m.GetType(), type, m));
-//			return (T)m;
-//		}
-//		
-//		public static void AssertTypeMember(string code, VB.Ast.AttributedNode expectedMember)
-//		{
-//			var member = ParseTypeMember<VB.Ast.AttributedNode>(code);
-//			if (!expectedMember.IsMatch(member)) {
-//				Assert.Fail("Expected '{0}' but was '{1}'", ToVB(expectedMember), ToVB(member));
-//			}
-//		}
-		
-		static string ToVB(AstNode node)
-		{
-			StringWriter w = new StringWriter();
-			node.AcceptVisitor(new OutputVisitor(w, new VBFormattingOptions()), null);
-			return w.ToString();
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/SnippetParserTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/SnippetParserTests.cs
deleted file mode 100644
index bf64c982bf..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/SnippetParserTests.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using ICSharpCode.NRefactory.VB.Ast;
-using System;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests
-{
-	[TestFixture]
-	public class SnippetParserTests
-	{
-//		[Test]
-//		public void InvalidExpressionSyntax()
-//		{
-//			// SD2-1584: ensure we don't crash on this invalid VB code
-//			SnippetParser parser = new SnippetParser();
-//			INode node = parser.Parse("i == 5");
-//			Assert.IsTrue(parser.Errors.Count > 0);
-//		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/AddHandlerStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/AddHandlerStatementTests.cs
deleted file mode 100644
index 714476ef68..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/AddHandlerStatementTests.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class AddHandlerStatementTests
-	{
-		[Test]
-		public void AddHandlerTest()
-		{
-			AddHandlerStatement addHandlerStatement = ParseUtil.ParseStatement<AddHandlerStatement>("AddHandler Obj.Ev_Event, AddressOf EventHandler");
-			// TODO : extend tests
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/BlockStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/BlockStatementTests.cs
deleted file mode 100644
index 85d2dd39bb..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/BlockStatementTests.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class BlockStatementTests
-	{
-		// TODO create BlockStatementTests
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ContinueStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ContinueStatementTests.cs
deleted file mode 100644
index 630054149d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ContinueStatementTests.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class ContinueStatementTests
-	{
-		// TODO : add ContinueStatementTests
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/DoLoopStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/DoLoopStatementTests.cs
deleted file mode 100644
index 512e7f1117..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/DoLoopStatementTests.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class DoLoopStatementTests
-	{
-		// TODO write some DoLoopStatement tests
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/EndStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/EndStatementTests.cs
deleted file mode 100644
index 9041a2763c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/EndStatementTests.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class EndStatementTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetEndStatementTest()
-		{
-			EndStatement endStatement = ParseUtil.ParseStatement<EndStatement>("End");
-		}
-		
-		[Test]
-		public void VBNetEndStatementInIfThenTest2()
-		{
-			IfElseStatement endStatement = ParseUtil.ParseStatement<IfElseStatement>("IF a THEN End");
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/EraseStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/EraseStatementTests.cs
deleted file mode 100644
index 742c0fdc2f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/EraseStatementTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class EraseStatementTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetEraseStatementTest()
-		{
-			EraseStatement eraseStatement = ParseUtil.ParseStatement<EraseStatement>("Erase a, b, c");
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ErrorStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ErrorStatementTests.cs
deleted file mode 100644
index e5ae7289f2..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ErrorStatementTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class ErrorStatementTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetErrorStatementTest()
-		{
-			ErrorStatement errorStatement = ParseUtil.ParseStatement<ErrorStatement>("Error a");
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ExpressionStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ExpressionStatementTests.cs
deleted file mode 100644
index 9262294027..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ExpressionStatementTests.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class ExpressionStatementTests
-	{
-		// TODO : Create ExpressionStatementTests
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ForNextStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ForNextStatementTests.cs
deleted file mode 100644
index 68433fd303..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ForNextStatementTests.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class ForNextStatementTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetForNextStatementTest()
-		{
-			ForNextStatement forNextStatement = ParseUtil.ParseStatement<ForNextStatement>("For i=0 To 10 Step 2 : Next i");
-		}
-		
-		[Test]
-		public void VBNetForNextStatementWithComplexExpressionTest()
-		{
-			ForNextStatement forNextStatement = ParseUtil.ParseStatement<ForNextStatement>("For SomeMethod().Property = 0 To 10 : Next SomeMethod().Property");
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ForeachStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ForeachStatementTests.cs
deleted file mode 100644
index f6e874a967..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ForeachStatementTests.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class ForeachStatementTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetForeachStatementTest()
-		{
-			ForeachStatement foreachStmt = ParseUtil.ParseStatement<ForeachStatement>("For Each i As Integer In myColl : Next");
-			// TODO : Extend test.
-		}
-		#endregion
-		
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/GotoStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/GotoStatementTests.cs
deleted file mode 100644
index f4c2c51333..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/GotoStatementTests.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class GotoStatementTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetGotoStatementTest()
-		{
-			GotoStatement gotoStmt = ParseUtil.ParseStatement<GotoStatement>("GoTo myLabel");
-			Assert.AreEqual("myLabel", gotoStmt.Label);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/IfElseStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/IfElseStatementTests.cs
deleted file mode 100644
index dee85e7fdb..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/IfElseStatementTests.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class IfElseStatementTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetSimpleIfStatementTest()
-		{
-			IfElseStatement ifElseStatement = ParseUtil.ParseStatement<IfElseStatement>("If True THEN END");
-			Assert.IsFalse(ifElseStatement.Condition.IsNull);
-			Assert.IsTrue(ifElseStatement.TrueStatement.Count == 1, "true count != 1:" + ifElseStatement.TrueStatement.Count);
-			Assert.IsTrue(ifElseStatement.FalseStatement.Count == 0, "false count != 0:" + ifElseStatement.FalseStatement.Count);
-			
-			Assert.IsTrue(ifElseStatement.TrueStatement[0] is EndStatement, "Statement was: " + ifElseStatement.TrueStatement[0]);
-		}
-		[Test]
-		public void VBNetSimpleIfStatementTest2()
-		{
-			IfElseStatement ifElseStatement = ParseUtil.ParseStatement<IfElseStatement>("If True THEN\n END\n END IF");
-			Assert.IsFalse(ifElseStatement.Condition.IsNull);
-			Assert.IsTrue(ifElseStatement.TrueStatement.Count == 1, "true count != 1:" + ifElseStatement.TrueStatement.Count);
-			Assert.IsTrue(ifElseStatement.FalseStatement.Count == 0, "false count != 0:" + ifElseStatement.FalseStatement.Count);
-			
-			Assert.IsTrue(ifElseStatement.TrueStatement[0] is BlockStatement, "Statement was: " + ifElseStatement.TrueStatement[0]);
-		}
-		
-		// test for SD2-1201
-		[Test]
-		public void VBNetIfStatementLocationTest()
-		{
-			IfElseStatement ifElseStatement = ParseUtil.ParseStatement<IfElseStatement>("If True THEN\n" +
-			                                                                                 "DoIt()\n" +
-			                                                                                 "ElseIf False Then\n" +
-			                                                                                 "DoIt()\n" +
-			                                                                                 "End If");
-			Assert.AreEqual(3, (ifElseStatement.StartLocation).Line);
-			Assert.AreEqual(7, (ifElseStatement.EndLocation).Line);
-			Assert.AreEqual(5, (ifElseStatement.ElseIfSections[0].StartLocation).Line);
-			Assert.AreEqual(6, (ifElseStatement.ElseIfSections[0].EndLocation).Line);
-			Assert.IsNotNull(ifElseStatement.ElseIfSections[0].Parent);
-			
-		}
-		
-		[Test]
-		public void VBNetElseIfStatementTest()
-		{
-			IfElseStatement ifElseStatement = ParseUtil.ParseStatement<IfElseStatement>("If True THEN\n" +
-			                                                                                 "END\n" +
-			                                                                                 "ElseIf False Then\n" +
-			                                                                                 "Stop\n" +
-			                                                                                 "End If");
-			Assert.IsFalse(ifElseStatement.Condition.IsNull);
-			Assert.IsTrue(ifElseStatement.TrueStatement.Count == 1, "true count != 1:" + ifElseStatement.TrueStatement.Count);
-			Assert.IsTrue(ifElseStatement.FalseStatement.Count == 0, "false count != 0:" + ifElseStatement.FalseStatement.Count);
-			Assert.IsFalse((bool)(ifElseStatement.ElseIfSections[0].Condition as PrimitiveExpression).Value);
-			
-			Assert.IsTrue(ifElseStatement.TrueStatement[0] is BlockStatement, "Statement was: " + ifElseStatement.TrueStatement[0]);
-			Assert.IsTrue(ifElseStatement.ElseIfSections[0].EmbeddedStatement.Children[0] is StopStatement, "Statement was: " + ifElseStatement.ElseIfSections[0].EmbeddedStatement.Children[0]);
-		}
-		[Test]
-		public void VBNetElse_IfStatementTest()
-		{
-			IfElseStatement ifElseStatement = ParseUtil.ParseStatement<IfElseStatement>("If True THEN\n" +
-			                                                                                 "END\n" +
-			                                                                                 "Else If False Then\n" +
-			                                                                                 "Stop\n" +
-			                                                                                 "End If");
-			Assert.IsFalse(ifElseStatement.Condition.IsNull);
-			Assert.IsTrue(ifElseStatement.TrueStatement.Count == 1, "true count != 1:" + ifElseStatement.TrueStatement.Count);
-			Assert.IsTrue(ifElseStatement.FalseStatement.Count == 0, "false count != 0:" + ifElseStatement.FalseStatement.Count);
-			Assert.IsFalse((bool)(ifElseStatement.ElseIfSections[0].Condition as PrimitiveExpression).Value);
-			
-			Assert.IsTrue(ifElseStatement.TrueStatement[0] is BlockStatement, "Statement was: " + ifElseStatement.TrueStatement[0]);
-			Assert.IsTrue(ifElseStatement.ElseIfSections[0].EmbeddedStatement.Children[0] is StopStatement, "Statement was: " + ifElseStatement.ElseIfSections[0].EmbeddedStatement.Children[0]);
-		}
-		[Test]
-		public void VBNetMultiStatementIfStatementTest()
-		{
-			IfElseStatement ifElseStatement = ParseUtil.ParseStatement<IfElseStatement>("If True THEN Stop : b");
-			Assert.IsFalse(ifElseStatement.Condition.IsNull);
-			Assert.AreEqual(2, ifElseStatement.TrueStatement.Count, "true count");
-			Assert.AreEqual(0, ifElseStatement.FalseStatement.Count, "false count");
-			
-			Assert.IsTrue(ifElseStatement.TrueStatement[0] is StopStatement);
-			Assert.IsTrue(ifElseStatement.TrueStatement[1] is ExpressionStatement);
-		}
-		[Test]
-		public void VBNetMultiStatementIfStatementWithEndStatementTest()
-		{
-			IfElseStatement ifElseStatement = ParseUtil.ParseStatement<IfElseStatement>("If True THEN Stop : End : b");
-			Assert.IsFalse(ifElseStatement.Condition.IsNull);
-			Assert.AreEqual(3, ifElseStatement.TrueStatement.Count, "true count");
-			Assert.AreEqual(0, ifElseStatement.FalseStatement.Count, "false count");
-			
-			Assert.IsTrue(ifElseStatement.TrueStatement[0] is StopStatement);
-			Assert.IsTrue(ifElseStatement.TrueStatement[1] is EndStatement);
-			Assert.IsTrue(ifElseStatement.TrueStatement[2] is ExpressionStatement);
-		}
-		
-		[Test]
-		public void VBNetIfWithEmptyElseTest()
-		{
-			IfElseStatement ifElseStatement = ParseUtil.ParseStatement<IfElseStatement>("If True THEN a Else");
-			Assert.IsFalse(ifElseStatement.Condition.IsNull);
-			Assert.AreEqual(1, ifElseStatement.TrueStatement.Count, "true count");
-			Assert.AreEqual(0, ifElseStatement.FalseStatement.Count, "false count");
-		}
-		
-		[Test]
-		public void VBNetIfWithMultipleColons()
-		{
-			IfElseStatement ifElseStatement = ParseUtil.ParseStatement<IfElseStatement>("If True THEN a : : b");
-			Assert.IsFalse(ifElseStatement.Condition.IsNull);
-			Assert.AreEqual(2, ifElseStatement.TrueStatement.Count, "true count");
-			Assert.AreEqual(0, ifElseStatement.FalseStatement.Count, "false count");
-		}
-		
-		[Test]
-		public void VBNetIfWithSingleLineElse()
-		{
-			// This isn't legal according to the VB spec, but the MS VB compiler seems to allow it.
-			IfElseStatement ifElseStatement = ParseUtil.ParseStatement<IfElseStatement>("If True THEN\n" +
-			                                                                                 " x()\n" +
-			                                                                                 "Else y()\n" +
-			                                                                                 "End If");
-			Assert.IsFalse(ifElseStatement.Condition.IsNull);
-			Assert.AreEqual(1, ifElseStatement.TrueStatement.Count, "true count");
-			Assert.AreEqual(1, ifElseStatement.FalseStatement.Count, "false count");
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/LabelStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/LabelStatementTests.cs
deleted file mode 100644
index 8bdd6f7faf..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/LabelStatementTests.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class LabelStatementTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetLabelStatementTest()
-		{
-			MethodDeclaration method = ParseUtil.ParseTypeMember<MethodDeclaration>("Sub Test \n myLabel: Console.WriteLine() \n End Sub");
-			Assert.AreEqual(2, method.Body.Children.Count);
-			LabelStatement labelStmt = (LabelStatement)method.Body.Children[0];
-			Assert.AreEqual("myLabel", labelStmt.Label);
-		}
-		#endregion 
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/LocalVariableDeclarationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/LocalVariableDeclarationTests.cs
deleted file mode 100644
index d0b9ced62f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/LocalVariableDeclarationTests.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class LocalVariableDeclarationTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetLocalVariableDeclarationTest()
-		{
-			LocalVariableDeclaration lvd = ParseUtil.ParseStatement<LocalVariableDeclaration>("Dim a As Integer = 5");
-			Assert.AreEqual(1, lvd.Variables.Count);
-			Assert.AreEqual("a", lvd.Variables[0].Name);
-			TypeReference type = lvd.GetTypeForVariable(0);
-			Assert.AreEqual("System.Int32", type.Type);
-			Assert.AreEqual(5, ((PrimitiveExpression)lvd.Variables[0].Initializer).Value);
-		}
-		
-		[Test]
-		public void VBNetLocalVariableNamedOverrideDeclarationTest()
-		{
-			LocalVariableDeclaration lvd = ParseUtil.ParseStatement<LocalVariableDeclaration>("Dim override As Integer = 5");
-			Assert.AreEqual(1, lvd.Variables.Count);
-			Assert.AreEqual("override", lvd.Variables[0].Name);
-			TypeReference type = lvd.GetTypeForVariable(0);
-			Assert.AreEqual("System.Int32", type.Type);
-			Assert.AreEqual(5, ((PrimitiveExpression)lvd.Variables[0].Initializer).Value);
-		}
-		
-		[Test]
-		public void VBNetLocalArrayDeclarationWithInitializationTest()
-		{
-			LocalVariableDeclaration lvd = ParseUtil.ParseStatement<LocalVariableDeclaration>("Dim a(10) As Integer");
-			Assert.AreEqual(1, lvd.Variables.Count);
-			Assert.AreEqual("a", lvd.Variables[0].Name);
-			TypeReference type = lvd.GetTypeForVariable(0);
-			Assert.AreEqual("System.Int32", type.Type);
-			Assert.AreEqual(new int[] { 0 } , type.RankSpecifier);
-			ArrayCreateExpression ace = (ArrayCreateExpression)lvd.Variables[0].Initializer;
-			Assert.AreEqual(new int[] { 0 } , ace.CreateType.RankSpecifier);
-			Assert.AreEqual(1, ace.Arguments.Count);
-			Assert.AreEqual(10, ((PrimitiveExpression)ace.Arguments[0]).Value);
-		}
-		
-		[Test]
-		public void VBNetLocalArrayDeclarationWithInitializationAndLowerBoundTest()
-		{
-			// VB.NET allows only "0" as lower bound
-			LocalVariableDeclaration lvd = ParseUtil.ParseStatement<LocalVariableDeclaration>("Dim a(0 To 10) As Integer");
-			Assert.AreEqual(1, lvd.Variables.Count);
-			Assert.AreEqual("a", lvd.Variables[0].Name);
-			TypeReference type = lvd.GetTypeForVariable(0);
-			Assert.AreEqual("System.Int32", type.Type);
-			Assert.AreEqual(new int[] { 0 } , type.RankSpecifier);
-			ArrayCreateExpression ace = (ArrayCreateExpression)lvd.Variables[0].Initializer;
-			Assert.AreEqual(new int[] { 0 } , ace.CreateType.RankSpecifier);
-			Assert.AreEqual(1, ace.Arguments.Count);
-			Assert.AreEqual(10, ((PrimitiveExpression)ace.Arguments[0]).Value);
-		}
-		
-		[Test]
-		public void VBNetLocalArrayDeclarationTest()
-		{
-			LocalVariableDeclaration lvd = ParseUtil.ParseStatement<LocalVariableDeclaration>("Dim a() As Integer");
-			Assert.AreEqual(1, lvd.Variables.Count);
-			Assert.AreEqual("a", lvd.Variables[0].Name);
-			TypeReference type = lvd.GetTypeForVariable(0);
-			Assert.AreEqual("System.Int32", type.Type);
-			Assert.AreEqual(new int[] { 0 } , type.RankSpecifier);
-		}
-		
-		[Test]
-		public void VBNetLocalJaggedArrayDeclarationTest()
-		{
-			LocalVariableDeclaration lvd = ParseUtil.ParseStatement<LocalVariableDeclaration>("Dim a(10)() As Integer");
-			Assert.AreEqual(1, lvd.Variables.Count);
-			Assert.AreEqual("a", lvd.Variables[0].Name);
-			TypeReference type = lvd.GetTypeForVariable(0);
-			Assert.AreEqual("System.Int32", type.Type);
-			Assert.AreEqual(new int[] { 0, 0 } , type.RankSpecifier);
-			ArrayCreateExpression ace = (ArrayCreateExpression)lvd.Variables[0].Initializer;
-			Assert.AreEqual(new int[] {0, 0}, ace.CreateType.RankSpecifier);
-			Assert.AreEqual(1, ace.Arguments.Count);
-			Assert.AreEqual(10, ((PrimitiveExpression)ace.Arguments[0]).Value);
-		}
-		
-		[Test]
-		public void VBNetComplexGenericLocalVariableDeclarationTest()
-		{
-			LocalVariableDeclaration lvd = ParseUtil.ParseStatement<LocalVariableDeclaration>("Dim where As Generic(Of Printable, G(Of Printable()))");
-			Assert.AreEqual(1, lvd.Variables.Count);
-			Assert.AreEqual("where", lvd.Variables[0].Name);
-			TypeReference type = lvd.GetTypeForVariable(0);
-			Assert.AreEqual("Generic", type.Type);
-			Assert.AreEqual(2, type.GenericTypes.Count);
-			Assert.AreEqual("Printable", type.GenericTypes[0].Type);
-			Assert.AreEqual(0, type.GenericTypes[0].GenericTypes.Count);
-			Assert.AreEqual("G", type.GenericTypes[1].Type);
-			Assert.AreEqual(1, type.GenericTypes[1].GenericTypes.Count);
-			Assert.AreEqual("Printable", type.GenericTypes[1].GenericTypes[0].Type);
-		}
-		
-		[Test]
-		public void VBNetGenericWithArrayLocalVariableDeclarationTest1()
-		{
-			LocalVariableDeclaration lvd = ParseUtil.ParseStatement<LocalVariableDeclaration>("Dim a As G(Of Integer)()");
-			Assert.AreEqual(1, lvd.Variables.Count);
-			TypeReference type = lvd.GetTypeForVariable(0);
-			Assert.AreEqual("G", type.Type);
-			Assert.AreEqual(1, type.GenericTypes.Count);
-			Assert.AreEqual("System.Int32", type.GenericTypes[0].Type);
-			Assert.AreEqual(0, type.GenericTypes[0].GenericTypes.Count);
-			Assert.IsFalse(type.GenericTypes[0].IsArrayType);
-			Assert.AreEqual(new int[] { 0 }, type.RankSpecifier);
-		}
-		
-		[Test]
-		public void VBNetGenericWithArrayLocalVariableDeclarationTest2()
-		{
-			LocalVariableDeclaration lvd = ParseUtil.ParseStatement<LocalVariableDeclaration>("Dim a As G(Of Integer())");
-			Assert.AreEqual(1, lvd.Variables.Count);
-			TypeReference type = lvd.GetTypeForVariable(0);
-			Assert.AreEqual("G", type.Type);
-			Assert.AreEqual(1, type.GenericTypes.Count);
-			Assert.AreEqual("System.Int32", type.GenericTypes[0].Type);
-			Assert.AreEqual(0, type.GenericTypes[0].GenericTypes.Count);
-			Assert.IsFalse(type.IsArrayType);
-			Assert.AreEqual(1, type.GenericTypes[0].RankSpecifier.Length);
-			Assert.AreEqual(0, type.GenericTypes[0].RankSpecifier[0]);
-		}
-		
-		[Test]
-		public void VBNetGenericLocalVariableDeclarationTest2()
-		{
-			LocalVariableDeclaration lvd = ParseUtil.ParseStatement<LocalVariableDeclaration>("Dim a As G(Of G(Of Integer))");
-			Assert.AreEqual(1, lvd.Variables.Count);
-			TypeReference type = lvd.GetTypeForVariable(0);
-			Assert.AreEqual("G", type.Type);
-			Assert.AreEqual(1, type.GenericTypes.Count);
-			Assert.AreEqual("G", type.GenericTypes[0].Type);
-			Assert.AreEqual(1, type.GenericTypes[0].GenericTypes.Count);
-			Assert.AreEqual("System.Int32", type.GenericTypes[0].GenericTypes[0].Type);
-		}
-		
-		[Test]
-		public void VBNetGenericLocalVariableDeclarationTest()
-		{
-			LocalVariableDeclaration lvd = ParseUtil.ParseStatement<LocalVariableDeclaration>("Dim a As G(Of Integer)");
-			Assert.AreEqual(1, lvd.Variables.Count);
-			TypeReference type = lvd.GetTypeForVariable(0);
-			Assert.AreEqual("G", type.Type);
-			Assert.AreEqual(1, type.GenericTypes.Count);
-			Assert.AreEqual("System.Int32", type.GenericTypes[0].Type);
-		}
-		
-		[Test]
-		public void VBNetGenericLocalVariableInitializationTest()
-		{
-			LocalVariableDeclaration lvd = ParseUtil.ParseStatement<LocalVariableDeclaration>("Dim a As New G(Of Integer)");
-			Assert.AreEqual(1, lvd.Variables.Count);
-			TypeReference type = lvd.GetTypeForVariable(0);
-			Assert.AreEqual("G", type.Type);
-			Assert.AreEqual(1, type.GenericTypes.Count);
-			Assert.AreEqual("System.Int32", type.GenericTypes[0].Type);
-			// TODO: Check initializer
-		}
-		
-		[Test]
-		public void VBNetNestedGenericLocalVariableDeclarationTest()
-		{
-			LocalVariableDeclaration lvd = ParseUtil.ParseStatement<LocalVariableDeclaration>("Dim a as MyType(of string).InnerClass(of integer).InnerInnerClass");
-			Assert.AreEqual(1, lvd.Variables.Count);
-			InnerClassTypeReference ic = (InnerClassTypeReference)lvd.GetTypeForVariable(0);
-			Assert.AreEqual("InnerInnerClass", ic.Type);
-			Assert.AreEqual(0, ic.GenericTypes.Count);
-			ic = (InnerClassTypeReference)ic.BaseType;
-			Assert.AreEqual("InnerClass", ic.Type);
-			Assert.AreEqual(1, ic.GenericTypes.Count);
-			Assert.AreEqual("System.Int32", ic.GenericTypes[0].Type);
-			Assert.AreEqual("MyType", ic.BaseType.Type);
-			Assert.AreEqual(1, ic.BaseType.GenericTypes.Count);
-			Assert.AreEqual("System.String", ic.BaseType.GenericTypes[0].Type);
-		}
-		
-		[Test]
-		public void VBNetDimInSingleLineIf()
-		{
-			IfElseStatement ifes = ParseUtil.ParseStatement<IfElseStatement>("If a Then Dim b As String");
-			LocalVariableDeclaration lvd = (LocalVariableDeclaration)ifes.TrueStatement[0];
-			Assert.AreEqual(1, lvd.Variables.Count);
-			TypeReference type = lvd.GetTypeForVariable(0);
-			Assert.AreEqual("System.String", type.Type);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/LockStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/LockStatementTests.cs
deleted file mode 100644
index ec3501c759..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/LockStatementTests.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class LockStatementTests
-	{
-		// TODO : write some tests on SyncLock
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/OnErrorStatementTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/OnErrorStatementTest.cs
deleted file mode 100644
index db4c5ab96f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/OnErrorStatementTest.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class OnErrorStatementTest
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetOnErrorStatementTest()
-		{
-			OnErrorStatement onErrorStatement = ParseUtil.ParseStatement<OnErrorStatement>("On Error Goto err");
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/RaiseEventStatementTest.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/RaiseEventStatementTest.cs
deleted file mode 100644
index 96bbd89e68..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/RaiseEventStatementTest.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class RaiseEventStatementTest
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetRaiseEventStatementTest()
-		{
-			RaiseEventStatement raiseEventStatement = ParseUtil.ParseStatement<RaiseEventStatement>("RaiseEvent MyEvent(a, 5, (6))");
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ReDimStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ReDimStatementTests.cs
deleted file mode 100644
index 4a4ea8db14..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ReDimStatementTests.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class ReDimStatementTests
-	{
-		[Test]
-		public void VBNetReDimStatementTest()
-		{
-			ReDimStatement reDimStatement = ParseUtil.ParseStatement<ReDimStatement>("ReDim Preserve MyArray(15)");
-			Assert.AreEqual(1, reDimStatement.ReDimClauses.Count);
-			Assert.AreSame(reDimStatement, reDimStatement.ReDimClauses[0].Parent);
-		}
-		
-		[Test]
-		public void VBNetReDimStatementTest2()
-		{
-			ReDimStatement reDimStatement = ParseUtil.ParseStatement<ReDimStatement>("ReDim calCheckData(channelNum, lambdaNum).ShiftFromLastFullCalPixels(CalCheckPeak.HighWavelength)");
-		}
-		
-		[Test]
-		public void VBNetBigReDimStatementTest()
-		{
-			string program = @"
-Class X
-	Sub x
-		ReDim sU(m - 1, n - 1)
-		ReDim sW(n - 1)
-		ReDim sV(n - 1, n - 1)
-		ReDim rv1(n - 1)
-		ReDim sMt(iNrCols - 1, 0)
-		ReDim Preserve sMt(iNrCols - 1, iRowNr)
-		ReDim sM(iRowNr - 1, iNrCols - 1)
-		If (IsNothing(ColLengths)) Then ReDim ColLengths(0)
-		If (ColLengths.Length = (SubItem + 1)) Then ReDim Preserve ColLengths(SubItem + 1)
-		ReDim sTransform(2, iTransformType - 1)
-		ReDim Preserve _Items(_Count)
-		ReDim Preserve _Items(nCapacity)
-		ReDim Preserve _Items(0 To _Count)
-		ReDim Preserve _Items(0 To nCapacity)
-		ReDim sU(m - 1, n - 1)
-		ReDim sW(n - 1)
-		ReDim sV(n - 1, n - 1)
-		ReDim rv1(n - 1)
-		ReDim sMt(iNrCols - 1, 0)
-		ReDim Preserve sMt(iNrCols - 1, iRowNr)
-		ReDim sM(iRowNr - 1, iNrCols - 1)
-		If (IsNothing(ColLengths)) Then ReDim ColLengths(0)
-		If (ColLengths.Length = (SubItem + 1)) Then ReDim Preserve ColLengths(SubItem + 1)
-		ReDim sTransform(2, iTransformType - 1)
-		ReDim Preserve Samples(Samples.GetUpperBound(0) + 1)
-		ReDim Samples(0)
-		ReDim BaseCssContent(BaseCssContentRows - 1)
-		ReDim mabtRxBuf(Bytes2Read - 1)
-		ReDim Preserve primarykey(primarykey.Length)
-		ReDim Preserve IntArray(10, 10, 15)
-		ReDim X(10, 10)
-		ReDim Preserve IntArray(0 To 10, 10, 0 To 20)
-		ReDim Preserve IntArray(10, 10, 15)
-		ReDim X(0 To 10, 0 To 10)
-		ReDim GetMe().IntArray(0 To 10, 10, 0 To 20)
-		ReDim GetMe(ExplicitParameter := 3).IntArray(0 To 10, 10, 0 To 20)
-		ReDim SomeType(Of Integer).IntArray(0 To 10, 10, 0 To 20)
-	End Sub
-End Class";
-			TypeDeclaration typeDeclaration = ParseUtil.ParseGlobal<TypeDeclaration>(program);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/RemoveHandlerStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/RemoveHandlerStatement.cs
deleted file mode 100644
index fb01666aec..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/RemoveHandlerStatement.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class RemoveHandlerStatementTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetRemoveHandlerTest()
-		{
-			RemoveHandlerStatement removeHandlerStatement = ParseUtil.ParseStatement<RemoveHandlerStatement>("RemoveHandler MyHandler, AddressOf MyMethod");
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ResumeStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ResumeStatement.cs
deleted file mode 100644
index 85ab30a311..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ResumeStatement.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class ResumeStatementTests
-	{
-		[Test]
-		public void ResumeStatementTest()
-		{
-			ResumeStatement resumeStatement = ParseUtil.ParseStatement<ResumeStatement>("Resume");
-		}
-		
-		// TODO : write some more
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ReturnStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ReturnStatementTests.cs
deleted file mode 100644
index f6403d5eba..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ReturnStatementTests.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class ReturnStatementTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetEmptyReturnStatementTest()
-		{
-			ReturnStatement returnStatement = ParseUtil.ParseStatement<ReturnStatement>("Return");
-			Assert.IsTrue(returnStatement.Expression.IsNull);
-		}
-		
-		[Test]
-		public void VBNetReturnStatementTest()
-		{
-			ReturnStatement returnStatement = ParseUtil.ParseStatement<ReturnStatement>("Return 5");
-			Assert.IsFalse(returnStatement.Expression.IsNull);
-			Assert.IsTrue(returnStatement.Expression is PrimitiveExpression);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/StopStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/StopStatementTests.cs
deleted file mode 100644
index 0a0d27595d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/StopStatementTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class StopStatementTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetStopStatementTest()
-		{
-			StopStatement stopStatement = ParseUtil.ParseStatement<StopStatement>("Stop");
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/SwitchStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/SwitchStatementTests.cs
deleted file mode 100644
index 39f4a47a82..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/SwitchStatementTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class SwitchStatementTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBSwitchStatementTest()
-		{
-			SwitchStatement switchStmt = ParseUtil.ParseStatement<SwitchStatement>("Select Case a\n Case 4, 5\n Case 6\n Case Else\n End Select");
-			Assert.AreEqual("a", ((SimpleNameExpression)switchStmt.SwitchExpression).Identifier);
-			// TODO: Extend test
-		}
-		
-		[Test]
-		public void InvalidVBSwitchStatementTest()
-		{
-			SwitchStatement switchStmt = ParseUtil.ParseStatement<SwitchStatement>("Select Case a\n Case \n End Select", true);
-			Assert.AreEqual("a", ((SimpleNameExpression)switchStmt.SwitchExpression).Identifier);
-			SwitchSection sec = switchStmt.SwitchSections[0];
-			Assert.AreEqual(0, sec.SwitchLabels.Count);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ThrowStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ThrowStatementTests.cs
deleted file mode 100644
index c9df1d6922..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ThrowStatementTests.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class ThrowStatementTests
-	{
-		// TODO : ThrowStatementTests
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/TryCatchStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/TryCatchStatementTests.cs
deleted file mode 100644
index 8d4b492893..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/TryCatchStatementTests.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class TryCatchStatementTests
-	{
-		// TODO : TryCatchStatementTests
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/UsingStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/UsingStatementTests.cs
deleted file mode 100644
index 059eb21a06..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/UsingStatementTests.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class UsingStatementTests
-	{
-		[Test]
-		public void UsingStatement()
-		{
-			string usingText = @"
-Using nf As New System.Drawing.Font(""Arial"", 12.0F, FontStyle.Bold)
-        c.Font = nf
-        c.Text = ""This is 12-point Arial bold""
-End Using";
-			UsingStatement usingStmt = ParseUtil.ParseStatement<UsingStatement>(usingText);
-			// TODO : Extend test.
-		}
-		[Test]
-		public void UsingStatement2()
-		{
-			string usingText = @"
-Using nf As Font = New Font()
-	Bla(nf)
-End Using";
-			UsingStatement usingStmt = ParseUtil.ParseStatement<UsingStatement>(usingText);
-			// TODO : Extend test.
-		}
-		[Test]
-		public void UsingStatement3()
-		{
-			string usingText = @"
-Using nf As New Font(), nf2 As New List(Of Font)(), nf3 = Nothing
-	Bla(nf)
-End Using";
-			UsingStatement usingStmt = ParseUtil.ParseStatement<UsingStatement>(usingText);
-			// TODO : Extend test.
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/WithStatementTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/WithStatementTests.cs
deleted file mode 100644
index 7f0ce5c446..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/WithStatementTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class WithStatementTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetWithStatementTest()
-		{
-			WithStatement withStatement = ParseUtil.ParseStatement<WithStatement>("With MyObj : End With");
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/ConstructorDeclarationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/ConstructorDeclarationTests.cs
deleted file mode 100644
index 8c6d27a666..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/ConstructorDeclarationTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using ICSharpCode.NRefactory.VB.Ast;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class ConstructorDeclarationTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetConstructorDeclarationTest1()
-		{
-			string program = @"Sub New()
-								End Sub";
-			ConstructorDeclaration cd = ParseUtil.ParseTypeMember<ConstructorDeclaration>(program);
-			Assert.IsTrue(cd.ConstructorInitializer.IsNull);
-		}
-		
-		[Test]
-		public void VBNetConstructorDeclarationTest2()
-		{
-			ConstructorDeclaration cd = ParseUtil.ParseTypeMember<ConstructorDeclaration>("Sub New(x As Integer, Optional y As String) \nEnd Sub");
-			Assert.AreEqual(2, cd.Parameters.Count);
-			Assert.AreEqual("System.Int32", cd.Parameters[0].TypeReference.Type);
-			Assert.AreEqual("System.String", cd.Parameters[1].TypeReference.Type);
-			Assert.AreEqual(ParameterModifiers.Optional, cd.Parameters[1].ParamModifier & ParameterModifiers.Optional);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/CustomEventTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/CustomEventTests.cs
deleted file mode 100644
index 5634c982b0..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/CustomEventTests.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using NUnit.Framework;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class CustomEventTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetCustomEventsStatementTest()
-		{
-			string code = @" Public Custom Event TestEvent As EventHandler
-        AddHandler(ByVal value As EventHandler)
-            Handlers = CType([Delegate].Combine(Handlers, value), _
-                EventHandler)
-        End AddHandler
-
-        RemoveHandler(ByVal value as EventHandler)
-            Handlers = CType([Delegate].Remove(Handlers, value), _
-                EventHandler)
-        End RemoveHandler
-
-        RaiseEvent(ByVal sender As Object, ByVal e As EventArgs)
-            Dim TempHandlers As EventHandler = Handlers
-
-            If TempHandlers IsNot Nothing Then
-                TempHandlers(sender, e)
-            End If
-        End RaiseEvent
-    End Event";
-			EventDeclaration customEventDecl = ParseUtil.ParseTypeMember<EventDeclaration>(code);
-			Assert.IsNotNull(customEventDecl);
-			Assert.AreEqual("TestEvent", customEventDecl.Name);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/DeclareDeclarationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/DeclareDeclarationTests.cs
deleted file mode 100644
index 3b1ae48c08..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/DeclareDeclarationTests.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using ICSharpCode.NRefactory.VB.Ast;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class DeclareDeclarationTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetDeclareDeclarationTest()
-		{
-			string program = "Declare Ansi Function GetUserName Lib \"advapi32.dll\" Alias \"GetUserNameA\" (ByVal lpBuffer As String, ByRef nSize As Integer) As Integer\n";
-			DeclareDeclaration dd = ParseUtil.ParseTypeMember<DeclareDeclaration>(program);
-			Assert.AreEqual("System.Int32", dd.TypeReference.Type);
-			Assert.AreEqual("GetUserName", dd.Name);
-			Assert.AreEqual("advapi32.dll", dd.Library);
-			Assert.AreEqual("GetUserNameA", dd.Alias);
-			Assert.AreEqual(CharsetModifier.Ansi, dd.Charset);
-		}
-		#endregion
-		
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/EventDeclarationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/EventDeclarationTests.cs
deleted file mode 100644
index f88e8e27fa..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/EventDeclarationTests.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using ICSharpCode.NRefactory.VB.Ast;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class EventDeclarationTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetSimpleEventDeclarationTest()
-		{
-			EventDeclaration ed = ParseUtil.ParseTypeMember<EventDeclaration>("event MyEvent(x as Integer)");
-			Assert.AreEqual(1, ed.Parameters.Count);
-			Assert.AreEqual("MyEvent", ed.Name);
-			Assert.IsFalse(ed.HasAddRegion);
-			Assert.IsFalse(ed.HasRemoveRegion);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/FieldDeclarationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/FieldDeclarationTests.cs
deleted file mode 100644
index 2aa54fdb2d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/FieldDeclarationTests.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using ICSharpCode.NRefactory.VB.Ast;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class FieldDeclarationTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetSimpleFieldDeclarationTest()
-		{
-			FieldDeclaration fd = ParseUtil.ParseTypeMember<FieldDeclaration>("myField As Integer(,,,)");
-			Assert.AreEqual(1, fd.Fields.Count);
-			
-			Assert.AreEqual("System.Int32", ((VariableDeclaration)fd.Fields[0]).TypeReference.Type);
-			Assert.AreEqual("System.Int32", ((VariableDeclaration)fd.Fields[0]).TypeReference.Type);
-			Assert.AreEqual("myField", ((VariableDeclaration)fd.Fields[0]).Name);
-			Assert.AreEqual(new int[] { 3 } , ((VariableDeclaration)fd.Fields[0]).TypeReference.RankSpecifier);
-		}
-		
-		[Test]
-		public void VBNetMultiFieldDeclarationTest()
-		{
-			FieldDeclaration fd = ParseUtil.ParseTypeMember<FieldDeclaration>("a, b As String");
-			Assert.AreEqual(2, fd.Fields.Count);
-			
-			Assert.AreEqual("System.String", ((VariableDeclaration)fd.Fields[0]).TypeReference.Type);
-			Assert.IsFalse(((VariableDeclaration)fd.Fields[0]).TypeReference.IsArrayType);
-			Assert.AreEqual("System.String", ((VariableDeclaration)fd.Fields[1]).TypeReference.Type);
-			Assert.IsFalse(((VariableDeclaration)fd.Fields[1]).TypeReference.IsArrayType);
-		}
-		
-		[Test]
-		public void VBNetMultiFieldsOnSingleLineTest()
-		{
-			string program = "Class TestClass : Dim a : Dim b : End Class";
-			TypeDeclaration td = ParseUtil.ParseGlobal<TypeDeclaration>(program);
-			
-			Assert.AreEqual(2, td.Children.Count);
-			Assert.IsTrue(td.Children[0] is FieldDeclaration);
-			Assert.IsTrue(td.Children[1] is FieldDeclaration);
-		}
-		
-		[Test]
-		public void VBNetMultiFieldDeclarationTest2()
-		{
-			FieldDeclaration fd = ParseUtil.ParseTypeMember<FieldDeclaration>("Dim a, b() As String");
-			Assert.AreEqual(2, fd.Fields.Count);
-			
-			Assert.AreEqual("System.String", ((VariableDeclaration)fd.Fields[0]).TypeReference.Type);
-			Assert.AreEqual("System.String", ((VariableDeclaration)fd.Fields[1]).TypeReference.Type);
-			Assert.IsFalse(((VariableDeclaration)fd.Fields[0]).TypeReference.IsArrayType);
-			Assert.IsTrue(((VariableDeclaration)fd.Fields[1]).TypeReference.IsArrayType);
-		}
-		
-		[Test]
-		public void VBNetMultiFieldDeclarationTest3()
-		{
-			FieldDeclaration fd = ParseUtil.ParseTypeMember<FieldDeclaration>("Dim a(), b As String");
-			Assert.AreEqual(2, fd.Fields.Count);
-			
-			Assert.AreEqual("System.String", ((VariableDeclaration)fd.Fields[0]).TypeReference.Type);
-			Assert.AreEqual("System.String", ((VariableDeclaration)fd.Fields[1]).TypeReference.Type);
-			Assert.IsTrue(((VariableDeclaration)fd.Fields[0]).TypeReference.IsArrayType);
-			Assert.IsFalse(((VariableDeclaration)fd.Fields[1]).TypeReference.IsArrayType);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/MethodDeclarationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/MethodDeclarationTests.cs
deleted file mode 100644
index 5be86af631..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/MethodDeclarationTests.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using ICSharpCode.NRefactory.VB.Ast;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class MethodDeclarationTests
-	{
-		#region VB.NET
-		
-		[Test]
-		public void VBNetDefiningPartialMethodDeclarationTest()
-		{
-			MethodDeclaration md = ParseUtil.ParseTypeMember<MethodDeclaration>(@"Partial Sub MyMethod()
-			                                                                         End Sub");
-			Assert.AreEqual(0, md.Parameters.Count);
-			Assert.AreEqual("MyMethod", md.Name);
-			Assert.IsFalse(md.IsExtensionMethod);
-			Assert.AreEqual(Modifiers.Partial, md.Modifier);
-		}
-		
-		[Test]
-		public void VBNetMethodWithModifiersRegionTest()
-		{
-			const string program = @"public shared sub MyMethod()
-				OtherMethod()
-			end sub";
-			
-			MethodDeclaration md = ParseUtil.ParseTypeMember<MethodDeclaration>(program);
-			Assert.AreEqual(Modifiers.Public | Modifiers.Static, md.Modifier);
-			Assert.AreEqual(2, md.StartLocation.Line, "StartLocation.Y");
-			Assert.AreEqual(2, md.EndLocation.Line, "EndLocation.Y");
-			Assert.AreEqual(2, md.StartLocation.Column, "StartLocation.X");
-		}
-		
-		[Test]
-		public void VBNetFunctionMethodDeclarationTest()
-		{
-			const string program = @"public function MyFunction() as Integer
-				return 1
-			end function";
-			
-			MethodDeclaration md = ParseUtil.ParseTypeMember<MethodDeclaration>(program);
-			Assert.AreEqual(Modifiers.Public, md.Modifier);
-			Assert.AreEqual(2, md.StartLocation.Line, "StartLocation.Y");
-			Assert.AreEqual(2, md.StartLocation.Column, "StartLocation.X");
-			Assert.AreEqual(2, md.EndLocation.Line, "EndLocation.Y");
-		}
-		
-		[Test]
-		public void VBNetSubroutineMethodDeclarationTest()
-		{
-			const string program = @"public Sub MyMethod()
-				OtherMethod()
-			end Sub";
-			
-			MethodDeclaration md = ParseUtil.ParseTypeMember<MethodDeclaration>(program);
-			Assert.AreEqual(Modifiers.Public, md.Modifier);
-			Assert.AreEqual(2, md.StartLocation.Line, "StartLocation.Y");
-			Assert.AreEqual(2, md.StartLocation.Column, "StartLocation.X");
-			Assert.AreEqual(2, md.EndLocation.Line, "EndLocation.Y");
-		}
-		
-		[Test]
-		public void VBNetGenericFunctionMethodDeclarationTest()
-		{
-			MethodDeclaration md = ParseUtil.ParseTypeMember<MethodDeclaration>("function MyMethod(Of T)(a As T) As Double\nEnd Function");
-			Assert.AreEqual("System.Double", md.TypeReference.Type);
-			Assert.AreEqual(1, md.Parameters.Count);
-			Assert.AreEqual("T", ((ParameterDeclarationExpression)md.Parameters[0]).TypeReference.Type);
-			Assert.AreEqual("a", ((ParameterDeclarationExpression)md.Parameters[0]).ParameterName);
-			
-			Assert.AreEqual(1, md.Templates.Count);
-			Assert.AreEqual("T", md.Templates[0].Name);
-		}
-		
-		[Test]
-		public void VBNetGenericMethodDeclarationTest()
-		{
-			MethodDeclaration md = ParseUtil.ParseTypeMember<MethodDeclaration>("Function MyMethod(Of T)(a As T) As T\nEnd Function ");
-			Assert.AreEqual("T", md.TypeReference.Type);
-			Assert.AreEqual(1, md.Parameters.Count);
-			Assert.AreEqual("T", ((ParameterDeclarationExpression)md.Parameters[0]).TypeReference.Type);
-			Assert.AreEqual("a", ((ParameterDeclarationExpression)md.Parameters[0]).ParameterName);
-			
-			Assert.AreEqual(1, md.Templates.Count);
-			Assert.AreEqual("T", md.Templates[0].Name);
-		}
-		
-		[Test]
-		public void VBNetGenericMethodDeclarationWithConstraintTest()
-		{
-			string program = "Function MyMethod(Of T As { ISomeInterface })(a As T) As T\n End Function";
-			MethodDeclaration md = ParseUtil.ParseTypeMember<MethodDeclaration>(program);
-			Assert.AreEqual("T", md.TypeReference.Type);
-			Assert.AreEqual(1, md.Parameters.Count);
-			Assert.AreEqual("T", ((ParameterDeclarationExpression)md.Parameters[0]).TypeReference.Type);
-			Assert.AreEqual("a", ((ParameterDeclarationExpression)md.Parameters[0]).ParameterName);
-			
-			Assert.AreEqual(1, md.Templates.Count);
-			Assert.AreEqual("T", md.Templates[0].Name);
-			Assert.AreEqual(1, md.Templates[0].Bases.Count);
-			Assert.AreEqual("ISomeInterface", md.Templates[0].Bases[0].Type);
-		}
-		
-		[Test]
-		public void VBNetExtensionMethodDeclaration()
-		{
-			MethodDeclaration md = ParseUtil.ParseTypeMember<MethodDeclaration>(
-				@"<Extension> _
-				Sub Print(s As String)
-					Console.WriteLine(s)
-				End Sub");
-			
-			Assert.AreEqual("Print", md.Name);
-			
-			// IsExtensionMethod is only valid for c#.
-			// Assert.IsTrue(md.IsExtensionMethod);
-			
-			Assert.AreEqual("s", md.Parameters[0].ParameterName);
-			Assert.AreEqual("System.String", md.Parameters[0].TypeReference.Type);
-		}
-		
-		[Test]
-		public void VBNetGenericMethodInInterface()
-		{
-			const string program = @"Interface MyInterface
-				Function MyMethod(Of T As {ISomeInterface})(a As T) As T
-				End Interface";
-			TypeDeclaration td = ParseUtil.ParseGlobal<TypeDeclaration>(program);
-			MethodDeclaration md = (MethodDeclaration)td.Children[0];
-			Assert.AreEqual("T", md.TypeReference.Type);
-			Assert.AreEqual(1, md.Parameters.Count);
-			Assert.AreEqual("T", ((ParameterDeclarationExpression)md.Parameters[0]).TypeReference.Type);
-			Assert.AreEqual("a", ((ParameterDeclarationExpression)md.Parameters[0]).ParameterName);
-			
-			Assert.AreEqual(1, md.Templates.Count);
-			Assert.AreEqual("T", md.Templates[0].Name);
-			Assert.AreEqual(1, md.Templates[0].Bases.Count);
-			Assert.AreEqual("ISomeInterface", md.Templates[0].Bases[0].Type);
-		}
-		
-		[Test]
-		public void VBNetGenericVoidMethodInInterface()
-		{
-			const string program = @"interface MyInterface
-	Sub MyMethod(Of T As {ISomeInterface})(a as T)
-End Interface
-";
-			TypeDeclaration td = ParseUtil.ParseGlobal<TypeDeclaration>(program);
-			MethodDeclaration md = (MethodDeclaration)td.Children[0];
-			Assert.AreEqual("System.Void", md.TypeReference.Type);
-			Assert.AreEqual(1, md.Parameters.Count);
-			Assert.AreEqual("T", ((ParameterDeclarationExpression)md.Parameters[0]).TypeReference.Type);
-			Assert.AreEqual("a", ((ParameterDeclarationExpression)md.Parameters[0]).ParameterName);
-			
-			Assert.AreEqual(1, md.Templates.Count);
-			Assert.AreEqual("T", md.Templates[0].Name);
-			Assert.AreEqual(1, md.Templates[0].Bases.Count);
-			Assert.AreEqual("ISomeInterface", md.Templates[0].Bases[0].Type);
-		}
-		
-		[Test]
-		public void VBNetMethodWithHandlesClause()
-		{
-			MethodDeclaration md = ParseUtil.ParseTypeMember<MethodDeclaration>(
-				@"Public Sub MyMethod(sender As Object, e As EventArgs) Handles x.y
-			End Sub");
-			Assert.AreEqual(new string[] { "x.y" }, md.HandlesClause.ToArray());
-			
-			md = ParseUtil.ParseTypeMember<MethodDeclaration>(
-				@"Public Sub MyMethod() Handles Me.FormClosing
-			End Sub");
-			Assert.AreEqual(new string[] { "Me.FormClosing" }, md.HandlesClause.ToArray());
-			
-			md = ParseUtil.ParseTypeMember<MethodDeclaration>(
-				@"Public Sub MyMethod() Handles MyBase.Event, Button1.Click
-			End Sub");
-			Assert.AreEqual(new string[] { "MyBase.Event", "Button1.Click" }, md.HandlesClause.ToArray());
-		}
-		
-		[Test]
-		public void VBNetMethodWithTypeCharactersTest()
-		{
-			const string program = @"Public Function Func!(ByVal Param&)
-				Func! = CSingle(Param&)
-			End Function";
-			
-			MethodDeclaration md = ParseUtil.ParseTypeMember<MethodDeclaration>(program);
-			Assert.AreEqual(Modifiers.Public, md.Modifier);
-		}
-		
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/OperatorDeclarationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/OperatorDeclarationTests.cs
deleted file mode 100644
index 049f7f4644..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/OperatorDeclarationTests.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using ICSharpCode.NRefactory.VB.Ast;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class OperatorDeclarationTests
-	{
-		#region VB.NET
-		
-		[Test]
-		public void VBNetImplictOperatorDeclarationTest()
-		{
-			string programm = @"Public Shared Operator + (ByVal v As Complex) As Complex
-					Return v
-				End Operator";
-			
-			OperatorDeclaration od = ParseUtil.ParseTypeMember<OperatorDeclaration>(programm);
-			Assert.IsFalse(od.IsConversionOperator);
-			Assert.AreEqual(1, od.Parameters.Count);
-			Assert.AreEqual(ConversionType.None, od.ConversionType);
-			Assert.AreEqual("Complex", od.TypeReference.Type);
-		}
-		#endregion 
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/PropertyDeclarationTests.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/PropertyDeclarationTests.cs
deleted file mode 100644
index c31f7bb9de..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB.Tests/Parser/TypeLevel/PropertyDeclarationTests.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-using ICSharpCode.NRefactory.VB.Ast;
-using NUnit.Framework;
-
-namespace ICSharpCode.NRefactory.VB.Tests.Ast
-{
-	[TestFixture]
-	public class PropertyDeclarationTests
-	{
-		#region VB.NET
-		[Test]
-		public void VBNetSimpleGetSetPropertyDeclarationTest()
-		{
-			PropertyDeclaration pd = ParseUtil.ParseTypeMember<PropertyDeclaration>("Property MyProperty As Integer \n Get \n End Get \n Set \n End Set\nEnd Property");
-			Assert.AreEqual("MyProperty", pd.Name);
-			Assert.IsTrue(pd.HasGetRegion);
-			Assert.IsTrue(pd.HasSetRegion);
-		}
-		
-		[Test]
-		public void VBNetSimpleGetPropertyDeclarationTest()
-		{
-			PropertyDeclaration pd = ParseUtil.ParseTypeMember<PropertyDeclaration>("ReadOnly Property MyProperty \nGet\nEnd Get\nEnd Property");
-			Assert.AreEqual("MyProperty", pd.Name);
-			Assert.IsTrue(pd.HasGetRegion);
-			Assert.IsFalse(pd.HasSetRegion);
-			Assert.IsTrue((pd.Modifier & Modifiers.ReadOnly) == Modifiers.ReadOnly);
-		}
-		
-		[Test]
-		public void VBNetSimpleSetPropertyDeclarationTest()
-		{
-			PropertyDeclaration pd = ParseUtil.ParseTypeMember<PropertyDeclaration>("WriteOnly Property MyProperty \n Set\nEnd Set\nEnd Property ");
-			Assert.AreEqual("MyProperty", pd.Name);
-			Assert.IsFalse(pd.HasGetRegion);
-			Assert.IsTrue(pd.HasSetRegion);
-			Assert.IsTrue((pd.Modifier & Modifiers.WriteOnly) == Modifiers.WriteOnly);
-		}
-		
-		[Test]
-		public void VBNetAutoPropertyTest()
-		{
-			PropertyDeclaration pd = ParseUtil.ParseTypeMember<PropertyDeclaration>("Property MyProperty");
-			Assert.AreEqual("MyProperty", pd.Name);
-			Assert.IsTrue(pd.HasGetRegion);
-			Assert.IsTrue(pd.HasSetRegion);
-			Assert.AreEqual(pd.Initializer, Expression.Null);
-		}
-		
-		[Test]
-		public void VBNetReadOnlyAutoPropertyTest()
-		{
-			PropertyDeclaration pd = ParseUtil.ParseTypeMember<PropertyDeclaration>("ReadOnly Property MyProperty");
-			Assert.AreEqual("MyProperty", pd.Name);
-			Assert.IsTrue(pd.HasGetRegion);
-			Assert.IsFalse(pd.HasSetRegion);
-			Assert.AreEqual(pd.Initializer, Expression.Null);
-		}
-		
-		[Test]
-		public void VBNetWriteOnlyAutoPropertyTest()
-		{
-			PropertyDeclaration pd = ParseUtil.ParseTypeMember<PropertyDeclaration>("WriteOnly Property MyProperty");
-			Assert.AreEqual("MyProperty", pd.Name);
-			Assert.IsFalse(pd.HasGetRegion);
-			Assert.IsTrue(pd.HasSetRegion);
-			Assert.AreEqual(pd.Initializer, Expression.Null);
-		}
-		
-		[Test]
-		public void VBNetSimpleInitializerAutoPropertyTest()
-		{
-			PropertyDeclaration pd = ParseUtil.ParseTypeMember<PropertyDeclaration>("Property MyProperty = 5");
-			Assert.AreEqual("MyProperty", pd.Name);
-			Assert.IsTrue(pd.HasGetRegion);
-			Assert.IsTrue(pd.HasSetRegion);
-			Assert.AreEqual(pd.Initializer.ToString(), new PrimitiveExpression(5).ToString());
-		}
-		
-		[Test]
-		public void VBNetSimpleInitializerAutoPropertyWithTypeTest()
-		{
-			PropertyDeclaration pd = ParseUtil.ParseTypeMember<PropertyDeclaration>("Property MyProperty As Integer = 5");
-			Assert.AreEqual("MyProperty", pd.Name);
-			Assert.AreEqual("System.Int32", pd.TypeReference.Type);
-			Assert.IsTrue(pd.HasGetRegion);
-			Assert.IsTrue(pd.HasSetRegion);
-			Assert.AreEqual(pd.Initializer.ToString(), new PrimitiveExpression(5).ToString());
-		}
-		
-		[Test]
-		public void VBNetSimpleObjectInitializerAutoPropertyTest()
-		{
-			PropertyDeclaration pd = ParseUtil.ParseTypeMember<PropertyDeclaration>("Property MyProperty As New List");
-			Assert.AreEqual("MyProperty", pd.Name);
-			Assert.AreEqual("List", pd.TypeReference.Type);
-			Assert.IsTrue(pd.HasGetRegion);
-			Assert.IsTrue(pd.HasSetRegion);
-			Assert.AreEqual(pd.Initializer.ToString(), new ObjectCreateExpression(new TypeReference("List"), null).ToString());
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/AstNode.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/AstNode.cs
deleted file mode 100644
index 39b439d74c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/AstNode.cs
+++ /dev/null
@@ -1,559 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB
-{
-	public abstract class AstNode : AbstractAnnotatable, PatternMatching.INode
-	{
-		#region Null
-		public static readonly AstNode Null = new NullAstNode ();
-		
-		sealed class NullAstNode : AstNode
-		{
-			public override bool IsNull {
-				get {
-					return true;
-				}
-			}
-			
-			public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-			{
-				return default (S);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return other == null || other.IsNull;
-			}
-		}
-		#endregion
-		
-		#region PatternPlaceholder
-		public static implicit operator AstNode(PatternMatching.Pattern pattern)
-		{
-			return pattern != null ? new PatternPlaceholder(pattern) : null;
-		}
-		
-		sealed class PatternPlaceholder : AstNode, PatternMatching.INode
-		{
-			readonly PatternMatching.Pattern child;
-			
-			public PatternPlaceholder(PatternMatching.Pattern child)
-			{
-				this.child = child;
-			}
-			
-			public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-			{
-				return visitor.VisitPatternPlaceholder(this, child, data);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return child.DoMatch(other, match);
-			}
-			
-			bool PatternMatching.INode.DoMatchCollection(Role role, PatternMatching.INode pos, PatternMatching.Match match, PatternMatching.BacktrackingInfo backtrackingInfo)
-			{
-				return child.DoMatchCollection(role, pos, match, backtrackingInfo);
-			}
-		}
-		#endregion
-		
-		AstNode parent;
-		AstNode prevSibling;
-		AstNode nextSibling;
-		AstNode firstChild;
-		AstNode lastChild;
-		Role role = RootRole;
-		
-		public virtual bool IsNull {
-			get {
-				return false;
-			}
-		}
-		
-		public virtual TextLocation StartLocation {
-			get {
-				var child = firstChild;
-				if (child == null)
-					return TextLocation.Empty;
-				return child.StartLocation;
-			}
-		}
-		
-		public virtual TextLocation EndLocation {
-			get {
-				var child = lastChild;
-				if (child == null)
-					return TextLocation.Empty;
-				return child.EndLocation;
-			}
-		}
-		
-		public AstNode Parent {
-			get { return parent; }
-		}
-		
-		public Role Role {
-			get { return role; }
-		}
-		
-		public AstNode NextSibling {
-			get { return nextSibling; }
-		}
-		
-		public AstNode PrevSibling {
-			get { return prevSibling; }
-		}
-		
-		public AstNode FirstChild {
-			get { return firstChild; }
-		}
-		
-		public AstNode LastChild {
-			get { return lastChild; }
-		}
-		
-		public IEnumerable<AstNode> Children {
-			get {
-				AstNode next;
-				for (AstNode cur = firstChild; cur != null; cur = next) {
-					Debug.Assert(cur.parent == this);
-					// Remember next before yielding cur.
-					// This allows removing/replacing nodes while iterating through the list.
-					next = cur.nextSibling;
-					yield return cur;
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Gets the ancestors of this node (excluding this node itself)
-		/// </summary>
-		public IEnumerable<AstNode> Ancestors {
-			get {
-				for (AstNode cur = parent; cur != null; cur = cur.parent) {
-					yield return cur;
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Gets all descendants of this node (excluding this node itself).
-		/// </summary>
-		public IEnumerable<AstNode> Descendants {
-			get {
-				return Utils.TreeTraversal.PreOrder(this.Children, n => n.Children);
-			}
-		}
-		
-		/// <summary>
-		/// Gets all descendants of this node (including this node itself).
-		/// </summary>
-		public IEnumerable<AstNode> DescendantsAndSelf {
-			get {
-				return Utils.TreeTraversal.PreOrder(this, n => n.Children);
-			}
-		}
-		
-		/// <summary>
-		/// Gets the first child with the specified role.
-		/// Returns the role's null object if the child is not found.
-		/// </summary>
-		public T GetChildByRole<T>(Role<T> role) where T : AstNode
-		{
-			if (role == null)
-				throw new ArgumentNullException("role");
-			for (var cur = firstChild; cur != null; cur = cur.nextSibling) {
-				if (cur.role == role)
-					return (T)cur;
-			}
-			return role.NullObject;
-		}
-		
-		public AstNodeCollection<T> GetChildrenByRole<T>(Role<T> role) where T : AstNode
-		{
-			return new AstNodeCollection<T>(this, role);
-		}
-		
-		protected void SetChildByRole<T>(Role<T> role, T newChild) where T : AstNode
-		{
-			AstNode oldChild = GetChildByRole(role);
-			if (oldChild.IsNull)
-				AddChild(newChild, role);
-			else
-				oldChild.ReplaceWith(newChild);
-		}
-		
-		public void AddChild<T>(T child, Role<T> role) where T : AstNode
-		{
-			if (role == null)
-				throw new ArgumentNullException("role");
-			if (child == null || child.IsNull)
-				return;
-			if (this.IsNull)
-				throw new InvalidOperationException("Cannot add children to null nodes");
-			if (child.parent != null)
-				throw new ArgumentException ("Node is already used in another tree.", "child");
-			AddChildUnsafe(child, role);
-		}
-		
-		internal void AddChildUntyped(AstNode child, Role role)
-		{
-			if (role == null)
-				throw new ArgumentNullException("role");
-			if (child == null || child.IsNull)
-				return;
-			if (this.IsNull)
-				throw new InvalidOperationException("Cannot add children to null nodes");
-			if (child.parent != null)
-				throw new ArgumentException ("Node is already used in another tree.", "child");
-			AddChildUnsafe(child, role);
-		}
-		
-		/// <summary>
-		/// Adds a child without performing any safety checks.
-		/// </summary>
-		void AddChildUnsafe(AstNode child, Role role)
-		{
-			child.parent = this;
-			child.role = role;
-			if (firstChild == null) {
-				lastChild = firstChild = child;
-			} else {
-				lastChild.nextSibling = child;
-				child.prevSibling = lastChild;
-				lastChild = child;
-			}
-		}
-		
-		public void InsertChildBefore<T>(AstNode nextSibling, T child, Role<T> role) where T : AstNode
-		{
-			if (role == null)
-				throw new ArgumentNullException("role");
-			if (nextSibling == null || nextSibling.IsNull) {
-				AddChild(child, role);
-				return;
-			}
-			
-			if (child == null || child.IsNull)
-				return;
-			if (child.parent != null)
-				throw new ArgumentException ("Node is already used in another tree.", "child");
-			if (nextSibling.parent != this)
-				throw new ArgumentException ("NextSibling is not a child of this node.", "nextSibling");
-			// No need to test for "Cannot add children to null nodes",
-			// as there isn't any valid nextSibling in null nodes.
-			InsertChildBeforeUnsafe(nextSibling, child, role);
-		}
-		
-		
-		void InsertChildBeforeUnsafe(AstNode nextSibling, AstNode child, Role role)
-		{
-			child.parent = this;
-			child.role = role;
-			child.nextSibling = nextSibling;
-			child.prevSibling = nextSibling.prevSibling;
-			
-			if (nextSibling.prevSibling != null) {
-				Debug.Assert(nextSibling.prevSibling.nextSibling == nextSibling);
-				nextSibling.prevSibling.nextSibling = child;
-			} else {
-				Debug.Assert(firstChild == nextSibling);
-				firstChild = child;
-			}
-			nextSibling.prevSibling = child;
-		}
-		
-		public void InsertChildAfter<T>(AstNode prevSibling, T child, Role<T> role) where T : AstNode
-		{
-			InsertChildBefore((prevSibling == null || prevSibling.IsNull) ? firstChild : prevSibling.nextSibling, child, role);
-		}
-		
-		/// <summary>
-		/// Removes this node from its parent.
-		/// </summary>
-		public void Remove()
-		{
-			if (parent != null) {
-				if (prevSibling != null) {
-					Debug.Assert(prevSibling.nextSibling == this);
-					prevSibling.nextSibling = nextSibling;
-				} else {
-					Debug.Assert(parent.firstChild == this);
-					parent.firstChild = nextSibling;
-				}
-				if (nextSibling != null) {
-					Debug.Assert(nextSibling.prevSibling == this);
-					nextSibling.prevSibling = prevSibling;
-				} else {
-					Debug.Assert(parent.lastChild == this);
-					parent.lastChild = prevSibling;
-				}
-				parent = null;
-				role = Roles.Root;
-				prevSibling = null;
-				nextSibling = null;
-			}
-		}
-		
-		/// <summary>
-		/// Replaces this node with the new node.
-		/// </summary>
-		public void ReplaceWith(AstNode newNode)
-		{
-			if (newNode == null || newNode.IsNull) {
-				Remove();
-				return;
-			}
-			if (newNode == this)
-				return; // nothing to do...
-			if (parent == null) {
-				throw new InvalidOperationException(this.IsNull ? "Cannot replace the null nodes" : "Cannot replace the root node");
-			}
-			// Because this method doesn't statically check the new node's type with the role,
-			// we perform a runtime test:
-			if (!role.IsValid(newNode)) {
-				throw new ArgumentException (string.Format("The new node '{0}' is not valid in the role {1}", newNode.GetType().Name, role.ToString()), "newNode");
-			}
-			if (newNode.parent != null) {
-				// newNode is used within this tree?
-				if (newNode.Ancestors.Contains(this)) {
-					// e.g. "parenthesizedExpr.ReplaceWith(parenthesizedExpr.Expression);"
-					// enable automatic removal
-					newNode.Remove();
-				} else {
-					throw new ArgumentException ("Node is already used in another tree.", "newNode");
-				}
-			}
-			
-			newNode.parent = parent;
-			newNode.role = role;
-			newNode.prevSibling = prevSibling;
-			newNode.nextSibling = nextSibling;
-			if (parent != null) {
-				if (prevSibling != null) {
-					Debug.Assert(prevSibling.nextSibling == this);
-					prevSibling.nextSibling = newNode;
-				} else {
-					Debug.Assert(parent.firstChild == this);
-					parent.firstChild = newNode;
-				}
-				if (nextSibling != null) {
-					Debug.Assert(nextSibling.prevSibling == this);
-					nextSibling.prevSibling = newNode;
-				} else {
-					Debug.Assert(parent.lastChild == this);
-					parent.lastChild = newNode;
-				}
-				parent = null;
-				prevSibling = null;
-				nextSibling = null;
-				role = Roles.Root;
-			}
-		}
-		
-		public AstNode ReplaceWith(Func<AstNode, AstNode> replaceFunction)
-		{
-			if (replaceFunction == null)
-				throw new ArgumentNullException("replaceFunction");
-			if (parent == null) {
-				throw new InvalidOperationException(this.IsNull ? "Cannot replace the null nodes" : "Cannot replace the root node");
-			}
-			AstNode oldParent = parent;
-			AstNode oldSuccessor = nextSibling;
-			Role oldRole = role;
-			Remove();
-			AstNode replacement = replaceFunction(this);
-			if (oldSuccessor != null && oldSuccessor.parent != oldParent)
-				throw new InvalidOperationException("replace function changed nextSibling of node being replaced?");
-			if (!(replacement == null || replacement.IsNull)) {
-				if (replacement.parent != null)
-					throw new InvalidOperationException("replace function must return the root of a tree");
-				if (!oldRole.IsValid(replacement)) {
-					throw new InvalidOperationException (string.Format("The new node '{0}' is not valid in the role {1}", replacement.GetType().Name, oldRole.ToString()));
-				}
-				
-				if (oldSuccessor != null)
-					oldParent.InsertChildBeforeUnsafe(oldSuccessor, replacement, oldRole);
-				else
-					oldParent.AddChildUnsafe(replacement, oldRole);
-			}
-			return replacement;
-		}
-		
-		/// <summary>
-		/// Clones the whole subtree starting at this AST node.
-		/// </summary>
-		/// <remarks>Annotations are copied over to the new nodes; and any annotations implementating ICloneable will be cloned.</remarks>
-		public AstNode Clone()
-		{
-			AstNode copy = (AstNode)MemberwiseClone();
-			// First, reset the shallow pointer copies
-			copy.parent = null;
-			copy.role = Roles.Root;
-			copy.firstChild = null;
-			copy.lastChild = null;
-			copy.prevSibling = null;
-			copy.nextSibling = null;
-			
-			// Then perform a deep copy:
-			for (AstNode cur = firstChild; cur != null; cur = cur.nextSibling) {
-				copy.AddChildUnsafe(cur.Clone(), cur.role);
-			}
-			
-			// Finally, clone the annotation, if necessary
-			copy.CloneAnnotations();
-			
-			return copy;
-		}
-		
-		public override void AddAnnotation (object annotation)
-		{
-			if (this.IsNull)
-				throw new InvalidOperationException("Cannot add annotations to the null node");
-			base.AddAnnotation (annotation);
-		}
-		
-		public abstract S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data);
-		
-		#region Pattern Matching
-		protected static bool MatchString(string name1, string name2)
-		{
-			return string.IsNullOrEmpty(name1) || string.Equals(name1, name2, StringComparison.OrdinalIgnoreCase);
-		}
-		
-		protected static bool MatchStringXml(string name1, string name2)
-		{
-			return string.IsNullOrEmpty(name1) || string.Equals(name1, name2, StringComparison.Ordinal);
-		}
-		
-		protected internal abstract bool DoMatch(AstNode other, PatternMatching.Match match);
-		
-		bool PatternMatching.INode.DoMatch(PatternMatching.INode other, PatternMatching.Match match)
-		{
-			AstNode o = other as AstNode;
-			// try matching if other is null, or if other is an AstNode
-			return (other == null || o != null) && DoMatch(o, match);
-		}
-		
-		bool PatternMatching.INode.DoMatchCollection(Role role, PatternMatching.INode pos, PatternMatching.Match match, PatternMatching.BacktrackingInfo backtrackingInfo)
-		{
-			AstNode o = pos as AstNode;
-			return (pos == null || o != null) && DoMatch (o, match);
-		}
-		
-		PatternMatching.INode PatternMatching.INode.NextSibling {
-			get { return nextSibling; }
-		}
-		
-		PatternMatching.INode PatternMatching.INode.FirstChild {
-			get { return firstChild; }
-		}
-		#endregion
-		
-		public AstNode GetNextNode ()
-		{
-			if (NextSibling != null)
-				return NextSibling;
-			if (Parent != null)
-				return Parent.GetNextNode ();
-			return null;
-		}
-
-		public AstNode GetPrevNode ()
-		{
-			if (PrevSibling != null)
-				return PrevSibling;
-			if (Parent != null)
-				return Parent.GetPrevNode ();
-			return null;
-		}
-		
-		// filters all non VB nodes (comments, white spaces or pre processor directives)
-		public AstNode GetVBNodeBefore (AstNode node)
-		{
-			var n = node.PrevSibling;
-			while (n != null) {
-				if (n.Role != Roles.Comment)
-					return n;
-				n = n.GetPrevNode ();
-			}
-			return null;
-		}
-		
-		// the Root role must be available when creating the null nodes, so we can't put it in the Roles class
-		static readonly Role<AstNode> RootRole = new Role<AstNode>("Root");
-		
-		public static class Roles
-		{
-			/// <summary>
-			/// Root of an abstract syntax tree.
-			/// </summary>
-			public static readonly Role<AstNode> Root = RootRole;
-			
-			// some pre defined constants for common roles
-			public static readonly Role<Identifier> Identifier = new Role<Identifier>("Identifier", Ast.Identifier.Null);
-			public static readonly Role<XmlIdentifier> XmlIdentifier = new Role<XmlIdentifier>("XmlIdentifier", Ast.XmlIdentifier.Null);
-			public static readonly Role<XmlLiteralString> XmlLiteralString = new Role<XmlLiteralString>("XmlLiteralString", Ast.XmlLiteralString.Null);
-			
-			public static readonly Role<BlockStatement> Body = new Role<BlockStatement>("Body", Ast.BlockStatement.Null);
-			public static readonly Role<ParameterDeclaration> Parameter = new Role<ParameterDeclaration>("Parameter");
-			public static readonly Role<Expression> Argument = new Role<Expression>("Argument", Ast.Expression.Null);
-			public static readonly Role<AstType> Type = new Role<AstType>("Type", AstType.Null);
-			public static readonly Role<Expression> Expression = new Role<Expression>("Expression", Ast.Expression.Null);
-			public static readonly Role<Expression> TargetExpression = new Role<Expression>("Target", Ast.Expression.Null);
-			public readonly static Role<Expression> Condition = new Role<Expression>("Condition", Ast.Expression.Null);
-//
-			public static readonly Role<TypeParameterDeclaration> TypeParameter = new Role<TypeParameterDeclaration>("TypeParameter");
-			public static readonly Role<AstType> TypeArgument = new Role<AstType>("TypeArgument", AstType.Null);
-//			public static readonly Role<VariableInitializer> Variable = new Role<VariableInitializer>("Variable");
-//			public static readonly Role<Statement> EmbeddedStatement = new Role<Statement>("EmbeddedStatement", CSharp.Statement.Null);
-//
-			public static readonly Role<VBTokenNode> Keyword = new Role<VBTokenNode>("Keyword", VBTokenNode.Null);
-//			public static readonly Role<VBTokenNode> InKeyword = new Role<VBTokenNode>("InKeyword", VBTokenNode.Null);
-			
-			// some pre defined constants for most used punctuation
-			public static readonly Role<VBTokenNode> LPar = new Role<VBTokenNode>("LPar", VBTokenNode.Null);
-			public static readonly Role<VBTokenNode> RPar = new Role<VBTokenNode>("RPar", VBTokenNode.Null);
-			public static readonly Role<VBTokenNode> LBracket = new Role<VBTokenNode>("LBracket", VBTokenNode.Null);
-			public static readonly Role<VBTokenNode> RBracket = new Role<VBTokenNode>("RBracket", VBTokenNode.Null);
-			public static readonly Role<VBTokenNode> LBrace = new Role<VBTokenNode>("LBrace", VBTokenNode.Null);
-			public static readonly Role<VBTokenNode> RBrace = new Role<VBTokenNode>("RBrace", VBTokenNode.Null);
-			public static readonly Role<VBTokenNode> LChevron = new Role<VBTokenNode>("LChevron", VBTokenNode.Null);
-			public static readonly Role<VBTokenNode> RChevron = new Role<VBTokenNode>("RChevron", VBTokenNode.Null);
-			public static readonly Role<VBTokenNode> Comma = new Role<VBTokenNode>("Comma", VBTokenNode.Null);
-			public static readonly Role<VBTokenNode> QuestionMark = new Role<VBTokenNode>("QuestionMark", VBTokenNode.Null);
-			public static readonly Role<VBTokenNode> Dot = new Role<VBTokenNode>("Dot", VBTokenNode.Null);
-			public static readonly Role<VBTokenNode> Semicolon = new Role<VBTokenNode>("Semicolon", VBTokenNode.Null);
-			public static readonly Role<VBTokenNode> Assign = new Role<VBTokenNode>("Assign", VBTokenNode.Null);
-			public static readonly Role<VBTokenNode> Colon = new Role<VBTokenNode>("Colon", VBTokenNode.Null);
-			public static readonly Role<VBTokenNode> StatementTerminator = new Role<VBTokenNode>("StatementTerminator", VBTokenNode.Null);
-			
-			// XML
-			/// <summary>
-			/// Text: &lt;
-			/// </summary>
-			public static readonly Role<VBTokenNode> XmlOpenTag = new Role<VBTokenNode>("XmlOpenTag", VBTokenNode.Null);
-			/// <summary>
-			/// Text: &gt;
-			/// </summary>
-			public static readonly Role<VBTokenNode> XmlCloseTag = new Role<VBTokenNode>("XmlOpenTag", VBTokenNode.Null);
-			
-			public static readonly Role<Comment> Comment = new Role<Comment>("Comment");
-			
-		}
-	}
-	
-
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/AstNodeCollection.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/AstNodeCollection.cs
deleted file mode 100644
index aa91bb5c9c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/AstNodeCollection.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-
-using ICSharpCode.NRefactory.PatternMatching;
-
-namespace ICSharpCode.NRefactory.VB
-{
-	/// <summary>
-	/// Represents the children of an AstNode that have a specific role.
-	/// </summary>
-	public class AstNodeCollection<T> : ICollection<T> where T : AstNode
-	{
-		readonly AstNode node;
-		readonly Role<T> role;
-		
-		public AstNodeCollection(AstNode node, Role<T> role)
-		{
-			if (node == null)
-				throw new ArgumentNullException("node");
-			if (role == null)
-				throw new ArgumentNullException("role");
-			this.node = node;
-			this.role = role;
-		}
-		
-		public int Count {
-			get {
-				int count = 0;
-				for (AstNode cur = node.FirstChild; cur != null; cur = cur.NextSibling) {
-					if (cur.Role == role)
-						count++;
-				}
-				return count;
-			}
-		}
-		
-		public void Add(T element)
-		{
-			node.AddChild(element, role);
-		}
-		
-		public void AddRange(IEnumerable<T> nodes)
-		{
-			// Evaluate 'nodes' first, since it might change when we add the new children
-			// Example: collection.AddRange(collection);
-			if (nodes != null) {
-				foreach (T node in nodes.ToList())
-					Add(node);
-			}
-		}
-		
-		public void AddRange(T[] nodes)
-		{
-			// Fast overload for arrays - we don't need to create a copy
-			if (nodes != null) {
-				foreach (T node in nodes)
-					Add(node);
-			}
-		}
-		
-		public void ReplaceWith(IEnumerable<T> nodes)
-		{
-			// Evaluate 'nodes' first, since it might change when we call Clear()
-			// Example: collection.ReplaceWith(collection);
-			if (nodes != null)
-				nodes = nodes.ToList();
-			Clear();
-			foreach (T node in nodes)
-				Add(node);
-		}
-		
-		public void MoveTo(ICollection<T> targetCollection)
-		{
-			foreach (T node in this) {
-				node.Remove();
-				targetCollection.Add(node);
-			}
-		}
-		
-		public bool Contains(T element)
-		{
-			return element != null && element.Parent == node && element.Role == role;
-		}
-		
-		public bool Remove(T element)
-		{
-			if (Contains(element)) {
-				element.Remove();
-				return true;
-			} else {
-				return false;
-			}
-		}
-		
-		public void CopyTo(T[] array, int arrayIndex)
-		{
-			foreach (T item in this)
-				array[arrayIndex++] = item;
-		}
-		
-		public void Clear()
-		{
-			foreach (T item in this)
-				item.Remove();
-		}
-		
-		bool ICollection<T>.IsReadOnly {
-			get { return false; }
-		}
-		
-		public IEnumerator<T> GetEnumerator()
-		{
-			AstNode next;
-			for (AstNode cur = node.FirstChild; cur != null; cur = next) {
-				Debug.Assert(cur.Parent == node);
-				// Remember next before yielding cur.
-				// This allows removing/replacing nodes while iterating through the list.
-				next = cur.NextSibling;
-				if (cur.Role == role)
-					yield return (T)cur;
-			}
-		}
-		
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
-		
-		#region Equals and GetHashCode implementation
-		public override int GetHashCode()
-		{
-			return node.GetHashCode() ^ role.GetHashCode();
-		}
-		
-		public override bool Equals(object obj)
-		{
-			AstNodeCollection<T> other = obj as AstNodeCollection<T>;
-			if (other == null)
-				return false;
-			return this.node == other.node && this.role == other.role;
-		}
-		#endregion
-		
-		internal bool DoMatch(AstNodeCollection<T> other, Match match)
-		{
-			// TODO : does not compile (ask Daniel)!
-//			Stack<AstNode> patternStack = new Stack<AstNode>();
-//			Stack<Pattern.PossibleMatch> stack = new Stack<Pattern.PossibleMatch>();
-//			patternStack.Push(this.node.FirstChild);
-//			stack.Push(new Pattern.PossibleMatch(other.node.FirstChild, match.CheckPoint()));
-//			while (stack.Count > 0) {
-//				AstNode cur1 = patternStack.Pop();
-//				AstNode cur2 = stack.Peek().NextOther;
-//				match.RestoreCheckPoint(stack.Pop().Checkpoint);
-//				bool success = true;
-//				while (cur1 != null && success) {
-//					while (cur1 != null && cur1.Role != role)
-//						cur1 = cur1.NextSibling;
-//					while (cur2 != null && cur2.Role != role)
-//						cur2 = cur2.NextSibling;
-//					if (cur1 == null)
-//						break;
-//					
-//					Debug.Assert(stack.Count == patternStack.Count);
-//					success = cur1.DoMatchCollection(role, cur2, match, stack);
-//					Debug.Assert(stack.Count >= patternStack.Count);
-//					while (stack.Count > patternStack.Count)
-//						patternStack.Push(cur1.NextSibling);
-//					
-//					cur1 = cur1.NextSibling;
-//					if (cur2 != null)
-//						cur2 = cur2.NextSibling;
-//				}
-//				while (cur2 != null && cur2.Role != role)
-//					cur2 = cur2.NextSibling;
-//				if (success && cur2 == null)
-//					return true;
-//			}
-			return false;
-		}
-		
-		public void InsertAfter(T existingItem, T newItem)
-		{
-			node.InsertChildAfter(existingItem, newItem, role);
-		}
-		
-		public void InsertBefore(T existingItem, T newItem)
-		{
-			node.InsertChildBefore(existingItem, newItem, role);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Comment.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Comment.cs
deleted file mode 100644
index fc3a600d87..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Comment.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB
-{
-	public class Comment : AstNode
-	{
-		public bool IsDocumentationComment { get; set; }
-		
-		public bool StartsLine {
-			get;
-			set;
-		}
-		
-		public string Content {
-			get;
-			set;
-		}
-		
-		TextLocation startLocation;
-		public override TextLocation StartLocation {
-			get { 
-				return startLocation;
-			}
-		}
-		
-		TextLocation endLocation;
-		public override TextLocation EndLocation {
-			get {
-				return endLocation;
-			}
-		}
-		
-		public Comment (string content, bool isDocumentation = false)
-		{
-			this.IsDocumentationComment = isDocumentation;
-			this.Content = content;
-		}
-		
-		public Comment (bool isDocumentation, TextLocation startLocation, TextLocation endLocation)
-		{
-			this.IsDocumentationComment = isDocumentation;
-			this.startLocation = startLocation;
-			this.endLocation = endLocation;
-		}
-	
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitComment(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			Comment o = other as Comment;
-			return o != null && this.IsDocumentationComment == o.IsDocumentationComment && MatchString(this.Content, o.Content);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Enums.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Enums.cs
deleted file mode 100644
index 02df4d6367..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Enums.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	[Flags]
-	public enum Modifiers
-	{
-		None      = 0x0000,
-		
-		// Accessibility
-		Private   = 0x0001,
-		Friend    = 0x0002,
-		Protected = 0x0004,
-		Public    = 0x0008,
-		
-		// Scope
-		MustInherit     = 0x0010,  // Types
-		MustOverride    = 0x0020,  // Members
-		Overridable     = 0x0040,
-		NotInheritable  = 0x0080,  // Types
-		NotOverridable  = 0x0100,  // Members
-		Const           = 0x0200,
-		Shared          = 0x0400,
-		Static          = 0x0800,
-		Overrides       = 0x1000,
-		ReadOnly        = 0x2000,
-		Shadows         = 0x4000,
-		Partial         = 0x8000,
-		
-		// Special
-		Overloads  = 0x10000, // VB specific
-		WithEvents = 0x20000, // VB specific
-		Default    = 0x40000, // VB specific
-		
-		Dim	   = 0x80000,	// VB.NET SPECIFIC, for fields/local variables only
-		
-		/// <summary>Only for VB properties.</summary>
-		WriteOnly  = 0x100000, // VB specific
-		
-		ByVal      = 0x200000,
-		ByRef      = 0x400000,
-		ParamArray = 0x800000,
-		Optional   = 0x1000000,
-		
-		Narrowing  = 0x2000000,
-		Widening   = 0x4000000,
-		
-		Iterator   = 0x8000000,
-		Async      = 0x10000000,
-		
-		/// <summary>
-		/// Special value used to match any modifiers during pattern matching.
-		/// </summary>
-		Any = unchecked((int)0x80000000)
-	}
-	
-	public enum ParentType
-	{
-		ClassOrStruct,
-		InterfaceOrEnum,
-		Namespace,
-		Unknown
-	}
-	
-	public enum FieldDirection
-	{
-		None,
-		In,
-		Out,
-		Ref
-	}
-	
-	public enum AssignmentOperatorType
-	{
-		None,
-		Assign,
-		
-		Add,
-		Subtract,
-		Multiply,
-		Divide,
-		
-		Power,         // (VB only)
-		DivideInteger, // (VB only)
-		ConcatString,  // (VB only)
-		
-		ShiftLeft,
-		ShiftRight,
-	}
-	
-	public enum ContinueType
-	{
-		None,
-		Do,
-		For,
-		While
-	}
-	
-	public enum ConditionType
-	{
-		None,
-		LoopUntil,
-		LoopWhile,
-		DoUntil,
-		DoWhile
-	}
-	
-	public enum ConversionType
-	{
-		None,
-		Implicit,
-		Explicit
-	}
-	
-	/// <summary>
-	/// Specifies the ordering direction of a QueryExpressionOrdering node.
-	/// </summary>
-	public enum QueryOrderingDirection
-	{
-		None,
-		Ascending,
-		Descending
-	}
-	
-	/// <summary>
-	/// Specifies the partition type for a VB.NET
-	/// query expression.
-	/// </summary>
-	public enum PartitionKind
-	{
-		Take,
-		TakeWhile,
-		Skip,
-		SkipWhile
-	}
-	
-	public enum XmlAxisType
-	{
-		Element, // .
-		Attribute, // .@
-		Descendents // ...
-	}
-	
-	public enum XmlContentType
-	{
-		Comment,
-		Text,
-		CData,
-		ProcessingInstruction
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/AnonymousObjectCreationExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/AnonymousObjectCreationExpression.cs
deleted file mode 100644
index ac3f8d0daa..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/AnonymousObjectCreationExpression.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class AnonymousObjectCreationExpression : Expression
-	{
-		public AstNodeCollection<Expression> Initializer {
-			get { return GetChildrenByRole(Roles.Expression); }
-		}
-		
-		public AnonymousObjectCreationExpression ()
-		{
-		}
-		
-		public AnonymousObjectCreationExpression (IEnumerable<Expression> initializer)
-		{
-			foreach (var ini in initializer) {
-				AddChild (ini, Roles.Expression);
-			}
-		}
-		
-		public AnonymousObjectCreationExpression (params Expression[] initializer) : this ((IEnumerable<Expression>)initializer)
-		{
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitAnonymousObjectCreationExpression(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			var o = other as AnonymousObjectCreationExpression;
-			return o != null && this.Initializer.DoMatch(o.Initializer, match);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ArrayCreateExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ArrayCreateExpression.cs
deleted file mode 100644
index b3f580894f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ArrayCreateExpression.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this
-// software and associated documentation files (the "Software"), to deal in the Software
-// without restriction, including without limitation the rights to use, copy, modify, merge,
-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// New Type[Dimensions]
-	/// </summary>
-	public class ArrayCreateExpression : Expression
-	{
-		public readonly static Role<ArraySpecifier> AdditionalArraySpecifierRole = new Role<ArraySpecifier>("AdditionalArraySpecifier");
-		public readonly static Role<ArrayInitializerExpression> InitializerRole = new Role<ArrayInitializerExpression>("Initializer", ArrayInitializerExpression.Null);
-		
-		public AstType Type {
-			get { return GetChildByRole (Roles.Type); }
-			set { SetChildByRole (Roles.Type, value); }
-		}
-		
-		public AstNodeCollection<Expression> Arguments {
-			get { return GetChildrenByRole (Roles.Argument); }
-		}
-		
-		/// <summary>
-		/// Gets additional array ranks (those without size info).
-		/// Empty for "New Integer(5,1)"; will contain a single element for "New Integer(5)()".
-		/// </summary>
-		public AstNodeCollection<ArraySpecifier> AdditionalArraySpecifiers {
-			get { return GetChildrenByRole(AdditionalArraySpecifierRole); }
-		}
-		
-		public ArrayInitializerExpression Initializer {
-			get { return GetChildByRole (InitializerRole); }
-			set { SetChildByRole (InitializerRole, value); }
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitArrayCreateExpression (this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			ArrayCreateExpression o = other as ArrayCreateExpression;
-			return o != null && this.Type.DoMatch(o.Type, match) && this.Arguments.DoMatch(o.Arguments, match) && this.AdditionalArraySpecifiers.DoMatch(o.AdditionalArraySpecifiers, match) && this.Initializer.DoMatch(o.Initializer, match);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ArrayInitializerExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ArrayInitializerExpression.cs
deleted file mode 100644
index 785f2c19b1..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ArrayInitializerExpression.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// { Elements }
-	/// </summary>
-	public class ArrayInitializerExpression : Expression
-	{
-		#region Null
-		public new static readonly ArrayInitializerExpression Null = new NullArrayInitializerExpression ();
-		
-		sealed class NullArrayInitializerExpression : ArrayInitializerExpression
-		{
-			public override bool IsNull {
-				get {
-					return true;
-				}
-			}
-			
-			public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-			{
-				return default (S);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return other == null || other.IsNull;
-			}
-		}
-		#endregion
-		
-		public readonly static Role<ArrayInitializerExpression> InitializerRole = new Role<ArrayInitializerExpression>("Initializer", ArrayInitializerExpression.Null);
-		
-		public AstNodeCollection<Expression> Elements {
-			get { return GetChildrenByRole(Roles.Expression); }
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitArrayInitializerExpression (this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			ArrayInitializerExpression o = other as ArrayInitializerExpression;
-			return o != null && this.Elements.DoMatch(o.Elements, match);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/AssignmentExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/AssignmentExpression.cs
deleted file mode 100644
index bab517a579..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/AssignmentExpression.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class AssignmentExpression : Expression
-	{
-		public readonly static Role<Expression> LeftExpressionRole = BinaryOperatorExpression.LeftExpressionRole;
-		public readonly static Role<VBTokenNode> OperatorRole = BinaryOperatorExpression.OperatorRole;
-		public readonly static Role<Expression> RightExpressionRole = BinaryOperatorExpression.RightExpressionRole;
-		
-		public AssignmentExpression(Expression left, AssignmentOperatorType type, Expression right)
-		{
-			AddChild(left, LeftExpressionRole);
-			AddChild(right, RightExpressionRole);
-			Operator = type;
-		}
-		
-		public Expression Left {
-			get { return GetChildByRole(LeftExpressionRole); }
-			set { SetChildByRole(LeftExpressionRole, value); }
-		}
-		
-		public AssignmentOperatorType Operator { get; set; }
-		
-		public Expression Right {
-			get { return GetChildByRole(RightExpressionRole); }
-			set { SetChildByRole(RightExpressionRole, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitAssignmentExpression(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/BinaryOperatorExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/BinaryOperatorExpression.cs
deleted file mode 100644
index b83a0909fe..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/BinaryOperatorExpression.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class BinaryOperatorExpression : Expression
-	{
-		public readonly static Role<Expression> LeftExpressionRole = new Role<Expression>("Left");
-		public readonly static Role<VBTokenNode> OperatorRole = new Role<VBTokenNode>("Operator");
-		public readonly static Role<Expression> RightExpressionRole = new Role<Expression>("Right");
-		
-		public BinaryOperatorExpression(Expression left, BinaryOperatorType type, Expression right)
-		{
-			AddChild(left, LeftExpressionRole);
-			AddChild(right, RightExpressionRole);
-			Operator = type;
-		}
-		
-		public Expression Left {
-			get { return GetChildByRole(LeftExpressionRole); }
-			set { SetChildByRole(LeftExpressionRole, value); }
-		}
-		
-		public BinaryOperatorType Operator { get; set; }
-		
-		public Expression Right {
-			get { return GetChildByRole(RightExpressionRole); }
-			set { SetChildByRole(RightExpressionRole, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitBinaryOperatorExpression(this, data);
-		}
-	}
-	
-		public enum BinaryOperatorType
-	{
-		None,
-		
-		/// <summary>'&amp;' in C#, 'And' in VB.</summary>
-		BitwiseAnd,
-		/// <summary>'|' in C#, 'Or' in VB.</summary>
-		BitwiseOr,
-		/// <summary>'&amp;&amp;' in C#, 'AndAlso' in VB.</summary>
-		LogicalAnd,
-		/// <summary>'||' in C#, 'OrElse' in VB.</summary>
-		LogicalOr,
-		/// <summary>'^' in C#, 'Xor' in VB.</summary>
-		ExclusiveOr,
-		
-		/// <summary>&gt;</summary>
-		GreaterThan,
-		/// <summary>&gt;=</summary>
-		GreaterThanOrEqual,
-		/// <summary>'==' in C#, '=' in VB.</summary>
-		Equality,
-		/// <summary>'!=' in C#, '&lt;&gt;' in VB.</summary>
-		InEquality,
-		/// <summary>&lt;</summary>
-		LessThan,
-		/// <summary>&lt;=</summary>
-		LessThanOrEqual,
-		
-		/// <summary>+</summary>
-		Add,
-		/// <summary>-</summary>
-		Subtract,
-		/// <summary>*</summary>
-		Multiply,
-		/// <summary>/</summary>
-		Divide,
-		/// <summary>'%' in C#, 'Mod' in VB.</summary>
-		Modulus,
-		/// <summary>VB-only: \</summary>
-		DivideInteger,
-		/// <summary>VB-only: ^</summary>
-		Power,
-		/// <summary>VB-only: &amp;</summary>
-		Concat,
-		
-		/// <summary>C#: &lt;&lt;</summary>
-		ShiftLeft,
-		/// <summary>C#: &gt;&gt;</summary>
-		ShiftRight,
-		/// <summary>VB-only: Is</summary>
-		ReferenceEquality,
-		/// <summary>VB-only: IsNot</summary>
-		ReferenceInequality,
-		
-		/// <summary>VB-only: Like</summary>
-		Like,
-		/// <summary>
-		/// 	C#: ??
-		/// 	VB: IF(x, y)
-		/// </summary>
-		NullCoalescing,
-		
-		/// <summary>VB-only: !</summary>
-		DictionaryAccess
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/CastExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/CastExpression.cs
deleted file mode 100644
index 5cdbd3fa63..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/CastExpression.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this
-// software and associated documentation files (the "Software"), to deal in the Software
-// without restriction, including without limitation the rights to use, copy, modify, merge,
-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// CastType(Expression, AstType)
-	/// </summary>
-	public class CastExpression : Expression
-	{
-		public CastType CastType { get; set; }
-		
-		public VBTokenNode CastTypeToken {
-			get { return GetChildByRole (Roles.Keyword); }
-		}
-		
-		public AstType Type {
-			get { return GetChildByRole (Roles.Type); }
-			set { SetChildByRole (Roles.Type, value); }
-		}
-		
-		public Expression Expression {
-			get { return GetChildByRole (Roles.Expression); }
-			set { SetChildByRole (Roles.Expression, value); }
-		}
-		
-		public CastExpression ()
-		{
-		}
-		
-		public CastExpression (CastType castType, AstType castToType, Expression expression)
-		{
-			CastType = castType;
-			AddChild (castToType, Roles.Type);
-			AddChild (expression, Roles.Expression);
-		}
-		
-		public CastExpression (CastType castType, Expression expression)
-		{
-			CastType = castType;
-			AddChild (expression, Roles.Expression);
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitCastExpression (this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			CastExpression o = other as CastExpression;
-			return o != null && this.CastType == o.CastType && this.Type.DoMatch(o.Type, match) && this.Expression.DoMatch(o.Expression, match);
-		}
-	}
-	
-	public enum CastType
-	{
-		DirectCast,
-		TryCast,
-		CType,
-		CBool,
-		CByte,
-		CChar,
-		CDate,
-		CDec,
-		CDbl,
-		CInt,
-		CLng,
-		CObj,
-		CSByte,
-		CShort,
-		CSng,
-		CStr,
-		CUInt,
-		CULng,
-		CUShort
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/CollectionRangeVariableDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/CollectionRangeVariableDeclaration.cs
deleted file mode 100644
index 711341d0cd..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/CollectionRangeVariableDeclaration.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Identifier As Type In Expression
-	/// </summary>
-	public class CollectionRangeVariableDeclaration : AstNode
-	{
-		public static readonly Role<CollectionRangeVariableDeclaration> CollectionRangeVariableDeclarationRole = new Role<CollectionRangeVariableDeclaration>("CollectionRangeVariableDeclaration");
-		
-		public VariableIdentifier Identifier {
-			get { return GetChildByRole(VariableIdentifier.VariableIdentifierRole); }
-			set { SetChildByRole(VariableIdentifier.VariableIdentifierRole, value); }
-		}
-		
-		public AstType Type {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-		
-		public Expression Expression {
-			get { return GetChildByRole (Roles.Expression); }
-			set { SetChildByRole (Roles.Expression, value); }
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitCollectionRangeVariableDeclaration(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			CollectionRangeVariableDeclaration o = other as CollectionRangeVariableDeclaration;
-			return o != null && this.Identifier.DoMatch(o.Identifier, match) && this.Type.DoMatch(o.Type, match) && this.Expression.DoMatch(o.Expression, match);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ConditionalExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ConditionalExpression.cs
deleted file mode 100644
index 4b53d56633..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ConditionalExpression.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class ConditionalExpression : Expression
-	{
-		public readonly static Role<Expression> ConditionExpressionRole = new Role<Expression>("ConditionExpressionRole", Expression.Null);
-		public readonly static Role<Expression> TrueExpressionRole = new Role<Expression>("TrueExpressionRole", Expression.Null);
-		public readonly static Role<Expression> FalseExpressionRole = new Role<Expression>("FalseExpressionRole", Expression.Null);
-		
-		public VBTokenNode IfToken {
-			get { return GetChildByRole (Roles.Keyword); }
-		}
-		
-		public Expression ConditionExpression {
-			get { return GetChildByRole (ConditionExpressionRole); }
-			set { SetChildByRole (ConditionExpressionRole, value); }
-		}
-		
-		public Expression TrueExpression {
-			get { return GetChildByRole (TrueExpressionRole); }
-			set { SetChildByRole (TrueExpressionRole, value); }
-		}
-		
-		public Expression FalseExpression {
-			get { return GetChildByRole (FalseExpressionRole); }
-			set { SetChildByRole (FalseExpressionRole, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitConditionalExpression(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/EmptyExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/EmptyExpression.cs
deleted file mode 100644
index 01b2f140e9..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/EmptyExpression.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this
-// software and associated documentation files (the "Software"), to deal in the Software
-// without restriction, including without limitation the rights to use, copy, modify, merge,
-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class EmptyExpression : Expression
-	{
-		TextLocation location;
-	
-		public override TextLocation StartLocation {
-			get {
-				return location;
-			}
-		}
-	
-		public override TextLocation EndLocation {
-			get {
-				return location;
-			}
-		}
-	
-		public EmptyExpression()
-		{
-		}
-	
-		public EmptyExpression(TextLocation location)
-		{
-			this.location = location;
-		}
-	
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitEmptyExpression(this, data);
-		}
-	
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			var o = other as EmptyExpression;
-			return o != null;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/Expression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/Expression.cs
deleted file mode 100644
index dad5cd9332..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/Expression.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public abstract class Expression : AstNode
-	{
-		#region Null
-		public new static readonly Expression Null = new NullExpression ();
-		
-		sealed class NullExpression : Expression
-		{
-			public override bool IsNull {
-				get {
-					return true;
-				}
-			}
-			
-			public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-			{
-				return default (S);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return other == null || other.IsNull;
-			}
-		}
-		#endregion
-		
-		#region Builder methods
-		/// <summary>
-		/// Builds an member reference expression using this expression as target.
-		/// </summary>
-		public MemberAccessExpression Member(string memberName)
-		{
-			return new MemberAccessExpression { Target = this, MemberName = memberName };
-		}
-		
-		/// <summary>
-		/// Builds an invocation expression using this expression as target.
-		/// </summary>
-		public InvocationExpression Invoke(string methodName, IEnumerable<Expression> arguments)
-		{
-			return Invoke(methodName, null, arguments);
-		}
-		
-		/// <summary>
-		/// Builds an invocation expression using this expression as target.
-		/// </summary>
-		public InvocationExpression Invoke(string methodName, params Expression[] arguments)
-		{
-			return Invoke(methodName, null, arguments);
-		}
-		
-		/// <summary>
-		/// Builds an invocation expression using this expression as target.
-		/// </summary>
-		public InvocationExpression Invoke(string methodName, IEnumerable<AstType> typeArguments, IEnumerable<Expression> arguments)
-		{
-			InvocationExpression ie = new InvocationExpression();
-			MemberAccessExpression mre = new MemberAccessExpression();
-			mre.Target = this;
-			mre.MemberName = methodName;
-			mre.TypeArguments.AddRange(typeArguments);
-			ie.Target = mre;
-			ie.Arguments.AddRange(arguments);
-			return ie;
-		}
-		
-		/// <summary>
-		/// Builds an invocation expression using this expression as target.
-		/// </summary>
-		public InvocationExpression Invoke(IEnumerable<Expression> arguments)
-		{
-			InvocationExpression ie = new InvocationExpression();
-			ie.Target = this;
-			ie.Arguments.AddRange(arguments);
-			return ie;
-		}
-		
-		/// <summary>
-		/// Builds an invocation expression using this expression as target.
-		/// </summary>
-		public InvocationExpression Invoke(params Expression[] arguments)
-		{
-			InvocationExpression ie = new InvocationExpression();
-			ie.Target = this;
-			ie.Arguments.AddRange(arguments);
-			return ie;
-		}
-		
-		public CastExpression CastTo(AstType type)
-		{
-			return new CastExpression { CastType = CastType.CType, Type = type,  Expression = this };
-		}
-		
-		public CastExpression CastTo(Type type)
-		{
-			return new CastExpression { CastType = CastType.CType, Type = AstType.Create(type),  Expression = this };
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/FieldInitializerExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/FieldInitializerExpression.cs
deleted file mode 100644
index bc77666c8a..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/FieldInitializerExpression.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// [ Key ] .Identifier = Expression
-	/// </summary>
-	public class FieldInitializerExpression : Expression
-	{
-		public bool IsKey { get; set; }
-		
-		public VBTokenNode KeyToken {
-			get { return GetChildByRole (Roles.Keyword); }
-		}
-		
-		public VBTokenNode DotToken {
-			get { return GetChildByRole (Roles.Dot); }
-		}
-		
-		public Identifier Identifier {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		public VBTokenNode AssignToken {
-			get { return GetChildByRole (Roles.Assign); }
-		}
-		
-		public Expression Expression {
-			get { return GetChildByRole (Roles.Expression); }
-			set { SetChildByRole (Roles.Expression, value); }
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitFieldInitializerExpression(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			FieldInitializerExpression o = other as FieldInitializerExpression;
-			return o != null && this.IsKey == o.IsKey && this.Identifier.DoMatch(o.Identifier, match) && this.Expression.DoMatch(o.Expression, match);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/GetTypeExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/GetTypeExpression.cs
deleted file mode 100644
index 573d1cf8b3..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/GetTypeExpression.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class GetTypeExpression : Expression
-	{
-		public GetTypeExpression()
-		{
-		}
-		
-		public AstType Type {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var expr = other as GetTypeExpression;
-			return expr != null &&
-				Type.DoMatch(expr.Type, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitGetTypeExpression(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/GetXmlNamespaceExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/GetXmlNamespaceExpression.cs
deleted file mode 100644
index 390281d3f6..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/GetXmlNamespaceExpression.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class GetXmlNamespaceExpression : Expression
-	{
-		public GetXmlNamespaceExpression(XmlIdentifier namespaceName)
-		{
-			SetChildByRole(Roles.XmlIdentifier, namespaceName);
-		}
-		
-		public XmlIdentifier NamespaceName {
-			get { return GetChildByRole(Roles.XmlIdentifier); }
-			set { SetChildByRole(Roles.XmlIdentifier, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var expr = other as GetXmlNamespaceExpression;
-			return expr != null &&
-				NamespaceName.DoMatch(expr.NamespaceName, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitGetXmlNamespaceExpression(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/IdentifierExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/IdentifierExpression.cs
deleted file mode 100644
index 6bd77cb9bd..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/IdentifierExpression.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class IdentifierExpression : Expression
-	{
-		public IdentifierExpression()
-		{
-			
-		}
-		
-		public IdentifierExpression(Identifier identifier)
-		{
-			this.Identifier = identifier;
-		}
-		
-		public Identifier Identifier {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		public AstNodeCollection<AstType> TypeArguments {
-			get { return GetChildrenByRole(Roles.TypeArgument); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitIdentifierExpression(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/InstanceExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/InstanceExpression.cs
deleted file mode 100644
index 321d387e93..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/InstanceExpression.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Description of InstanceExpression.
-	/// </summary>
-	public class InstanceExpression : Expression
-	{
-		TextLocation location;
-		
-		public InstanceExpression(InstanceExpressionType type, TextLocation location)
-		{
-			this.Type = type;
-			this.location = location;
-		}
-		
-		public override TextLocation StartLocation {
-			get { return location; }
-		}
-		
-		public override TextLocation EndLocation {
-			get {
-				switch (Type) {
-					case InstanceExpressionType.Me:
-						return new TextLocation(location.Line, location.Column + "Me".Length);
-					case InstanceExpressionType.MyBase:
-						return new TextLocation(location.Line, location.Column + "MyBase".Length);
-					case InstanceExpressionType.MyClass:
-						return new TextLocation(location.Line, location.Column + "MyClass".Length);
-					default:
-						throw new Exception("Invalid value for InstanceExpressionType");
-				}
-			}
-		}
-		
-		public InstanceExpressionType Type { get; set; }
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var expr = other as InstanceExpression;
-			return expr != null &&
-				Type == expr.Type;
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitInstanceExpression(this, data);
-		}
-	}
-	
-	public enum InstanceExpressionType
-	{
-		Me,
-		MyBase,
-		MyClass
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/InvocationExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/InvocationExpression.cs
deleted file mode 100644
index 6a81c0376d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/InvocationExpression.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Target(Arguments)
-	/// </summary>
-	public class InvocationExpression : Expression
-	{
-		public Expression Target {
-			get { return GetChildByRole (Roles.TargetExpression); }
-			set { SetChildByRole(Roles.TargetExpression, value); }
-		}
-		
-		public AstNodeCollection<Expression> Arguments {
-			get { return GetChildrenByRole<Expression>(Roles.Argument); }
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitInvocationExpression(this, data);
-		}
-		
-		public InvocationExpression ()
-		{
-		}
-		
-		public InvocationExpression (Expression target, IEnumerable<Expression> arguments)
-		{
-			AddChild (target, Roles.TargetExpression);
-			if (arguments != null) {
-				foreach (var arg in arguments) {
-					AddChild (arg, Roles.Argument);
-				}
-			}
-		}
-		
-		public InvocationExpression (Expression target, params Expression[] arguments) : this (target, (IEnumerable<Expression>)arguments)
-		{
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			InvocationExpression o = other as InvocationExpression;
-			return o != null && this.Target.DoMatch(o.Target, match) && this.Arguments.DoMatch(o.Arguments, match);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/LambdaExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/LambdaExpression.cs
deleted file mode 100644
index fe238367b5..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/LambdaExpression.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public abstract class LambdaExpression : Expression
-	{
-		public static readonly Role<VBModifierToken> ModifierRole = AttributedNode.ModifierRole;
-		
-		public LambdaExpressionModifiers Modifiers {
-			get { return GetModifiers(this); }
-			set { SetModifiers(this, value); }
-		}
-		
-		public AstNodeCollection<VBModifierToken> ModifierTokens {
-			get { return GetChildrenByRole (ModifierRole); }
-		}
-		
-		internal static LambdaExpressionModifiers GetModifiers(AstNode node)
-		{
-			LambdaExpressionModifiers m = 0;
-			foreach (VBModifierToken t in node.GetChildrenByRole (ModifierRole)) {
-				m |= (LambdaExpressionModifiers)t.Modifier;
-			}
-			return m;
-		}
-		
-		internal static void SetModifiers(AstNode node, LambdaExpressionModifiers newValue)
-		{
-			LambdaExpressionModifiers oldValue = GetModifiers(node);
-			AstNode insertionPos = null;
-			foreach (Modifiers m in VBModifierToken.AllModifiers) {
-				if ((m & (Modifiers)newValue) != 0) {
-					if ((m & (Modifiers)oldValue) == 0) {
-						// Modifier was added
-						var newToken = new VBModifierToken(TextLocation.Empty, m);
-						node.InsertChildAfter(insertionPos, newToken, ModifierRole);
-						insertionPos = newToken;
-					} else {
-						// Modifier already exists
-						insertionPos = node.GetChildrenByRole(ModifierRole).First(t => t.Modifier == m);
-					}
-				} else {
-					if ((m & (Modifiers)oldValue) != 0) {
-						// Modifier was removed
-						node.GetChildrenByRole (ModifierRole).First(t => t.Modifier == m).Remove();
-					}
-				}
-			}
-		}
-		
-		public AstNodeCollection<ParameterDeclaration> Parameters {
-			get { return GetChildrenByRole(Roles.Parameter); }
-		}
-	}
-	
-	public class SingleLineSubLambdaExpression : LambdaExpression
-	{
-		public static readonly Role<Statement> StatementRole = BlockStatement.StatementRole;
-		
-		public Statement EmbeddedStatement {
-			get { return GetChildByRole(StatementRole); }
-			set { SetChildByRole(StatementRole, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitSingleLineSubLambdaExpression(this, data);
-		}
-	}
-	
-	public class SingleLineFunctionLambdaExpression : LambdaExpression
-	{
-		public Expression EmbeddedExpression {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitSingleLineFunctionLambdaExpression(this, data);
-		}
-	}
-	
-	public class MultiLineLambdaExpression : LambdaExpression
-	{
-		public bool IsSub { get; set; }
-		
-		public BlockStatement Body {
-			get { return GetChildByRole(Roles.Body); }
-			set { SetChildByRole(Roles.Body, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitMultiLineLambdaExpression(this, data);
-		}
-	}
-	
-	public enum LambdaExpressionModifiers
-	{
-		Async = Modifiers.Async,
-		Iterator = Modifiers.Iterator
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/MemberAccessExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/MemberAccessExpression.cs
deleted file mode 100644
index 17e8057750..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/MemberAccessExpression.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class MemberAccessExpression : Expression
-	{
-		public MemberAccessExpression()
-		{
-		}
-		
-		public Expression Target {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		public Identifier MemberName {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		public AstNodeCollection<AstType> TypeArguments {
-			get { return GetChildrenByRole(Roles.TypeArgument); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var expr = other as MemberAccessExpression;
-			return expr != null &&
-				Target.DoMatch(expr.Target, match) &&
-				MemberName.DoMatch(expr.MemberName, match) &&
-				TypeArguments.DoMatch(expr.TypeArguments, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitMemberAccessExpression(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/NamedArgumentExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/NamedArgumentExpression.cs
deleted file mode 100644
index 730eaafafd..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/NamedArgumentExpression.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Represents a named argument passed to a method or attribute.
-	/// </summary>
-	public class NamedArgumentExpression : Expression
-	{
-		public Identifier Identifier {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		public VBTokenNode AssignToken {
-			get { return GetChildByRole (Roles.Assign); }
-		}
-		
-		public Expression Expression {
-			get { return GetChildByRole (Roles.Expression); }
-			set { SetChildByRole (Roles.Expression, value); }
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitNamedArgumentExpression(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			NamedArgumentExpression o = other as NamedArgumentExpression;
-			return o != null && this.Identifier.DoMatch(o.Identifier, match) && this.Expression.DoMatch(o.Expression, match);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ObjectCreationExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ObjectCreationExpression.cs
deleted file mode 100644
index 6e28b292d8..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ObjectCreationExpression.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// New Type(Arguments) { Initializer }
-	/// </summary>
-	public class ObjectCreationExpression : Expression
-	{
-		public readonly static Role<ArrayInitializerExpression> InitializerRole = ArrayInitializerExpression.InitializerRole;
-		
-		public AstType Type {
-			get { return GetChildByRole (Roles.Type); }
-			set { SetChildByRole (Roles.Type, value); }
-		}
-		
-		public AstNodeCollection<Expression> Arguments {
-			get { return GetChildrenByRole (Roles.Argument); }
-		}
-		
-		public ArrayInitializerExpression Initializer {
-			get { return GetChildByRole (InitializerRole); }
-			set { SetChildByRole (InitializerRole, value); }
-		}
-		
-		public ObjectCreationExpression()
-		{
-		}
-		
-		public ObjectCreationExpression (AstType type, IEnumerable<Expression> arguments = null)
-		{
-			AddChild (type, Roles.Type);
-			if (arguments != null) {
-				foreach (var arg in arguments) {
-					AddChild (arg, Roles.Argument);
-				}
-			}
-		}
-		
-		public ObjectCreationExpression (AstType type, params Expression[] arguments) : this (type, (IEnumerable<Expression>)arguments)
-		{
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitObjectCreationExpression(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			ObjectCreationExpression o = other as ObjectCreationExpression;
-			return o != null && this.Type.DoMatch(o.Type, match) && this.Arguments.DoMatch(o.Arguments, match) && this.Initializer.DoMatch(o.Initializer, match);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ParenthesizedExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ParenthesizedExpression.cs
deleted file mode 100644
index 31c234044c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/ParenthesizedExpression.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Description of ParenthesizedExpression.
-	/// </summary>
-	public class ParenthesizedExpression : Expression
-	{
-		public ParenthesizedExpression()
-		{
-		}
-		
-		public Expression Expression {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var expr = other as ParenthesizedExpression;
-			return expr != null &&
-				Expression.DoMatch(expr.Expression, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitParenthesizedExpression(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/PrimitiveExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/PrimitiveExpression.cs
deleted file mode 100644
index d1d5f2d1f1..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/PrimitiveExpression.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using ICSharpCode.NRefactory.VB.PrettyPrinter;
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Represents a literal value.
-	/// </summary>
-	public class PrimitiveExpression : Expression
-	{
-		public static readonly object AnyValue = new object();
-		
-		TextLocation startLocation;
-		public override TextLocation StartLocation {
-			get {
-				return startLocation;
-			}
-		}
-		
-		int length;
-		public override TextLocation EndLocation {
-			get {
-				return new TextLocation(StartLocation.Line, StartLocation.Column + length);
-			}
-		}
-		
-		public object Value { get; private set; }
-		
-		string stringValue;
-		
-		public string StringValue {
-			get { return stringValue ?? OutputVisitor.ToVBNetString(this); }
-		}
-		
-		public PrimitiveExpression(object value)
-		{
-			this.Value = value;
-		}
-		
-		public PrimitiveExpression(object value, string stringValue)
-		{
-			this.Value = value;
-			this.stringValue = stringValue;
-		}
-		
-		public PrimitiveExpression(object value, TextLocation startLocation, int length)
-		{
-			this.Value = value;
-			this.startLocation = startLocation;
-			this.length = length;
-		}
-		
-		public PrimitiveExpression(object value, string stringValue, TextLocation startLocation, int length)
-		{
-			this.Value = value;
-			this.stringValue = stringValue;
-			this.startLocation = startLocation;
-			this.length = length;
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitPrimitiveExpression(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			PrimitiveExpression o = other as PrimitiveExpression;
-			return o != null && (this.Value == AnyValue || object.Equals(this.Value, o.Value));
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/QueryExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/QueryExpression.cs
deleted file mode 100644
index 2701d4e892..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/QueryExpression.cs
+++ /dev/null
@@ -1,348 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class QueryExpression : Expression
-	{
-		public AstNodeCollection<QueryOperator> QueryOperators {
-			get { return GetChildrenByRole(QueryOperator.QueryOperatorRole); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitQueryExpression(this, data);
-		}
-	}
-	
-	public abstract class QueryOperator : AstNode
-	{
-		#region Null
-		public new static readonly QueryOperator Null = new NullQueryOperator();
-		
-		sealed class NullQueryOperator : QueryOperator
-		{
-			public override bool IsNull {
-				get {
-					return true;
-				}
-			}
-			
-			public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-			{
-				return default (S);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return other == null || other.IsNull;
-			}
-		}
-		#endregion
-		
-		public static readonly Role<QueryOperator> QueryOperatorRole = new Role<QueryOperator>("QueryOperator", QueryOperator.Null);
-	}
-	
-	public class FromQueryOperator : QueryOperator
-	{
-		public AstNodeCollection<CollectionRangeVariableDeclaration> Variables {
-			get { return GetChildrenByRole (CollectionRangeVariableDeclaration.CollectionRangeVariableDeclarationRole); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitFromQueryOperator(this, data);
-		}
-	}
-	
-	public class AggregateQueryOperator : QueryOperator
-	{
-		public CollectionRangeVariableDeclaration Variable {
-			get { return GetChildByRole(CollectionRangeVariableDeclaration.CollectionRangeVariableDeclarationRole); }
-			set { SetChildByRole(CollectionRangeVariableDeclaration.CollectionRangeVariableDeclarationRole, value); }
-		}
-		
-		public AstNodeCollection<QueryOperator> SubQueryOperators {
-			get { return GetChildrenByRole(QueryOperatorRole); }
-		}
-		
-		public AstNodeCollection<VariableInitializer> IntoExpressions {
-			get { return GetChildrenByRole(VariableInitializer.VariableInitializerRole); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitAggregateQueryOperator(this, data);
-		}
-	}
-	
-	public class SelectQueryOperator : QueryOperator
-	{
-		public AstNodeCollection<VariableInitializer> Variables {
-			get { return GetChildrenByRole(VariableInitializer.VariableInitializerRole); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitSelectQueryOperator(this, data);
-		}
-	}
-	
-	public class DistinctQueryOperator : QueryOperator
-	{
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitDistinctQueryOperator(this, data);
-		}
-	}
-	
-	public class WhereQueryOperator : QueryOperator
-	{
-		public Expression Condition {
-			get { return GetChildByRole (Roles.Expression); }
-			set { SetChildByRole (Roles.Expression, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitWhereQueryOperator(this, data);
-		}
-	}
-	
-	public class OrderExpression : AstNode
-	{
-		public static readonly Role<OrderExpression> OrderExpressionRole = new Role<OrderExpression>("OrderExpression");
-		
-		public Expression Expression {
-			get { return GetChildByRole (Roles.Expression); }
-			set { SetChildByRole (Roles.Expression, value); }
-		}
-		
-		public QueryOrderingDirection Direction { get; set; }
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitOrderExpression(this, data);
-		}
-	}
-	
-	public class OrderByQueryOperator : QueryOperator
-	{
-		public AstNodeCollection<OrderExpression> Expressions {
-			get { return GetChildrenByRole(OrderExpression.OrderExpressionRole); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitOrderByQueryOperator(this, data);
-		}
-	}
-	
-	public class PartitionQueryOperator : QueryOperator
-	{
-		public PartitionKind Kind { get; set; }
-		
-		public Expression Expression {
-			get { return GetChildByRole (Roles.Expression); }
-			set { SetChildByRole (Roles.Expression, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitPartitionQueryOperator(this, data);
-		}
-	}
-	
-	public class LetQueryOperator : QueryOperator
-	{
-		public AstNodeCollection<VariableInitializer> Variables {
-			get { return GetChildrenByRole(VariableInitializer.VariableInitializerRole); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitLetQueryOperator(this, data);
-		}
-	}
-	
-	public class GroupByQueryOperator : QueryOperator
-	{
-		public static readonly Role<VariableInitializer> GroupExpressionRole = new Role<VariableInitializer>("GroupExpression");
-		public static readonly Role<VariableInitializer> ByExpressionRole = new Role<VariableInitializer>("ByExpression");
-		public static readonly Role<VariableInitializer> IntoExpressionRole = new Role<VariableInitializer>("IntoExpression");
-		
-		public AstNodeCollection<VariableInitializer> GroupExpressions {
-			get { return GetChildrenByRole(GroupExpressionRole); }
-		}
-		
-		public AstNodeCollection<VariableInitializer> ByExpressions {
-			get { return GetChildrenByRole(ByExpressionRole); }
-		}
-		
-		public AstNodeCollection<VariableInitializer> IntoExpressions {
-			get { return GetChildrenByRole(IntoExpressionRole); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitGroupByQueryOperator(this, data);
-		}
-	}
-	
-	public class JoinQueryOperator : QueryOperator
-	{
-		#region Null
-		public new static readonly JoinQueryOperator Null = new NullJoinQueryOperator();
-		
-		sealed class NullJoinQueryOperator : JoinQueryOperator
-		{
-			public override bool IsNull {
-				get {
-					return true;
-				}
-			}
-			
-			public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-			{
-				return default (S);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return other == null || other.IsNull;
-			}
-		}
-		#endregion
-		
-		public static readonly Role<JoinQueryOperator> JoinQueryOperatorRole = new Role<JoinQueryOperator>("JoinQueryOperator", JoinQueryOperator.Null);
-		
-		public CollectionRangeVariableDeclaration JoinVariable {
-			get { return GetChildByRole(CollectionRangeVariableDeclaration.CollectionRangeVariableDeclarationRole); }
-			set { SetChildByRole(CollectionRangeVariableDeclaration.CollectionRangeVariableDeclarationRole, value); }
-		}
-		
-		public JoinQueryOperator SubJoinQuery {
-			get { return GetChildByRole(JoinQueryOperatorRole); }
-			set {  SetChildByRole(JoinQueryOperatorRole, value); }
-		}
-		
-		public AstNodeCollection<JoinCondition> JoinConditions {
-			get { return GetChildrenByRole(JoinCondition.JoinConditionRole); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitJoinQueryOperator(this, data);
-		}
-	}
-	
-	public class JoinCondition : AstNode
-	{
-		public static readonly Role<JoinCondition> JoinConditionRole = new Role<JoinCondition>("JoinCondition");
-		
-		public static readonly Role<Expression> LeftExpressionRole = BinaryOperatorExpression.LeftExpressionRole;
-		public static readonly Role<Expression> RightExpressionRole = BinaryOperatorExpression.RightExpressionRole;
-		
-		public Expression Left {
-			get { return GetChildByRole (LeftExpressionRole); }
-			set { SetChildByRole (LeftExpressionRole, value); }
-		}
-		
-		public Expression Right {
-			get { return GetChildByRole (RightExpressionRole); }
-			set { SetChildByRole (RightExpressionRole, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitJoinCondition(this, data);
-		}
-	}
-	
-	public class GroupJoinQueryOperator : JoinQueryOperator
-	{
-		public static readonly Role<VariableInitializer> IntoExpressionRole = GroupByQueryOperator.IntoExpressionRole;
-		
-		public AstNodeCollection<VariableInitializer> IntoExpressions {
-			get { return GetChildrenByRole(IntoExpressionRole); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitGroupJoinQueryOperator(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/SimpleNameExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/SimpleNameExpression.cs
deleted file mode 100644
index 0face5c9e9..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/SimpleNameExpression.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Description of SimpleNameExpression.
-	/// </summary>
-	public class SimpleNameExpression : Expression
-	{
-		public Identifier Identifier { get; set; }
-		
-		public AstNodeCollection<AstType> TypeArguments {
-			get { return GetChildrenByRole(Roles.TypeArgument); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var node = other as SimpleNameExpression;
-			return node != null
-				&& Identifier.DoMatch(node.Identifier, match)
-				&& TypeArguments.DoMatch(node.TypeArguments, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitSimpleNameExpression(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/TypeOfIsExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/TypeOfIsExpression.cs
deleted file mode 100644
index 54ef20f94f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/TypeOfIsExpression.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class TypeOfIsExpression : Expression
-	{
-		public TypeOfIsExpression()
-		{
-		}
-		
-		public Expression TypeOfExpression {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		public AstType Type {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var expr = other as TypeOfIsExpression;
-			return expr != null &&
-				TypeOfExpression.DoMatch(expr.TypeOfExpression, match) &&
-				Type.DoMatch(expr.Type, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitTypeOfIsExpression(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/TypeReferenceExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/TypeReferenceExpression.cs
deleted file mode 100644
index d163fcd77b..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/TypeReferenceExpression.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Represents an AstType as an expression.
-	/// This is used when calling a method on a primitive type: "Integer.Parse()"
-	/// </summary>
-	public class TypeReferenceExpression : Expression
-	{
-		public AstType Type {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitTypeReferenceExpression(this, data);
-		}
-		
-		public TypeReferenceExpression ()
-		{
-		}
-		
-		public TypeReferenceExpression (AstType type)
-		{
-			SetChildByRole(Roles.Type, type);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			TypeReferenceExpression o = other as TypeReferenceExpression;
-			return o != null && this.Type.DoMatch(o.Type, match);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/UnaryOperatorExpression.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/UnaryOperatorExpression.cs
deleted file mode 100644
index 7876984849..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/UnaryOperatorExpression.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Operator Expression
-	/// </summary>
-	public class UnaryOperatorExpression : Expression
-	{
-		public readonly static Role<VBTokenNode> OperatorRole = BinaryOperatorExpression.OperatorRole;
-		
-		public UnaryOperatorExpression()
-		{
-		}
-		
-		public UnaryOperatorExpression(UnaryOperatorType op, Expression expression)
-		{
-			this.Operator = op;
-			this.Expression = expression;
-		}
-		
-		public UnaryOperatorType Operator {
-			get;
-			set;
-		}
-		
-		public VBTokenNode OperatorToken {
-			get { return GetChildByRole (OperatorRole); }
-		}
-		
-		public Expression Expression {
-			get { return GetChildByRole (Roles.Expression); }
-			set { SetChildByRole (Roles.Expression, value); }
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitUnaryOperatorExpression(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			UnaryOperatorExpression o = other as UnaryOperatorExpression;
-			return o != null && this.Operator == o.Operator && this.Expression.DoMatch(o.Expression, match);
-		}
-		
-		public static string GetOperatorSymbol(UnaryOperatorType op)
-		{
-			switch (op) {
-				case UnaryOperatorType.Not:
-					return "Not";
-				case UnaryOperatorType.Minus:
-					return "-";
-				case UnaryOperatorType.Plus:
-					return "+";
-				default:
-					throw new NotSupportedException("Invalid value for UnaryOperatorType");
-			}
-		}
-	}
-	
-	public enum UnaryOperatorType
-	{
-		/// <summary>Logical/Bitwise not (Not a)</summary>
-		Not,
-		/// <summary>Unary minus (-a)</summary>
-		Minus,
-		/// <summary>Unary plus (+a)</summary>
-		Plus,
-		/// <summary>AddressOf</summary>
-		AddressOf,
-		/// <summary>Await</summary>
-		Await
-	}
-	
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/VariableInitializer.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/VariableInitializer.cs
deleted file mode 100644
index 7d1cb87e70..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/VariableInitializer.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Identifier As Type = Expression
-	/// </summary>
-	public class VariableInitializer : AstNode
-	{
-		public static readonly Role<VariableInitializer> VariableInitializerRole = new Role<VariableInitializer>("VariableInitializer");
-		
-		public VariableIdentifier Identifier {
-			get { return GetChildByRole(VariableIdentifier.VariableIdentifierRole); }
-			set { SetChildByRole(VariableIdentifier.VariableIdentifierRole, value); }
-		}
-		
-		public AstType Type {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-		
-		public VBTokenNode AssignToken {
-			get { return GetChildByRole (Roles.Assign); }
-		}
-		
-		public Expression Expression {
-			get { return GetChildByRole (Roles.Expression); }
-			set { SetChildByRole (Roles.Expression, value); }
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitVariableInitializer(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			VariableInitializer o = other as VariableInitializer;
-			return o != null && this.Identifier.DoMatch(o.Identifier, match) && this.Type.DoMatch(o.Type, match) && this.Expression.DoMatch(o.Expression, match);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/XmlIdentifier.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/XmlIdentifier.cs
deleted file mode 100644
index 3b45d5a606..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/XmlIdentifier.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Description of XmlIdentifier.
-	/// </summary>
-	public class XmlIdentifier : AstNode
-	{
-		public static readonly new XmlIdentifier Null = new NullXmlIdentifier();
-		
-		class NullXmlIdentifier : XmlIdentifier
-		{
-			public override bool IsNull {
-				get {
-					return true;
-				}
-			}
-			
-			public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-			{
-				return default(S);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return other == null || other.IsNull;
-			}
-		}
-		
-		public string Name { get; set; }
-		
-		TextLocation startLocation;
-		public override TextLocation StartLocation {
-			get { return startLocation; }
-		}
-		
-		TextLocation endLocation;
-		public override TextLocation EndLocation {
-			get { return endLocation; }
-		}
-		
-		private XmlIdentifier()
-		{
-			this.Name = string.Empty;
-		}
-		
-		public XmlIdentifier(string name, TextLocation startLocation, TextLocation endLocation)
-		{
-			this.Name = name;
-			this.startLocation = startLocation;
-			this.endLocation = endLocation;
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var ident = other as XmlIdentifier;
-			return ident != null
-				&& MatchStringXml(Name, ident.Name)
-				&& ident.startLocation == startLocation
-				&& ident.endLocation == endLocation;
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitXmlIdentifier(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/XmlLiteralString.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/XmlLiteralString.cs
deleted file mode 100644
index d2f89e8050..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Expressions/XmlLiteralString.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class XmlLiteralString : AstNode
-	{
-		public static readonly new XmlLiteralString Null = new XmlLiteralString();
-		
-		class NullXmlLiteralString : XmlLiteralString
-		{
-			public override bool IsNull {
-				get {
-					return true;
-				}
-			}
-			
-			public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-			{
-				return default(S);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return other == null || other.IsNull;
-			}
-		}
-		
-		public string Value { get; set; }
-		
-		TextLocation startLocation;
-		public override TextLocation StartLocation {
-			get { return startLocation; }
-		}
-		
-		TextLocation endLocation;
-		public override TextLocation EndLocation {
-			get { return endLocation; }
-		}
-		
-		private XmlLiteralString()
-		{
-			this.Value = string.Empty;
-		}
-		
-		public XmlLiteralString(string value, TextLocation startLocation, TextLocation endLocation)
-		{
-			this.Value = value;
-			this.startLocation = startLocation;
-			this.endLocation = endLocation;
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var ident = other as XmlLiteralString;
-			return ident != null
-				&& MatchStringXml(Value, ident.Value)
-				&& ident.startLocation == startLocation
-				&& ident.endLocation == endLocation;
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitXmlLiteralString(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/Attribute.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/Attribute.cs
deleted file mode 100644
index 3ad4686092..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/Attribute.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class Attribute : AstNode
-	{
-		#region PatternPlaceholder
-		public static implicit operator Attribute(PatternMatching.Pattern pattern)
-		{
-			return pattern != null ? new PatternPlaceholder(pattern) : null;
-		}
-		
-		sealed class PatternPlaceholder : Attribute, PatternMatching.INode
-		{
-			readonly PatternMatching.Pattern child;
-			
-			public PatternPlaceholder(PatternMatching.Pattern child)
-			{
-				this.child = child;
-			}
-			
-			public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-			{
-				return visitor.VisitPatternPlaceholder(this, child, data);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return child.DoMatch(other, match);
-			}
-			
-			bool PatternMatching.INode.DoMatchCollection(Role role, PatternMatching.INode pos, PatternMatching.Match match, PatternMatching.BacktrackingInfo backtrackingInfo)
-			{
-				return child.DoMatchCollection(role, pos, match, backtrackingInfo);
-			}
-		}
-		#endregion
-		
-		public static readonly Role<Attribute> AttributeRole = new Role<Attribute>("Attribute");
-		public static readonly Role<VBTokenNode> TargetRole = new Role<VBTokenNode>("Target", VBTokenNode.Null);
-		
-		public AttributeTarget Target { get; set; }
-		
-		public VBTokenNode TargetKeyword {
-			get { return GetChildByRole(TargetRole); }
-			set { SetChildByRole(TargetRole, value); }
-		}
-		
-		public VBTokenNode ColonToken {
-			get { return GetChildByRole(Roles.StatementTerminator); }
-		}
-		
-		public AstType Type {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-		
-		public VBTokenNode LParToken {
-			get { return GetChildByRole(Roles.LPar); }
-		}
-		
-		public AstNodeCollection<Expression> Arguments {
-			get { return GetChildrenByRole(Roles.Argument); }
-		}
-		
-		public VBTokenNode RParToken {
-			get { return GetChildByRole(Roles.RPar); }
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitAttribute(this, data);
-		}
-		
-//		public override string ToString()
-//		{
-//			return string.Format("[Attribute Type={0} Arguments={1}]", Type, GetCollectionString(Arguments));
-//		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var node = other as Attribute;
-			return node != null && node.Target == Target && node.TargetKeyword.DoMatch(this.TargetKeyword, match) && node.Type.DoMatch(this.Type, match) && node.Arguments.DoMatch(this.Arguments, match);
-		}
-	}
-	
-	public enum AttributeTarget
-	{
-		None,
-		Assembly,
-		Module
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/AttributeBlock.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/AttributeBlock.cs
deleted file mode 100644
index 57d69db33d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/AttributeBlock.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class AttributeBlock : AstNode
-	{
-		public readonly static Role<AttributeBlock> AttributeBlockRole = new Role<AttributeBlock>("AttributeBlock");
-		public readonly static Role<AttributeBlock> ReturnTypeAttributeBlockRole = new Role<AttributeBlock>("ReturnTypeAttributeBlock");
-		
-		public VBTokenNode LChevron {
-			get { return GetChildByRole(Roles.LChevron); }
-		}
-		
-		public AstNodeCollection<Attribute> Attributes {
-			get { return GetChildrenByRole(Attribute.AttributeRole); }
-		}
-		
-		public VBTokenNode RChevron {
-			get { return GetChildByRole(Roles.RChevron); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var node = other as AttributeBlock;
-			return node != null && Attributes.DoMatch(node.Attributes, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitAttributeBlock(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/AttributedNode.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/AttributedNode.cs
deleted file mode 100644
index de1ccd2546..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/AttributedNode.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public abstract class AttributedNode : AstNode
-	{
-		public AstNodeCollection<AttributeBlock> Attributes {
-			get { return GetChildrenByRole(AttributeBlock.AttributeBlockRole); }
-		}
-		
-		public static readonly Role<VBModifierToken> ModifierRole = new Role<VBModifierToken>("Modifier");
-		
-		public Modifiers Modifiers {
-			get { return GetModifiers(this); }
-			set { SetModifiers(this, value); }
-		}
-		
-		public AstNodeCollection<VBModifierToken> ModifierTokens {
-			get { return GetChildrenByRole (ModifierRole); }
-		}
-		
-		internal static Modifiers GetModifiers(AstNode node)
-		{
-			Modifiers m = 0;
-			foreach (VBModifierToken t in node.GetChildrenByRole (ModifierRole)) {
-				m |= t.Modifier;
-			}
-			return m;
-		}
-		
-		internal static void SetModifiers(AstNode node, Modifiers newValue)
-		{
-			Modifiers oldValue = GetModifiers(node);
-			AstNode insertionPos = node.GetChildrenByRole(Attribute.AttributeRole).LastOrDefault();
-			foreach (Modifiers m in VBModifierToken.AllModifiers) {
-				if ((m & newValue) != 0) {
-					if ((m & oldValue) == 0) {
-						// Modifier was added
-						var newToken = new VBModifierToken(TextLocation.Empty, m);
-						node.InsertChildAfter(insertionPos, newToken, ModifierRole);
-						insertionPos = newToken;
-					} else {
-						// Modifier already exists
-						insertionPos = node.GetChildrenByRole(ModifierRole).First(t => t.Modifier == m);
-					}
-				} else {
-					if ((m & oldValue) != 0) {
-						// Modifier was removed
-						node.GetChildrenByRole (ModifierRole).First(t => t.Modifier == m).Remove();
-					}
-				}
-			}
-		}
-		
-		protected bool MatchAttributesAndModifiers(AttributedNode o, PatternMatching.Match match)
-		{
-			return (this.Modifiers == Modifiers.Any || this.Modifiers == o.Modifiers) && this.Attributes.DoMatch(o.Attributes, match);
-		}
-	}
-	
-
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/CompilationUnit.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/CompilationUnit.cs
deleted file mode 100644
index 558872c7d5..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/CompilationUnit.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class CompilationUnit : AstNode 
-	{
-		public static readonly Role<AstNode> MemberRole = new Role<AstNode>("Member", AstNode.Null);
-		
-		public CompilationUnit ()
-		{
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			CompilationUnit o = other as CompilationUnit;
-			return o != null && GetChildrenByRole(MemberRole).DoMatch(o.GetChildrenByRole(MemberRole), match);
-		}
-		
-		public AstNode GetNodeAt (int line, int column)
-		{
-			return GetNodeAt (new TextLocation (line, column));
-		}
-		
-		public AstNode GetNodeAt (TextLocation location)
-		{
-			AstNode node = this;
-			while (node.FirstChild != null) {
-				var child = node.FirstChild;
-				while (child != null) {
-					if (child.StartLocation <= location && location < child.EndLocation) {
-						node = child;
-						break;
-					}
-					child = child.NextSibling;
-				}
-				// found no better child node - therefore the parent is the right one.
-				if (child == null)
-					break;
-			}
-			return node;
-		}
-		
-		public IEnumerable<AstNode> GetNodesBetween (int startLine, int startColumn, int endLine, int endColumn)
-		{
-			return GetNodesBetween (new TextLocation (startLine, startColumn), new TextLocation (endLine, endColumn));
-		}
-		
-		public IEnumerable<AstNode> GetNodesBetween (TextLocation start, TextLocation end)
-		{
-			AstNode node = this;
-			while (node != null) {
-				AstNode next;
-				if (start <= node.StartLocation && node.EndLocation <= end) {
-					// Remember next before yielding node.
-					// This allows iteration to continue when the caller removes/replaces the node.
-					next = node.NextSibling;
-					yield return node;
-				} else {
-					if (node.EndLocation < start) {
-						next = node.NextSibling; 
-					} else {
-						next = node.FirstChild;
-					}
-				}
-				
-				if (next != null && next.StartLocation > end)
-					yield break;
-				node = next;
-			}
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitCompilationUnit (this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/EventMemberSpecifier.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/EventMemberSpecifier.cs
deleted file mode 100644
index da1e14cf4f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/EventMemberSpecifier.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class EventMemberSpecifier : AstNode
-	{
-		public static readonly Role<EventMemberSpecifier> EventMemberSpecifierRole = new Role<EventMemberSpecifier>("EventMemberSpecifier");
-		
-		public EventMemberSpecifier()
-		{
-		}
-		
-		public Expression Target {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		public Identifier Member {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var expr = other as EventMemberSpecifier;
-			return expr != null &&
-				Target.DoMatch(expr.Target, match) &&
-				Member.DoMatch(expr.Member, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitEventMemberSpecifier(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/InterfaceMemberSpecifier.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/InterfaceMemberSpecifier.cs
deleted file mode 100644
index d4e0090f24..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/InterfaceMemberSpecifier.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class InterfaceMemberSpecifier : AstNode
-	{
-		public static readonly Role<InterfaceMemberSpecifier> InterfaceMemberSpecifierRole = new Role<InterfaceMemberSpecifier>("InterfaceMemberSpecifier");
-		
-		public InterfaceMemberSpecifier(Expression target, Identifier member)
-		{
-			Target = target;
-			Member = member;
-		}
-		
-		public InterfaceMemberSpecifier(AstType target, string member)
-		{
-			Target = new TypeReferenceExpression(target);
-			Member = new Identifier(member, TextLocation.Empty);
-		}
-		
-		public Expression Target {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		public Identifier Member {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var expr = other as InterfaceMemberSpecifier;
-			return expr != null &&
-				Target.DoMatch(expr.Target, match) &&
-				Member.DoMatch(expr.Member, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitInterfaceMemberSpecifier(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/ParameterDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/ParameterDeclaration.cs
deleted file mode 100644
index 61b4f2ae37..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/ParameterDeclaration.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class ParameterDeclaration : AttributedNode
-	{
-		public Identifier Name {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		public Expression OptionalValue {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		public AstType Type {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var param = other as ParameterDeclaration;
-			return param != null &&
-				MatchAttributesAndModifiers(param, match) &&
-				Name.DoMatch(param.Name, match) &&
-				OptionalValue.DoMatch(param.OptionalValue, match) &&
-				Type.DoMatch(param.Type, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitParameterDeclaration(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/TypeParameterDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/TypeParameterDeclaration.cs
deleted file mode 100644
index 29396a9d94..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/General/TypeParameterDeclaration.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// [In|Out] Name [As Contraints]
-	/// 
-	/// Represents a type parameter.
-	/// </summary>
-	public class TypeParameterDeclaration : AstNode
-	{
-		public static readonly Role<AstType> TypeConstraintRole = TypeDeclaration.InheritsTypeRole;
-		public static readonly Role<VBTokenNode> VarianceRole = new Role<VBTokenNode>("Variance");
-		
-		public VarianceModifier Variance { get; set; }
-		
-		public string Name {
-			get { return GetChildByRole (Roles.Identifier).Name; }
-			set { SetChildByRole(Roles.Identifier, new Identifier (value, TextLocation.Empty)); }
-		}
-		
-		public AstNodeCollection<AstType> Constraints {
-			get { return GetChildrenByRole(TypeConstraintRole); }
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitTypeParameterDeclaration(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			TypeParameterDeclaration o = other as TypeParameterDeclaration;
-			return o != null && this.Variance == o.Variance
-				&& MatchString(this.Name, o.Name)
-				&& this.Constraints.DoMatch(o.Constraints, match);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Generated.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Generated.cs
deleted file mode 100644
index dee6e4d96f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Generated.cs
+++ /dev/null
@@ -1,4866 +0,0 @@
-//// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-//// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-//using System;
-//using System.Collections.Generic;
-//
-//namespace ICSharpCode.NRefactory.VB.Ast {
-//	public class AddHandlerStatement : Statement {
-//		
-//		Expression eventExpression;
-//		
-//		Expression handlerExpression;
-//		
-//		public Expression EventExpression {
-//			get {
-//				return eventExpression;
-//			}
-//			set {
-//				eventExpression = value ?? Expression.Null;
-//				if (!eventExpression.IsNull) eventExpression.Parent = this;
-//			}
-//		}
-//		
-//		public Expression HandlerExpression {
-//			get {
-//				return handlerExpression;
-//			}
-//			set {
-//				handlerExpression = value ?? Expression.Null;
-//				if (!handlerExpression.IsNull) handlerExpression.Parent = this;
-//			}
-//		}
-//		
-//		public AddHandlerStatement(Expression eventExpression, Expression handlerExpression) {
-//			EventExpression = eventExpression;
-//			HandlerExpression = handlerExpression;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitAddHandlerStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[AddHandlerStatement EventExpression={0} HandlerExpression={1}]", EventExpression, HandlerExpression);
-//		}
-//	}
-//	
-//	public class AddressOfExpression : Expression {
-//		
-//		Expression expression;
-//		
-//		public Expression Expression {
-//			get {
-//				return expression;
-//			}
-//			set {
-//				expression = value ?? Expression.Null;
-//				if (!expression.IsNull) expression.Parent = this;
-//			}
-//		}
-//		
-//		public AddressOfExpression(Expression expression) {
-//			Expression = expression;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitAddressOfExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[AddressOfExpression Expression={0}]", Expression);
-//		}
-//	}
-//	
-//	public class ArrayCreateExpression : Expression {
-//		
-//		TypeReference createType;
-//		
-//		List<Expression> arguments;
-//		
-//		CollectionInitializerExpression arrayInitializer;
-//		
-//		public TypeReference CreateType {
-//			get {
-//				return createType;
-//			}
-//			set {
-//				createType = value ?? TypeReference.Null;
-//				if (!createType.IsNull) createType.Parent = this;
-//			}
-//		}
-//		
-//		public List<Expression> Arguments {
-//			get {
-//				return arguments;
-//			}
-//			set {
-//				arguments = value ?? new List<Expression>();
-//			}
-//		}
-//		
-//		public CollectionInitializerExpression ArrayInitializer {
-//			get {
-//				return arrayInitializer;
-//			}
-//			set {
-//				arrayInitializer = value ?? CollectionInitializerExpression.Null;
-//				if (!arrayInitializer.IsNull) arrayInitializer.Parent = this;
-//			}
-//		}
-//		
-//		public ArrayCreateExpression(TypeReference createType) {
-//			CreateType = createType;
-//			arguments = new List<Expression>();
-//			arrayInitializer = CollectionInitializerExpression.Null;
-//		}
-//		
-//		public ArrayCreateExpression(TypeReference createType, List<Expression> arguments) {
-//			CreateType = createType;
-//			Arguments = arguments;
-//			arrayInitializer = CollectionInitializerExpression.Null;
-//		}
-//		
-//		public ArrayCreateExpression(TypeReference createType, CollectionInitializerExpression arrayInitializer) {
-//			CreateType = createType;
-//			ArrayInitializer = arrayInitializer;
-//			arguments = new List<Expression>();
-//		}
-//		
-//		public bool IsImplicitlyTyped {
-//			get {
-//				return createType.IsNull || string.IsNullOrEmpty(createType.Type);
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitArrayCreateExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ArrayCreateExpression CreateType={0} Arguments={1} ArrayInitializer={2}]", CreateType, GetCollectionString(Arguments), ArrayInitializer);
-//		}
-//	}
-//	
-//	public class AssignmentExpression : Expression {
-//		
-//		Expression left;
-//		
-//		AssignmentOperatorType op;
-//		
-//		Expression right;
-//		
-//		public Expression Left {
-//			get {
-//				return left;
-//			}
-//			set {
-//				left = value ?? Expression.Null;
-//				if (!left.IsNull) left.Parent = this;
-//			}
-//		}
-//		
-//		public AssignmentOperatorType Op {
-//			get {
-//				return op;
-//			}
-//			set {
-//				op = value;
-//			}
-//		}
-//		
-//		public Expression Right {
-//			get {
-//				return right;
-//			}
-//			set {
-//				right = value ?? Expression.Null;
-//				if (!right.IsNull) right.Parent = this;
-//			}
-//		}
-//		
-//		public AssignmentExpression(Expression left, AssignmentOperatorType op, Expression right) {
-//			Left = left;
-//			Op = op;
-//			Right = right;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitAssignmentExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[AssignmentExpression Left={0} Op={1} Right={2}]", Left, Op, Right);
-//		}
-//	}
-//	
-//	public abstract class AttributedNode : AbstractNode {
-//		
-//		List<AttributeSection> attributes;
-//		
-//		Modifiers modifier;
-//		
-//		public List<AttributeSection> Attributes {
-//			get {
-//				return attributes;
-//			}
-//			set {
-//				attributes = value ?? new List<AttributeSection>();
-//			}
-//		}
-//		
-//		public Modifiers Modifier {
-//			get {
-//				return modifier;
-//			}
-//			set {
-//				modifier = value;
-//			}
-//		}
-//		
-//		protected AttributedNode() {
-//			attributes = new List<AttributeSection>();
-//		}
-//		
-//		protected AttributedNode(List<AttributeSection> attributes) {
-//			Attributes = attributes;
-//		}
-//		
-//		protected AttributedNode(Modifiers modifier, List<AttributeSection> attributes) {
-//			Modifier = modifier;
-//			Attributes = attributes;
-//		}
-//	}
-//	
-//	public class AttributeSection : AbstractNode {
-//		
-//		string attributeTarget;
-//		
-//		List<ICSharpCode.NRefactory.VB.Ast.Attribute> attributes;
-//		
-//		public string AttributeTarget {
-//			get {
-//				return attributeTarget;
-//			}
-//			set {
-//				attributeTarget = value ?? "";
-//			}
-//		}
-//		
-//		public List<ICSharpCode.NRefactory.VB.Ast.Attribute> Attributes {
-//			get {
-//				return attributes;
-//			}
-//			set {
-//				attributes = value ?? new List<Attribute>();
-//			}
-//		}
-//		
-//		public AttributeSection() {
-//			attributeTarget = "";
-//			attributes = new List<Attribute>();
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitAttributeSection(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[AttributeSection AttributeTarget={0} Attributes={1}]", AttributeTarget, GetCollectionString(Attributes));
-//		}
-//	}
-//	
-//	public class BaseReferenceExpression : Expression {
-//		
-//		public BaseReferenceExpression() {
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitBaseReferenceExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return "[BaseReferenceExpression]";
-//		}
-//	}
-//	
-//	public class BinaryOperatorExpression : Expression {
-//		
-//		Expression left;
-//		
-//		BinaryOperatorType op;
-//		
-//		Expression right;
-//		
-//		public Expression Left {
-//			get {
-//				return left;
-//			}
-//			set {
-//				left = value ?? Expression.Null;
-//				if (!left.IsNull) left.Parent = this;
-//			}
-//		}
-//		
-//		public BinaryOperatorType Op {
-//			get {
-//				return op;
-//			}
-//			set {
-//				op = value;
-//			}
-//		}
-//		
-//		public Expression Right {
-//			get {
-//				return right;
-//			}
-//			set {
-//				right = value ?? Expression.Null;
-//				if (!right.IsNull) right.Parent = this;
-//			}
-//		}
-//		
-//		public BinaryOperatorExpression() {
-//			left = Expression.Null;
-//			right = Expression.Null;
-//		}
-//		
-//		public BinaryOperatorExpression(Expression left, BinaryOperatorType op, Expression right) {
-//			Left = left;
-//			Op = op;
-//			Right = right;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitBinaryOperatorExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[BinaryOperatorExpression Left={0} Op={1} Right={2}]", Left, Op, Right);
-//		}
-//	}
-//	
-//	public class CaseLabel : AbstractNode {
-//		
-//		Expression label;
-//		
-//		BinaryOperatorType binaryOperatorType;
-//		
-//		Expression toExpression;
-//		
-//		public Expression Label {
-//			get {
-//				return label;
-//			}
-//			set {
-//				label = value ?? Expression.Null;
-//				if (!label.IsNull) label.Parent = this;
-//			}
-//		}
-//		
-//		public BinaryOperatorType BinaryOperatorType {
-//			get {
-//				return binaryOperatorType;
-//			}
-//			set {
-//				binaryOperatorType = value;
-//			}
-//		}
-//		
-//		public Expression ToExpression {
-//			get {
-//				return toExpression;
-//			}
-//			set {
-//				toExpression = value ?? Expression.Null;
-//				if (!toExpression.IsNull) toExpression.Parent = this;
-//			}
-//		}
-//		
-//		public CaseLabel() {
-//			label = Expression.Null;
-//			toExpression = Expression.Null;
-//		}
-//		
-//		public CaseLabel(Expression label) {
-//			Label = label;
-//			toExpression = Expression.Null;
-//		}
-//		
-//		public CaseLabel(Expression label, Expression toExpression) {
-//			Label = label;
-//			ToExpression = toExpression;
-//		}
-//		
-//		public CaseLabel(BinaryOperatorType binaryOperatorType, Expression label) {
-//			BinaryOperatorType = binaryOperatorType;
-//			Label = label;
-//			toExpression = Expression.Null;
-//		}
-//		
-//		public bool IsDefault {
-//			get {
-//				return label.IsNull;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitCaseLabel(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[CaseLabel Label={0} BinaryOperatorType={1} ToExpression={2}]", Label, BinaryOperatorType, ToExpression);
-//		}
-//	}
-//	
-//	public class CastExpression : Expression {
-//		
-//		TypeReference castTo;
-//		
-//		Expression expression;
-//		
-//		CastType castType;
-//		
-//		public TypeReference CastTo {
-//			get {
-//				return castTo;
-//			}
-//			set {
-//				castTo = value ?? TypeReference.Null;
-//				if (!castTo.IsNull) castTo.Parent = this;
-//			}
-//		}
-//		
-//		public Expression Expression {
-//			get {
-//				return expression;
-//			}
-//			set {
-//				expression = value ?? Expression.Null;
-//				if (!expression.IsNull) expression.Parent = this;
-//			}
-//		}
-//		
-//		public CastType CastType {
-//			get {
-//				return castType;
-//			}
-//			set {
-//				castType = value;
-//			}
-//		}
-//		
-//		public CastExpression(TypeReference castTo) {
-//			CastTo = castTo;
-//			expression = Expression.Null;
-//		}
-//		
-//		public CastExpression(TypeReference castTo, Expression expression, CastType castType) {
-//			CastTo = castTo;
-//			Expression = expression;
-//			CastType = castType;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitCastExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[CastExpression CastTo={0} Expression={1} CastType={2}]", CastTo, Expression, CastType);
-//		}
-//	}
-//	
-//	public class CatchClause : AbstractNode {
-//		
-//		TypeReference typeReference;
-//		
-//		string variableName;
-//		
-//		Statement statementBlock;
-//		
-//		Expression condition;
-//		
-//		public TypeReference TypeReference {
-//			get {
-//				return typeReference;
-//			}
-//			set {
-//				typeReference = value ?? TypeReference.Null;
-//				if (!typeReference.IsNull) typeReference.Parent = this;
-//			}
-//		}
-//		
-//		public string VariableName {
-//			get {
-//				return variableName;
-//			}
-//			set {
-//				variableName = value ?? "";
-//			}
-//		}
-//		
-//		public Statement StatementBlock {
-//			get {
-//				return statementBlock;
-//			}
-//			set {
-//				statementBlock = value ?? Statement.Null;
-//				if (!statementBlock.IsNull) statementBlock.Parent = this;
-//			}
-//		}
-//		
-//		public Expression Condition {
-//			get {
-//				return condition;
-//			}
-//			set {
-//				condition = value ?? Expression.Null;
-//				if (!condition.IsNull) condition.Parent = this;
-//			}
-//		}
-//		
-//		public CatchClause(TypeReference typeReference, string variableName, Statement statementBlock) {
-//			TypeReference = typeReference;
-//			VariableName = variableName;
-//			StatementBlock = statementBlock;
-//			condition = Expression.Null;
-//		}
-//		
-//		public CatchClause(TypeReference typeReference, string variableName, Statement statementBlock, Expression condition) {
-//			TypeReference = typeReference;
-//			VariableName = variableName;
-//			StatementBlock = statementBlock;
-//			Condition = condition;
-//		}
-//		
-//		public CatchClause(Statement statementBlock) {
-//			StatementBlock = statementBlock;
-//			typeReference = TypeReference.Null;
-//			variableName = "";
-//			condition = Expression.Null;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitCatchClause(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[CatchClause TypeReference={0} VariableName={1} StatementBlock={2} Condition={3}]" +
-//			                     "", TypeReference, VariableName, StatementBlock, Condition);
-//		}
-//	}
-//	
-//	public class ClassReferenceExpression : Expression {
-//		
-//		public ClassReferenceExpression() {
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitClassReferenceExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return "[ClassReferenceExpression]";
-//		}
-//	}
-//	
-//	public class CollectionInitializerExpression : Expression {
-//		
-//		List<Expression> createExpressions;
-//		
-//		public List<Expression> CreateExpressions {
-//			get {
-//				return createExpressions;
-//			}
-//			set {
-//				createExpressions = value ?? new List<Expression>();
-//			}
-//		}
-//		
-//		public CollectionInitializerExpression() {
-//			createExpressions = new List<Expression>();
-//		}
-//		
-//		public CollectionInitializerExpression(List<Expression> createExpressions) {
-//			CreateExpressions = createExpressions;
-//		}
-//		
-//		public new static CollectionInitializerExpression Null {
-//			get {
-//				return NullCollectionInitializerExpression.Instance;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitCollectionInitializerExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[CollectionInitializerExpression CreateExpressions={0}]", GetCollectionString(CreateExpressions));
-//		}
-//	}
-//	
-//	internal sealed class NullCollectionInitializerExpression : CollectionInitializerExpression {
-//		
-//		internal static NullCollectionInitializerExpression Instance = new NullCollectionInitializerExpression();
-//		
-//		public override bool IsNull {
-//			get {
-//				return true;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return null;
-//		}
-//		
-//		public override string ToString() {
-//			return "[NullCollectionInitializerExpression]";
-//		}
-//	}
-//	
-//	public class CollectionRangeVariable : AbstractNode, INullable {
-//		
-//		string identifier;
-//		
-//		Expression expression;
-//		
-//		TypeReference type;
-//		
-//		public string Identifier {
-//			get {
-//				return identifier;
-//			}
-//			set {
-//				identifier = value ?? "";
-//			}
-//		}
-//		
-//		public Expression Expression {
-//			get {
-//				return expression;
-//			}
-//			set {
-//				expression = value ?? Expression.Null;
-//				if (!expression.IsNull) expression.Parent = this;
-//			}
-//		}
-//		
-//		public TypeReference Type {
-//			get {
-//				return type;
-//			}
-//			set {
-//				type = value ?? TypeReference.Null;
-//				if (!type.IsNull) type.Parent = this;
-//			}
-//		}
-//		
-//		public CollectionRangeVariable() {
-//			identifier = "";
-//			expression = Expression.Null;
-//			type = TypeReference.Null;
-//		}
-//		
-//		public virtual bool IsNull {
-//			get {
-//				return false;
-//			}
-//		}
-//		
-//		public static CollectionRangeVariable Null {
-//			get {
-//				return NullCollectionRangeVariable.Instance;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitCollectionRangeVariable(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[CollectionRangeVariable Identifier={0} Expression={1} Type={2}]", Identifier, Expression, Type);
-//		}
-//	}
-//	
-//	internal sealed class NullCollectionRangeVariable : CollectionRangeVariable {
-//		
-//		internal static NullCollectionRangeVariable Instance = new NullCollectionRangeVariable();
-//		
-//		public override bool IsNull {
-//			get {
-//				return true;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return null;
-//		}
-//		
-//		public override string ToString() {
-//			return "[NullCollectionRangeVariable]";
-//		}
-//	}
-//	
-//	public class ConditionalExpression : Expression {
-//		
-//		Expression condition;
-//		
-//		Expression trueExpression;
-//		
-//		Expression falseExpression;
-//		
-//		public Expression Condition {
-//			get {
-//				return condition;
-//			}
-//			set {
-//				condition = value ?? Expression.Null;
-//				if (!condition.IsNull) condition.Parent = this;
-//			}
-//		}
-//		
-//		public Expression TrueExpression {
-//			get {
-//				return trueExpression;
-//			}
-//			set {
-//				trueExpression = value ?? Expression.Null;
-//				if (!trueExpression.IsNull) trueExpression.Parent = this;
-//			}
-//		}
-//		
-//		public Expression FalseExpression {
-//			get {
-//				return falseExpression;
-//			}
-//			set {
-//				falseExpression = value ?? Expression.Null;
-//				if (!falseExpression.IsNull) falseExpression.Parent = this;
-//			}
-//		}
-//		
-//		public ConditionalExpression() {
-//			condition = Expression.Null;
-//			trueExpression = Expression.Null;
-//			falseExpression = Expression.Null;
-//		}
-//		
-//		public ConditionalExpression(Expression condition, Expression trueExpression, Expression falseExpression) {
-//			Condition = condition;
-//			TrueExpression = trueExpression;
-//			FalseExpression = falseExpression;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitConditionalExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ConditionalExpression Condition={0} TrueExpression={1} FalseExpression={2}]", Condition, TrueExpression, FalseExpression);
-//		}
-//	}
-//	
-//	public class ConstructorDeclaration : ParametrizedNode {
-//		
-//		ConstructorInitializer constructorInitializer;
-//		
-//		BlockStatement body;
-//		
-//		public ConstructorInitializer ConstructorInitializer {
-//			get {
-//				return constructorInitializer;
-//			}
-//			set {
-//				constructorInitializer = value ?? ConstructorInitializer.Null;
-//				if (!constructorInitializer.IsNull) constructorInitializer.Parent = this;
-//			}
-//		}
-//		
-//		public BlockStatement Body {
-//			get {
-//				return body;
-//			}
-//			set {
-//				body = value ?? BlockStatement.Null;
-//				if (!body.IsNull) body.Parent = this;
-//			}
-//		}
-//		
-//		public ConstructorDeclaration(string name, Modifiers modifier, List<ParameterDeclarationExpression> parameters, List<AttributeSection> attributes) {
-//			Name = name;
-//			Modifier = modifier;
-//			Parameters = parameters;
-//			Attributes = attributes;
-//			constructorInitializer = ConstructorInitializer.Null;
-//			body = BlockStatement.Null;
-//		}
-//		
-//		public ConstructorDeclaration(string name, Modifiers modifier, List<ParameterDeclarationExpression> parameters, ConstructorInitializer constructorInitializer, List<AttributeSection> attributes) {
-//			Name = name;
-//			Modifier = modifier;
-//			Parameters = parameters;
-//			ConstructorInitializer = constructorInitializer;
-//			Attributes = attributes;
-//			body = BlockStatement.Null;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitConstructorDeclaration(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ConstructorDeclaration ConstructorInitializer={0} Body={1} Name={2} Parameters={" +
-//			                     "3} Attributes={4} Modifier={5}]", ConstructorInitializer, Body, Name, GetCollectionString(Parameters), GetCollectionString(Attributes), Modifier);
-//		}
-//	}
-//	
-//	public class ConstructorInitializer : AbstractNode, INullable {
-//		
-//		ConstructorInitializerType constructorInitializerType;
-//		
-//		List<Expression> arguments;
-//		
-//		public ConstructorInitializerType ConstructorInitializerType {
-//			get {
-//				return constructorInitializerType;
-//			}
-//			set {
-//				constructorInitializerType = value;
-//			}
-//		}
-//		
-//		public List<Expression> Arguments {
-//			get {
-//				return arguments;
-//			}
-//			set {
-//				arguments = value ?? new List<Expression>();
-//			}
-//		}
-//		
-//		public ConstructorInitializer() {
-//			arguments = new List<Expression>();
-//		}
-//		
-//		public virtual bool IsNull {
-//			get {
-//				return false;
-//			}
-//		}
-//		
-//		public static ConstructorInitializer Null {
-//			get {
-//				return NullConstructorInitializer.Instance;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitConstructorInitializer(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ConstructorInitializer ConstructorInitializerType={0} Arguments={1}]", ConstructorInitializerType, GetCollectionString(Arguments));
-//		}
-//	}
-//	
-//	internal sealed class NullConstructorInitializer : ConstructorInitializer {
-//		
-//		internal static NullConstructorInitializer Instance = new NullConstructorInitializer();
-//		
-//		public override bool IsNull {
-//			get {
-//				return true;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return null;
-//		}
-//		
-//		public override string ToString() {
-//			return "[NullConstructorInitializer]";
-//		}
-//	}
-//	
-//	public class ContinueStatement : Statement {
-//		
-//		ContinueType continueType;
-//		
-//		public ContinueType ContinueType {
-//			get {
-//				return continueType;
-//			}
-//			set {
-//				continueType = value;
-//			}
-//		}
-//		
-//		public ContinueStatement() {
-//		}
-//		
-//		public ContinueStatement(ContinueType continueType) {
-//			ContinueType = continueType;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitContinueStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ContinueStatement ContinueType={0}]", ContinueType);
-//		}
-//	}
-//	
-//	public class DeclareDeclaration : ParametrizedNode {
-//		
-//		string alias;
-//		
-//		string library;
-//		
-//		CharsetModifier charset;
-//		
-//		TypeReference typeReference;
-//		
-//		public string Alias {
-//			get {
-//				return alias;
-//			}
-//			set {
-//				alias = value ?? "";
-//			}
-//		}
-//		
-//		public string Library {
-//			get {
-//				return library;
-//			}
-//			set {
-//				library = value ?? "";
-//			}
-//		}
-//		
-//		public CharsetModifier Charset {
-//			get {
-//				return charset;
-//			}
-//			set {
-//				charset = value;
-//			}
-//		}
-//		
-//		public TypeReference TypeReference {
-//			get {
-//				return typeReference;
-//			}
-//			set {
-//				typeReference = value ?? TypeReference.Null;
-//				if (!typeReference.IsNull) typeReference.Parent = this;
-//			}
-//		}
-//		
-//		public DeclareDeclaration(string name, Modifiers modifier, TypeReference typeReference, List<ParameterDeclarationExpression> parameters, List<AttributeSection> attributes, string library, string alias, CharsetModifier charset) {
-//			Name = name;
-//			Modifier = modifier;
-//			TypeReference = typeReference;
-//			Parameters = parameters;
-//			Attributes = attributes;
-//			Library = library;
-//			Alias = alias;
-//			Charset = charset;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitDeclareDeclaration(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[DeclareDeclaration Alias={0} Library={1} Charset={2} TypeReference={3} Name={4} " +
-//			                     "Parameters={5} Attributes={6} Modifier={7}]", Alias, Library, Charset, TypeReference, Name, GetCollectionString(Parameters), GetCollectionString(Attributes), Modifier);
-//		}
-//	}
-//	
-//	public class DefaultValueExpression : Expression {
-//		
-//		TypeReference typeReference;
-//		
-//		public TypeReference TypeReference {
-//			get {
-//				return typeReference;
-//			}
-//			set {
-//				typeReference = value ?? TypeReference.Null;
-//				if (!typeReference.IsNull) typeReference.Parent = this;
-//			}
-//		}
-//		
-//		public DefaultValueExpression(TypeReference typeReference) {
-//			TypeReference = typeReference;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitDefaultValueExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[DefaultValueExpression TypeReference={0}]", TypeReference);
-//		}
-//	}
-//	
-//	public class DelegateDeclaration : AttributedNode {
-//		
-//		string name;
-//		
-//		TypeReference returnType;
-//		
-//		List<ParameterDeclarationExpression> parameters;
-//		
-//		List<TemplateDefinition> templates;
-//		
-//		public string Name {
-//			get {
-//				return name;
-//			}
-//			set {
-//				name = string.IsNullOrEmpty(value) ? "?" : value;
-//			}
-//		}
-//		
-//		public TypeReference ReturnType {
-//			get {
-//				return returnType;
-//			}
-//			set {
-//				returnType = value ?? TypeReference.Null;
-//				if (!returnType.IsNull) returnType.Parent = this;
-//			}
-//		}
-//		
-//		public List<ParameterDeclarationExpression> Parameters {
-//			get {
-//				return parameters;
-//			}
-//			set {
-//				parameters = value ?? new List<ParameterDeclarationExpression>();
-//			}
-//		}
-//		
-//		public List<TemplateDefinition> Templates {
-//			get {
-//				return templates;
-//			}
-//			set {
-//				templates = value ?? new List<TemplateDefinition>();
-//			}
-//		}
-//		
-//		public DelegateDeclaration(Modifiers modifier, List<AttributeSection> attributes) {
-//			Modifier = modifier;
-//			Attributes = attributes;
-//			name = "?";
-//			returnType = TypeReference.Null;
-//			parameters = new List<ParameterDeclarationExpression>();
-//			templates = new List<TemplateDefinition>();
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitDelegateDeclaration(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[DelegateDeclaration Name={0} ReturnType={1} Parameters={2} Templates={3} Attribu" +
-//			                     "tes={4} Modifier={5}]", Name, ReturnType, GetCollectionString(Parameters), GetCollectionString(Templates), GetCollectionString(Attributes), Modifier);
-//		}
-//	}
-//	
-//	public class DirectionExpression : Expression {
-//		
-//		FieldDirection fieldDirection;
-//		
-//		Expression expression;
-//		
-//		public FieldDirection FieldDirection {
-//			get {
-//				return fieldDirection;
-//			}
-//			set {
-//				fieldDirection = value;
-//			}
-//		}
-//		
-//		public Expression Expression {
-//			get {
-//				return expression;
-//			}
-//			set {
-//				expression = value ?? Expression.Null;
-//				if (!expression.IsNull) expression.Parent = this;
-//			}
-//		}
-//		
-//		public DirectionExpression(FieldDirection fieldDirection, Expression expression) {
-//			FieldDirection = fieldDirection;
-//			Expression = expression;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitDirectionExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[DirectionExpression FieldDirection={0} Expression={1}]", FieldDirection, Expression);
-//		}
-//	}
-//	
-//	public class DoLoopStatement : StatementWithEmbeddedStatement {
-//		
-//		Expression condition;
-//		
-//		ConditionType conditionType;
-//		
-//		ConditionPosition conditionPosition;
-//		
-//		public Expression Condition {
-//			get {
-//				return condition;
-//			}
-//			set {
-//				condition = value ?? Expression.Null;
-//				if (!condition.IsNull) condition.Parent = this;
-//			}
-//		}
-//		
-//		public ConditionType ConditionType {
-//			get {
-//				return conditionType;
-//			}
-//			set {
-//				conditionType = value;
-//			}
-//		}
-//		
-//		public ConditionPosition ConditionPosition {
-//			get {
-//				return conditionPosition;
-//			}
-//			set {
-//				conditionPosition = value;
-//			}
-//		}
-//		
-//		public DoLoopStatement(Expression condition, Statement embeddedStatement, ConditionType conditionType, ConditionPosition conditionPosition) {
-//			Condition = condition;
-//			EmbeddedStatement = embeddedStatement;
-//			ConditionType = conditionType;
-//			ConditionPosition = conditionPosition;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitDoLoopStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[DoLoopStatement Condition={0} ConditionType={1} ConditionPosition={2} EmbeddedSt" +
-//			                     "atement={3}]", Condition, ConditionType, ConditionPosition, EmbeddedStatement);
-//		}
-//	}
-//	
-//	public class ElseIfSection : StatementWithEmbeddedStatement {
-//		
-//		Expression condition;
-//		
-//		public Expression Condition {
-//			get {
-//				return condition;
-//			}
-//			set {
-//				condition = value ?? Expression.Null;
-//				if (!condition.IsNull) condition.Parent = this;
-//			}
-//		}
-//		
-//		public ElseIfSection(Expression condition, Statement embeddedStatement) {
-//			Condition = condition;
-//			EmbeddedStatement = embeddedStatement;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitElseIfSection(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ElseIfSection Condition={0} EmbeddedStatement={1}]", Condition, EmbeddedStatement);
-//		}
-//	}
-//	
-//	public class EndStatement : Statement {
-//		
-//		public EndStatement() {
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitEndStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return "[EndStatement]";
-//		}
-//	}
-//	
-//	public class EraseStatement : Statement {
-//		
-//		List<Expression> expressions;
-//		
-//		public List<Expression> Expressions {
-//			get {
-//				return expressions;
-//			}
-//			set {
-//				expressions = value ?? new List<Expression>();
-//			}
-//		}
-//		
-//		public EraseStatement() {
-//			expressions = new List<Expression>();
-//		}
-//		
-//		public EraseStatement(List<Expression> expressions) {
-//			Expressions = expressions;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitEraseStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[EraseStatement Expressions={0}]", GetCollectionString(Expressions));
-//		}
-//	}
-//	
-//	public class ErrorStatement : Statement {
-//		
-//		Expression expression;
-//		
-//		public Expression Expression {
-//			get {
-//				return expression;
-//			}
-//			set {
-//				expression = value ?? Expression.Null;
-//				if (!expression.IsNull) expression.Parent = this;
-//			}
-//		}
-//		
-//		public ErrorStatement(Expression expression) {
-//			Expression = expression;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitErrorStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ErrorStatement Expression={0}]", Expression);
-//		}
-//	}
-//	
-//	public class EventAddRegion : EventAddRemoveRegion {
-//		
-//		public EventAddRegion(List<AttributeSection> attributes) :
-//			base(attributes) {
-//		}
-//		
-//		public static EventAddRegion Null {
-//			get {
-//				return NullEventAddRegion.Instance;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitEventAddRegion(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[EventAddRegion Block={0} Parameters={1} Attributes={2} Modifier={3}]", Block, GetCollectionString(Parameters), GetCollectionString(Attributes), Modifier);
-//		}
-//	}
-//	
-//	internal sealed class NullEventAddRegion : EventAddRegion {
-//		
-//		private NullEventAddRegion() :
-//			base(null) {
-//		}
-//		
-//		internal static NullEventAddRegion Instance = new NullEventAddRegion();
-//		
-//		public override bool IsNull {
-//			get {
-//				return true;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return null;
-//		}
-//		
-//		public override string ToString() {
-//			return "[NullEventAddRegion]";
-//		}
-//	}
-//	
-//	public abstract class EventAddRemoveRegion : AttributedNode, INullable {
-//		
-//		BlockStatement block;
-//		
-//		List<ParameterDeclarationExpression> parameters;
-//		
-//		public BlockStatement Block {
-//			get {
-//				return block;
-//			}
-//			set {
-//				block = value ?? BlockStatement.Null;
-//				if (!block.IsNull) block.Parent = this;
-//			}
-//		}
-//		
-//		public List<ParameterDeclarationExpression> Parameters {
-//			get {
-//				return parameters;
-//			}
-//			set {
-//				parameters = value ?? new List<ParameterDeclarationExpression>();
-//			}
-//		}
-//		
-//		protected EventAddRemoveRegion(List<AttributeSection> attributes) {
-//			Attributes = attributes;
-//			block = BlockStatement.Null;
-//			parameters = new List<ParameterDeclarationExpression>();
-//		}
-//		
-//		public virtual bool IsNull {
-//			get {
-//				return false;
-//			}
-//		}
-//	}
-//	
-//	public class EventDeclaration : MemberNode {
-//		
-//		EventAddRegion addRegion;
-//		
-//		EventRemoveRegion removeRegion;
-//		
-//		EventRaiseRegion raiseRegion;
-//		
-//		Location bodyStart;
-//		
-//		Location bodyEnd;
-//		
-//		Expression initializer;
-//		
-//		public EventAddRegion AddRegion {
-//			get {
-//				return addRegion;
-//			}
-//			set {
-//				addRegion = value ?? EventAddRegion.Null;
-//				if (!addRegion.IsNull) addRegion.Parent = this;
-//			}
-//		}
-//		
-//		public EventRemoveRegion RemoveRegion {
-//			get {
-//				return removeRegion;
-//			}
-//			set {
-//				removeRegion = value ?? EventRemoveRegion.Null;
-//				if (!removeRegion.IsNull) removeRegion.Parent = this;
-//			}
-//		}
-//		
-//		public EventRaiseRegion RaiseRegion {
-//			get {
-//				return raiseRegion;
-//			}
-//			set {
-//				raiseRegion = value ?? EventRaiseRegion.Null;
-//				if (!raiseRegion.IsNull) raiseRegion.Parent = this;
-//			}
-//		}
-//		
-//		public Location BodyStart {
-//			get {
-//				return bodyStart;
-//			}
-//			set {
-//				bodyStart = value;
-//			}
-//		}
-//		
-//		public Location BodyEnd {
-//			get {
-//				return bodyEnd;
-//			}
-//			set {
-//				bodyEnd = value;
-//			}
-//		}
-//		
-//		public Expression Initializer {
-//			get {
-//				return initializer;
-//			}
-//			set {
-//				initializer = value ?? Expression.Null;
-//				if (!initializer.IsNull) initializer.Parent = this;
-//			}
-//		}
-//		
-//		public EventDeclaration() {
-//			addRegion = EventAddRegion.Null;
-//			removeRegion = EventRemoveRegion.Null;
-//			raiseRegion = EventRaiseRegion.Null;
-//			bodyStart = Location.Empty;
-//			bodyEnd = Location.Empty;
-//			initializer = Expression.Null;
-//		}
-//		
-//		public bool HasAddRegion {
-//			get {
-//				return !addRegion.IsNull;
-//			}
-//		}
-//		
-//		public bool HasRemoveRegion {
-//			get {
-//				return !removeRegion.IsNull;
-//			}
-//		}
-//		
-//		public bool HasRaiseRegion {
-//			get {
-//				return !raiseRegion.IsNull;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitEventDeclaration(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[EventDeclaration AddRegion={0} RemoveRegion={1} RaiseRegion={2} BodyStart={3} Bo" +
-//			                     "dyEnd={4} Initializer={5} InterfaceImplementations={6} TypeReference={7} Name={8" +
-//			                     "} Parameters={9} Attributes={10} Modifier={11}]", AddRegion, RemoveRegion, RaiseRegion, BodyStart, BodyEnd, Initializer, GetCollectionString(InterfaceImplementations), TypeReference, Name, GetCollectionString(Parameters), GetCollectionString(Attributes), Modifier);
-//		}
-//	}
-//	
-//	public class EventRaiseRegion : EventAddRemoveRegion {
-//		
-//		public EventRaiseRegion(List<AttributeSection> attributes) :
-//			base(attributes) {
-//		}
-//		
-//		public static EventRaiseRegion Null {
-//			get {
-//				return NullEventRaiseRegion.Instance;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitEventRaiseRegion(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[EventRaiseRegion Block={0} Parameters={1} Attributes={2} Modifier={3}]", Block, GetCollectionString(Parameters), GetCollectionString(Attributes), Modifier);
-//		}
-//	}
-//	
-//	internal sealed class NullEventRaiseRegion : EventRaiseRegion {
-//		
-//		private NullEventRaiseRegion() :
-//			base(null) {
-//		}
-//		
-//		internal static NullEventRaiseRegion Instance = new NullEventRaiseRegion();
-//		
-//		public override bool IsNull {
-//			get {
-//				return true;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return null;
-//		}
-//		
-//		public override string ToString() {
-//			return "[NullEventRaiseRegion]";
-//		}
-//	}
-//	
-//	public class EventRemoveRegion : EventAddRemoveRegion {
-//		
-//		public EventRemoveRegion(List<AttributeSection> attributes) :
-//			base(attributes) {
-//		}
-//		
-//		public static EventRemoveRegion Null {
-//			get {
-//				return NullEventRemoveRegion.Instance;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitEventRemoveRegion(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[EventRemoveRegion Block={0} Parameters={1} Attributes={2} Modifier={3}]", Block, GetCollectionString(Parameters), GetCollectionString(Attributes), Modifier);
-//		}
-//	}
-//	
-//	internal sealed class NullEventRemoveRegion : EventRemoveRegion {
-//		
-//		private NullEventRemoveRegion() :
-//			base(null) {
-//		}
-//		
-//		internal static NullEventRemoveRegion Instance = new NullEventRemoveRegion();
-//		
-//		public override bool IsNull {
-//			get {
-//				return true;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return null;
-//		}
-//		
-//		public override string ToString() {
-//			return "[NullEventRemoveRegion]";
-//		}
-//	}
-//	
-//	public class ExitStatement : Statement {
-//		
-//		ExitType exitType;
-//		
-//		public ExitType ExitType {
-//			get {
-//				return exitType;
-//			}
-//			set {
-//				exitType = value;
-//			}
-//		}
-//		
-//		public ExitStatement(ExitType exitType) {
-//			ExitType = exitType;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitExitStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ExitStatement ExitType={0}]", ExitType);
-//		}
-//	}
-//	
-//	public class ExpressionRangeVariable : AbstractNode, INullable {
-//		
-//		string identifier;
-//		
-//		Expression expression;
-//		
-//		TypeReference type;
-//		
-//		public string Identifier {
-//			get {
-//				return identifier;
-//			}
-//			set {
-//				identifier = value ?? "";
-//			}
-//		}
-//		
-//		public Expression Expression {
-//			get {
-//				return expression;
-//			}
-//			set {
-//				expression = value ?? Expression.Null;
-//				if (!expression.IsNull) expression.Parent = this;
-//			}
-//		}
-//		
-//		public TypeReference Type {
-//			get {
-//				return type;
-//			}
-//			set {
-//				type = value ?? TypeReference.Null;
-//				if (!type.IsNull) type.Parent = this;
-//			}
-//		}
-//		
-//		public ExpressionRangeVariable() {
-//			identifier = "";
-//			expression = Expression.Null;
-//			type = TypeReference.Null;
-//		}
-//		
-//		public virtual bool IsNull {
-//			get {
-//				return false;
-//			}
-//		}
-//		
-//		public static ExpressionRangeVariable Null {
-//			get {
-//				return NullExpressionRangeVariable.Instance;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitExpressionRangeVariable(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ExpressionRangeVariable Identifier={0} Expression={1} Type={2}]", Identifier, Expression, Type);
-//		}
-//	}
-//	
-//	internal sealed class NullExpressionRangeVariable : ExpressionRangeVariable {
-//		
-//		internal static NullExpressionRangeVariable Instance = new NullExpressionRangeVariable();
-//		
-//		public override bool IsNull {
-//			get {
-//				return true;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return null;
-//		}
-//		
-//		public override string ToString() {
-//			return "[NullExpressionRangeVariable]";
-//		}
-//	}
-//	
-//	public class ExpressionStatement : Statement {
-//		
-//		Expression expression;
-//		
-//		public Expression Expression {
-//			get {
-//				return expression;
-//			}
-//			set {
-//				expression = value ?? Expression.Null;
-//				if (!expression.IsNull) expression.Parent = this;
-//			}
-//		}
-//		
-//		public ExpressionStatement(Expression expression) {
-//			Expression = expression;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitExpressionStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ExpressionStatement Expression={0}]", Expression);
-//		}
-//	}
-//	
-//	public class ExternAliasDirective : AbstractNode {
-//		
-//		string name;
-//		
-//		public string Name {
-//			get {
-//				return name;
-//			}
-//			set {
-//				name = value ?? "";
-//			}
-//		}
-//		
-//		public ExternAliasDirective() {
-//			name = "";
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitExternAliasDirective(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ExternAliasDirective Name={0}]", Name);
-//		}
-//	}
-//	
-//	public class FieldDeclaration : AttributedNode {
-//		
-//		TypeReference typeReference;
-//		
-//		List<VariableDeclaration> fields;
-//		
-//		public TypeReference TypeReference {
-//			get {
-//				return typeReference;
-//			}
-//			set {
-//				typeReference = value ?? TypeReference.Null;
-//				if (!typeReference.IsNull) typeReference.Parent = this;
-//			}
-//		}
-//		
-//		public List<VariableDeclaration> Fields {
-//			get {
-//				return fields;
-//			}
-//			set {
-//				fields = value ?? new List<VariableDeclaration>();
-//			}
-//		}
-//		
-//		public FieldDeclaration(List<AttributeSection> attributes) {
-//			Attributes = attributes;
-//			typeReference = TypeReference.Null;
-//			fields = new List<VariableDeclaration>();
-//		}
-//		
-//		public FieldDeclaration(List<AttributeSection> attributes, TypeReference typeReference, Modifiers modifier) {
-//			Attributes = attributes;
-//			TypeReference = typeReference;
-//			Modifier = modifier;
-//			fields = new List<VariableDeclaration>();
-//		}
-//		
-//
-//		public TypeReference GetTypeForField(int fieldIndex)
-//		{
-//			if (!typeReference.IsNull) {
-//				return typeReference;
-//			}
-//			return ((VariableDeclaration)Fields[fieldIndex]).TypeReference;
-//		}
-//		
-//
-//		public VariableDeclaration GetVariableDeclaration(string variableName)
-//		{
-//			foreach (VariableDeclaration variableDeclaration in Fields) {
-//				if (variableDeclaration.Name == variableName) {
-//					return variableDeclaration;
-//				}
-//			}
-//			return null;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitFieldDeclaration(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[FieldDeclaration TypeReference={0} Fields={1} Attributes={2} Modifier={3}]", TypeReference, GetCollectionString(Fields), GetCollectionString(Attributes), Modifier);
-//		}
-//	}
-//	
-//	public class ForeachStatement : StatementWithEmbeddedStatement {
-//		
-//		TypeReference typeReference;
-//		
-//		string variableName;
-//		
-//		Expression expression;
-//		
-//		Expression nextExpression;
-//		
-//		public TypeReference TypeReference {
-//			get {
-//				return typeReference;
-//			}
-//			set {
-//				typeReference = value ?? TypeReference.Null;
-//				if (!typeReference.IsNull) typeReference.Parent = this;
-//			}
-//		}
-//		
-//		public string VariableName {
-//			get {
-//				return variableName;
-//			}
-//			set {
-//				variableName = value ?? "";
-//			}
-//		}
-//		
-//		public Expression Expression {
-//			get {
-//				return expression;
-//			}
-//			set {
-//				expression = value ?? Expression.Null;
-//				if (!expression.IsNull) expression.Parent = this;
-//			}
-//		}
-//		
-//		public Expression NextExpression {
-//			get {
-//				return nextExpression;
-//			}
-//			set {
-//				nextExpression = value ?? Expression.Null;
-//				if (!nextExpression.IsNull) nextExpression.Parent = this;
-//			}
-//		}
-//		
-//		public ForeachStatement(TypeReference typeReference, string variableName, Expression expression, Statement embeddedStatement) {
-//			TypeReference = typeReference;
-//			VariableName = variableName;
-//			Expression = expression;
-//			EmbeddedStatement = embeddedStatement;
-//			nextExpression = Expression.Null;
-//		}
-//		
-//		public ForeachStatement(TypeReference typeReference, string variableName, Expression expression, Statement embeddedStatement, Expression nextExpression) {
-//			TypeReference = typeReference;
-//			VariableName = variableName;
-//			Expression = expression;
-//			EmbeddedStatement = embeddedStatement;
-//			NextExpression = nextExpression;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitForeachStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ForeachStatement TypeReference={0} VariableName={1} Expression={2} NextExpressio" +
-//			                     "n={3} EmbeddedStatement={4}]", TypeReference, VariableName, Expression, NextExpression, EmbeddedStatement);
-//		}
-//	}
-//	
-//	public class ForNextStatement : StatementWithEmbeddedStatement {
-//		
-//		Expression start;
-//		
-//		Expression end;
-//		
-//		Expression step;
-//		
-//		List<Expression> nextExpressions;
-//		
-//		TypeReference typeReference;
-//		
-//		string variableName;
-//		
-//		Expression loopVariableExpression;
-//		
-//		public Expression Start {
-//			get {
-//				return start;
-//			}
-//			set {
-//				start = value ?? Expression.Null;
-//				if (!start.IsNull) start.Parent = this;
-//			}
-//		}
-//		
-//		public Expression End {
-//			get {
-//				return end;
-//			}
-//			set {
-//				end = value ?? Expression.Null;
-//				if (!end.IsNull) end.Parent = this;
-//			}
-//		}
-//		
-//		public Expression Step {
-//			get {
-//				return step;
-//			}
-//			set {
-//				step = value ?? Expression.Null;
-//				if (!step.IsNull) step.Parent = this;
-//			}
-//		}
-//		
-//		public List<Expression> NextExpressions {
-//			get {
-//				return nextExpressions;
-//			}
-//			set {
-//				nextExpressions = value ?? new List<Expression>();
-//			}
-//		}
-//		
-//		public TypeReference TypeReference {
-//			get {
-//				return typeReference;
-//			}
-//			set {
-//				typeReference = value ?? TypeReference.Null;
-//				if (!typeReference.IsNull) typeReference.Parent = this;
-//			}
-//		}
-//		
-//		public string VariableName {
-//			get {
-//				return variableName;
-//			}
-//			set {
-//				variableName = value ?? "";
-//			}
-//		}
-//		
-//		public Expression LoopVariableExpression {
-//			get {
-//				return loopVariableExpression;
-//			}
-//			set {
-//				loopVariableExpression = value ?? Expression.Null;
-//				if (!loopVariableExpression.IsNull) loopVariableExpression.Parent = this;
-//			}
-//		}
-//		
-//		public ForNextStatement() {
-//			start = Expression.Null;
-//			end = Expression.Null;
-//			step = Expression.Null;
-//			nextExpressions = new List<Expression>();
-//			typeReference = TypeReference.Null;
-//			variableName = "";
-//			loopVariableExpression = Expression.Null;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitForNextStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ForNextStatement Start={0} End={1} Step={2} NextExpressions={3} TypeReference={4" +
-//			                     "} VariableName={5} LoopVariableExpression={6} EmbeddedStatement={7}]", Start, End, Step, GetCollectionString(NextExpressions), TypeReference, VariableName, LoopVariableExpression, EmbeddedStatement);
-//		}
-//	}
-//	
-//	public class GotoStatement : Statement {
-//		
-//		string label;
-//		
-//		public string Label {
-//			get {
-//				return label;
-//			}
-//			set {
-//				label = value ?? "";
-//			}
-//		}
-//		
-//		public GotoStatement(string label) {
-//			Label = label;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitGotoStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[GotoStatement Label={0}]", Label);
-//		}
-//	}
-//	
-//	public class IfElseStatement : Statement {
-//		
-//		Expression condition;
-//		
-//		List<Statement> trueStatement;
-//		
-//		List<Statement> falseStatement;
-//		
-//		List<ElseIfSection> elseIfSections;
-//		
-//		public Expression Condition {
-//			get {
-//				return condition;
-//			}
-//			set {
-//				condition = value ?? Expression.Null;
-//				if (!condition.IsNull) condition.Parent = this;
-//			}
-//		}
-//		
-//		public List<Statement> TrueStatement {
-//			get {
-//				return trueStatement;
-//			}
-//			set {
-//				trueStatement = value ?? new List<Statement>();
-//			}
-//		}
-//		
-//		public List<Statement> FalseStatement {
-//			get {
-//				return falseStatement;
-//			}
-//			set {
-//				falseStatement = value ?? new List<Statement>();
-//			}
-//		}
-//		
-//		public List<ElseIfSection> ElseIfSections {
-//			get {
-//				return elseIfSections;
-//			}
-//			set {
-//				elseIfSections = value ?? new List<ElseIfSection>();
-//			}
-//		}
-//		
-//		public IfElseStatement(Expression condition) {
-//			Condition = condition;
-//			trueStatement = new List<Statement>();
-//			falseStatement = new List<Statement>();
-//			elseIfSections = new List<ElseIfSection>();
-//		}
-//		
-//
-//		public IfElseStatement(Expression condition, Statement trueStatement)
-//			: this(condition) {
-//			this.trueStatement.Add(Statement.CheckNull(trueStatement));
-//			if (trueStatement != null) trueStatement.Parent = this;
-//		}
-//		
-//		public bool HasElseStatements {
-//			get {
-//				return falseStatement.Count > 0;
-//			}
-//		}
-//		
-//		public bool HasElseIfSections {
-//			get {
-//				return elseIfSections.Count > 0;
-//			}
-//		}
-//		
-//
-//		public IfElseStatement(Expression condition, Statement trueStatement, Statement falseStatement)
-//			: this(condition) {
-//			this.trueStatement.Add(Statement.CheckNull(trueStatement));
-//			this.falseStatement.Add(Statement.CheckNull(falseStatement));
-//			if (trueStatement != null) trueStatement.Parent = this;
-//			if (falseStatement != null) falseStatement.Parent = this;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitIfElseStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[IfElseStatement Condition={0} TrueStatement={1} FalseStatement={2} ElseIfSection" +
-//			                     "s={3}]", Condition, GetCollectionString(TrueStatement), GetCollectionString(FalseStatement), GetCollectionString(ElseIfSections));
-//		}
-//	}
-//	
-//	public class InterfaceImplementation : AbstractNode {
-//		
-//		TypeReference interfaceType;
-//		
-//		string memberName;
-//		
-//		public TypeReference InterfaceType {
-//			get {
-//				return interfaceType;
-//			}
-//			set {
-//				interfaceType = value ?? TypeReference.Null;
-//				if (!interfaceType.IsNull) interfaceType.Parent = this;
-//			}
-//		}
-//		
-//		public string MemberName {
-//			get {
-//				return memberName;
-//			}
-//			set {
-//				memberName = string.IsNullOrEmpty(value) ? "?" : value;
-//			}
-//		}
-//		
-//		public InterfaceImplementation(TypeReference interfaceType, string memberName) {
-//			InterfaceType = interfaceType;
-//			MemberName = memberName;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitInterfaceImplementation(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[InterfaceImplementation InterfaceType={0} MemberName={1}]", InterfaceType, MemberName);
-//		}
-//	}
-//	
-//	public class InvocationExpression : Expression {
-//		
-//		Expression targetObject;
-//		
-//		List<Expression> arguments;
-//		
-//		public Expression TargetObject {
-//			get {
-//				return targetObject;
-//			}
-//			set {
-//				targetObject = value ?? Expression.Null;
-//				if (!targetObject.IsNull) targetObject.Parent = this;
-//			}
-//		}
-//		
-//		public List<Expression> Arguments {
-//			get {
-//				return arguments;
-//			}
-//			set {
-//				arguments = value ?? new List<Expression>();
-//			}
-//		}
-//		
-//		public InvocationExpression(Expression targetObject) {
-//			TargetObject = targetObject;
-//			arguments = new List<Expression>();
-//		}
-//		
-//		public InvocationExpression(Expression targetObject, List<Expression> arguments) {
-//			TargetObject = targetObject;
-//			Arguments = arguments;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitInvocationExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[InvocationExpression TargetObject={0} Arguments={1}]", TargetObject, GetCollectionString(Arguments));
-//		}
-//	}
-//	
-//	public class LabelStatement : Statement {
-//		
-//		string label;
-//		
-//		public string Label {
-//			get {
-//				return label;
-//			}
-//			set {
-//				label = value ?? "";
-//			}
-//		}
-//		
-//		public LabelStatement(string label) {
-//			Label = label;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitLabelStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[LabelStatement Label={0}]", Label);
-//		}
-//	}
-//	
-//	public class LambdaExpression : Expression {
-//		
-//		List<ParameterDeclarationExpression> parameters;
-//		
-//		Statement statementBody;
-//		
-//		Expression expressionBody;
-//		
-//		TypeReference returnType;
-//		
-//		public List<ParameterDeclarationExpression> Parameters {
-//			get {
-//				return parameters;
-//			}
-//			set {
-//				parameters = value ?? new List<ParameterDeclarationExpression>();
-//			}
-//		}
-//		
-//		public Statement StatementBody {
-//			get {
-//				return statementBody;
-//			}
-//			set {
-//				statementBody = value ?? Statement.Null;
-//				if (!statementBody.IsNull) statementBody.Parent = this;
-//			}
-//		}
-//		
-//		public Expression ExpressionBody {
-//			get {
-//				return expressionBody;
-//			}
-//			set {
-//				expressionBody = value ?? Expression.Null;
-//				if (!expressionBody.IsNull) expressionBody.Parent = this;
-//			}
-//		}
-//		
-//		public TypeReference ReturnType {
-//			get {
-//				return returnType;
-//			}
-//			set {
-//				returnType = value ?? TypeReference.Null;
-//				if (!returnType.IsNull) returnType.Parent = this;
-//			}
-//		}
-//		
-//		public LambdaExpression() {
-//			parameters = new List<ParameterDeclarationExpression>();
-//			statementBody = Statement.Null;
-//			expressionBody = Expression.Null;
-//			returnType = TypeReference.Null;
-//		}
-//		
-//		public Location ExtendedEndLocation { get; set; }
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitLambdaExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[LambdaExpression Parameters={0} StatementBody={1} ExpressionBody={2} ReturnType=" +
-//			                     "{3}]", GetCollectionString(Parameters), StatementBody, ExpressionBody, ReturnType);
-//		}
-//	}
-//	
-//	public class LockStatement : StatementWithEmbeddedStatement {
-//		
-//		Expression lockExpression;
-//		
-//		public Expression LockExpression {
-//			get {
-//				return lockExpression;
-//			}
-//			set {
-//				lockExpression = value ?? Expression.Null;
-//				if (!lockExpression.IsNull) lockExpression.Parent = this;
-//			}
-//		}
-//		
-//		public LockStatement(Expression lockExpression, Statement embeddedStatement) {
-//			LockExpression = lockExpression;
-//			EmbeddedStatement = embeddedStatement;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitLockStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[LockStatement LockExpression={0} EmbeddedStatement={1}]", LockExpression, EmbeddedStatement);
-//		}
-//	}
-//	
-//	public class MemberInitializerExpression : Expression {
-//		
-//		string name;
-//		
-//		bool isKey;
-//		
-//		Expression expression;
-//		
-//		public string Name {
-//			get {
-//				return name;
-//			}
-//			set {
-//				name = value ?? "";
-//			}
-//		}
-//		
-//		public bool IsKey {
-//			get {
-//				return isKey;
-//			}
-//			set {
-//				isKey = value;
-//			}
-//		}
-//		
-//		public Expression Expression {
-//			get {
-//				return expression;
-//			}
-//			set {
-//				expression = value ?? Expression.Null;
-//				if (!expression.IsNull) expression.Parent = this;
-//			}
-//		}
-//		
-//		public MemberInitializerExpression() {
-//			name = "";
-//			expression = Expression.Null;
-//		}
-//		
-//		public MemberInitializerExpression(string name, Expression expression) {
-//			Name = name;
-//			Expression = expression;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitMemberInitializerExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[MemberInitializerExpression Name={0} IsKey={1} Expression={2}]", Name, IsKey, Expression);
-//		}
-//	}
-//	
-//	public abstract class MemberNode : ParametrizedNode {
-//		
-//		List<InterfaceImplementation> interfaceImplementations;
-//		
-//		TypeReference typeReference;
-//		
-//		public List<InterfaceImplementation> InterfaceImplementations {
-//			get {
-//				return interfaceImplementations;
-//			}
-//			set {
-//				interfaceImplementations = value ?? new List<InterfaceImplementation>();
-//			}
-//		}
-//		
-//		public TypeReference TypeReference {
-//			get {
-//				return typeReference;
-//			}
-//			set {
-//				typeReference = value ?? TypeReference.Null;
-//				if (!typeReference.IsNull) typeReference.Parent = this;
-//			}
-//		}
-//		
-//		protected MemberNode() {
-//			interfaceImplementations = new List<InterfaceImplementation>();
-//			typeReference = TypeReference.Null;
-//		}
-//		
-//		protected MemberNode(Modifiers modifier, List<AttributeSection> attributes, string name, List<ParameterDeclarationExpression> parameters) {
-//			Modifier = modifier;
-//			Attributes = attributes;
-//			Name = name;
-//			Parameters = parameters;
-//			interfaceImplementations = new List<InterfaceImplementation>();
-//			typeReference = TypeReference.Null;
-//		}
-//	}
-//	
-//	public class MemberReferenceExpression : Expression {
-//		
-//		Expression targetObject;
-//		
-//		string memberName;
-//		
-//		List<TypeReference> typeArguments;
-//		
-//		public Expression TargetObject {
-//			get {
-//				return targetObject;
-//			}
-//			set {
-//				targetObject = value ?? Expression.Null;
-//				if (!targetObject.IsNull) targetObject.Parent = this;
-//			}
-//		}
-//		
-//		public string MemberName {
-//			get {
-//				return memberName;
-//			}
-//			set {
-//				memberName = value ?? "";
-//			}
-//		}
-//		
-//		public List<TypeReference> TypeArguments {
-//			get {
-//				return typeArguments;
-//			}
-//			set {
-//				typeArguments = value ?? new List<TypeReference>();
-//			}
-//		}
-//		
-//		public MemberReferenceExpression(Expression targetObject, string memberName) {
-//			TargetObject = targetObject;
-//			MemberName = memberName;
-//			typeArguments = new List<TypeReference>();
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitMemberReferenceExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[MemberReferenceExpression TargetObject={0} MemberName={1} TypeArguments={2}]", TargetObject, MemberName, GetCollectionString(TypeArguments));
-//		}
-//	}
-//	
-//	public class MethodDeclaration : MemberNode {
-//		
-//		BlockStatement body;
-//		
-//		List<string> handlesClause;
-//		
-//		List<TemplateDefinition> templates;
-//		
-//		bool isExtensionMethod;
-//		
-//		public BlockStatement Body {
-//			get {
-//				return body;
-//			}
-//			set {
-//				body = value ?? BlockStatement.Null;
-//				if (!body.IsNull) body.Parent = this;
-//			}
-//		}
-//		
-//		public List<string> HandlesClause {
-//			get {
-//				return handlesClause;
-//			}
-//			set {
-//				handlesClause = value ?? new List<String>();
-//			}
-//		}
-//		
-//		public List<TemplateDefinition> Templates {
-//			get {
-//				return templates;
-//			}
-//			set {
-//				templates = value ?? new List<TemplateDefinition>();
-//			}
-//		}
-//		
-//		public bool IsExtensionMethod {
-//			get {
-//				return isExtensionMethod;
-//			}
-//			set {
-//				isExtensionMethod = value;
-//			}
-//		}
-//		
-//		public MethodDeclaration() {
-//			body = BlockStatement.Null;
-//			handlesClause = new List<String>();
-//			templates = new List<TemplateDefinition>();
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitMethodDeclaration(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[MethodDeclaration Body={0} HandlesClause={1} Templates={2} IsExtensionMethod={3}" +
-//			                     " InterfaceImplementations={4} TypeReference={5} Name={6} Parameters={7} Attribut" +
-//			                     "es={8} Modifier={9}]", Body, GetCollectionString(HandlesClause), GetCollectionString(Templates), IsExtensionMethod, GetCollectionString(InterfaceImplementations), TypeReference, Name, GetCollectionString(Parameters), GetCollectionString(Attributes), Modifier);
-//		}
-//	}
-//	
-//	public class NamedArgumentExpression : Expression {
-//		
-//		string name;
-//		
-//		Expression expression;
-//		
-//		public string Name {
-//			get {
-//				return name;
-//			}
-//			set {
-//				name = value ?? "";
-//			}
-//		}
-//		
-//		public Expression Expression {
-//			get {
-//				return expression;
-//			}
-//			set {
-//				expression = value ?? Expression.Null;
-//				if (!expression.IsNull) expression.Parent = this;
-//			}
-//		}
-//		
-//		public NamedArgumentExpression() {
-//			name = "";
-//			expression = Expression.Null;
-//		}
-//		
-//		public NamedArgumentExpression(string name, Expression expression) {
-//			Name = name;
-//			Expression = expression;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitNamedArgumentExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[NamedArgumentExpression Name={0} Expression={1}]", Name, Expression);
-//		}
-//	}
-//	
-//	public class NamespaceDeclaration : AbstractNode {
-//		
-//		string name;
-//		
-//		public string Name {
-//			get {
-//				return name;
-//			}
-//			set {
-//				name = value ?? "";
-//			}
-//		}
-//		
-//		public NamespaceDeclaration(string name) {
-//			Name = name;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitNamespaceDeclaration(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[NamespaceDeclaration Name={0}]", Name);
-//		}
-//	}
-//	
-//	public class ObjectCreateExpression : Expression {
-//		
-//		TypeReference createType;
-//		
-//		List<Expression> parameters;
-//		
-//		CollectionInitializerExpression objectInitializer;
-//		
-//		public TypeReference CreateType {
-//			get {
-//				return createType;
-//			}
-//			set {
-//				createType = value ?? TypeReference.Null;
-//				if (!createType.IsNull) createType.Parent = this;
-//			}
-//		}
-//		
-//		public List<Expression> Parameters {
-//			get {
-//				return parameters;
-//			}
-//			set {
-//				parameters = value ?? new List<Expression>();
-//			}
-//		}
-//		
-//		public CollectionInitializerExpression ObjectInitializer {
-//			get {
-//				return objectInitializer;
-//			}
-//			set {
-//				objectInitializer = value ?? CollectionInitializerExpression.Null;
-//				if (!objectInitializer.IsNull) objectInitializer.Parent = this;
-//			}
-//		}
-//		
-//		public ObjectCreateExpression(TypeReference createType, List<Expression> parameters) {
-//			CreateType = createType;
-//			Parameters = parameters;
-//			objectInitializer = CollectionInitializerExpression.Null;
-//		}
-//		
-//		public bool IsAnonymousType {
-//			get {
-//				return createType.IsNull || string.IsNullOrEmpty(createType.Type);
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitObjectCreateExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ObjectCreateExpression CreateType={0} Parameters={1} ObjectInitializer={2}]", CreateType, GetCollectionString(Parameters), ObjectInitializer);
-//		}
-//	}
-//	
-//	public class OnErrorStatement : StatementWithEmbeddedStatement {
-//		
-//		public OnErrorStatement(Statement embeddedStatement) {
-//			EmbeddedStatement = embeddedStatement;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitOnErrorStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[OnErrorStatement EmbeddedStatement={0}]", EmbeddedStatement);
-//		}
-//	}
-//	
-//	public class OperatorDeclaration : MethodDeclaration {
-//		
-//		ConversionType conversionType;
-//		
-//		OverloadableOperatorType overloadableOperator;
-//		
-//		public ConversionType ConversionType {
-//			get {
-//				return conversionType;
-//			}
-//			set {
-//				conversionType = value;
-//			}
-//		}
-//		
-//		public OverloadableOperatorType OverloadableOperator {
-//			get {
-//				return overloadableOperator;
-//			}
-//			set {
-//				overloadableOperator = value;
-//			}
-//		}
-//		
-//		public OperatorDeclaration() {
-//		}
-//		
-//		public bool IsConversionOperator {
-//			get {
-//				return conversionType != ConversionType.None;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitOperatorDeclaration(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[OperatorDeclaration ConversionType={0} OverloadableOperator={1} Body={2} Handles" +
-//			                     "Clause={3} Templates={4} IsExtensionMethod={5} InterfaceImplementations={6} Type" +
-//			                     "Reference={7} Name={8} Parameters={9} Attributes={10} Modifier={11}]", ConversionType, OverloadableOperator, Body, GetCollectionString(HandlesClause), GetCollectionString(Templates), IsExtensionMethod, GetCollectionString(InterfaceImplementations), TypeReference, Name, GetCollectionString(Parameters), GetCollectionString(Attributes), Modifier);
-//		}
-//	}
-//	
-//	public class ParameterDeclarationExpression : Expression {
-//		
-//		List<AttributeSection> attributes;
-//		
-//		string parameterName;
-//		
-//		TypeReference typeReference;
-//		
-//		ParameterModifiers paramModifier;
-//		
-//		Expression defaultValue;
-//		
-//		public List<AttributeSection> Attributes {
-//			get {
-//				return attributes;
-//			}
-//			set {
-//				attributes = value ?? new List<AttributeSection>();
-//			}
-//		}
-//		
-//		public string ParameterName {
-//			get {
-//				return parameterName;
-//			}
-//			set {
-//				parameterName = string.IsNullOrEmpty(value) ? "?" : value;
-//			}
-//		}
-//		
-//		public TypeReference TypeReference {
-//			get {
-//				return typeReference;
-//			}
-//			set {
-//				typeReference = value ?? TypeReference.Null;
-//				if (!typeReference.IsNull) typeReference.Parent = this;
-//			}
-//		}
-//		
-//		public ParameterModifiers ParamModifier {
-//			get {
-//				return paramModifier;
-//			}
-//			set {
-//				paramModifier = value;
-//			}
-//		}
-//		
-//		public Expression DefaultValue {
-//			get {
-//				return defaultValue;
-//			}
-//			set {
-//				defaultValue = value ?? Expression.Null;
-//				if (!defaultValue.IsNull) defaultValue.Parent = this;
-//			}
-//		}
-//		
-//		public ParameterDeclarationExpression(TypeReference typeReference, string parameterName) {
-//			TypeReference = typeReference;
-//			ParameterName = parameterName;
-//			attributes = new List<AttributeSection>();
-//			defaultValue = Expression.Null;
-//		}
-//		
-//		public ParameterDeclarationExpression(TypeReference typeReference, string parameterName, ParameterModifiers paramModifier) {
-//			TypeReference = typeReference;
-//			ParameterName = parameterName;
-//			ParamModifier = paramModifier;
-//			attributes = new List<AttributeSection>();
-//			defaultValue = Expression.Null;
-//		}
-//		
-//		public ParameterDeclarationExpression(TypeReference typeReference, string parameterName, ParameterModifiers paramModifier, Expression defaultValue) {
-//			TypeReference = typeReference;
-//			ParameterName = parameterName;
-//			ParamModifier = paramModifier;
-//			DefaultValue = defaultValue;
-//			attributes = new List<AttributeSection>();
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitParameterDeclarationExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ParameterDeclarationExpression Attributes={0} ParameterName={1} TypeReference={2" +
-//			                     "} ParamModifier={3} DefaultValue={4}]", GetCollectionString(Attributes), ParameterName, TypeReference, ParamModifier, DefaultValue);
-//		}
-//	}
-//	
-//	public abstract class ParametrizedNode : AttributedNode {
-//		
-//		string name;
-//		
-//		List<ParameterDeclarationExpression> parameters;
-//		
-//		public string Name {
-//			get {
-//				return name;
-//			}
-//			set {
-//				name = value ?? "";
-//			}
-//		}
-//		
-//		public List<ParameterDeclarationExpression> Parameters {
-//			get {
-//				return parameters;
-//			}
-//			set {
-//				parameters = value ?? new List<ParameterDeclarationExpression>();
-//			}
-//		}
-//		
-//		protected ParametrizedNode() {
-//			name = "";
-//			parameters = new List<ParameterDeclarationExpression>();
-//		}
-//		
-//		protected ParametrizedNode(Modifiers modifier, List<AttributeSection> attributes, string name, List<ParameterDeclarationExpression> parameters) {
-//			Modifier = modifier;
-//			Attributes = attributes;
-//			Name = name;
-//			Parameters = parameters;
-//		}
-//	}
-//	
-//	public class ParenthesizedExpression : Expression {
-//		
-//		Expression expression;
-//		
-//		public Expression Expression {
-//			get {
-//				return expression;
-//			}
-//			set {
-//				expression = value ?? Expression.Null;
-//				if (!expression.IsNull) expression.Parent = this;
-//			}
-//		}
-//		
-//		public ParenthesizedExpression(Expression expression) {
-//			Expression = expression;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitParenthesizedExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ParenthesizedExpression Expression={0}]", Expression);
-//		}
-//	}
-//	
-//	public class PropertyDeclaration : MemberNode {
-//		
-//		Location bodyStart;
-//		
-//		Location bodyEnd;
-//		
-//		PropertyGetRegion getRegion;
-//		
-//		PropertySetRegion setRegion;
-//		
-//		Expression initializer;
-//		
-//		public Location BodyStart {
-//			get {
-//				return bodyStart;
-//			}
-//			set {
-//				bodyStart = value;
-//			}
-//		}
-//		
-//		public Location BodyEnd {
-//			get {
-//				return bodyEnd;
-//			}
-//			set {
-//				bodyEnd = value;
-//			}
-//		}
-//		
-//		public PropertyGetRegion GetRegion {
-//			get {
-//				return getRegion;
-//			}
-//			set {
-//				getRegion = value ?? PropertyGetRegion.Null;
-//				if (!getRegion.IsNull) getRegion.Parent = this;
-//			}
-//		}
-//		
-//		public PropertySetRegion SetRegion {
-//			get {
-//				return setRegion;
-//			}
-//			set {
-//				setRegion = value ?? PropertySetRegion.Null;
-//				if (!setRegion.IsNull) setRegion.Parent = this;
-//			}
-//		}
-//		
-//		public Expression Initializer {
-//			get {
-//				return initializer;
-//			}
-//			set {
-//				initializer = value ?? Expression.Null;
-//				if (!initializer.IsNull) initializer.Parent = this;
-//			}
-//		}
-//		
-//		public PropertyDeclaration(Modifiers modifier, List<AttributeSection> attributes, string name, List<ParameterDeclarationExpression> parameters) {
-//			Modifier = modifier;
-//			Attributes = attributes;
-//			Name = name;
-//			Parameters = parameters;
-//			bodyStart = Location.Empty;
-//			bodyEnd = Location.Empty;
-//			getRegion = PropertyGetRegion.Null;
-//			setRegion = PropertySetRegion.Null;
-//			initializer = Expression.Null;
-//		}
-//		
-//		public bool IsReadOnly {
-//			get {
-//				return HasGetRegion && !HasSetRegion;
-//			}
-//		}
-//		
-//		public bool HasGetRegion {
-//			get {
-//				return !getRegion.IsNull;
-//			}
-//		}
-//		
-//		public bool IsWriteOnly {
-//			get {
-//				return !HasGetRegion && HasSetRegion;
-//			}
-//		}
-//		
-//		public bool IsIndexer {
-//			get {
-//				return (Modifier & Modifiers.Default) != 0;
-//			}
-//		}
-//		
-//
-//		internal PropertyDeclaration(string name, TypeReference typeReference, Modifiers modifier, List<AttributeSection> attributes) : this(modifier, attributes, name, null)
-//		{
-//			this.TypeReference = typeReference;
-//			if ((modifier & Modifiers.ReadOnly) != Modifiers.ReadOnly) {
-//				this.SetRegion = new PropertySetRegion(null, null);
-//			}
-//			if ((modifier & Modifiers.WriteOnly) != Modifiers.WriteOnly) {
-//				this.GetRegion = new PropertyGetRegion(null, null);
-//			}
-//		}
-//		
-//		public bool HasSetRegion {
-//			get {
-//				return !setRegion.IsNull;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitPropertyDeclaration(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[PropertyDeclaration BodyStart={0} BodyEnd={1} GetRegion={2} SetRegion={3} Initia" +
-//			                     "lizer={4} InterfaceImplementations={5} TypeReference={6} Name={7} Parameters={8}" +
-//			                     " Attributes={9} Modifier={10}]", BodyStart, BodyEnd, GetRegion, SetRegion, Initializer, GetCollectionString(InterfaceImplementations), TypeReference, Name, GetCollectionString(Parameters), GetCollectionString(Attributes), Modifier);
-//		}
-//	}
-//	
-//	public class PropertyGetRegion : PropertyGetSetRegion {
-//		
-//		public PropertyGetRegion(BlockStatement block, List<AttributeSection> attributes) :
-//			base(block, attributes) {
-//		}
-//		
-//		public static PropertyGetRegion Null {
-//			get {
-//				return NullPropertyGetRegion.Instance;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitPropertyGetRegion(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[PropertyGetRegion Block={0} Attributes={1} Modifier={2}]", Block, GetCollectionString(Attributes), Modifier);
-//		}
-//	}
-//	
-//	internal sealed class NullPropertyGetRegion : PropertyGetRegion {
-//		
-//		private NullPropertyGetRegion() :
-//			base(null, null) {
-//		}
-//		
-//		internal static NullPropertyGetRegion Instance = new NullPropertyGetRegion();
-//		
-//		public override bool IsNull {
-//			get {
-//				return true;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return null;
-//		}
-//		
-//		public override string ToString() {
-//			return "[NullPropertyGetRegion]";
-//		}
-//	}
-//	
-//	public abstract class PropertyGetSetRegion : AttributedNode, INullable {
-//		
-//		BlockStatement block;
-//		
-//		public BlockStatement Block {
-//			get {
-//				return block;
-//			}
-//			set {
-//				block = value ?? BlockStatement.Null;
-//				if (!block.IsNull) block.Parent = this;
-//			}
-//		}
-//		
-//		protected PropertyGetSetRegion(BlockStatement block, List<AttributeSection> attributes) {
-//			Block = block;
-//			Attributes = attributes;
-//		}
-//		
-//		public virtual bool IsNull {
-//			get {
-//				return false;
-//			}
-//		}
-//	}
-//	
-//	public class PropertySetRegion : PropertyGetSetRegion {
-//		
-//		List<ParameterDeclarationExpression> parameters;
-//		
-//		public List<ParameterDeclarationExpression> Parameters {
-//			get {
-//				return parameters;
-//			}
-//			set {
-//				parameters = value ?? new List<ParameterDeclarationExpression>();
-//			}
-//		}
-//		
-//		public PropertySetRegion(BlockStatement block, List<AttributeSection> attributes) :
-//			base(block, attributes) {
-//			parameters = new List<ParameterDeclarationExpression>();
-//		}
-//		
-//		public static PropertySetRegion Null {
-//			get {
-//				return NullPropertySetRegion.Instance;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitPropertySetRegion(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[PropertySetRegion Parameters={0} Block={1} Attributes={2} Modifier={3}]", GetCollectionString(Parameters), Block, GetCollectionString(Attributes), Modifier);
-//		}
-//	}
-//	
-//	internal sealed class NullPropertySetRegion : PropertySetRegion {
-//		
-//		private NullPropertySetRegion() :
-//			base(null, null) {
-//		}
-//		
-//		internal static NullPropertySetRegion Instance = new NullPropertySetRegion();
-//		
-//		public override bool IsNull {
-//			get {
-//				return true;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return null;
-//		}
-//		
-//		public override string ToString() {
-//			return "[NullPropertySetRegion]";
-//		}
-//	}
-//	
-//	public class QueryExpression : Expression {
-//		
-//		List<QueryExpressionClause> clauses;
-//		
-//		public List<QueryExpressionClause> Clauses {
-//			get {
-//				return clauses;
-//			}
-//			set {
-//				clauses = value ?? new List<QueryExpressionClause>();
-//			}
-//		}
-//		
-//		public QueryExpression() {
-//			clauses = new List<QueryExpressionClause>();
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitQueryExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[QueryExpression Clauses={0}]", GetCollectionString(Clauses));
-//		}
-//	}
-//	
-//	public class QueryExpressionAggregateClause : QueryExpressionClause {
-//		
-//		CollectionRangeVariable source;
-//		
-//		List<QueryExpressionClause> middleClauses;
-//		
-//		List<ExpressionRangeVariable> intoVariables;
-//		
-//		public CollectionRangeVariable Source {
-//			get {
-//				return source;
-//			}
-//			set {
-//				source = value ?? CollectionRangeVariable.Null;
-//				if (!source.IsNull) source.Parent = this;
-//			}
-//		}
-//		
-//		public List<QueryExpressionClause> MiddleClauses {
-//			get {
-//				return middleClauses;
-//			}
-//			set {
-//				middleClauses = value ?? new List<QueryExpressionClause>();
-//			}
-//		}
-//		
-//		public List<ExpressionRangeVariable> IntoVariables {
-//			get {
-//				return intoVariables;
-//			}
-//			set {
-//				intoVariables = value ?? new List<ExpressionRangeVariable>();
-//			}
-//		}
-//		
-//		public QueryExpressionAggregateClause() {
-//			source = CollectionRangeVariable.Null;
-//			middleClauses = new List<QueryExpressionClause>();
-//			intoVariables = new List<ExpressionRangeVariable>();
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitQueryExpressionAggregateClause(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[QueryExpressionAggregateClause Source={0} MiddleClauses={1} IntoVariables={2}]", Source, GetCollectionString(MiddleClauses), GetCollectionString(IntoVariables));
-//		}
-//	}
-//	
-//	public abstract class QueryExpressionClause : AbstractNode, INullable {
-//		
-//		protected QueryExpressionClause() {
-//		}
-//		
-//		public virtual bool IsNull {
-//			get {
-//				return false;
-//			}
-//		}
-//		
-//		public static QueryExpressionClause Null {
-//			get {
-//				return NullQueryExpressionClause.Instance;
-//			}
-//		}
-//	}
-//	
-//	internal sealed class NullQueryExpressionClause : QueryExpressionClause {
-//		
-//		internal static NullQueryExpressionClause Instance = new NullQueryExpressionClause();
-//		
-//		public override bool IsNull {
-//			get {
-//				return true;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return null;
-//		}
-//		
-//		public override string ToString() {
-//			return "[NullQueryExpressionClause]";
-//		}
-//	}
-//	
-//	public class QueryExpressionDistinctClause : QueryExpressionClause {
-//		
-//		public QueryExpressionDistinctClause() {
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitQueryExpressionDistinctClause(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return "[QueryExpressionDistinctClause]";
-//		}
-//	}
-//	
-//	public class QueryExpressionFromClause : QueryExpressionClause {
-//		
-//		List<CollectionRangeVariable> sources;
-//		
-//		public List<CollectionRangeVariable> Sources {
-//			get {
-//				return sources;
-//			}
-//			set {
-//				sources = value ?? new List<CollectionRangeVariable>();
-//			}
-//		}
-//		
-//		public QueryExpressionFromClause() {
-//			sources = new List<CollectionRangeVariable>();
-//		}
-//		
-//		public new static QueryExpressionFromClause Null {
-//			get {
-//				return NullQueryExpressionFromClause.Instance;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitQueryExpressionFromClause(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[QueryExpressionFromClause Sources={0}]", GetCollectionString(Sources));
-//		}
-//	}
-//	
-//	internal sealed class NullQueryExpressionFromClause : QueryExpressionFromClause {
-//		
-//		internal static NullQueryExpressionFromClause Instance = new NullQueryExpressionFromClause();
-//		
-//		public override bool IsNull {
-//			get {
-//				return true;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return null;
-//		}
-//		
-//		public override string ToString() {
-//			return "[NullQueryExpressionFromClause]";
-//		}
-//	}
-//	
-//	public class QueryExpressionGroupClause : QueryExpressionClause {
-//		
-//		Expression projection;
-//		
-//		Expression groupBy;
-//		
-//		public Expression Projection {
-//			get {
-//				return projection;
-//			}
-//			set {
-//				projection = value ?? Expression.Null;
-//				if (!projection.IsNull) projection.Parent = this;
-//			}
-//		}
-//		
-//		public Expression GroupBy {
-//			get {
-//				return groupBy;
-//			}
-//			set {
-//				groupBy = value ?? Expression.Null;
-//				if (!groupBy.IsNull) groupBy.Parent = this;
-//			}
-//		}
-//		
-//		public QueryExpressionGroupClause() {
-//			projection = Expression.Null;
-//			groupBy = Expression.Null;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitQueryExpressionGroupClause(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[QueryExpressionGroupClause Projection={0} GroupBy={1}]", Projection, GroupBy);
-//		}
-//	}
-//	
-//	public class QueryExpressionGroupJoinVBClause : QueryExpressionClause {
-//		
-//		QueryExpressionJoinVBClause joinClause;
-//		
-//		List<ExpressionRangeVariable> intoVariables;
-//		
-//		public QueryExpressionJoinVBClause JoinClause {
-//			get {
-//				return joinClause;
-//			}
-//			set {
-//				joinClause = value ?? QueryExpressionJoinVBClause.Null;
-//				if (!joinClause.IsNull) joinClause.Parent = this;
-//			}
-//		}
-//		
-//		public List<ExpressionRangeVariable> IntoVariables {
-//			get {
-//				return intoVariables;
-//			}
-//			set {
-//				intoVariables = value ?? new List<ExpressionRangeVariable>();
-//			}
-//		}
-//		
-//		public QueryExpressionGroupJoinVBClause() {
-//			joinClause = QueryExpressionJoinVBClause.Null;
-//			intoVariables = new List<ExpressionRangeVariable>();
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitQueryExpressionGroupJoinVBClause(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[QueryExpressionGroupJoinVBClause JoinClause={0} IntoVariables={1}]", JoinClause, GetCollectionString(IntoVariables));
-//		}
-//	}
-//	
-//	public class QueryExpressionGroupVBClause : QueryExpressionClause {
-//		
-//		List<ExpressionRangeVariable> groupVariables;
-//		
-//		List<ExpressionRangeVariable> byVariables;
-//		
-//		List<ExpressionRangeVariable> intoVariables;
-//		
-//		public List<ExpressionRangeVariable> GroupVariables {
-//			get {
-//				return groupVariables;
-//			}
-//			set {
-//				groupVariables = value ?? new List<ExpressionRangeVariable>();
-//			}
-//		}
-//		
-//		public List<ExpressionRangeVariable> ByVariables {
-//			get {
-//				return byVariables;
-//			}
-//			set {
-//				byVariables = value ?? new List<ExpressionRangeVariable>();
-//			}
-//		}
-//		
-//		public List<ExpressionRangeVariable> IntoVariables {
-//			get {
-//				return intoVariables;
-//			}
-//			set {
-//				intoVariables = value ?? new List<ExpressionRangeVariable>();
-//			}
-//		}
-//		
-//		public QueryExpressionGroupVBClause() {
-//			groupVariables = new List<ExpressionRangeVariable>();
-//			byVariables = new List<ExpressionRangeVariable>();
-//			intoVariables = new List<ExpressionRangeVariable>();
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitQueryExpressionGroupVBClause(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[QueryExpressionGroupVBClause GroupVariables={0} ByVariables={1} IntoVariables={2" +
-//			                     "}]", GetCollectionString(GroupVariables), GetCollectionString(ByVariables), GetCollectionString(IntoVariables));
-//		}
-//	}
-//	
-//	public class QueryExpressionJoinClause : QueryExpressionClause {
-//		
-//		Expression onExpression;
-//		
-//		Expression equalsExpression;
-//		
-//		CollectionRangeVariable source;
-//		
-//		string intoIdentifier;
-//		
-//		public Expression OnExpression {
-//			get {
-//				return onExpression;
-//			}
-//			set {
-//				onExpression = value ?? Expression.Null;
-//				if (!onExpression.IsNull) onExpression.Parent = this;
-//			}
-//		}
-//		
-//		public Expression EqualsExpression {
-//			get {
-//				return equalsExpression;
-//			}
-//			set {
-//				equalsExpression = value ?? Expression.Null;
-//				if (!equalsExpression.IsNull) equalsExpression.Parent = this;
-//			}
-//		}
-//		
-//		public CollectionRangeVariable Source {
-//			get {
-//				return source;
-//			}
-//			set {
-//				source = value ?? CollectionRangeVariable.Null;
-//				if (!source.IsNull) source.Parent = this;
-//			}
-//		}
-//		
-//		public string IntoIdentifier {
-//			get {
-//				return intoIdentifier;
-//			}
-//			set {
-//				intoIdentifier = value ?? "";
-//			}
-//		}
-//		
-//		public QueryExpressionJoinClause() {
-//			onExpression = Expression.Null;
-//			equalsExpression = Expression.Null;
-//			source = CollectionRangeVariable.Null;
-//			intoIdentifier = "";
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitQueryExpressionJoinClause(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[QueryExpressionJoinClause OnExpression={0} EqualsExpression={1} Source={2} IntoI" +
-//			                     "dentifier={3}]", OnExpression, EqualsExpression, Source, IntoIdentifier);
-//		}
-//	}
-//	
-//	public class QueryExpressionJoinConditionVB : AbstractNode {
-//		
-//		Expression leftSide;
-//		
-//		Expression rightSide;
-//		
-//		public Expression LeftSide {
-//			get {
-//				return leftSide;
-//			}
-//			set {
-//				leftSide = value ?? Expression.Null;
-//				if (!leftSide.IsNull) leftSide.Parent = this;
-//			}
-//		}
-//		
-//		public Expression RightSide {
-//			get {
-//				return rightSide;
-//			}
-//			set {
-//				rightSide = value ?? Expression.Null;
-//				if (!rightSide.IsNull) rightSide.Parent = this;
-//			}
-//		}
-//		
-//		public QueryExpressionJoinConditionVB() {
-//			leftSide = Expression.Null;
-//			rightSide = Expression.Null;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitQueryExpressionJoinConditionVB(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[QueryExpressionJoinConditionVB LeftSide={0} RightSide={1}]", LeftSide, RightSide);
-//		}
-//	}
-//	
-//	public class QueryExpressionJoinVBClause : QueryExpressionClause {
-//		
-//		CollectionRangeVariable joinVariable;
-//		
-//		QueryExpressionJoinVBClause subJoin;
-//		
-//		List<QueryExpressionJoinConditionVB> conditions;
-//		
-//		public CollectionRangeVariable JoinVariable {
-//			get {
-//				return joinVariable;
-//			}
-//			set {
-//				joinVariable = value ?? CollectionRangeVariable.Null;
-//				if (!joinVariable.IsNull) joinVariable.Parent = this;
-//			}
-//		}
-//		
-//		public QueryExpressionJoinVBClause SubJoin {
-//			get {
-//				return subJoin;
-//			}
-//			set {
-//				subJoin = value ?? QueryExpressionJoinVBClause.Null;
-//				if (!subJoin.IsNull) subJoin.Parent = this;
-//			}
-//		}
-//		
-//		public List<QueryExpressionJoinConditionVB> Conditions {
-//			get {
-//				return conditions;
-//			}
-//			set {
-//				conditions = value ?? new List<QueryExpressionJoinConditionVB>();
-//			}
-//		}
-//		
-//		public QueryExpressionJoinVBClause() {
-//			joinVariable = CollectionRangeVariable.Null;
-//			subJoin = QueryExpressionJoinVBClause.Null;
-//			conditions = new List<QueryExpressionJoinConditionVB>();
-//		}
-//		
-//		public new static QueryExpressionJoinVBClause Null {
-//			get {
-//				return NullQueryExpressionJoinVBClause.Instance;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitQueryExpressionJoinVBClause(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[QueryExpressionJoinVBClause JoinVariable={0} SubJoin={1} Conditions={2}]", JoinVariable, SubJoin, GetCollectionString(Conditions));
-//		}
-//	}
-//	
-//	internal sealed class NullQueryExpressionJoinVBClause : QueryExpressionJoinVBClause {
-//		
-//		internal static NullQueryExpressionJoinVBClause Instance = new NullQueryExpressionJoinVBClause();
-//		
-//		public override bool IsNull {
-//			get {
-//				return true;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return null;
-//		}
-//		
-//		public override string ToString() {
-//			return "[NullQueryExpressionJoinVBClause]";
-//		}
-//	}
-//	
-//	public class QueryExpressionLetClause : QueryExpressionClause {
-//		
-//		List<ExpressionRangeVariable> variables;
-//		
-//		public List<ExpressionRangeVariable> Variables {
-//			get {
-//				return variables;
-//			}
-//			set {
-//				variables = value ?? new List<ExpressionRangeVariable>();
-//			}
-//		}
-//		
-//		public QueryExpressionLetClause() {
-//			variables = new List<ExpressionRangeVariable>();
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitQueryExpressionLetVBClause(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[QueryExpressionLetVBClause Variables={0}]", GetCollectionString(Variables));
-//		}
-//	}
-//	
-//	public class QueryExpressionOrderClause : QueryExpressionClause {
-//		
-//		List<QueryExpressionOrdering> orderings;
-//		
-//		public List<QueryExpressionOrdering> Orderings {
-//			get {
-//				return orderings;
-//			}
-//			set {
-//				orderings = value ?? new List<QueryExpressionOrdering>();
-//			}
-//		}
-//		
-//		public QueryExpressionOrderClause() {
-//			orderings = new List<QueryExpressionOrdering>();
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitQueryExpressionOrderClause(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[QueryExpressionOrderClause Orderings={0}]", GetCollectionString(Orderings));
-//		}
-//	}
-//	
-//	public class QueryExpressionOrdering : AbstractNode {
-//		
-//		Expression criteria;
-//		
-//		QueryExpressionOrderingDirection direction;
-//		
-//		public Expression Criteria {
-//			get {
-//				return criteria;
-//			}
-//			set {
-//				criteria = value ?? Expression.Null;
-//				if (!criteria.IsNull) criteria.Parent = this;
-//			}
-//		}
-//		
-//		public QueryExpressionOrderingDirection Direction {
-//			get {
-//				return direction;
-//			}
-//			set {
-//				direction = value;
-//			}
-//		}
-//		
-//		public QueryExpressionOrdering() {
-//			criteria = Expression.Null;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitQueryExpressionOrdering(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[QueryExpressionOrdering Criteria={0} Direction={1}]", Criteria, Direction);
-//		}
-//	}
-//	
-//	public class QueryExpressionPartitionVBClause : QueryExpressionClause {
-//		
-//		Expression expression;
-//		
-//		QueryExpressionPartitionType partitionType;
-//		
-//		public Expression Expression {
-//			get {
-//				return expression;
-//			}
-//			set {
-//				expression = value ?? Expression.Null;
-//				if (!expression.IsNull) expression.Parent = this;
-//			}
-//		}
-//		
-//		public QueryExpressionPartitionType PartitionType {
-//			get {
-//				return partitionType;
-//			}
-//			set {
-//				partitionType = value;
-//			}
-//		}
-//		
-//		public QueryExpressionPartitionVBClause() {
-//			expression = Expression.Null;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitQueryExpressionPartitionVBClause(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[QueryExpressionPartitionVBClause Expression={0} PartitionType={1}]", Expression, PartitionType);
-//		}
-//	}
-//	
-//	public class QueryExpressionSelectClause : QueryExpressionClause {
-//		
-//		Expression projection;
-//		
-//		public Expression Projection {
-//			get {
-//				return projection;
-//			}
-//			set {
-//				projection = value ?? Expression.Null;
-//				if (!projection.IsNull) projection.Parent = this;
-//			}
-//		}
-//		
-//		public QueryExpressionSelectClause() {
-//			projection = Expression.Null;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitQueryExpressionSelectClause(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[QueryExpressionSelectClause Projection={0}]", Projection);
-//		}
-//	}
-//	
-//	public class QueryExpressionSelectVBClause : QueryExpressionClause {
-//		
-//		List<ExpressionRangeVariable> variables;
-//		
-//		public List<ExpressionRangeVariable> Variables {
-//			get {
-//				return variables;
-//			}
-//			set {
-//				variables = value ?? new List<ExpressionRangeVariable>();
-//			}
-//		}
-//		
-//		public QueryExpressionSelectVBClause() {
-//			variables = new List<ExpressionRangeVariable>();
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitQueryExpressionSelectVBClause(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[QueryExpressionSelectVBClause Variables={0}]", GetCollectionString(Variables));
-//		}
-//	}
-//	
-//	public class QueryExpressionWhereClause : QueryExpressionClause {
-//		
-//		Expression condition;
-//		
-//		public Expression Condition {
-//			get {
-//				return condition;
-//			}
-//			set {
-//				condition = value ?? Expression.Null;
-//				if (!condition.IsNull) condition.Parent = this;
-//			}
-//		}
-//		
-//		public QueryExpressionWhereClause() {
-//			condition = Expression.Null;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitQueryExpressionWhereClause(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[QueryExpressionWhereClause Condition={0}]", Condition);
-//		}
-//	}
-//	
-//	public class RaiseEventStatement : Statement {
-//		
-//		string eventName;
-//		
-//		List<Expression> arguments;
-//		
-//		public string EventName {
-//			get {
-//				return eventName;
-//			}
-//			set {
-//				eventName = value ?? "";
-//			}
-//		}
-//		
-//		public List<Expression> Arguments {
-//			get {
-//				return arguments;
-//			}
-//			set {
-//				arguments = value ?? new List<Expression>();
-//			}
-//		}
-//		
-//		public RaiseEventStatement(string eventName, List<Expression> arguments) {
-//			EventName = eventName;
-//			Arguments = arguments;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitRaiseEventStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[RaiseEventStatement EventName={0} Arguments={1}]", EventName, GetCollectionString(Arguments));
-//		}
-//	}
-//	
-//	public class ReDimStatement : Statement {
-//		
-//		List<InvocationExpression> reDimClauses;
-//		
-//		bool isPreserve;
-//		
-//		public List<InvocationExpression> ReDimClauses {
-//			get {
-//				return reDimClauses;
-//			}
-//			set {
-//				reDimClauses = value ?? new List<InvocationExpression>();
-//			}
-//		}
-//		
-//		public bool IsPreserve {
-//			get {
-//				return isPreserve;
-//			}
-//			set {
-//				isPreserve = value;
-//			}
-//		}
-//		
-//		public ReDimStatement(bool isPreserve) {
-//			IsPreserve = isPreserve;
-//			reDimClauses = new List<InvocationExpression>();
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitReDimStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ReDimStatement ReDimClauses={0} IsPreserve={1}]", GetCollectionString(ReDimClauses), IsPreserve);
-//		}
-//	}
-//	
-//	public class RemoveHandlerStatement : Statement {
-//		
-//		Expression eventExpression;
-//		
-//		Expression handlerExpression;
-//		
-//		public Expression EventExpression {
-//			get {
-//				return eventExpression;
-//			}
-//			set {
-//				eventExpression = value ?? Expression.Null;
-//				if (!eventExpression.IsNull) eventExpression.Parent = this;
-//			}
-//		}
-//		
-//		public Expression HandlerExpression {
-//			get {
-//				return handlerExpression;
-//			}
-//			set {
-//				handlerExpression = value ?? Expression.Null;
-//				if (!handlerExpression.IsNull) handlerExpression.Parent = this;
-//			}
-//		}
-//		
-//		public RemoveHandlerStatement(Expression eventExpression, Expression handlerExpression) {
-//			EventExpression = eventExpression;
-//			HandlerExpression = handlerExpression;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitRemoveHandlerStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[RemoveHandlerStatement EventExpression={0} HandlerExpression={1}]", EventExpression, HandlerExpression);
-//		}
-//	}
-//	
-//	public class ResumeStatement : Statement {
-//		
-//		string labelName;
-//		
-//		bool isResumeNext;
-//		
-//		public string LabelName {
-//			get {
-//				return labelName;
-//			}
-//			set {
-//				labelName = value ?? "";
-//			}
-//		}
-//		
-//		public bool IsResumeNext {
-//			get {
-//				return isResumeNext;
-//			}
-//			set {
-//				isResumeNext = value;
-//			}
-//		}
-//		
-//		public ResumeStatement(bool isResumeNext) {
-//			IsResumeNext = isResumeNext;
-//			labelName = "";
-//		}
-//		
-//		public ResumeStatement(string labelName) {
-//			LabelName = labelName;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitResumeStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ResumeStatement LabelName={0} IsResumeNext={1}]", LabelName, IsResumeNext);
-//		}
-//	}
-//	
-//	public class ReturnStatement : Statement {
-//		
-//		Expression expression;
-//		
-//		public Expression Expression {
-//			get {
-//				return expression;
-//			}
-//			set {
-//				expression = value ?? Expression.Null;
-//				if (!expression.IsNull) expression.Parent = this;
-//			}
-//		}
-//		
-//		public ReturnStatement(Expression expression) {
-//			Expression = expression;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitReturnStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ReturnStatement Expression={0}]", Expression);
-//		}
-//	}
-//	
-//	public class StopStatement : Statement {
-//		
-//		public StopStatement() {
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitStopStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return "[StopStatement]";
-//		}
-//	}
-//	
-//	public class SwitchSection : BlockStatement {
-//		
-//		List<CaseLabel> switchLabels;
-//		
-//		public List<CaseLabel> SwitchLabels {
-//			get {
-//				return switchLabels;
-//			}
-//			set {
-//				switchLabels = value ?? new List<CaseLabel>();
-//			}
-//		}
-//		
-//		public SwitchSection() {
-//			switchLabels = new List<CaseLabel>();
-//		}
-//		
-//		public SwitchSection(List<CaseLabel> switchLabels) {
-//			SwitchLabels = switchLabels;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitSwitchSection(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[SwitchSection SwitchLabels={0}]", GetCollectionString(SwitchLabels));
-//		}
-//	}
-//	
-//	public class SwitchStatement : Statement {
-//		
-//		Expression switchExpression;
-//		
-//		List<SwitchSection> switchSections;
-//		
-//		public Expression SwitchExpression {
-//			get {
-//				return switchExpression;
-//			}
-//			set {
-//				switchExpression = value ?? Expression.Null;
-//				if (!switchExpression.IsNull) switchExpression.Parent = this;
-//			}
-//		}
-//		
-//		public List<SwitchSection> SwitchSections {
-//			get {
-//				return switchSections;
-//			}
-//			set {
-//				switchSections = value ?? new List<SwitchSection>();
-//			}
-//		}
-//		
-//		public SwitchStatement(Expression switchExpression, List<SwitchSection> switchSections) {
-//			SwitchExpression = switchExpression;
-//			SwitchSections = switchSections;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitSwitchStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[SwitchStatement SwitchExpression={0} SwitchSections={1}]", SwitchExpression, GetCollectionString(SwitchSections));
-//		}
-//	}
-//	
-//	public class TemplateDefinition : AttributedNode {
-//		
-//		string name;
-//		
-//		VarianceModifier varianceModifier;
-//		
-//		List<TypeReference> bases;
-//		
-//		public string Name {
-//			get {
-//				return name;
-//			}
-//			set {
-//				name = string.IsNullOrEmpty(value) ? "?" : value;
-//			}
-//		}
-//		
-//		public VarianceModifier VarianceModifier {
-//			get {
-//				return varianceModifier;
-//			}
-//			set {
-//				varianceModifier = value;
-//			}
-//		}
-//		
-//		public List<TypeReference> Bases {
-//			get {
-//				return bases;
-//			}
-//			set {
-//				bases = value ?? new List<TypeReference>();
-//			}
-//		}
-//		
-//		public TemplateDefinition() {
-//			name = "?";
-//			bases = new List<TypeReference>();
-//		}
-//		
-//		public TemplateDefinition(string name, List<AttributeSection> attributes) {
-//			Name = name;
-//			Attributes = attributes;
-//			bases = new List<TypeReference>();
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitTemplateDefinition(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[TemplateDefinition Name={0} VarianceModifier={1} Bases={2} Attributes={3} Modifi" +
-//			                     "er={4}]", Name, VarianceModifier, GetCollectionString(Bases), GetCollectionString(Attributes), Modifier);
-//		}
-//	}
-//	
-//	public class ThisReferenceExpression : Expression {
-//		
-//		public ThisReferenceExpression() {
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitThisReferenceExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return "[ThisReferenceExpression]";
-//		}
-//	}
-//	
-//	public class ThrowStatement : Statement {
-//		
-//		Expression expression;
-//		
-//		public Expression Expression {
-//			get {
-//				return expression;
-//			}
-//			set {
-//				expression = value ?? Expression.Null;
-//				if (!expression.IsNull) expression.Parent = this;
-//			}
-//		}
-//		
-//		public ThrowStatement(Expression expression) {
-//			Expression = expression;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitThrowStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[ThrowStatement Expression={0}]", Expression);
-//		}
-//	}
-//	
-//	public class TryCatchStatement : Statement {
-//		
-//		Statement statementBlock;
-//		
-//		List<CatchClause> catchClauses;
-//		
-//		Statement finallyBlock;
-//		
-//		public Statement StatementBlock {
-//			get {
-//				return statementBlock;
-//			}
-//			set {
-//				statementBlock = value ?? Statement.Null;
-//				if (!statementBlock.IsNull) statementBlock.Parent = this;
-//			}
-//		}
-//		
-//		public List<CatchClause> CatchClauses {
-//			get {
-//				return catchClauses;
-//			}
-//			set {
-//				catchClauses = value ?? new List<CatchClause>();
-//			}
-//		}
-//		
-//		public Statement FinallyBlock {
-//			get {
-//				return finallyBlock;
-//			}
-//			set {
-//				finallyBlock = value ?? Statement.Null;
-//				if (!finallyBlock.IsNull) finallyBlock.Parent = this;
-//			}
-//		}
-//		
-//		public TryCatchStatement(Statement statementBlock, List<CatchClause> catchClauses, Statement finallyBlock) {
-//			StatementBlock = statementBlock;
-//			CatchClauses = catchClauses;
-//			FinallyBlock = finallyBlock;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitTryCatchStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[TryCatchStatement StatementBlock={0} CatchClauses={1} FinallyBlock={2}]", StatementBlock, GetCollectionString(CatchClauses), FinallyBlock);
-//		}
-//	}
-//	
-//	public class TypeDeclaration : AttributedNode {
-//		
-//		string name;
-//		
-//		ClassType type;
-//		
-//		List<TypeReference> baseTypes;
-//		
-//		List<TemplateDefinition> templates;
-//		
-//		Location bodyStartLocation;
-//		
-//		public string Name {
-//			get {
-//				return name;
-//			}
-//			set {
-//				name = value ?? "";
-//			}
-//		}
-//		
-//		public ClassType Type {
-//			get {
-//				return type;
-//			}
-//			set {
-//				type = value;
-//			}
-//		}
-//		
-//		public List<TypeReference> BaseTypes {
-//			get {
-//				return baseTypes;
-//			}
-//			set {
-//				baseTypes = value ?? new List<TypeReference>();
-//			}
-//		}
-//		
-//		public List<TemplateDefinition> Templates {
-//			get {
-//				return templates;
-//			}
-//			set {
-//				templates = value ?? new List<TemplateDefinition>();
-//			}
-//		}
-//		
-//		public Location BodyStartLocation {
-//			get {
-//				return bodyStartLocation;
-//			}
-//			set {
-//				bodyStartLocation = value;
-//			}
-//		}
-//		
-//		public TypeDeclaration(Modifiers modifier, List<AttributeSection> attributes) {
-//			Modifier = modifier;
-//			Attributes = attributes;
-//			name = "";
-//			baseTypes = new List<TypeReference>();
-//			templates = new List<TemplateDefinition>();
-//			bodyStartLocation = Location.Empty;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitTypeDeclaration(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[TypeDeclaration Name={0} Type={1} BaseTypes={2} Templates={3} BodyStartLocation=" +
-//			                     "{4} Attributes={5} Modifier={6}]", Name, Type, GetCollectionString(BaseTypes), GetCollectionString(Templates), BodyStartLocation, GetCollectionString(Attributes), Modifier);
-//		}
-//	}
-//	
-//	public class TypeOfExpression : Expression {
-//		
-//		TypeReference typeReference;
-//		
-//		public TypeReference TypeReference {
-//			get {
-//				return typeReference;
-//			}
-//			set {
-//				typeReference = value ?? TypeReference.Null;
-//				if (!typeReference.IsNull) typeReference.Parent = this;
-//			}
-//		}
-//		
-//		public TypeOfExpression(TypeReference typeReference) {
-//			TypeReference = typeReference;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitTypeOfExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[TypeOfExpression TypeReference={0}]", TypeReference);
-//		}
-//	}
-//	
-//	public class TypeOfIsExpression : Expression {
-//		
-//		Expression expression;
-//		
-//		TypeReference typeReference;
-//		
-//		public Expression Expression {
-//			get {
-//				return expression;
-//			}
-//			set {
-//				expression = value ?? Expression.Null;
-//				if (!expression.IsNull) expression.Parent = this;
-//			}
-//		}
-//		
-//		public TypeReference TypeReference {
-//			get {
-//				return typeReference;
-//			}
-//			set {
-//				typeReference = value ?? TypeReference.Null;
-//				if (!typeReference.IsNull) typeReference.Parent = this;
-//			}
-//		}
-//		
-//		public TypeOfIsExpression(Expression expression, TypeReference typeReference) {
-//			Expression = expression;
-//			TypeReference = typeReference;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitTypeOfIsExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[TypeOfIsExpression Expression={0} TypeReference={1}]", Expression, TypeReference);
-//		}
-//	}
-//	
-//	public class TypeReferenceExpression : Expression {
-//		
-//		TypeReference typeReference;
-//		
-//		public TypeReference TypeReference {
-//			get {
-//				return typeReference;
-//			}
-//			set {
-//				typeReference = value ?? TypeReference.Null;
-//				if (!typeReference.IsNull) typeReference.Parent = this;
-//			}
-//		}
-//		
-//		public TypeReferenceExpression(TypeReference typeReference) {
-//			TypeReference = typeReference;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitTypeReferenceExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[TypeReferenceExpression TypeReference={0}]", TypeReference);
-//		}
-//	}
-//	
-//	public class UnaryOperatorExpression : Expression {
-//		
-//		UnaryOperatorType op;
-//		
-//		Expression expression;
-//		
-//		public UnaryOperatorType Op {
-//			get {
-//				return op;
-//			}
-//			set {
-//				op = value;
-//			}
-//		}
-//		
-//		public Expression Expression {
-//			get {
-//				return expression;
-//			}
-//			set {
-//				expression = value ?? Expression.Null;
-//				if (!expression.IsNull) expression.Parent = this;
-//			}
-//		}
-//		
-//		public UnaryOperatorExpression(UnaryOperatorType op) {
-//			Op = op;
-//			expression = Expression.Null;
-//		}
-//		
-//		public UnaryOperatorExpression(Expression expression, UnaryOperatorType op) {
-//			Expression = expression;
-//			Op = op;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitUnaryOperatorExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[UnaryOperatorExpression Op={0} Expression={1}]", Op, Expression);
-//		}
-//	}
-//	
-//	public class UsingStatement : StatementWithEmbeddedStatement {
-//		
-//		Statement resourceAcquisition;
-//		
-//		public Statement ResourceAcquisition {
-//			get {
-//				return resourceAcquisition;
-//			}
-//			set {
-//				resourceAcquisition = value ?? Statement.Null;
-//				if (!resourceAcquisition.IsNull) resourceAcquisition.Parent = this;
-//			}
-//		}
-//		
-//		public UsingStatement(Statement resourceAcquisition, Statement embeddedStatement) {
-//			ResourceAcquisition = resourceAcquisition;
-//			EmbeddedStatement = embeddedStatement;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitUsingStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[UsingStatement ResourceAcquisition={0} EmbeddedStatement={1}]", ResourceAcquisition, EmbeddedStatement);
-//		}
-//	}
-//	
-//	public class VariableDeclaration : AbstractNode {
-//		
-//		string name;
-//		
-//		Expression initializer;
-//		
-//		TypeReference typeReference;
-//		
-//		Expression fixedArrayInitialization;
-//		
-//		public string Name {
-//			get {
-//				return name;
-//			}
-//			set {
-//				name = value ?? "";
-//			}
-//		}
-//		
-//		public Expression Initializer {
-//			get {
-//				return initializer;
-//			}
-//			set {
-//				initializer = value ?? Expression.Null;
-//				if (!initializer.IsNull) initializer.Parent = this;
-//			}
-//		}
-//		
-//		public TypeReference TypeReference {
-//			get {
-//				return typeReference;
-//			}
-//			set {
-//				typeReference = value ?? TypeReference.Null;
-//				if (!typeReference.IsNull) typeReference.Parent = this;
-//			}
-//		}
-//		
-//		public Expression FixedArrayInitialization {
-//			get {
-//				return fixedArrayInitialization;
-//			}
-//			set {
-//				fixedArrayInitialization = value ?? Expression.Null;
-//				if (!fixedArrayInitialization.IsNull) fixedArrayInitialization.Parent = this;
-//			}
-//		}
-//		
-//		public VariableDeclaration(string name) {
-//			Name = name;
-//			initializer = Expression.Null;
-//			typeReference = TypeReference.Null;
-//			fixedArrayInitialization = Expression.Null;
-//		}
-//		
-//		public VariableDeclaration(string name, Expression initializer) {
-//			Name = name;
-//			Initializer = initializer;
-//			typeReference = TypeReference.Null;
-//			fixedArrayInitialization = Expression.Null;
-//		}
-//		
-//		public VariableDeclaration(string name, Expression initializer, TypeReference typeReference) {
-//			Name = name;
-//			Initializer = initializer;
-//			TypeReference = typeReference;
-//			fixedArrayInitialization = Expression.Null;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitVariableDeclaration(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[VariableDeclaration Name={0} Initializer={1} TypeReference={2} FixedArrayInitial" +
-//			                     "ization={3}]", Name, Initializer, TypeReference, FixedArrayInitialization);
-//		}
-//	}
-//	
-//	public class WithStatement : Statement {
-//		
-//		Expression expression;
-//		
-//		BlockStatement body;
-//		
-//		public Expression Expression {
-//			get {
-//				return expression;
-//			}
-//			set {
-//				expression = value ?? Expression.Null;
-//				if (!expression.IsNull) expression.Parent = this;
-//			}
-//		}
-//		
-//		public BlockStatement Body {
-//			get {
-//				return body;
-//			}
-//			set {
-//				body = value ?? BlockStatement.Null;
-//				if (!body.IsNull) body.Parent = this;
-//			}
-//		}
-//		
-//		public WithStatement(Expression expression) {
-//			Expression = expression;
-//			body = BlockStatement.Null;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitWithStatement(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[WithStatement Expression={0} Body={1}]", Expression, Body);
-//		}
-//	}
-//	
-//	public class XmlAttributeExpression : XmlExpression {
-//		
-//		string name;
-//		
-//		string literalValue;
-//		
-//		bool useDoubleQuotes;
-//		
-//		Expression expressionValue;
-//		
-//		public string Name {
-//			get {
-//				return name;
-//			}
-//			set {
-//				name = value ?? "";
-//			}
-//		}
-//		
-//		public string LiteralValue {
-//			get {
-//				return literalValue;
-//			}
-//			set {
-//				literalValue = value ?? "";
-//			}
-//		}
-//		
-//		public bool UseDoubleQuotes {
-//			get {
-//				return useDoubleQuotes;
-//			}
-//			set {
-//				useDoubleQuotes = value;
-//			}
-//		}
-//		
-//		public Expression ExpressionValue {
-//			get {
-//				return expressionValue;
-//			}
-//			set {
-//				expressionValue = value ?? Expression.Null;
-//				if (!expressionValue.IsNull) expressionValue.Parent = this;
-//			}
-//		}
-//		
-//		public XmlAttributeExpression() {
-//			name = "";
-//			literalValue = "";
-//			expressionValue = Expression.Null;
-//		}
-//		
-//		public bool IsLiteralValue {
-//			get {
-//				return expressionValue.IsNull;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitXmlAttributeExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[XmlAttributeExpression Name={0} LiteralValue={1} UseDoubleQuotes={2} ExpressionV" +
-//			                     "alue={3}]", Name, LiteralValue, UseDoubleQuotes, ExpressionValue);
-//		}
-//	}
-//	
-//	public class XmlContentExpression : XmlExpression {
-//		
-//		string content;
-//		
-//		XmlContentType type;
-//		
-//		public string Content {
-//			get {
-//				return content;
-//			}
-//			set {
-//				content = value ?? "";
-//			}
-//		}
-//		
-//		public XmlContentType Type {
-//			get {
-//				return type;
-//			}
-//			set {
-//				type = value;
-//			}
-//		}
-//		
-//		public XmlContentExpression(string content, XmlContentType type) {
-//			Content = content;
-//			Type = type;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitXmlContentExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[XmlContentExpression Content={0} Type={1}]", Content, Type);
-//		}
-//	}
-//	
-//	public class XmlDocumentExpression : XmlExpression {
-//		
-//		List<XmlExpression> expressions;
-//		
-//		public List<XmlExpression> Expressions {
-//			get {
-//				return expressions;
-//			}
-//			set {
-//				expressions = value ?? new List<XmlExpression>();
-//			}
-//		}
-//		
-//		public XmlDocumentExpression() {
-//			expressions = new List<XmlExpression>();
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitXmlDocumentExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[XmlDocumentExpression Expressions={0}]", GetCollectionString(Expressions));
-//		}
-//	}
-//	
-//	public class XmlElementExpression : XmlExpression {
-//		
-//		Expression content;
-//		
-//		Expression nameExpression;
-//		
-//		string xmlName;
-//		
-//		List<XmlExpression> attributes;
-//		
-//		public Expression Content {
-//			get {
-//				return content;
-//			}
-//			set {
-//				content = value ?? Expression.Null;
-//				if (!content.IsNull) content.Parent = this;
-//			}
-//		}
-//		
-//		public Expression NameExpression {
-//			get {
-//				return nameExpression;
-//			}
-//			set {
-//				nameExpression = value ?? Expression.Null;
-//				if (!nameExpression.IsNull) nameExpression.Parent = this;
-//			}
-//		}
-//		
-//		public string XmlName {
-//			get {
-//				return xmlName;
-//			}
-//			set {
-//				xmlName = value ?? "";
-//			}
-//		}
-//		
-//		public List<XmlExpression> Attributes {
-//			get {
-//				return attributes;
-//			}
-//			set {
-//				attributes = value ?? new List<XmlExpression>();
-//			}
-//		}
-//		
-//		public XmlElementExpression() {
-//			content = Expression.Null;
-//			nameExpression = Expression.Null;
-//			xmlName = "";
-//			attributes = new List<XmlExpression>();
-//		}
-//		
-//		public bool IsExpression {
-//			get {
-//				return !content.IsNull;
-//			}
-//		}
-//		
-//		public bool NameIsExpression {
-//			get {
-//				return !nameExpression.IsNull;
-//			}
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitXmlElementExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[XmlElementExpression Content={0} NameExpression={1} XmlName={2} Attributes={3}]", Content, NameExpression, XmlName, GetCollectionString(Attributes));
-//		}
-//	}
-//	
-//	public class XmlEmbeddedExpression : XmlExpression {
-//		
-//		Expression inlineVBExpression;
-//		
-//		public Expression InlineVBExpression {
-//			get {
-//				return inlineVBExpression;
-//			}
-//			set {
-//				inlineVBExpression = value ?? Expression.Null;
-//				if (!inlineVBExpression.IsNull) inlineVBExpression.Parent = this;
-//			}
-//		}
-//		
-//		public XmlEmbeddedExpression() {
-//			inlineVBExpression = Expression.Null;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitXmlEmbeddedExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[XmlEmbeddedExpression InlineVBExpression={0}]", InlineVBExpression);
-//		}
-//	}
-//	
-//	public abstract class XmlExpression : Expression {
-//		
-//		protected XmlExpression() {
-//		}
-//	}
-//	
-//	public class XmlMemberAccessExpression : Expression {
-//		
-//		Expression targetObject;
-//		
-//		XmlAxisType axisType;
-//		
-//		bool isXmlIdentifier;
-//		
-//		string identifier;
-//		
-//		public Expression TargetObject {
-//			get {
-//				return targetObject;
-//			}
-//			set {
-//				targetObject = value ?? Expression.Null;
-//				if (!targetObject.IsNull) targetObject.Parent = this;
-//			}
-//		}
-//		
-//		public XmlAxisType AxisType {
-//			get {
-//				return axisType;
-//			}
-//			set {
-//				axisType = value;
-//			}
-//		}
-//		
-//		public bool IsXmlIdentifier {
-//			get {
-//				return isXmlIdentifier;
-//			}
-//			set {
-//				isXmlIdentifier = value;
-//			}
-//		}
-//		
-//		public string Identifier {
-//			get {
-//				return identifier;
-//			}
-//			set {
-//				identifier = value ?? "";
-//			}
-//		}
-//		
-//		public XmlMemberAccessExpression(Expression targetObject, XmlAxisType axisType, string identifier, bool isXmlIdentifier) {
-//			TargetObject = targetObject;
-//			AxisType = axisType;
-//			Identifier = identifier;
-//			IsXmlIdentifier = isXmlIdentifier;
-//		}
-//		
-//		public override object AcceptVisitor(IAstVisitor visitor, object data) {
-//			return visitor.VisitXmlMemberAccessExpression(this, data);
-//		}
-//		
-//		public override string ToString() {
-//			return string.Format("[XmlMemberAccessExpression TargetObject={0} AxisType={1} IsXmlIdentifier={2} Iden" +
-//			                     "tifier={3}]", TargetObject, AxisType, IsXmlIdentifier, Identifier);
-//		}
-//	}
-//}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/DelegateDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/DelegateDeclaration.cs
deleted file mode 100644
index 8a88c91350..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/DelegateDeclaration.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class DelegateDeclaration : AttributedNode
-	{
-		public bool IsSub { get; set; }
-		
-		public AstNodeCollection<TypeParameterDeclaration> TypeParameters {
-			get { return GetChildrenByRole(Roles.TypeParameter); }
-		}
-		
-		public Identifier Name {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		public AstNodeCollection<ParameterDeclaration> Parameters {
-			get { return GetChildrenByRole(Roles.Parameter); }
-		}
-		
-		public AstNodeCollection<AttributeBlock> ReturnTypeAttributes {
-			get { return GetChildrenByRole(AttributeBlock.ReturnTypeAttributeBlockRole); }
-		}
-		
-		public AstType ReturnType {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var o = other as DelegateDeclaration;
-			return o != null &&
-				MatchAttributesAndModifiers(o, match) &&
-				IsSub == o.IsSub &&
-				TypeParameters.DoMatch(o.TypeParameters, match) &&
-				Name.DoMatch(o.Name, match) &&
-				Parameters.DoMatch(o.Parameters, match) &&
-				ReturnTypeAttributes.DoMatch(o.ReturnTypeAttributes, match) &&
-				ReturnType.DoMatch(o.ReturnType, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitDelegateDeclaration(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/EnumDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/EnumDeclaration.cs
deleted file mode 100644
index 736d579ffb..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/EnumDeclaration.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class EnumDeclaration : AttributedNode
-	{
-		public readonly static Role<EnumMemberDeclaration> MemberRole = new Role<EnumMemberDeclaration>("Member");
-		public readonly static Role<AstType> UnderlyingTypeRole = new Role<AstType>("UnderlyingType", AstType.Null);
-
-		public Identifier Name {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		public AstType UnderlyingType {
-			get { return GetChildByRole(UnderlyingTypeRole); }
-			set { SetChildByRole(UnderlyingTypeRole, value); }
-		}
-		
-		public AstNodeCollection<EnumMemberDeclaration> Members {
-			get { return GetChildrenByRole(MemberRole); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var decl = other as EnumDeclaration;
-			return decl != null &&
-				MatchAttributesAndModifiers(decl, match) &&
-				Name.DoMatch(decl.Name, match) &&
-				UnderlyingType.DoMatch(decl.UnderlyingType, match) &&
-				Members.DoMatch(decl.Members, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitEnumDeclaration(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/EnumMemberDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/EnumMemberDeclaration.cs
deleted file mode 100644
index 72e757c607..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/EnumMemberDeclaration.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class EnumMemberDeclaration : AstNode
-	{
-		public AstNodeCollection<AttributeBlock> Attributes {
-			get { return GetChildrenByRole(AttributeBlock.AttributeBlockRole); }
-		}
-		
-		public Identifier Name {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		public Expression Value {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var member = other as EnumMemberDeclaration;
-			return Attributes.DoMatch(member.Attributes, match) &&
-				Name.DoMatch(member.Name, match) &&
-				Value.DoMatch(member.Value, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitEnumMemberDeclaration(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/ImportsClause.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/ImportsClause.cs
deleted file mode 100644
index a9d7f45bf0..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/ImportsClause.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public abstract class ImportsClause : AstNode
-	{
-		public new static readonly ImportsClause Null = new NullImportsClause();
-		
-		class NullImportsClause : ImportsClause
-		{
-			public override bool IsNull {
-				get { return true; }
-			}
-			
-			protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-			{
-				return other != null && other.IsNull;
-			}
-			
-			public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-			{
-				return default(S);
-			}
-		}
-	}
-	
-	public class AliasImportsClause : ImportsClause
-	{
-		public Identifier Name {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		public AstType Alias {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var clause = other as AliasImportsClause;
-			return clause != null
-				&& Name.DoMatch(clause.Name, match)
-				&& Alias.DoMatch(clause.Alias, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitAliasImportsClause(this, data);
-		}
-		
-		public override string ToString() {
-			return string.Format("[AliasImportsClause Name={0} Alias={1}]", Name, Alias);
-		}
-	}
-	
-	public class MemberImportsClause : ImportsClause
-	{
-		public AstType Member {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var node = other as MemberImportsClause;
-			return node != null
-				&& Member.DoMatch(node.Member, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitMemberImportsClause(this, data);
-		}
-		
-		public override string ToString()
-		{
-			return string.Format("[MemberImportsClause Member={0}]", Member);
-		}
-	}
-	
-	public class XmlNamespaceImportsClause : ImportsClause
-	{
-		public XmlIdentifier Prefix {
-			get { return GetChildByRole(Roles.XmlIdentifier); }
-			set { SetChildByRole(Roles.XmlIdentifier, value); }
-		}
-		
-		public XmlLiteralString Namespace {
-			get { return GetChildByRole(Roles.XmlLiteralString); }
-			set { SetChildByRole(Roles.XmlLiteralString, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var clause = other as XmlNamespaceImportsClause;
-			return clause != null && Namespace.DoMatch(clause.Namespace, match) && Prefix.DoMatch(clause.Prefix, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitXmlNamespaceImportsClause(this, data);
-		}
-		
-		public override string ToString()
-		{
-			return string.Format("[XmlNamespaceImportsClause Prefix={0}, Namespace={1}]", Prefix, Namespace);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/ImportsStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/ImportsStatement.cs
deleted file mode 100644
index 24ea944d62..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/ImportsStatement.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.PatternMatching;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class ImportsStatement : AstNode
-	{
-		public static readonly Role<ImportsClause> ImportsClauseRole = new Role<ImportsClause>("ImportsClause", ImportsClause.Null);
-		
-		public VBTokenNode Imports {
-			get { return GetChildByRole(Roles.Keyword); }
-		}
-		
-		public AstNodeCollection<ImportsClause> ImportsClauses {
-			get { return GetChildrenByRole(ImportsClauseRole); }
-		}
-		
-//		public override string ToString() {
-//			return string.Format("[ImportsStatement ImportsClauses={0}]", GetCollectionString(ImportsClauses));
-//		}
-		
-		protected internal override bool DoMatch(AstNode other, Match match)
-		{
-			ImportsStatement stmt = other as ImportsStatement;
-			return stmt != null && stmt.ImportsClauses.DoMatch(ImportsClauses, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitImportsStatement(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/NamespaceDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/NamespaceDeclaration.cs
deleted file mode 100644
index 84016b45af..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/NamespaceDeclaration.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using ICSharpCode.NRefactory.PatternMatching;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Namespace Name
-	/// 	Members
-	/// End Namespace
-	/// </summary>
-	public class NamespaceDeclaration : AstNode
-	{
-		public static readonly Role<AstNode> MemberRole = CompilationUnit.MemberRole;
-		
-		public string Name {
-			get {
-				StringBuilder builder = new StringBuilder();
-				foreach (Identifier identifier in GetChildrenByRole (Roles.Identifier)) {
-					if (builder.Length > 0)
-						builder.Append ('.');
-					builder.Append (identifier.Name);
-				}
-				return builder.ToString ();
-			}
-			set {
-				GetChildrenByRole(Roles.Identifier).ReplaceWith(value.Split('.').Select(ident => new Identifier (ident, TextLocation.Empty)));
-			}
-		}
-		
-		public AstNodeCollection<Identifier> Identifiers {
-			get { return GetChildrenByRole (Roles.Identifier); }
-		}
-		
-		/// <summary>
-		/// Gets the full namespace name (including any parent namespaces)
-		/// </summary>
-		public string FullName {
-			get {
-				NamespaceDeclaration parentNamespace = Parent as NamespaceDeclaration;
-				if (parentNamespace != null)
-					return BuildQualifiedName (parentNamespace.FullName, Name);
-				return Name;
-			}
-		}
-		
-		public AstNodeCollection<AstNode> Members {
-			get { return GetChildrenByRole(MemberRole); }
-		}
-		
-		public static string BuildQualifiedName (string name1, string name2)
-		{
-			if (string.IsNullOrEmpty (name1))
-				return name2;
-			if (string.IsNullOrEmpty (name2))
-				return name1;
-			return name1 + "." + name2;
-		}
-		
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitNamespaceDeclaration(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			NamespaceDeclaration o = other as NamespaceDeclaration;
-			return o != null && MatchString(this.Name, o.Name) && this.Members.DoMatch(o.Members, match);
-		}
-	}
-};
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/OptionStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/OptionStatement.cs
deleted file mode 100644
index 299cc5b01e..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/OptionStatement.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.PatternMatching;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class OptionStatement : AstNode
-	{
-		public static readonly Role<VBTokenNode> OptionTypeRole = new Role<VBTokenNode>("OptionType");
-		public static readonly Role<VBTokenNode> OptionValueRole = new Role<VBTokenNode>("OptionValue");
-
-		public VBTokenNode OptionKeyword {
-			get { return GetChildByRole(Roles.Keyword); }
-		}
-		
-		public VBTokenNode OptionTypeKeyword {
-			get { return GetChildByRole(OptionTypeRole); }
-		}
-		
-		public VBTokenNode OptionValueKeyword {
-			get { return GetChildByRole(OptionValueRole); }
-		}
-
-		public OptionType OptionType { get; set; }
-
-		public OptionValue OptionValue { get; set; }
-		
-		protected internal override bool DoMatch(AstNode other, Match match)
-		{
-			var stmt = other as OptionStatement;
-			return stmt != null && stmt.OptionType == this.OptionType
-				&& stmt.OptionValue == this.OptionValue;
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitOptionStatement(this, data);
-		}
-		
-		public override string ToString() {
-			return string.Format("[OptionStatement OptionType={0} OptionValue={1}]", OptionType, OptionValue);
-		}
-	}
-	
-	public enum OptionType
-	{
-		Explicit,
-		Strict,
-		Compare,
-		Infer
-	}
-	
-	public enum OptionValue
-	{
-		On, Off,
-		Text, Binary
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/TypeDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/TypeDeclaration.cs
deleted file mode 100644
index 13ccf5563e..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/GlobalScope/TypeDeclaration.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public enum ClassType
-	{
-		Class,
-		Struct,
-		Interface,
-		Module
-	}
-	
-	public class TypeDeclaration : AttributedNode
-	{
-		public readonly static Role<AttributedNode> MemberRole = new Role<AttributedNode>("Member");
-		public readonly static Role<AstType> InheritsTypeRole = new Role<AstType>("InheritsType", AstType.Null);
-		public readonly static Role<AstType> ImplementsTypesRole = new Role<AstType>("ImplementsTypes", AstType.Null);
-
-		public AstNodeCollection<AttributedNode> Members {
-			get { return base.GetChildrenByRole(MemberRole); }
-		}
-		
-		public ClassType ClassType { get; set; }
-		
-		public Identifier Name {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		public AstNodeCollection<TypeParameterDeclaration> TypeParameters {
-			get { return GetChildrenByRole(Roles.TypeParameter); }
-		}
-		
-		public AstType InheritsType {
-			get { return GetChildByRole(InheritsTypeRole); }
-			set { SetChildByRole(InheritsTypeRole, value); }
-		}
-		
-		public AstNodeCollection<AstType> ImplementsTypes {
-			get { return GetChildrenByRole(ImplementsTypesRole); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			TypeDeclaration t = other as TypeDeclaration;
-			return t != null &&
-				MatchAttributesAndModifiers(t, match) &&
-				Members.DoMatch(t.Members, match) &&
-				ClassType == t.ClassType &&
-				Name.DoMatch(t.Name, match) &&
-				TypeParameters.DoMatch(t.TypeParameters, match) &&
-				InheritsType.DoMatch(t.InheritsType, match) &&
-				ImplementsTypes.DoMatch(t.ImplementsTypes, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitTypeDeclaration(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/INullable.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/INullable.cs
deleted file mode 100644
index 1ce646f6bb..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/INullable.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public interface INullable
-	{
-		bool IsNull {
-			get;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Identifier.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Identifier.cs
deleted file mode 100644
index e7cd4424a1..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Identifier.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Represents an identifier in VB.
-	/// </summary>
-	public class Identifier : AstNode
-	{
-		public static readonly new Identifier Null = new NullIdentifier ();
-		class NullIdentifier : Identifier
-		{
-			public override bool IsNull {
-				get {
-					return true;
-				}
-			}
-			
-			public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-			{
-				return default (S);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return other == null || other.IsNull;
-			}
-		}
-		
-		string name;
-		
-		public string Name {
-			get { return name; }
-			set {
-				if (value == null)
-					throw new ArgumentNullException("value");
-				name = value;
-			}
-		}
-		
-		public TypeCode TypeCharacter { get; set; }
-		
-		TextLocation startLocation;
-		public override TextLocation StartLocation {
-			get {
-				return startLocation;
-			}
-		}
-		
-		public override TextLocation EndLocation {
-			get {
-				return new TextLocation (StartLocation.Line, StartLocation.Column + Name.Length);
-			}
-		}
-		
-		private Identifier()
-		{
-			this.name = string.Empty;
-		}
-		
-		public Identifier (string name, TextLocation location)
-		{
-			if (name == null)
-				throw new ArgumentNullException("name");
-			this.Name = name;
-			this.startLocation = location;
-		}
-		
-		public static implicit operator Identifier(string name)
-		{
-			return new Identifier(name, TextLocation.Empty);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var node = other as Identifier;
-			return node != null
-				&& MatchString(node.name, name)
-				&& node.TypeCharacter == TypeCharacter;
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitIdentifier(this, data);
-		}
-		
-		public override string ToString()
-		{
-			return string.Format("{0}",
-			                     name);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/BlockStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/BlockStatement.cs
deleted file mode 100644
index 1cce01649d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/BlockStatement.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// { Statements }
-	/// </summary>
-	public class BlockStatement : Statement, IEnumerable<Statement>
-	{
-		public static readonly Role<Statement> StatementRole = new Role<Statement>("Statement", Statement.Null);
-		
-		#region Null
-		public static readonly new BlockStatement Null = new NullBlockStatement();
-		sealed class NullBlockStatement : BlockStatement
-		{
-			public override bool IsNull {
-				get {
-					return true;
-				}
-			}
-			
-			public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-			{
-				return default(S);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return other == null || other.IsNull;
-			}
-		}
-		#endregion
-		
-		#region PatternPlaceholder
-		public static implicit operator BlockStatement(PatternMatching.Pattern pattern)
-		{
-			return pattern != null ? new PatternPlaceholder(pattern) : null;
-		}
-		
-		sealed class PatternPlaceholder : BlockStatement, PatternMatching.INode
-		{
-			readonly PatternMatching.Pattern child;
-			
-			public PatternPlaceholder(PatternMatching.Pattern child)
-			{
-				this.child = child;
-			}
-			
-			public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-			{
-				return visitor.VisitPatternPlaceholder(this, child, data);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return child.DoMatch(other, match);
-			}
-			
-			bool PatternMatching.INode.DoMatchCollection(Role role, PatternMatching.INode pos, PatternMatching.Match match, PatternMatching.BacktrackingInfo backtrackingInfo)
-			{
-				return child.DoMatchCollection(role, pos, match, backtrackingInfo);
-			}
-		}
-		#endregion
-		
-		public AstNodeCollection<Statement> Statements {
-			get { return GetChildrenByRole (StatementRole); }
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitBlockStatement (this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			BlockStatement o = other as BlockStatement;
-			return o != null && !(o is CatchBlock) && !o.IsNull && this.Statements.DoMatch(o.Statements, match);
-		}
-		
-		#region Builder methods
-		public void Add(Statement statement)
-		{
-			AddChild(statement, StatementRole);
-		}
-		
-		public void Add(Expression expression)
-		{
-			AddChild(new ExpressionStatement { Expression = expression }, StatementRole);
-		}
-		
-		public void AddRange(IEnumerable<Statement> statements)
-		{
-			foreach (Statement st in statements)
-				AddChild(st, StatementRole);
-		}
-		
-		public void AddAssignment(Expression left, Expression right)
-		{
-			Add(new AssignmentExpression(left, AssignmentOperatorType.Assign, right));
-		}
-		
-		public void AddReturnStatement(Expression expression)
-		{
-			Add(new ReturnStatement { Expression = expression });
-		}
-		#endregion
-		
-		IEnumerator<Statement> IEnumerable<Statement>.GetEnumerator()
-		{
-			return this.Statements.GetEnumerator();
-		}
-		
-		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-		{
-			return this.Statements.GetEnumerator();
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ContinueStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ContinueStatement.cs
deleted file mode 100644
index 4ec41f6284..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ContinueStatement.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Continue ( Do | For | While )
-	/// </summary>
-	public class ContinueStatement : Statement
-	{
-		public static readonly Role<VBTokenNode> ContinueKindTokenRole = new Role<VBTokenNode>("ContinueKindToken");
-		
-		public ContinueKind ContinueKind { get; set; }
-		
-		public VBTokenNode ContinueToken {
-			get { return GetChildByRole (Roles.Keyword); }
-		}
-		
-		public VBTokenNode ContinueKindToken {
-			get { return GetChildByRole (ContinueKindTokenRole); }
-		}
-		
-		public ContinueStatement(ContinueKind kind)
-		{
-			this.ContinueKind = kind;
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitContinueStatement(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			ContinueStatement o = other as ContinueStatement;
-			return o != null && this.ContinueKind == o.ContinueKind;
-		}
-	}
-	
-	public enum ContinueKind
-	{
-		None,
-		Do,
-		For,
-		While
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/DoLoopStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/DoLoopStatement.cs
deleted file mode 100644
index 9335926f89..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/DoLoopStatement.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class DoLoopStatement : Statement
-	{
-		public ConditionType ConditionType { get; set; }
-		
-		public Expression Expression {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		public BlockStatement Body {
-			get { return GetChildByRole(Roles.Body); }
-			set { SetChildByRole(Roles.Body, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitDoLoopStatement(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ExitStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ExitStatement.cs
deleted file mode 100644
index b5f7c0ff3c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ExitStatement.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Exit ( Do | For | While | Select | Sub | Function | Property | Try )
-	/// </summary>
-	public class ExitStatement : Statement
-	{
-		public static readonly Role<VBTokenNode> ExitKindTokenRole = new Role<VBTokenNode>("ExitKindToken");
-		
-		public ExitKind ExitKind { get; set; }
-		
-		public VBTokenNode ExitToken {
-			get { return GetChildByRole (Roles.Keyword); }
-		}
-		
-		public VBTokenNode ExitKindToken {
-			get { return GetChildByRole (ExitKindTokenRole); }
-		}
-		
-		public ExitStatement(ExitKind kind)
-		{
-			this.ExitKind = kind;
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitExitStatement(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			ExitStatement o = other as ExitStatement;
-			return o != null && this.ExitKind == o.ExitKind;
-		}
-	}
-	
-	public enum ExitKind
-	{
-		None,
-		Sub,
-		Function,
-		Property,
-		Do,
-		For,
-		While,
-		Select,
-		Try
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ExpressionStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ExpressionStatement.cs
deleted file mode 100644
index 67e8952d65..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ExpressionStatement.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Expression
-	/// </summary>
-	// TODO this does not directly reflect the VB grammar!
-	public class ExpressionStatement : Statement
-	{
-		public Expression Expression {
-			get { return GetChildByRole (Roles.Expression); }
-			set { SetChildByRole (Roles.Expression, value); }
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitExpressionStatement(this, data);
-		}
-		
-		public ExpressionStatement()
-		{
-		}
-		
-		public ExpressionStatement(Expression expression)
-		{
-			this.Expression = expression;
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			ExpressionStatement o = other as ExpressionStatement;
-			return o != null && this.Expression.DoMatch(o.Expression, match);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ForEachStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ForEachStatement.cs
deleted file mode 100644
index 7c0cd90b14..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ForEachStatement.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class ForEachStatement : Statement
-	{
-		public static readonly Role<AstNode> VariableRole = new Role<AstNode>("Variable", AstNode.Null);
-		
-		public AstNode Variable {
-			get { return GetChildByRole(VariableRole); }
-			set { SetChildByRole(VariableRole, value); }
-		}
-		
-		public Expression InExpression {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		public BlockStatement Body {
-			get { return GetChildByRole(Roles.Body); }
-			set { SetChildByRole(Roles.Body, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitForEachStatement(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ForStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ForStatement.cs
deleted file mode 100644
index c28ea0fd56..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ForStatement.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class ForStatement : Statement
-	{
-		public static readonly Role<AstNode> VariableRole = new Role<AstNode>("Variable", AstNode.Null);
-		public static readonly Role<Expression> ToExpressionRole = new Role<Expression>("ToExpression", Expression.Null);
-		public static readonly Role<Expression> StepExpressionRole = new Role<Expression>("StepExpression", Expression.Null);
-		
-		public AstNode Variable {
-			get { return GetChildByRole(VariableRole); }
-			set { SetChildByRole(VariableRole, value); }
-		}
-		
-		public Expression ToExpression {
-			get { return GetChildByRole(ToExpressionRole); }
-			set { SetChildByRole(ToExpressionRole, value); }
-		}
-		
-		public Expression StepExpression {
-			get { return GetChildByRole(StepExpressionRole); }
-			set { SetChildByRole(StepExpressionRole, value); }
-		}
-		
-		public BlockStatement Body {
-			get { return GetChildByRole(Roles.Body); }
-			set { SetChildByRole(Roles.Body, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitForStatement(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/GoToStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/GoToStatement.cs
deleted file mode 100644
index 32dc7d7456..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/GoToStatement.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class GoToStatement : Statement
-	{
-		/// <remarks>either PrimitiveExpression or IdentifierExpression</remarks>
-		public Expression Label {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitGoToStatement(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/IfElseStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/IfElseStatement.cs
deleted file mode 100644
index 08738789aa..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/IfElseStatement.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class IfElseStatement : Statement
-	{
-		public static readonly Role<Statement> FalseStatementRole = new Role<Statement>("False", Ast.Statement.Null);
-		public static readonly Role<Statement> TrueStatementRole = new Role<Statement>("True", Ast.Statement.Null);
-		
-		public Expression Condition {
-			get { return GetChildByRole(Roles.Condition); }
-			set { SetChildByRole(Roles.Condition, value); }
-		}
-		
-		public Statement Body {
-			get { return GetChildByRole(TrueStatementRole); }
-			set { SetChildByRole(TrueStatementRole, value); }
-		}
-		
-		public Statement ElseBlock {
-			get { return GetChildByRole(FalseStatementRole); }
-			set { SetChildByRole(FalseStatementRole, value); }
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitIfElseStatement(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/LabelDeclarationStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/LabelDeclarationStatement.cs
deleted file mode 100644
index 589fea5a6c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/LabelDeclarationStatement.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Label:
-	/// </summary>
-	public class LabelDeclarationStatement : Statement
-	{
-		/// <remarks>either PrimitiveExpression or IdentifierExpression</remarks>
-		public Expression Label {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		public VBTokenNode Colon {
-			get { return GetChildByRole(Roles.Colon); }
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitLabelDeclarationStatement(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			LabelDeclarationStatement o = other as LabelDeclarationStatement;
-			return o != null && this.Label.DoMatch(o.Label, match);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/LocalDeclarationStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/LocalDeclarationStatement.cs
deleted file mode 100644
index 40c19b2abb..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/LocalDeclarationStatement.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// ( Dim | Static | Const ) VariableDeclarator { , VariableDeclarator }
-	/// </summary>
-	public class LocalDeclarationStatement : Statement
-	{
-		public AstNodeCollection<VariableDeclarator> Variables {
-			get { return GetChildrenByRole(VariableDeclarator.VariableDeclaratorRole); }
-		}
-		
-		public Modifiers Modifiers {
-			get { return AttributedNode.GetModifiers(this); }
-			set { AttributedNode.SetModifiers(this, value); }
-		}
-		
-		public VBModifierToken ModifierToken {
-			get { return GetChildByRole(AttributedNode.ModifierRole); }
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitLocalDeclarationStatement(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ReturnStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ReturnStatement.cs
deleted file mode 100644
index 26deb1ab29..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ReturnStatement.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Return Expression
-	/// </summary>
-	public class ReturnStatement : Statement
-	{
-		public VBTokenNode ReturnToken {
-			get { return GetChildByRole (Roles.Keyword); }
-		}
-		
-		public Expression Expression {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		public ReturnStatement()
-		{
-		}
-		
-		public ReturnStatement(Expression expression)
-		{
-			AddChild (expression, Roles.Expression);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitReturnStatement(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			ReturnStatement o = other as ReturnStatement;
-			return o != null && this.Expression.DoMatch(o.Expression, match);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/SelectStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/SelectStatement.cs
deleted file mode 100644
index 70f2dd7209..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/SelectStatement.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class SelectStatement : Statement
-	{
-		public Expression Expression {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		public AstNodeCollection<CaseStatement> Cases {
-			get { return GetChildrenByRole(CaseStatement.CaseStatementRole); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitSelectStatement(this, data);
-		}
-	}
-	
-	public class CaseStatement : Statement
-	{
-		public static readonly Role<CaseStatement> CaseStatementRole = new Role<CaseStatement>("CaseStatement");
-		
-		public AstNodeCollection<CaseClause> Clauses {
-			get { return GetChildrenByRole(CaseClause.CaseClauseRole); }
-		}
-		
-		public BlockStatement Body {
-			get { return GetChildByRole(Roles.Body); }
-			set { SetChildByRole(Roles.Body, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitCaseStatement(this, data);
-		}
-	}
-	
-	public abstract class CaseClause : AstNode
-	{
-		#region Null
-		public new static readonly CaseClause Null = new NullCaseClause();
-		
-		sealed class NullCaseClause : CaseClause
-		{
-			public override bool IsNull {
-				get {
-					return true;
-				}
-			}
-			
-			public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-			{
-				return default (S);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return other == null || other.IsNull;
-			}
-		}
-		#endregion
-		
-		public static readonly Role<CaseClause> CaseClauseRole = new Role<CaseClause>("CaseClause", CaseClause.Null);
-		
-		public Expression Expression {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-	}
-
-	public class SimpleCaseClause : CaseClause
-	{
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitSimpleCaseClause(this, data);
-		}
-	}
-
-	public class RangeCaseClause : CaseClause
-	{
-		public static readonly Role<Expression> ToExpressionRole = ForStatement.ToExpressionRole;
-		
-		public Expression ToExpression {
-			get { return GetChildByRole(ToExpressionRole); }
-			set { SetChildByRole(ToExpressionRole, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitRangeCaseClause(this, data);
-		}
-	}
-
-	public class ComparisonCaseClause : CaseClause
-	{
-		public static readonly Role<VBTokenNode> OperatorRole = BinaryOperatorExpression.OperatorRole;
-		
-		public ComparisonOperator Operator { get; set; }
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitComparisonCaseClause(this, data);
-		}
-	}
-
-	public enum ComparisonOperator
-	{
-		Equality = BinaryOperatorType.Equality,
-		InEquality = BinaryOperatorType.InEquality,
-		LessThan = BinaryOperatorType.LessThan,
-		GreaterThan = BinaryOperatorType.GreaterThan,
-		LessThanOrEqual = BinaryOperatorType.LessThanOrEqual,
-		GreaterThanOrEqual = BinaryOperatorType.GreaterThanOrEqual
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/Statement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/Statement.cs
deleted file mode 100644
index 4eee3903e2..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/Statement.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Base class for statements.
-	/// </summary>
-	/// <remarks>
-	/// This class is useful even though it doesn't provide any additional functionality:
-	/// It can be used to communicate more information in APIs, e.g. "this subnode will always be a statement"
-	/// </remarks>
-	public abstract class Statement : AstNode
-	{
-		#region Null
-		public new static readonly Statement Null = new NullStatement ();
-		
-		sealed class NullStatement : Statement
-		{
-			public override bool IsNull {
-				get {
-					return true;
-				}
-			}
-			
-			public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-			{
-				return default (S);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return other == null || other.IsNull;
-			}
-		}
-		#endregion
-		
-		#region PatternPlaceholder
-		public static implicit operator Statement(PatternMatching.Pattern pattern)
-		{
-			return pattern != null ? new PatternPlaceholder(pattern) : null;
-		}
-		
-		sealed class PatternPlaceholder : Statement, PatternMatching.INode
-		{
-			readonly PatternMatching.Pattern child;
-			
-			public PatternPlaceholder(PatternMatching.Pattern child)
-			{
-				this.child = child;
-			}
-			
-			public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-			{
-				return visitor.VisitPatternPlaceholder(this, child, data);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return child.DoMatch(other, match);
-			}
-			
-			bool PatternMatching.INode.DoMatchCollection(Role role, PatternMatching.INode pos, PatternMatching.Match match, PatternMatching.BacktrackingInfo backtrackingInfo)
-			{
-				return child.DoMatchCollection(role, pos, match, backtrackingInfo);
-			}
-		}
-		#endregion
-		
-		/// <summary>
-		/// Gets the previous statement within the current block.
-		/// This is usually equivalent to <see cref="PrevSibling"/>, but will skip any non-statements (e.g. comments)
-		/// </summary>
-		public Statement PreviousStatement {
-			get {
-				AstNode node = this;
-				while ((node = node.PrevSibling) != null) {
-					Statement stmt = node as Statement;
-					if (stmt != null)
-						return stmt;
-				}
-				return null;
-			}
-		}
-		
-		/// <summary>
-		/// Gets the next statement within the current block.
-		/// This is usually equivalent to <see cref="NextSibling"/>, but will skip any non-statements (e.g. comments)
-		/// </summary>
-		public Statement NextStatement {
-			get {
-				AstNode node = this;
-				while ((node = node.NextSibling) != null) {
-					Statement stmt = node as Statement;
-					if (stmt != null)
-						return stmt;
-				}
-				return null;
-			}
-		}
-		
-		public new Statement Clone()
-		{
-			return (Statement)base.Clone();
-		}
-		
-		public Statement ReplaceWith(Func<Statement, Statement> replaceFunction)
-		{
-			if (replaceFunction == null)
-				throw new ArgumentNullException("replaceFunction");
-			return (Statement)base.ReplaceWith(node => replaceFunction((Statement)node));
-		}
-		
-		// Make debugging easier by giving Statements a ToString() implementation
-//		public override string ToString()
-//		{
-////			if (IsNull)
-////				return "Null";
-////			StringWriter w = new StringWriter();
-////			AcceptVisitor(new OutputVisitor(w, FormattingOptionsFactory.CreateMonoOptions ()), null);
-////			string text = w.ToString().TrimEnd().Replace("\t", "").Replace(w.NewLine, " ");
-////			if (text.Length > 100)
-////				return text.Substring(0, 97) + "...";
-////			else
-////				return text;
-//			throw new NotImplementedException();
-//		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/SyncLockStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/SyncLockStatement.cs
deleted file mode 100644
index 7fd317eb09..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/SyncLockStatement.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// SyncLock Expression <br />
-	/// 	Block <br />
-	/// End SyncLock
-	/// </summary>
-	public class SyncLockStatement : Statement
-	{
-		public Expression Expression {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		public BlockStatement Body {
-			get { return GetChildByRole(Roles.Body); }
-			set { SetChildByRole(Roles.Body, value); }
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitSyncLockStatement(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ThrowStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ThrowStatement.cs
deleted file mode 100644
index c4c1634b5c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/ThrowStatement.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Throw Expression
-	/// </summary>
-	public class ThrowStatement : Statement
-	{
-		public VBTokenNode ThrowToken {
-			get { return GetChildByRole (Roles.Keyword); }
-		}
-		
-		public Expression Expression {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		public ThrowStatement()
-		{
-		}
-		
-		public ThrowStatement(Expression expression)
-		{
-			AddChild (expression, Roles.Expression);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitThrowStatement(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			ThrowStatement o = other as ThrowStatement;
-			return o != null && this.Expression.DoMatch(o.Expression, match);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/TryStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/TryStatement.cs
deleted file mode 100644
index 7e5eb94da9..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/TryStatement.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class TryStatement : Statement
-	{
-		public static readonly Role<BlockStatement> FinallyBlockRole = new Role<BlockStatement>("FinallyBlock", Ast.BlockStatement.Null);
-		
-		public BlockStatement Body {
-			get { return GetChildByRole(Roles.Body); }
-			set { SetChildByRole(Roles.Body, value); }
-		}
-		
-		public AstNodeCollection<CatchBlock> CatchBlocks {
-			get { return GetChildrenByRole(CatchBlock.CatchBlockRole); }
-		}
-		
-		public BlockStatement FinallyBlock {
-			get { return GetChildByRole(FinallyBlockRole); }
-			set { SetChildByRole(FinallyBlockRole, value); }
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitTryStatement(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-	}
-	
-	public class CatchBlock : BlockStatement
-	{
-		public static readonly Role<CatchBlock> CatchBlockRole = new Role<CatchBlock>("CatchBlockRole");
-		
-		public Identifier ExceptionVariable {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		public AstType ExceptionType {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-		
-		public Expression WhenExpression {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitCatchBlock(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-	}	
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/UsingStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/UsingStatement.cs
deleted file mode 100644
index c2147e447a..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/UsingStatement.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class UsingStatement : Statement
-	{
-		public static readonly Role<AstNode> ResourceRole = new Role<AstNode>("Resource", AstNode.Null);
-		
-		/// <remarks>either multiple VariableInitializers or one Expression</remarks>
-		public AstNodeCollection<AstNode> Resources {
-			get { return GetChildrenByRole(ResourceRole); }
-		}
-		
-		public BlockStatement Body {
-			get { return GetChildByRole(Roles.Body); }
-			set { SetChildByRole(Roles.Body, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitUsingStatement(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/WhileStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/WhileStatement.cs
deleted file mode 100644
index e5c9ec24c5..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/WhileStatement.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class WhileStatement : Statement
-	{
-		public Expression Condition {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		public BlockStatement Body {
-			get { return GetChildByRole(Roles.Body); }
-			set { SetChildByRole(Roles.Body, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitWhileStatement(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/WithStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/WithStatement.cs
deleted file mode 100644
index b915a90815..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/WithStatement.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// With Expression <br />
-	/// 	Block <br />
-	/// End With
-	/// </summary>
-	public class WithStatement : Statement
-	{
-		public Expression Expression {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		public BlockStatement Body {
-			get { return GetChildByRole(Roles.Body); }
-			set { SetChildByRole(Roles.Body, value); }
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitWithStatement(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/YieldStatement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/YieldStatement.cs
deleted file mode 100644
index 895382aa1d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/Statements/YieldStatement.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Yield Expression
-	/// </summary>
-	/// <remarks>VB 11</remarks>
-	public class YieldStatement : Statement
-	{
-		public VBTokenNode YieldToken {
-			get { return GetChildByRole (Roles.Keyword); }
-		}
-		
-		public Expression Expression {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		public YieldStatement()
-		{
-		}
-		
-		public YieldStatement(Expression expression)
-		{
-			AddChild (expression, Roles.Expression);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitYieldStatement(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			YieldStatement o = other as YieldStatement;
-			return o != null && this.Expression.DoMatch(o.Expression, match);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/Accessor.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/Accessor.cs
deleted file mode 100644
index 7eb287c267..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/Accessor.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Get/Set/AddHandler/RemoveHandler/RaiseEvent
-	/// </summary>
-	public class Accessor : AttributedNode
-	{
-		public static readonly new Accessor Null = new NullAccessor ();
-		sealed class NullAccessor : Accessor
-		{
-			public override bool IsNull {
-				get {
-					return true;
-				}
-			}
-			
-			public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-			{
-				return default (S);
-			}
-		}
-		
-		public BlockStatement Body {
-			get { return GetChildByRole(Roles.Body); }
-			set { SetChildByRole(Roles.Body, value); }
-		}
-		
-		public AstNodeCollection<ParameterDeclaration> Parameters {
-			get { return GetChildrenByRole(Roles.Parameter); }
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitAccessor(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			Accessor o = other as Accessor;
-			return o != null && !o.IsNull && this.MatchAttributesAndModifiers(o, match) &&
-				this.Body.DoMatch(o.Body, match) && Parameters.DoMatch(o.Parameters, match);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/ConstructorDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/ConstructorDeclaration.cs
deleted file mode 100644
index 9e57fc572d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/ConstructorDeclaration.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public abstract class MemberDeclaration : AttributedNode
-	{
-		
-	}
-	
-	/// <summary>
-	/// Description of ConstructorDeclaration.
-	/// </summary>
-	public class ConstructorDeclaration : MemberDeclaration
-	{
-		public ConstructorDeclaration()
-		{
-		}
-		
-		public AstNodeCollection<ParameterDeclaration> Parameters {
-			get { return GetChildrenByRole(Roles.Parameter); }
-		}
-		
-		public BlockStatement Body {
-			get { return GetChildByRole(Roles.Body); }
-			set { SetChildByRole(Roles.Body, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var ctor = other as ConstructorDeclaration;
-			return ctor != null &&
-				MatchAttributesAndModifiers(ctor, match) &&
-				Parameters.DoMatch(ctor.Parameters, match) &&
-				Body.DoMatch(ctor.Body, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitConstructorDeclaration(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/EventDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/EventDeclaration.cs
deleted file mode 100644
index ce01819640..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/EventDeclaration.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class EventDeclaration : MemberDeclaration
-	{
-		public bool IsCustom { get; set; }
-		
-		public static readonly Role<Accessor> AddHandlerRole = new Role<Accessor>("AddHandler", Accessor.Null);
-		public static readonly Role<Accessor> RemoveHandlerRole = new Role<Accessor>("RemoveHandler", Accessor.Null);
-		public static readonly Role<Accessor> RaiseEventRole = new Role<Accessor>("RaiseEvent", Accessor.Null);
-		
-		public Identifier Name {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		public AstType ReturnType {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-		
-		public AstNodeCollection<ParameterDeclaration> Parameters {
-			get { return GetChildrenByRole(Roles.Parameter); }
-		}
-		
-		public AstNodeCollection<InterfaceMemberSpecifier> ImplementsClause {
-			get { return GetChildrenByRole(InterfaceMemberSpecifier.InterfaceMemberSpecifierRole); }
-		}
-		
-		public Accessor AddHandlerBlock {
-			get { return GetChildByRole(AddHandlerRole); }
-			set { SetChildByRole(AddHandlerRole, value); }
-		}
-		
-		public Accessor RemoveHandlerBlock {
-			get { return GetChildByRole(RemoveHandlerRole); }
-			set { SetChildByRole(RemoveHandlerRole, value); }
-		}
-		
-		public Accessor RaiseEventBlock {
-			get { return GetChildByRole(RaiseEventRole); }
-			set { SetChildByRole(RaiseEventRole, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitEventDeclaration(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/ExternalMethodDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/ExternalMethodDeclaration.cs
deleted file mode 100644
index d5d9754472..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/ExternalMethodDeclaration.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class ExternalMethodDeclaration : MemberDeclaration
-	{
-		public ExternalMethodDeclaration()
-		{
-		}
-		
-		public CharsetModifier CharsetModifier { get; set; }
-		
-		public bool IsSub { get; set; }
-		
-		public Identifier Name {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		public string Library { get; set; }
-		
-		public string Alias { get; set; }
-		
-		public AstNodeCollection<ParameterDeclaration> Parameters {
-			get { return GetChildrenByRole(Roles.Parameter); }
-		}
-		
-		public AstNodeCollection<AttributeBlock> ReturnTypeAttributes {
-			get { return GetChildrenByRole(AttributeBlock.ReturnTypeAttributeBlockRole); }
-		}
-		
-		public AstType ReturnType {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-				
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			// TODO : finish
-			var method = other as ExternalMethodDeclaration;
-			return method != null &&
-				MatchAttributesAndModifiers(method, match) &&
-				IsSub == method.IsSub &&
-				Name.DoMatch(method.Name, match) &&
-				Parameters.DoMatch(method.Parameters, match) &&
-				ReturnTypeAttributes.DoMatch(method.ReturnTypeAttributes, match) &&
-				ReturnType.DoMatch(method.ReturnType, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitExternalMethodDeclaration(this, data);
-		}
-	}
-	
-	///<summary>
-	/// Charset types, used in external methods
-	/// declarations (VB only).
-	///</summary>
-	public enum CharsetModifier
-	{
-		None,
-		Auto,
-		Unicode,
-		Ansi
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/FieldDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/FieldDeclaration.cs
deleted file mode 100644
index 528d632cb4..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/FieldDeclaration.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <remarks>
-	/// Attributes? VariableModifier+ VariableDeclarators StatementTerminator
-	/// </remarks>
-	public class FieldDeclaration : MemberDeclaration
-	{
-		public AstNodeCollection<VariableDeclarator> Variables {
-			get { return GetChildrenByRole(VariableDeclarator.VariableDeclaratorRole); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitFieldDeclaration(this, data);
-		}
-	}
-	
-
-	
-	/// <remarks>
-	/// Identifier IdentifierModifiers
-	/// </remarks>
-	public class VariableIdentifier : AstNode
-	{
-		#region Null
-		public new static readonly VariableIdentifier Null = new NullVariableIdentifier();
-		
-		sealed class NullVariableIdentifier : VariableIdentifier
-		{
-			public override bool IsNull {
-				get {
-					return true;
-				}
-			}
-			
-			public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-			{
-				return default (S);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return other == null || other.IsNull;
-			}
-		}
-		#endregion
-		
-		public static readonly Role<VariableIdentifier> VariableIdentifierRole = new Role<VariableIdentifier>("VariableIdentifier", VariableIdentifier.Null);
-		
-		public Identifier Name {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		public bool HasNullableSpecifier { get; set; }
-		
-		public AstNodeCollection<ArraySpecifier> ArraySpecifiers {
-			get { return GetChildrenByRole(ComposedType.ArraySpecifierRole); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitVariableIdentifier(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/MethodDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/MethodDeclaration.cs
deleted file mode 100644
index a6dd87159e..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/MethodDeclaration.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class MethodDeclaration : MemberDeclaration
-	{
-		public MethodDeclaration()
-		{
-		}
-		
-		public bool IsSub { get; set; }
-		
-		public Identifier Name {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		public AstNodeCollection<TypeParameterDeclaration> TypeParameters {
-			get { return GetChildrenByRole(Roles.TypeParameter); }
-		}
-		
-		public AstNodeCollection<ParameterDeclaration> Parameters {
-			get { return GetChildrenByRole(Roles.Parameter); }
-		}
-		
-		public AstNodeCollection<AttributeBlock> ReturnTypeAttributes {
-			get { return GetChildrenByRole(AttributeBlock.ReturnTypeAttributeBlockRole); }
-		}
-		
-		public AstType ReturnType {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-		
-		public AstNodeCollection<EventMemberSpecifier> HandlesClause {
-			get { return GetChildrenByRole(EventMemberSpecifier.EventMemberSpecifierRole); }
-		}
-		
-		public AstNodeCollection<InterfaceMemberSpecifier> ImplementsClause {
-			get { return GetChildrenByRole(InterfaceMemberSpecifier.InterfaceMemberSpecifierRole); }
-		}
-		
-		public BlockStatement Body {
-			get { return GetChildByRole(Roles.Body); }
-			set { SetChildByRole(Roles.Body, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			var method = other as MethodDeclaration;
-			return method != null &&
-				MatchAttributesAndModifiers(method, match) &&
-				IsSub == method.IsSub &&
-				Name.DoMatch(method.Name, match) &&
-				TypeParameters.DoMatch(method.TypeParameters, match) &&
-				Parameters.DoMatch(method.Parameters, match) &&
-				ReturnTypeAttributes.DoMatch(method.ReturnTypeAttributes, match) &&
-				ReturnType.DoMatch(method.ReturnType, match) &&
-				HandlesClause.DoMatch(method.HandlesClause, match) &&
-				ImplementsClause.DoMatch(method.ImplementsClause, match) &&
-				Body.DoMatch(method.Body, match);
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitMethodDeclaration(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/OperatorDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/OperatorDeclaration.cs
deleted file mode 100644
index f6591e4a4f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/OperatorDeclaration.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class OperatorDeclaration : MemberDeclaration
-	{
-		public OperatorDeclaration()
-		{
-		}
-		
-		public OverloadableOperatorType Operator { get; set; }
-		
-		public AstNodeCollection<ParameterDeclaration> Parameters {
-			get { return GetChildrenByRole(Roles.Parameter); }
-		}
-		
-		public AstNodeCollection<AttributeBlock> ReturnTypeAttributes {
-			get { return GetChildrenByRole(AttributeBlock.ReturnTypeAttributeBlockRole); }
-		}
-		
-		public AstType ReturnType {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-		
-		public BlockStatement Body {
-			get { return GetChildByRole(Roles.Body); }
-			set { SetChildByRole(Roles.Body, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitOperatorDeclaration(this, data);
-		}
-	}
-	
-	public enum OverloadableOperatorType
-	{
-		None,
-		
-		Add,
-		Subtract,
-		Multiply,
-		Divide,
-		Modulus,
-		Concat,
-		
-		UnaryPlus,
-		UnaryMinus,
-		
-		Not,
-		
-		BitwiseAnd,
-		BitwiseOr,
-		ExclusiveOr,
-		
-		ShiftLeft,
-		ShiftRight,
-		
-		GreaterThan,
-		GreaterThanOrEqual,
-		Equality,
-		InEquality,
-		LessThan,
-		LessThanOrEqual,
-		
-		IsTrue,
-		IsFalse,
-		
-		Like,
-		Power,
-		CType,
-		DivideInteger
-	}//
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/PropertyDeclaration.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/PropertyDeclaration.cs
deleted file mode 100644
index 6fdab3842a..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/PropertyDeclaration.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class PropertyDeclaration : MemberDeclaration
-	{
-		// TODO : support automatic properties
-		
-		public static readonly Role<Accessor> GetterRole = new Role<Accessor>("Getter", Accessor.Null);
-		public static readonly Role<Accessor> SetterRole = new Role<Accessor>("Setter", Accessor.Null);
-		
-		public Identifier Name {
-			get { return GetChildByRole(Roles.Identifier); }
-			set { SetChildByRole(Roles.Identifier, value); }
-		}
-		
-		public AstNodeCollection<ParameterDeclaration> Parameters {
-			get { return GetChildrenByRole(Roles.Parameter); }
-		}
-		
-		public AstNodeCollection<AttributeBlock> ReturnTypeAttributes {
-			get { return GetChildrenByRole(AttributeBlock.ReturnTypeAttributeBlockRole); }
-		}
-		
-		public AstType ReturnType {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-		
-		public AstNodeCollection<InterfaceMemberSpecifier> ImplementsClause {
-			get { return GetChildrenByRole(InterfaceMemberSpecifier.InterfaceMemberSpecifierRole); }
-		}
-		
-		public Accessor Getter {
-			get { return GetChildByRole(GetterRole); }
-			set { SetChildByRole(GetterRole, value); }
-		}
-		
-		public Accessor Setter {
-			get { return GetChildByRole(SetterRole); }
-			set { SetChildByRole(SetterRole, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitPropertyDeclaration(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/VariableDeclarator.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/VariableDeclarator.cs
deleted file mode 100644
index a3ad2892ad..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeMembers/VariableDeclarator.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <remarks>
-	/// VariableIdentifiers As ObjectCreationExpression <br />
-	/// VariableIdentifiers ( As TypeName )? ( Equals Expression )?
-	/// </remarks>
-	public abstract class VariableDeclarator : AstNode
-	{
-		public static readonly Role<VariableDeclarator> VariableDeclaratorRole = new Role<VariableDeclarator>("VariableDeclarator");
-		
-		public AstNodeCollection<VariableIdentifier> Identifiers {
-			get { return GetChildrenByRole(VariableIdentifier.VariableIdentifierRole); }
-		}
-	}
-	
-	public class VariableDeclaratorWithTypeAndInitializer : VariableDeclarator
-	{
-		public AstType Type {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-		
-		public Expression Initializer {
-			get { return GetChildByRole(Roles.Expression); }
-			set { SetChildByRole(Roles.Expression, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitVariableDeclaratorWithTypeAndInitializer(this, data);
-		}
-	}
-	
-	public class VariableDeclaratorWithObjectCreation : VariableDeclarator
-	{
-		public static readonly Role<ObjectCreationExpression> InitializerRole = new Role<ObjectCreationExpression>("InitializerRole");
-		
-		public ObjectCreationExpression Initializer {
-			get { return GetChildByRole(InitializerRole); }
-			set { SetChildByRole(InitializerRole, value); }
-		}
-		
-		protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitVariableDeclaratorWithObjectCreation(this, data);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/AstType.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/AstType.cs
deleted file mode 100644
index ca39bd369e..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/AstType.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// A type reference in the VB AST.
-	/// </summary>
-	public abstract class AstType : AstNode
-	{
-		#region Null
-		public new static readonly AstType Null = new NullAstType();
-		
-		sealed class NullAstType : AstType
-		{
-			public override bool IsNull {
-				get {
-					return true;
-				}
-			}
-			
-			public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-			{
-				return default (S);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return other == null || other.IsNull;
-			}
-		}
-		#endregion
-		
-		#region PatternPlaceholder
-		public static implicit operator AstType(PatternMatching.Pattern pattern)
-		{
-			return pattern != null ? new PatternPlaceholder(pattern) : null;
-		}
-		
-		sealed class PatternPlaceholder : AstType, PatternMatching.INode
-		{
-			readonly PatternMatching.Pattern child;
-			
-			public PatternPlaceholder(PatternMatching.Pattern child)
-			{
-				this.child = child;
-			}
-			
-			public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-			{
-				return visitor.VisitPatternPlaceholder(this, child, data);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return child.DoMatch(other, match);
-			}
-			
-			bool PatternMatching.INode.DoMatchCollection(Role role, PatternMatching.INode pos, PatternMatching.Match match, PatternMatching.BacktrackingInfo backtrackingInfo)
-			{
-				return child.DoMatchCollection(role, pos, match, backtrackingInfo);
-			}
-		}
-		#endregion
-		
-		public virtual AstType MakeArrayType(int rank = 1)
-		{
-			return new ComposedType { BaseType = this }.MakeArrayType(rank);
-		}
-		
-		public static AstType FromName(string fullName)
-		{
-			if (string.IsNullOrEmpty(fullName))
-				throw new ArgumentNullException("fullName");
-			fullName = fullName.Trim();
-			if (!fullName.Contains("."))
-				return new SimpleType(fullName);
-			string[] parts = fullName.Split('.');
-			
-			AstType type = new SimpleType(parts.First());
-			
-			foreach (var part in parts.Skip(1)) {
-				type = new QualifiedType(type, part);
-			}
-			
-			return type;
-		}
-		
-		/// <summary>
-		/// Builds an expression that can be used to access a static member on this type.
-		/// </summary>
-		public MemberAccessExpression Member(string memberName)
-		{
-			return new TypeReferenceExpression { Type = this }.Member(memberName);
-		}
-		
-		/// <summary>
-		/// Builds an invocation expression using this type as target.
-		/// </summary>
-		public InvocationExpression Invoke(string methodName, IEnumerable<Expression> arguments)
-		{
-			return new TypeReferenceExpression { Type = this }.Invoke(methodName, arguments);
-		}
-		
-		/// <summary>
-		/// Builds an invocation expression using this type as target.
-		/// </summary>
-		public InvocationExpression Invoke(string methodName, params Expression[] arguments)
-		{
-			return new TypeReferenceExpression { Type = this }.Invoke(methodName, arguments);
-		}
-		
-		/// <summary>
-		/// Builds an invocation expression using this type as target.
-		/// </summary>
-		public InvocationExpression Invoke(string methodName, IEnumerable<AstType> typeArguments, IEnumerable<Expression> arguments)
-		{
-			return new TypeReferenceExpression { Type = this }.Invoke(methodName, typeArguments, arguments);
-		}
-		
-		public static AstType Create(Type type)
-		{
-			switch (Type.GetTypeCode(type)) {
-				case TypeCode.Object:
-					return new PrimitiveType("Object");
-				case TypeCode.Boolean:
-					return new PrimitiveType("Boolean");
-				case TypeCode.Char:
-					return new PrimitiveType("Char");
-				case TypeCode.SByte:
-					return new PrimitiveType("SByte");
-				case TypeCode.Byte:
-					return new PrimitiveType("Byte");
-				case TypeCode.Int16:
-					return new PrimitiveType("Short");
-				case TypeCode.UInt16:
-					return new PrimitiveType("UShort");
-				case TypeCode.Int32:
-					return new PrimitiveType("Integer");
-				case TypeCode.UInt32:
-					return new PrimitiveType("UInteger");
-				case TypeCode.Int64:
-					return new PrimitiveType("Long");
-				case TypeCode.UInt64:
-					return new PrimitiveType("ULong");
-				case TypeCode.Single:
-					return new PrimitiveType("Single");
-				case TypeCode.Double:
-					return new PrimitiveType("Double");
-				case TypeCode.Decimal:
-					return new PrimitiveType("Decimal");
-				case TypeCode.String:
-					return new PrimitiveType("String");
-				case TypeCode.DateTime:
-					return new PrimitiveType("Date");
-			}
-			return new SimpleType(type.FullName); // TODO: implement this correctly
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/ComposedType.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/ComposedType.cs
deleted file mode 100644
index 3f23d791c0..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/ComposedType.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class ComposedType : AstType
-	{
-		public static readonly Role<VBTokenNode> NullableRole = new Role<VBTokenNode>("Nullable", VBTokenNode.Null);
-		public static readonly Role<ArraySpecifier> ArraySpecifierRole = new Role<ArraySpecifier>("ArraySpecifier");
-		
-		public AstType BaseType {
-			get { return GetChildByRole(Roles.Type); }
-			set { SetChildByRole(Roles.Type, value); }
-		}
-		
-		public bool HasNullableSpecifier {
-			get {
-				return !GetChildByRole(NullableRole).IsNull;
-			}
-			set {
-				SetChildByRole(NullableRole, value ? new VBTokenNode(TextLocation.Empty, 1) : null);
-			}
-		}
-		
-		public AstNodeCollection<ArraySpecifier> ArraySpecifiers {
-			get { return GetChildrenByRole (ArraySpecifierRole); }
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitComposedType (this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			ComposedType o = other as ComposedType;
-			return o != null && this.HasNullableSpecifier == o.HasNullableSpecifier && this.ArraySpecifiers.DoMatch(o.ArraySpecifiers, match);
-		}
-		
-		public override string ToString()
-		{
-			StringBuilder b = new StringBuilder();
-			b.Append(this.BaseType.ToString());
-			if (this.HasNullableSpecifier)
-				b.Append('?');
-			foreach (var arraySpecifier in this.ArraySpecifiers) {
-				b.Append('(');
-				b.Append(',', arraySpecifier.Dimensions - 1);
-				b.Append(')');
-			}
-			return b.ToString();
-		}
-		
-		public override AstType MakeArrayType(int dimensions)
-		{
-			InsertChildBefore(this.ArraySpecifiers.FirstOrDefault(), new ArraySpecifier(dimensions), ArraySpecifierRole);
-			return this;
-		}
-	}
-	
-	/// <summary>
-	/// [,,,]
-	/// </summary>
-	public class ArraySpecifier : AstNode
-	{
-		public ArraySpecifier()
-		{
-		}
-		
-		public ArraySpecifier(int dimensions)
-		{
-			this.Dimensions = dimensions;
-		}
-		
-		public VBTokenNode LParToken {
-			get { return GetChildByRole (Roles.LPar); }
-		}
-		
-		public int Dimensions {
-			get { return 1 + GetChildrenByRole(Roles.Comma).Count(); }
-			set {
-				int d = this.Dimensions;
-				while (d > value) {
-					GetChildByRole(Roles.Comma).Remove();
-					d--;
-				}
-				while (d < value) {
-					InsertChildBefore(GetChildByRole(Roles.Comma), new VBTokenNode(TextLocation.Empty, 1), Roles.Comma);
-					d++;
-				}
-			}
-		}
-		
-		public VBTokenNode RParToken {
-			get { return GetChildByRole (Roles.LPar); }
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitArraySpecifier(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			ArraySpecifier o = other as ArraySpecifier;
-			return o != null && this.Dimensions == o.Dimensions;
-		}
-		
-		public override string ToString()
-		{
-			return "(" + new string(',', this.Dimensions - 1) + ")";
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/PrimitiveType.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/PrimitiveType.cs
deleted file mode 100644
index 092705d532..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/PrimitiveType.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class PrimitiveType : AstType
-	{
-		public string Keyword { get; set; }
-		public TextLocation Location { get; set; }
-		
-		public PrimitiveType()
-		{
-		}
-		
-		public PrimitiveType(string keyword)
-		{
-			this.Keyword = keyword;
-		}
-		
-		public PrimitiveType(string keyword, TextLocation location)
-		{
-			this.Keyword = keyword;
-			this.Location = location;
-		}
-		
-		public override TextLocation StartLocation {
-			get {
-				return Location;
-			}
-		}
-		public override TextLocation EndLocation {
-			get {
-				return new TextLocation (Location.Line, Location.Column + (Keyword != null ? Keyword.Length : 0));
-			}
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitPrimitiveType(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			PrimitiveType o = other as PrimitiveType;
-			return o != null && MatchString(this.Keyword, o.Keyword);
-		}
-		
-		public override string ToString()
-		{
-			return Keyword ?? base.ToString();
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/QualifiedType.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/QualifiedType.cs
deleted file mode 100644
index 3ee783d63e..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/QualifiedType.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Linq;
-using System.Text;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Description of QualifiedType.
-	/// </summary>
-	public class QualifiedType : AstType
-	{
-		public static readonly Role<AstType> TargetRole = new Role<AstType>("Target", AstType.Null);
-		
-		public AstType Target {
-			get { return GetChildByRole(TargetRole); }
-			set { SetChildByRole(TargetRole, value); }
-		}
-		
-		public string Name {
-			get {
-				return GetChildByRole (Roles.Identifier).Name;
-			}
-			set {
-				SetChildByRole (Roles.Identifier, new Identifier (value, TextLocation.Empty));
-			}
-		}
-		
-		public QualifiedType(AstType target, Identifier name)
-		{
-			Target = target;
-			SetChildByRole(Roles.Identifier, name);
-		}
-		
-		public AstNodeCollection<AstType> TypeArguments {
-			get { return GetChildrenByRole (Roles.TypeArgument); }
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitQualifiedType(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			var o = other as QualifiedType;
-			return o != null && MatchString(this.Name, o.Name) && this.Target.DoMatch(o.Target, match);
-		}
-		
-		public override string ToString()
-		{
-			StringBuilder b = new StringBuilder();
-			b.Append(this.Target);
-			b.Append('.');
-			b.Append(this.Name);
-			if (this.TypeArguments.Any()) {
-				b.Append('(');
-				b.Append(string.Join(", ", this.TypeArguments));
-				b.Append(')');
-			}
-			return b.ToString();
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/SimpleType.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/SimpleType.cs
deleted file mode 100644
index 5f86fa871d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/TypeName/SimpleType.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// 
-// FullTypeName.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2010 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	public class SimpleType : AstType
-	{
-		public SimpleType()
-		{
-		}
-		
-		public SimpleType(string identifier)
-		{
-			this.Identifier = identifier;
-		}
-		
-		public SimpleType(string identifier, TextLocation location)
-		{
-			SetChildByRole (Roles.Identifier, new Identifier (identifier, location));
-		}
-		
-		public string Identifier {
-			get {
-				return GetChildByRole (Roles.Identifier).Name;
-			}
-			set {
-				SetChildByRole (Roles.Identifier, new Identifier (value, TextLocation.Empty));
-			}
-		}
-		
-		public AstNodeCollection<AstType> TypeArguments {
-			get { return GetChildrenByRole (Roles.TypeArgument); }
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitSimpleType(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			SimpleType o = other as SimpleType;
-			return o != null && MatchString(this.Identifier, o.Identifier) && this.TypeArguments.DoMatch(o.TypeArguments, match);
-		}
-		
-		public override string ToString()
-		{
-			StringBuilder b = new StringBuilder(this.Identifier);
-			if (this.TypeArguments.Any()) {
-				b.Append('(');
-				b.Append("Of ");
-				b.Append(string.Join(", ", this.TypeArguments));
-				b.Append(')');
-			}
-			return b.ToString();
-		}
-	}
-}
-
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/VBModifierToken.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/VBModifierToken.cs
deleted file mode 100644
index b38fc3e51b..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/VBModifierToken.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Description of VBModifierToken.
-	/// </summary>
-	public class VBModifierToken : VBTokenNode
-	{
-		Modifiers modifier;
-		
-		public Modifiers Modifier {
-			get { return modifier; }
-			set {
-				for (int i = 0; i < lengthTable.Count; i++) {
-					if (lengthTable[i].Key == value) {
-						this.modifier = value;
-						this.tokenLength = lengthTable[i].Value;
-						return;
-					}
-				}
-				throw new ArgumentException ("Modifier " + value + " is invalid.");
-			}
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			VBModifierToken o = other as VBModifierToken;
-			return o != null && this.modifier == o.modifier;
-		}
-		
-		// Not worth using a dictionary for such few elements.
-		// This table is sorted in the order that modifiers should be output when generating code.
-		static readonly List<KeyValuePair<Modifiers, int>> lengthTable = new List<KeyValuePair<Modifiers, int>> () {
-			new KeyValuePair<Modifiers, int>(Modifiers.Public, "Public".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.Protected, "Protected".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.Private, "Private".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.Friend, "Friend".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.MustInherit, "MustInherit".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.MustOverride, "MustOverride".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.Overridable, "Overridable".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.NotInheritable, "NotInheritable".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.NotOverridable, "NotOverridable".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.Dim, "Dim".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.Const, "Const".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.Shared, "Shared".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.Static, "Static".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.Overrides, "Overrides".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.ReadOnly, "ReadOnly".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.WriteOnly, "WriteOnly".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.Shadows, "Shadows".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.Partial, "Partial".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.Overloads, "Overloads".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.WithEvents, "WithEvents".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.Default, "Default".Length),
-			// parameter modifiers
-			new KeyValuePair<Modifiers, int>(Modifiers.Optional, "Optional".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.ByVal, "ByVal".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.ByRef, "ByRef".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.ParamArray, "ParamArray".Length),
-			// operator modifiers
-			new KeyValuePair<Modifiers, int>(Modifiers.Narrowing, "Narrowing".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.Widening, "Widening".Length),
-			// VB 11 modifiers
-			new KeyValuePair<Modifiers, int>(Modifiers.Async, "Async".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.Iterator, "Iterator".Length),
-			// even though it's used for patterns only, it needs to be in this table to be usable in the AST
-			new KeyValuePair<Modifiers, int>(Modifiers.Any, "Any".Length)
-		};
-		
-		public static IEnumerable<Modifiers> AllModifiers {
-			get { return lengthTable.Select(p => p.Key); }
-		}
-		
-		public VBModifierToken(TextLocation location, Modifiers modifier) : base (location, 0)
-		{
-			this.Modifier = modifier;
-		}
-		
-		public static string GetModifierName(Modifiers modifier)
-		{
-			switch (modifier) {
-				case Modifiers.Private:
-					return "Private";
-				case Modifiers.Friend:
-					return "Friend";
-				case Modifiers.Protected:
-					return "Protected";
-				case Modifiers.Public:
-					return "Public";
-				case Modifiers.MustInherit:
-					return "MustInherit";
-				case Modifiers.MustOverride:
-					return "MustOverride";
-				case Modifiers.Overridable:
-					return "Overridable";
-				case Modifiers.NotInheritable:
-					return "NotInheritable";
-				case Modifiers.NotOverridable:
-					return "NotOverridable";
-				case Modifiers.Const:
-					return "Const";
-				case Modifiers.Shared:
-					return "Shared";
-				case Modifiers.Static:
-					return "Static";
-				case Modifiers.Overrides:
-					return "Overrides";
-				case Modifiers.ReadOnly:
-					return "ReadOnly";
-				case Modifiers.Shadows:
-					return "Shadows";
-				case Modifiers.Partial:
-					return "Partial";
-				case Modifiers.Overloads:
-					return "Overloads";
-				case Modifiers.WithEvents:
-					return "WithEvents";
-				case Modifiers.Default:
-					return "Default";
-				case Modifiers.Dim:
-					return "Dim";
-				case Modifiers.WriteOnly:
-					return "WriteOnly";
-				case Modifiers.Optional:
-					return "Optional";
-				case Modifiers.ByVal:
-					return "ByVal";
-				case Modifiers.ByRef:
-					return "ByRef";
-				case Modifiers.ParamArray:
-					return "ParamArray";
-				case Modifiers.Widening:
-					return "Widening";
-				case Modifiers.Narrowing:
-					return "Narrowing";
-				case Modifiers.Async:
-					return "Async";
-				case Modifiers.Iterator:
-					return "Iterator";
-				default:
-					throw new NotSupportedException("Invalid value for Modifiers: " + modifier);
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/VBTokenNode.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/VBTokenNode.cs
deleted file mode 100644
index d98a820af9..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Ast/VBTokenNode.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Created by SharpDevelop.
- * User: Siegfried
- * Date: 11.04.2011
- * Time: 20:44
- * 
- * To change this template use Tools | Options | Coding | Edit Standard Headers.
- */
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Ast
-{
-	/// <summary>
-	/// Description of VBTokenNode.
-	/// </summary>
-	public class VBTokenNode : AstNode
-	{
-		public static new readonly VBTokenNode Null = new NullVBTokenNode();
-		
-		class NullVBTokenNode : VBTokenNode
-		{
-			public override bool IsNull {
-				get {
-					return true;
-				}
-			}
-			
-			public NullVBTokenNode() : base (TextLocation.Empty, 0)
-			{
-			}
-			
-			public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-			{
-				return default (S);
-			}
-			
-			protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-			{
-				return other == null || other.IsNull;
-			}
-		}
-		
-		TextLocation startLocation;
-		public override TextLocation StartLocation {
-			get {
-				return startLocation;
-			}
-		}
-		
-		protected int tokenLength = -1;
-		
-		TextLocation endLocation;
-		public override TextLocation EndLocation {
-			get {
-				return tokenLength < 0 ? endLocation : new TextLocation(startLocation.Line, startLocation.Column + tokenLength);
-			}
-		}
-		
-		public VBTokenNode(TextLocation location, int tokenLength)
-		{
-			this.startLocation = location;
-			this.tokenLength = tokenLength;
-		}
-		
-		public VBTokenNode(TextLocation startLocation, TextLocation endLocation)
-		{
-			this.startLocation = startLocation;
-			this.endLocation = endLocation;
-		}
-		
-		public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data)
-		{
-			return visitor.VisitVBTokenNode(this, data);
-		}
-		
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			var node = other as VBTokenNode;
-			return node != null && !node.IsNull;
-		}
-		
-		public override string ToString ()
-		{
-			return string.Format ("[VBTokenNode: StartLocation={0}, EndLocation={1}, Role={2}]", StartLocation, EndLocation, Role);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/IAstVisitor.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/IAstVisitor.cs
deleted file mode 100644
index c24e2b617b..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/IAstVisitor.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using ICSharpCode.NRefactory.VB.Ast;
-using Attribute = ICSharpCode.NRefactory.VB.Ast.Attribute;
-
-namespace ICSharpCode.NRefactory.VB {
-	public interface IAstVisitor<in T, out S>
-	{
-		S VisitBlockStatement(BlockStatement blockStatement, T data);
-		S VisitComment(Comment comment, T data);
-		S VisitCompilationUnit(CompilationUnit compilationUnit, T data);
-		S VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern, T data);
-		S VisitTypeParameterDeclaration(TypeParameterDeclaration typeParameterDeclaration, T data);
-		S VisitParameterDeclaration(ParameterDeclaration parameterDeclaration, T data);
-		S VisitVBTokenNode(VBTokenNode vBTokenNode, T data);
-		S VisitEventMemberSpecifier(EventMemberSpecifier eventMemberSpecifier, T data);
-		S VisitInterfaceMemberSpecifier(InterfaceMemberSpecifier interfaceMemberSpecifier, T data);
-		
-		// Global scope
-		S VisitAliasImportsClause(AliasImportsClause aliasImportsClause, T data);
-		S VisitAttribute(Attribute attribute, T data);
-		S VisitAttributeBlock(AttributeBlock attributeBlock, T data);
-		S VisitImportsStatement(ImportsStatement importsStatement, T data);
-		S VisitMemberImportsClause(MemberImportsClause memberImportsClause, T data);
-		S VisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration, T data);
-		S VisitOptionStatement(OptionStatement optionStatement, T data);
-		S VisitTypeDeclaration(TypeDeclaration typeDeclaration, T data);
-		S VisitXmlNamespaceImportsClause(XmlNamespaceImportsClause xmlNamespaceImportsClause, T data);
-		S VisitEnumDeclaration(EnumDeclaration enumDeclaration, T data);
-		S VisitEnumMemberDeclaration(EnumMemberDeclaration enumMemberDeclaration, T data);
-		S VisitDelegateDeclaration(DelegateDeclaration delegateDeclaration, T data);
-		
-		// TypeMember scope
-		S VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration, T data);
-		S VisitMethodDeclaration(MethodDeclaration methodDeclaration, T data);
-		S VisitExternalMethodDeclaration(ExternalMethodDeclaration externalMethodDeclaration, T data);
-		S VisitFieldDeclaration(FieldDeclaration fieldDeclaration, T data);
-		S VisitVariableDeclaratorWithTypeAndInitializer(VariableDeclaratorWithTypeAndInitializer variableDeclaratorWithTypeAndInitializer, T data);
-		S VisitVariableDeclaratorWithObjectCreation(VariableDeclaratorWithObjectCreation variableDeclaratorWithObjectCreation, T data);
-		S VisitVariableIdentifier(VariableIdentifier variableIdentifier, T data);
-		S VisitAccessor(Accessor accessor, T data);
-		S VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration, T data);
-		S VisitEventDeclaration(EventDeclaration eventDeclaration, T data);
-		S VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration, T data);
-		
-		// Expression scope
-		S VisitIdentifier(Identifier identifier, T data);
-		S VisitXmlIdentifier(XmlIdentifier xmlIdentifier, T data);
-		S VisitXmlLiteralString(XmlLiteralString xmlLiteralString, T data);
-		S VisitSimpleNameExpression(SimpleNameExpression identifierExpression, T data);
-		S VisitPrimitiveExpression(PrimitiveExpression primitiveExpression, T data);
-		S VisitInstanceExpression(InstanceExpression instanceExpression, T data);
-		S VisitParenthesizedExpression(ParenthesizedExpression parenthesizedExpression, T data);
-		S VisitGetTypeExpression(GetTypeExpression getTypeExpression, T data);
-		S VisitTypeOfIsExpression(TypeOfIsExpression typeOfIsExpression, T data);
-		S VisitGetXmlNamespaceExpression(GetXmlNamespaceExpression getXmlNamespaceExpression, T data);
-		S VisitMemberAccessExpression(MemberAccessExpression memberAccessExpression, T data);
-		S VisitTypeReferenceExpression(TypeReferenceExpression typeReferenceExpression, T data);
-		S VisitUnaryOperatorExpression(UnaryOperatorExpression unaryOperatorExpression, T data);
-		S VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression, T data);
-		S VisitAssignmentExpression(AssignmentExpression assignmentExpression, T data);
-		S VisitIdentifierExpression(IdentifierExpression identifierExpression, T data);
-		S VisitInvocationExpression(InvocationExpression invocationExpression, T data);
-		S VisitArrayInitializerExpression(ArrayInitializerExpression arrayInitializerExpression, T data);
-		S VisitArrayCreateExpression(ArrayCreateExpression arrayCreateExpression, T data);
-		S VisitObjectCreationExpression(ObjectCreationExpression objectCreationExpression, T data);
-		S VisitCastExpression(CastExpression castExpression, T data);
-		S VisitFieldInitializerExpression(FieldInitializerExpression fieldInitializerExpression, T data);
-		S VisitNamedArgumentExpression(NamedArgumentExpression namedArgumentExpression, T data);
-		S VisitConditionalExpression(ConditionalExpression conditionalExpression, T data);
-		
-		// Statement scope
-		S VisitLabelDeclarationStatement(LabelDeclarationStatement labelDeclarationStatement, T data);
-		S VisitLocalDeclarationStatement(LocalDeclarationStatement localDeclarationStatement, T data);
-		S VisitExpressionStatement(ExpressionStatement expressionStatement, T data);
-		S VisitWithStatement(WithStatement withStatement, T data);
-		S VisitSyncLockStatement(SyncLockStatement syncLockStatement, T data);
-		S VisitIfElseStatement(IfElseStatement ifElseStatement, T data);
-		S VisitTryStatement(TryStatement tryStatement, T data);
-		S VisitThrowStatement(ThrowStatement throwStatement, T data);
-		S VisitCatchBlock(CatchBlock catchBlock, T data);
-		S VisitReturnStatement(ReturnStatement returnStatement, T data);
-		S VisitWhileStatement(WhileStatement whileStatement, T data);
-		S VisitForStatement(ForStatement forStatement, T data);
-		S VisitForEachStatement(ForEachStatement forEachStatement, T data);
-		S VisitExitStatement(ExitStatement exitStatement, T data);
-		S VisitContinueStatement(ContinueStatement continueStatement, T data);
-		S VisitSelectStatement(SelectStatement selectStatement, T data);
-		S VisitYieldStatement(YieldStatement yieldStatement, T data);
-		S VisitVariableInitializer(VariableInitializer variableInitializer, T data);
-		S VisitRangeCaseClause(RangeCaseClause rangeCaseClause, T data);
-		S VisitComparisonCaseClause(ComparisonCaseClause comparisonCaseClause, T data);
-		S VisitSimpleCaseClause(SimpleCaseClause simpleCaseClause, T data);
-		S VisitCaseStatement(CaseStatement caseStatement, T data);
-		S VisitDoLoopStatement(DoLoopStatement doLoopStatement, T data);
-		S VisitUsingStatement(UsingStatement usingStatement, T data);
-		
-		// TypeName
-		S VisitPrimitiveType(PrimitiveType primitiveType, T data);
-		S VisitQualifiedType(QualifiedType qualifiedType, T data);
-		S VisitComposedType(ComposedType composedType, T data);
-		S VisitArraySpecifier(ArraySpecifier arraySpecifier, T data);
-		S VisitSimpleType(SimpleType simpleType, T data);
-		
-		S VisitGoToStatement(GoToStatement goToStatement, T data);
-		
-		S VisitSingleLineSubLambdaExpression(SingleLineSubLambdaExpression singleLineSubLambdaExpression, T data);
-		S VisitMultiLineLambdaExpression(MultiLineLambdaExpression multiLineLambdaExpression, T data);
-		S VisitSingleLineFunctionLambdaExpression(SingleLineFunctionLambdaExpression singleLineFunctionLambdaExpression, T data);
-		
-		S VisitQueryExpression(QueryExpression queryExpression, T data);
-		
-		S VisitEmptyExpression(EmptyExpression emptyExpression, T data);
-		
-		S VisitAnonymousObjectCreationExpression(AnonymousObjectCreationExpression anonymousObjectCreationExpression, T data);
-		
-		S VisitCollectionRangeVariableDeclaration(CollectionRangeVariableDeclaration collectionRangeVariableDeclaration, T data);
-		
-		S VisitFromQueryOperator(FromQueryOperator fromQueryOperator, T data);
-		S VisitAggregateQueryOperator(AggregateQueryOperator aggregateQueryOperator, T data);
-		S VisitSelectQueryOperator(SelectQueryOperator selectQueryOperator, T data);
-		S VisitDistinctQueryOperator(DistinctQueryOperator distinctQueryOperator, T data);
-		S VisitWhereQueryOperator(WhereQueryOperator whereQueryOperator, T data);
-		S VisitOrderExpression(OrderExpression orderExpression, T data);
-		S VisitOrderByQueryOperator(OrderByQueryOperator orderByQueryOperator, T data);
-		S VisitPartitionQueryOperator(PartitionQueryOperator partitionQueryOperator, T data);
-		S VisitLetQueryOperator(LetQueryOperator letQueryOperator, T data);
-		S VisitGroupByQueryOperator(GroupByQueryOperator groupByQueryOperator, T data);
-		S VisitJoinQueryOperator(JoinQueryOperator joinQueryOperator, T data);
-		S VisitJoinCondition(JoinCondition joinCondition, T data);
-		S VisitGroupJoinQueryOperator(GroupJoinQueryOperator groupJoinQueryOperator, T data);
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/ICSharpCode.NRefactory.VB.csproj b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/ICSharpCode.NRefactory.VB.csproj
deleted file mode 100644
index cc8a37d553..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/ICSharpCode.NRefactory.VB.csproj
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <PropertyGroup>
-    <ProjectGuid>{7B82B671-419F-45F4-B778-D9286F996EFA}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <OutputType>Library</OutputType>
-    <RootNamespace>ICSharpCode.NRefactory.VB</RootNamespace>
-    <AssemblyName>ICSharpCode.NRefactory.VB</AssemblyName>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <NoStdLib>False</NoStdLib>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\ICSharpCode.NRefactory.snk</AssemblyOriginatorKeyFile>
-    <DelaySign>False</DelaySign>
-    <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <Optimize>False</Optimize>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <DebugSymbols>False</DebugSymbols>
-    <DebugType>None</DebugType>
-    <Optimize>True</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>TRACE</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Ast\AstNode.cs" />
-    <Compile Include="Ast\AstNodeCollection.cs" />
-    <Compile Include="Ast\Comment.cs" />
-    <Compile Include="Ast\Enums.cs" />
-    <Compile Include="Ast\Expressions\AnonymousObjectCreationExpression.cs" />
-    <Compile Include="Ast\Expressions\ArrayCreateExpression.cs" />
-    <Compile Include="Ast\Expressions\ArrayInitializerExpression.cs" />
-    <Compile Include="Ast\Expressions\AssignmentExpression.cs" />
-    <Compile Include="Ast\Expressions\BinaryOperatorExpression.cs" />
-    <Compile Include="Ast\Expressions\CastExpression.cs" />
-    <Compile Include="Ast\Expressions\CollectionRangeVariableDeclaration.cs" />
-    <Compile Include="Ast\Expressions\ConditionalExpression.cs" />
-    <Compile Include="Ast\Expressions\EmptyExpression.cs" />
-    <Compile Include="Ast\Expressions\Expression.cs" />
-    <Compile Include="Ast\Expressions\FieldInitializerExpression.cs" />
-    <Compile Include="Ast\Expressions\GetTypeExpression.cs" />
-    <Compile Include="Ast\Expressions\GetXmlNamespaceExpression.cs" />
-    <Compile Include="Ast\Expressions\IdentifierExpression.cs" />
-    <Compile Include="Ast\Expressions\InstanceExpression.cs" />
-    <Compile Include="Ast\Expressions\InvocationExpression.cs" />
-    <Compile Include="Ast\Expressions\LambdaExpression.cs" />
-    <Compile Include="Ast\Expressions\MemberAccessExpression.cs" />
-    <Compile Include="Ast\Expressions\NamedArgumentExpression.cs" />
-    <Compile Include="Ast\Expressions\ObjectCreationExpression.cs" />
-    <Compile Include="Ast\Expressions\ParenthesizedExpression.cs" />
-    <Compile Include="Ast\Expressions\QueryExpression.cs" />
-    <Compile Include="Ast\Expressions\SimpleNameExpression.cs" />
-    <Compile Include="Ast\Expressions\PrimitiveExpression.cs" />
-    <Compile Include="Ast\Expressions\TypeOfIsExpression.cs" />
-    <Compile Include="Ast\Expressions\TypeReferenceExpression.cs" />
-    <Compile Include="Ast\Expressions\UnaryOperatorExpression.cs" />
-    <Compile Include="Ast\Expressions\VariableInitializer.cs" />
-    <Compile Include="Ast\Expressions\XmlIdentifier.cs" />
-    <Compile Include="Ast\Expressions\XmlLiteralString.cs" />
-    <Compile Include="Ast\General\Attribute.cs" />
-    <Compile Include="Ast\General\AttributeBlock.cs" />
-    <Compile Include="Ast\General\AttributedNode.cs" />
-    <Compile Include="Ast\General\CompilationUnit.cs" />
-    <Compile Include="Ast\General\EventMemberSpecifier.cs" />
-    <Compile Include="Ast\General\InterfaceMemberSpecifier.cs" />
-    <Compile Include="Ast\General\ParameterDeclaration.cs" />
-    <Compile Include="Ast\General\TypeParameterDeclaration.cs" />
-    <Compile Include="Ast\Generated.cs" />
-    <Compile Include="Ast\GlobalScope\DelegateDeclaration.cs" />
-    <Compile Include="Ast\GlobalScope\EnumDeclaration.cs" />
-    <Compile Include="Ast\GlobalScope\EnumMemberDeclaration.cs" />
-    <Compile Include="Ast\GlobalScope\ImportsClause.cs" />
-    <Compile Include="Ast\GlobalScope\ImportsStatement.cs" />
-    <Compile Include="Ast\GlobalScope\NamespaceDeclaration.cs" />
-    <Compile Include="Ast\GlobalScope\TypeDeclaration.cs" />
-    <Compile Include="Ast\GlobalScope\OptionStatement.cs" />
-    <Compile Include="Ast\Identifier.cs" />
-    <Compile Include="Ast\INullable.cs" />
-    <Compile Include="Ast\Statements\BlockStatement.cs" />
-    <Compile Include="Ast\Statements\ContinueStatement.cs" />
-    <Compile Include="Ast\Statements\DoLoopStatement.cs" />
-    <Compile Include="Ast\Statements\ExitStatement.cs" />
-    <Compile Include="Ast\Statements\ExpressionStatement.cs" />
-    <Compile Include="Ast\Statements\ForEachStatement.cs" />
-    <Compile Include="Ast\Statements\ForStatement.cs" />
-    <Compile Include="Ast\Statements\GoToStatement.cs" />
-    <Compile Include="Ast\Statements\IfElseStatement.cs" />
-    <Compile Include="Ast\Statements\LabelDeclarationStatement.cs" />
-    <Compile Include="Ast\Statements\LocalDeclarationStatement.cs" />
-    <Compile Include="Ast\Statements\ReturnStatement.cs" />
-    <Compile Include="Ast\Statements\SelectStatement.cs" />
-    <Compile Include="Ast\Statements\Statement.cs" />
-    <Compile Include="Ast\Statements\SyncLockStatement.cs" />
-    <Compile Include="Ast\Statements\ThrowStatement.cs" />
-    <Compile Include="Ast\Statements\TryStatement.cs" />
-    <Compile Include="Ast\Statements\UsingStatement.cs" />
-    <Compile Include="Ast\Statements\WhileStatement.cs" />
-    <Compile Include="Ast\Statements\WithStatement.cs" />
-    <Compile Include="Ast\Statements\YieldStatement.cs" />
-    <Compile Include="Ast\TypeMembers\Accessor.cs" />
-    <Compile Include="Ast\TypeMembers\ConstructorDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\EventDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\ExternalMethodDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\FieldDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\MethodDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\OperatorDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\PropertyDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\VariableDeclarator.cs" />
-    <Compile Include="Ast\TypeName\AstType.cs" />
-    <Compile Include="Ast\TypeName\ComposedType.cs" />
-    <Compile Include="Ast\TypeName\PrimitiveType.cs" />
-    <Compile Include="Ast\TypeName\QualifiedType.cs" />
-    <Compile Include="Ast\TypeName\SimpleType.cs" />
-    <Compile Include="Ast\VBModifierToken.cs" />
-    <Compile Include="Ast\VBTokenNode.cs" />
-    <Compile Include="IAstVisitor.cs" />
-    <Compile Include="Lexer\Block.cs" />
-    <Compile Include="Lexer\ExpressionFinder.cs" />
-    <Compile Include="Lexer\ExpressionFinderState.cs" />
-    <Compile Include="Lexer\Extensions.cs" />
-    <Compile Include="Lexer\Keywords.cs" />
-    <Compile Include="Lexer\LATextReader.cs" />
-    <Compile Include="Lexer\VBLexer.cs" />
-    <Compile Include="Lexer\LookupTable.cs" />
-    <Compile Include="Lexer\Parser.cs">
-      <DependentUpon>ExpressionFinder.atg</DependentUpon>
-    </Compile>
-    <Compile Include="Lexer\SavepointEventArgs.cs" />
-    <Compile Include="Lexer\Special\BlankLine.cs" />
-    <Compile Include="Lexer\Special\Comment.cs" />
-    <Compile Include="Lexer\Special\CommentType.cs" />
-    <Compile Include="Lexer\Special\ISpecial.cs" />
-    <Compile Include="Lexer\Special\PreProcessingDirective.cs" />
-    <Compile Include="Lexer\Special\SpecialTracker.cs" />
-    <Compile Include="Lexer\Special\TagComment.cs" />
-    <Compile Include="Lexer\Token.cs" />
-    <Compile Include="Lexer\Tokens.cs" />
-    <Compile Include="Lexer\VBLexerMemento.cs" />
-    <Compile Include="Lexer\XmlModeInfo.cs" />
-    <Compile Include="OutputVisitor\IOutputFormatter.cs" />
-    <Compile Include="OutputVisitor\OutputVisitor.cs" />
-    <Compile Include="OutputVisitor\TextWriterOutputFormatter.cs" />
-    <Compile Include="OutputVisitor\VBFormattingOptions.cs" />
-    <Compile Include="Parser\Errors.cs" />
-    <Compile Include="Parser\Parser.cs">
-      <DependentUpon>vb.atg</DependentUpon>
-    </Compile>
-    <Compile Include="Parser\VBParser.cs" />
-    <Compile Include="PrettyPrinter\AbstractOutputFormatter.cs" />
-    <Compile Include="PrettyPrinter\AbstractPrettyPrintOptions.cs" />
-    <Compile Include="PrettyPrinter\IOutputAstVisitor.cs" />
-    <Compile Include="PrettyPrinter\SpecialNodesInserter.cs" />
-    <Compile Include="PrettyPrinter\VBNet\VBNetOutputFormatter.cs" />
-    <Compile Include="PrettyPrinter\VBNet\VBNetOutputVisitor.cs" />
-    <Compile Include="PrettyPrinter\VBNet\VBNetPrettyPrintOptions.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="VBParser.cs" />
-    <Compile Include="Visitors\CSharpToVBConverterVisitor.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Ast\" />
-    <Folder Include="Lexer\" />
-    <Folder Include="PrettyPrinter\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Lexer\ExpressionFinder.atg">
-      <Generator>CocoParserGenerator</Generator>
-      <CustomToolNamespace>ICSharpCode.NRefactory.VB.Parser</CustomToolNamespace>
-      <LastGenOutput>Parser.cs</LastGenOutput>
-    </None>
-    <None Include="Lexer\KeywordList.txt" />
-    <None Include="Lexer\PushParser.frame">
-      <DependentUpon>ExpressionFinder.atg</DependentUpon>
-    </None>
-    <None Include="Parser\Parser.frame">
-      <DependentUpon>vb.atg</DependentUpon>
-    </None>
-    <None Include="Parser\vb.atg">
-      <CustomToolNamespace>ICSharpCode.NRefactory.VB.Parser</CustomToolNamespace>
-      <Generator>CocoParserGenerator</Generator>
-      <LastGenOutput>Parser.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
-      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
-      <Name>ICSharpCode.NRefactory.CSharp</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Block.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Block.cs
deleted file mode 100644
index 6b4218e7c0..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Block.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ICSharpCode.NRefactory.VB.Parser
-{	
-	public enum Context
-	{
-		Global,
-		TypeDeclaration,
-		ObjectCreation,
-		ObjectInitializer,
-		CollectionInitializer,
-		Type,
-		Member,
-		Parameter,
-		Identifier,
-		Body,
-		Xml,
-		Attribute,
-		Importable,
-		Query,
-		Expression,
-		Debug,
-		Default
-	}
-	
-	public class Block : ICloneable
-	{
-		public static readonly Block Default = new Block() {
-			context = Context.Global,
-			lastExpressionStart = TextLocation.Empty
-		};
-		
-		public Context context;
-		public TextLocation lastExpressionStart;
-		public bool isClosed;
-		
-		public override string ToString()
-		{
-			return string.Format("[Block Context={0}, LastExpressionStart={1}, IsClosed={2}]", context, lastExpressionStart, isClosed);
-		}
-		
-		public object Clone()
-		{
-			return new Block() {
-				context = this.context,
-				lastExpressionStart = this.lastExpressionStart,
-				isClosed = this.isClosed
-			};
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/ExpressionFinder.atg b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/ExpressionFinder.atg
deleted file mode 100644
index b2768890d3..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/ExpressionFinder.atg
+++ /dev/null
@@ -1,1375 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-PUSHCOMPILER WITH EXPECTEDSETS ExpressionFinder
-
-/* START AUTOGENERATED TOKENS SECTION */
-TOKENS
-	/* ----- terminal classes ----- */
-	/* EOF is 0 */
-	EOL
-	ident
-	LiteralString
-	LiteralCharacter
-	LiteralInteger
-	LiteralDouble
-	LiteralSingle
-	LiteralDecimal
-	LiteralDate
-	XmlOpenTag
-	XmlCloseTag
-	XmlStartInlineVB
-	XmlEndInlineVB
-	XmlCloseTagEmptyElement
-	XmlOpenEndTag
-	XmlContent
-	XmlComment
-	XmlCData
-	XmlProcessingInstruction
-
-	/* ----- special character ----- */
-	"="
-	":"
-	","
-	"&"
-	"/"
-	"\\"
-	"."
-	"..."
-	".@"
-	"!"
-	"-"
-	"+"
-	"^"
-	"?"
-	"*"
-	"{"
-	"}"
-	"("
-	")"
-	">"
-	"<"
-	"<>"
-	">="
-	"<="
-	"<<"
-	">>"
-	"+="
-	"^="
-	"-="
-	"*="
-	"/="
-	"\\="
-	"<<="
-	">>="
-	"&="
-	":="
-
-	/* ----- keywords ----- */
-	"AddHandler"
-	"AddressOf"
-	"Aggregate"
-	"Alias"
-	"And"
-	"AndAlso"
-	"Ansi"
-	"As"
-	"Ascending"
-	"Assembly"
-	"Auto"
-	"Binary"
-	"Boolean"
-	"ByRef"
-	"By"
-	"Byte"
-	"ByVal"
-	"Call"
-	"Case"
-	"Catch"
-	"CBool"
-	"CByte"
-	"CChar"
-	"CDate"
-	"CDbl"
-	"CDec"
-	"Char"
-	"CInt"
-	"Class"
-	"CLng"
-	"CObj"
-	"Compare"
-	"Const"
-	"Continue"
-	"CSByte"
-	"CShort"
-	"CSng"
-	"CStr"
-	"CType"
-	"CUInt"
-	"CULng"
-	"CUShort"
-	"Custom"
-	"Date"
-	"Decimal"
-	"Declare"
-	"Default"
-	"Delegate"
-	"Descending"
-	"Dim"
-	"DirectCast"
-	"Distinct"
-	"Do"
-	"Double"
-	"Each"
-	"Else"
-	"ElseIf"
-	"End"
-	"EndIf"
-	"Enum"
-	"Equals"
-	"Erase"
-	"Error"
-	"Event"
-	"Exit"
-	"Explicit"
-	"False"
-	"Finally"
-	"For"
-	"Friend"
-	"From"
-	"Function"
-	"Get"
-	"GetType"
-	"Global"
-	"GoSub"
-	"GoTo"
-	"Group"
-	"Handles"
-	"If"
-	"Implements"
-	"Imports"
-	"In"
-	"Infer"
-	"Inherits"
-	"Integer"
-	"Interface"
-	"Into"
-	"Is"
-	"IsNot"
-	"Join"
-	"Key"
-	"Let"
-	"Lib"
-	"Like"
-	"Long"
-	"Loop"
-	"Me"
-	"Mod"
-	"Module"
-	"MustInherit"
-	"MustOverride"
-	"MyBase"
-	"MyClass"
-	"Namespace"
-	"Narrowing"
-	"New"
-	"Next"
-	"Not"
-	"Nothing"
-	"NotInheritable"
-	"NotOverridable"
-	"Object"
-	"Of"
-	"Off"
-	"On"
-	"Operator"
-	"Option"
-	"Optional"
-	"Or"
-	"Order"
-	"OrElse"
-	"Out"
-	"Overloads"
-	"Overridable"
-	"Overrides"
-	"ParamArray"
-	"Partial"
-	"Preserve"
-	"Private"
-	"Property"
-	"Protected"
-	"Public"
-	"RaiseEvent"
-	"ReadOnly"
-	"ReDim"
-	"Rem"
-	"RemoveHandler"
-	"Resume"
-	"Return"
-	"SByte"
-	"Select"
-	"Set"
-	"Shadows"
-	"Shared"
-	"Short"
-	"Single"
-	"Skip"
-	"Static"
-	"Step"
-	"Stop"
-	"Strict"
-	"String"
-	"Structure"
-	"Sub"
-	"SyncLock"
-	"Take"
-	"Text"
-	"Then"
-	"Throw"
-	"To"
-	"True"
-	"Try"
-	"TryCast"
-	"TypeOf"
-	"UInteger"
-	"ULong"
-	"Unicode"
-	"Until"
-	"UShort"
-	"Using"
-	"Variant"
-	"Wend"
-	"When"
-	"Where"
-	"While"
-	"Widening"
-	"With"
-	"WithEvents"
-	"WriteOnly"
-	"Xor"
-	"GetXmlNamespace"
-/* END AUTOGENERATED TOKENS SECTION */
-
-PRODUCTIONS
-/*------------------------------------------------------------------------*/
-ExpressionFinder =
-	(. PushContext(Context.Global, la, t); .)
-	{ OptionStatement }
-	{ ImportsStatement }
-	{ EXPECTEDCONFLICT("<") AttributeBlock } /* Expected LL(1) conflict: we can't tell global attributes */
-	                                         /* from those on types. */
-	                                         /* This isn't a problem, we can just treat all as global attributes */
-	{ NamespaceMemberDeclaration }
-	(. PopContext(); .)
-.
-
-StatementTerminator
-	(. if (la != null) CurrentBlock.lastExpressionStart = la.Location; .)
-=
-	EOL | ":"
-.
-
-OptionStatement = 
-	"Option" ( ( "Explicit" | "Strict" | "Infer" ) [ "Off" | "On" ] | "Compare" ( "Text" | "Binary" ) )  StatementTerminator
-.
-
-ImportsStatement =
-	"Imports" (. PushContext(Context.Importable, la, t); .)
-	(. nextTokenIsStartOfImportsOrAccessExpression = true;	.)
-	(
-		( "Global" | Identifier | PrimitiveTypeName ) { TypeSuffix } [ ( "." | "=" ) TypeName ]
-		| XmlOpenTag Identifier "=" LiteralString XmlCloseTag
-	)
-	{ ","
-		(. nextTokenIsStartOfImportsOrAccessExpression = true;	.)
-		(
-			( "Global" | Identifier | PrimitiveTypeName ) { TypeSuffix } [ ( "." | "=" ) TypeName ]
-			| XmlOpenTag Identifier "=" LiteralString XmlCloseTag
-		)
-	}
-	(. PopContext(); .)
-	StatementTerminator
-
-.
-
-AttributeBlock =
-	"<" (. wasNormalAttribute = true; PushContext(Context.Attribute, la, t); .) [ ( "Assembly" | "Module" ) ":" (. wasNormalAttribute = false; .) ] { ANY } ">" (. PopContext(); .) [ EOL ]
-.
-
-NamespaceMemberDeclaration =
-	NamespaceDeclaration
-	| TypeDeclaration
-.
-
-NamespaceDeclaration =
-	"Namespace" (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) { ANY } (. PopContext(); .) StatementTerminator
-	{ NamespaceMemberDeclaration }
-	"End" "Namespace" StatementTerminator
-.
-
-TypeDeclaration =
-	{ AttributeBlock }
-	{ TypeModifier }
-	( ClassOrModuleOrStructureTypeDeclaration |
-	DelegateTypeDeclaration |
-	EnumTypeDeclaration |
-	InterfaceDeclaration )
-.
-
-ClassOrModuleOrStructureTypeDeclaration =
-	(. PushContext(Context.TypeDeclaration, la, t); .)
-	( "Module" | "Class" | "Structure" ) (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .)
-	[ "(" "Of" GenericTypeParameterDeclaration ")" ] StatementTerminator
-	[ (. isMissingModifier = false; .) "Inherits" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) StatementTerminator ]
-	[ (. isMissingModifier = false; .) "Implements" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) { "," (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) } StatementTerminator ]
-	{
-		{ AttributeBlock } (.OnEachPossiblePath: isMissingModifier = true; .)
-		{ TypeOrMemberModifier (. isMissingModifier = false; .) } (. isMissingModifier = false; .)
-		( ClassOrModuleOrStructureTypeDeclaration | DelegateTypeDeclaration | EnumTypeDeclaration
-		| InterfaceDeclaration | MemberDeclaration )
-	}
-	(. isMissingModifier = false; .)
-	"End" ( "Module" | "Class" | "Structure" ) StatementTerminator
-	(. PopContext(); .)
-.
-
-EnumTypeDeclaration =
-	(. PushContext(Context.TypeDeclaration, la, t); .)
-	"Enum" (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .)
-	[ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] StatementTerminator
-	{
-		{ AttributeBlock }
-		(. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .)
-		[ "=" Expression ]
-		StatementTerminator
-	}
-	"End" "Enum" StatementTerminator
-	(. PopContext(); .)
-.
-
-InterfaceDeclaration =
-	(. PushContext(Context.TypeDeclaration, la, t); .)
-	"Interface" (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .)
-	[ "(" "Of" GenericTypeParameterDeclaration ")" ] StatementTerminator
-	[ "Inherits" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) { "," (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) } StatementTerminator ]
-	{
-		{ AttributeBlock } (.OnEachPossiblePath: isMissingModifier = true; .)
-		{ TypeOrMemberModifier (. isMissingModifier = false; .) } (. isMissingModifier = false; .)
-		( ClassOrModuleOrStructureTypeDeclaration | DelegateTypeDeclaration | EnumTypeDeclaration
-		| InterfaceDeclaration | InterfaceMemberDeclaration )
-	}
-	(. isMissingModifier = false; .)
-	"End" "Interface" StatementTerminator
-	(. PopContext(); .)
-.
-
-InterfaceMemberDeclaration =
-	InterfaceEvent | InterfaceProperty | InterfaceSubOrFunction
-.
-
-TypeOrMemberModifier =
-	MemberModifier /* contains all modifiers for types */
-.
-
-InterfaceEvent =
-	"Event" (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .)
-	[ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) | ParameterListInParenthesis ]
-	StatementTerminator
-.
-
-InterfaceProperty =
-	"Property" (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .)
-	[ ParameterListInParenthesis ] [ "As" (. PushContext(Context.Type, la, t); .) { AttributeBlock } TypeName (. PopContext(); .) ]
-	StatementTerminator
-.
-
-InterfaceSubOrFunction =
-	("Sub" | "Function")
-	(. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) ANY (. PopContext(); .)
-	{ "(" [ ( "Of" GenericTypeParameterDeclaration | ParameterList ) ] ")" }
-	[ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ]
-	StatementTerminator
-.
-
-GenericConstraint =
-	TypeName | "New" | "Class" | "Structure"
-.
-
-GenericConstraintList =
-	GenericConstraint | "{" GenericConstraint { "," GenericConstraint } "}"
-.
-
-GenericTypeParameterDeclaration =
- 	[ "Out" | "In" ] (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) IdentifierExceptOut (. PopContext(); .) [ "As" (. PushContext(Context.Type, la, t); .) GenericConstraintList (. PopContext(); .) ]
-	{ "," [ "Out" | "In" ] (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) IdentifierExceptOut (. PopContext(); .) [ "As" (. PushContext(Context.Type, la, t); .) GenericConstraintList (. PopContext(); .) ] }
-.
-
-DelegateTypeDeclaration =
-	"Delegate" ("Sub" | "Function")
-	(. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) ANY (. PopContext(); .)
-	{ "(" [ "Of" GenericTypeParameterDeclaration | ParameterList ] ")" }
-	[ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ]
-	StatementTerminator
-.
-
-MemberDeclaration =
-	(. PushContext(Context.Member, la, t); .)
-	(
-		MemberVariableOrConstantDeclaration |
-		SubOrFunctionDeclaration |
-		ExternalMemberDeclaration |
-		EventMemberDeclaration |
-		CustomEventMemberDeclaration |
-		PropertyDeclaration |
-		OperatorDeclaration
-	) 
-	(. PopContext(); .)
-.
-
-SubOrFunctionDeclaration = 
-	("Sub" | "Function")
-	(. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) ANY (. PopContext(); .)
-	{ "(" [ ( "Of" GenericTypeParameterDeclaration | ParameterList ) ] ")" }
-	[ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ]
-	[ ( "Implements" | "Handles" ) [ ( "Me" | "MyClass" | "MyBase" ) "." ] TypeName ]
-	StatementTerminatorAndBlock
-	"End" ("Sub" | "Function") StatementTerminator
-.
-
-ExternalMemberDeclaration =
-	"Declare" [ "Ansi" | "Unicode" | "Auto" ] ( "Sub" | "Function" )
-	(. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .)
-	"Lib" LiteralString
-	[ "Alias" LiteralString ]
-	[ ParameterListInParenthesis ]
-	[ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ]
-	StatementTerminator
-.
-
-EventMemberDeclaration =
-	"Event"
-	(. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .)
-	( "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) | [ ParameterListInParenthesis ] )
-	[ "Implements" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) /*"." IdentifierOrKeyword*/
-	  { "," (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) /*"." IdentifierOrKeyword*/ } ]
-	/* the TypeName production already allows the "." IdentifierOrKeyword syntax, so to avoid an ambiguous grammar we just leave that out */
-	StatementTerminator
-.
-
-CustomEventMemberDeclaration =
-	"Custom" EventMemberDeclaration
-	{
-		{ AttributeBlock } ( "AddHandler" | "RemoveHandler" | "RaiseEvent" ) "(" ParameterList ")"
-		StatementTerminatorAndBlock
-		"End" ( "AddHandler" | "RemoveHandler" | "RaiseEvent" ) StatementTerminator
-	}
-	"End" "Event" StatementTerminator
-.
-
-PropertyDeclaration =
-	"Property"
-	(. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .)
-	[ ParameterListInParenthesis ]
-	[ "As" (. PushContext(Context.Type, la, t); .) { AttributeBlock } ( NewExpression |  TypeName ) (. PopContext(); .) ]
-	[ "Implements" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) /*"." IdentifierOrKeyword*/
-	    { "," (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) /*"." IdentifierOrKeyword*/ } ]
-	[ "=" Expression ] StatementTerminator
-	(. PopContext(); .) { EXPECTEDCONFLICT("<") AttributeBlock }
-	{ EXPECTEDCONFLICT("Public", "Protected", "Private", "Friend") AccessModifier
-	// HACK : OnEachPossiblePath cannot detect that this might be the end of an auto property
-	//        so we need to simulate it
-	(.OnEachPossiblePath: SetIdentifierExpected(la); .) }
-	[ (. PushContext(Context.Member, la, t); .)
-	( "Get" | "Set" ) [ ParameterListInParenthesis ]
-		StatementTerminatorAndBlock
-		"End" ( "Get" | "Set" ) StatementTerminator
-	[ { AttributeBlock } { AccessModifier } ( "Get" | "Set" ) [ ParameterListInParenthesis ]
-		StatementTerminatorAndBlock
-		"End" ( "Get" | "Set" ) StatementTerminator ]
-	
-	"End" "Property" StatementTerminator ]
-.
-
-OperatorDeclaration =
-	"Operator" (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) ANY (. PopContext(); .)
-	"(" ParameterList ")"
-	[ "As" (. PushContext(Context.Type, la, t); .) { AttributeBlock } TypeName (. PopContext(); .) ]
-	StatementTerminatorAndBlock
-	"End" "Operator" StatementTerminator
-.
-
-MemberVariableOrConstantDeclaration =
-	MemberVariableOrConstantDeclarator { "," MemberVariableOrConstantDeclarator } StatementTerminator
-.
-
-MemberVariableOrConstantDeclarator =
-	[ "Const" ]
-	(. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) IdentifierForFieldDeclaration (. PopContext(); .)
-	[ "?" ] { "(" [ Expression ] { "," [ Expression ] } ")" }
-	[ "As" (. PushContext(Context.Type, la, t); .) ( NewExpression | TypeName ) (. PopContext(); .) ]
-	[ "=" Expression ]
-.
-
-ParameterList =
-	Parameter { "," Parameter }
-.
-
-Parameter =
-	(. PushContext(Context.Parameter, la, t); .)
-	{ AttributeBlock } { ParameterModifier }
-	(. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .)
-	[ "?" ] { "(" { "," } ")" }
-	[ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ]
-	[ "=" Expression ]
-	(. PopContext(); .)
-.
-
-StatementTerminatorAndBlock =
-	(. PushContext(Context.Body, la, t); .)
-	StatementTerminator
-	{ EXPECTEDCONFLICT("End")
-		(
-			[ Statement] StatementTerminator
-		|	"End"
-			( StatementTerminator /* End+StatementTerminator is end statement */
-			| /* End+anything else is the end of this block. */
-			  (.
-				currentState = endOfStatementTerminatorAndBlock; /* leave this block */
-				InformToken(t); /* process End again*/
-				/* for processing current token (la): go to the position after processing End */
-				goto switchlbl;
-			  .)
-			  ANY /* never reached due to goto above: */
-			      /* this ANY is just so that Coco knows this branch isn't empty */
-			)
-		)
-	}
-	(.NamedState:endOfStatementTerminatorAndBlock.)
-	(. PopContext(); .)
-.
-
-Expression
-	(.NamedState:startOfExpression.)
-=
-	(. PushContext(Context.Expression, la, t); .)
-	SimpleExpressionWithSuffix { BinaryOperator SimpleExpressionWithSuffix }
-	(. PopContext(); .)
-.
-
-BinaryOperator =
-	"+" | "-" | "*" | "\\" | "/" | "^" | "Mod"
-	| "=" | "<>" | "<" | ">" (. wasNormalAttribute = false; .) | "<=" | ">=" 
-	| "Like" | "&" | "And" | "AndAlso" | "Or" | "OrElse"
-	| "Xor" | "<<" | ">>" | "Is" | "IsNot"
-	| "^=" | "*=" | "/=" | "\\=" | "+=" | "-=" | "&=" | "<<=" | ">>=" | "To" | ":="
-.
-
-UnaryOperator =
-	"+" | "-" | "Not" | "AddressOf"
-.
-
-SimpleExpressionWithSuffix =
-	(. PushContext(Context.Expression, la, t); .)
-	{ UnaryOperator }
-	(
-		SimpleExpression { ExpressionSuffix }
-		| "TypeOf" SimpleExpressionWithSuffix "Is" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .)
-		| NewExpression
-		| CollectionInitializer
-	)
-	(. PopContext(); .)
-.
-
-SimpleExpression =
-	(. PushContext(Context.Expression, la, t); .)
-    (    Literal
-    |    ( "(" (. activeArgument = 0; .) Expression // HACK in ExpressionRangeVariable Identifier is consumed before start
-    													// of Expression so this can be an argument list too
-    		{ "," (. activeArgument++; .) Expression } ")" )
-    |    IdentifierForExpressionStart
-    |    PrimitiveTypeName
-    |    ( "." | "!" | ".@" | "..." ) (. nextTokenIsStartOfImportsOrAccessExpression = true; wasQualifierTokenAtStart = true; .) [ XmlOpenTag ] IdentifierOrKeyword [ XmlCloseTag ]
-    |    "GetType" "(" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ")"
-    |    "GetXmlNamespace" "(" (. readXmlIdentifier = true; .) Identifier ")"
-    |    XmlLiteral
-    |    LambdaExpression
-    |    GREEDY QueryExpression
-    |    CastExpression
-    |    ConditionalExpression
-    )
-	(. PopContext(); .)
-.
-
-NewExpression =
-	"New" (. PushContext(Context.ObjectCreation, la, t); .)
-	(
-		TypeName
-		[
-			EXPECTEDCONFLICT("From")
-			(
-				(. PushContext(Context.CollectionInitializer, la, t); .)
-				"From"
-				(
-					CollectionInitializer /* From + CollectionInitializer is a NewExpression */
-				|
-					(.
-						currentState = endOfStatementTerminatorAndBlock; /* leave this block */
-						InformToken(t); /* process From again*/
-						/* for processing current token (la): go to the position after processing End */
-						goto switchlbl;
-					.)
-					ANY /* never reached due to goto above: */
-					/* this ANY is just so that Coco knows this branch isn't empty */
-				)
-				(. PopContext(); .)
-			|
-				/* handle array initializer after New */
-				(. PushContext(Context.CollectionInitializer, la, t); .)
-				CollectionInitializer
-				(. PopContext(); .)
-			|
-				(. PushContext(Context.ObjectInitializer, la, t); .)
-				"With" ObjectInitializer
-				(. PopContext(); .)
-			)
-		]
-	|
-		(. PushContext(Context.ObjectInitializer, la, t); .)
-		"With" ObjectInitializer
-		(. PopContext(); .)
-	)
-	(. PopContext(); .)
-.
-
-ObjectInitializer =
-	"{" [ [ "Key" ] "." IdentifierOrKeyword "=" Expression { "," [ "Key" ] "." IdentifierOrKeyword "=" Expression } ] "}"
-.
-
-CollectionInitializer =
-	"{" [ Expression { "," Expression } ] "}"
-.
-
-ExpressionSuffix =
-    "(" (. PushContext(Context.Expression, la, t); .)
-        ( "Of" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .)
-            { "," (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) }
-    |  [ ArgumentList ] ) (. PopContext(); .) ")"
-|    ( "." | "!" | ".@" | "..." ) (. nextTokenIsStartOfImportsOrAccessExpression = true; .) [ XmlOpenTag ] IdentifierOrKeyword [ XmlCloseTag ]
-.
-
-CastExpression =
-	SimpleCastExpression | ("DirectCast" | "TryCast" | "CType") "(" Expression "," (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ")"
-.
-
-SimpleCastExpression =
-	(
-		"CBool"   |
-		"CByte"   |
-		"CChar"   |
-		"CDate"   |
-		"CDec"    |
-		"CDbl"    |
-		"CInt"    |
-		"CLng"    |
-		"CObj"    |
-		"CSByte"  |
-		"CShort"  |
-		"CSng"    |
-		"CStr"    |
-		"CUInt"   |
-		"CULng"   |
-		"CUShort"
-	)
-	"(" Expression ")"
-.
-
-ConditionalExpression =
-	"If" "(" Expression "," Expression [ "," Expression ] ")"
-.
-
-LambdaExpression =
-	SubLambdaExpression |
-	FunctionLambdaExpression
-.
-
-SubLambdaExpression =
-	"Sub" ParameterListInParenthesis
-	( GREEDY Statement | StatementTerminatorAndBlock "End" "Sub" )
-.
-
-FunctionLambdaExpression =
-	"Function" ParameterListInParenthesis
-	( GREEDY Expression | [ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] StatementTerminatorAndBlock "End" "Function" )
-.
-
-ParameterListInParenthesis =
-	"(" (. PushContext(Context.Default, la, t); .) [ ParameterList ] (. PopContext(); .) ")"
-.
-
-QueryExpression
-	(. PushContext(Context.Query, la, t); .)
-=
-	( FromQueryOperator | AggregateQueryOperator )
-	{ QueryOperator }
-	(. PopContext(); .)
-.
- 
-QueryOperator =
-	FromQueryOperator
-	| AggregateQueryOperator
-	| SelectQueryOperator
-	| DistinctQueryOperator
-	| WhereQueryOperator
-	| OrderByQueryOperator
-	| PartitionQueryOperator
-	| LetQueryOperator
-	| GroupByOrGroupJoinQueryOperator
-	| JoinQueryOperator 
-.
-
-FromQueryOperator =
-	"From" CollectionRangeVariable { "," CollectionRangeVariable }
-.
-
-AggregateQueryOperator =
-	"Aggregate" CollectionRangeVariable { QueryOperator } "Into" ExpressionRangeVariable { "," ExpressionRangeVariable }
-.
-
-SelectQueryOperator =
-	"Select" ExpressionRangeVariable { "," ExpressionRangeVariable }
-.
-
-DistinctQueryOperator =
-	"Distinct"
-.
-
-WhereQueryOperator =
-	"Where" Expression
-.
-
-OrderByQueryOperator =
-	"Order" "By" Expression ( "Ascending" | "Descending" ) { "," Expression ( "Ascending" | "Descending" ) }
-.
-
-PartitionQueryOperator =
-	( "Take" | "Skip" ) [ "While" ] Expression
-.
-
-LetQueryOperator =
-	"Let" ExpressionRangeVariable { "," ExpressionRangeVariable }
-.
-
-GroupByOrGroupJoinQueryOperator =
-	"Group"
-	(
-		EXPECTEDCONFLICT("Join")
-		JoinQueryOperator { ( "Group"  JoinQueryOperator GroupJoinSuffix | JoinQueryOperator ) }
-		GroupJoinSuffix
-	|
-		( EXPECTEDCONFLICT("By") () | ExpressionRangeVariable { "," ExpressionRangeVariable } )
-		"By" ExpressionRangeVariable { "," ExpressionRangeVariable }
-		"Into" ExpressionRangeVariable { "," ExpressionRangeVariable }
-	)
-.
-
-JoinQueryOperator =
-	"Join" CollectionRangeVariable
-	"On" Expression "Equals" Expression { "," Expression "Equals" Expression }
-.
-
-GroupJoinSuffix =
-	"Into" ExpressionRangeVariable { "," ExpressionRangeVariable }
-.
-
-ExpressionRangeVariable =
-	[
-		EXPECTEDCONFLICT("Where", "Until", "Unicode", "Text", "Take", "Skip", "Preserve",
-						  "Order", "Off", "Out", "Key", "Join", "Into", "Infer", "Group", "From",
-						  "Explicit", "Equals", "Distinct", "Descending", "Compare", "By",
-						  "Binary", "Auto", "Assembly", "Ascending", "Ansi", "Aggregate", ident)
-		(
-			(. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier
-			// HACK: needs to be optional because Expression can start with Identifier too
-			[  (. PopContext(); isAlreadyInExpr = true; .)
-				( "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) "="
-				| "="
-				| (.
-					currentState = endOfStatementTerminatorAndBlock; /* leave this block */
-					InformToken(t); /* process Identifier again*/
-					/* for processing current token (la): go to the position after processing End */
-					goto switchlbl;
-				.)
-				ANY /* never reached due to goto above: */
-				/* this ANY is just so that Coco knows this branch isn't empty */
-				)
-			]
-		)
-	]
-	Expression
-	(. if (!isAlreadyInExpr) PopContext(); isAlreadyInExpr = false; .)
-.
-
-CollectionRangeVariable =
-	(. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .)
-	[ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ]
-	"In" Expression
-.
-
-/* semantic action will be inserted on all paths that possibly lead to XmlLiteral */
-XmlLiteral
-    (.OnEachPossiblePath: nextTokenIsPotentialStartOfExpression = true; .)
-=
-    (. PushContext(Context.Xml, la, t); .)
-    (
-    	( XmlComment | XmlProcessingInstruction | XmlCData ) [ XmlContent ] { ( XmlComment | XmlProcessingInstruction ) [ XmlContent ] } [ XmlElement { XmlComment [ XmlContent ] } ]
-    |
-    	XmlElement { XmlComment [ XmlContent ] }
-    )
-    (. PopContext(); .)
-.
-
-XmlElement =
-	(. PushContext(Context.Xml, la, t); .)
-	XmlOpenTag { ANY | XmlEmbeddedExpression } ( XmlCloseTagEmptyElement | XmlCloseTag { ANY | XmlEmbeddedExpression | XmlElement } XmlOpenEndTag { ANY | XmlEmbeddedExpression } XmlCloseTag )
-	(. PopContext(); .)
-.
-
-XmlEmbeddedExpression =
-	XmlStartInlineVB Expression XmlEndInlineVB
-.
-
-PrimitiveTypeName = 
-	"Byte" |
-    "SByte" |
-    "UShort" |
-    "Short" |
-    "UInteger" |
-    "Integer" |
-    "ULong" |
-    "Long" |
-	"Single" |
-	"Double" |
-	"Decimal" |
-	"Boolean" |
-	"Date" |
-	"Char" |
-	"String" |
-	"Object"
-.
-	
-TypeName = ( "Global" | Identifier | PrimitiveTypeName | "?" /* used for ? = completion */ ) { TypeSuffix } { "." IdentifierOrKeyword { TypeSuffix } } .
-
-TypeSuffix = "(" (. PushContext(Context.Expression, la, t); .) ( "Of" [ (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] { "," [ (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] } | [ ArgumentList ] ) (. PopContext(); .) ")" .
-
-IdentifierOrKeyword = ident
-| "AddHandler"
-| "AddressOf"
-| "Aggregate"
-| "Alias"
-| "And"
-| "AndAlso"
-| "Ansi"
-| "As"
-| "Ascending"
-| "Assembly"
-| "Auto"
-| "Binary"
-| "Boolean"
-| "ByRef"
-| "By"
-| "Byte"
-| "ByVal"
-| "Call"
-| "Case"
-| "Catch"
-| "CBool"
-| "CByte"
-| "CChar"
-| "CDate"
-| "CDbl"
-| "CDec"
-| "Char"
-| "CInt"
-| "Class"
-| "CLng"
-| "CObj"
-| "Compare"
-| "Const"
-| "Continue"
-| "CSByte"
-| "CShort"
-| "CSng"
-| "CStr"
-| "CType"
-| "CUInt"
-| "CULng"
-| "CUShort"
-| "Custom"
-| "Date"
-| "Decimal"
-| "Declare"
-| "Default"
-| "Delegate"
-| "Descending"
-| "Dim"
-| "DirectCast"
-| "Distinct"
-| "Do"
-| "Double"
-| "Each"
-| "Else"
-| "ElseIf"
-| "End"
-| "EndIf"
-| "Enum"
-| "Equals"
-| "Erase"
-| "Error"
-| "Event"
-| "Exit"
-| "Explicit"
-| "False"
-| "Finally"
-| "For"
-| "Friend"
-| "From"
-| "Function"
-| "Get"
-| "GetType"
-| "Global"
-| "GoSub"
-| "GoTo"
-| "Group"
-| "Handles"
-| "If"
-| "Implements"
-| "Imports"
-| "In"
-| "Infer"
-| "Inherits"
-| "Integer"
-| "Interface"
-| "Into"
-| "Is"
-| "IsNot"
-| "Join"
-| "Key"
-| "Let"
-| "Lib"
-| "Like"
-| "Long"
-| "Loop"
-| "Me"
-| "Mod"
-| "Module"
-| "MustInherit"
-| "MustOverride"
-| "MyBase"
-| "MyClass"
-| "Namespace"
-| "Narrowing"
-| "New"
-| "Next"
-| "Not"
-| "Nothing"
-| "NotInheritable"
-| "NotOverridable"
-| "Object"
-| "Of"
-| "Off"
-| "On"
-| "Operator"
-| "Option"
-| "Optional"
-| "Or"
-| "Order"
-| "OrElse"
-| "Out"
-| "Overloads"
-| "Overridable"
-| "Overrides"
-| "ParamArray"
-| "Partial"
-| "Preserve"
-| "Private"
-| "Property"
-| "Protected"
-| "Public"
-| "RaiseEvent"
-| "ReadOnly"
-| "ReDim"
-| "Rem"
-| "RemoveHandler"
-| "Resume"
-| "Return"
-| "SByte"
-| "Select"
-| "Set"
-| "Shadows"
-| "Shared"
-| "Short"
-| "Single"
-| "Skip"
-| "Static"
-| "Step"
-| "Stop"
-| "Strict"
-| "String"
-| "Structure"
-| "Sub"
-| "SyncLock"
-| "Take"
-| "Text"
-| "Then"
-| "Throw"
-| "To"
-| "True"
-| "Try"
-| "TryCast"
-| "TypeOf"
-| "UInteger"
-| "ULong"
-| "Unicode"
-| "Until"
-| "UShort"
-| "Using"
-| "Variant"
-| "Wend"
-| "When"
-| "Where"
-| "While"
-| "Widening"
-| "With"
-| "WithEvents"
-| "WriteOnly"
-| "Xor"
-| "GetXmlNamespace"
-.
-
-Literal =
-	LiteralString |
-	LiteralCharacter |
-	LiteralInteger |
-	LiteralDouble |
-	LiteralSingle |
-	LiteralDecimal |
-	LiteralDate |
-	"True" |
-	"False" |
-	"Nothing" |
-	/* from InstanceExpression */
-	"Me" |
-	"MyBase" |
-	"MyClass"
-.
-
-Statement =
-	VariableDeclarationStatement
-	| WithOrLockStatement
-	| AddOrRemoveHandlerStatement
-	| RaiseEventStatement
-	| EXPECTEDCONFLICT("If") IfStatement /* prefer if-statement to if-expression */
-	| SelectStatement
-	| WhileStatement
-	| DoLoopStatement
-	| ForStatement
-	| ErrorHandlingStatement
-	| ThrowStatement
-	| TryStatement
-	| BranchStatement
-	| ReDimStatement
-	| EraseStatement
-	| UsingStatement
-	| InvocationStatement
-.
-
-VariableDeclarationStatement =
-	( "Dim" | "Static" | "Const" )
-	(. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .)
-	Identifier (. PopContext(); .) [ "?" ] { "(" [ Expression ] { "," [ Expression ] } ")" }
-	[ "As" (. PushContext(Context.Type, la, t); .) ( NewExpression | TypeName ) (. PopContext(); .) ]
-	[ "=" Expression ]
-	{ ","
-		(. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .)
-		Identifier (. PopContext(); .) [ "?" ] { "(" [ Expression ] { "," [ Expression ] } ")" }
-		[ "As" (. PushContext(Context.Type, la, t); .) ( NewExpression | TypeName ) (. PopContext(); .) ]
-		[ "=" Expression ]
-	}
-.
-
-WithOrLockStatement =
-	( "With" | "SyncLock" ) Expression StatementTerminatorAndBlock "End" ( "With" | "SyncLock" )
-.
-
-AddOrRemoveHandlerStatement =
-	( "AddHandler" | "RemoveHandler" ) Expression "," Expression
-.
-
-RaiseEventStatement =
-	"RaiseEvent" IdentifierOrKeyword [ "(" (. PushContext(Context.Expression, la, t); .) [ ArgumentList ] (. PopContext(); .) ")" ]
-.
-
-IfStatement =
-    "If" Expression
-    (    "Then"
-        ( Statement { EXPECTEDCONFLICT(":") ":" [Statement] } [ EXPECTEDCONFLICT("Else") "Else" [Statement] { EXPECTEDCONFLICT(":") ":" [Statement] } ]
-        | MultilineIfRemainder
-        )
-    |    MultilineIfRemainder
-    )
-.
-
-MultilineIfRemainder =
-    StatementTerminatorAndBlock
-    {
-        ("Else" [ "If" Expression [ "Then" ] ]
-        | "ElseIf" Expression [ "Then" ]
-        )
-        StatementTerminatorAndBlock
-    }
-    "End" "If"
-.
-
-SelectStatement =
-	"Select" [ "Case" ] Expression StatementTerminator
-	{
-		"Case" (
-			"Else" |
-			( [ "Is" ] ComparisonOperator SimpleExpressionWithSuffix | Expression )
-				{ "," ( [ "Is" ] ComparisonOperator SimpleExpressionWithSuffix | Expression ) }
-		)
-		StatementTerminatorAndBlock
-	}
-	"End" "Select"
-.
-
-ComparisonOperator =
-	"=" | "<>" | "<" | ">" (. wasNormalAttribute = false; .) | ">=" | "<="
-.
-
-WhileStatement =
-	"While" Expression StatementTerminatorAndBlock "End" "While"
-.
-
-DoLoopStatement =
-	"Do" ( DoTopLoopStatement | DoBottomLoopStatement )
-.
-
-DoTopLoopStatement =
-	( "While" | "Until" ) Expression
-	StatementTerminatorAndBlock
-	"Loop"
-.
-
-DoBottomLoopStatement =
-	StatementTerminatorAndBlock
-	"Loop" [ ( "While" | "Until" ) Expression ]
-.
-
-ForStatement =
-	"For" ( ForLoopStatement | ForEachLoopStatement )
-.
-
-ForLoopStatement =
-	ForLoopVariable "=" Expression /* "To" is binary operator */ [ "Step" Expression ]
-	StatementTerminatorAndBlock
-	"Next" [ Expression { "," Expression } ]
-.
-
-ForEachLoopStatement =
-	"Each" ForLoopVariable "In" Expression
-	StatementTerminatorAndBlock
-	"Next" [ Expression { "," Expression } ]
-.
-
-ForLoopVariable =
-	(. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) SimpleExpression (. PopContext(); .)
-	[ "?" ] { ExpressionSuffix }
-	[ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ]
-.
-
-ErrorHandlingStatement =
-	[ "On" ] "Error" ( Expression | "GoTo" ( LiteralInteger | Identifier ) | "Resume" "Next" )
-	| "Resume" ( "Next" | LiteralInteger | Identifier )
-.
-
-ThrowStatement =
-	"Throw" [ Expression ]
-.
-
-TryStatement =
-	"Try"
-	StatementTerminatorAndBlock
-	{
-		"Catch"
-		[ (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .)
-			[ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ]
-		]
-		[ "When" Expression ]
-		StatementTerminatorAndBlock
-	}
-	[
-		"Finally"
-		StatementTerminatorAndBlock
-	]
-	"End" "Try"
-.
-
-BranchStatement =
-	"GoTo" ( Identifier | LiteralInteger )
-	| "Exit" ( "Do" | "For" | "While" | "Select" | "Sub" | "Function" | "Property" | "Try" )
-	| "Continue" ( "Do" | "For" | "While" )
-	| "Stop"
-  /*| "End" HACK End-Statements has special handling in Block */
-	| "Return" (. PushContext(Context.Expression, la, t); .) [ Expression ] (. PopContext(); .)
-.
-
-ReDimStatement =
-	"ReDim"
-	[ EXPECTEDCONFLICT("Preserve") "Preserve" ] /* Preserve is context-dependend keyword */
-	Expression
-.
-
-EraseStatement =
-	"Erase" Expression { "," Expression }
-.
-
-UsingVariable =
-	[
-		EXPECTEDCONFLICT("Where", "Until", "Unicode", "Text", "Take", "Skip", "Preserve",
-						  "Order", "Off", "Out", "Key", "Join", "Into", "Infer", "Group", "From",
-						  "Explicit", "Equals", "Distinct", "Descending", "Compare", "By",
-						  "Binary", "Auto", "Assembly", "Ascending", "Ansi", "Aggregate", ident)
-		(
-			(. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier
-			// HACK: needs to be optional because Expression can start with Identifier too
-			[ (. PopContext(); isAlreadyInExpr = true; .)
-				( "As" [ EXPECTEDCONFLICT("Where", "UShort", "Until", "Unicode", "ULong", "UInteger", "Text", "Take",
-		                 "String", "Skip", "Single", "Short", "SByte", "Preserve", "Out", "Order",
-		                 "Off", "Object", "Long", "Key", "Join", "Into", "Integer", "Infer", "Group",
-		                 "From", "Explicit", "Equals", "Double", "Distinct", "Descending", "Decimal",
-		                 "Date", "Compare", "Char", "Byte", "By", "Boolean", "Binary", "Binary", "Auto",
-		                 "Assembly", "Ascending", "Ansi", "Aggregate", ident)
-						(. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) "=" ]
-				| "="
-				| (.
-					currentState = endOfStatementTerminatorAndBlock; /* leave this block */
-					InformToken(t); /* process Identifier again*/
-					/* for processing current token (la): go to the position after processing End */
-					goto switchlbl;
-				.)
-				ANY /* never reached due to goto above: */
-				/* this ANY is just so that Coco knows this branch isn't empty */
-				)
-			]
-		)
-	]
-	Expression
-	(. if (!isAlreadyInExpr) PopContext(); isAlreadyInExpr = false; .)
-.
-
-UsingStatement =
-	"Using" UsingVariable { "," UsingVariable }
-	StatementTerminatorAndBlock
-	"End" "Using"
-.
-
-InvocationStatement =
-	[ "Call" ] Expression
-.
-
-ArgumentList =
-  (. activeArgument = 0; .) Expression { "," (. activeArgument++; .) [ Expression ] }
-| (. activeArgument = 0; .)  "," (. activeArgument++; .) [ Expression ]  { "," (. activeArgument++; .) [ Expression ] }
-.
-
-/* This production handles pseudo keywords that are needed in the grammar */
-Identifier =
-	IdentifierForFieldDeclaration
-	| "Custom"
-.
-
-IdentifierForFieldDeclaration =
-	IdentifierForExpressionStart
-	| "Aggregate"
-	| "From"
-.
-
-IdentifierForExpressionStart = 
-	IdentifierExceptOut
-	| "Out"
-.
-
-IdentifierExceptOut =
-	ident
-	| "Ansi"
-	| "Ascending"
-	| "Assembly"
-	| "Auto"
-	| "Binary"
-	| "By"
-	| "Compare"
-	| "Descending"
-	| "Distinct"
-	| "Equals"
-	| "Explicit"
-	| "Group"
-	| "Infer"
-	| "Into"
-	| "Join"
-	| "Key"
-	| "Off"
-	| "Order"
-	| "Preserve"
-	| "Skip"
-	| "Take"
-	| "Text"
-	| "Unicode"
-	| "Until"
-	| "Where"
-.
-
-AccessModifier =
-	"Public" |
-	"Friend" |
-	"Protected" |
-	"Private"
-.
-
-TypeModifier =
-	AccessModifier |
-	"MustInherit" |
-	"NotInheritable" |
-	"Shadows" |
-	"Partial"
-.
-
-MemberModifier =
-	AccessModifier |
-	"Shadows" |
-	"Shared" |
-	"Overridable" |
-	"NotOverridable" |
-	"NotInheritable" |
-	"Overrides" |
-	"Overloads" |
-	"Partial" |
-	"WithEvents" |
-	"MustOverride" |
-	"Widening" |
-	"Narrowing" |
-	"ReadOnly" |
-	"WriteOnly" |
-	"Default" |
-	"Dim"
-.
-
-ParameterModifier =
-	"ByVal" |
-	"ByRef" |
-	"Optional" |
-	"ParamArray"
-.
-
-END ExpressionFinder .
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/ExpressionFinder.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/ExpressionFinder.cs
deleted file mode 100644
index 42b6e05c43..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/ExpressionFinder.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ICSharpCode.NRefactory.VB.Parser
-{
-	public partial class ExpressionFinder
-	{
-		Stack<Block> stack = new Stack<Block>();
-		StringBuilder output = new StringBuilder();
-		
-		void PopContext()
-		{
-			if (stack.Any()) {
-				string indent = new string('\t', stack.Count - 1);
-				var item = stack.Pop();
-				item.isClosed = true;
-				Print(indent + "exit " + item.context);
-			} else {
-				Print("empty stack");
-			}
-		}
-		
-		void PushContext(Context context, Token la, Token t)
-		{
-			string indent = new string('\t', stack.Count);
-			TextLocation l = la == null ? (t == null ? TextLocation.Empty : t.EndLocation) : la.Location;
-			
-			stack.Push(new Block() { context = context, lastExpressionStart = l });
-			Print(indent + "enter " + context);
-		}
-		
-		public ExpressionFinder(ExpressionFinderState state)
-		{
-			wasQualifierTokenAtStart = state.WasQualifierTokenAtStart;
-			nextTokenIsPotentialStartOfExpression = state.NextTokenIsPotentialStartOfExpression;
-			nextTokenIsStartOfImportsOrAccessExpression = state.NextTokenIsStartOfImportsOrAccessExpression;
-			readXmlIdentifier = state.ReadXmlIdentifier;
-			identifierExpected = state.IdentifierExpected;
-			stateStack = new Stack<int>(state.StateStack.Reverse());
-			stack = new Stack<Block>(state.BlockStack.Select(x => (Block)x.Clone()).Reverse());
-			currentState = state.CurrentState;
-			output = new StringBuilder();
-		}
-		
-		void Print(string text)
-		{
-			//Console.WriteLine(text);
-			output.AppendLine(text);
-		}
-		
-		public void SetContext(SnippetType type)
-		{
-			switch (type) {
-				case SnippetType.Expression:
-					currentState = startOfExpression;
-					break;
-			}
-			
-			Advance();
-		}
-		
-		public string Output {
-			get { return output.ToString(); }
-		}
-		
-		public string Stacktrace {
-			get {
-				string text = "";
-				
-				foreach (Block b in stack) {
-					text += b.ToString() + "\n";
-				}
-				
-				return text;
-			}
-		}
-		
-		public Block CurrentBlock {
-			get { return stack.Any() ? stack.Peek() : Block.Default; }
-		}
-		
-		public bool IsIdentifierExpected {
-			get { return identifierExpected; }
-		}
-		
-		void SetIdentifierExpected(Token la)
-		{
-			identifierExpected = true;
-			if (la != null)
-				CurrentBlock.lastExpressionStart = la.Location;
-			else if (t != null)
-				CurrentBlock.lastExpressionStart = t.EndLocation;
-		}
-		
-		public bool InContext(Context expected)
-		{
-			return stack
-				.SkipWhile(f => f.context == Context.Expression)
-				.IsElement(fx => fx.context == expected);
-		}
-		
-		public bool NextTokenIsPotentialStartOfExpression {
-			get { return nextTokenIsPotentialStartOfExpression; }
-		}
-		
-		public bool ReadXmlIdentifier {
-			get { return readXmlIdentifier; }
-			set { readXmlIdentifier = value; }
-		}
-		
-		public bool NextTokenIsStartOfImportsOrAccessExpression {
-			get { return nextTokenIsStartOfImportsOrAccessExpression; }
-		}
-		
-		public bool WasQualifierTokenAtStart {
-			get { return wasQualifierTokenAtStart; }
-		}
-		
-		public bool IsMissingModifier {
-			get { return isMissingModifier; }
-		}
-		
-		public bool WasNormalAttribute {
-			get { return wasNormalAttribute; }
-		}
-		
-		public int ActiveArgument {
-			get { return activeArgument; }
-		}
-		
-		public List<Token> Errors {
-			get { return errors; }
-		}
-		
-		public ExpressionFinderState Export()
-		{
-			return new ExpressionFinderState() {
-				WasQualifierTokenAtStart = wasQualifierTokenAtStart,
-				NextTokenIsPotentialStartOfExpression = nextTokenIsPotentialStartOfExpression,
-				NextTokenIsStartOfImportsOrAccessExpression = nextTokenIsStartOfImportsOrAccessExpression,
-				ReadXmlIdentifier = readXmlIdentifier,
-				IdentifierExpected = identifierExpected,
-				StateStack = new Stack<int>(stateStack.Reverse()),
-				BlockStack = new Stack<Block>(stack.Select(x => (Block)x.Clone()).Reverse()),
-				CurrentState = currentState
-			};
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/ExpressionFinderState.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/ExpressionFinderState.cs
deleted file mode 100644
index 0feda1f93e..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/ExpressionFinderState.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ICSharpCode.NRefactory.VB.Parser
-{
-	public class ExpressionFinderState
-	{
-		public bool WasQualifierTokenAtStart { get; set; }
-		public bool NextTokenIsPotentialStartOfExpression { get; set; }
-		public bool ReadXmlIdentifier { get; set; }
-		public bool IdentifierExpected { get; set; }
-		public bool NextTokenIsStartOfImportsOrAccessExpression { get; set; }
-		public Stack<int> StateStack { get; set; }
-		public Stack<Block> BlockStack { get; set; }
-		public int CurrentState { get; set; }
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Extensions.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Extensions.cs
deleted file mode 100644
index 0107d3f088..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Extensions.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ICSharpCode.NRefactory.VB.Parser
-{
-	public static class Extensions
-	{
-		public static bool IsElement<T>(this IEnumerable<T> items, Func<T, bool> check)
-		{
-			T item = items.FirstOrDefault();
-			
-			if (item != null)
-				return check(item);
-			return false;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/KeywordList.txt b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/KeywordList.txt
deleted file mode 100644
index a2a29b670d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/KeywordList.txt
+++ /dev/null
@@ -1,284 +0,0 @@
-# this list is used for autogeneration of:
-# - Keywords.cs
-# - Tokens.cs
-# - ATGTokensSection.txt - the TOKENS section of the ATG file
-
-# use BuildKeywords to generate the different lists.
-
-$Namespace=ICSharpCode.NRefactory.VB.Parser
-$UpperCaseKeywords=True
-
-# TERMINAL_CLASSES
-EOF
-EOL
-Identifier
-LiteralString
-LiteralCharacter
-LiteralInteger
-LiteralDouble
-LiteralSingle
-LiteralDecimal
-LiteralDate
-
-# XML_TERMINALS
-XmlOpenTag
-XmlCloseTag
-XmlStartInlineVB
-XmlEndInlineVB
-XmlCloseTagEmptyElement
-XmlOpenEndTag
-XmlContent
-XmlComment
-XmlCData
-XmlProcessingInstruction
-
-# SPECIAL_CHARACTERS
-Assign = "="
-Colon =":"
-Comma = ","
-ConcatString = "&"
-Div ="/"
-DivInteger = "\\"
-Dot = "."
-TripleDot = "..."
-DotAt = ".@"
-# Exclamation mark = Dictionary access operator (not always a token, sometimes it's a type character)
-ExclamationMark = "!"
-Minus = "-"
-Plus = "+"
-Power = "^"
-QuestionMark = "?"
-Times = "*"
-
-OpenCurlyBrace = "{"
-CloseCurlyBrace = "}"
-	
-OpenParenthesis = "("
-CloseParenthesis = ")"
-	
-GreaterThan = ">"
-LessThan = "<"
-	
-NotEqual = "<>"
-GreaterEqual = ">="
-LessEqual = "<="
-	
-ShiftLeft = "<<"
-ShiftRight = ">>"
-	
-PlusAssign = "+="
-PowerAssign = "^="
-MinusAssign = "-="
-TimesAssign = "*="
-DivAssign = "/="
-DivIntegerAssign = "\\="
-ShiftLeftAssign = "<<="
-ShiftRightAssign = ">>="
-ConcatStringAssign = "&="
-ColonAssign = ":="
-
-# keywords according to the spec:
-# Keywordlist
-"AddHandler"
-"AddressOf"
-"Aggregate"
-"Alias"
-"And"
-"AndAlso"
-"Ansi"
-"As"
-"Ascending"
-"Assembly"
-"Auto"
-"Binary"
-"Boolean"
-"ByRef"
-"By"
-"Byte"
-"ByVal"
-"Call"
-"Case"
-"Catch"
-"CBool"
-"CByte"
-"CChar"
-"CDate"
-"CDbl"
-"CDec"
-"Char"
-"CInt"
-"Class"
-"CLng"
-"CObj"
-"Compare"
-"Const"
-"Continue"
-"CSByte"
-"CShort"
-"CSng"
-"CStr"
-"CType"
-"CUInt"
-"CULng"
-"CUShort"
-"Custom"
-"Date"
-"Decimal"
-"Declare"
-"Default"
-"Delegate"
-"Descending"
-"Dim"
-"DirectCast"
-"Distinct"
-"Do"
-"Double"
-"Each"
-"Else"
-"ElseIf"
-"End"
-"EndIf"
-"Enum"
-"Equals"
-"Erase"
-"Error"
-"Event"
-"Exit"
-"Explicit"
-"False"
-"Finally"
-"For"
-"Friend"
-"From"
-"Function"
-"Get"
-"GetType"
-"Global"
-"GoSub"
-"GoTo"
-"Group"
-"Handles"
-"If"
-"Implements"
-"Imports"
-"In"
-"Infer"
-"Inherits"
-"Integer"
-"Interface"
-"Into"
-"Is"
-"IsNot"
-# Note: IsTrue and IsFalse are 'NOT' keywords they're only valid in Operator declarations (like get/set/value are no C# 'keywords')
-"Join"
-"Key"
-"Let"
-"Lib"
-"Like"
-"Long"
-"Loop"
-"Me"
-"Mod"
-"Module"
-"MustInherit"
-"MustOverride"
-"MyBase"
-"MyClass"
-"Namespace"
-"Narrowing"
-"New"
-"Next"
-"Not"
-"Nothing"
-"NotInheritable"
-"NotOverridable"
-"Object"
-"Of"
-"Off"
-"On"
-"Operator"
-"Option"
-"Optional"
-"Or"
-"Order"
-"OrElse"
-"Out"
-"Overloads"
-"Overridable"
-"Overrides"
-"ParamArray"
-"Partial"
-"Preserve"
-"Private"
-"Property"
-"Protected"
-"Public"
-"RaiseEvent"
-"ReadOnly"
-"ReDim"
-# has to be in the keyword list for the output formatter
-"Rem"
-"RemoveHandler"
-"Resume"
-"Return"
-"SByte"
-"Select"
-"Set"
-"Shadows"
-"Shared"
-"Short"
-"Single"
-"Skip"
-"Static"
-"Step"
-"Stop"
-"Strict"
-"String"
-"Structure"
-"Sub"
-"SyncLock"
-"Take"
-"Text"
-"Then"
-"Throw"
-"To"
-"True"
-"Try"
-"TryCast"
-"TypeOf"
-"UInteger"
-"ULong"
-"Unicode"
-"Until"
-"UShort"
-"Using"
-"Variant"
-"Wend"
-"When"
-"Where"
-"While"
-"Widening"
-"With"
-"WithEvents"
-"WriteOnly"
-"Xor"
-
-#XML specific keywords
-"GetXmlNamespace"
-
-#Sets
-Null("Nothing")
-BlockSucc("Case", "Catch", "Else", "ElseIf", "End", "Finally", "Loop", "Next")
-GlobalLevel("Namespace", "Module", "Class", "Structure", "Imports", "Option")
-TypeLevel("Sub", "Function", "Property")
-
-# List of keywords that are valid identifiers, must be the same as the "Identifier" production in VBNET.ATG
-IdentifierTokens("Text", "Binary", "Compare", "Assembly", "Ansi", "Auto", "Preserve", "Unicode", "Until", "Off", "Out", "Key", "Explicit", "Infer", "From", "Join", "Equals", "Distinct", "Where", "Take", "Skip", "Order", "By", "Ascending", "Descending", "Group", "Into", "Aggregate")
-ExpressionStart("Me", "MyBase", "MyClass", @BooleanExpressions, @OperatorsAtStart, "New", @Null, "AddressOf", "GetType", "TypeOf", "GetXmlNamespace", "Global", @TypeKW, @LambdaStart, @CastExpressions)
-StatementStart(@Null, @ExpressionStart, "Dim", "Const", "Static", "For", "While", "Do", "Select")
-SimpleTypeName(@TypeKW, @IdentifierTokens)
-CastExpressions("DirectCast", "TryCast", "CType", "CBool", "CByte", "CChar", "CDate", "CDec", "CDbl", "CInt", "CLng", "CObj", "CSByte", "CShort", "CSng", "CStr", "CUInt", "CULng", "CUShort")
-BooleanExpressions("True", "False")
-LambdaStart("Sub", "Function")
-OperatorsAtStart("Not", "From", "Aggregate")
-TypeKW("Boolean", "Date", "Char", "String", "Decimal", "Byte", "Short", "Integer", "Long", "Single", "Double", "UInteger", "ULong", "UShort", "SByte")
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Keywords.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Keywords.cs
deleted file mode 100644
index 507ab10b4b..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Keywords.cs
+++ /dev/null
@@ -1,215 +0,0 @@
-// this file was autogenerated by a tool.
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Parser
-{
-	public static class Keywords
-	{
-		static readonly string[] keywordList = {
-			"ADDHANDLER",
-			"ADDRESSOF",
-			"AGGREGATE",
-			"ALIAS",
-			"AND",
-			"ANDALSO",
-			"ANSI",
-			"AS",
-			"ASCENDING",
-			"ASSEMBLY",
-			"AUTO",
-			"BINARY",
-			"BOOLEAN",
-			"BYREF",
-			"BY",
-			"BYTE",
-			"BYVAL",
-			"CALL",
-			"CASE",
-			"CATCH",
-			"CBOOL",
-			"CBYTE",
-			"CCHAR",
-			"CDATE",
-			"CDBL",
-			"CDEC",
-			"CHAR",
-			"CINT",
-			"CLASS",
-			"CLNG",
-			"COBJ",
-			"COMPARE",
-			"CONST",
-			"CONTINUE",
-			"CSBYTE",
-			"CSHORT",
-			"CSNG",
-			"CSTR",
-			"CTYPE",
-			"CUINT",
-			"CULNG",
-			"CUSHORT",
-			"CUSTOM",
-			"DATE",
-			"DECIMAL",
-			"DECLARE",
-			"DEFAULT",
-			"DELEGATE",
-			"DESCENDING",
-			"DIM",
-			"DIRECTCAST",
-			"DISTINCT",
-			"DO",
-			"DOUBLE",
-			"EACH",
-			"ELSE",
-			"ELSEIF",
-			"END",
-			"ENDIF",
-			"ENUM",
-			"EQUALS",
-			"ERASE",
-			"ERROR",
-			"EVENT",
-			"EXIT",
-			"EXPLICIT",
-			"FALSE",
-			"FINALLY",
-			"FOR",
-			"FRIEND",
-			"FROM",
-			"FUNCTION",
-			"GET",
-			"GETTYPE",
-			"GLOBAL",
-			"GOSUB",
-			"GOTO",
-			"GROUP",
-			"HANDLES",
-			"IF",
-			"IMPLEMENTS",
-			"IMPORTS",
-			"IN",
-			"INFER",
-			"INHERITS",
-			"INTEGER",
-			"INTERFACE",
-			"INTO",
-			"IS",
-			"ISNOT",
-			"JOIN",
-			"KEY",
-			"LET",
-			"LIB",
-			"LIKE",
-			"LONG",
-			"LOOP",
-			"ME",
-			"MOD",
-			"MODULE",
-			"MUSTINHERIT",
-			"MUSTOVERRIDE",
-			"MYBASE",
-			"MYCLASS",
-			"NAMESPACE",
-			"NARROWING",
-			"NEW",
-			"NEXT",
-			"NOT",
-			"NOTHING",
-			"NOTINHERITABLE",
-			"NOTOVERRIDABLE",
-			"OBJECT",
-			"OF",
-			"OFF",
-			"ON",
-			"OPERATOR",
-			"OPTION",
-			"OPTIONAL",
-			"OR",
-			"ORDER",
-			"ORELSE",
-			"OUT",
-			"OVERLOADS",
-			"OVERRIDABLE",
-			"OVERRIDES",
-			"PARAMARRAY",
-			"PARTIAL",
-			"PRESERVE",
-			"PRIVATE",
-			"PROPERTY",
-			"PROTECTED",
-			"PUBLIC",
-			"RAISEEVENT",
-			"READONLY",
-			"REDIM",
-			"REM",
-			"REMOVEHANDLER",
-			"RESUME",
-			"RETURN",
-			"SBYTE",
-			"SELECT",
-			"SET",
-			"SHADOWS",
-			"SHARED",
-			"SHORT",
-			"SINGLE",
-			"SKIP",
-			"STATIC",
-			"STEP",
-			"STOP",
-			"STRICT",
-			"STRING",
-			"STRUCTURE",
-			"SUB",
-			"SYNCLOCK",
-			"TAKE",
-			"TEXT",
-			"THEN",
-			"THROW",
-			"TO",
-			"TRUE",
-			"TRY",
-			"TRYCAST",
-			"TYPEOF",
-			"UINTEGER",
-			"ULONG",
-			"UNICODE",
-			"UNTIL",
-			"USHORT",
-			"USING",
-			"VARIANT",
-			"WEND",
-			"WHEN",
-			"WHERE",
-			"WHILE",
-			"WIDENING",
-			"WITH",
-			"WITHEVENTS",
-			"WRITEONLY",
-			"XOR",
-			"GETXMLNAMESPACE"
-		};
-		
-		static LookupTable keywords = new LookupTable(false);
-		
-		static Keywords()
-		{
-			for (int i = 0; i < keywordList.Length; ++i) {
-				keywords[keywordList[i]] = i + Tokens.AddHandler;
-			}
-		}
-		
-		public static int GetToken(string keyword)
-		{
-			return keywords[keyword];
-		}
-		
-		public static bool IsNonIdentifierKeyword(string word)
-		{
-			int token = GetToken(word);
-			if (token < 0)
-				return false;
-			return !Tokens.IdentifierTokens[token];
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/LATextReader.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/LATextReader.cs
deleted file mode 100644
index eff8b821eb..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/LATextReader.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB.Parser
-{
-	public class LATextReader : TextReader
-	{
-		List<int> buffer;
-		TextReader reader;
-		
-		public LATextReader(TextReader reader)
-		{
-			this.buffer = new List<int>();
-			this.reader = reader;
-		}
-		
-		public override int Peek()
-		{
-			return Peek(0);
-		}
-		
-		public override int Read()
-		{
-			int c = Peek();
-			buffer.RemoveAt(0);
-			return c;
-		}
-		
-		public int Peek(int step)
-		{
-			while (step >= buffer.Count) {
-				buffer.Add(reader.Read());
-			}
-			
-			if (step < 0)
-				return -1;
-			
-			return buffer[step];
-		}
-		
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing)
-				reader.Dispose();
-			base.Dispose(disposing);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/LookupTable.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/LookupTable.cs
deleted file mode 100644
index eb2c94dfcf..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/LookupTable.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Globalization;
-
-namespace ICSharpCode.NRefactory.VB.Parser
-{
-	/// <summary>
-	/// This class implements a keyword map. It implements a digital search trees (tries) to find
-	/// a word.
-	/// </summary>
-	internal class LookupTable
-	{
-		Node root = new Node(-1, null);
-		bool casesensitive;
-		int  length;
-		
-		/// <value>
-		/// The number of elements in the table
-		/// </value>
-		public int Count {
-			get {
-				return length;
-			}
-		}
-		
-		/// <summary>
-		/// Inserts an int in the tree, under keyword
-		/// </summary>
-		public int this[string keyword] {
-			get {
-				Node next = root;
-				
-				if (!casesensitive) {
-					keyword = keyword.ToUpper(CultureInfo.InvariantCulture);
-				}
-				
-				for (int i = 0; i < keyword.Length; ++i) {
-					int index = ((int)keyword[i]) % 256;
-					next = next.leaf[index];
-					
-					if (next == null) {
-						return -1;
-					}
-					
-					if (keyword == next.word) {
-						return next.val;
-					}
-				}
-				return -1;
-			}
-			set {
-				Node node = root;
-				Node next = root;
-				
-				if (!casesensitive) {
-					keyword = keyword.ToUpper(CultureInfo.InvariantCulture);
-				}
-				
-				++length;
-				
-				// insert word into the tree
-				for (int i = 0; i < keyword.Length; ++i) {
-					int index = ((int)keyword[i]) % 256; // index of curchar
-					bool d = keyword[i] == '\\';
-					
-					next = next.leaf[index];             // get node to this index
-					
-					if (next == null) { // no node created -> insert word here
-						node.leaf[index] = new Node(value, keyword);
-						break;
-					}
-					
-					if (next.word != null && next.word.Length != i) { // node there, take node content and insert them again
-						string tmpword  = next.word;                  // this word will be inserted 1 level deeper (better, don't need too much 
-						int    tmpval = next.val;                 // string comparisons for finding.)
-						next.val = -1;
-						next.word = null;
-						this[tmpword] = tmpval;
-					}
-					
-					if (i == keyword.Length - 1) { // end of keyword reached, insert node there, if a node was here it was
-						next.word = keyword;       // reinserted, if it has the same length (keyword EQUALS this word) it will be overwritten
-						next.val = value;
-						break;
-					}
-					
-					node = next;
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Creates a new instance of <see cref="LookupTable"/>
-		/// </summary>
-		public LookupTable(bool casesensitive)
-		{
-			this.casesensitive = casesensitive;
-		}
-		
-		class Node
-		{
-			public Node(int val, string word)
-			{
-				this.word  = word;
-				this.val   = val;
-			}
-			
-			public string word;
-			public int    val;
-			
-			public Node[] leaf = new Node[256];
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Parser.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Parser.cs
deleted file mode 100644
index 9fd64e9528..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Parser.cs
+++ /dev/null
@@ -1,8631 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-
-
-namespace ICSharpCode.NRefactory.VB.Parser {
-
-
-
-partial class ExpressionFinder {
-	const int startOfExpression = 55;
-	const int endOfStatementTerminatorAndBlock = 263;
-	static BitArray GetExpectedSet(int state)
-	{
-		switch (state) {
-			case 0:
-			case 1:
-				return set[0];
-			case 2:
-				return set[1];
-			case 3:
-			case 4:
-				return set[2];
-			case 5:
-				return set[3];
-			case 6:
-			case 88:
-			case 264:
-			case 530:
-				{
-					BitArray a = new BitArray(239);
-					return a;
-				}
-			case 7:
-				return set[4];
-			case 8:
-				return set[5];
-			case 9:
-			case 10:
-			case 20:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(142, true);
-					return a;
-				}
-			case 11:
-			case 193:
-			case 199:
-			case 205:
-			case 244:
-			case 248:
-			case 295:
-			case 399:
-			case 405:
-			case 474:
-			case 520:
-			case 527:
-			case 535:
-			case 565:
-			case 601:
-			case 650:
-			case 664:
-			case 743:
-				return set[6];
-			case 12:
-			case 13:
-			case 566:
-			case 567:
-			case 612:
-			case 622:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(1, true);
-					a.Set(21, true);
-					a.Set(37, true);
-					return a;
-				}
-			case 14:
-			case 21:
-			case 23:
-			case 24:
-			case 36:
-			case 256:
-			case 259:
-			case 260:
-			case 296:
-			case 300:
-			case 322:
-			case 337:
-			case 348:
-			case 351:
-			case 357:
-			case 362:
-			case 372:
-			case 373:
-			case 396:
-			case 423:
-			case 526:
-			case 532:
-			case 538:
-			case 542:
-			case 550:
-			case 558:
-			case 568:
-			case 577:
-			case 594:
-			case 599:
-			case 607:
-			case 613:
-			case 616:
-			case 623:
-			case 626:
-			case 645:
-			case 648:
-			case 672:
-			case 680:
-			case 716:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(1, true);
-					a.Set(21, true);
-					return a;
-				}
-			case 15:
-			case 16:
-				return set[7];
-			case 17:
-			case 18:
-				return set[8];
-			case 19:
-			case 257:
-			case 271:
-			case 298:
-			case 352:
-			case 397:
-			case 454:
-			case 575:
-			case 595:
-			case 614:
-			case 618:
-			case 624:
-			case 646:
-			case 681:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(113, true);
-					return a;
-				}
-			case 22:
-			case 543:
-			case 578:
-				return set[9];
-			case 25:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(1, true);
-					return a;
-				}
-			case 26:
-			case 27:
-				return set[10];
-			case 28:
-			case 720:
-				return set[11];
-			case 29:
-				return set[12];
-			case 30:
-				return set[13];
-			case 31:
-			case 32:
-			case 152:
-			case 217:
-			case 218:
-			case 265:
-			case 276:
-			case 277:
-			case 444:
-			case 445:
-			case 462:
-			case 463:
-			case 464:
-			case 465:
-			case 553:
-			case 554:
-			case 587:
-			case 588:
-			case 675:
-			case 676:
-			case 729:
-			case 730:
-				return set[14];
-			case 33:
-			case 34:
-			case 521:
-			case 522:
-			case 528:
-			case 529:
-			case 555:
-			case 556:
-			case 669:
-				return set[15];
-			case 35:
-			case 37:
-			case 157:
-			case 168:
-			case 171:
-			case 187:
-			case 203:
-			case 221:
-			case 307:
-			case 332:
-			case 422:
-			case 440:
-			case 477:
-			case 531:
-			case 549:
-			case 557:
-			case 629:
-			case 632:
-			case 654:
-			case 657:
-			case 659:
-			case 671:
-			case 684:
-			case 686:
-			case 709:
-			case 712:
-			case 715:
-			case 721:
-			case 724:
-			case 742:
-				return set[16];
-			case 38:
-			case 41:
-				return set[17];
-			case 39:
-				return set[18];
-			case 40:
-			case 97:
-			case 101:
-			case 163:
-			case 388:
-			case 481:
-				return set[19];
-			case 42:
-			case 177:
-			case 184:
-			case 189:
-			case 253:
-			case 424:
-			case 451:
-			case 473:
-			case 476:
-			case 589:
-			case 590:
-			case 642:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(37, true);
-					return a;
-				}
-			case 43:
-			case 44:
-			case 165:
-			case 166:
-				return set[20];
-			case 45:
-			case 46:
-			case 167:
-			case 188:
-			case 392:
-			case 427:
-			case 475:
-			case 478:
-			case 498:
-			case 561:
-			case 592:
-			case 644:
-			case 690:
-			case 719:
-			case 728:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(38, true);
-					return a;
-				}
-			case 47:
-			case 48:
-				return set[21];
-			case 49:
-			case 179:
-			case 186:
-			case 394:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(22, true);
-					return a;
-				}
-			case 50:
-			case 51:
-			case 52:
-			case 54:
-			case 390:
-			case 391:
-			case 412:
-			case 413:
-			case 419:
-			case 420:
-			case 489:
-			case 490:
-			case 703:
-			case 704:
-				return set[22];
-			case 53:
-			case 169:
-			case 170:
-			case 172:
-			case 181:
-			case 414:
-			case 421:
-			case 429:
-			case 438:
-			case 442:
-			case 485:
-			case 488:
-			case 492:
-			case 494:
-			case 495:
-			case 505:
-			case 512:
-			case 519:
-			case 705:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(22, true);
-					a.Set(38, true);
-					return a;
-				}
-			case 55:
-			case 56:
-			case 70:
-			case 75:
-			case 76:
-			case 77:
-			case 83:
-			case 99:
-			case 155:
-			case 178:
-			case 180:
-			case 182:
-			case 185:
-			case 195:
-			case 197:
-			case 215:
-			case 239:
-			case 274:
-			case 284:
-			case 286:
-			case 287:
-			case 304:
-			case 321:
-			case 326:
-			case 335:
-			case 341:
-			case 343:
-			case 347:
-			case 350:
-			case 356:
-			case 367:
-			case 369:
-			case 370:
-			case 376:
-			case 393:
-			case 395:
-			case 415:
-			case 439:
-			case 467:
-			case 483:
-			case 484:
-			case 486:
-			case 487:
-			case 548:
-			case 628:
-				return set[23];
-			case 57:
-			case 78:
-			case 158:
-				return set[24];
-			case 58:
-				return set[25];
-			case 59:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(216, true);
-					return a;
-				}
-			case 60:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(145, true);
-					return a;
-				}
-			case 61:
-			case 156:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(144, true);
-					return a;
-				}
-			case 62:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(236, true);
-					return a;
-				}
-			case 63:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(177, true);
-					return a;
-				}
-			case 64:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(175, true);
-					return a;
-				}
-			case 65:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(61, true);
-					return a;
-				}
-			case 66:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(60, true);
-					return a;
-				}
-			case 67:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(150, true);
-					return a;
-				}
-			case 68:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(42, true);
-					return a;
-				}
-			case 69:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(43, true);
-					return a;
-				}
-			case 71:
-			case 443:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(40, true);
-					return a;
-				}
-			case 72:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(41, true);
-					return a;
-				}
-			case 73:
-			case 98:
-			case 222:
-			case 223:
-			case 282:
-			case 283:
-			case 334:
-			case 744:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(20, true);
-					return a;
-				}
-			case 74:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(154, true);
-					return a;
-				}
-			case 79:
-			case 91:
-			case 93:
-			case 148:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(35, true);
-					return a;
-				}
-			case 80:
-			case 81:
-				return set[26];
-			case 82:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(36, true);
-					return a;
-				}
-			case 84:
-			case 100:
-			case 515:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(22, true);
-					a.Set(36, true);
-					return a;
-				}
-			case 85:
-			case 121:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(162, true);
-					return a;
-				}
-			case 86:
-			case 87:
-				return set[27];
-			case 89:
-			case 92:
-			case 149:
-			case 150:
-			case 153:
-				return set[28];
-			case 90:
-			case 102:
-			case 147:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(233, true);
-					return a;
-				}
-			case 94:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(26, true);
-					a.Set(36, true);
-					a.Set(147, true);
-					return a;
-				}
-			case 95:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(26, true);
-					a.Set(147, true);
-					return a;
-				}
-			case 96:
-			case 685:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(26, true);
-					return a;
-				}
-			case 103:
-			case 353:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(231, true);
-					return a;
-				}
-			case 104:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(230, true);
-					return a;
-				}
-			case 105:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(224, true);
-					return a;
-				}
-			case 106:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(223, true);
-					return a;
-				}
-			case 107:
-			case 299:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(218, true);
-					return a;
-				}
-			case 108:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(213, true);
-					return a;
-				}
-			case 109:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(212, true);
-					return a;
-				}
-			case 110:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(211, true);
-					return a;
-				}
-			case 111:
-			case 455:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(210, true);
-					return a;
-				}
-			case 112:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(209, true);
-					return a;
-				}
-			case 113:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(206, true);
-					return a;
-				}
-			case 114:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(203, true);
-					return a;
-				}
-			case 115:
-			case 359:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(197, true);
-					return a;
-				}
-			case 116:
-			case 600:
-			case 619:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(186, true);
-					return a;
-				}
-			case 117:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(184, true);
-					return a;
-				}
-			case 118:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(176, true);
-					return a;
-				}
-			case 119:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(170, true);
-					return a;
-				}
-			case 120:
-			case 316:
-			case 323:
-			case 338:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(163, true);
-					return a;
-				}
-			case 122:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(147, true);
-					return a;
-				}
-			case 123:
-			case 226:
-			case 231:
-			case 233:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(146, true);
-					return a;
-				}
-			case 124:
-			case 228:
-			case 232:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(143, true);
-					return a;
-				}
-			case 125:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(139, true);
-					return a;
-				}
-			case 126:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(133, true);
-					return a;
-				}
-			case 127:
-			case 258:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(127, true);
-					return a;
-				}
-			case 128:
-			case 151:
-			case 251:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(126, true);
-					return a;
-				}
-			case 129:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(124, true);
-					return a;
-				}
-			case 130:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(121, true);
-					return a;
-				}
-			case 131:
-			case 196:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(116, true);
-					return a;
-				}
-			case 132:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(108, true);
-					return a;
-				}
-			case 133:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(107, true);
-					return a;
-				}
-			case 134:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(104, true);
-					return a;
-				}
-			case 135:
-			case 637:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(98, true);
-					return a;
-				}
-			case 136:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(87, true);
-					return a;
-				}
-			case 137:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(84, true);
-					return a;
-				}
-			case 138:
-			case 208:
-			case 238:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(70, true);
-					return a;
-				}
-			case 139:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(67, true);
-					return a;
-				}
-			case 140:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(66, true);
-					return a;
-				}
-			case 141:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(65, true);
-					return a;
-				}
-			case 142:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(64, true);
-					return a;
-				}
-			case 143:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(62, true);
-					return a;
-				}
-			case 144:
-			case 250:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(58, true);
-					return a;
-				}
-			case 145:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(2, true);
-					return a;
-				}
-			case 146:
-				return set[29];
-			case 154:
-				return set[30];
-			case 159:
-				return set[31];
-			case 160:
-				return set[32];
-			case 161:
-			case 162:
-			case 479:
-			case 480:
-				return set[33];
-			case 164:
-				return set[34];
-			case 173:
-			case 174:
-			case 319:
-			case 328:
-				return set[35];
-			case 175:
-			case 457:
-				return set[36];
-			case 176:
-			case 375:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(135, true);
-					return a;
-				}
-			case 183:
-				return set[37];
-			case 190:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(58, true);
-					a.Set(126, true);
-					return a;
-				}
-			case 191:
-			case 192:
-				return set[38];
-			case 194:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(171, true);
-					return a;
-				}
-			case 198:
-			case 212:
-			case 230:
-			case 235:
-			case 241:
-			case 243:
-			case 247:
-			case 249:
-				return set[39];
-			case 200:
-			case 201:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(63, true);
-					a.Set(138, true);
-					return a;
-				}
-			case 202:
-			case 204:
-			case 320:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(138, true);
-					return a;
-				}
-			case 206:
-			case 207:
-			case 209:
-			case 211:
-			case 213:
-			case 214:
-			case 224:
-			case 229:
-			case 234:
-			case 242:
-			case 246:
-			case 269:
-			case 273:
-				return set[40];
-			case 210:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(22, true);
-					a.Set(143, true);
-					return a;
-				}
-			case 216:
-				return set[41];
-			case 219:
-			case 278:
-				return set[42];
-			case 220:
-			case 279:
-				return set[43];
-			case 225:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(22, true);
-					a.Set(70, true);
-					return a;
-				}
-			case 227:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(133, true);
-					a.Set(143, true);
-					a.Set(146, true);
-					return a;
-				}
-			case 236:
-			case 237:
-				return set[44];
-			case 240:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(64, true);
-					a.Set(104, true);
-					return a;
-				}
-			case 245:
-				return set[45];
-			case 252:
-			case 552:
-			case 663:
-			case 674:
-			case 682:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(127, true);
-					a.Set(210, true);
-					return a;
-				}
-			case 254:
-			case 255:
-				return set[46];
-			case 261:
-			case 262:
-				return set[47];
-			case 263:
-				return set[48];
-			case 266:
-				return set[49];
-			case 267:
-			case 268:
-			case 381:
-				return set[50];
-			case 270:
-			case 275:
-			case 365:
-			case 655:
-			case 656:
-			case 658:
-			case 693:
-			case 710:
-			case 711:
-			case 713:
-			case 722:
-			case 723:
-			case 725:
-			case 737:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(1, true);
-					a.Set(21, true);
-					a.Set(22, true);
-					return a;
-				}
-			case 272:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(226, true);
-					return a;
-				}
-			case 280:
-			case 281:
-				return set[51];
-			case 285:
-			case 327:
-			case 342:
-			case 404:
-				return set[52];
-			case 288:
-			case 289:
-			case 309:
-			case 310:
-			case 324:
-			case 325:
-			case 339:
-			case 340:
-				return set[53];
-			case 290:
-			case 382:
-			case 385:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(1, true);
-					a.Set(21, true);
-					a.Set(111, true);
-					return a;
-				}
-			case 291:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(108, true);
-					a.Set(124, true);
-					a.Set(231, true);
-					return a;
-				}
-			case 292:
-				return set[54];
-			case 293:
-			case 312:
-				return set[55];
-			case 294:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(5, true);
-					return a;
-				}
-			case 297:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(75, true);
-					a.Set(113, true);
-					a.Set(123, true);
-					return a;
-				}
-			case 301:
-			case 302:
-				return set[56];
-			case 303:
-			case 308:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(1, true);
-					a.Set(21, true);
-					a.Set(229, true);
-					return a;
-				}
-			case 305:
-			case 306:
-				return set[57];
-			case 311:
-				return set[58];
-			case 313:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(118, true);
-					return a;
-				}
-			case 314:
-			case 315:
-				return set[59];
-			case 317:
-			case 318:
-				return set[60];
-			case 329:
-			case 330:
-				return set[61];
-			case 331:
-				return set[62];
-			case 333:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(20, true);
-					a.Set(138, true);
-					return a;
-				}
-			case 336:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(1, true);
-					a.Set(21, true);
-					a.Set(205, true);
-					return a;
-				}
-			case 344:
-				return set[63];
-			case 345:
-			case 349:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(152, true);
-					return a;
-				}
-			case 346:
-				return set[64];
-			case 354:
-			case 355:
-				return set[65];
-			case 358:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(74, true);
-					a.Set(113, true);
-					return a;
-				}
-			case 360:
-			case 361:
-				return set[66];
-			case 363:
-			case 364:
-				return set[67];
-			case 366:
-			case 368:
-				return set[68];
-			case 371:
-			case 377:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(1, true);
-					a.Set(21, true);
-					a.Set(214, true);
-					return a;
-				}
-			case 374:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(111, true);
-					a.Set(112, true);
-					a.Set(113, true);
-					return a;
-				}
-			case 378:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(1, true);
-					a.Set(21, true);
-					a.Set(135, true);
-					return a;
-				}
-			case 379:
-			case 380:
-			case 452:
-			case 453:
-				return set[69];
-			case 383:
-			case 384:
-			case 386:
-			case 387:
-				return set[70];
-			case 389:
-				return set[71];
-			case 398:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(211, true);
-					a.Set(233, true);
-					return a;
-				}
-			case 400:
-			case 401:
-			case 406:
-			case 407:
-				return set[72];
-			case 402:
-			case 408:
-				return set[73];
-			case 403:
-			case 411:
-			case 418:
-				return set[74];
-			case 409:
-			case 410:
-			case 416:
-			case 417:
-			case 700:
-			case 701:
-				return set[75];
-			case 425:
-			case 426:
-				return set[76];
-			case 428:
-			case 430:
-			case 431:
-			case 591:
-			case 643:
-				return set[77];
-			case 432:
-			case 433:
-				return set[78];
-			case 434:
-			case 435:
-				return set[79];
-			case 436:
-				return set[80];
-			case 437:
-			case 441:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(20, true);
-					a.Set(22, true);
-					a.Set(38, true);
-					return a;
-				}
-			case 446:
-			case 450:
-				return set[81];
-			case 447:
-			case 448:
-				return set[82];
-			case 449:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(21, true);
-					return a;
-				}
-			case 456:
-				return set[83];
-			case 458:
-			case 471:
-				return set[84];
-			case 459:
-			case 472:
-				return set[85];
-			case 460:
-			case 461:
-			case 736:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(10, true);
-					return a;
-				}
-			case 466:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(12, true);
-					return a;
-				}
-			case 468:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(13, true);
-					return a;
-				}
-			case 469:
-				return set[86];
-			case 470:
-				return set[87];
-			case 482:
-				return set[88];
-			case 491:
-			case 493:
-				return set[89];
-			case 496:
-			case 497:
-			case 559:
-			case 560:
-			case 688:
-			case 689:
-				return set[90];
-			case 499:
-			case 500:
-			case 501:
-			case 506:
-			case 507:
-			case 562:
-			case 691:
-			case 718:
-			case 727:
-				return set[91];
-			case 502:
-			case 508:
-			case 517:
-				return set[92];
-			case 503:
-			case 504:
-			case 509:
-			case 510:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(22, true);
-					a.Set(38, true);
-					a.Set(63, true);
-					return a;
-				}
-			case 511:
-			case 513:
-			case 518:
-				return set[93];
-			case 514:
-			case 516:
-				return set[94];
-			case 523:
-			case 536:
-			case 537:
-			case 593:
-			case 670:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(1, true);
-					a.Set(21, true);
-					a.Set(63, true);
-					return a;
-				}
-			case 524:
-			case 525:
-			case 597:
-			case 598:
-				return set[95];
-			case 533:
-			case 534:
-			case 541:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(115, true);
-					return a;
-				}
-			case 539:
-			case 540:
-				return set[96];
-			case 544:
-			case 545:
-				return set[97];
-			case 546:
-			case 547:
-			case 606:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(1, true);
-					a.Set(20, true);
-					a.Set(21, true);
-					return a;
-				}
-			case 551:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(103, true);
-					return a;
-				}
-			case 563:
-			case 564:
-			case 576:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(84, true);
-					a.Set(155, true);
-					a.Set(209, true);
-					return a;
-				}
-			case 569:
-			case 570:
-				return set[98];
-			case 571:
-			case 572:
-				return set[99];
-			case 573:
-			case 574:
-			case 585:
-				return set[100];
-			case 579:
-			case 580:
-				return set[101];
-			case 581:
-			case 582:
-			case 707:
-				return set[102];
-			case 583:
-				return set[103];
-			case 584:
-				return set[104];
-			case 586:
-			case 596:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(172, true);
-					return a;
-				}
-			case 602:
-			case 603:
-				return set[105];
-			case 604:
-				return set[106];
-			case 605:
-			case 636:
-				return set[107];
-			case 608:
-			case 609:
-			case 610:
-			case 627:
-				return set[108];
-			case 611:
-			case 615:
-			case 625:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(128, true);
-					a.Set(198, true);
-					return a;
-				}
-			case 617:
-				return set[109];
-			case 620:
-				return set[110];
-			case 621:
-				return set[111];
-			case 630:
-			case 631:
-			case 633:
-			case 699:
-			case 702:
-				return set[112];
-			case 634:
-			case 635:
-				return set[113];
-			case 638:
-			case 640:
-			case 649:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(119, true);
-					return a;
-				}
-			case 639:
-				return set[114];
-			case 641:
-				return set[115];
-			case 647:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(56, true);
-					a.Set(189, true);
-					a.Set(193, true);
-					return a;
-				}
-			case 651:
-			case 652:
-				return set[116];
-			case 653:
-			case 660:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(1, true);
-					a.Set(21, true);
-					a.Set(136, true);
-					return a;
-				}
-			case 661:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(101, true);
-					return a;
-				}
-			case 662:
-				return set[117];
-			case 665:
-			case 666:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(149, true);
-					return a;
-				}
-			case 667:
-			case 673:
-			case 745:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(3, true);
-					return a;
-				}
-			case 668:
-				return set[118];
-			case 677:
-			case 678:
-				return set[119];
-			case 679:
-			case 687:
-				return set[120];
-			case 683:
-				return set[121];
-			case 692:
-			case 694:
-				return set[122];
-			case 695:
-			case 706:
-				return set[123];
-			case 696:
-			case 697:
-				return set[124];
-			case 698:
-				return set[125];
-			case 708:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(136, true);
-					return a;
-				}
-			case 714:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(140, true);
-					return a;
-				}
-			case 717:
-			case 726:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(169, true);
-					return a;
-				}
-			case 731:
-				return set[126];
-			case 732:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(160, true);
-					return a;
-				}
-			case 733:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(137, true);
-					return a;
-				}
-			case 734:
-			case 735:
-			case 738:
-			case 739:
-				return set[127];
-			case 740:
-			case 747:
-				return set[128];
-			case 741:
-				return set[129];
-			case 746:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(11, true);
-					return a;
-				}
-			case 748:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(173, true);
-					return a;
-				}
-			case 749:
-				return set[130];
-			case 750:
-				{
-					BitArray a = new BitArray(239);
-					a.Set(67, true);
-					a.Set(213, true);
-					return a;
-				}
-			case 751:
-				return set[131];
-			default: throw new InvalidOperationException();
-		}
-	}
-
-	const bool T = true;
-	const bool x = false;
-
-	int currentState = 0;
-
-	readonly Stack<int> stateStack = new Stack<int>();
-	bool wasQualifierTokenAtStart = false;
-	bool nextTokenIsPotentialStartOfExpression = false;
-	bool readXmlIdentifier = false;
-	bool identifierExpected = false;
-	bool nextTokenIsStartOfImportsOrAccessExpression = false;
-	bool isMissingModifier = false;
-	bool isAlreadyInExpr = false;
-	bool wasNormalAttribute = false;
-	int activeArgument = 0;
-	List<Token> errors = new List<Token>();
-	
-	public ExpressionFinder()
-	{
-		stateStack.Push(-1); // required so that we don't crash when leaving the root production
-	}
-
-	void Expect(int expectedKind, Token la)
-	{
-		if (la.kind != expectedKind) {
-			Error(la);
-			output.AppendLine("expected: " + expectedKind);
-			//Console.WriteLine("expected: " + expectedKind);
-		}
-	}
-	
-	void Error(Token la) 
-	{
-		output.AppendLine("not expected: " + la);
-		//Console.WriteLine("not expected: " + la);
-		errors.Add(la);
-	}
-	
-	Token t;
-	
-	public void InformToken(Token la) 
-	{
-		switchlbl: switch (currentState) {
-			case 0: {
-				PushContext(Context.Global, la, t);
-				goto case 1;
-			}
-			case 1: {
-				if (la == null) { currentState = 1; break; }
-				if (la.kind == 173) {
-					stateStack.Push(1);
-					goto case 748;
-				} else {
-					goto case 2;
-				}
-			}
-			case 2: {
-				if (la == null) { currentState = 2; break; }
-				if (la.kind == 137) {
-					stateStack.Push(2);
-					goto case 733;
-				} else {
-					goto case 3;
-				}
-			}
-			case 3: {
-				if (la == null) { currentState = 3; break; }
-				if (la.kind == 40) {
-					stateStack.Push(3);
-					goto case 443;
-				} else {
-					goto case 4;
-				}
-			}
-			case 4: {
-				if (la == null) { currentState = 4; break; }
-				if (set[3].Get(la.kind)) {
-					stateStack.Push(4);
-					goto case 5;
-				} else {
-					PopContext();
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 5: {
-				if (la == null) { currentState = 5; break; }
-				if (la.kind == 160) {
-					currentState = 729;
-					break;
-				} else {
-					if (set[4].Get(la.kind)) {
-						goto case 7;
-					} else {
-						goto case 6;
-					}
-				}
-			}
-			case 6: {
-				Error(la);
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 7: {
-				if (la == null) { currentState = 7; break; }
-				if (la.kind == 40) {
-					stateStack.Push(7);
-					goto case 443;
-				} else {
-					goto case 8;
-				}
-			}
-			case 8: {
-				if (la == null) { currentState = 8; break; }
-				if (set[132].Get(la.kind)) {
-					currentState = 8;
-					break;
-				} else {
-					if (la.kind == 84 || la.kind == 155 || la.kind == 209) {
-						goto case 563;
-					} else {
-						if (la.kind == 103) {
-							currentState = 552;
-							break;
-						} else {
-							if (la.kind == 115) {
-								goto case 533;
-							} else {
-								if (la.kind == 142) {
-									goto case 9;
-								} else {
-									goto case 6;
-								}
-							}
-						}
-					}
-				}
-			}
-			case 9: {
-				PushContext(Context.TypeDeclaration, la, t);
-				goto case 10;
-			}
-			case 10: {
-				if (la == null) { currentState = 10; break; }
-				Expect(142, la); // "Interface"
-				currentState = 11;
-				break;
-			}
-			case 11: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				stateStack.Push(12);
-				goto case 205;
-			}
-			case 12: {
-				PopContext();
-				goto case 13;
-			}
-			case 13: {
-				if (la == null) { currentState = 13; break; }
-				if (la.kind == 37) {
-					currentState = 726;
-					break;
-				} else {
-					goto case 14;
-				}
-			}
-			case 14: {
-				stateStack.Push(15);
-				goto case 23;
-			}
-			case 15: {
-				isMissingModifier = true;
-				goto case 16;
-			}
-			case 16: {
-				if (la == null) { currentState = 16; break; }
-				if (la.kind == 140) {
-					currentState = 721;
-					break;
-				} else {
-					goto case 17;
-				}
-			}
-			case 17: {
-				isMissingModifier = true;
-				goto case 18;
-			}
-			case 18: {
-				if (la == null) { currentState = 18; break; }
-				if (set[10].Get(la.kind)) {
-					goto case 26;
-				} else {
-					isMissingModifier = false;
-					goto case 19;
-				}
-			}
-			case 19: {
-				if (la == null) { currentState = 19; break; }
-				Expect(113, la); // "End"
-				currentState = 20;
-				break;
-			}
-			case 20: {
-				if (la == null) { currentState = 20; break; }
-				Expect(142, la); // "Interface"
-				currentState = 21;
-				break;
-			}
-			case 21: {
-				stateStack.Push(22);
-				goto case 23;
-			}
-			case 22: {
-				PopContext();
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 23: {
-				if (la != null) CurrentBlock.lastExpressionStart = la.Location;
-				goto case 24;
-			}
-			case 24: {
-				if (la == null) { currentState = 24; break; }
-				if (la.kind == 1) {
-					goto case 25;
-				} else {
-					if (la.kind == 21) {
-						currentState = stateStack.Pop();
-						break;
-					} else {
-						goto case 6;
-					}
-				}
-			}
-			case 25: {
-				if (la == null) { currentState = 25; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 26: {
-				isMissingModifier = true;
-				goto case 27;
-			}
-			case 27: {
-				if (la == null) { currentState = 27; break; }
-				if (la.kind == 40) {
-					stateStack.Push(26);
-					goto case 443;
-				} else {
-					isMissingModifier = true;
-					goto case 28;
-				}
-			}
-			case 28: {
-				if (la == null) { currentState = 28; break; }
-				if (set[133].Get(la.kind)) {
-					currentState = 720;
-					break;
-				} else {
-					isMissingModifier = false;
-					goto case 29;
-				}
-			}
-			case 29: {
-				if (la == null) { currentState = 29; break; }
-				if (la.kind == 84 || la.kind == 155 || la.kind == 209) {
-					stateStack.Push(17);
-					goto case 563;
-				} else {
-					if (la.kind == 103) {
-						stateStack.Push(17);
-						goto case 551;
-					} else {
-						if (la.kind == 115) {
-							stateStack.Push(17);
-							goto case 533;
-						} else {
-							if (la.kind == 142) {
-								stateStack.Push(17);
-								goto case 9;
-							} else {
-								if (set[13].Get(la.kind)) {
-									stateStack.Push(17);
-									goto case 30;
-								} else {
-									Error(la);
-									goto case 17;
-								}
-							}
-						}
-					}
-				}
-			}
-			case 30: {
-				if (la == null) { currentState = 30; break; }
-				if (la.kind == 119) {
-					currentState = 527;
-					break;
-				} else {
-					if (la.kind == 186) {
-						currentState = 520;
-						break;
-					} else {
-						if (la.kind == 127 || la.kind == 210) {
-							currentState = 31;
-							break;
-						} else {
-							goto case 6;
-						}
-					}
-				}
-			}
-			case 31: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				goto case 32;
-			}
-			case 32: {
-				if (la == null) { currentState = 32; break; }
-				currentState = 33;
-				break;
-			}
-			case 33: {
-				PopContext();
-				goto case 34;
-			}
-			case 34: {
-				if (la == null) { currentState = 34; break; }
-				if (la.kind == 37) {
-					currentState = 496;
-					break;
-				} else {
-					if (la.kind == 63) {
-						currentState = 35;
-						break;
-					} else {
-						goto case 23;
-					}
-				}
-			}
-			case 35: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(36);
-				goto case 37;
-			}
-			case 36: {
-				PopContext();
-				goto case 23;
-			}
-			case 37: {
-				if (la == null) { currentState = 37; break; }
-				if (la.kind == 130) {
-					currentState = 38;
-					break;
-				} else {
-					if (set[6].Get(la.kind)) {
-						currentState = 38;
-						break;
-					} else {
-						if (set[134].Get(la.kind)) {
-							currentState = 38;
-							break;
-						} else {
-							if (la.kind == 33) {
-								currentState = 38;
-								break;
-							} else {
-								Error(la);
-								goto case 38;
-							}
-						}
-					}
-				}
-			}
-			case 38: {
-				if (la == null) { currentState = 38; break; }
-				if (la.kind == 37) {
-					stateStack.Push(38);
-					goto case 42;
-				} else {
-					goto case 39;
-				}
-			}
-			case 39: {
-				if (la == null) { currentState = 39; break; }
-				if (la.kind == 26) {
-					currentState = 40;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 40: {
-				stateStack.Push(41);
-				goto case 101;
-			}
-			case 41: {
-				if (la == null) { currentState = 41; break; }
-				if (la.kind == 37) {
-					stateStack.Push(41);
-					goto case 42;
-				} else {
-					goto case 39;
-				}
-			}
-			case 42: {
-				if (la == null) { currentState = 42; break; }
-				Expect(37, la); // "("
-				currentState = 43;
-				break;
-			}
-			case 43: {
-				PushContext(Context.Expression, la, t);
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 44;
-			}
-			case 44: {
-				if (la == null) { currentState = 44; break; }
-				if (la.kind == 169) {
-					currentState = 491;
-					break;
-				} else {
-					if (set[22].Get(la.kind)) {
-						if (set[21].Get(la.kind)) {
-							stateStack.Push(45);
-							goto case 47;
-						} else {
-							goto case 45;
-						}
-					} else {
-						Error(la);
-						goto case 45;
-					}
-				}
-			}
-			case 45: {
-				PopContext();
-				goto case 46;
-			}
-			case 46: {
-				if (la == null) { currentState = 46; break; }
-				Expect(38, la); // ")"
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 47: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 48;
-			}
-			case 48: {
-				if (la == null) { currentState = 48; break; }
-				if (set[23].Get(la.kind)) {
-					activeArgument = 0;
-					goto case 487;
-				} else {
-					if (la.kind == 22) {
-						activeArgument = 0;
-						goto case 49;
-					} else {
-						goto case 6;
-					}
-				}
-			}
-			case 49: {
-				if (la == null) { currentState = 49; break; }
-				Expect(22, la); // ","
-				currentState = 50;
-				break;
-			}
-			case 50: {
-				activeArgument++;
-				goto case 51;
-			}
-			case 51: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 52;
-			}
-			case 52: {
-				if (la == null) { currentState = 52; break; }
-				if (set[23].Get(la.kind)) {
-					stateStack.Push(53);
-					goto case 55;
-				} else {
-					goto case 53;
-				}
-			}
-			case 53: {
-				if (la == null) { currentState = 53; break; }
-				if (la.kind == 22) {
-					currentState = 54;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 54: {
-				activeArgument++;
-				goto case 51;
-			}
-			case 55: {
-				PushContext(Context.Expression, la, t);
-				goto case 56;
-			}
-			case 56: {
-				stateStack.Push(57);
-				goto case 75;
-			}
-			case 57: {
-				if (la == null) { currentState = 57; break; }
-				if (set[25].Get(la.kind)) {
-					stateStack.Push(56);
-					goto case 58;
-				} else {
-					PopContext();
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 58: {
-				if (la == null) { currentState = 58; break; }
-				if (la.kind == 31) {
-					currentState = stateStack.Pop();
-					break;
-				} else {
-					if (la.kind == 30) {
-						currentState = stateStack.Pop();
-						break;
-					} else {
-						if (la.kind == 34) {
-							currentState = stateStack.Pop();
-							break;
-						} else {
-							if (la.kind == 25) {
-								currentState = stateStack.Pop();
-								break;
-							} else {
-								if (la.kind == 24) {
-									currentState = stateStack.Pop();
-									break;
-								} else {
-									if (la.kind == 32) {
-										currentState = stateStack.Pop();
-										break;
-									} else {
-										if (la.kind == 154) {
-											goto case 74;
-										} else {
-											if (la.kind == 20) {
-												goto case 73;
-											} else {
-												if (la.kind == 41) {
-													goto case 72;
-												} else {
-													if (la.kind == 40) {
-														goto case 71;
-													} else {
-														if (la.kind == 39) {
-															currentState = 70;
-															break;
-														} else {
-															if (la.kind == 43) {
-																goto case 69;
-															} else {
-																if (la.kind == 42) {
-																	goto case 68;
-																} else {
-																	if (la.kind == 150) {
-																		goto case 67;
-																	} else {
-																		if (la.kind == 23) {
-																			currentState = stateStack.Pop();
-																			break;
-																		} else {
-																			if (la.kind == 60) {
-																				goto case 66;
-																			} else {
-																				if (la.kind == 61) {
-																					goto case 65;
-																				} else {
-																					if (la.kind == 175) {
-																						goto case 64;
-																					} else {
-																						if (la.kind == 177) {
-																							goto case 63;
-																						} else {
-																							if (la.kind == 236) {
-																								goto case 62;
-																							} else {
-																								if (la.kind == 44) {
-																									currentState = stateStack.Pop();
-																									break;
-																								} else {
-																									if (la.kind == 45) {
-																										currentState = stateStack.Pop();
-																										break;
-																									} else {
-																										if (la.kind == 144) {
-																											goto case 61;
-																										} else {
-																											if (la.kind == 145) {
-																												goto case 60;
-																											} else {
-																												if (la.kind == 47) {
-																													currentState = stateStack.Pop();
-																													break;
-																												} else {
-																													if (la.kind == 49) {
-																														currentState = stateStack.Pop();
-																														break;
-																													} else {
-																														if (la.kind == 50) {
-																															currentState = stateStack.Pop();
-																															break;
-																														} else {
-																															if (la.kind == 51) {
-																																currentState = stateStack.Pop();
-																																break;
-																															} else {
-																																if (la.kind == 46) {
-																																	currentState = stateStack.Pop();
-																																	break;
-																																} else {
-																																	if (la.kind == 48) {
-																																		currentState = stateStack.Pop();
-																																		break;
-																																	} else {
-																																		if (la.kind == 54) {
-																																			currentState = stateStack.Pop();
-																																			break;
-																																		} else {
-																																			if (la.kind == 52) {
-																																				currentState = stateStack.Pop();
-																																				break;
-																																			} else {
-																																				if (la.kind == 53) {
-																																					currentState = stateStack.Pop();
-																																					break;
-																																				} else {
-																																					if (la.kind == 216) {
-																																						goto case 59;
-																																					} else {
-																																						if (la.kind == 55) {
-																																							currentState = stateStack.Pop();
-																																							break;
-																																						} else {
-																																							goto case 6;
-																																						}
-																																					}
-																																				}
-																																			}
-																																		}
-																																	}
-																																}
-																															}
-																														}
-																													}
-																												}
-																											}
-																										}
-																									}
-																								}
-																							}
-																						}
-																					}
-																				}
-																			}
-																		}
-																	}
-																}
-															}
-														}
-													}
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			case 59: {
-				if (la == null) { currentState = 59; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 60: {
-				if (la == null) { currentState = 60; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 61: {
-				if (la == null) { currentState = 61; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 62: {
-				if (la == null) { currentState = 62; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 63: {
-				if (la == null) { currentState = 63; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 64: {
-				if (la == null) { currentState = 64; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 65: {
-				if (la == null) { currentState = 65; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 66: {
-				if (la == null) { currentState = 66; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 67: {
-				if (la == null) { currentState = 67; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 68: {
-				if (la == null) { currentState = 68; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 69: {
-				if (la == null) { currentState = 69; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 70: {
-				wasNormalAttribute = false;
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 71: {
-				if (la == null) { currentState = 71; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 72: {
-				if (la == null) { currentState = 72; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 73: {
-				if (la == null) { currentState = 73; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 74: {
-				if (la == null) { currentState = 74; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 75: {
-				PushContext(Context.Expression, la, t);
-				goto case 76;
-			}
-			case 76: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 77;
-			}
-			case 77: {
-				if (la == null) { currentState = 77; break; }
-				if (set[135].Get(la.kind)) {
-					currentState = 76;
-					break;
-				} else {
-					if (set[35].Get(la.kind)) {
-						stateStack.Push(159);
-						goto case 173;
-					} else {
-						if (la.kind == 220) {
-							currentState = 155;
-							break;
-						} else {
-							if (la.kind == 162) {
-								stateStack.Push(78);
-								goto case 85;
-							} else {
-								if (la.kind == 35) {
-									stateStack.Push(78);
-									goto case 79;
-								} else {
-									Error(la);
-									goto case 78;
-								}
-							}
-						}
-					}
-				}
-			}
-			case 78: {
-				PopContext();
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 79: {
-				if (la == null) { currentState = 79; break; }
-				Expect(35, la); // "{"
-				currentState = 80;
-				break;
-			}
-			case 80: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 81;
-			}
-			case 81: {
-				if (la == null) { currentState = 81; break; }
-				if (set[23].Get(la.kind)) {
-					goto case 83;
-				} else {
-					goto case 82;
-				}
-			}
-			case 82: {
-				if (la == null) { currentState = 82; break; }
-				Expect(36, la); // "}"
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 83: {
-				stateStack.Push(84);
-				goto case 55;
-			}
-			case 84: {
-				if (la == null) { currentState = 84; break; }
-				if (la.kind == 22) {
-					currentState = 83;
-					break;
-				} else {
-					goto case 82;
-				}
-			}
-			case 85: {
-				if (la == null) { currentState = 85; break; }
-				Expect(162, la); // "New"
-				currentState = 86;
-				break;
-			}
-			case 86: {
-				PushContext(Context.ObjectCreation, la, t);
-				goto case 87;
-			}
-			case 87: {
-				if (la == null) { currentState = 87; break; }
-				if (set[16].Get(la.kind)) {
-					stateStack.Push(146);
-					goto case 37;
-				} else {
-					if (la.kind == 233) {
-						PushContext(Context.ObjectInitializer, la, t);
-						goto case 90;
-					} else {
-						goto case 88;
-					}
-				}
-			}
-			case 88: {
-				Error(la);
-				goto case 89;
-			}
-			case 89: {
-				PopContext();
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 90: {
-				if (la == null) { currentState = 90; break; }
-				Expect(233, la); // "With"
-				currentState = 91;
-				break;
-			}
-			case 91: {
-				stateStack.Push(92);
-				goto case 93;
-			}
-			case 92: {
-				PopContext();
-				goto case 89;
-			}
-			case 93: {
-				if (la == null) { currentState = 93; break; }
-				Expect(35, la); // "{"
-				currentState = 94;
-				break;
-			}
-			case 94: {
-				if (la == null) { currentState = 94; break; }
-				if (la.kind == 26 || la.kind == 147) {
-					goto case 95;
-				} else {
-					goto case 82;
-				}
-			}
-			case 95: {
-				if (la == null) { currentState = 95; break; }
-				if (la.kind == 147) {
-					currentState = 96;
-					break;
-				} else {
-					goto case 96;
-				}
-			}
-			case 96: {
-				if (la == null) { currentState = 96; break; }
-				Expect(26, la); // "."
-				currentState = 97;
-				break;
-			}
-			case 97: {
-				stateStack.Push(98);
-				goto case 101;
-			}
-			case 98: {
-				if (la == null) { currentState = 98; break; }
-				Expect(20, la); // "="
-				currentState = 99;
-				break;
-			}
-			case 99: {
-				stateStack.Push(100);
-				goto case 55;
-			}
-			case 100: {
-				if (la == null) { currentState = 100; break; }
-				if (la.kind == 22) {
-					currentState = 95;
-					break;
-				} else {
-					goto case 82;
-				}
-			}
-			case 101: {
-				if (la == null) { currentState = 101; break; }
-				if (la.kind == 2) {
-					goto case 145;
-				} else {
-					if (la.kind == 56) {
-						currentState = stateStack.Pop();
-						break;
-					} else {
-						if (la.kind == 57) {
-							currentState = stateStack.Pop();
-							break;
-						} else {
-							if (la.kind == 58) {
-								goto case 144;
-							} else {
-								if (la.kind == 59) {
-									currentState = stateStack.Pop();
-									break;
-								} else {
-									if (la.kind == 60) {
-										goto case 66;
-									} else {
-										if (la.kind == 61) {
-											goto case 65;
-										} else {
-											if (la.kind == 62) {
-												goto case 143;
-											} else {
-												if (la.kind == 63) {
-													currentState = stateStack.Pop();
-													break;
-												} else {
-													if (la.kind == 64) {
-														goto case 142;
-													} else {
-														if (la.kind == 65) {
-															goto case 141;
-														} else {
-															if (la.kind == 66) {
-																goto case 140;
-															} else {
-																if (la.kind == 67) {
-																	goto case 139;
-																} else {
-																	if (la.kind == 68) {
-																		currentState = stateStack.Pop();
-																		break;
-																	} else {
-																		if (la.kind == 69) {
-																			currentState = stateStack.Pop();
-																			break;
-																		} else {
-																			if (la.kind == 70) {
-																				goto case 138;
-																			} else {
-																				if (la.kind == 71) {
-																					currentState = stateStack.Pop();
-																					break;
-																				} else {
-																					if (la.kind == 72) {
-																						currentState = stateStack.Pop();
-																						break;
-																					} else {
-																						if (la.kind == 73) {
-																							currentState = stateStack.Pop();
-																							break;
-																						} else {
-																							if (la.kind == 74) {
-																								currentState = stateStack.Pop();
-																								break;
-																							} else {
-																								if (la.kind == 75) {
-																									currentState = stateStack.Pop();
-																									break;
-																								} else {
-																									if (la.kind == 76) {
-																										currentState = stateStack.Pop();
-																										break;
-																									} else {
-																										if (la.kind == 77) {
-																											currentState = stateStack.Pop();
-																											break;
-																										} else {
-																											if (la.kind == 78) {
-																												currentState = stateStack.Pop();
-																												break;
-																											} else {
-																												if (la.kind == 79) {
-																													currentState = stateStack.Pop();
-																													break;
-																												} else {
-																													if (la.kind == 80) {
-																														currentState = stateStack.Pop();
-																														break;
-																													} else {
-																														if (la.kind == 81) {
-																															currentState = stateStack.Pop();
-																															break;
-																														} else {
-																															if (la.kind == 82) {
-																																currentState = stateStack.Pop();
-																																break;
-																															} else {
-																																if (la.kind == 83) {
-																																	currentState = stateStack.Pop();
-																																	break;
-																																} else {
-																																	if (la.kind == 84) {
-																																		goto case 137;
-																																	} else {
-																																		if (la.kind == 85) {
-																																			currentState = stateStack.Pop();
-																																			break;
-																																		} else {
-																																			if (la.kind == 86) {
-																																				currentState = stateStack.Pop();
-																																				break;
-																																			} else {
-																																				if (la.kind == 87) {
-																																					goto case 136;
-																																				} else {
-																																					if (la.kind == 88) {
-																																						currentState = stateStack.Pop();
-																																						break;
-																																					} else {
-																																						if (la.kind == 89) {
-																																							currentState = stateStack.Pop();
-																																							break;
-																																						} else {
-																																							if (la.kind == 90) {
-																																								currentState = stateStack.Pop();
-																																								break;
-																																							} else {
-																																								if (la.kind == 91) {
-																																									currentState = stateStack.Pop();
-																																									break;
-																																								} else {
-																																									if (la.kind == 92) {
-																																										currentState = stateStack.Pop();
-																																										break;
-																																									} else {
-																																										if (la.kind == 93) {
-																																											currentState = stateStack.Pop();
-																																											break;
-																																										} else {
-																																											if (la.kind == 94) {
-																																												currentState = stateStack.Pop();
-																																												break;
-																																											} else {
-																																												if (la.kind == 95) {
-																																													currentState = stateStack.Pop();
-																																													break;
-																																												} else {
-																																													if (la.kind == 96) {
-																																														currentState = stateStack.Pop();
-																																														break;
-																																													} else {
-																																														if (la.kind == 97) {
-																																															currentState = stateStack.Pop();
-																																															break;
-																																														} else {
-																																															if (la.kind == 98) {
-																																																goto case 135;
-																																															} else {
-																																																if (la.kind == 99) {
-																																																	currentState = stateStack.Pop();
-																																																	break;
-																																																} else {
-																																																	if (la.kind == 100) {
-																																																		currentState = stateStack.Pop();
-																																																		break;
-																																																	} else {
-																																																		if (la.kind == 101) {
-																																																			currentState = stateStack.Pop();
-																																																			break;
-																																																		} else {
-																																																			if (la.kind == 102) {
-																																																				currentState = stateStack.Pop();
-																																																				break;
-																																																			} else {
-																																																				if (la.kind == 103) {
-																																																					currentState = stateStack.Pop();
-																																																					break;
-																																																				} else {
-																																																					if (la.kind == 104) {
-																																																						goto case 134;
-																																																					} else {
-																																																						if (la.kind == 105) {
-																																																							currentState = stateStack.Pop();
-																																																							break;
-																																																						} else {
-																																																							if (la.kind == 106) {
-																																																								currentState = stateStack.Pop();
-																																																								break;
-																																																							} else {
-																																																								if (la.kind == 107) {
-																																																									goto case 133;
-																																																								} else {
-																																																									if (la.kind == 108) {
-																																																										goto case 132;
-																																																									} else {
-																																																										if (la.kind == 109) {
-																																																											currentState = stateStack.Pop();
-																																																											break;
-																																																										} else {
-																																																											if (la.kind == 110) {
-																																																												currentState = stateStack.Pop();
-																																																												break;
-																																																											} else {
-																																																												if (la.kind == 111) {
-																																																													currentState = stateStack.Pop();
-																																																													break;
-																																																												} else {
-																																																													if (la.kind == 112) {
-																																																														currentState = stateStack.Pop();
-																																																														break;
-																																																													} else {
-																																																														if (la.kind == 113) {
-																																																															currentState = stateStack.Pop();
-																																																															break;
-																																																														} else {
-																																																															if (la.kind == 114) {
-																																																																currentState = stateStack.Pop();
-																																																																break;
-																																																															} else {
-																																																																if (la.kind == 115) {
-																																																																	currentState = stateStack.Pop();
-																																																																	break;
-																																																																} else {
-																																																																	if (la.kind == 116) {
-																																																																		goto case 131;
-																																																																	} else {
-																																																																		if (la.kind == 117) {
-																																																																			currentState = stateStack.Pop();
-																																																																			break;
-																																																																		} else {
-																																																																			if (la.kind == 118) {
-																																																																				currentState = stateStack.Pop();
-																																																																				break;
-																																																																			} else {
-																																																																				if (la.kind == 119) {
-																																																																					currentState = stateStack.Pop();
-																																																																					break;
-																																																																				} else {
-																																																																					if (la.kind == 120) {
-																																																																						currentState = stateStack.Pop();
-																																																																						break;
-																																																																					} else {
-																																																																						if (la.kind == 121) {
-																																																																							goto case 130;
-																																																																						} else {
-																																																																							if (la.kind == 122) {
-																																																																								currentState = stateStack.Pop();
-																																																																								break;
-																																																																							} else {
-																																																																								if (la.kind == 123) {
-																																																																									currentState = stateStack.Pop();
-																																																																									break;
-																																																																								} else {
-																																																																									if (la.kind == 124) {
-																																																																										goto case 129;
-																																																																									} else {
-																																																																										if (la.kind == 125) {
-																																																																											currentState = stateStack.Pop();
-																																																																											break;
-																																																																										} else {
-																																																																											if (la.kind == 126) {
-																																																																												goto case 128;
-																																																																											} else {
-																																																																												if (la.kind == 127) {
-																																																																													goto case 127;
-																																																																												} else {
-																																																																													if (la.kind == 128) {
-																																																																														currentState = stateStack.Pop();
-																																																																														break;
-																																																																													} else {
-																																																																														if (la.kind == 129) {
-																																																																															currentState = stateStack.Pop();
-																																																																															break;
-																																																																														} else {
-																																																																															if (la.kind == 130) {
-																																																																																currentState = stateStack.Pop();
-																																																																																break;
-																																																																															} else {
-																																																																																if (la.kind == 131) {
-																																																																																	currentState = stateStack.Pop();
-																																																																																	break;
-																																																																																} else {
-																																																																																	if (la.kind == 132) {
-																																																																																		currentState = stateStack.Pop();
-																																																																																		break;
-																																																																																	} else {
-																																																																																		if (la.kind == 133) {
-																																																																																			goto case 126;
-																																																																																		} else {
-																																																																																			if (la.kind == 134) {
-																																																																																				currentState = stateStack.Pop();
-																																																																																				break;
-																																																																																			} else {
-																																																																																				if (la.kind == 135) {
-																																																																																					currentState = stateStack.Pop();
-																																																																																					break;
-																																																																																				} else {
-																																																																																					if (la.kind == 136) {
-																																																																																						currentState = stateStack.Pop();
-																																																																																						break;
-																																																																																					} else {
-																																																																																						if (la.kind == 137) {
-																																																																																							currentState = stateStack.Pop();
-																																																																																							break;
-																																																																																						} else {
-																																																																																							if (la.kind == 138) {
-																																																																																								currentState = stateStack.Pop();
-																																																																																								break;
-																																																																																							} else {
-																																																																																								if (la.kind == 139) {
-																																																																																									goto case 125;
-																																																																																								} else {
-																																																																																									if (la.kind == 140) {
-																																																																																										currentState = stateStack.Pop();
-																																																																																										break;
-																																																																																									} else {
-																																																																																										if (la.kind == 141) {
-																																																																																											currentState = stateStack.Pop();
-																																																																																											break;
-																																																																																										} else {
-																																																																																											if (la.kind == 142) {
-																																																																																												currentState = stateStack.Pop();
-																																																																																												break;
-																																																																																											} else {
-																																																																																												if (la.kind == 143) {
-																																																																																													goto case 124;
-																																																																																												} else {
-																																																																																													if (la.kind == 144) {
-																																																																																														goto case 61;
-																																																																																													} else {
-																																																																																														if (la.kind == 145) {
-																																																																																															goto case 60;
-																																																																																														} else {
-																																																																																															if (la.kind == 146) {
-																																																																																																goto case 123;
-																																																																																															} else {
-																																																																																																if (la.kind == 147) {
-																																																																																																	goto case 122;
-																																																																																																} else {
-																																																																																																	if (la.kind == 148) {
-																																																																																																		currentState = stateStack.Pop();
-																																																																																																		break;
-																																																																																																	} else {
-																																																																																																		if (la.kind == 149) {
-																																																																																																			currentState = stateStack.Pop();
-																																																																																																			break;
-																																																																																																		} else {
-																																																																																																			if (la.kind == 150) {
-																																																																																																				goto case 67;
-																																																																																																			} else {
-																																																																																																				if (la.kind == 151) {
-																																																																																																					currentState = stateStack.Pop();
-																																																																																																					break;
-																																																																																																				} else {
-																																																																																																					if (la.kind == 152) {
-																																																																																																						currentState = stateStack.Pop();
-																																																																																																						break;
-																																																																																																					} else {
-																																																																																																						if (la.kind == 153) {
-																																																																																																							currentState = stateStack.Pop();
-																																																																																																							break;
-																																																																																																						} else {
-																																																																																																							if (la.kind == 154) {
-																																																																																																								goto case 74;
-																																																																																																							} else {
-																																																																																																								if (la.kind == 155) {
-																																																																																																									currentState = stateStack.Pop();
-																																																																																																									break;
-																																																																																																								} else {
-																																																																																																									if (la.kind == 156) {
-																																																																																																										currentState = stateStack.Pop();
-																																																																																																										break;
-																																																																																																									} else {
-																																																																																																										if (la.kind == 157) {
-																																																																																																											currentState = stateStack.Pop();
-																																																																																																											break;
-																																																																																																										} else {
-																																																																																																											if (la.kind == 158) {
-																																																																																																												currentState = stateStack.Pop();
-																																																																																																												break;
-																																																																																																											} else {
-																																																																																																												if (la.kind == 159) {
-																																																																																																													currentState = stateStack.Pop();
-																																																																																																													break;
-																																																																																																												} else {
-																																																																																																													if (la.kind == 160) {
-																																																																																																														currentState = stateStack.Pop();
-																																																																																																														break;
-																																																																																																													} else {
-																																																																																																														if (la.kind == 161) {
-																																																																																																															currentState = stateStack.Pop();
-																																																																																																															break;
-																																																																																																														} else {
-																																																																																																															if (la.kind == 162) {
-																																																																																																																goto case 121;
-																																																																																																															} else {
-																																																																																																																if (la.kind == 163) {
-																																																																																																																	goto case 120;
-																																																																																																																} else {
-																																																																																																																	if (la.kind == 164) {
-																																																																																																																		currentState = stateStack.Pop();
-																																																																																																																		break;
-																																																																																																																	} else {
-																																																																																																																		if (la.kind == 165) {
-																																																																																																																			currentState = stateStack.Pop();
-																																																																																																																			break;
-																																																																																																																		} else {
-																																																																																																																			if (la.kind == 166) {
-																																																																																																																				currentState = stateStack.Pop();
-																																																																																																																				break;
-																																																																																																																			} else {
-																																																																																																																				if (la.kind == 167) {
-																																																																																																																					currentState = stateStack.Pop();
-																																																																																																																					break;
-																																																																																																																				} else {
-																																																																																																																					if (la.kind == 168) {
-																																																																																																																						currentState = stateStack.Pop();
-																																																																																																																						break;
-																																																																																																																					} else {
-																																																																																																																						if (la.kind == 169) {
-																																																																																																																							currentState = stateStack.Pop();
-																																																																																																																							break;
-																																																																																																																						} else {
-																																																																																																																							if (la.kind == 170) {
-																																																																																																																								goto case 119;
-																																																																																																																							} else {
-																																																																																																																								if (la.kind == 171) {
-																																																																																																																									currentState = stateStack.Pop();
-																																																																																																																									break;
-																																																																																																																								} else {
-																																																																																																																									if (la.kind == 172) {
-																																																																																																																										currentState = stateStack.Pop();
-																																																																																																																										break;
-																																																																																																																									} else {
-																																																																																																																										if (la.kind == 173) {
-																																																																																																																											currentState = stateStack.Pop();
-																																																																																																																											break;
-																																																																																																																										} else {
-																																																																																																																											if (la.kind == 174) {
-																																																																																																																												currentState = stateStack.Pop();
-																																																																																																																												break;
-																																																																																																																											} else {
-																																																																																																																												if (la.kind == 175) {
-																																																																																																																													goto case 64;
-																																																																																																																												} else {
-																																																																																																																													if (la.kind == 176) {
-																																																																																																																														goto case 118;
-																																																																																																																													} else {
-																																																																																																																														if (la.kind == 177) {
-																																																																																																																															goto case 63;
-																																																																																																																														} else {
-																																																																																																																															if (la.kind == 178) {
-																																																																																																																																currentState = stateStack.Pop();
-																																																																																																																																break;
-																																																																																																																															} else {
-																																																																																																																																if (la.kind == 179) {
-																																																																																																																																	currentState = stateStack.Pop();
-																																																																																																																																	break;
-																																																																																																																																} else {
-																																																																																																																																	if (la.kind == 180) {
-																																																																																																																																		currentState = stateStack.Pop();
-																																																																																																																																		break;
-																																																																																																																																	} else {
-																																																																																																																																		if (la.kind == 181) {
-																																																																																																																																			currentState = stateStack.Pop();
-																																																																																																																																			break;
-																																																																																																																																		} else {
-																																																																																																																																			if (la.kind == 182) {
-																																																																																																																																				currentState = stateStack.Pop();
-																																																																																																																																				break;
-																																																																																																																																			} else {
-																																																																																																																																				if (la.kind == 183) {
-																																																																																																																																					currentState = stateStack.Pop();
-																																																																																																																																					break;
-																																																																																																																																				} else {
-																																																																																																																																					if (la.kind == 184) {
-																																																																																																																																						goto case 117;
-																																																																																																																																					} else {
-																																																																																																																																						if (la.kind == 185) {
-																																																																																																																																							currentState = stateStack.Pop();
-																																																																																																																																							break;
-																																																																																																																																						} else {
-																																																																																																																																							if (la.kind == 186) {
-																																																																																																																																								goto case 116;
-																																																																																																																																							} else {
-																																																																																																																																								if (la.kind == 187) {
-																																																																																																																																									currentState = stateStack.Pop();
-																																																																																																																																									break;
-																																																																																																																																								} else {
-																																																																																																																																									if (la.kind == 188) {
-																																																																																																																																										currentState = stateStack.Pop();
-																																																																																																																																										break;
-																																																																																																																																									} else {
-																																																																																																																																										if (la.kind == 189) {
-																																																																																																																																											currentState = stateStack.Pop();
-																																																																																																																																											break;
-																																																																																																																																										} else {
-																																																																																																																																											if (la.kind == 190) {
-																																																																																																																																												currentState = stateStack.Pop();
-																																																																																																																																												break;
-																																																																																																																																											} else {
-																																																																																																																																												if (la.kind == 191) {
-																																																																																																																																													currentState = stateStack.Pop();
-																																																																																																																																													break;
-																																																																																																																																												} else {
-																																																																																																																																													if (la.kind == 192) {
-																																																																																																																																														currentState = stateStack.Pop();
-																																																																																																																																														break;
-																																																																																																																																													} else {
-																																																																																																																																														if (la.kind == 193) {
-																																																																																																																																															currentState = stateStack.Pop();
-																																																																																																																																															break;
-																																																																																																																																														} else {
-																																																																																																																																															if (la.kind == 194) {
-																																																																																																																																																currentState = stateStack.Pop();
-																																																																																																																																																break;
-																																																																																																																																															} else {
-																																																																																																																																																if (la.kind == 195) {
-																																																																																																																																																	currentState = stateStack.Pop();
-																																																																																																																																																	break;
-																																																																																																																																																} else {
-																																																																																																																																																	if (la.kind == 196) {
-																																																																																																																																																		currentState = stateStack.Pop();
-																																																																																																																																																		break;
-																																																																																																																																																	} else {
-																																																																																																																																																		if (la.kind == 197) {
-																																																																																																																																																			goto case 115;
-																																																																																																																																																		} else {
-																																																																																																																																																			if (la.kind == 198) {
-																																																																																																																																																				currentState = stateStack.Pop();
-																																																																																																																																																				break;
-																																																																																																																																																			} else {
-																																																																																																																																																				if (la.kind == 199) {
-																																																																																																																																																					currentState = stateStack.Pop();
-																																																																																																																																																					break;
-																																																																																																																																																				} else {
-																																																																																																																																																					if (la.kind == 200) {
-																																																																																																																																																						currentState = stateStack.Pop();
-																																																																																																																																																						break;
-																																																																																																																																																					} else {
-																																																																																																																																																						if (la.kind == 201) {
-																																																																																																																																																							currentState = stateStack.Pop();
-																																																																																																																																																							break;
-																																																																																																																																																						} else {
-																																																																																																																																																							if (la.kind == 202) {
-																																																																																																																																																								currentState = stateStack.Pop();
-																																																																																																																																																								break;
-																																																																																																																																																							} else {
-																																																																																																																																																								if (la.kind == 203) {
-																																																																																																																																																									goto case 114;
-																																																																																																																																																								} else {
-																																																																																																																																																									if (la.kind == 204) {
-																																																																																																																																																										currentState = stateStack.Pop();
-																																																																																																																																																										break;
-																																																																																																																																																									} else {
-																																																																																																																																																										if (la.kind == 205) {
-																																																																																																																																																											currentState = stateStack.Pop();
-																																																																																																																																																											break;
-																																																																																																																																																										} else {
-																																																																																																																																																											if (la.kind == 206) {
-																																																																																																																																																												goto case 113;
-																																																																																																																																																											} else {
-																																																																																																																																																												if (la.kind == 207) {
-																																																																																																																																																													currentState = stateStack.Pop();
-																																																																																																																																																													break;
-																																																																																																																																																												} else {
-																																																																																																																																																													if (la.kind == 208) {
-																																																																																																																																																														currentState = stateStack.Pop();
-																																																																																																																																																														break;
-																																																																																																																																																													} else {
-																																																																																																																																																														if (la.kind == 209) {
-																																																																																																																																																															goto case 112;
-																																																																																																																																																														} else {
-																																																																																																																																																															if (la.kind == 210) {
-																																																																																																																																																																goto case 111;
-																																																																																																																																																															} else {
-																																																																																																																																																																if (la.kind == 211) {
-																																																																																																																																																																	goto case 110;
-																																																																																																																																																																} else {
-																																																																																																																																																																	if (la.kind == 212) {
-																																																																																																																																																																		goto case 109;
-																																																																																																																																																																	} else {
-																																																																																																																																																																		if (la.kind == 213) {
-																																																																																																																																																																			goto case 108;
-																																																																																																																																																																		} else {
-																																																																																																																																																																			if (la.kind == 214) {
-																																																																																																																																																																				currentState = stateStack.Pop();
-																																																																																																																																																																				break;
-																																																																																																																																																																			} else {
-																																																																																																																																																																				if (la.kind == 215) {
-																																																																																																																																																																					currentState = stateStack.Pop();
-																																																																																																																																																																					break;
-																																																																																																																																																																				} else {
-																																																																																																																																																																					if (la.kind == 216) {
-																																																																																																																																																																						goto case 59;
-																																																																																																																																																																					} else {
-																																																																																																																																																																						if (la.kind == 217) {
-																																																																																																																																																																							currentState = stateStack.Pop();
-																																																																																																																																																																							break;
-																																																																																																																																																																						} else {
-																																																																																																																																																																							if (la.kind == 218) {
-																																																																																																																																																																								goto case 107;
-																																																																																																																																																																							} else {
-																																																																																																																																																																								if (la.kind == 219) {
-																																																																																																																																																																									currentState = stateStack.Pop();
-																																																																																																																																																																									break;
-																																																																																																																																																																								} else {
-																																																																																																																																																																									if (la.kind == 220) {
-																																																																																																																																																																										currentState = stateStack.Pop();
-																																																																																																																																																																										break;
-																																																																																																																																																																									} else {
-																																																																																																																																																																										if (la.kind == 221) {
-																																																																																																																																																																											currentState = stateStack.Pop();
-																																																																																																																																																																											break;
-																																																																																																																																																																										} else {
-																																																																																																																																																																											if (la.kind == 222) {
-																																																																																																																																																																												currentState = stateStack.Pop();
-																																																																																																																																																																												break;
-																																																																																																																																																																											} else {
-																																																																																																																																																																												if (la.kind == 223) {
-																																																																																																																																																																													goto case 106;
-																																																																																																																																																																												} else {
-																																																																																																																																																																													if (la.kind == 224) {
-																																																																																																																																																																														goto case 105;
-																																																																																																																																																																													} else {
-																																																																																																																																																																														if (la.kind == 225) {
-																																																																																																																																																																															currentState = stateStack.Pop();
-																																																																																																																																																																															break;
-																																																																																																																																																																														} else {
-																																																																																																																																																																															if (la.kind == 226) {
-																																																																																																																																																																																currentState = stateStack.Pop();
-																																																																																																																																																																																break;
-																																																																																																																																																																															} else {
-																																																																																																																																																																																if (la.kind == 227) {
-																																																																																																																																																																																	currentState = stateStack.Pop();
-																																																																																																																																																																																	break;
-																																																																																																																																																																																} else {
-																																																																																																																																																																																	if (la.kind == 228) {
-																																																																																																																																																																																		currentState = stateStack.Pop();
-																																																																																																																																																																																		break;
-																																																																																																																																																																																	} else {
-																																																																																																																																																																																		if (la.kind == 229) {
-																																																																																																																																																																																			currentState = stateStack.Pop();
-																																																																																																																																																																																			break;
-																																																																																																																																																																																		} else {
-																																																																																																																																																																																			if (la.kind == 230) {
-																																																																																																																																																																																				goto case 104;
-																																																																																																																																																																																			} else {
-																																																																																																																																																																																				if (la.kind == 231) {
-																																																																																																																																																																																					goto case 103;
-																																																																																																																																																																																				} else {
-																																																																																																																																																																																					if (la.kind == 232) {
-																																																																																																																																																																																						currentState = stateStack.Pop();
-																																																																																																																																																																																						break;
-																																																																																																																																																																																					} else {
-																																																																																																																																																																																						if (la.kind == 233) {
-																																																																																																																																																																																							goto case 102;
-																																																																																																																																																																																						} else {
-																																																																																																																																																																																							if (la.kind == 234) {
-																																																																																																																																																																																								currentState = stateStack.Pop();
-																																																																																																																																																																																								break;
-																																																																																																																																																																																							} else {
-																																																																																																																																																																																								if (la.kind == 235) {
-																																																																																																																																																																																									currentState = stateStack.Pop();
-																																																																																																																																																																																									break;
-																																																																																																																																																																																								} else {
-																																																																																																																																																																																									if (la.kind == 236) {
-																																																																																																																																																																																										goto case 62;
-																																																																																																																																																																																									} else {
-																																																																																																																																																																																										if (la.kind == 237) {
-																																																																																																																																																																																											currentState = stateStack.Pop();
-																																																																																																																																																																																											break;
-																																																																																																																																																																																										} else {
-																																																																																																																																																																																											goto case 6;
-																																																																																																																																																																																										}
-																																																																																																																																																																																									}
-																																																																																																																																																																																								}
-																																																																																																																																																																																							}
-																																																																																																																																																																																						}
-																																																																																																																																																																																					}
-																																																																																																																																																																																				}
-																																																																																																																																																																																			}
-																																																																																																																																																																																		}
-																																																																																																																																																																																	}
-																																																																																																																																																																																}
-																																																																																																																																																																															}
-																																																																																																																																																																														}
-																																																																																																																																																																													}
-																																																																																																																																																																												}
-																																																																																																																																																																											}
-																																																																																																																																																																										}
-																																																																																																																																																																									}
-																																																																																																																																																																								}
-																																																																																																																																																																							}
-																																																																																																																																																																						}
-																																																																																																																																																																					}
-																																																																																																																																																																				}
-																																																																																																																																																																			}
-																																																																																																																																																																		}
-																																																																																																																																																																	}
-																																																																																																																																																																}
-																																																																																																																																																															}
-																																																																																																																																																														}
-																																																																																																																																																													}
-																																																																																																																																																												}
-																																																																																																																																																											}
-																																																																																																																																																										}
-																																																																																																																																																									}
-																																																																																																																																																								}
-																																																																																																																																																							}
-																																																																																																																																																						}
-																																																																																																																																																					}
-																																																																																																																																																				}
-																																																																																																																																																			}
-																																																																																																																																																		}
-																																																																																																																																																	}
-																																																																																																																																																}
-																																																																																																																																															}
-																																																																																																																																														}
-																																																																																																																																													}
-																																																																																																																																												}
-																																																																																																																																											}
-																																																																																																																																										}
-																																																																																																																																									}
-																																																																																																																																								}
-																																																																																																																																							}
-																																																																																																																																						}
-																																																																																																																																					}
-																																																																																																																																				}
-																																																																																																																																			}
-																																																																																																																																		}
-																																																																																																																																	}
-																																																																																																																																}
-																																																																																																																															}
-																																																																																																																														}
-																																																																																																																													}
-																																																																																																																												}
-																																																																																																																											}
-																																																																																																																										}
-																																																																																																																									}
-																																																																																																																								}
-																																																																																																																							}
-																																																																																																																						}
-																																																																																																																					}
-																																																																																																																				}
-																																																																																																																			}
-																																																																																																																		}
-																																																																																																																	}
-																																																																																																																}
-																																																																																																															}
-																																																																																																														}
-																																																																																																													}
-																																																																																																												}
-																																																																																																											}
-																																																																																																										}
-																																																																																																									}
-																																																																																																								}
-																																																																																																							}
-																																																																																																						}
-																																																																																																					}
-																																																																																																				}
-																																																																																																			}
-																																																																																																		}
-																																																																																																	}
-																																																																																																}
-																																																																																															}
-																																																																																														}
-																																																																																													}
-																																																																																												}
-																																																																																											}
-																																																																																										}
-																																																																																									}
-																																																																																								}
-																																																																																							}
-																																																																																						}
-																																																																																					}
-																																																																																				}
-																																																																																			}
-																																																																																		}
-																																																																																	}
-																																																																																}
-																																																																															}
-																																																																														}
-																																																																													}
-																																																																												}
-																																																																											}
-																																																																										}
-																																																																									}
-																																																																								}
-																																																																							}
-																																																																						}
-																																																																					}
-																																																																				}
-																																																																			}
-																																																																		}
-																																																																	}
-																																																																}
-																																																															}
-																																																														}
-																																																													}
-																																																												}
-																																																											}
-																																																										}
-																																																									}
-																																																								}
-																																																							}
-																																																						}
-																																																					}
-																																																				}
-																																																			}
-																																																		}
-																																																	}
-																																																}
-																																															}
-																																														}
-																																													}
-																																												}
-																																											}
-																																										}
-																																									}
-																																								}
-																																							}
-																																						}
-																																					}
-																																				}
-																																			}
-																																		}
-																																	}
-																																}
-																															}
-																														}
-																													}
-																												}
-																											}
-																										}
-																									}
-																								}
-																							}
-																						}
-																					}
-																				}
-																			}
-																		}
-																	}
-																}
-															}
-														}
-													}
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			case 102: {
-				if (la == null) { currentState = 102; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 103: {
-				if (la == null) { currentState = 103; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 104: {
-				if (la == null) { currentState = 104; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 105: {
-				if (la == null) { currentState = 105; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 106: {
-				if (la == null) { currentState = 106; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 107: {
-				if (la == null) { currentState = 107; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 108: {
-				if (la == null) { currentState = 108; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 109: {
-				if (la == null) { currentState = 109; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 110: {
-				if (la == null) { currentState = 110; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 111: {
-				if (la == null) { currentState = 111; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 112: {
-				if (la == null) { currentState = 112; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 113: {
-				if (la == null) { currentState = 113; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 114: {
-				if (la == null) { currentState = 114; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 115: {
-				if (la == null) { currentState = 115; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 116: {
-				if (la == null) { currentState = 116; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 117: {
-				if (la == null) { currentState = 117; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 118: {
-				if (la == null) { currentState = 118; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 119: {
-				if (la == null) { currentState = 119; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 120: {
-				if (la == null) { currentState = 120; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 121: {
-				if (la == null) { currentState = 121; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 122: {
-				if (la == null) { currentState = 122; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 123: {
-				if (la == null) { currentState = 123; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 124: {
-				if (la == null) { currentState = 124; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 125: {
-				if (la == null) { currentState = 125; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 126: {
-				if (la == null) { currentState = 126; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 127: {
-				if (la == null) { currentState = 127; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 128: {
-				if (la == null) { currentState = 128; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 129: {
-				if (la == null) { currentState = 129; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 130: {
-				if (la == null) { currentState = 130; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 131: {
-				if (la == null) { currentState = 131; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 132: {
-				if (la == null) { currentState = 132; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 133: {
-				if (la == null) { currentState = 133; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 134: {
-				if (la == null) { currentState = 134; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 135: {
-				if (la == null) { currentState = 135; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 136: {
-				if (la == null) { currentState = 136; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 137: {
-				if (la == null) { currentState = 137; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 138: {
-				if (la == null) { currentState = 138; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 139: {
-				if (la == null) { currentState = 139; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 140: {
-				if (la == null) { currentState = 140; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 141: {
-				if (la == null) { currentState = 141; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 142: {
-				if (la == null) { currentState = 142; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 143: {
-				if (la == null) { currentState = 143; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 144: {
-				if (la == null) { currentState = 144; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 145: {
-				if (la == null) { currentState = 145; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 146: {
-				if (la == null) { currentState = 146; break; }
-				if (la.kind == 35 || la.kind == 126 || la.kind == 233) {
-					if (la.kind == 126) {
-						PushContext(Context.CollectionInitializer, la, t);
-						goto case 151;
-					} else {
-						if (la.kind == 35) {
-							PushContext(Context.CollectionInitializer, la, t);
-							stateStack.Push(150);
-							goto case 79;
-						} else {
-							if (la.kind == 233) {
-								PushContext(Context.ObjectInitializer, la, t);
-								goto case 147;
-							} else {
-								goto case 88;
-							}
-						}
-					}
-				} else {
-					goto case 89;
-				}
-			}
-			case 147: {
-				if (la == null) { currentState = 147; break; }
-				Expect(233, la); // "With"
-				currentState = 148;
-				break;
-			}
-			case 148: {
-				stateStack.Push(149);
-				goto case 93;
-			}
-			case 149: {
-				PopContext();
-				goto case 89;
-			}
-			case 150: {
-				PopContext();
-				goto case 89;
-			}
-			case 151: {
-				if (la == null) { currentState = 151; break; }
-				Expect(126, la); // "From"
-				currentState = 152;
-				break;
-			}
-			case 152: {
-				if (la == null) { currentState = 152; break; }
-				if (la.kind == 35) {
-					stateStack.Push(153);
-					goto case 79;
-				} else {
-					if (set[30].Get(la.kind)) {
-						currentState = endOfStatementTerminatorAndBlock; /* leave this block */
-							InformToken(t); /* process From again*/
-							/* for processing current token (la): go to the position after processing End */
-							goto switchlbl;
-
-					} else {
-						Error(la);
-						goto case 153;
-					}
-				}
-			}
-			case 153: {
-				PopContext();
-				goto case 89;
-			}
-			case 154: {
-				if (la == null) { currentState = 154; break; }
-				currentState = 153;
-				break;
-			}
-			case 155: {
-				stateStack.Push(156);
-				goto case 75;
-			}
-			case 156: {
-				if (la == null) { currentState = 156; break; }
-				Expect(144, la); // "Is"
-				currentState = 157;
-				break;
-			}
-			case 157: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(158);
-				goto case 37;
-			}
-			case 158: {
-				PopContext();
-				goto case 78;
-			}
-			case 159: {
-				if (la == null) { currentState = 159; break; }
-				if (set[32].Get(la.kind)) {
-					stateStack.Push(159);
-					goto case 160;
-				} else {
-					goto case 78;
-				}
-			}
-			case 160: {
-				if (la == null) { currentState = 160; break; }
-				if (la.kind == 37) {
-					currentState = 165;
-					break;
-				} else {
-					if (set[136].Get(la.kind)) {
-						currentState = 161;
-						break;
-					} else {
-						goto case 6;
-					}
-				}
-			}
-			case 161: {
-				nextTokenIsStartOfImportsOrAccessExpression = true;
-				goto case 162;
-			}
-			case 162: {
-				if (la == null) { currentState = 162; break; }
-				if (la.kind == 10) {
-					currentState = 163;
-					break;
-				} else {
-					goto case 163;
-				}
-			}
-			case 163: {
-				stateStack.Push(164);
-				goto case 101;
-			}
-			case 164: {
-				if (la == null) { currentState = 164; break; }
-				if (la.kind == 11) {
-					currentState = stateStack.Pop();
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 165: {
-				PushContext(Context.Expression, la, t);
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 166;
-			}
-			case 166: {
-				if (la == null) { currentState = 166; break; }
-				if (la.kind == 169) {
-					currentState = 168;
-					break;
-				} else {
-					if (set[22].Get(la.kind)) {
-						if (set[21].Get(la.kind)) {
-							stateStack.Push(167);
-							goto case 47;
-						} else {
-							goto case 167;
-						}
-					} else {
-						Error(la);
-						goto case 167;
-					}
-				}
-			}
-			case 167: {
-				PopContext();
-				goto case 46;
-			}
-			case 168: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(169);
-				goto case 37;
-			}
-			case 169: {
-				PopContext();
-				goto case 170;
-			}
-			case 170: {
-				if (la == null) { currentState = 170; break; }
-				if (la.kind == 22) {
-					currentState = 171;
-					break;
-				} else {
-					goto case 167;
-				}
-			}
-			case 171: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(172);
-				goto case 37;
-			}
-			case 172: {
-				PopContext();
-				goto case 170;
-			}
-			case 173: {
-				PushContext(Context.Expression, la, t);
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 174;
-			}
-			case 174: {
-				if (la == null) { currentState = 174; break; }
-				if (set[137].Get(la.kind)) {
-					currentState = 175;
-					break;
-				} else {
-					if (la.kind == 37) {
-						currentState = 483;
-						break;
-					} else {
-						if (set[138].Get(la.kind)) {
-							currentState = 175;
-							break;
-						} else {
-							if (set[134].Get(la.kind)) {
-								currentState = 175;
-								break;
-							} else {
-								if (set[136].Get(la.kind)) {
-									currentState = 479;
-									break;
-								} else {
-									if (la.kind == 129) {
-										currentState = 476;
-										break;
-									} else {
-										if (la.kind == 237) {
-											currentState = 473;
-											break;
-										} else {
-											if (set[83].Get(la.kind)) {
-												stateStack.Push(175);
-												nextTokenIsPotentialStartOfExpression = true;
-												PushContext(Context.Xml, la, t);
-												goto case 456;
-											} else {
-												if (la.kind == 127 || la.kind == 210) {
-													stateStack.Push(175);
-													goto case 252;
-												} else {
-													if (la.kind == 58 || la.kind == 126) {
-														stateStack.Push(175);
-														PushContext(Context.Query, la, t);
-														goto case 190;
-													} else {
-														if (set[37].Get(la.kind)) {
-															stateStack.Push(175);
-															goto case 183;
-														} else {
-															if (la.kind == 135) {
-																stateStack.Push(175);
-																goto case 176;
-															} else {
-																Error(la);
-																goto case 175;
-															}
-														}
-													}
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			case 175: {
-				PopContext();
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 176: {
-				if (la == null) { currentState = 176; break; }
-				Expect(135, la); // "If"
-				currentState = 177;
-				break;
-			}
-			case 177: {
-				if (la == null) { currentState = 177; break; }
-				Expect(37, la); // "("
-				currentState = 178;
-				break;
-			}
-			case 178: {
-				stateStack.Push(179);
-				goto case 55;
-			}
-			case 179: {
-				if (la == null) { currentState = 179; break; }
-				Expect(22, la); // ","
-				currentState = 180;
-				break;
-			}
-			case 180: {
-				stateStack.Push(181);
-				goto case 55;
-			}
-			case 181: {
-				if (la == null) { currentState = 181; break; }
-				if (la.kind == 22) {
-					currentState = 182;
-					break;
-				} else {
-					goto case 46;
-				}
-			}
-			case 182: {
-				stateStack.Push(46);
-				goto case 55;
-			}
-			case 183: {
-				if (la == null) { currentState = 183; break; }
-				if (set[139].Get(la.kind)) {
-					currentState = 189;
-					break;
-				} else {
-					if (la.kind == 94 || la.kind == 106 || la.kind == 219) {
-						currentState = 184;
-						break;
-					} else {
-						goto case 6;
-					}
-				}
-			}
-			case 184: {
-				if (la == null) { currentState = 184; break; }
-				Expect(37, la); // "("
-				currentState = 185;
-				break;
-			}
-			case 185: {
-				stateStack.Push(186);
-				goto case 55;
-			}
-			case 186: {
-				if (la == null) { currentState = 186; break; }
-				Expect(22, la); // ","
-				currentState = 187;
-				break;
-			}
-			case 187: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(188);
-				goto case 37;
-			}
-			case 188: {
-				PopContext();
-				goto case 46;
-			}
-			case 189: {
-				if (la == null) { currentState = 189; break; }
-				Expect(37, la); // "("
-				currentState = 182;
-				break;
-			}
-			case 190: {
-				if (la == null) { currentState = 190; break; }
-				if (la.kind == 126) {
-					stateStack.Push(191);
-					goto case 251;
-				} else {
-					if (la.kind == 58) {
-						stateStack.Push(191);
-						goto case 250;
-					} else {
-						Error(la);
-						goto case 191;
-					}
-				}
-			}
-			case 191: {
-				if (la == null) { currentState = 191; break; }
-				if (set[38].Get(la.kind)) {
-					stateStack.Push(191);
-					goto case 192;
-				} else {
-					PopContext();
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 192: {
-				if (la == null) { currentState = 192; break; }
-				if (la.kind == 126) {
-					currentState = 248;
-					break;
-				} else {
-					if (la.kind == 58) {
-						currentState = 244;
-						break;
-					} else {
-						if (la.kind == 197) {
-							currentState = 242;
-							break;
-						} else {
-							if (la.kind == 107) {
-								goto case 133;
-							} else {
-								if (la.kind == 230) {
-									currentState = 55;
-									break;
-								} else {
-									if (la.kind == 176) {
-										currentState = 238;
-										break;
-									} else {
-										if (la.kind == 203 || la.kind == 212) {
-											currentState = 236;
-											break;
-										} else {
-											if (la.kind == 148) {
-												currentState = 234;
-												break;
-											} else {
-												if (la.kind == 133) {
-													currentState = 206;
-													break;
-												} else {
-													if (la.kind == 146) {
-														currentState = 193;
-														break;
-													} else {
-														goto case 6;
-													}
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			case 193: {
-				stateStack.Push(194);
-				goto case 199;
-			}
-			case 194: {
-				if (la == null) { currentState = 194; break; }
-				Expect(171, la); // "On"
-				currentState = 195;
-				break;
-			}
-			case 195: {
-				stateStack.Push(196);
-				goto case 55;
-			}
-			case 196: {
-				if (la == null) { currentState = 196; break; }
-				Expect(116, la); // "Equals"
-				currentState = 197;
-				break;
-			}
-			case 197: {
-				stateStack.Push(198);
-				goto case 55;
-			}
-			case 198: {
-				if (la == null) { currentState = 198; break; }
-				if (la.kind == 22) {
-					currentState = 195;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 199: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				stateStack.Push(200);
-				goto case 205;
-			}
-			case 200: {
-				PopContext();
-				goto case 201;
-			}
-			case 201: {
-				if (la == null) { currentState = 201; break; }
-				if (la.kind == 63) {
-					currentState = 203;
-					break;
-				} else {
-					goto case 202;
-				}
-			}
-			case 202: {
-				if (la == null) { currentState = 202; break; }
-				Expect(138, la); // "In"
-				currentState = 55;
-				break;
-			}
-			case 203: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(204);
-				goto case 37;
-			}
-			case 204: {
-				PopContext();
-				goto case 202;
-			}
-			case 205: {
-				if (la == null) { currentState = 205; break; }
-				if (set[123].Get(la.kind)) {
-					currentState = stateStack.Pop();
-					break;
-				} else {
-					if (la.kind == 98) {
-						goto case 135;
-					} else {
-						goto case 6;
-					}
-				}
-			}
-			case 206: {
-				SetIdentifierExpected(la);
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 207;
-			}
-			case 207: {
-				if (la == null) { currentState = 207; break; }
-				if (la.kind == 146) {
-					goto case 226;
-				} else {
-					if (set[40].Get(la.kind)) {
-						if (la.kind == 70) {
-							currentState = 209;
-							break;
-						} else {
-							if (set[40].Get(la.kind)) {
-								goto case 224;
-							} else {
-								Error(la);
-								goto case 208;
-							}
-						}
-					} else {
-						goto case 6;
-					}
-				}
-			}
-			case 208: {
-				if (la == null) { currentState = 208; break; }
-				Expect(70, la); // "By"
-				currentState = 209;
-				break;
-			}
-			case 209: {
-				stateStack.Push(210);
-				goto case 213;
-			}
-			case 210: {
-				if (la == null) { currentState = 210; break; }
-				if (la.kind == 22) {
-					currentState = 209;
-					break;
-				} else {
-					Expect(143, la); // "Into"
-					currentState = 211;
-					break;
-				}
-			}
-			case 211: {
-				stateStack.Push(212);
-				goto case 213;
-			}
-			case 212: {
-				if (la == null) { currentState = 212; break; }
-				if (la.kind == 22) {
-					currentState = 211;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 213: {
-				SetIdentifierExpected(la);
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 214;
-			}
-			case 214: {
-				if (la == null) { currentState = 214; break; }
-				if (set[6].Get(la.kind)) {
-					PushContext(Context.Identifier, la, t);
-					SetIdentifierExpected(la);
-					stateStack.Push(217);
-					goto case 205;
-				} else {
-					goto case 215;
-				}
-			}
-			case 215: {
-				stateStack.Push(216);
-				goto case 55;
-			}
-			case 216: {
-				if (!isAlreadyInExpr) PopContext(); isAlreadyInExpr = false;
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 217: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 218;
-			}
-			case 218: {
-				if (la == null) { currentState = 218; break; }
-				if (set[42].Get(la.kind)) {
-					PopContext(); isAlreadyInExpr = true;
-					goto case 219;
-				} else {
-					goto case 215;
-				}
-			}
-			case 219: {
-				if (la == null) { currentState = 219; break; }
-				if (la.kind == 63) {
-					currentState = 221;
-					break;
-				} else {
-					if (la.kind == 20) {
-						currentState = 215;
-						break;
-					} else {
-						if (set[43].Get(la.kind)) {
-							currentState = endOfStatementTerminatorAndBlock; /* leave this block */
-								InformToken(t); /* process Identifier again*/
-								/* for processing current token (la): go to the position after processing End */
-								goto switchlbl;
-
-						} else {
-							Error(la);
-							goto case 215;
-						}
-					}
-				}
-			}
-			case 220: {
-				if (la == null) { currentState = 220; break; }
-				currentState = 215;
-				break;
-			}
-			case 221: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(222);
-				goto case 37;
-			}
-			case 222: {
-				PopContext();
-				goto case 223;
-			}
-			case 223: {
-				if (la == null) { currentState = 223; break; }
-				Expect(20, la); // "="
-				currentState = 215;
-				break;
-			}
-			case 224: {
-				stateStack.Push(225);
-				goto case 213;
-			}
-			case 225: {
-				if (la == null) { currentState = 225; break; }
-				if (la.kind == 22) {
-					currentState = 224;
-					break;
-				} else {
-					goto case 208;
-				}
-			}
-			case 226: {
-				stateStack.Push(227);
-				goto case 233;
-			}
-			case 227: {
-				if (la == null) { currentState = 227; break; }
-				if (la.kind == 133 || la.kind == 146) {
-					if (la.kind == 133) {
-						currentState = 231;
-						break;
-					} else {
-						if (la.kind == 146) {
-							goto case 226;
-						} else {
-							Error(la);
-							goto case 227;
-						}
-					}
-				} else {
-					goto case 228;
-				}
-			}
-			case 228: {
-				if (la == null) { currentState = 228; break; }
-				Expect(143, la); // "Into"
-				currentState = 229;
-				break;
-			}
-			case 229: {
-				stateStack.Push(230);
-				goto case 213;
-			}
-			case 230: {
-				if (la == null) { currentState = 230; break; }
-				if (la.kind == 22) {
-					currentState = 229;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 231: {
-				stateStack.Push(232);
-				goto case 233;
-			}
-			case 232: {
-				stateStack.Push(227);
-				goto case 228;
-			}
-			case 233: {
-				if (la == null) { currentState = 233; break; }
-				Expect(146, la); // "Join"
-				currentState = 193;
-				break;
-			}
-			case 234: {
-				stateStack.Push(235);
-				goto case 213;
-			}
-			case 235: {
-				if (la == null) { currentState = 235; break; }
-				if (la.kind == 22) {
-					currentState = 234;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 236: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 237;
-			}
-			case 237: {
-				if (la == null) { currentState = 237; break; }
-				if (la.kind == 231) {
-					currentState = 55;
-					break;
-				} else {
-					goto case 55;
-				}
-			}
-			case 238: {
-				if (la == null) { currentState = 238; break; }
-				Expect(70, la); // "By"
-				currentState = 239;
-				break;
-			}
-			case 239: {
-				stateStack.Push(240);
-				goto case 55;
-			}
-			case 240: {
-				if (la == null) { currentState = 240; break; }
-				if (la.kind == 64) {
-					currentState = 241;
-					break;
-				} else {
-					if (la.kind == 104) {
-						currentState = 241;
-						break;
-					} else {
-						Error(la);
-						goto case 241;
-					}
-				}
-			}
-			case 241: {
-				if (la == null) { currentState = 241; break; }
-				if (la.kind == 22) {
-					currentState = 239;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 242: {
-				stateStack.Push(243);
-				goto case 213;
-			}
-			case 243: {
-				if (la == null) { currentState = 243; break; }
-				if (la.kind == 22) {
-					currentState = 242;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 244: {
-				stateStack.Push(245);
-				goto case 199;
-			}
-			case 245: {
-				if (la == null) { currentState = 245; break; }
-				if (set[38].Get(la.kind)) {
-					stateStack.Push(245);
-					goto case 192;
-				} else {
-					Expect(143, la); // "Into"
-					currentState = 246;
-					break;
-				}
-			}
-			case 246: {
-				stateStack.Push(247);
-				goto case 213;
-			}
-			case 247: {
-				if (la == null) { currentState = 247; break; }
-				if (la.kind == 22) {
-					currentState = 246;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 248: {
-				stateStack.Push(249);
-				goto case 199;
-			}
-			case 249: {
-				if (la == null) { currentState = 249; break; }
-				if (la.kind == 22) {
-					currentState = 248;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 250: {
-				if (la == null) { currentState = 250; break; }
-				Expect(58, la); // "Aggregate"
-				currentState = 244;
-				break;
-			}
-			case 251: {
-				if (la == null) { currentState = 251; break; }
-				Expect(126, la); // "From"
-				currentState = 248;
-				break;
-			}
-			case 252: {
-				if (la == null) { currentState = 252; break; }
-				if (la.kind == 210) {
-					currentState = 451;
-					break;
-				} else {
-					if (la.kind == 127) {
-						currentState = 253;
-						break;
-					} else {
-						goto case 6;
-					}
-				}
-			}
-			case 253: {
-				stateStack.Push(254);
-				goto case 424;
-			}
-			case 254: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 255;
-			}
-			case 255: {
-				if (la == null) { currentState = 255; break; }
-				if (set[23].Get(la.kind)) {
-					goto case 55;
-				} else {
-					if (la.kind == 1 || la.kind == 21 || la.kind == 63) {
-						if (la.kind == 63) {
-							currentState = 422;
-							break;
-						} else {
-							goto case 256;
-						}
-					} else {
-						goto case 6;
-					}
-				}
-			}
-			case 256: {
-				stateStack.Push(257);
-				goto case 259;
-			}
-			case 257: {
-				if (la == null) { currentState = 257; break; }
-				Expect(113, la); // "End"
-				currentState = 258;
-				break;
-			}
-			case 258: {
-				if (la == null) { currentState = 258; break; }
-				Expect(127, la); // "Function"
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 259: {
-				PushContext(Context.Body, la, t);
-				goto case 260;
-			}
-			case 260: {
-				stateStack.Push(261);
-				goto case 23;
-			}
-			case 261: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 262;
-			}
-			case 262: {
-				if (la == null) { currentState = 262; break; }
-				if (set[140].Get(la.kind)) {
-					if (set[69].Get(la.kind)) {
-						if (set[50].Get(la.kind)) {
-							stateStack.Push(260);
-							goto case 267;
-						} else {
-							goto case 260;
-						}
-					} else {
-						if (la.kind == 113) {
-							currentState = 265;
-							break;
-						} else {
-							goto case 264;
-						}
-					}
-				} else {
-					goto case 263;
-				}
-			}
-			case 263: {
-				PopContext();
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 264: {
-				Error(la);
-				goto case 261;
-			}
-			case 265: {
-				if (la == null) { currentState = 265; break; }
-				if (la.kind == 1 || la.kind == 21) {
-					goto case 260;
-				} else {
-					if (set[49].Get(la.kind)) {
-						currentState = endOfStatementTerminatorAndBlock; /* leave this block */
-						InformToken(t); /* process End again*/
-						/* for processing current token (la): go to the position after processing End */
-						goto switchlbl;
-
-					} else {
-						goto case 264;
-					}
-				}
-			}
-			case 266: {
-				if (la == null) { currentState = 266; break; }
-				currentState = 261;
-				break;
-			}
-			case 267: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 268;
-			}
-			case 268: {
-				if (la == null) { currentState = 268; break; }
-				if (la.kind == 88 || la.kind == 105 || la.kind == 204) {
-					currentState = 399;
-					break;
-				} else {
-					if (la.kind == 211 || la.kind == 233) {
-						currentState = 395;
-						break;
-					} else {
-						if (la.kind == 56 || la.kind == 193) {
-							currentState = 393;
-							break;
-						} else {
-							if (la.kind == 189) {
-								currentState = 388;
-								break;
-							} else {
-								if (la.kind == 135) {
-									currentState = 370;
-									break;
-								} else {
-									if (la.kind == 197) {
-										currentState = 354;
-										break;
-									} else {
-										if (la.kind == 231) {
-											currentState = 350;
-											break;
-										} else {
-											if (la.kind == 108) {
-												currentState = 344;
-												break;
-											} else {
-												if (la.kind == 124) {
-													currentState = 317;
-													break;
-												} else {
-													if (la.kind == 118 || la.kind == 171 || la.kind == 194) {
-														if (la.kind == 118 || la.kind == 171) {
-															if (la.kind == 171) {
-																currentState = 313;
-																break;
-															} else {
-																goto case 313;
-															}
-														} else {
-															if (la.kind == 194) {
-																currentState = 311;
-																break;
-															} else {
-																goto case 6;
-															}
-														}
-													} else {
-														if (la.kind == 215) {
-															currentState = 309;
-															break;
-														} else {
-															if (la.kind == 218) {
-																currentState = 296;
-																break;
-															} else {
-																if (set[141].Get(la.kind)) {
-																	if (la.kind == 132) {
-																		currentState = 293;
-																		break;
-																	} else {
-																		if (la.kind == 120) {
-																			currentState = 292;
-																			break;
-																		} else {
-																			if (la.kind == 89) {
-																				currentState = 291;
-																				break;
-																			} else {
-																				if (la.kind == 206) {
-																					goto case 113;
-																				} else {
-																					if (la.kind == 195) {
-																						currentState = 288;
-																						break;
-																					} else {
-																						goto case 6;
-																					}
-																				}
-																			}
-																		}
-																	}
-																} else {
-																	if (la.kind == 191) {
-																		currentState = 286;
-																		break;
-																	} else {
-																		if (la.kind == 117) {
-																			currentState = 284;
-																			break;
-																		} else {
-																			if (la.kind == 226) {
-																				currentState = 269;
-																				break;
-																			} else {
-																				if (set[142].Get(la.kind)) {
-																					if (la.kind == 73) {
-																						currentState = 55;
-																						break;
-																					} else {
-																						goto case 55;
-																					}
-																				} else {
-																					goto case 6;
-																				}
-																			}
-																		}
-																	}
-																}
-															}
-														}
-													}
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			case 269: {
-				stateStack.Push(270);
-				SetIdentifierExpected(la);
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 273;
-			}
-			case 270: {
-				if (la == null) { currentState = 270; break; }
-				if (la.kind == 22) {
-					currentState = 269;
-					break;
-				} else {
-					stateStack.Push(271);
-					goto case 259;
-				}
-			}
-			case 271: {
-				if (la == null) { currentState = 271; break; }
-				Expect(113, la); // "End"
-				currentState = 272;
-				break;
-			}
-			case 272: {
-				if (la == null) { currentState = 272; break; }
-				Expect(226, la); // "Using"
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 273: {
-				if (la == null) { currentState = 273; break; }
-				if (set[6].Get(la.kind)) {
-					PushContext(Context.Identifier, la, t);
-					SetIdentifierExpected(la);
-					stateStack.Push(276);
-					goto case 205;
-				} else {
-					goto case 274;
-				}
-			}
-			case 274: {
-				stateStack.Push(275);
-				goto case 55;
-			}
-			case 275: {
-				if (!isAlreadyInExpr) PopContext(); isAlreadyInExpr = false;
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 276: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 277;
-			}
-			case 277: {
-				if (la == null) { currentState = 277; break; }
-				if (set[42].Get(la.kind)) {
-					PopContext(); isAlreadyInExpr = true;
-					goto case 278;
-				} else {
-					goto case 274;
-				}
-			}
-			case 278: {
-				if (la == null) { currentState = 278; break; }
-				if (la.kind == 63) {
-					currentState = 280;
-					break;
-				} else {
-					if (la.kind == 20) {
-						currentState = 274;
-						break;
-					} else {
-						if (set[43].Get(la.kind)) {
-							currentState = endOfStatementTerminatorAndBlock; /* leave this block */
-								InformToken(t); /* process Identifier again*/
-								/* for processing current token (la): go to the position after processing End */
-								goto switchlbl;
-
-						} else {
-							Error(la);
-							goto case 274;
-						}
-					}
-				}
-			}
-			case 279: {
-				if (la == null) { currentState = 279; break; }
-				currentState = 274;
-				break;
-			}
-			case 280: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 281;
-			}
-			case 281: {
-				if (la == null) { currentState = 281; break; }
-				if (set[16].Get(la.kind)) {
-					PushContext(Context.Type, la, t);
-					stateStack.Push(282);
-					goto case 37;
-				} else {
-					goto case 274;
-				}
-			}
-			case 282: {
-				PopContext();
-				goto case 283;
-			}
-			case 283: {
-				if (la == null) { currentState = 283; break; }
-				Expect(20, la); // "="
-				currentState = 274;
-				break;
-			}
-			case 284: {
-				stateStack.Push(285);
-				goto case 55;
-			}
-			case 285: {
-				if (la == null) { currentState = 285; break; }
-				if (la.kind == 22) {
-					currentState = 284;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 286: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 287;
-			}
-			case 287: {
-				if (la == null) { currentState = 287; break; }
-				if (la.kind == 184) {
-					currentState = 55;
-					break;
-				} else {
-					goto case 55;
-				}
-			}
-			case 288: {
-				PushContext(Context.Expression, la, t);
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 289;
-			}
-			case 289: {
-				if (la == null) { currentState = 289; break; }
-				if (set[23].Get(la.kind)) {
-					stateStack.Push(290);
-					goto case 55;
-				} else {
-					goto case 290;
-				}
-			}
-			case 290: {
-				PopContext();
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 291: {
-				if (la == null) { currentState = 291; break; }
-				if (la.kind == 108) {
-					goto case 132;
-				} else {
-					if (la.kind == 124) {
-						goto case 129;
-					} else {
-						if (la.kind == 231) {
-							goto case 103;
-						} else {
-							goto case 6;
-						}
-					}
-				}
-			}
-			case 292: {
-				if (la == null) { currentState = 292; break; }
-				if (la.kind == 108) {
-					goto case 132;
-				} else {
-					if (la.kind == 124) {
-						goto case 129;
-					} else {
-						if (la.kind == 231) {
-							goto case 103;
-						} else {
-							if (la.kind == 197) {
-								goto case 115;
-							} else {
-								if (la.kind == 210) {
-									goto case 111;
-								} else {
-									if (la.kind == 127) {
-										goto case 127;
-									} else {
-										if (la.kind == 186) {
-											goto case 116;
-										} else {
-											if (la.kind == 218) {
-												goto case 107;
-											} else {
-												goto case 6;
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			case 293: {
-				if (la == null) { currentState = 293; break; }
-				if (set[6].Get(la.kind)) {
-					goto case 295;
-				} else {
-					if (la.kind == 5) {
-						goto case 294;
-					} else {
-						goto case 6;
-					}
-				}
-			}
-			case 294: {
-				if (la == null) { currentState = 294; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 295: {
-				if (la == null) { currentState = 295; break; }
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 296: {
-				stateStack.Push(297);
-				goto case 259;
-			}
-			case 297: {
-				if (la == null) { currentState = 297; break; }
-				if (la.kind == 75) {
-					currentState = 301;
-					break;
-				} else {
-					if (la.kind == 123) {
-						currentState = 300;
-						break;
-					} else {
-						goto case 298;
-					}
-				}
-			}
-			case 298: {
-				if (la == null) { currentState = 298; break; }
-				Expect(113, la); // "End"
-				currentState = 299;
-				break;
-			}
-			case 299: {
-				if (la == null) { currentState = 299; break; }
-				Expect(218, la); // "Try"
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 300: {
-				stateStack.Push(298);
-				goto case 259;
-			}
-			case 301: {
-				SetIdentifierExpected(la);
-				goto case 302;
-			}
-			case 302: {
-				if (la == null) { currentState = 302; break; }
-				if (set[6].Get(la.kind)) {
-					PushContext(Context.Identifier, la, t);
-					SetIdentifierExpected(la);
-					stateStack.Push(305);
-					goto case 205;
-				} else {
-					goto case 303;
-				}
-			}
-			case 303: {
-				if (la == null) { currentState = 303; break; }
-				if (la.kind == 229) {
-					currentState = 304;
-					break;
-				} else {
-					goto case 296;
-				}
-			}
-			case 304: {
-				stateStack.Push(296);
-				goto case 55;
-			}
-			case 305: {
-				PopContext();
-				goto case 306;
-			}
-			case 306: {
-				if (la == null) { currentState = 306; break; }
-				if (la.kind == 63) {
-					currentState = 307;
-					break;
-				} else {
-					goto case 303;
-				}
-			}
-			case 307: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(308);
-				goto case 37;
-			}
-			case 308: {
-				PopContext();
-				goto case 303;
-			}
-			case 309: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 310;
-			}
-			case 310: {
-				if (la == null) { currentState = 310; break; }
-				if (set[23].Get(la.kind)) {
-					goto case 55;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 311: {
-				if (la == null) { currentState = 311; break; }
-				if (la.kind == 163) {
-					goto case 120;
-				} else {
-					goto case 312;
-				}
-			}
-			case 312: {
-				if (la == null) { currentState = 312; break; }
-				if (la.kind == 5) {
-					goto case 294;
-				} else {
-					if (set[6].Get(la.kind)) {
-						goto case 295;
-					} else {
-						goto case 6;
-					}
-				}
-			}
-			case 313: {
-				if (la == null) { currentState = 313; break; }
-				Expect(118, la); // "Error"
-				currentState = 314;
-				break;
-			}
-			case 314: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 315;
-			}
-			case 315: {
-				if (la == null) { currentState = 315; break; }
-				if (set[23].Get(la.kind)) {
-					goto case 55;
-				} else {
-					if (la.kind == 132) {
-						currentState = 312;
-						break;
-					} else {
-						if (la.kind == 194) {
-							currentState = 316;
-							break;
-						} else {
-							goto case 6;
-						}
-					}
-				}
-			}
-			case 316: {
-				if (la == null) { currentState = 316; break; }
-				Expect(163, la); // "Next"
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 317: {
-				nextTokenIsPotentialStartOfExpression = true;
-				SetIdentifierExpected(la);
-				goto case 318;
-			}
-			case 318: {
-				if (la == null) { currentState = 318; break; }
-				if (set[35].Get(la.kind)) {
-					stateStack.Push(334);
-					goto case 328;
-				} else {
-					if (la.kind == 110) {
-						currentState = 319;
-						break;
-					} else {
-						goto case 6;
-					}
-				}
-			}
-			case 319: {
-				stateStack.Push(320);
-				goto case 328;
-			}
-			case 320: {
-				if (la == null) { currentState = 320; break; }
-				Expect(138, la); // "In"
-				currentState = 321;
-				break;
-			}
-			case 321: {
-				stateStack.Push(322);
-				goto case 55;
-			}
-			case 322: {
-				stateStack.Push(323);
-				goto case 259;
-			}
-			case 323: {
-				if (la == null) { currentState = 323; break; }
-				Expect(163, la); // "Next"
-				currentState = 324;
-				break;
-			}
-			case 324: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 325;
-			}
-			case 325: {
-				if (la == null) { currentState = 325; break; }
-				if (set[23].Get(la.kind)) {
-					goto case 326;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 326: {
-				stateStack.Push(327);
-				goto case 55;
-			}
-			case 327: {
-				if (la == null) { currentState = 327; break; }
-				if (la.kind == 22) {
-					currentState = 326;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 328: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				stateStack.Push(329);
-				goto case 173;
-			}
-			case 329: {
-				PopContext();
-				goto case 330;
-			}
-			case 330: {
-				if (la == null) { currentState = 330; break; }
-				if (la.kind == 33) {
-					currentState = 331;
-					break;
-				} else {
-					goto case 331;
-				}
-			}
-			case 331: {
-				if (la == null) { currentState = 331; break; }
-				if (set[32].Get(la.kind)) {
-					stateStack.Push(331);
-					goto case 160;
-				} else {
-					if (la.kind == 63) {
-						currentState = 332;
-						break;
-					} else {
-						currentState = stateStack.Pop();
-						goto switchlbl;
-					}
-				}
-			}
-			case 332: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(333);
-				goto case 37;
-			}
-			case 333: {
-				PopContext();
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 334: {
-				if (la == null) { currentState = 334; break; }
-				Expect(20, la); // "="
-				currentState = 335;
-				break;
-			}
-			case 335: {
-				stateStack.Push(336);
-				goto case 55;
-			}
-			case 336: {
-				if (la == null) { currentState = 336; break; }
-				if (la.kind == 205) {
-					currentState = 343;
-					break;
-				} else {
-					goto case 337;
-				}
-			}
-			case 337: {
-				stateStack.Push(338);
-				goto case 259;
-			}
-			case 338: {
-				if (la == null) { currentState = 338; break; }
-				Expect(163, la); // "Next"
-				currentState = 339;
-				break;
-			}
-			case 339: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 340;
-			}
-			case 340: {
-				if (la == null) { currentState = 340; break; }
-				if (set[23].Get(la.kind)) {
-					goto case 341;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 341: {
-				stateStack.Push(342);
-				goto case 55;
-			}
-			case 342: {
-				if (la == null) { currentState = 342; break; }
-				if (la.kind == 22) {
-					currentState = 341;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 343: {
-				stateStack.Push(337);
-				goto case 55;
-			}
-			case 344: {
-				if (la == null) { currentState = 344; break; }
-				if (la.kind == 224 || la.kind == 231) {
-					currentState = 347;
-					break;
-				} else {
-					if (la.kind == 1 || la.kind == 21) {
-						stateStack.Push(345);
-						goto case 259;
-					} else {
-						goto case 6;
-					}
-				}
-			}
-			case 345: {
-				if (la == null) { currentState = 345; break; }
-				Expect(152, la); // "Loop"
-				currentState = 346;
-				break;
-			}
-			case 346: {
-				if (la == null) { currentState = 346; break; }
-				if (la.kind == 224 || la.kind == 231) {
-					currentState = 55;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 347: {
-				stateStack.Push(348);
-				goto case 55;
-			}
-			case 348: {
-				stateStack.Push(349);
-				goto case 259;
-			}
-			case 349: {
-				if (la == null) { currentState = 349; break; }
-				Expect(152, la); // "Loop"
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 350: {
-				stateStack.Push(351);
-				goto case 55;
-			}
-			case 351: {
-				stateStack.Push(352);
-				goto case 259;
-			}
-			case 352: {
-				if (la == null) { currentState = 352; break; }
-				Expect(113, la); // "End"
-				currentState = 353;
-				break;
-			}
-			case 353: {
-				if (la == null) { currentState = 353; break; }
-				Expect(231, la); // "While"
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 354: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 355;
-			}
-			case 355: {
-				if (la == null) { currentState = 355; break; }
-				if (la.kind == 74) {
-					currentState = 356;
-					break;
-				} else {
-					goto case 356;
-				}
-			}
-			case 356: {
-				stateStack.Push(357);
-				goto case 55;
-			}
-			case 357: {
-				stateStack.Push(358);
-				goto case 23;
-			}
-			case 358: {
-				if (la == null) { currentState = 358; break; }
-				if (la.kind == 74) {
-					currentState = 360;
-					break;
-				} else {
-					Expect(113, la); // "End"
-					currentState = 359;
-					break;
-				}
-			}
-			case 359: {
-				if (la == null) { currentState = 359; break; }
-				Expect(197, la); // "Select"
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 360: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 361;
-			}
-			case 361: {
-				if (la == null) { currentState = 361; break; }
-				if (la.kind == 111) {
-					currentState = 362;
-					break;
-				} else {
-					if (set[67].Get(la.kind)) {
-						goto case 363;
-					} else {
-						Error(la);
-						goto case 362;
-					}
-				}
-			}
-			case 362: {
-				stateStack.Push(358);
-				goto case 259;
-			}
-			case 363: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 364;
-			}
-			case 364: {
-				if (la == null) { currentState = 364; break; }
-				if (set[143].Get(la.kind)) {
-					if (la.kind == 144) {
-						currentState = 366;
-						break;
-					} else {
-						goto case 366;
-					}
-				} else {
-					if (set[23].Get(la.kind)) {
-						stateStack.Push(365);
-						goto case 55;
-					} else {
-						Error(la);
-						goto case 365;
-					}
-				}
-			}
-			case 365: {
-				if (la == null) { currentState = 365; break; }
-				if (la.kind == 22) {
-					currentState = 363;
-					break;
-				} else {
-					goto case 362;
-				}
-			}
-			case 366: {
-				stateStack.Push(367);
-				goto case 368;
-			}
-			case 367: {
-				stateStack.Push(365);
-				goto case 75;
-			}
-			case 368: {
-				if (la == null) { currentState = 368; break; }
-				if (la.kind == 20) {
-					goto case 73;
-				} else {
-					if (la.kind == 41) {
-						goto case 72;
-					} else {
-						if (la.kind == 40) {
-							goto case 71;
-						} else {
-							if (la.kind == 39) {
-								currentState = 369;
-								break;
-							} else {
-								if (la.kind == 42) {
-									goto case 68;
-								} else {
-									if (la.kind == 43) {
-										goto case 69;
-									} else {
-										goto case 6;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			case 369: {
-				wasNormalAttribute = false;
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 370: {
-				stateStack.Push(371);
-				goto case 55;
-			}
-			case 371: {
-				if (la == null) { currentState = 371; break; }
-				if (la.kind == 214) {
-					currentState = 379;
-					break;
-				} else {
-					goto case 372;
-				}
-			}
-			case 372: {
-				if (la == null) { currentState = 372; break; }
-				if (la.kind == 1 || la.kind == 21) {
-					goto case 373;
-				} else {
-					goto case 6;
-				}
-			}
-			case 373: {
-				stateStack.Push(374);
-				goto case 259;
-			}
-			case 374: {
-				if (la == null) { currentState = 374; break; }
-				if (la.kind == 111 || la.kind == 112) {
-					if (la.kind == 111) {
-						currentState = 378;
-						break;
-					} else {
-						if (la.kind == 112) {
-							currentState = 376;
-							break;
-						} else {
-							Error(la);
-							goto case 373;
-						}
-					}
-				} else {
-					Expect(113, la); // "End"
-					currentState = 375;
-					break;
-				}
-			}
-			case 375: {
-				if (la == null) { currentState = 375; break; }
-				Expect(135, la); // "If"
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 376: {
-				stateStack.Push(377);
-				goto case 55;
-			}
-			case 377: {
-				if (la == null) { currentState = 377; break; }
-				if (la.kind == 214) {
-					currentState = 373;
-					break;
-				} else {
-					goto case 373;
-				}
-			}
-			case 378: {
-				if (la == null) { currentState = 378; break; }
-				if (la.kind == 135) {
-					currentState = 376;
-					break;
-				} else {
-					goto case 373;
-				}
-			}
-			case 379: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 380;
-			}
-			case 380: {
-				if (la == null) { currentState = 380; break; }
-				if (set[50].Get(la.kind)) {
-					goto case 381;
-				} else {
-					goto case 372;
-				}
-			}
-			case 381: {
-				stateStack.Push(382);
-				goto case 267;
-			}
-			case 382: {
-				if (la == null) { currentState = 382; break; }
-				if (la.kind == 21) {
-					currentState = 386;
-					break;
-				} else {
-					if (la.kind == 111) {
-						currentState = 383;
-						break;
-					} else {
-						currentState = stateStack.Pop();
-						goto switchlbl;
-					}
-				}
-			}
-			case 383: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 384;
-			}
-			case 384: {
-				if (la == null) { currentState = 384; break; }
-				if (set[50].Get(la.kind)) {
-					stateStack.Push(385);
-					goto case 267;
-				} else {
-					goto case 385;
-				}
-			}
-			case 385: {
-				if (la == null) { currentState = 385; break; }
-				if (la.kind == 21) {
-					currentState = 383;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 386: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 387;
-			}
-			case 387: {
-				if (la == null) { currentState = 387; break; }
-				if (set[50].Get(la.kind)) {
-					goto case 381;
-				} else {
-					goto case 382;
-				}
-			}
-			case 388: {
-				stateStack.Push(389);
-				goto case 101;
-			}
-			case 389: {
-				if (la == null) { currentState = 389; break; }
-				if (la.kind == 37) {
-					currentState = 390;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 390: {
-				PushContext(Context.Expression, la, t);
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 391;
-			}
-			case 391: {
-				if (la == null) { currentState = 391; break; }
-				if (set[21].Get(la.kind)) {
-					stateStack.Push(392);
-					goto case 47;
-				} else {
-					goto case 392;
-				}
-			}
-			case 392: {
-				PopContext();
-				goto case 46;
-			}
-			case 393: {
-				stateStack.Push(394);
-				goto case 55;
-			}
-			case 394: {
-				if (la == null) { currentState = 394; break; }
-				Expect(22, la); // ","
-				currentState = 55;
-				break;
-			}
-			case 395: {
-				stateStack.Push(396);
-				goto case 55;
-			}
-			case 396: {
-				stateStack.Push(397);
-				goto case 259;
-			}
-			case 397: {
-				if (la == null) { currentState = 397; break; }
-				Expect(113, la); // "End"
-				currentState = 398;
-				break;
-			}
-			case 398: {
-				if (la == null) { currentState = 398; break; }
-				if (la.kind == 233) {
-					goto case 102;
-				} else {
-					if (la.kind == 211) {
-						goto case 110;
-					} else {
-						goto case 6;
-					}
-				}
-			}
-			case 399: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				stateStack.Push(400);
-				goto case 205;
-			}
-			case 400: {
-				PopContext();
-				goto case 401;
-			}
-			case 401: {
-				if (la == null) { currentState = 401; break; }
-				if (la.kind == 33) {
-					currentState = 402;
-					break;
-				} else {
-					goto case 402;
-				}
-			}
-			case 402: {
-				if (la == null) { currentState = 402; break; }
-				if (la.kind == 37) {
-					currentState = 419;
-					break;
-				} else {
-					if (la.kind == 63) {
-						currentState = 416;
-						break;
-					} else {
-						goto case 403;
-					}
-				}
-			}
-			case 403: {
-				if (la == null) { currentState = 403; break; }
-				if (la.kind == 20) {
-					currentState = 415;
-					break;
-				} else {
-					goto case 404;
-				}
-			}
-			case 404: {
-				if (la == null) { currentState = 404; break; }
-				if (la.kind == 22) {
-					currentState = 405;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 405: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				stateStack.Push(406);
-				goto case 205;
-			}
-			case 406: {
-				PopContext();
-				goto case 407;
-			}
-			case 407: {
-				if (la == null) { currentState = 407; break; }
-				if (la.kind == 33) {
-					currentState = 408;
-					break;
-				} else {
-					goto case 408;
-				}
-			}
-			case 408: {
-				if (la == null) { currentState = 408; break; }
-				if (la.kind == 37) {
-					currentState = 412;
-					break;
-				} else {
-					if (la.kind == 63) {
-						currentState = 409;
-						break;
-					} else {
-						goto case 403;
-					}
-				}
-			}
-			case 409: {
-				PushContext(Context.Type, la, t);
-				goto case 410;
-			}
-			case 410: {
-				if (la == null) { currentState = 410; break; }
-				if (la.kind == 162) {
-					stateStack.Push(411);
-					goto case 85;
-				} else {
-					if (set[16].Get(la.kind)) {
-						stateStack.Push(411);
-						goto case 37;
-					} else {
-						Error(la);
-						goto case 411;
-					}
-				}
-			}
-			case 411: {
-				PopContext();
-				goto case 403;
-			}
-			case 412: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 413;
-			}
-			case 413: {
-				if (la == null) { currentState = 413; break; }
-				if (set[23].Get(la.kind)) {
-					stateStack.Push(414);
-					goto case 55;
-				} else {
-					goto case 414;
-				}
-			}
-			case 414: {
-				if (la == null) { currentState = 414; break; }
-				if (la.kind == 22) {
-					currentState = 412;
-					break;
-				} else {
-					Expect(38, la); // ")"
-					currentState = 408;
-					break;
-				}
-			}
-			case 415: {
-				stateStack.Push(404);
-				goto case 55;
-			}
-			case 416: {
-				PushContext(Context.Type, la, t);
-				goto case 417;
-			}
-			case 417: {
-				if (la == null) { currentState = 417; break; }
-				if (la.kind == 162) {
-					stateStack.Push(418);
-					goto case 85;
-				} else {
-					if (set[16].Get(la.kind)) {
-						stateStack.Push(418);
-						goto case 37;
-					} else {
-						Error(la);
-						goto case 418;
-					}
-				}
-			}
-			case 418: {
-				PopContext();
-				goto case 403;
-			}
-			case 419: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 420;
-			}
-			case 420: {
-				if (la == null) { currentState = 420; break; }
-				if (set[23].Get(la.kind)) {
-					stateStack.Push(421);
-					goto case 55;
-				} else {
-					goto case 421;
-				}
-			}
-			case 421: {
-				if (la == null) { currentState = 421; break; }
-				if (la.kind == 22) {
-					currentState = 419;
-					break;
-				} else {
-					Expect(38, la); // ")"
-					currentState = 402;
-					break;
-				}
-			}
-			case 422: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(423);
-				goto case 37;
-			}
-			case 423: {
-				PopContext();
-				goto case 256;
-			}
-			case 424: {
-				if (la == null) { currentState = 424; break; }
-				Expect(37, la); // "("
-				currentState = 425;
-				break;
-			}
-			case 425: {
-				PushContext(Context.Default, la, t);
-				SetIdentifierExpected(la);
-				goto case 426;
-			}
-			case 426: {
-				if (la == null) { currentState = 426; break; }
-				if (set[77].Get(la.kind)) {
-					stateStack.Push(427);
-					goto case 428;
-				} else {
-					goto case 427;
-				}
-			}
-			case 427: {
-				PopContext();
-				goto case 46;
-			}
-			case 428: {
-				stateStack.Push(429);
-				PushContext(Context.Parameter, la, t);
-				goto case 430;
-			}
-			case 429: {
-				if (la == null) { currentState = 429; break; }
-				if (la.kind == 22) {
-					currentState = 428;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 430: {
-				SetIdentifierExpected(la);
-				goto case 431;
-			}
-			case 431: {
-				if (la == null) { currentState = 431; break; }
-				if (la.kind == 40) {
-					stateStack.Push(430);
-					goto case 443;
-				} else {
-					goto case 432;
-				}
-			}
-			case 432: {
-				SetIdentifierExpected(la);
-				goto case 433;
-			}
-			case 433: {
-				if (la == null) { currentState = 433; break; }
-				if (set[144].Get(la.kind)) {
-					currentState = 432;
-					break;
-				} else {
-					PushContext(Context.Identifier, la, t);
-					SetIdentifierExpected(la);
-					stateStack.Push(434);
-					goto case 205;
-				}
-			}
-			case 434: {
-				PopContext();
-				goto case 435;
-			}
-			case 435: {
-				if (la == null) { currentState = 435; break; }
-				if (la.kind == 33) {
-					currentState = 436;
-					break;
-				} else {
-					goto case 436;
-				}
-			}
-			case 436: {
-				if (la == null) { currentState = 436; break; }
-				if (la.kind == 37) {
-					currentState = 442;
-					break;
-				} else {
-					if (la.kind == 63) {
-						currentState = 440;
-						break;
-					} else {
-						goto case 437;
-					}
-				}
-			}
-			case 437: {
-				if (la == null) { currentState = 437; break; }
-				if (la.kind == 20) {
-					currentState = 439;
-					break;
-				} else {
-					goto case 438;
-				}
-			}
-			case 438: {
-				PopContext();
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 439: {
-				stateStack.Push(438);
-				goto case 55;
-			}
-			case 440: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(441);
-				goto case 37;
-			}
-			case 441: {
-				PopContext();
-				goto case 437;
-			}
-			case 442: {
-				if (la == null) { currentState = 442; break; }
-				if (la.kind == 22) {
-					currentState = 442;
-					break;
-				} else {
-					Expect(38, la); // ")"
-					currentState = 436;
-					break;
-				}
-			}
-			case 443: {
-				if (la == null) { currentState = 443; break; }
-				Expect(40, la); // "<"
-				currentState = 444;
-				break;
-			}
-			case 444: {
-				wasNormalAttribute = true; PushContext(Context.Attribute, la, t);
-				goto case 445;
-			}
-			case 445: {
-				if (la == null) { currentState = 445; break; }
-				if (la.kind == 65 || la.kind == 155) {
-					currentState = 449;
-					break;
-				} else {
-					goto case 446;
-				}
-			}
-			case 446: {
-				if (la == null) { currentState = 446; break; }
-				if (set[145].Get(la.kind)) {
-					currentState = 446;
-					break;
-				} else {
-					Expect(39, la); // ">"
-					currentState = 447;
-					break;
-				}
-			}
-			case 447: {
-				PopContext();
-				goto case 448;
-			}
-			case 448: {
-				if (la == null) { currentState = 448; break; }
-				if (la.kind == 1) {
-					goto case 25;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 449: {
-				if (la == null) { currentState = 449; break; }
-				Expect(21, la); // ":"
-				currentState = 450;
-				break;
-			}
-			case 450: {
-				wasNormalAttribute = false;
-				goto case 446;
-			}
-			case 451: {
-				stateStack.Push(452);
-				goto case 424;
-			}
-			case 452: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 453;
-			}
-			case 453: {
-				if (la == null) { currentState = 453; break; }
-				if (set[50].Get(la.kind)) {
-					goto case 267;
-				} else {
-					if (la.kind == 1 || la.kind == 21) {
-						stateStack.Push(454);
-						goto case 259;
-					} else {
-						goto case 6;
-					}
-				}
-			}
-			case 454: {
-				if (la == null) { currentState = 454; break; }
-				Expect(113, la); // "End"
-				currentState = 455;
-				break;
-			}
-			case 455: {
-				if (la == null) { currentState = 455; break; }
-				Expect(210, la); // "Sub"
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 456: {
-				if (la == null) { currentState = 456; break; }
-				if (la.kind == 17 || la.kind == 18 || la.kind == 19) {
-					currentState = 469;
-					break;
-				} else {
-					if (la.kind == 10) {
-						stateStack.Push(458);
-						goto case 460;
-					} else {
-						Error(la);
-						goto case 457;
-					}
-				}
-			}
-			case 457: {
-				PopContext();
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 458: {
-				if (la == null) { currentState = 458; break; }
-				if (la.kind == 17) {
-					currentState = 459;
-					break;
-				} else {
-					goto case 457;
-				}
-			}
-			case 459: {
-				if (la == null) { currentState = 459; break; }
-				if (la.kind == 16) {
-					currentState = 458;
-					break;
-				} else {
-					goto case 458;
-				}
-			}
-			case 460: {
-				PushContext(Context.Xml, la, t);
-				goto case 461;
-			}
-			case 461: {
-				if (la == null) { currentState = 461; break; }
-				Expect(10, la); // XmlOpenTag
-				currentState = 462;
-				break;
-			}
-			case 462: {
-				if (la == null) { currentState = 462; break; }
-				if (set[146].Get(la.kind)) {
-					if (set[147].Get(la.kind)) {
-						currentState = 462;
-						break;
-					} else {
-						if (la.kind == 12) {
-							stateStack.Push(462);
-							goto case 466;
-						} else {
-							Error(la);
-							goto case 462;
-						}
-					}
-				} else {
-					if (la.kind == 14) {
-						currentState = 463;
-						break;
-					} else {
-						if (la.kind == 11) {
-							currentState = 464;
-							break;
-						} else {
-							Error(la);
-							goto case 463;
-						}
-					}
-				}
-			}
-			case 463: {
-				PopContext();
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 464: {
-				if (la == null) { currentState = 464; break; }
-				if (set[148].Get(la.kind)) {
-					if (set[149].Get(la.kind)) {
-						currentState = 464;
-						break;
-					} else {
-						if (la.kind == 12) {
-							stateStack.Push(464);
-							goto case 466;
-						} else {
-							if (la.kind == 10) {
-								stateStack.Push(464);
-								goto case 460;
-							} else {
-								Error(la);
-								goto case 464;
-							}
-						}
-					}
-				} else {
-					Expect(15, la); // XmlOpenEndTag
-					currentState = 465;
-					break;
-				}
-			}
-			case 465: {
-				if (la == null) { currentState = 465; break; }
-				if (set[150].Get(la.kind)) {
-					if (set[151].Get(la.kind)) {
-						currentState = 465;
-						break;
-					} else {
-						if (la.kind == 12) {
-							stateStack.Push(465);
-							goto case 466;
-						} else {
-							Error(la);
-							goto case 465;
-						}
-					}
-				} else {
-					Expect(11, la); // XmlCloseTag
-					currentState = 463;
-					break;
-				}
-			}
-			case 466: {
-				if (la == null) { currentState = 466; break; }
-				Expect(12, la); // XmlStartInlineVB
-				currentState = 467;
-				break;
-			}
-			case 467: {
-				stateStack.Push(468);
-				goto case 55;
-			}
-			case 468: {
-				if (la == null) { currentState = 468; break; }
-				Expect(13, la); // XmlEndInlineVB
-				currentState = stateStack.Pop();
-				break;
-			}
-			case 469: {
-				if (la == null) { currentState = 469; break; }
-				if (la.kind == 16) {
-					currentState = 470;
-					break;
-				} else {
-					goto case 470;
-				}
-			}
-			case 470: {
-				if (la == null) { currentState = 470; break; }
-				if (la.kind == 17 || la.kind == 19) {
-					currentState = 469;
-					break;
-				} else {
-					if (la.kind == 10) {
-						stateStack.Push(471);
-						goto case 460;
-					} else {
-						goto case 457;
-					}
-				}
-			}
-			case 471: {
-				if (la == null) { currentState = 471; break; }
-				if (la.kind == 17) {
-					currentState = 472;
-					break;
-				} else {
-					goto case 457;
-				}
-			}
-			case 472: {
-				if (la == null) { currentState = 472; break; }
-				if (la.kind == 16) {
-					currentState = 471;
-					break;
-				} else {
-					goto case 471;
-				}
-			}
-			case 473: {
-				if (la == null) { currentState = 473; break; }
-				Expect(37, la); // "("
-				currentState = 474;
-				break;
-			}
-			case 474: {
-				readXmlIdentifier = true;
-				stateStack.Push(475);
-				goto case 205;
-			}
-			case 475: {
-				if (la == null) { currentState = 475; break; }
-				Expect(38, la); // ")"
-				currentState = 175;
-				break;
-			}
-			case 476: {
-				if (la == null) { currentState = 476; break; }
-				Expect(37, la); // "("
-				currentState = 477;
-				break;
-			}
-			case 477: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(478);
-				goto case 37;
-			}
-			case 478: {
-				PopContext();
-				goto case 475;
-			}
-			case 479: {
-				nextTokenIsStartOfImportsOrAccessExpression = true; wasQualifierTokenAtStart = true;
-				goto case 480;
-			}
-			case 480: {
-				if (la == null) { currentState = 480; break; }
-				if (la.kind == 10) {
-					currentState = 481;
-					break;
-				} else {
-					goto case 481;
-				}
-			}
-			case 481: {
-				stateStack.Push(482);
-				goto case 101;
-			}
-			case 482: {
-				if (la == null) { currentState = 482; break; }
-				if (la.kind == 11) {
-					currentState = 175;
-					break;
-				} else {
-					goto case 175;
-				}
-			}
-			case 483: {
-				activeArgument = 0;
-				goto case 484;
-			}
-			case 484: {
-				stateStack.Push(485);
-				goto case 55;
-			}
-			case 485: {
-				if (la == null) { currentState = 485; break; }
-				if (la.kind == 22) {
-					currentState = 486;
-					break;
-				} else {
-					goto case 475;
-				}
-			}
-			case 486: {
-				activeArgument++;
-				goto case 484;
-			}
-			case 487: {
-				stateStack.Push(488);
-				goto case 55;
-			}
-			case 488: {
-				if (la == null) { currentState = 488; break; }
-				if (la.kind == 22) {
-					currentState = 489;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 489: {
-				activeArgument++;
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 490;
-			}
-			case 490: {
-				if (la == null) { currentState = 490; break; }
-				if (set[23].Get(la.kind)) {
-					goto case 487;
-				} else {
-					goto case 488;
-				}
-			}
-			case 491: {
-				if (la == null) { currentState = 491; break; }
-				if (set[16].Get(la.kind)) {
-					PushContext(Context.Type, la, t);
-					stateStack.Push(495);
-					goto case 37;
-				} else {
-					goto case 492;
-				}
-			}
-			case 492: {
-				if (la == null) { currentState = 492; break; }
-				if (la.kind == 22) {
-					currentState = 493;
-					break;
-				} else {
-					goto case 45;
-				}
-			}
-			case 493: {
-				if (la == null) { currentState = 493; break; }
-				if (set[16].Get(la.kind)) {
-					PushContext(Context.Type, la, t);
-					stateStack.Push(494);
-					goto case 37;
-				} else {
-					goto case 492;
-				}
-			}
-			case 494: {
-				PopContext();
-				goto case 492;
-			}
-			case 495: {
-				PopContext();
-				goto case 492;
-			}
-			case 496: {
-				SetIdentifierExpected(la);
-				goto case 497;
-			}
-			case 497: {
-				if (la == null) { currentState = 497; break; }
-				if (set[152].Get(la.kind)) {
-					if (la.kind == 169) {
-						currentState = 499;
-						break;
-					} else {
-						if (set[77].Get(la.kind)) {
-							stateStack.Push(498);
-							goto case 428;
-						} else {
-							Error(la);
-							goto case 498;
-						}
-					}
-				} else {
-					goto case 498;
-				}
-			}
-			case 498: {
-				if (la == null) { currentState = 498; break; }
-				Expect(38, la); // ")"
-				currentState = 34;
-				break;
-			}
-			case 499: {
-				stateStack.Push(498);
-				goto case 500;
-			}
-			case 500: {
-				SetIdentifierExpected(la);
-				goto case 501;
-			}
-			case 501: {
-				if (la == null) { currentState = 501; break; }
-				if (la.kind == 138 || la.kind == 178) {
-					currentState = 502;
-					break;
-				} else {
-					goto case 502;
-				}
-			}
-			case 502: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				stateStack.Push(503);
-				goto case 517;
-			}
-			case 503: {
-				PopContext();
-				goto case 504;
-			}
-			case 504: {
-				if (la == null) { currentState = 504; break; }
-				if (la.kind == 63) {
-					currentState = 518;
-					break;
-				} else {
-					goto case 505;
-				}
-			}
-			case 505: {
-				if (la == null) { currentState = 505; break; }
-				if (la.kind == 22) {
-					currentState = 506;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 506: {
-				SetIdentifierExpected(la);
-				goto case 507;
-			}
-			case 507: {
-				if (la == null) { currentState = 507; break; }
-				if (la.kind == 138 || la.kind == 178) {
-					currentState = 508;
-					break;
-				} else {
-					goto case 508;
-				}
-			}
-			case 508: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				stateStack.Push(509);
-				goto case 517;
-			}
-			case 509: {
-				PopContext();
-				goto case 510;
-			}
-			case 510: {
-				if (la == null) { currentState = 510; break; }
-				if (la.kind == 63) {
-					currentState = 511;
-					break;
-				} else {
-					goto case 505;
-				}
-			}
-			case 511: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(512);
-				goto case 513;
-			}
-			case 512: {
-				PopContext();
-				goto case 505;
-			}
-			case 513: {
-				if (la == null) { currentState = 513; break; }
-				if (set[94].Get(la.kind)) {
-					goto case 516;
-				} else {
-					if (la.kind == 35) {
-						currentState = 514;
-						break;
-					} else {
-						goto case 6;
-					}
-				}
-			}
-			case 514: {
-				stateStack.Push(515);
-				goto case 516;
-			}
-			case 515: {
-				if (la == null) { currentState = 515; break; }
-				if (la.kind == 22) {
-					currentState = 514;
-					break;
-				} else {
-					goto case 82;
-				}
-			}
-			case 516: {
-				if (la == null) { currentState = 516; break; }
-				if (set[16].Get(la.kind)) {
-					currentState = 38;
-					break;
-				} else {
-					if (la.kind == 162) {
-						goto case 121;
-					} else {
-						if (la.kind == 84) {
-							goto case 137;
-						} else {
-							if (la.kind == 209) {
-								goto case 112;
-							} else {
-								goto case 6;
-							}
-						}
-					}
-				}
-			}
-			case 517: {
-				if (la == null) { currentState = 517; break; }
-				if (la.kind == 2) {
-					goto case 145;
-				} else {
-					if (la.kind == 62) {
-						goto case 143;
-					} else {
-						if (la.kind == 64) {
-							goto case 142;
-						} else {
-							if (la.kind == 65) {
-								goto case 141;
-							} else {
-								if (la.kind == 66) {
-									goto case 140;
-								} else {
-									if (la.kind == 67) {
-										goto case 139;
-									} else {
-										if (la.kind == 70) {
-											goto case 138;
-										} else {
-											if (la.kind == 87) {
-												goto case 136;
-											} else {
-												if (la.kind == 104) {
-													goto case 134;
-												} else {
-													if (la.kind == 107) {
-														goto case 133;
-													} else {
-														if (la.kind == 116) {
-															goto case 131;
-														} else {
-															if (la.kind == 121) {
-																goto case 130;
-															} else {
-																if (la.kind == 133) {
-																	goto case 126;
-																} else {
-																	if (la.kind == 139) {
-																		goto case 125;
-																	} else {
-																		if (la.kind == 143) {
-																			goto case 124;
-																		} else {
-																			if (la.kind == 146) {
-																				goto case 123;
-																			} else {
-																				if (la.kind == 147) {
-																					goto case 122;
-																				} else {
-																					if (la.kind == 170) {
-																						goto case 119;
-																					} else {
-																						if (la.kind == 176) {
-																							goto case 118;
-																						} else {
-																							if (la.kind == 184) {
-																								goto case 117;
-																							} else {
-																								if (la.kind == 203) {
-																									goto case 114;
-																								} else {
-																									if (la.kind == 212) {
-																										goto case 109;
-																									} else {
-																										if (la.kind == 213) {
-																											goto case 108;
-																										} else {
-																											if (la.kind == 223) {
-																												goto case 106;
-																											} else {
-																												if (la.kind == 224) {
-																													goto case 105;
-																												} else {
-																													if (la.kind == 230) {
-																														goto case 104;
-																													} else {
-																														goto case 6;
-																													}
-																												}
-																											}
-																										}
-																									}
-																								}
-																							}
-																						}
-																					}
-																				}
-																			}
-																		}
-																	}
-																}
-															}
-														}
-													}
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			case 518: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(519);
-				goto case 513;
-			}
-			case 519: {
-				PopContext();
-				goto case 505;
-			}
-			case 520: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				stateStack.Push(521);
-				goto case 205;
-			}
-			case 521: {
-				PopContext();
-				goto case 522;
-			}
-			case 522: {
-				if (la == null) { currentState = 522; break; }
-				if (la.kind == 37) {
-					stateStack.Push(523);
-					goto case 424;
-				} else {
-					goto case 523;
-				}
-			}
-			case 523: {
-				if (la == null) { currentState = 523; break; }
-				if (la.kind == 63) {
-					currentState = 524;
-					break;
-				} else {
-					goto case 23;
-				}
-			}
-			case 524: {
-				PushContext(Context.Type, la, t);
-				goto case 525;
-			}
-			case 525: {
-				if (la == null) { currentState = 525; break; }
-				if (la.kind == 40) {
-					stateStack.Push(525);
-					goto case 443;
-				} else {
-					stateStack.Push(526);
-					goto case 37;
-				}
-			}
-			case 526: {
-				PopContext();
-				goto case 23;
-			}
-			case 527: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				stateStack.Push(528);
-				goto case 205;
-			}
-			case 528: {
-				PopContext();
-				goto case 529;
-			}
-			case 529: {
-				if (la == null) { currentState = 529; break; }
-				if (la.kind == 37 || la.kind == 63) {
-					if (la.kind == 63) {
-						currentState = 531;
-						break;
-					} else {
-						if (la.kind == 37) {
-							stateStack.Push(23);
-							goto case 424;
-						} else {
-							goto case 530;
-						}
-					}
-				} else {
-					goto case 23;
-				}
-			}
-			case 530: {
-				Error(la);
-				goto case 23;
-			}
-			case 531: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(532);
-				goto case 37;
-			}
-			case 532: {
-				PopContext();
-				goto case 23;
-			}
-			case 533: {
-				PushContext(Context.TypeDeclaration, la, t);
-				goto case 534;
-			}
-			case 534: {
-				if (la == null) { currentState = 534; break; }
-				Expect(115, la); // "Enum"
-				currentState = 535;
-				break;
-			}
-			case 535: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				stateStack.Push(536);
-				goto case 205;
-			}
-			case 536: {
-				PopContext();
-				goto case 537;
-			}
-			case 537: {
-				if (la == null) { currentState = 537; break; }
-				if (la.kind == 63) {
-					currentState = 549;
-					break;
-				} else {
-					goto case 538;
-				}
-			}
-			case 538: {
-				stateStack.Push(539);
-				goto case 23;
-			}
-			case 539: {
-				SetIdentifierExpected(la);
-				goto case 540;
-			}
-			case 540: {
-				if (la == null) { currentState = 540; break; }
-				if (set[97].Get(la.kind)) {
-					goto case 544;
-				} else {
-					Expect(113, la); // "End"
-					currentState = 541;
-					break;
-				}
-			}
-			case 541: {
-				if (la == null) { currentState = 541; break; }
-				Expect(115, la); // "Enum"
-				currentState = 542;
-				break;
-			}
-			case 542: {
-				stateStack.Push(543);
-				goto case 23;
-			}
-			case 543: {
-				PopContext();
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 544: {
-				SetIdentifierExpected(la);
-				goto case 545;
-			}
-			case 545: {
-				if (la == null) { currentState = 545; break; }
-				if (la.kind == 40) {
-					stateStack.Push(544);
-					goto case 443;
-				} else {
-					PushContext(Context.Identifier, la, t);
-					SetIdentifierExpected(la);
-					stateStack.Push(546);
-					goto case 205;
-				}
-			}
-			case 546: {
-				PopContext();
-				goto case 547;
-			}
-			case 547: {
-				if (la == null) { currentState = 547; break; }
-				if (la.kind == 20) {
-					currentState = 548;
-					break;
-				} else {
-					goto case 538;
-				}
-			}
-			case 548: {
-				stateStack.Push(538);
-				goto case 55;
-			}
-			case 549: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(550);
-				goto case 37;
-			}
-			case 550: {
-				PopContext();
-				goto case 538;
-			}
-			case 551: {
-				if (la == null) { currentState = 551; break; }
-				Expect(103, la); // "Delegate"
-				currentState = 552;
-				break;
-			}
-			case 552: {
-				if (la == null) { currentState = 552; break; }
-				if (la.kind == 210) {
-					currentState = 553;
-					break;
-				} else {
-					if (la.kind == 127) {
-						currentState = 553;
-						break;
-					} else {
-						Error(la);
-						goto case 553;
-					}
-				}
-			}
-			case 553: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				goto case 554;
-			}
-			case 554: {
-				if (la == null) { currentState = 554; break; }
-				currentState = 555;
-				break;
-			}
-			case 555: {
-				PopContext();
-				goto case 556;
-			}
-			case 556: {
-				if (la == null) { currentState = 556; break; }
-				if (la.kind == 37) {
-					currentState = 559;
-					break;
-				} else {
-					if (la.kind == 63) {
-						currentState = 557;
-						break;
-					} else {
-						goto case 23;
-					}
-				}
-			}
-			case 557: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(558);
-				goto case 37;
-			}
-			case 558: {
-				PopContext();
-				goto case 23;
-			}
-			case 559: {
-				SetIdentifierExpected(la);
-				goto case 560;
-			}
-			case 560: {
-				if (la == null) { currentState = 560; break; }
-				if (set[152].Get(la.kind)) {
-					if (la.kind == 169) {
-						currentState = 562;
-						break;
-					} else {
-						if (set[77].Get(la.kind)) {
-							stateStack.Push(561);
-							goto case 428;
-						} else {
-							Error(la);
-							goto case 561;
-						}
-					}
-				} else {
-					goto case 561;
-				}
-			}
-			case 561: {
-				if (la == null) { currentState = 561; break; }
-				Expect(38, la); // ")"
-				currentState = 556;
-				break;
-			}
-			case 562: {
-				stateStack.Push(561);
-				goto case 500;
-			}
-			case 563: {
-				PushContext(Context.TypeDeclaration, la, t);
-				goto case 564;
-			}
-			case 564: {
-				if (la == null) { currentState = 564; break; }
-				if (la.kind == 155) {
-					currentState = 565;
-					break;
-				} else {
-					if (la.kind == 84) {
-						currentState = 565;
-						break;
-					} else {
-						if (la.kind == 209) {
-							currentState = 565;
-							break;
-						} else {
-							Error(la);
-							goto case 565;
-						}
-					}
-				}
-			}
-			case 565: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				stateStack.Push(566);
-				goto case 205;
-			}
-			case 566: {
-				PopContext();
-				goto case 567;
-			}
-			case 567: {
-				if (la == null) { currentState = 567; break; }
-				if (la.kind == 37) {
-					currentState = 717;
-					break;
-				} else {
-					goto case 568;
-				}
-			}
-			case 568: {
-				stateStack.Push(569);
-				goto case 23;
-			}
-			case 569: {
-				SetIdentifierExpected(la);
-				isMissingModifier = true;
-				goto case 570;
-			}
-			case 570: {
-				if (la == null) { currentState = 570; break; }
-				if (la.kind == 140) {
-					isMissingModifier = false;
-					goto case 714;
-				} else {
-					goto case 571;
-				}
-			}
-			case 571: {
-				SetIdentifierExpected(la);
-				isMissingModifier = true;
-				goto case 572;
-			}
-			case 572: {
-				if (la == null) { currentState = 572; break; }
-				if (la.kind == 136) {
-					isMissingModifier = false;
-					goto case 708;
-				} else {
-					goto case 573;
-				}
-			}
-			case 573: {
-				SetIdentifierExpected(la);
-				isMissingModifier = true;
-				goto case 574;
-			}
-			case 574: {
-				if (la == null) { currentState = 574; break; }
-				if (set[101].Get(la.kind)) {
-					goto case 579;
-				} else {
-					isMissingModifier = false;
-					goto case 575;
-				}
-			}
-			case 575: {
-				if (la == null) { currentState = 575; break; }
-				Expect(113, la); // "End"
-				currentState = 576;
-				break;
-			}
-			case 576: {
-				if (la == null) { currentState = 576; break; }
-				if (la.kind == 155) {
-					currentState = 577;
-					break;
-				} else {
-					if (la.kind == 84) {
-						currentState = 577;
-						break;
-					} else {
-						if (la.kind == 209) {
-							currentState = 577;
-							break;
-						} else {
-							Error(la);
-							goto case 577;
-						}
-					}
-				}
-			}
-			case 577: {
-				stateStack.Push(578);
-				goto case 23;
-			}
-			case 578: {
-				PopContext();
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 579: {
-				SetIdentifierExpected(la);
-				isMissingModifier = true;
-				goto case 580;
-			}
-			case 580: {
-				if (la == null) { currentState = 580; break; }
-				if (la.kind == 40) {
-					stateStack.Push(579);
-					goto case 443;
-				} else {
-					isMissingModifier = true;
-					goto case 581;
-				}
-			}
-			case 581: {
-				SetIdentifierExpected(la);
-				goto case 582;
-			}
-			case 582: {
-				if (la == null) { currentState = 582; break; }
-				if (set[133].Get(la.kind)) {
-					currentState = 707;
-					break;
-				} else {
-					isMissingModifier = false;
-					SetIdentifierExpected(la);
-					goto case 583;
-				}
-			}
-			case 583: {
-				if (la == null) { currentState = 583; break; }
-				if (la.kind == 84 || la.kind == 155 || la.kind == 209) {
-					stateStack.Push(573);
-					goto case 563;
-				} else {
-					if (la.kind == 103) {
-						stateStack.Push(573);
-						goto case 551;
-					} else {
-						if (la.kind == 115) {
-							stateStack.Push(573);
-							goto case 533;
-						} else {
-							if (la.kind == 142) {
-								stateStack.Push(573);
-								goto case 9;
-							} else {
-								if (set[104].Get(la.kind)) {
-									stateStack.Push(573);
-									PushContext(Context.Member, la, t);
-									SetIdentifierExpected(la);
-									goto case 584;
-								} else {
-									Error(la);
-									goto case 573;
-								}
-							}
-						}
-					}
-				}
-			}
-			case 584: {
-				if (la == null) { currentState = 584; break; }
-				if (set[122].Get(la.kind)) {
-					stateStack.Push(585);
-					goto case 692;
-				} else {
-					if (la.kind == 127 || la.kind == 210) {
-						stateStack.Push(585);
-						goto case 674;
-					} else {
-						if (la.kind == 101) {
-							stateStack.Push(585);
-							goto case 661;
-						} else {
-							if (la.kind == 119) {
-								stateStack.Push(585);
-								goto case 649;
-							} else {
-								if (la.kind == 98) {
-									stateStack.Push(585);
-									goto case 637;
-								} else {
-									if (la.kind == 186) {
-										stateStack.Push(585);
-										goto case 600;
-									} else {
-										if (la.kind == 172) {
-											stateStack.Push(585);
-											goto case 586;
-										} else {
-											Error(la);
-											goto case 585;
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			case 585: {
-				PopContext();
-				currentState = stateStack.Pop();
-				goto switchlbl;
-			}
-			case 586: {
-				if (la == null) { currentState = 586; break; }
-				Expect(172, la); // "Operator"
-				currentState = 587;
-				break;
-			}
-			case 587: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				goto case 588;
-			}
-			case 588: {
-				if (la == null) { currentState = 588; break; }
-				currentState = 589;
-				break;
-			}
-			case 589: {
-				PopContext();
-				goto case 590;
-			}
-			case 590: {
-				if (la == null) { currentState = 590; break; }
-				Expect(37, la); // "("
-				currentState = 591;
-				break;
-			}
-			case 591: {
-				stateStack.Push(592);
-				goto case 428;
-			}
-			case 592: {
-				if (la == null) { currentState = 592; break; }
-				Expect(38, la); // ")"
-				currentState = 593;
-				break;
-			}
-			case 593: {
-				if (la == null) { currentState = 593; break; }
-				if (la.kind == 63) {
-					currentState = 597;
-					break;
-				} else {
-					goto case 594;
-				}
-			}
-			case 594: {
-				stateStack.Push(595);
-				goto case 259;
-			}
-			case 595: {
-				if (la == null) { currentState = 595; break; }
-				Expect(113, la); // "End"
-				currentState = 596;
-				break;
-			}
-			case 596: {
-				if (la == null) { currentState = 596; break; }
-				Expect(172, la); // "Operator"
-				currentState = 23;
-				break;
-			}
-			case 597: {
-				PushContext(Context.Type, la, t);
-				goto case 598;
-			}
-			case 598: {
-				if (la == null) { currentState = 598; break; }
-				if (la.kind == 40) {
-					stateStack.Push(598);
-					goto case 443;
-				} else {
-					stateStack.Push(599);
-					goto case 37;
-				}
-			}
-			case 599: {
-				PopContext();
-				goto case 594;
-			}
-			case 600: {
-				if (la == null) { currentState = 600; break; }
-				Expect(186, la); // "Property"
-				currentState = 601;
-				break;
-			}
-			case 601: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				stateStack.Push(602);
-				goto case 205;
-			}
-			case 602: {
-				PopContext();
-				goto case 603;
-			}
-			case 603: {
-				if (la == null) { currentState = 603; break; }
-				if (la.kind == 37) {
-					stateStack.Push(604);
-					goto case 424;
-				} else {
-					goto case 604;
-				}
-			}
-			case 604: {
-				if (la == null) { currentState = 604; break; }
-				if (la.kind == 63) {
-					currentState = 634;
-					break;
-				} else {
-					goto case 605;
-				}
-			}
-			case 605: {
-				if (la == null) { currentState = 605; break; }
-				if (la.kind == 136) {
-					currentState = 629;
-					break;
-				} else {
-					goto case 606;
-				}
-			}
-			case 606: {
-				if (la == null) { currentState = 606; break; }
-				if (la.kind == 20) {
-					currentState = 628;
-					break;
-				} else {
-					goto case 607;
-				}
-			}
-			case 607: {
-				stateStack.Push(608);
-				goto case 23;
-			}
-			case 608: {
-				PopContext();
-				goto case 609;
-			}
-			case 609: {
-				if (la == null) { currentState = 609; break; }
-				if (la.kind == 40) {
-					stateStack.Push(609);
-					goto case 443;
-				} else {
-					goto case 610;
-				}
-			}
-			case 610: {
-				if (la == null) { currentState = 610; break; }
-				if (set[153].Get(la.kind)) {
-					currentState = 627;
-					break;
-				} else {
-					if (la.kind == 128 || la.kind == 198) {
-						PushContext(Context.Member, la, t);
-						goto case 611;
-					} else {
-						currentState = stateStack.Pop();
-						goto switchlbl;
-					}
-				}
-			}
-			case 611: {
-				if (la == null) { currentState = 611; break; }
-				if (la.kind == 128) {
-					currentState = 612;
-					break;
-				} else {
-					if (la.kind == 198) {
-						currentState = 612;
-						break;
-					} else {
-						Error(la);
-						goto case 612;
-					}
-				}
-			}
-			case 612: {
-				if (la == null) { currentState = 612; break; }
-				if (la.kind == 37) {
-					stateStack.Push(613);
-					goto case 424;
-				} else {
-					goto case 613;
-				}
-			}
-			case 613: {
-				stateStack.Push(614);
-				goto case 259;
-			}
-			case 614: {
-				if (la == null) { currentState = 614; break; }
-				Expect(113, la); // "End"
-				currentState = 615;
-				break;
-			}
-			case 615: {
-				if (la == null) { currentState = 615; break; }
-				if (la.kind == 128) {
-					currentState = 616;
-					break;
-				} else {
-					if (la.kind == 198) {
-						currentState = 616;
-						break;
-					} else {
-						Error(la);
-						goto case 616;
-					}
-				}
-			}
-			case 616: {
-				stateStack.Push(617);
-				goto case 23;
-			}
-			case 617: {
-				if (la == null) { currentState = 617; break; }
-				if (set[110].Get(la.kind)) {
-					goto case 620;
-				} else {
-					goto case 618;
-				}
-			}
-			case 618: {
-				if (la == null) { currentState = 618; break; }
-				Expect(113, la); // "End"
-				currentState = 619;
-				break;
-			}
-			case 619: {
-				if (la == null) { currentState = 619; break; }
-				Expect(186, la); // "Property"
-				currentState = 23;
-				break;
-			}
-			case 620: {
-				if (la == null) { currentState = 620; break; }
-				if (la.kind == 40) {
-					stateStack.Push(620);
-					goto case 443;
-				} else {
-					goto case 621;
-				}
-			}
-			case 621: {
-				if (la == null) { currentState = 621; break; }
-				if (set[153].Get(la.kind)) {
-					currentState = 621;
-					break;
-				} else {
-					if (la.kind == 128) {
-						currentState = 622;
-						break;
-					} else {
-						if (la.kind == 198) {
-							currentState = 622;
-							break;
-						} else {
-							Error(la);
-							goto case 622;
-						}
-					}
-				}
-			}
-			case 622: {
-				if (la == null) { currentState = 622; break; }
-				if (la.kind == 37) {
-					stateStack.Push(623);
-					goto case 424;
-				} else {
-					goto case 623;
-				}
-			}
-			case 623: {
-				stateStack.Push(624);
-				goto case 259;
-			}
-			case 624: {
-				if (la == null) { currentState = 624; break; }
-				Expect(113, la); // "End"
-				currentState = 625;
-				break;
-			}
-			case 625: {
-				if (la == null) { currentState = 625; break; }
-				if (la.kind == 128) {
-					currentState = 626;
-					break;
-				} else {
-					if (la.kind == 198) {
-						currentState = 626;
-						break;
-					} else {
-						Error(la);
-						goto case 626;
-					}
-				}
-			}
-			case 626: {
-				stateStack.Push(618);
-				goto case 23;
-			}
-			case 627: {
-				SetIdentifierExpected(la);
-				goto case 610;
-			}
-			case 628: {
-				stateStack.Push(607);
-				goto case 55;
-			}
-			case 629: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(630);
-				goto case 37;
-			}
-			case 630: {
-				PopContext();
-				goto case 631;
-			}
-			case 631: {
-				if (la == null) { currentState = 631; break; }
-				if (la.kind == 22) {
-					currentState = 632;
-					break;
-				} else {
-					goto case 606;
-				}
-			}
-			case 632: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(633);
-				goto case 37;
-			}
-			case 633: {
-				PopContext();
-				goto case 631;
-			}
-			case 634: {
-				PushContext(Context.Type, la, t);
-				goto case 635;
-			}
-			case 635: {
-				if (la == null) { currentState = 635; break; }
-				if (la.kind == 40) {
-					stateStack.Push(635);
-					goto case 443;
-				} else {
-					if (la.kind == 162) {
-						stateStack.Push(636);
-						goto case 85;
-					} else {
-						if (set[16].Get(la.kind)) {
-							stateStack.Push(636);
-							goto case 37;
-						} else {
-							Error(la);
-							goto case 636;
-						}
-					}
-				}
-			}
-			case 636: {
-				PopContext();
-				goto case 605;
-			}
-			case 637: {
-				if (la == null) { currentState = 637; break; }
-				Expect(98, la); // "Custom"
-				currentState = 638;
-				break;
-			}
-			case 638: {
-				stateStack.Push(639);
-				goto case 649;
-			}
-			case 639: {
-				if (la == null) { currentState = 639; break; }
-				if (set[115].Get(la.kind)) {
-					goto case 641;
-				} else {
-					Expect(113, la); // "End"
-					currentState = 640;
-					break;
-				}
-			}
-			case 640: {
-				if (la == null) { currentState = 640; break; }
-				Expect(119, la); // "Event"
-				currentState = 23;
-				break;
-			}
-			case 641: {
-				if (la == null) { currentState = 641; break; }
-				if (la.kind == 40) {
-					stateStack.Push(641);
-					goto case 443;
-				} else {
-					if (la.kind == 56) {
-						currentState = 642;
-						break;
-					} else {
-						if (la.kind == 193) {
-							currentState = 642;
-							break;
-						} else {
-							if (la.kind == 189) {
-								currentState = 642;
-								break;
-							} else {
-								Error(la);
-								goto case 642;
-							}
-						}
-					}
-				}
-			}
-			case 642: {
-				if (la == null) { currentState = 642; break; }
-				Expect(37, la); // "("
-				currentState = 643;
-				break;
-			}
-			case 643: {
-				stateStack.Push(644);
-				goto case 428;
-			}
-			case 644: {
-				if (la == null) { currentState = 644; break; }
-				Expect(38, la); // ")"
-				currentState = 645;
-				break;
-			}
-			case 645: {
-				stateStack.Push(646);
-				goto case 259;
-			}
-			case 646: {
-				if (la == null) { currentState = 646; break; }
-				Expect(113, la); // "End"
-				currentState = 647;
-				break;
-			}
-			case 647: {
-				if (la == null) { currentState = 647; break; }
-				if (la.kind == 56) {
-					currentState = 648;
-					break;
-				} else {
-					if (la.kind == 193) {
-						currentState = 648;
-						break;
-					} else {
-						if (la.kind == 189) {
-							currentState = 648;
-							break;
-						} else {
-							Error(la);
-							goto case 648;
-						}
-					}
-				}
-			}
-			case 648: {
-				stateStack.Push(639);
-				goto case 23;
-			}
-			case 649: {
-				if (la == null) { currentState = 649; break; }
-				Expect(119, la); // "Event"
-				currentState = 650;
-				break;
-			}
-			case 650: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				stateStack.Push(651);
-				goto case 205;
-			}
-			case 651: {
-				PopContext();
-				goto case 652;
-			}
-			case 652: {
-				if (la == null) { currentState = 652; break; }
-				if (la.kind == 63) {
-					currentState = 659;
-					break;
-				} else {
-					if (set[154].Get(la.kind)) {
-						if (la.kind == 37) {
-							stateStack.Push(653);
-							goto case 424;
-						} else {
-							goto case 653;
-						}
-					} else {
-						Error(la);
-						goto case 653;
-					}
-				}
-			}
-			case 653: {
-				if (la == null) { currentState = 653; break; }
-				if (la.kind == 136) {
-					currentState = 654;
-					break;
-				} else {
-					goto case 23;
-				}
-			}
-			case 654: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(655);
-				goto case 37;
-			}
-			case 655: {
-				PopContext();
-				goto case 656;
-			}
-			case 656: {
-				if (la == null) { currentState = 656; break; }
-				if (la.kind == 22) {
-					currentState = 657;
-					break;
-				} else {
-					goto case 23;
-				}
-			}
-			case 657: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(658);
-				goto case 37;
-			}
-			case 658: {
-				PopContext();
-				goto case 656;
-			}
-			case 659: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(660);
-				goto case 37;
-			}
-			case 660: {
-				PopContext();
-				goto case 653;
-			}
-			case 661: {
-				if (la == null) { currentState = 661; break; }
-				Expect(101, la); // "Declare"
-				currentState = 662;
-				break;
-			}
-			case 662: {
-				if (la == null) { currentState = 662; break; }
-				if (la.kind == 62 || la.kind == 66 || la.kind == 223) {
-					currentState = 663;
-					break;
-				} else {
-					goto case 663;
-				}
-			}
-			case 663: {
-				if (la == null) { currentState = 663; break; }
-				if (la.kind == 210) {
-					currentState = 664;
-					break;
-				} else {
-					if (la.kind == 127) {
-						currentState = 664;
-						break;
-					} else {
-						Error(la);
-						goto case 664;
-					}
-				}
-			}
-			case 664: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				stateStack.Push(665);
-				goto case 205;
-			}
-			case 665: {
-				PopContext();
-				goto case 666;
-			}
-			case 666: {
-				if (la == null) { currentState = 666; break; }
-				Expect(149, la); // "Lib"
-				currentState = 667;
-				break;
-			}
-			case 667: {
-				if (la == null) { currentState = 667; break; }
-				Expect(3, la); // LiteralString
-				currentState = 668;
-				break;
-			}
-			case 668: {
-				if (la == null) { currentState = 668; break; }
-				if (la.kind == 59) {
-					currentState = 673;
-					break;
-				} else {
-					goto case 669;
-				}
-			}
-			case 669: {
-				if (la == null) { currentState = 669; break; }
-				if (la.kind == 37) {
-					stateStack.Push(670);
-					goto case 424;
-				} else {
-					goto case 670;
-				}
-			}
-			case 670: {
-				if (la == null) { currentState = 670; break; }
-				if (la.kind == 63) {
-					currentState = 671;
-					break;
-				} else {
-					goto case 23;
-				}
-			}
-			case 671: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(672);
-				goto case 37;
-			}
-			case 672: {
-				PopContext();
-				goto case 23;
-			}
-			case 673: {
-				if (la == null) { currentState = 673; break; }
-				Expect(3, la); // LiteralString
-				currentState = 669;
-				break;
-			}
-			case 674: {
-				if (la == null) { currentState = 674; break; }
-				if (la.kind == 210) {
-					currentState = 675;
-					break;
-				} else {
-					if (la.kind == 127) {
-						currentState = 675;
-						break;
-					} else {
-						Error(la);
-						goto case 675;
-					}
-				}
-			}
-			case 675: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				goto case 676;
-			}
-			case 676: {
-				if (la == null) { currentState = 676; break; }
-				currentState = 677;
-				break;
-			}
-			case 677: {
-				PopContext();
-				goto case 678;
-			}
-			case 678: {
-				if (la == null) { currentState = 678; break; }
-				if (la.kind == 37) {
-					currentState = 688;
-					break;
-				} else {
-					if (la.kind == 63) {
-						currentState = 686;
-						break;
-					} else {
-						goto case 679;
-					}
-				}
-			}
-			case 679: {
-				if (la == null) { currentState = 679; break; }
-				if (la.kind == 134 || la.kind == 136) {
-					currentState = 683;
-					break;
-				} else {
-					goto case 680;
-				}
-			}
-			case 680: {
-				stateStack.Push(681);
-				goto case 259;
-			}
-			case 681: {
-				if (la == null) { currentState = 681; break; }
-				Expect(113, la); // "End"
-				currentState = 682;
-				break;
-			}
-			case 682: {
-				if (la == null) { currentState = 682; break; }
-				if (la.kind == 210) {
-					currentState = 23;
-					break;
-				} else {
-					if (la.kind == 127) {
-						currentState = 23;
-						break;
-					} else {
-						goto case 530;
-					}
-				}
-			}
-			case 683: {
-				if (la == null) { currentState = 683; break; }
-				if (la.kind == 153 || la.kind == 158 || la.kind == 159) {
-					currentState = 685;
-					break;
-				} else {
-					goto case 684;
-				}
-			}
-			case 684: {
-				stateStack.Push(680);
-				goto case 37;
-			}
-			case 685: {
-				if (la == null) { currentState = 685; break; }
-				Expect(26, la); // "."
-				currentState = 684;
-				break;
-			}
-			case 686: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(687);
-				goto case 37;
-			}
-			case 687: {
-				PopContext();
-				goto case 679;
-			}
-			case 688: {
-				SetIdentifierExpected(la);
-				goto case 689;
-			}
-			case 689: {
-				if (la == null) { currentState = 689; break; }
-				if (set[152].Get(la.kind)) {
-					if (la.kind == 169) {
-						currentState = 691;
-						break;
-					} else {
-						if (set[77].Get(la.kind)) {
-							stateStack.Push(690);
-							goto case 428;
-						} else {
-							Error(la);
-							goto case 690;
-						}
-					}
-				} else {
-					goto case 690;
-				}
-			}
-			case 690: {
-				if (la == null) { currentState = 690; break; }
-				Expect(38, la); // ")"
-				currentState = 678;
-				break;
-			}
-			case 691: {
-				stateStack.Push(690);
-				goto case 500;
-			}
-			case 692: {
-				stateStack.Push(693);
-				SetIdentifierExpected(la);
-				goto case 694;
-			}
-			case 693: {
-				if (la == null) { currentState = 693; break; }
-				if (la.kind == 22) {
-					currentState = 692;
-					break;
-				} else {
-					goto case 23;
-				}
-			}
-			case 694: {
-				if (la == null) { currentState = 694; break; }
-				if (la.kind == 88) {
-					currentState = 695;
-					break;
-				} else {
-					goto case 695;
-				}
-			}
-			case 695: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				stateStack.Push(696);
-				goto case 706;
-			}
-			case 696: {
-				PopContext();
-				goto case 697;
-			}
-			case 697: {
-				if (la == null) { currentState = 697; break; }
-				if (la.kind == 33) {
-					currentState = 698;
-					break;
-				} else {
-					goto case 698;
-				}
-			}
-			case 698: {
-				if (la == null) { currentState = 698; break; }
-				if (la.kind == 37) {
-					currentState = 703;
-					break;
-				} else {
-					if (la.kind == 63) {
-						currentState = 700;
-						break;
-					} else {
-						goto case 699;
-					}
-				}
-			}
-			case 699: {
-				if (la == null) { currentState = 699; break; }
-				if (la.kind == 20) {
-					currentState = 55;
-					break;
-				} else {
-					currentState = stateStack.Pop();
-					goto switchlbl;
-				}
-			}
-			case 700: {
-				PushContext(Context.Type, la, t);
-				goto case 701;
-			}
-			case 701: {
-				if (la == null) { currentState = 701; break; }
-				if (la.kind == 162) {
-					stateStack.Push(702);
-					goto case 85;
-				} else {
-					if (set[16].Get(la.kind)) {
-						stateStack.Push(702);
-						goto case 37;
-					} else {
-						Error(la);
-						goto case 702;
-					}
-				}
-			}
-			case 702: {
-				PopContext();
-				goto case 699;
-			}
-			case 703: {
-				nextTokenIsPotentialStartOfExpression = true;
-				goto case 704;
-			}
-			case 704: {
-				if (la == null) { currentState = 704; break; }
-				if (set[23].Get(la.kind)) {
-					stateStack.Push(705);
-					goto case 55;
-				} else {
-					goto case 705;
-				}
-			}
-			case 705: {
-				if (la == null) { currentState = 705; break; }
-				if (la.kind == 22) {
-					currentState = 703;
-					break;
-				} else {
-					Expect(38, la); // ")"
-					currentState = 698;
-					break;
-				}
-			}
-			case 706: {
-				if (la == null) { currentState = 706; break; }
-				if (set[138].Get(la.kind)) {
-					currentState = stateStack.Pop();
-					break;
-				} else {
-					if (la.kind == 58) {
-						goto case 144;
-					} else {
-						if (la.kind == 126) {
-							goto case 128;
-						} else {
-							goto case 6;
-						}
-					}
-				}
-			}
-			case 707: {
-				isMissingModifier = false;
-				goto case 581;
-			}
-			case 708: {
-				if (la == null) { currentState = 708; break; }
-				Expect(136, la); // "Implements"
-				currentState = 709;
-				break;
-			}
-			case 709: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(710);
-				goto case 37;
-			}
-			case 710: {
-				PopContext();
-				goto case 711;
-			}
-			case 711: {
-				if (la == null) { currentState = 711; break; }
-				if (la.kind == 22) {
-					currentState = 712;
-					break;
-				} else {
-					stateStack.Push(573);
-					goto case 23;
-				}
-			}
-			case 712: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(713);
-				goto case 37;
-			}
-			case 713: {
-				PopContext();
-				goto case 711;
-			}
-			case 714: {
-				if (la == null) { currentState = 714; break; }
-				Expect(140, la); // "Inherits"
-				currentState = 715;
-				break;
-			}
-			case 715: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(716);
-				goto case 37;
-			}
-			case 716: {
-				PopContext();
-				stateStack.Push(571);
-				goto case 23;
-			}
-			case 717: {
-				if (la == null) { currentState = 717; break; }
-				Expect(169, la); // "Of"
-				currentState = 718;
-				break;
-			}
-			case 718: {
-				stateStack.Push(719);
-				goto case 500;
-			}
-			case 719: {
-				if (la == null) { currentState = 719; break; }
-				Expect(38, la); // ")"
-				currentState = 568;
-				break;
-			}
-			case 720: {
-				isMissingModifier = false;
-				goto case 28;
-			}
-			case 721: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(722);
-				goto case 37;
-			}
-			case 722: {
-				PopContext();
-				goto case 723;
-			}
-			case 723: {
-				if (la == null) { currentState = 723; break; }
-				if (la.kind == 22) {
-					currentState = 724;
-					break;
-				} else {
-					stateStack.Push(17);
-					goto case 23;
-				}
-			}
-			case 724: {
-				PushContext(Context.Type, la, t);
-				stateStack.Push(725);
-				goto case 37;
-			}
-			case 725: {
-				PopContext();
-				goto case 723;
-			}
-			case 726: {
-				if (la == null) { currentState = 726; break; }
-				Expect(169, la); // "Of"
-				currentState = 727;
-				break;
-			}
-			case 727: {
-				stateStack.Push(728);
-				goto case 500;
-			}
-			case 728: {
-				if (la == null) { currentState = 728; break; }
-				Expect(38, la); // ")"
-				currentState = 14;
-				break;
-			}
-			case 729: {
-				PushContext(Context.Identifier, la, t);
-				SetIdentifierExpected(la);
-				goto case 730;
-			}
-			case 730: {
-				if (la == null) { currentState = 730; break; }
-				if (set[49].Get(la.kind)) {
-					currentState = 730;
-					break;
-				} else {
-					PopContext();
-					stateStack.Push(731);
-					goto case 23;
-				}
-			}
-			case 731: {
-				if (la == null) { currentState = 731; break; }
-				if (set[3].Get(la.kind)) {
-					stateStack.Push(731);
-					goto case 5;
-				} else {
-					Expect(113, la); // "End"
-					currentState = 732;
-					break;
-				}
-			}
-			case 732: {
-				if (la == null) { currentState = 732; break; }
-				Expect(160, la); // "Namespace"
-				currentState = 23;
-				break;
-			}
-			case 733: {
-				if (la == null) { currentState = 733; break; }
-				Expect(137, la); // "Imports"
-				currentState = 734;
-				break;
-			}
-			case 734: {
-				PushContext(Context.Importable, la, t);
-				nextTokenIsStartOfImportsOrAccessExpression = true;	
-				goto case 735;
-			}
-			case 735: {
-				if (la == null) { currentState = 735; break; }
-				if (set[155].Get(la.kind)) {
-					currentState = 747;
-					break;
-				} else {
-					goto case 736;
-				}
-			}
-			case 736: {
-				if (la == null) { currentState = 736; break; }
-				if (la.kind == 10) {
-					currentState = 743;
-					break;
-				} else {
-					Error(la);
-					goto case 737;
-				}
-			}
-			case 737: {
-				if (la == null) { currentState = 737; break; }
-				if (la.kind == 22) {
-					currentState = 738;
-					break;
-				} else {
-					PopContext();
-					goto case 23;
-				}
-			}
-			case 738: {
-				nextTokenIsStartOfImportsOrAccessExpression = true;	
-				goto case 739;
-			}
-			case 739: {
-				if (la == null) { currentState = 739; break; }
-				if (set[155].Get(la.kind)) {
-					currentState = 740;
-					break;
-				} else {
-					goto case 736;
-				}
-			}
-			case 740: {
-				if (la == null) { currentState = 740; break; }
-				if (la.kind == 37) {
-					stateStack.Push(740);
-					goto case 42;
-				} else {
-					goto case 741;
-				}
-			}
-			case 741: {
-				if (la == null) { currentState = 741; break; }
-				if (la.kind == 20 || la.kind == 26) {
-					currentState = 742;
-					break;
-				} else {
-					goto case 737;
-				}
-			}
-			case 742: {
-				stateStack.Push(737);
-				goto case 37;
-			}
-			case 743: {
-				stateStack.Push(744);
-				goto case 205;
-			}
-			case 744: {
-				if (la == null) { currentState = 744; break; }
-				Expect(20, la); // "="
-				currentState = 745;
-				break;
-			}
-			case 745: {
-				if (la == null) { currentState = 745; break; }
-				Expect(3, la); // LiteralString
-				currentState = 746;
-				break;
-			}
-			case 746: {
-				if (la == null) { currentState = 746; break; }
-				Expect(11, la); // XmlCloseTag
-				currentState = 737;
-				break;
-			}
-			case 747: {
-				if (la == null) { currentState = 747; break; }
-				if (la.kind == 37) {
-					stateStack.Push(747);
-					goto case 42;
-				} else {
-					goto case 741;
-				}
-			}
-			case 748: {
-				if (la == null) { currentState = 748; break; }
-				Expect(173, la); // "Option"
-				currentState = 749;
-				break;
-			}
-			case 749: {
-				if (la == null) { currentState = 749; break; }
-				if (la.kind == 121 || la.kind == 139 || la.kind == 207) {
-					currentState = 751;
-					break;
-				} else {
-					if (la.kind == 87) {
-						currentState = 750;
-						break;
-					} else {
-						goto case 530;
-					}
-				}
-			}
-			case 750: {
-				if (la == null) { currentState = 750; break; }
-				if (la.kind == 213) {
-					currentState = 23;
-					break;
-				} else {
-					if (la.kind == 67) {
-						currentState = 23;
-						break;
-					} else {
-						goto case 530;
-					}
-				}
-			}
-			case 751: {
-				if (la == null) { currentState = 751; break; }
-				if (la.kind == 170 || la.kind == 171) {
-					currentState = 23;
-					break;
-				} else {
-					goto case 23;
-				}
-			}
-		}
-
-		if (la != null) {
-			t = la;
-			nextTokenIsPotentialStartOfExpression = false;
-			readXmlIdentifier = false;
-			nextTokenIsStartOfImportsOrAccessExpression = false;
-			wasQualifierTokenAtStart = false;
-			identifierExpected = false;
-		}
-	}
-	
-	public void Advance()
-	{
-		//Console.WriteLine("Advance");
-		InformToken(null);
-	}
-	
-	public BitArray GetExpectedSet() { return GetExpectedSet(currentState); }
-	
-	static readonly BitArray[] set = {
-		new BitArray(new int[] {1, 256, 1048576, 537395328, 402670080, 444604481, 131200, 0}),
-		new BitArray(new int[] {1, 256, 1048576, 537395328, 402670080, 444596289, 131200, 0}),
-		new BitArray(new int[] {1, 256, 1048576, 537395328, 402669568, 444596289, 131200, 0}),
-		new BitArray(new int[] {0, 256, 1048576, 537395328, 402669568, 444596289, 131200, 0}),
-		new BitArray(new int[] {0, 256, 1048576, 537395328, 402669568, 444596288, 131200, 0}),
-		new BitArray(new int[] {0, 0, 1048576, 537395328, 402669568, 444596288, 131200, 0}),
-		new BitArray(new int[] {4, 1140850688, 8388687, 1108347140, 821280, 17105920, -2144335872, 65}),
-		new BitArray(new int[] {0, 256, 1048576, -1601568064, 671109120, 1589117122, 393600, 3328}),
-		new BitArray(new int[] {0, 256, 1048576, -1601568064, 671105024, 1589117122, 393600, 3328}),
-		new BitArray(new int[] {5, 1140850944, 26214479, -493220892, 940361760, 1606227139, -2143942272, 3393}),
-		new BitArray(new int[] {0, 256, 1048576, -1601699136, 671105024, 1589117122, 393600, 3328}),
-		new BitArray(new int[] {0, 0, 1048576, -1601699136, 671105024, 1589117122, 393600, 3328}),
-		new BitArray(new int[] {0, 0, 1048576, -2138570624, 134234112, 67108864, 393216, 0}),
-		new BitArray(new int[] {0, 0, 0, -2139095040, 0, 67108864, 262144, 0}),
-		new BitArray(new int[] {-2, -1, -1, -1, -1, -1, -1, -1}),
-		new BitArray(new int[] {2097154, -2147483616, 0, 0, 0, 0, 0, 0}),
-		new BitArray(new int[] {4, 1140850690, 8650975, 1108355356, 9218084, 17106176, -533656048, 67}),
-		new BitArray(new int[] {-940564478, 889192445, 65, 1074825472, 72844640, 231424, 22030368, 4704}),
-		new BitArray(new int[] {-940564478, 889192413, 65, 1074825472, 72844640, 231424, 22030368, 4704}),
-		new BitArray(new int[] {4, -16777216, -1, -1, -1, -1, -1, 16383}),
-		new BitArray(new int[] {-61995012, 1174405224, -51384097, -972018405, -1030969182, 17106740, -97186288, 8259}),
-		new BitArray(new int[] {-61995012, 1174405160, -51384097, -972018405, -1030969182, 17106228, -97186288, 8259}),
-		new BitArray(new int[] {-61995012, 1174405224, -51384097, -972018405, -1030969182, 17106228, -97186288, 8259}),
-		new BitArray(new int[] {-66189316, 1174405160, -51384097, -972018405, -1030969182, 17106228, -97186288, 8259}),
-		new BitArray(new int[] {-1007673342, 889192405, 65, 1074825472, 72843296, 231424, 22030368, 4160}),
-		new BitArray(new int[] {-1013972992, 822083461, 0, 0, 71499776, 163840, 16777216, 4096}),
-		new BitArray(new int[] {-66189316, 1174405176, -51384097, -972018405, -1030969182, 17106228, -97186288, 8259}),
-		new BitArray(new int[] {4, 1140850690, 8650975, 1108355356, 9218084, 17106176, -533656048, 579}),
-		new BitArray(new int[] {-1007673342, 889192405, 65, 1074825472, 72843552, 231424, 22030368, 4160}),
-		new BitArray(new int[] {-1007673342, 889192413, 65, 1074825472, 72843552, 231424, 22030368, 4672}),
-		new BitArray(new int[] {-2, -9, -1, -1, -1, -1, -1, -1}),
-		new BitArray(new int[] {-1040382, 889192437, 65, 1074825472, 72843296, 231424, 22030368, 4160}),
-		new BitArray(new int[] {1006632960, 32, 0, 0, 0, 0, 0, 0}),
-		new BitArray(new int[] {1028, -16777216, -1, -1, -1, -1, -1, 16383}),
-		new BitArray(new int[] {-1038334, -1258291211, 65, 1074825472, 72844320, 231424, 22030368, 4160}),
-		new BitArray(new int[] {1007552508, 1140850720, -51384097, -972018405, -1030969182, 17106208, -365621744, 8259}),
-		new BitArray(new int[] {-1040382, -1258291209, 65, 1074825472, 72844320, 231424, 22030368, 4160}),
-		new BitArray(new int[] {0, 0, -60035072, 1027, 0, 0, 134217728, 0}),
-		new BitArray(new int[] {0, 67108864, 0, 1073743872, 1310752, 65536, 1050656, 64}),
-		new BitArray(new int[] {4194304, 67108864, 0, 1073743872, 1343520, 65536, 1050656, 64}),
-		new BitArray(new int[] {-66189316, 1174405160, -51384097, -972018401, -1030969182, 17106228, -97186288, 8259}),
-		new BitArray(new int[] {4194304, 67108864, 64, 1073743872, 1343520, 65536, 1050656, 64}),
-		new BitArray(new int[] {66189314, -1174405161, 51384096, 972018404, 1030969181, -17106229, 97186287, -8260}),
-		new BitArray(new int[] {65140738, 973078487, 51384096, 972018404, 1030969181, -17106229, 97186287, -8260}),
-		new BitArray(new int[] {-66189316, 1174405160, -51384097, -972018405, -1030969182, 17106228, -97186288, 8387}),
-		new BitArray(new int[] {0, 67108864, 0, 1073743872, 1343520, 65536, 1050656, 64}),
-		new BitArray(new int[] {-64092162, -973078488, -51384097, -972018405, -1030969182, 17106228, -97186288, 8259}),
-		new BitArray(new int[] {-64092162, 1191182376, -1048865, -546062565, -1014191950, -1593504452, -21144002, 8903}),
-		new BitArray(new int[] {0, 0, 3072, 134447104, 16777216, 8, 0, 0}),
-		new BitArray(new int[] {-2097156, -1, -1, -1, -1, -1, -1, -1}),
-		new BitArray(new int[] {-66189316, 1191182376, -1051937, -680509669, -1030969166, -1593504460, -21144002, 8903}),
-		new BitArray(new int[] {-66189316, 1174405162, -51384097, -972018401, -1030969178, 17106228, -97186288, 8259}),
-		new BitArray(new int[] {6291458, 0, 0, 32768, 0, 0, 0, 0}),
-		new BitArray(new int[] {-64092162, 1174405160, -51384097, -971985637, -1030969182, 17106228, -97186288, 8259}),
-		new BitArray(new int[] {0, 0, 0, -1879044096, 0, 67108864, 67371040, 128}),
-		new BitArray(new int[] {36, 1140850688, 8388687, 1108347140, 821280, 17105920, -2144335872, 65}),
-		new BitArray(new int[] {2097158, 1140850688, 8388687, 1108347140, 821280, 17105920, -2144335872, 97}),
-		new BitArray(new int[] {2097154, -2147483648, 0, 0, 0, 0, 0, 32}),
-		new BitArray(new int[] {36, 1140850688, 8388687, 1108347140, 821280, 17105928, -2144335872, 65}),
-		new BitArray(new int[] {-66189316, 1174405160, -51384097, -972018405, -1030969166, 17106228, -97186284, 8259}),
-		new BitArray(new int[] {1007552508, 1140850720, -51384097, -972002021, -1030969182, 17106208, -365621744, 8259}),
-		new BitArray(new int[] {1007681536, -2147483614, 0, 0, 1024, 0, 0, 0}),
-		new BitArray(new int[] {1007681536, -2147483616, 0, 0, 1024, 0, 0, 0}),
-		new BitArray(new int[] {2097154, 0, 0, 0, 0, 0, 0, 129}),
-		new BitArray(new int[] {2097154, 0, 0, 32768, 0, 0, 0, 129}),
-		new BitArray(new int[] {-66189316, 1174405160, -51383073, -972018405, -1030969182, 17106228, -97186288, 8259}),
-		new BitArray(new int[] {-65140740, 1174409128, -51384097, -971985637, -1030903646, 17106228, -97186288, 8259}),
-		new BitArray(new int[] {-65140740, 1174409128, -51384097, -972018405, -1030903646, 17106228, -97186288, 8259}),
-		new BitArray(new int[] {1048576, 3968, 0, 0, 0, 0, 0, 0}),
-		new BitArray(new int[] {-64092162, 1191182376, -1051937, -680509669, -1030969166, -1593504460, -21144002, 8903}),
-		new BitArray(new int[] {-64092162, 1191182376, -1051937, -680476901, -1030969166, -1593504460, -21144002, 8903}),
-		new BitArray(new int[] {2097154, 32, 0, 32768, 0, 0, 0, 0}),
-		new BitArray(new int[] {7340034, -2147483614, 0, 32768, 0, 0, 0, 0}),
-		new BitArray(new int[] {7340034, -2147483616, 0, 32768, 0, 0, 0, 0}),
-		new BitArray(new int[] {7340034, 0, 0, 32768, 0, 0, 0, 0}),
-		new BitArray(new int[] {4, 1140850690, 8650975, 1108355356, 9218084, 17106180, -533656048, 67}),
-		new BitArray(new int[] {4, 1140851008, 8388975, 1108347140, 821280, 21316608, -2144335872, 65}),
-		new BitArray(new int[] {4, 1140850944, 8388975, 1108347140, 821280, 21316608, -2144335872, 65}),
-		new BitArray(new int[] {4, 1140850688, 8388975, 1108347140, 821280, 21316608, -2144335872, 65}),
-		new BitArray(new int[] {5242880, -2147483550, 0, 0, 0, 0, 0, 0}),
-		new BitArray(new int[] {5242880, -2147483552, 0, 0, 0, 0, 0, 0}),
-		new BitArray(new int[] {-2, -1, -3, -1, -134217729, -1, -1, -1}),
-		new BitArray(new int[] {7, 1157628162, 26477055, -493212676, 948758565, 2147308999, -533262382, 3395}),
-		new BitArray(new int[] {918528, 0, 0, 0, 0, 0, 0, 0}),
-		new BitArray(new int[] {-909310, -1258291209, 65, 1074825472, 72844320, 231424, 22030368, 4160}),
-		new BitArray(new int[] {-843774, -1258291209, 65, 1074825472, 72844320, 231424, 22030368, 4160}),
-		new BitArray(new int[] {-318462, -1258291209, 65, 1074825472, 72844320, 231424, 22030368, 4160}),
-		new BitArray(new int[] {-383998, -1258291209, 65, 1074825472, 72844320, 231424, 22030368, 4160}),
-		new BitArray(new int[] {-1038334, -1258291209, 65, 1074825472, 72844320, 231424, 22030368, 4160}),
-		new BitArray(new int[] {4194308, 1140850754, 8650975, 1108355356, 9218084, 17106176, -533656048, 67}),
-		new BitArray(new int[] {4, 1140851008, 8388975, 1108347140, 821280, 21317120, -2144335872, 65}),
-		new BitArray(new int[] {4, 1073741824, 8388687, 34605312, 822304, 17105920, -2144335872, 65}),
-		new BitArray(new int[] {4, 1073741824, 8388687, 34605312, 821280, 16843776, -2144335872, 65}),
-		new BitArray(new int[] {4, 1140850698, 9699551, 1108355356, 9218084, 17106180, -533524976, 67}),
-		new BitArray(new int[] {4, 1140850690, 9699551, 1108355356, 9218084, 17106180, -533524976, 67}),
-		new BitArray(new int[] {4, 1140850946, 8650975, 1108355356, 9218084, 17106176, -533656048, 67}),
-		new BitArray(new int[] {4, 1140850944, 8388687, 1108478212, 821280, 17105920, -2144335872, 65}),
-		new BitArray(new int[] {4, 1140850944, 8388687, 1108347140, 821280, 17105920, -2144335872, 65}),
-		new BitArray(new int[] {4, 1140850944, 26214479, -493220892, 671930656, 1606227138, -2143942272, 3393}),
-		new BitArray(new int[] {4, 1140850944, 26214479, -493220892, 671926560, 1606227138, -2143942272, 3393}),
-		new BitArray(new int[] {4, 1140850944, 26214479, -493220892, 671926304, 1606227138, -2143942272, 3393}),
-		new BitArray(new int[] {4, 1140850944, 26214479, -493351964, 671926304, 1606227138, -2143942272, 3393}),
-		new BitArray(new int[] {4, 1140850688, 26214479, -493351964, 671926304, 1606227138, -2143942272, 3393}),
-		new BitArray(new int[] {4, 1140850688, 26214479, -1030223452, 135055392, 84218880, -2143942656, 65}),
-		new BitArray(new int[] {4, 1140850688, 25165903, -1030747868, 821280, 84218880, -2144073728, 65}),
-		new BitArray(new int[] {3145730, -2147483616, 0, 0, 256, 0, 0, 0}),
-		new BitArray(new int[] {3145730, -2147483648, 0, 0, 256, 0, 0, 0}),
-		new BitArray(new int[] {3145730, 0, 0, 0, 256, 0, 0, 0}),
-		new BitArray(new int[] {4, 1140850944, 26214479, -493220892, 671926305, 1606227138, -2143942208, 3393}),
-		new BitArray(new int[] {0, 256, 0, 537001984, 1, 436207616, 64, 0}),
-		new BitArray(new int[] {0, 256, 0, 536870912, 1, 436207616, 64, 0}),
-		new BitArray(new int[] {0, 0, 0, 536870912, 1, 436207616, 64, 0}),
-		new BitArray(new int[] {7340034, 0, 0, 0, 0, 0, 0, 0}),
-		new BitArray(new int[] {4, 1140850946, 8650975, 1108355356, 9218084, 17106180, -533656048, 67}),
-		new BitArray(new int[] {0, 16777472, 0, 131072, 0, 536870912, 2, 0}),
-		new BitArray(new int[] {0, 16777472, 0, 0, 0, 536870912, 2, 0}),
-		new BitArray(new int[] {2097154, -2147483616, 0, 0, 256, 0, 0, 0}),
-		new BitArray(new int[] {0, 1073741824, 4, -2147483648, 0, 0, -2147221504, 0}),
-		new BitArray(new int[] {2097154, -2013265888, 0, 0, 0, 0, 0, 0}),
-		new BitArray(new int[] {2097154, -2147483616, 0, 0, 320, 0, 0, 0}),
-		new BitArray(new int[] {2097154, 0, 0, 0, 320, 0, 0, 0}),
-		new BitArray(new int[] {4, 1140850690, 8650975, 1108355356, -1030969308, 17106176, -533656048, 67}),
-		new BitArray(new int[] {4, 1140850688, 25165903, 1108347136, 821280, 17105920, -2144335872, 65}),
-		new BitArray(new int[] {4, 1140850688, 8388687, 1108347136, 821280, 17105920, -2144335872, 65}),
-		new BitArray(new int[] {7340034, -2147483614, 0, 0, 0, 0, 0, 0}),
-		new BitArray(new int[] {7340034, -2147483616, 0, 0, 0, 0, 0, 0}),
-		new BitArray(new int[] {0, 256, 1048576, 537526400, 402669568, 444596289, 131200, 0}),
-		new BitArray(new int[] {1028, 1140850688, 8650975, 1108355356, 9218084, 17106176, -533656048, 67}),
-		new BitArray(new int[] {74448898, 32, 0, 0, 0, 0, 0, 0}),
-		new BitArray(new int[] {74448898, 0, 0, 0, 0, 0, 0, 0}),
-		new BitArray(new int[] {0, 0, 8388608, 33554432, 2048, 0, 32768, 0}),
-		new BitArray(new int[] {2097154, 0, 0, 0, 0, 3072, 0, 0}),
-		new BitArray(new int[] {0, 0, 0, 536870912, 268435456, 444596288, 128, 0}),
-		new BitArray(new int[] {0, 0, 0, 536871488, 536870912, 1522008258, 384, 3328}),
-		new BitArray(new int[] {0, 0, 262288, 8216, 8396800, 256, 1610679824, 2}),
-		new BitArray(new int[] {-1073741824, 33554432, 0, 0, 0, 16, 0, 0}),
-		new BitArray(new int[] {1006632960, 0, 0, 0, 0, 0, 0, 0}),
-		new BitArray(new int[] {1016, 0, 0, 67108864, -1040187392, 32, 33554432, 0}),
-		new BitArray(new int[] {4, 1073741824, 8388687, 34605312, 821280, 17105920, -2144335872, 65}),
-		new BitArray(new int[] {0, 0, -1133776896, 3, 0, 0, 0, 0}),
-		new BitArray(new int[] {-64092162, 1191182376, -1051937, -680378597, -1030969166, -1593504460, -21144002, 8903}),
-		new BitArray(new int[] {0, 0, 33554432, 16777216, 16, 0, 16392, 0}),
-		new BitArray(new int[] {-66189316, 1174405160, -51383585, -972018405, -1030969182, 17106228, -97186288, 8259}),
-		new BitArray(new int[] {1048576, 3968, 0, 0, 65536, 0, 0, 0}),
-		new BitArray(new int[] {0, 0, 288, 0, 0, 4210688, 0, 0}),
-		new BitArray(new int[] {-2, -129, -3, -1, -134217729, -1, -1, -1}),
-		new BitArray(new int[] {-18434, -1, -1, -1, -1, -1, -1, -1}),
-		new BitArray(new int[] {-22530, -1, -1, -1, -1, -1, -1, -1}),
-		new BitArray(new int[] {-32770, -1, -1, -1, -1, -1, -1, -1}),
-		new BitArray(new int[] {-37890, -1, -1, -1, -1, -1, -1, -1}),
-		new BitArray(new int[] {-2050, -1, -1, -1, -1, -1, -1, -1}),
-		new BitArray(new int[] {-6146, -1, -1, -1, -1, -1, -1, -1}),
-		new BitArray(new int[] {4, 1140850944, 8388975, 1108347140, 821280, 21317120, -2144335872, 65}),
-		new BitArray(new int[] {0, 0, 0, 536870912, 0, 436207616, 0, 0}),
-		new BitArray(new int[] {2097154, 32, 0, 0, 256, 0, 0, 0}),
-		new BitArray(new int[] {4, 1140850688, 8650975, 1108355356, 9218084, 17106176, -533656048, 67})
-
-	};
-
-} // end Parser
-
-
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/PushParser.frame b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/PushParser.frame
deleted file mode 100644
index 1bf369d5ea..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/PushParser.frame
+++ /dev/null
@@ -1,100 +0,0 @@
-/*----------------------------------------------------------------------
-Compiler Generator Coco/R,
-Copyright (c) 1990, 2004 Hanspeter Moessenboeck, University of Linz
-extended by M. Loeberbauer & A. Woess, Univ. of Linz
-with improvements by Pat Terry, Rhodes University
-
-This program is free software; you can redistribute it and/or modify it 
-under the terms of the GNU General Public License as published by the 
-Free Software Foundation; either version 2, or (at your option) any 
-later version.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
-for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program; if not, write to the Free Software Foundation, Inc., 
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-As an exception, it is allowed to write an extension of Coco/R that is
-used as a plugin in non-free software.
-
-If not otherwise stated, any source code generated by Coco/R (other than 
-Coco/R itself) does not fall under the GNU General Public License.
-----------------------------------------------------------------------*/
--->begin
--->namespace
-
-partial class ExpressionFinder {
--->constants
-	const bool T = true;
-	const bool x = false;
-
--->declarations
-	readonly Stack<int> stateStack = new Stack<int>();
-	bool wasQualifierTokenAtStart = false;
-	bool nextTokenIsPotentialStartOfExpression = false;
-	bool readXmlIdentifier = false;
-	bool identifierExpected = false;
-	bool nextTokenIsStartOfImportsOrAccessExpression = false;
-	bool isMissingModifier = false;
-	bool isAlreadyInExpr = false;
-	bool wasNormalAttribute = false;
-	int lambdaNestingDepth = 0;
-	int activeArgument = 0;
-	List<Token> errors = new List<Token>();
-	
-	public ExpressionFinder()
-	{
-		stateStack.Push(-1); // required so that we don't crash when leaving the root production
-	}
-
-	void Expect(int expectedKind, Token la)
-	{
-		if (la.kind != expectedKind) {
-			Error(la);
-			output.AppendLine("expected: " + expectedKind);
-			//Console.WriteLine("expected: " + expectedKind);
-		}
-	}
-	
-	void Error(Token la) 
-	{
-		output.AppendLine("not expected: " + la);
-		//Console.WriteLine("not expected: " + la);
-		errors.Add(la);
-	}
-	
-	Token t;
-	
-	public void InformToken(Token la) 
-	{
-		-->informToken
-		if (la != null) {
-			t = la;
-			nextTokenIsPotentialStartOfExpression = false;
-			readXmlIdentifier = false;
-			nextTokenIsStartOfImportsOrAccessExpression = false;
-			wasQualifierTokenAtStart = false;
-			identifierExpected = false;
-		}
-	}
-	
-	public void Advance()
-	{
-		//Console.WriteLine("Advance");
-		InformToken(null);
-	}
-	
-	public BitArray GetExpectedSet() { return GetExpectedSet(currentState); }
-	
-	static readonly BitArray[] set = {
--->initialization
-	};
-
-} // end Parser
-
-
-$$$
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/SavepointEventArgs.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/SavepointEventArgs.cs
deleted file mode 100644
index c599ca7f55..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/SavepointEventArgs.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Parser
-{
-	public class SavepointEventArgs : EventArgs
-	{
-		public TextLocation SavepointLocation { get; private set; }
-		public VBLexerMemento State { get; private set; }
-		
-		public SavepointEventArgs(TextLocation savepointLocation, VBLexerMemento state)
-		{
-			this.SavepointLocation = savepointLocation;
-			this.State = state;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/BlankLine.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/BlankLine.cs
deleted file mode 100644
index 5821ca6a98..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/BlankLine.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB
-{
-//	public class BlankLine : AbstractSpecial
-//	{
-//		public BlankLine(Location point) : base(point)
-//		{
-//		}
-//		
-//		public override object AcceptVisitor(ISpecialVisitor visitor, object data)
-//		{
-//			return visitor.Visit(this, data);
-//		}
-//	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/Comment.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/Comment.cs
deleted file mode 100644
index ecfc393fa4..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/Comment.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB
-{
-//	public class Comment : AbstractSpecial
-//	{
-//		CommentType   commentType;
-//		string        comment;
-//		
-//		public CommentType CommentType {
-//			get {
-//				return commentType;
-//			}
-//			set {
-//				commentType = value;
-//			}
-//		}
-//		
-//		public string CommentText {
-//			get {
-//				return comment;
-//			}
-//			set {
-//				comment = value;
-//			}
-//		}
-//		
-//		/// <value>
-//		/// Is true, when the comment is at line start or only whitespaces
-//		/// between line and comment start.
-//		/// </value>
-//		public bool CommentStartsLine {
-//			get;
-//			set;
-//		}
-//		
-//		public Comment(CommentType commentType, string comment, bool commentStartsLine, Location startPosition, Location endPosition)
-//			: base(startPosition, endPosition)
-//		{
-//			this.commentType   = commentType;
-//			this.comment       = comment;
-//			this.CommentStartsLine = commentStartsLine;
-//		}
-//		
-//		public override string ToString()
-//		{
-//			return String.Format("[{0}: Type = {1}, Text = {2}, Start = {3}, End = {4}]",
-//			                     GetType().Name, CommentType, CommentText, StartPosition, EndPosition);
-//		}
-//		
-//		public override object AcceptVisitor(ISpecialVisitor visitor, object data)
-//		{
-//			return visitor.Visit(this, data);
-//		}
-//	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/CommentType.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/CommentType.cs
deleted file mode 100644
index 7eac974d5c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/CommentType.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB
-{
-//	public enum CommentType
-//	{
-//		Block,
-//		SingleLine,
-//		Documentation
-//	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/ISpecial.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/ISpecial.cs
deleted file mode 100644
index 52c1abb37e..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/ISpecial.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB
-{
-//	/// <summary>
-//	/// Interface for all specials.
-//	/// </summary>
-//	public interface ISpecial
-//	{
-//		Location StartPosition { get; }
-//		Location EndPosition { get; }
-//		
-//		object AcceptVisitor(ISpecialVisitor visitor, object data);
-//	}
-//	
-//	public interface ISpecialVisitor
-//	{
-//		object Visit(ISpecial special, object data);
-//		object Visit(BlankLine special, object data);
-//		object Visit(Comment special, object data);
-//		object Visit(PreprocessingDirective special, object data);
-//	}
-//	
-//	public abstract class AbstractSpecial : ISpecial
-//	{
-//		public abstract object AcceptVisitor(ISpecialVisitor visitor, object data);
-//		
-//		protected AbstractSpecial(Location position)
-//		{
-//			this.StartPosition = position;
-//			this.EndPosition = position;
-//		}
-//		
-//		protected AbstractSpecial(Location startPosition, Location endPosition)
-//		{
-//			this.StartPosition = startPosition;
-//			this.EndPosition = endPosition;
-//		}
-//		
-//		public Location StartPosition { get; set; }
-//		public Location EndPosition { get; set; }
-//		
-//		public override string ToString()
-//		{
-//			return String.Format("[{0}: Start = {1}, End = {2}]",
-//			                     GetType().Name, StartPosition, EndPosition);
-//		}
-//	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/PreProcessingDirective.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/PreProcessingDirective.cs
deleted file mode 100644
index 4b9222190e..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/PreProcessingDirective.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB
-{
-//	public class PreprocessingDirective : AbstractSpecial
-//	{
-//		#region Conversion C# <-> VB
-//		public static void VBToCSharp(IList<ISpecial> list)
-//		{
-//			for (int i = 0; i < list.Count; ++i) {
-//				if (list[i] is PreprocessingDirective)
-//					list[i] = VBToCSharp((PreprocessingDirective)list[i]);
-//			}
-//		}
-//		
-//		public static PreprocessingDirective VBToCSharp(PreprocessingDirective dir)
-//		{
-//			string cmd = dir.Cmd;
-//			string arg = dir.Arg;
-//			if (cmd.Equals("#End", StringComparison.InvariantCultureIgnoreCase)) {
-//				if (arg.ToLowerInvariant().StartsWith("region")) {
-//					cmd = "#endregion";
-//					arg = "";
-//				} else if ("if".Equals(arg, StringComparison.InvariantCultureIgnoreCase)) {
-//					cmd = "#endif";
-//					arg = "";
-//				}
-//			} else if (cmd.Equals("#Region", StringComparison.InvariantCultureIgnoreCase)) {
-//				cmd = "#region";
-//			} else if (cmd.Equals("#If", StringComparison.InvariantCultureIgnoreCase)) {
-//				cmd = "#if";
-//				if (arg.ToLowerInvariant().EndsWith(" then"))
-//					arg = arg.Substring(0, arg.Length - 5);
-//			} else if (cmd.Equals("#Else", StringComparison.InvariantCultureIgnoreCase)) {
-//				if (dir.Expression != null)
-//					cmd = "#elif";
-//				else
-//					cmd = "#else";
-//			} else if (cmd.Equals("#ElseIf", StringComparison.InvariantCultureIgnoreCase)) {
-//				cmd = "#elif";
-//			}
-//			return new PreprocessingDirective(cmd, arg, dir.StartPosition, dir.EndPosition) {
-//				Expression = dir.Expression
-//			};
-//		}
-//		
-//		public static void CSharpToVB(List<ISpecial> list)
-//		{
-//			for (int i = 0; i < list.Count; ++i) {
-//				if (list[i] is PreprocessingDirective)
-//					list[i] = CSharpToVB((PreprocessingDirective)list[i]);
-//			}
-//		}
-//		
-//		public static PreprocessingDirective CSharpToVB(PreprocessingDirective dir)
-//		{
-//			string cmd = dir.Cmd;
-//			string arg = dir.Arg;
-//			switch (cmd) {
-//				case "#region":
-//					cmd = "#Region";
-//					if (!arg.StartsWith("\"")) {
-//						arg = "\"" + arg.Trim() + "\"";
-//					}
-//					break;
-//				case "#endregion":
-//					cmd = "#End";
-//					arg = "Region";
-//					break;
-//				case "#endif":
-//					cmd = "#End";
-//					arg = "If";
-//					break;
-//				case "#if":
-//					arg += " Then";
-//					break;
-//			}
-//			if (cmd.Length > 1) {
-//				cmd = cmd.Substring(0, 2).ToUpperInvariant() + cmd.Substring(2);
-//			}
-//			return new PreprocessingDirective(cmd, arg, dir.StartPosition, dir.EndPosition) {
-//				Expression = dir.Expression
-//			};
-//		}
-//		#endregion
-//		
-//		string cmd;
-//		string arg;
-//		Ast.Expression expression = Ast.Expression.Null;
-//		
-//		/// <summary>
-//		/// Gets the directive name, including '#'.
-//		/// </summary>
-//		public string Cmd {
-//			get {
-//				return cmd;
-//			}
-//			set {
-//				cmd = value ?? string.Empty;
-//			}
-//		}
-//		
-//		/// <summary>
-//		/// Gets the directive argument.
-//		/// </summary>
-//		public string Arg {
-//			get {
-//				return arg;
-//			}
-//			set {
-//				arg = value ?? string.Empty;
-//			}
-//		}
-//		
-//		/// <summary>
-//		/// Gets/sets the expression (for directives that take an expression, e.g. #if and #elif).
-//		/// </summary>
-//		public Ast.Expression Expression {
-//			get { return expression; }
-//			set { expression = value ?? Ast.Expression.Null; }
-//		}
-//		
-//		/// <value>
-//		/// The end position of the pre processor directive line.
-//		/// May be != EndPosition.
-//		/// </value>
-//		public Location LastLineEnd {
-//			get;
-//			set;
-//		}
-//		
-//				
-//		public override string ToString()
-//		{
-//			return String.Format("[PreProcessingDirective: Cmd = {0}, Arg = {1}]",
-//			                     Cmd,
-//			                     Arg);
-//		}
-//		
-//		public PreprocessingDirective(string cmd, string arg, Location start, Location end)
-//			: base(start, end)
-//		{
-//			this.Cmd = cmd;
-//			this.Arg = arg;
-//		}
-//		
-//		public override object AcceptVisitor(ISpecialVisitor visitor, object data)
-//		{
-//			return visitor.Visit(this, data);
-//		}
-//	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/SpecialTracker.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/SpecialTracker.cs
deleted file mode 100644
index 6ae334b2f6..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/SpecialTracker.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace ICSharpCode.NRefactory.VB.Parser
-{
-//	public class SpecialTracker
-//	{
-//		List<ISpecial> currentSpecials = new List<ISpecial>();
-//		
-//		CommentType   currentCommentType;
-//		StringBuilder sb = new StringBuilder();
-//		Location         startPosition;
-//		bool commentStartsLine;
-//		
-//		public List<ISpecial> CurrentSpecials {
-//			get {
-//				return currentSpecials;
-//			}
-//		}
-//		
-//		/// <summary>
-//		/// Gets the specials from the SpecialTracker and resets the lists.
-//		/// </summary>
-//		public List<ISpecial> RetrieveSpecials()
-//		{
-//			List<ISpecial> tmp = currentSpecials;
-//			currentSpecials = new List<ISpecial>();
-//			return tmp;
-//		}
-//		
-//		public void AddEndOfLine(Location point)
-//		{
-//			currentSpecials.Add(new BlankLine(point));
-//		}
-//		
-//		public void AddPreprocessingDirective(PreprocessingDirective directive)
-//		{
-//			if (directive == null)
-//				throw new ArgumentNullException("directive");
-//			currentSpecials.Add(directive);
-//		}
-//		
-//		// used for comment tracking
-//		public void StartComment(CommentType commentType, bool commentStartsLine, Location startPosition)
-//		{
-//			this.currentCommentType = commentType;
-//			this.startPosition      = startPosition;
-//			this.sb.Length          = 0;
-//			this.commentStartsLine  = commentStartsLine;
-//		}
-//		
-//		public void AddChar(char c)
-//		{
-//			sb.Append(c);
-//		}
-//		
-//		public void AddString(string s)
-//		{
-//			sb.Append(s);
-//		}
-//		
-//		public void FinishComment(Location endPosition)
-//		{
-//			currentSpecials.Add(new Comment(currentCommentType, sb.ToString(), commentStartsLine, startPosition, endPosition));
-//		}
-//	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/TagComment.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/TagComment.cs
deleted file mode 100644
index 39863d1256..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Special/TagComment.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Parser
-{
-	/// <summary>
-	/// Description of TagComment.	
-	/// </summary>
-//	public class TagComment : Comment
-//	{
-//		string tag;
-//		
-//		public string Tag {
-//			get {
-//				return tag;
-//			}
-//			set {
-//				tag = value;
-//			}
-//		}
-//		
-//		public TagComment(string tag, string comment, bool commentStartsLine, Location startPosition, Location endPosition) : base(CommentType.SingleLine, comment, commentStartsLine, startPosition, endPosition)
-//		{
-//			this.tag = tag;
-//		}
-//	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Token.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Token.cs
deleted file mode 100644
index 423c56a935..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Token.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Parser
-{
-	public class Token
-	{
-		internal readonly int kind;
-		
-		internal readonly int col;
-		internal readonly int line;
-		
-		internal readonly object literalValue;
-		internal readonly string val;
-		internal Token next;
-		readonly TextLocation endLocation;
-		
-		public int Kind {
-			get { return kind; }
-		}
-		
-		public object LiteralValue {
-			get { return literalValue; }
-		}
-		
-		public string Value {
-			get { return val; }
-		}
-		
-		public TextLocation EndLocation {
-			get { return endLocation; }
-		}
-		
-		public TextLocation Location {
-			get {
-				return new TextLocation(line, col);
-			}
-		}
-		
-		public Token()
-			: this(0, 1, 1)
-		{
-		}
-		
-		public Token(int kind, int col, int line) : this (kind, col, line, null)
-		{
-		}
-		
-		public Token(int kind, TextLocation startLocation, TextLocation endLocation) : this(kind, startLocation, endLocation, "", null)
-		{
-		}
-		
-		public Token(int kind, int col, int line, string val)
-		{
-			this.kind         = kind;
-			this.col          = col;
-			this.line         = line;
-			this.val          = val;
-			this.endLocation  = new TextLocation(line, col + (val == null ? 1 : val.Length));
-		}
-		
-		internal Token(int kind, int x, int y, string val, object literalValue)
-			: this(kind, new TextLocation(y, x), new TextLocation(y, x + val.Length), val, literalValue)
-		{
-		}
-		
-		public Token(int kind, TextLocation startLocation, TextLocation endLocation, string val, object literalValue)
-		{
-			this.kind         = kind;
-			this.col          = startLocation.Column;
-			this.line         = startLocation.Line;
-			this.endLocation = endLocation;
-			this.val          = val;
-			this.literalValue = literalValue;
-		}
-		
-		public override string ToString()
-		{
-			string vbToken;
-			
-			try {
-				vbToken = Tokens.GetTokenString(kind);
-			} catch (NotSupportedException) {
-				vbToken = "<unknown>";
-			}
-			
-			return string.Format("[Token {0} Location={1} EndLocation={2} val={3}]",
-			                     vbToken, Location, EndLocation, val);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Tokens.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Tokens.cs
deleted file mode 100644
index 484534a156..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/Tokens.cs
+++ /dev/null
@@ -1,527 +0,0 @@
-// this file was autogenerated by a tool.
-using System;
-using System.Collections;
-
-namespace ICSharpCode.NRefactory.VB.Parser
-{
-	public static class Tokens
-	{
-		// ----- terminal classes -----
-		public const int EOF                  = 0;
-		public const int EOL                  = 1;
-		public const int Identifier           = 2;
-		public const int LiteralString        = 3;
-		public const int LiteralCharacter     = 4;
-		public const int LiteralInteger       = 5;
-		public const int LiteralDouble        = 6;
-		public const int LiteralSingle        = 7;
-		public const int LiteralDecimal       = 8;
-		public const int LiteralDate          = 9;
-		public const int XmlOpenTag           = 10;
-		public const int XmlCloseTag          = 11;
-		public const int XmlStartInlineVB     = 12;
-		public const int XmlEndInlineVB       = 13;
-		public const int XmlCloseTagEmptyElement = 14;
-		public const int XmlOpenEndTag        = 15;
-		public const int XmlContent           = 16;
-		public const int XmlComment           = 17;
-		public const int XmlCData             = 18;
-		public const int XmlProcessingInstruction = 19;
-
-		// ----- special character -----
-		public const int Assign               = 20;
-		public const int Colon                = 21;
-		public const int Comma                = 22;
-		public const int ConcatString         = 23;
-		public const int Div                  = 24;
-		public const int DivInteger           = 25;
-		public const int Dot                  = 26;
-		public const int TripleDot            = 27;
-		public const int DotAt                = 28;
-		public const int ExclamationMark      = 29;
-		public const int Minus                = 30;
-		public const int Plus                 = 31;
-		public const int Power                = 32;
-		public const int QuestionMark         = 33;
-		public const int Times                = 34;
-		public const int OpenCurlyBrace       = 35;
-		public const int CloseCurlyBrace      = 36;
-		public const int OpenParenthesis      = 37;
-		public const int CloseParenthesis     = 38;
-		public const int GreaterThan          = 39;
-		public const int LessThan             = 40;
-		public const int NotEqual             = 41;
-		public const int GreaterEqual         = 42;
-		public const int LessEqual            = 43;
-		public const int ShiftLeft            = 44;
-		public const int ShiftRight           = 45;
-		public const int PlusAssign           = 46;
-		public const int PowerAssign          = 47;
-		public const int MinusAssign          = 48;
-		public const int TimesAssign          = 49;
-		public const int DivAssign            = 50;
-		public const int DivIntegerAssign     = 51;
-		public const int ShiftLeftAssign      = 52;
-		public const int ShiftRightAssign     = 53;
-		public const int ConcatStringAssign   = 54;
-		public const int ColonAssign          = 55;
-
-		// ----- keywords -----
-		public const int AddHandler           = 56;
-		public const int AddressOf            = 57;
-		public const int Aggregate            = 58;
-		public const int Alias                = 59;
-		public const int And                  = 60;
-		public const int AndAlso              = 61;
-		public const int Ansi                 = 62;
-		public const int As                   = 63;
-		public const int Ascending            = 64;
-		public const int Assembly             = 65;
-		public const int Auto                 = 66;
-		public const int Binary               = 67;
-		public const int Boolean              = 68;
-		public const int ByRef                = 69;
-		public const int By                   = 70;
-		public const int Byte                 = 71;
-		public const int ByVal                = 72;
-		public const int Call                 = 73;
-		public const int Case                 = 74;
-		public const int Catch                = 75;
-		public const int CBool                = 76;
-		public const int CByte                = 77;
-		public const int CChar                = 78;
-		public const int CDate                = 79;
-		public const int CDbl                 = 80;
-		public const int CDec                 = 81;
-		public const int Char                 = 82;
-		public const int CInt                 = 83;
-		public const int Class                = 84;
-		public const int CLng                 = 85;
-		public const int CObj                 = 86;
-		public const int Compare              = 87;
-		public const int Const                = 88;
-		public const int Continue             = 89;
-		public const int CSByte               = 90;
-		public const int CShort               = 91;
-		public const int CSng                 = 92;
-		public const int CStr                 = 93;
-		public const int CType                = 94;
-		public const int CUInt                = 95;
-		public const int CULng                = 96;
-		public const int CUShort              = 97;
-		public const int Custom               = 98;
-		public const int Date                 = 99;
-		public const int Decimal              = 100;
-		public const int Declare              = 101;
-		public const int Default              = 102;
-		public const int Delegate             = 103;
-		public const int Descending           = 104;
-		public const int Dim                  = 105;
-		public const int DirectCast           = 106;
-		public const int Distinct             = 107;
-		public const int Do                   = 108;
-		public const int Double               = 109;
-		public const int Each                 = 110;
-		public const int Else                 = 111;
-		public const int ElseIf               = 112;
-		public const int End                  = 113;
-		public const int EndIf                = 114;
-		public const int Enum                 = 115;
-		new public const int Equals               = 116;
-		public const int Erase                = 117;
-		public const int Error                = 118;
-		public const int Event                = 119;
-		public const int Exit                 = 120;
-		public const int Explicit             = 121;
-		public const int False                = 122;
-		public const int Finally              = 123;
-		public const int For                  = 124;
-		public const int Friend               = 125;
-		public const int From                 = 126;
-		public const int Function             = 127;
-		public const int Get                  = 128;
-		new public const int GetType              = 129;
-		public const int Global               = 130;
-		public const int GoSub                = 131;
-		public const int GoTo                 = 132;
-		public const int Group                = 133;
-		public const int Handles              = 134;
-		public const int If                   = 135;
-		public const int Implements           = 136;
-		public const int Imports              = 137;
-		public const int In                   = 138;
-		public const int Infer                = 139;
-		public const int Inherits             = 140;
-		public const int Integer              = 141;
-		public const int Interface            = 142;
-		public const int Into                 = 143;
-		public const int Is                   = 144;
-		public const int IsNot                = 145;
-		public const int Join                 = 146;
-		public const int Key                  = 147;
-		public const int Let                  = 148;
-		public const int Lib                  = 149;
-		public const int Like                 = 150;
-		public const int Long                 = 151;
-		public const int Loop                 = 152;
-		public const int Me                   = 153;
-		public const int Mod                  = 154;
-		public const int Module               = 155;
-		public const int MustInherit          = 156;
-		public const int MustOverride         = 157;
-		public const int MyBase               = 158;
-		public const int MyClass              = 159;
-		public const int Namespace            = 160;
-		public const int Narrowing            = 161;
-		public const int New                  = 162;
-		public const int Next                 = 163;
-		public const int Not                  = 164;
-		public const int Nothing              = 165;
-		public const int NotInheritable       = 166;
-		public const int NotOverridable       = 167;
-		public const int Object               = 168;
-		public const int Of                   = 169;
-		public const int Off                  = 170;
-		public const int On                   = 171;
-		public const int Operator             = 172;
-		public const int Option               = 173;
-		public const int Optional             = 174;
-		public const int Or                   = 175;
-		public const int Order                = 176;
-		public const int OrElse               = 177;
-		public const int Out                  = 178;
-		public const int Overloads            = 179;
-		public const int Overridable          = 180;
-		public const int Overrides            = 181;
-		public const int ParamArray           = 182;
-		public const int Partial              = 183;
-		public const int Preserve             = 184;
-		public const int Private              = 185;
-		public const int Property             = 186;
-		public const int Protected            = 187;
-		public const int Public               = 188;
-		public const int RaiseEvent           = 189;
-		public const int ReadOnly             = 190;
-		public const int ReDim                = 191;
-		public const int Rem                  = 192;
-		public const int RemoveHandler        = 193;
-		public const int Resume               = 194;
-		public const int Return               = 195;
-		public const int SByte                = 196;
-		public const int Select               = 197;
-		public const int Set                  = 198;
-		public const int Shadows              = 199;
-		public const int Shared               = 200;
-		public const int Short                = 201;
-		public const int Single               = 202;
-		public const int Skip                 = 203;
-		public const int Static               = 204;
-		public const int Step                 = 205;
-		public const int Stop                 = 206;
-		public const int Strict               = 207;
-		public const int String               = 208;
-		public const int Structure            = 209;
-		public const int Sub                  = 210;
-		public const int SyncLock             = 211;
-		public const int Take                 = 212;
-		public const int Text                 = 213;
-		public const int Then                 = 214;
-		public const int Throw                = 215;
-		public const int To                   = 216;
-		public const int True                 = 217;
-		public const int Try                  = 218;
-		public const int TryCast              = 219;
-		public const int TypeOf               = 220;
-		public const int UInteger             = 221;
-		public const int ULong                = 222;
-		public const int Unicode              = 223;
-		public const int Until                = 224;
-		public const int UShort               = 225;
-		public const int Using                = 226;
-		public const int Variant              = 227;
-		public const int Wend                 = 228;
-		public const int When                 = 229;
-		public const int Where                = 230;
-		public const int While                = 231;
-		public const int Widening             = 232;
-		public const int With                 = 233;
-		public const int WithEvents           = 234;
-		public const int WriteOnly            = 235;
-		public const int Xor                  = 236;
-		public const int GetXmlNamespace      = 237;
-
-		public const int MaxToken = 238;
-		static BitArray NewSet(params int[] values)
-		{
-			BitArray bitArray = new BitArray(MaxToken);
-			foreach (int val in values) {
-			bitArray[val] = true;
-			}
-			return bitArray;
-		}
-		public static BitArray Null = NewSet(Nothing);
-		public static BitArray BlockSucc = NewSet(Case, Catch, Else, ElseIf, End, Finally, Loop, Next);
-		public static BitArray GlobalLevel = NewSet(Namespace, Module, Class, Structure, Imports, Option);
-		public static BitArray TypeLevel = NewSet(Sub, Function, Property);
-		public static BitArray IdentifierTokens = NewSet(Text, Binary, Compare, Assembly, Ansi, Auto, Preserve, Unicode, Until, Off, Out, Key, Explicit, Infer, From, Join, Equals, Distinct, Where, Take, Skip, Order, By, Ascending, Descending, Group, Into, Aggregate);
-		public static BitArray ExpressionStart = NewSet(Me, MyBase, MyClass, True, False, Not, From, Aggregate, New, Nothing, AddressOf, GetType, TypeOf, GetXmlNamespace, Global, Boolean, Date, Char, String, Decimal, Byte, Short, Integer, Long, Single, Double, UInteger, ULong, UShort, SByte, Sub, Function, DirectCast, TryCast, CType, CBool, CByte, CChar, CDate, CDec, CDbl, CInt, CLng, CObj, CSByte, CShort, CSng, CStr, CUInt, CULng, CUShort);
-		public static BitArray StatementStart = NewSet(Nothing, Me, MyBase, MyClass, True, False, Not, From, Aggregate, New, Nothing, AddressOf, GetType, TypeOf, GetXmlNamespace, Global, Boolean, Date, Char, String, Decimal, Byte, Short, Integer, Long, Single, Double, UInteger, ULong, UShort, SByte, Sub, Function, DirectCast, TryCast, CType, CBool, CByte, CChar, CDate, CDec, CDbl, CInt, CLng, CObj, CSByte, CShort, CSng, CStr, CUInt, CULng, CUShort, Dim, Const, Static, For, While, Do, Select);
-		public static BitArray SimpleTypeName = NewSet(Boolean, Date, Char, String, Decimal, Byte, Short, Integer, Long, Single, Double, UInteger, ULong, UShort, SByte, Text, Binary, Compare, Assembly, Ansi, Auto, Preserve, Unicode, Until, Off, Out, Key, Explicit, Infer, From, Join, Equals, Distinct, Where, Take, Skip, Order, By, Ascending, Descending, Group, Into, Aggregate);
-		public static BitArray CastExpressions = NewSet(DirectCast, TryCast, CType, CBool, CByte, CChar, CDate, CDec, CDbl, CInt, CLng, CObj, CSByte, CShort, CSng, CStr, CUInt, CULng, CUShort);
-		public static BitArray BooleanExpressions = NewSet(True, False);
-		public static BitArray LambdaStart = NewSet(Sub, Function);
-		public static BitArray OperatorsAtStart = NewSet(Not, From, Aggregate);
-		public static BitArray TypeKW = NewSet(Boolean, Date, Char, String, Decimal, Byte, Short, Integer, Long, Single, Double, UInteger, ULong, UShort, SByte);
-
-		static string[] tokenList = new string[] {
-			// ----- terminal classes -----
-			"<EOF>",
-			"<EOL>",
-			"<Identifier>",
-			"<LiteralString>",
-			"<LiteralCharacter>",
-			"<LiteralInteger>",
-			"<LiteralDouble>",
-			"<LiteralSingle>",
-			"<LiteralDecimal>",
-			"<LiteralDate>",
-			"<XmlOpenTag>",
-			"<XmlCloseTag>",
-			"<XmlStartInlineVB>",
-			"<XmlEndInlineVB>",
-			"<XmlCloseTagEmptyElement>",
-			"<XmlOpenEndTag>",
-			"<XmlContent>",
-			"<XmlComment>",
-			"<XmlCData>",
-			"<XmlProcessingInstruction>",
-			// ----- special character -----
-			"=",
-			":",
-			",",
-			"&",
-			"/",
-			"\\",
-			".",
-			"...",
-			".@",
-			"!",
-			"-",
-			"+",
-			"^",
-			"?",
-			"*",
-			"{",
-			"}",
-			"(",
-			")",
-			">",
-			"<",
-			"<>",
-			">=",
-			"<=",
-			"<<",
-			">>",
-			"+=",
-			"^=",
-			"-=",
-			"*=",
-			"/=",
-			"\\=",
-			"<<=",
-			">>=",
-			"&=",
-			":=",
-			// ----- keywords -----
-			"AddHandler",
-			"AddressOf",
-			"Aggregate",
-			"Alias",
-			"And",
-			"AndAlso",
-			"Ansi",
-			"As",
-			"Ascending",
-			"Assembly",
-			"Auto",
-			"Binary",
-			"Boolean",
-			"ByRef",
-			"By",
-			"Byte",
-			"ByVal",
-			"Call",
-			"Case",
-			"Catch",
-			"CBool",
-			"CByte",
-			"CChar",
-			"CDate",
-			"CDbl",
-			"CDec",
-			"Char",
-			"CInt",
-			"Class",
-			"CLng",
-			"CObj",
-			"Compare",
-			"Const",
-			"Continue",
-			"CSByte",
-			"CShort",
-			"CSng",
-			"CStr",
-			"CType",
-			"CUInt",
-			"CULng",
-			"CUShort",
-			"Custom",
-			"Date",
-			"Decimal",
-			"Declare",
-			"Default",
-			"Delegate",
-			"Descending",
-			"Dim",
-			"DirectCast",
-			"Distinct",
-			"Do",
-			"Double",
-			"Each",
-			"Else",
-			"ElseIf",
-			"End",
-			"EndIf",
-			"Enum",
-			"Equals",
-			"Erase",
-			"Error",
-			"Event",
-			"Exit",
-			"Explicit",
-			"False",
-			"Finally",
-			"For",
-			"Friend",
-			"From",
-			"Function",
-			"Get",
-			"GetType",
-			"Global",
-			"GoSub",
-			"GoTo",
-			"Group",
-			"Handles",
-			"If",
-			"Implements",
-			"Imports",
-			"In",
-			"Infer",
-			"Inherits",
-			"Integer",
-			"Interface",
-			"Into",
-			"Is",
-			"IsNot",
-			"Join",
-			"Key",
-			"Let",
-			"Lib",
-			"Like",
-			"Long",
-			"Loop",
-			"Me",
-			"Mod",
-			"Module",
-			"MustInherit",
-			"MustOverride",
-			"MyBase",
-			"MyClass",
-			"Namespace",
-			"Narrowing",
-			"New",
-			"Next",
-			"Not",
-			"Nothing",
-			"NotInheritable",
-			"NotOverridable",
-			"Object",
-			"Of",
-			"Off",
-			"On",
-			"Operator",
-			"Option",
-			"Optional",
-			"Or",
-			"Order",
-			"OrElse",
-			"Out",
-			"Overloads",
-			"Overridable",
-			"Overrides",
-			"ParamArray",
-			"Partial",
-			"Preserve",
-			"Private",
-			"Property",
-			"Protected",
-			"Public",
-			"RaiseEvent",
-			"ReadOnly",
-			"ReDim",
-			"Rem",
-			"RemoveHandler",
-			"Resume",
-			"Return",
-			"SByte",
-			"Select",
-			"Set",
-			"Shadows",
-			"Shared",
-			"Short",
-			"Single",
-			"Skip",
-			"Static",
-			"Step",
-			"Stop",
-			"Strict",
-			"String",
-			"Structure",
-			"Sub",
-			"SyncLock",
-			"Take",
-			"Text",
-			"Then",
-			"Throw",
-			"To",
-			"True",
-			"Try",
-			"TryCast",
-			"TypeOf",
-			"UInteger",
-			"ULong",
-			"Unicode",
-			"Until",
-			"UShort",
-			"Using",
-			"Variant",
-			"Wend",
-			"When",
-			"Where",
-			"While",
-			"Widening",
-			"With",
-			"WithEvents",
-			"WriteOnly",
-			"Xor",
-			"GetXmlNamespace",
-		};
-		public static string GetTokenString(int token)
-		{
-			if (token >= 0 && token < tokenList.Length) {
-				return tokenList[token];
-			}
-			throw new System.NotSupportedException("Unknown token:" + token);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/VBLexer.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/VBLexer.cs
deleted file mode 100644
index a8e3163099..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/VBLexer.cs
+++ /dev/null
@@ -1,1487 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Xml;
-
-namespace ICSharpCode.NRefactory.VB.Parser
-{
-	public class VBLexer : IDisposable
-	{
-		bool lineEnd = true;
-		bool isAtLineBegin = false; // TODO: handle line begin, if neccessarry
-		bool misreadExclamationMarkAsTypeCharacter;
-		bool encounteredLineContinuation;
-		
-		ExpressionFinder ef;
-		
-		bool inXmlMode;
-		
-		Stack<XmlModeInfo> xmlModeStack = new Stack<XmlModeInfo>();
-		
-		public VBLexer(TextReader reader)
-		{
-			this.reader = new LATextReader(reader);
-			ef = new ExpressionFinder();
-		}
-		
-		public VBLexer(TextReader reader, VBLexerMemento state) : this(reader)
-		{
-			SetInitialLocation(new TextLocation(state.Line, state.Column));
-			lastToken = new Token(state.PrevTokenKind, 0, 0);
-			ef = new ExpressionFinder(state.ExpressionFinder);
-			lineEnd = state.LineEnd;
-			isAtLineBegin = state.IsAtLineBegin;
-			encounteredLineContinuation = state.EncounteredLineContinuation;
-			misreadExclamationMarkAsTypeCharacter = state.MisreadExclamationMarkAsTypeCharacter;
-			xmlModeStack = new Stack<XmlModeInfo>(state.XmlModeInfoStack.Select(i => (XmlModeInfo)i.Clone()).Reverse());
-			inXmlMode = state.InXmlMode;
-		}
-		
-		Token NextInternal()
-		{
-			if (misreadExclamationMarkAsTypeCharacter) {
-				misreadExclamationMarkAsTypeCharacter = false;
-				return new Token(Tokens.ExclamationMark, Col - 1, Line);
-			}
-			
-			unchecked {
-				while (true) {
-					TextLocation startLocation = new TextLocation(Line, Col);
-					int nextChar = ReaderRead();
-					if (nextChar == -1)
-						return new Token(Tokens.EOF, Col, Line, string.Empty);
-					char ch = (char)nextChar;
-					#region XML mode
-					CheckXMLState(startLocation);
-					if (inXmlMode && xmlModeStack.Peek().level <= 0 && !xmlModeStack.Peek().isDocumentStart && !xmlModeStack.Peek().inXmlTag) {
-						XmlModeInfo info = xmlModeStack.Peek();
-						int peek = nextChar;
-						while (true) {
-							int step = -1;
-							while (peek != -1 && XmlConvert.IsWhitespaceChar((char)peek)) {
-								step++;
-								peek = ReaderPeek(step);
-							}
-							
-							if (peek == '<' && (ReaderPeek(step + 1) == '!' || ReaderPeek(step + 1) == '?')) {
-								char lastCh = '\0';
-								for (int i = 0; i < step + 2; i++)
-									lastCh = (char)ReaderRead();
-								
-								if (lastCh == '!')
-									return ReadXmlCommentOrCData(Col - 2, Line);
-								else
-									return ReadXmlProcessingInstruction(Col - 2, Line);
-							}
-							
-							break;
-						}
-						inXmlMode = false;
-						xmlModeStack.Pop();
-					}
-					if (inXmlMode) {
-						XmlModeInfo info = xmlModeStack.Peek();
-						int x = Col - 1;
-						int y = Line;
-						switch (ch) {
-							case '<':
-								if (ReaderPeek() == '/') {
-									ReaderRead();
-									info.inXmlCloseTag = true;
-									return new Token(Tokens.XmlOpenEndTag, new TextLocation(y, x), new TextLocation(Line, Col));
-								}
-								if (ReaderPeek() == '%' && ReaderPeek(1) == '=') {
-									inXmlMode = false;
-									ReaderRead(); ReaderRead();
-									return new Token(Tokens.XmlStartInlineVB, new TextLocation(y, x), new TextLocation(Line, Col));
-								}
-								if (ReaderPeek() == '?') {
-									ReaderRead();
-									Token t = ReadXmlProcessingInstruction(x, y);
-									return t;
-								}
-								if (ReaderPeek() == '!') {
-									ReaderRead();
-									Token token = ReadXmlCommentOrCData(x, y);
-									return token;
-								}
-								info.level++;
-								info.isDocumentStart = false;
-								info.inXmlTag = true;
-								return new Token(Tokens.XmlOpenTag, x, y);
-							case '/':
-								if (ReaderPeek() == '>') {
-									ReaderRead();
-									info.inXmlTag = false;
-									info.level--;
-									return new Token(Tokens.XmlCloseTagEmptyElement, new TextLocation(y, x), new TextLocation(Line, Col));
-								}
-								break;
-							case '>':
-								if (info.inXmlCloseTag)
-									info.level--;
-								info.inXmlTag = info.inXmlCloseTag = false;
-								return new Token(Tokens.XmlCloseTag, x, y);
-							case '=':
-								return new Token(Tokens.Assign, x, y);
-							case '\'':
-							case '"':
-								string s = ReadXmlString(ch);
-								return new Token(Tokens.LiteralString, x, y, ch + s + ch, s);
-							default:
-								if (info.inXmlCloseTag || info.inXmlTag) {
-									if (XmlConvert.IsWhitespaceChar(ch))
-										continue;
-									return new Token(Tokens.Identifier, x, y, ReadXmlIdent(ch));
-								} else {
-									string content = ReadXmlContent(ch);
-									return new Token(Tokens.XmlContent, startLocation, new TextLocation(Line, Col), content, null);
-								}
-						}
-						#endregion
-					} else {
-						#region Standard Mode
-						if (Char.IsWhiteSpace(ch)) {
-							if (HandleLineEnd(ch)) {
-								if (lineEnd) {
-									// second line end before getting to a token
-									// -> here was a blank line
-//									specialTracker.AddEndOfLine(startLocation);
-								} else {
-									lineEnd = true;
-									return new Token(Tokens.EOL, startLocation, new TextLocation(Line, Col), null, null);
-								}
-							}
-							continue;
-						}
-						if (ch == '_') {
-							if (ReaderPeek() == -1) {
-								errors.Error(Line, Col, String.Format("No EOF expected after _"));
-								return new Token(Tokens.EOF, Col, Line, string.Empty);
-							}
-							if (!Char.IsWhiteSpace((char)ReaderPeek())) {
-								int x = Col - 1;
-								int y = Line;
-								string s = ReadIdent('_');
-								lineEnd = false;
-								return new Token(Tokens.Identifier, x, y, s);
-							}
-							encounteredLineContinuation = true;
-							ch = (char)ReaderRead();
-							
-							bool oldLineEnd = lineEnd;
-							lineEnd = false;
-							while (Char.IsWhiteSpace(ch)) {
-								if (HandleLineEnd(ch)) {
-									lineEnd = true;
-									break;
-								}
-								if (ReaderPeek() != -1) {
-									ch = (char)ReaderRead();
-								} else {
-									errors.Error(Line, Col, String.Format("No EOF expected after _"));
-									return new Token(Tokens.EOF, Col, Line, string.Empty);
-								}
-							}
-							if (!lineEnd) {
-								errors.Error(Line, Col, String.Format("NewLine expected"));
-							}
-							lineEnd = oldLineEnd;
-							continue;
-						}
-						
-						if (ch == '#') {
-							while (Char.IsWhiteSpace((char)ReaderPeek())) {
-								ReaderRead();
-							}
-							if (Char.IsDigit((char)ReaderPeek())) {
-								int x = Col - 1;
-								int y = Line;
-								string s = ReadDate();
-								DateTime time = new DateTime(1, 1, 1, 0, 0, 0);
-								try {
-									time = DateTime.Parse(s, System.Globalization.CultureInfo.InvariantCulture, DateTimeStyles.NoCurrentDateDefault);
-								} catch (Exception e) {
-									errors.Error(Line, Col, String.Format("Invalid date time {0}", e));
-								}
-								return new Token(Tokens.LiteralDate, x, y, s, time);
-							} else {
-								ReadPreprocessorDirective();
-								continue;
-							}
-						}
-						
-						if (ch == '[') { // Identifier
-							lineEnd = false;
-							if (ReaderPeek() == -1) {
-								errors.Error(Line, Col, String.Format("Identifier expected"));
-							}
-							ch = (char)ReaderRead();
-							if (ch == ']' || Char.IsWhiteSpace(ch)) {
-								errors.Error(Line, Col, String.Format("Identifier expected"));
-							}
-							int x = Col - 1;
-							int y = Line;
-							string s = ReadIdent(ch);
-							if (ReaderPeek() == -1) {
-								errors.Error(Line, Col, String.Format("']' expected"));
-							}
-							ch = (char)ReaderRead();
-							if (!(ch == ']')) {
-								errors.Error(Line, Col, String.Format("']' expected"));
-							}
-							return new Token(Tokens.Identifier, x, y, s);
-						}
-						if (Char.IsLetter(ch)) {
-							int x = Col - 1;
-							int y = Line;
-							char typeCharacter;
-							string s = ReadIdent(ch, out typeCharacter);
-							if (typeCharacter == '\0') {
-								int keyWordToken = Keywords.GetToken(s);
-								if (keyWordToken >= 0) {
-									// handle 'REM' comments
-									if (keyWordToken == Tokens.Rem) {
-										ReadComment();
-										if (!lineEnd) {
-											lineEnd = true;
-											return new Token(Tokens.EOL, Col, Line, "\n");
-										}
-										continue;
-									}
-									
-									lineEnd = false;
-									return new Token(keyWordToken, x, y, s);
-								}
-							}
-							
-							lineEnd = false;
-							return new Token(Tokens.Identifier, x, y, s);
-							
-						}
-						if (Char.IsDigit(ch)) {
-							lineEnd = false;
-							return ReadDigit(ch, Col - 1);
-						}
-						if (ch == '&') {
-							lineEnd = false;
-							if (ReaderPeek() == -1) {
-								return ReadOperator('&');
-							}
-							ch = (char)ReaderPeek();
-							if (Char.ToUpper(ch, CultureInfo.InvariantCulture) == 'H' || Char.ToUpper(ch, CultureInfo.InvariantCulture) == 'O') {
-								return ReadDigit('&', Col - 1);
-							}
-							return ReadOperator('&');
-						}
-						if (ch == '\'' || ch == '\u2018' || ch == '\u2019') {
-							int x = Col - 1;
-							int y = Line;
-							ReadComment();
-							if (!lineEnd) {
-								lineEnd = true;
-								return new Token(Tokens.EOL, x, y, "\n");
-							}
-							continue;
-						}
-						if (ch == '"') {
-							lineEnd = false;
-							int x = Col - 1;
-							int y = Line;
-							string s = ReadString();
-							if (ReaderPeek() != -1 && (ReaderPeek() == 'C' || ReaderPeek() == 'c')) {
-								ReaderRead();
-								if (s.Length != 1) {
-									errors.Error(Line, Col, String.Format("Chars can only have Length 1 "));
-								}
-								if (s.Length == 0) {
-									s = "\0";
-								}
-								return new Token(Tokens.LiteralCharacter, x, y, '"' + s  + "\"C", s[0]);
-							}
-							return new Token(Tokens.LiteralString, x, y, '"' + s + '"', s);
-						}
-						if (ch == '%' && ReaderPeek() == '>') {
-							int x = Col - 1;
-							int y = Line;
-							inXmlMode = true;
-							ReaderRead();
-							return new Token(Tokens.XmlEndInlineVB, new TextLocation(y, x), new TextLocation(Line, Col));
-						}
-						#endregion
-						if (ch == '<' && (ef.NextTokenIsPotentialStartOfExpression || ef.NextTokenIsStartOfImportsOrAccessExpression)) {
-							xmlModeStack.Push(new XmlModeInfo(ef.NextTokenIsStartOfImportsOrAccessExpression));
-							XmlModeInfo info = xmlModeStack.Peek();
-							int x = Col - 1;
-							int y = Line;
-							inXmlMode = true;
-							if (ReaderPeek() == '/') {
-								ReaderRead();
-								info.inXmlCloseTag = true;
-								return new Token(Tokens.XmlOpenEndTag, new TextLocation(y, x), new TextLocation(Line, Col));
-							}
-							// should we allow <%= at start of an expression? not valid with vbc ...
-							if (ReaderPeek() == '%' && ReaderPeek(1) == '=') {
-								inXmlMode = false;
-								ReaderRead(); ReaderRead();
-								return new Token(Tokens.XmlStartInlineVB, new TextLocation(y, x), new TextLocation(Line, Col));
-							}
-							if (ReaderPeek() == '!') {
-								ReaderRead();
-								Token t = ReadXmlCommentOrCData(x, y);
-								return t;
-							}
-							if (ReaderPeek() == '?') {
-								ReaderRead();
-								Token t = ReadXmlProcessingInstruction(x, y);
-								info.isDocumentStart = t.val.Trim().StartsWith("xml", StringComparison.OrdinalIgnoreCase);
-								return t;
-							}
-							info.inXmlTag = true;
-							info.level++;
-							return new Token(Tokens.XmlOpenTag, x, y);
-						}
-						Token token = ReadOperator(ch);
-						if (token != null) {
-							lineEnd = false;
-							return token;
-						}
-					}
-					
-					errors.Error(Line, Col, String.Format("Unknown char({0}) which can't be read", ch));
-				}
-			}
-		}
-
-		void CheckXMLState(TextLocation startLocation)
-		{
-			if (inXmlMode && !xmlModeStack.Any())
-				throw new InvalidOperationException("invalid XML stack state at " + startLocation);
-		}
-		
-		Token prevToken;
-		
-		Token Next()
-		{
-			Token t = NextInternal();
-			if (t.kind == Tokens.EOL) {
-				Debug.Assert(t.next == null); // NextInternal() must return only 1 token
-				t.next = NextInternal();
-				Debug.Assert(t.next.next == null);
-				if (SkipEOL(prevToken.kind, t.next.kind)) {
-					t = t.next;
-				}
-			} else
-				encounteredLineContinuation = false;
-			// inform EF only once we're sure it's really a token
-			// this means we inform it about EOL tokens "1 token too late", but that's not a problem because
-			// XML literals cannot start immediately after an EOL token
-			ef.InformToken(t);
-			if (t.next != null) {
-				// Next() isn't called again when it returns 2 tokens, so we need to process both tokens
-				ef.InformToken(t.next);
-				prevToken = t.next;
-			} else {
-				prevToken = t;
-			}
-			ef.Advance();
-			Debug.Assert(t != null);
-			return t;
-		}
-		
-		/// <remarks>see VB language specification 10; pg. 6</remarks>
-		bool SkipEOL(int prevTokenKind, int nextTokenKind)
-		{
-			// exception directly after _
-			if (encounteredLineContinuation) {
-				return encounteredLineContinuation = false;
-			}
-			
-			// 1st rule
-			// after a comma (,), open parenthesis ((), open curly brace ({), or open embedded expression (<%=)
-			if (new[] { Tokens.Comma, Tokens.OpenParenthesis, Tokens.OpenCurlyBrace, Tokens.XmlStartInlineVB }
-			    .Contains(prevTokenKind))
-				return true;
-			
-			// 2nd rule
-			// after a member qualifier (. or .@ or ...), provided that something is being qualified (i.e. is not
-			// using an implicit With context)
-			if (new[] { Tokens.Dot, Tokens.DotAt, Tokens.TripleDot }.Contains(prevTokenKind)
-			    && !ef.WasQualifierTokenAtStart)
-				return true;
-			
-			// 3rd rule
-			// before a close parenthesis ()), close curly brace (}), or close embedded expression (%>)
-			if (new[] { Tokens.CloseParenthesis, Tokens.CloseCurlyBrace, Tokens.XmlEndInlineVB }
-			    .Contains(nextTokenKind))
-				return true;
-			
-			// 4th rule
-			// after a less-than (<) in an attribute context
-			if (prevTokenKind == Tokens.LessThan && ef.InContext(Context.Attribute))
-				return true;
-			
-			// 5th rule
-			// before a greater-than (>) in an attribute context
-			if (nextTokenKind == Tokens.GreaterThan && ef.InContext(Context.Attribute))
-				return true;
-			
-			// 6th rule
-			// after a greater-than (>) in a non-file-level attribute context
-			if (ef.WasNormalAttribute && prevTokenKind == Tokens.GreaterThan)
-				return true;
-			
-			// 7th rule
-			// before and after query operators (Where, Order, Select, etc.)
-			var queryOperators = new int[] { Tokens.From, Tokens.Aggregate, Tokens.Select, Tokens.Distinct,
-				Tokens.Where, Tokens.Order, Tokens.By, Tokens.Ascending, Tokens.Descending, Tokens.Take,
-				Tokens.Skip, Tokens.Let, Tokens.Group, Tokens.Into, Tokens.On, Tokens.While, Tokens.Join };
-			if (ef.InContext(Context.Query)) {
-				// Ascending, Descending, Distinct are special
-				// fixes http://community.sharpdevelop.net/forums/p/12068/32893.aspx#32893
-				var specialQueryOperators = new int[] { Tokens.Ascending, Tokens.Descending, Tokens.Distinct };
-				if (specialQueryOperators.Contains(prevTokenKind) && !queryOperators.Contains(nextTokenKind))
-					return false;
-				
-				if ((queryOperators.Contains(prevTokenKind) || queryOperators.Contains(nextTokenKind)))
-					return true;
-			}
-			
-			// 8th rule
-			// after binary operators (+, -, /, *, etc.) in an expression context
-			if (new[] { Tokens.Plus, Tokens.Minus, Tokens.Div, Tokens.DivInteger, Tokens.Times, Tokens.Mod, Tokens.Power,
-			    	Tokens.Assign, Tokens.NotEqual, Tokens.LessThan, Tokens.LessEqual, Tokens.GreaterThan, Tokens.GreaterEqual,
-			    	Tokens.Like, Tokens.ConcatString, Tokens.AndAlso, Tokens.OrElse, Tokens.And, Tokens.Or, Tokens.Xor,
-			    	Tokens.ShiftLeft, Tokens.ShiftRight }.Contains(prevTokenKind) && ef.CurrentBlock.context == Context.Expression)
-				return true;
-			
-			// 9th rule
-			// after assignment operators (=, :=, +=, -=, etc.) in any context.
-			if (new[] { Tokens.Assign, Tokens.ColonAssign, Tokens.ConcatStringAssign, Tokens.DivAssign,
-			    	Tokens.DivIntegerAssign, Tokens.MinusAssign, Tokens.PlusAssign, Tokens.PowerAssign,
-			    	Tokens.ShiftLeftAssign, Tokens.ShiftRightAssign, Tokens.TimesAssign }.Contains(prevTokenKind))
-				return true;
-			
-			return false;
-		}
-		
-		/// <summary>
-		/// Reads the next token.
-		/// </summary>
-		/// <returns>A <see cref="Token"/> object.</returns>
-		public Token NextToken()
-		{
-			if (curToken == null) { // first call of NextToken()
-				curToken = Next();
-				//Console.WriteLine("Tok:" + Tokens.GetTokenString(curToken.kind) + " --- " + curToken.val);
-				return curToken;
-			}
-			
-			lastToken = curToken;
-			
-			if (curToken.next == null) {
-				curToken.next = Next();
-			}
-			
-			curToken = curToken.next;
-			
-			if (curToken.kind == Tokens.EOF && !(lastToken.kind == Tokens.EOL)) { // be sure that before EOF there is an EOL token
-				curToken = new Token(Tokens.EOL, curToken.col, curToken.line, string.Empty);
-				curToken.next = new Token(Tokens.EOF, curToken.col, curToken.line, string.Empty);
-			}
-			//Console.WriteLine("Tok:" + Tokens.GetTokenString(curToken.kind) + " --- " + curToken.val);
-			return curToken;
-		}
-		
-		#region VB Readers
-		string ReadIdent(char ch)
-		{
-			char typeCharacter;
-			return ReadIdent(ch, out typeCharacter);
-		}
-		
-		string ReadIdent(char ch, out char typeCharacter)
-		{
-			typeCharacter = '\0';
-			
-			if (ef.ReadXmlIdentifier) {
-				ef.ReadXmlIdentifier = false;
-				return ReadXmlIdent(ch);
-			}
-			
-			sb.Length = 0;
-			sb.Append(ch);
-			int peek;
-			while ((peek = ReaderPeek()) != -1 && (Char.IsLetterOrDigit(ch = (char)peek) || ch == '_')) {
-				ReaderRead();
-				sb.Append(ch.ToString());
-			}
-			if (peek == -1) {
-				return sb.ToString();
-			}
-			
-			if ("%&@!#$".IndexOf((char)peek) != -1) {
-				typeCharacter = (char)peek;
-				ReaderRead();
-				if (typeCharacter == '!') {
-					peek = ReaderPeek();
-					if (peek != -1 && (peek == '_' || peek == '[' || char.IsLetter((char)peek))) {
-						misreadExclamationMarkAsTypeCharacter = true;
-					}
-				}
-			}
-			return sb.ToString();
-		}
-		
-		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1818:DoNotConcatenateStringsInsideLoops")]
-		Token ReadDigit(char ch, int x)
-		{
-			sb.Length = 0;
-			sb.Append(ch);
-			
-			int y = Line;
-			string digit = "";
-			if (ch != '&') {
-				digit += ch;
-			}
-			
-			bool isHex      = false;
-			bool isOct      = false;
-			bool isSingle   = false;
-			bool isDouble   = false;
-			bool isDecimal  = false;
-			
-			if (ReaderPeek() == -1) {
-				if (ch == '&') {
-					errors.Error(Line, Col, String.Format("digit expected"));
-				}
-				return new Token(Tokens.LiteralInteger, x, y, sb.ToString() ,ch - '0');
-			}
-			if (ch == '.') {
-				if (Char.IsDigit((char)ReaderPeek())) {
-					isDouble = true; // double is default
-					if (isHex || isOct) {
-						errors.Error(Line, Col, String.Format("No hexadecimal or oktadecimal floating point values allowed"));
-					}
-					while (ReaderPeek() != -1 && Char.IsDigit((char)ReaderPeek())){ // read decimal digits beyond the dot
-						digit += (char)ReaderRead();
-					}
-				}
-			} else if (ch == '&' && PeekUpperChar() == 'H') {
-				const string hex = "0123456789ABCDEF";
-				sb.Append((char)ReaderRead()); // skip 'H'
-				while (ReaderPeek() != -1 && hex.IndexOf(PeekUpperChar()) != -1) {
-					ch = (char)ReaderRead();
-					sb.Append(ch);
-					digit += Char.ToUpper(ch, CultureInfo.InvariantCulture);
-				}
-				isHex = true;
-			} else if (ReaderPeek() != -1 && ch == '&' && PeekUpperChar() == 'O') {
-				const string okt = "01234567";
-				sb.Append((char)ReaderRead()); // skip 'O'
-				while (ReaderPeek() != -1 && okt.IndexOf(PeekUpperChar()) != -1) {
-					ch = (char)ReaderRead();
-					sb.Append(ch);
-					digit += Char.ToUpper(ch, CultureInfo.InvariantCulture);
-				}
-				isOct = true;
-			} else {
-				while (ReaderPeek() != -1 && Char.IsDigit((char)ReaderPeek())) {
-					ch = (char)ReaderRead();;
-					digit += ch;
-					sb.Append(ch);
-				}
-			}
-			
-			if (digit.Length == 0) {
-				errors.Error(Line, Col, String.Format("digit expected"));
-				return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), 0);
-			}
-			
-			if (ReaderPeek() != -1 && "%&SILU".IndexOf(PeekUpperChar()) != -1 || isHex || isOct) {
-				bool unsigned = false;
-				if (ReaderPeek() != -1) {
-					ch = (char)ReaderPeek();
-					sb.Append(ch);
-					ch = Char.ToUpper(ch, CultureInfo.InvariantCulture);
-					unsigned = ch == 'U';
-					if (unsigned) {
-						ReaderRead(); // read the U
-						ch = (char)ReaderPeek();
-						sb.Append(ch);
-						ch = Char.ToUpper(ch, CultureInfo.InvariantCulture);
-						if (ch != 'I' && ch != 'L' && ch != 'S') {
-							errors.Error(Line, Col, "Invalid type character: U" + ch);
-						}
-					}
-				}
-				try {
-					if (isOct) {
-						ReaderRead();
-						ulong number = 0L;
-						for (int i = 0; i < digit.Length; ++i) {
-							number = number * 8 + digit[i] - '0';
-						}
-						if (ch == 'S') {
-							if (unsigned)
-								return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (ushort)number);
-							else
-								return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (short)number);
-						} else if (ch == '%' || ch == 'I') {
-							if (unsigned)
-								return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (uint)number);
-							else
-								return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (int)number);
-						} else if (ch == '&' || ch == 'L') {
-							if (unsigned)
-								return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (ulong)number);
-							else
-								return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (long)number);
-						} else {
-							if (number > uint.MaxValue) {
-								return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), unchecked((long)number));
-							} else {
-								return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), unchecked((int)number));
-							}
-						}
-					}
-					if (ch == 'S') {
-						ReaderRead();
-						if (unsigned)
-							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), UInt16.Parse(digit, isHex ? NumberStyles.HexNumber : NumberStyles.Number));
-						else
-							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), Int16.Parse(digit, isHex ? NumberStyles.HexNumber : NumberStyles.Number));
-					} else if (ch == '%' || ch == 'I') {
-						ReaderRead();
-						if (unsigned)
-							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), UInt32.Parse(digit, isHex ? NumberStyles.HexNumber : NumberStyles.Number));
-						else
-							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), Int32.Parse(digit, isHex ? NumberStyles.HexNumber : NumberStyles.Number));
-					} else if (ch == '&' || ch == 'L') {
-						ReaderRead();
-						if (unsigned)
-							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), UInt64.Parse(digit, isHex ? NumberStyles.HexNumber : NumberStyles.Number));
-						else
-							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), Int64.Parse(digit, isHex ? NumberStyles.HexNumber : NumberStyles.Number));
-					} else if (isHex) {
-						ulong number = UInt64.Parse(digit, NumberStyles.HexNumber);
-						if (number > uint.MaxValue) {
-							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), unchecked((long)number));
-						} else {
-							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), unchecked((int)number));
-						}
-					}
-				} catch (OverflowException ex) {
-					errors.Error(Line, Col, ex.Message);
-					return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), 0);
-				} catch (FormatException) {
-					errors.Error(Line, Col, String.Format("{0} is not a parseable number", digit));
-					return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), 0);
-				}
-			}
-			Token nextToken = null; // if we accidently read a 'dot'
-			if (!isDouble && ReaderPeek() == '.') { // read floating point number
-				ReaderRead();
-				if (ReaderPeek() != -1 && Char.IsDigit((char)ReaderPeek())) {
-					isDouble = true; // double is default
-					if (isHex || isOct) {
-						errors.Error(Line, Col, String.Format("No hexadecimal or oktadecimal floating point values allowed"));
-					}
-					digit += '.';
-					while (ReaderPeek() != -1 && Char.IsDigit((char)ReaderPeek())){ // read decimal digits beyond the dot
-						digit += (char)ReaderRead();
-					}
-				} else {
-					nextToken = new Token(Tokens.Dot, Col - 1, Line);
-				}
-			}
-			
-			if (ReaderPeek() != -1 && PeekUpperChar() == 'E') { // read exponent
-				isDouble = true;
-				digit +=  (char)ReaderRead();
-				if (ReaderPeek() != -1 && (ReaderPeek() == '-' || ReaderPeek() == '+')) {
-					digit += (char)ReaderRead();
-				}
-				while (ReaderPeek() != -1 && Char.IsDigit((char)ReaderPeek())) { // read exponent value
-					digit += (char)ReaderRead();
-				}
-			}
-			
-			if (ReaderPeek() != -1) {
-				switch (PeekUpperChar()) {
-					case 'R':
-					case '#':
-						ReaderRead();
-						isDouble = true;
-						break;
-					case 'D':
-					case '@':
-						ReaderRead();
-						isDecimal = true;
-						break;
-					case 'F':
-					case '!':
-						ReaderRead();
-						isSingle = true;
-						break;
-				}
-			}
-			
-			try {
-				if (isSingle) {
-					return new Token(Tokens.LiteralSingle, x, y, sb.ToString(), Single.Parse(digit, CultureInfo.InvariantCulture));
-				}
-				if (isDecimal) {
-					return new Token(Tokens.LiteralDecimal, x, y, sb.ToString(), Decimal.Parse(digit, NumberStyles.Currency | NumberStyles.AllowExponent, CultureInfo.InvariantCulture));
-				}
-				if (isDouble) {
-					return new Token(Tokens.LiteralDouble, x, y, sb.ToString(), Double.Parse(digit, CultureInfo.InvariantCulture));
-				}
-			} catch (FormatException) {
-				errors.Error(Line, Col, String.Format("{0} is not a parseable number", digit));
-				if (isSingle)
-					return new Token(Tokens.LiteralSingle, x, y, sb.ToString(), 0f);
-				if (isDecimal)
-					return new Token(Tokens.LiteralDecimal, x, y, sb.ToString(), 0m);
-				if (isDouble)
-					return new Token(Tokens.LiteralDouble, x, y, sb.ToString(), 0.0);
-			}
-			Token token;
-			try {
-				token = new Token(Tokens.LiteralInteger, x, y, sb.ToString(), Int32.Parse(digit, isHex ? NumberStyles.HexNumber : NumberStyles.Number));
-			} catch (Exception) {
-				try {
-					token = new Token(Tokens.LiteralInteger, x, y, sb.ToString(), Int64.Parse(digit, isHex ? NumberStyles.HexNumber : NumberStyles.Number));
-				} catch (FormatException) {
-					errors.Error(Line, Col, String.Format("{0} is not a parseable number", digit));
-					// fallback, when nothing helps :)
-					token = new Token(Tokens.LiteralInteger, x, y, sb.ToString(), 0);
-				} catch (OverflowException) {
-					errors.Error(Line, Col, String.Format("{0} is too long for a integer literal", digit));
-					// fallback, when nothing helps :)
-					token = new Token(Tokens.LiteralInteger, x, y, sb.ToString(), 0);
-				}
-			}
-			token.next = nextToken;
-			return token;
-		}
-		
-		void ReadPreprocessorDirective()
-		{
-			TextLocation start = new TextLocation(Line, Col - 1);
-			string directive = ReadIdent('#');
-			// TODO : expression parser for PP directives
-			// needed for proper conversion to e. g. C#
-			string argument  = ReadToEndOfLine();
-//			this.specialTracker.AddPreprocessingDirective(new PreprocessingDirective(directive, argument.Trim(), start, new AstLocation(start.Line, start.Column + directive.Length + argument.Length)));
-		}
-		
-		string ReadDate()
-		{
-			char ch = '\0';
-			sb.Length = 0;
-			int nextChar;
-			while ((nextChar = ReaderRead()) != -1) {
-				ch = (char)nextChar;
-				if (ch == '#') {
-					break;
-				} else if (ch == '\n') {
-					errors.Error(Line, Col, String.Format("No return allowed inside Date literal"));
-				} else {
-					sb.Append(ch);
-				}
-			}
-			if (ch != '#') {
-				errors.Error(Line, Col, String.Format("End of File reached before Date literal terminated"));
-			}
-			return sb.ToString();
-		}
-		
-		string ReadString()
-		{
-			char ch = '\0';
-			sb.Length = 0;
-			int nextChar;
-			while ((nextChar = ReaderRead()) != -1) {
-				ch = (char)nextChar;
-				if (ch == '"') {
-					if (ReaderPeek() != -1 && ReaderPeek() == '"') {
-						sb.Append('"');
-						ReaderRead();
-					} else {
-						break;
-					}
-				} else if (ch == '\n') {
-					errors.Error(Line, Col, String.Format("No return allowed inside String literal"));
-				} else {
-					sb.Append(ch);
-				}
-			}
-			if (ch != '"') {
-				errors.Error(Line, Col, String.Format("End of File reached before String terminated "));
-			}
-			return sb.ToString();
-		}
-		
-		void ReadComment()
-		{
-			TextLocation startPos = new TextLocation(Line, Col);
-			sb.Length = 0;
-			StringBuilder curWord = specialCommentHash != null ? new StringBuilder() : null;
-			int missingApostrophes = 2; // no. of ' missing until it is a documentation comment
-			int nextChar;
-			while ((nextChar = ReaderRead()) != -1) {
-				char ch = (char)nextChar;
-				
-				if (HandleLineEnd(ch)) {
-					break;
-				}
-				
-				sb.Append(ch);
-				
-				if (missingApostrophes > 0) {
-					if (ch == '\'' || ch == '\u2018' || ch == '\u2019') {
-						if (--missingApostrophes == 0) {
-//							specialTracker.StartComment(CommentType.Documentation, isAtLineBegin, startPos);
-							sb.Length = 0;
-						}
-					} else {
-//						specialTracker.StartComment(CommentType.SingleLine, isAtLineBegin, startPos);
-						missingApostrophes = 0;
-					}
-				}
-				
-				if (specialCommentHash != null) {
-					if (Char.IsLetter(ch)) {
-						curWord.Append(ch);
-					} else {
-						string tag = curWord.ToString();
-						curWord.Length = 0;
-						if (specialCommentHash.ContainsKey(tag)) {
-							TextLocation p = new TextLocation(Line, Col);
-							string comment = ch + ReadToEndOfLine();
-//							this.TagComments.Add(new TagComment(tag, comment, isAtLineBegin, p, new Location(Col, Line)));
-							sb.Append(comment);
-							break;
-						}
-					}
-				}
-			}
-//			if (missingApostrophes > 0) {
-//				specialTracker.StartComment(CommentType.SingleLine, isAtLineBegin, startPos);
-//			}
-//			specialTracker.AddString(sb.ToString());
-//			specialTracker.FinishComment(new Location(Col, Line));
-		}
-		
-		Token ReadOperator(char ch)
-		{
-			int x = Col - 1;
-			int y = Line;
-			switch(ch) {
-				case '+':
-					switch (ReaderPeek()) {
-						case '=':
-							ReaderRead();
-							return new Token(Tokens.PlusAssign, x, y);
-						default:
-							break;
-					}
-					return new Token(Tokens.Plus, x, y);
-				case '-':
-					switch (ReaderPeek()) {
-						case '=':
-							ReaderRead();
-							return new Token(Tokens.MinusAssign, x, y);
-						default:
-							break;
-					}
-					return new Token(Tokens.Minus, x, y);
-				case '*':
-					switch (ReaderPeek()) {
-						case '=':
-							ReaderRead();
-							return new Token(Tokens.TimesAssign, x, y);
-						default:
-							break;
-					}
-					return new Token(Tokens.Times, x, y, "*");
-				case '/':
-					switch (ReaderPeek()) {
-						case '=':
-							ReaderRead();
-							return new Token(Tokens.DivAssign, x, y);
-						default:
-							break;
-					}
-					return new Token(Tokens.Div, x, y);
-				case '\\':
-					switch (ReaderPeek()) {
-						case '=':
-							ReaderRead();
-							return new Token(Tokens.DivIntegerAssign, x, y);
-						default:
-							break;
-					}
-					return new Token(Tokens.DivInteger, x, y);
-				case '&':
-					switch (ReaderPeek()) {
-						case '=':
-							ReaderRead();
-							return new Token(Tokens.ConcatStringAssign, x, y);
-						default:
-							break;
-					}
-					return new Token(Tokens.ConcatString, x, y);
-				case '^':
-					switch (ReaderPeek()) {
-						case '=':
-							ReaderRead();
-							return new Token(Tokens.PowerAssign, x, y);
-						default:
-							break;
-					}
-					return new Token(Tokens.Power, x, y);
-				case ':':
-					if (ReaderPeek() == '=') {
-						ReaderRead();
-						return new Token(Tokens.ColonAssign, x, y);
-					}
-					return new Token(Tokens.Colon, x, y);
-				case '=':
-					return new Token(Tokens.Assign, x, y);
-				case '<':
-					switch (ReaderPeek()) {
-						case '=':
-							ReaderRead();
-							return new Token(Tokens.LessEqual, x, y);
-						case '>':
-							ReaderRead();
-							return new Token(Tokens.NotEqual, x, y);
-						case '<':
-							ReaderRead();
-							switch (ReaderPeek()) {
-								case '=':
-									ReaderRead();
-									return new Token(Tokens.ShiftLeftAssign, x, y);
-								default:
-									break;
-							}
-							return new Token(Tokens.ShiftLeft, x, y);
-					}
-					return new Token(Tokens.LessThan, x, y);
-				case '>':
-					switch (ReaderPeek()) {
-						case '=':
-							ReaderRead();
-							return new Token(Tokens.GreaterEqual, x, y);
-						case '>':
-							ReaderRead();
-							if (ReaderPeek() != -1) {
-								switch (ReaderPeek()) {
-									case '=':
-										ReaderRead();
-										return new Token(Tokens.ShiftRightAssign, x, y);
-									default:
-										break;
-								}
-							}
-							return new Token(Tokens.ShiftRight, x, y);
-					}
-					return new Token(Tokens.GreaterThan, x, y);
-				case ',':
-					return new Token(Tokens.Comma, x, y);
-				case '.':
-					// Prevent OverflowException when Peek returns -1
-					int tmp = ReaderPeek(); int tmp2 = ReaderPeek(1);
-					if (tmp > 0) {
-						if (char.IsDigit((char)tmp))
-							return ReadDigit('.', Col);
-						else if ((char)tmp == '@') {
-							ReaderRead();
-							return new Token(Tokens.DotAt, x, y);
-						} else if ((char)tmp == '.' && tmp2 > 0 && (char)tmp2 == '.') {
-							ReaderRead(); ReaderRead();
-							return new Token(Tokens.TripleDot, x, y);
-						}
-					}
-					return new Token(Tokens.Dot, x, y);
-				case '(':
-					return new Token(Tokens.OpenParenthesis, x, y);
-				case ')':
-					return new Token(Tokens.CloseParenthesis, x, y);
-				case '{':
-					return new Token(Tokens.OpenCurlyBrace, x, y);
-				case '}':
-					return new Token(Tokens.CloseCurlyBrace, x, y);
-				case '?':
-					return new Token(Tokens.QuestionMark, x, y);
-				case '!':
-					return new Token(Tokens.ExclamationMark, x, y);
-			}
-			return null;
-		}
-		#endregion
-		
-		#region XML Readers
-		Token ReadXmlProcessingInstruction(int x, int y)
-		{
-			sb.Length = 0;
-			int nextChar = -1;
-			
-			while (ReaderPeek() != '?' || ReaderPeek(1) != '>') {
-				nextChar = ReaderRead();
-				if (nextChar == -1)
-					break;
-				sb.Append((char)nextChar);
-			}
-			
-			ReaderSkip("?>".Length);
-			
-			return new Token(Tokens.XmlProcessingInstruction, new TextLocation(y, x), new TextLocation(Line, Col), sb.ToString(), null);
-		}
-		
-		Token ReadXmlCommentOrCData(int x, int y)
-		{
-			sb.Length = 0;
-			int nextChar = -1;
-			
-			if (string.CompareOrdinal(ReaderPeekString("--".Length), "--") == 0) {
-				ReaderSkip("--".Length);
-				while ((nextChar = ReaderRead()) != -1) {
-					sb.Append((char)nextChar);
-					if (string.CompareOrdinal(ReaderPeekString("-->".Length), "-->") == 0) {
-						ReaderSkip("-->".Length);
-						return new Token(Tokens.XmlComment, new TextLocation(y, x), new TextLocation(Line, Col), sb.ToString(), null);
-					}
-				}
-			}
-			
-			if (string.CompareOrdinal(ReaderPeekString("[CDATA[".Length), "[CDATA[") == 0) {
-				ReaderSkip("[CDATA[".Length);
-				while ((nextChar = ReaderRead()) != -1) {
-					sb.Append((char)nextChar);
-					if (string.CompareOrdinal(ReaderPeekString("]]>".Length), "]]>") == 0) {
-						ReaderSkip("]]>".Length);
-						return new Token(Tokens.XmlCData, new TextLocation(y, x), new TextLocation(Line, Col), sb.ToString(), null);
-					}
-				}
-			}
-			
-			return new Token(Tokens.XmlComment, new TextLocation(y, x), new TextLocation(Line, Col), sb.ToString(), null);
-		}
-		
-		string ReadXmlContent(char ch)
-		{
-			sb.Length = 0;
-			while (true) {
-				sb.Append(ch);
-				int next = ReaderPeek();
-				
-				if (next == -1 || next == '<')
-					break;
-				ch = (char)ReaderRead();
-			}
-			
-			return sb.ToString();
-		}
-		
-		string ReadXmlString(char terminator)
-		{
-			char ch = '\0';
-			sb.Length = 0;
-			int nextChar;
-			while ((nextChar = ReaderRead()) != -1) {
-				ch = (char)nextChar;
-				if (ch == terminator) {
-					break;
-				} else if (ch == '\n') {
-					errors.Error(Line, Col, String.Format("No return allowed inside String literal"));
-				} else {
-					sb.Append(ch);
-				}
-			}
-			if (ch != terminator) {
-				errors.Error(Line, Col, String.Format("End of File reached before String terminated "));
-			}
-			return sb.ToString();
-		}
-		
-		string ReadXmlIdent(char ch)
-		{
-			sb.Length = 0;
-			sb.Append(ch);
-			
-			int peek;
-			
-			while ((peek = ReaderPeek()) != -1 && (peek == ':' || XmlConvert.IsNCNameChar((char)peek))) {
-				sb.Append((char)ReaderRead());
-			}
-			
-			return sb.ToString();
-		}
-		#endregion
-		
-		char PeekUpperChar()
-		{
-			return Char.ToUpper((char)ReaderPeek(), CultureInfo.InvariantCulture);
-		}
-		
-		/// <summary>
-		/// Skips to the end of the current code block.
-		/// For this, the lexer must have read the next token AFTER the token opening the
-		/// block (so that Lexer.Token is the block-opening token, not Lexer.LookAhead).
-		/// After the call, Lexer.LookAhead will be the block-closing token.
-		/// </summary>
-		public void SkipCurrentBlock(int targetToken)
-		{
-			int lastKind = -1;
-			int kind = lastToken.kind;
-			while (kind != Tokens.EOF &&
-			       !(lastKind == Tokens.End && kind == targetToken))
-			{
-				lastKind = kind;
-				NextToken();
-				kind = lastToken.kind;
-			}
-		}
-		
-		public void SetInitialContext(SnippetType type)
-		{
-			ef.SetContext(type);
-		}
-		
-		public VBLexerMemento Export()
-		{
-			return new VBLexerMemento() {
-				Column = Col,
-				Line = Line,
-				EncounteredLineContinuation = encounteredLineContinuation,
-				ExpressionFinder = ef.Export(),
-				InXmlMode = inXmlMode,
-				IsAtLineBegin = isAtLineBegin,
-				LineEnd = lineEnd,
-				PrevTokenKind = prevToken.kind,
-				MisreadExclamationMarkAsTypeCharacter = misreadExclamationMarkAsTypeCharacter,
-				XmlModeInfoStack = new Stack<XmlModeInfo>(xmlModeStack.Select(i => (XmlModeInfo)i.Clone()).Reverse())
-			};
-		}
-		
-		LATextReader reader;
-		int col  = 1;
-		int line = 1;
-		
-		protected Errors errors = new Errors();
-		
-		protected Token lastToken = null;
-		protected Token curToken  = null;
-		protected Token peekToken = null;
-		
-		string[]  specialCommentTags = null;
-		protected Hashtable specialCommentHash  = null;
-//		List<TagComment> tagComments  = new List<TagComment>();
-		protected StringBuilder sb              = new StringBuilder();
-//		protected SpecialTracker specialTracker = new SpecialTracker();
-		
-		// used for the original value of strings (with escape sequences).
-		protected StringBuilder originalValue = new StringBuilder();
-		
-		public bool SkipAllComments { get; set; }
-		public bool EvaluateConditionalCompilation { get; set; }
-		public virtual IDictionary<string, object> ConditionalCompilationSymbols {
-			get { throw new NotSupportedException(); }
-		}
-		
-		protected static IEnumerable<string> GetSymbols (string symbols)
-		{
-			if (!string.IsNullOrEmpty(symbols)) {
-				foreach (string symbol in symbols.Split (';', ' ', '\t')) {
-					string s = symbol.Trim ();
-					if (s.Length == 0)
-						continue;
-					yield return s;
-				}
-			}
-		}
-		
-		public void SetConditionalCompilationSymbols (string symbols)
-		{
-			throw new NotSupportedException ();
-		}
-		
-		protected int Line {
-			get {
-				return line;
-			}
-		}
-		protected int Col {
-			get {
-				return col;
-			}
-		}
-		
-		protected bool recordRead = false;
-		protected StringBuilder recordedText = new StringBuilder ();
-		
-		protected int ReaderRead()
-		{
-			int val = reader.Read();
-			if (recordRead && val >= 0)
-				recordedText.Append ((char)val);
-			if ((val == '\r' && reader.Peek() != '\n') || val == '\n') {
-				++line;
-				col = 1;
-				LineBreak();
-			} else if (val >= 0) {
-				col++;
-			}
-			return val;
-		}
-		
-		protected int ReaderPeek()
-		{
-			return reader.Peek();
-		}
-		
-		protected int ReaderPeek(int step)
-		{
-			return reader.Peek(step);
-		}
-		
-		protected void ReaderSkip(int steps)
-		{
-			for (int i = 0; i < steps; i++) {
-				ReaderRead();
-			}
-		}
-		
-		protected string ReaderPeekString(int length)
-		{
-			StringBuilder builder = new StringBuilder();
-			
-			for (int i = 0; i < length; i++) {
-				int peek = ReaderPeek(i);
-				if (peek != -1)
-					builder.Append((char)peek);
-			}
-			
-			return builder.ToString();
-		}
-		
-		public void SetInitialLocation(TextLocation location)
-		{
-			if (lastToken != null || curToken != null || peekToken != null)
-				throw new InvalidOperationException();
-			this.line = location.Line;
-			this.col = location.Column;
-		}
-		
-		public Errors Errors {
-			get {
-				return errors;
-			}
-		}
-		
-		/// <summary>
-		/// Returns the comments that had been read and containing tag key words.
-		/// </summary>
-//		public List<TagComment> TagComments {
-//			get {
-//				return tagComments;
-//			}
-//		}
-		
-//		public SpecialTracker SpecialTracker {
-//			get {
-//				return specialTracker;
-//			}
-//		}
-		
-		/// <summary>
-		/// Special comment tags are tags like TODO, HACK or UNDONE which are read by the lexer and stored in <see cref="TagComments"/>.
-		/// </summary>
-		public string[] SpecialCommentTags {
-			get {
-				return specialCommentTags;
-			}
-			set {
-				specialCommentTags = value;
-				specialCommentHash = null;
-				if (specialCommentTags != null && specialCommentTags.Length > 0) {
-					specialCommentHash = new Hashtable();
-					foreach (string str in specialCommentTags) {
-						specialCommentHash.Add(str, null);
-					}
-				}
-			}
-		}
-		
-		/// <summary>
-		/// The current Token. <seealso cref="ICSharpCode.NRefactory.VB.Parser.Token"/>
-		/// </summary>
-		public Token Token {
-			get {
-//				Console.WriteLine("Call to Token");
-				return lastToken;
-			}
-		}
-		
-		/// <summary>
-		/// The next Token (The <see cref="Token"/> after <see cref="NextToken"/> call) . <seealso cref="ICSharpCode.NRefactory.VB.Parser.Token"/>
-		/// </summary>
-		public Token LookAhead {
-			get {
-//				Console.WriteLine("Call to LookAhead");
-				return curToken;
-			}
-		}
-		
-		#region System.IDisposable interface implementation
-		public virtual void Dispose()
-		{
-			reader.Close();
-			reader = null;
-			errors = null;
-			lastToken = curToken = peekToken = null;
-			specialCommentHash = null;
-			sb = originalValue = null;
-		}
-		#endregion
-		
-		/// <summary>
-		/// Must be called before a peek operation.
-		/// </summary>
-		public void StartPeek()
-		{
-			peekToken = curToken;
-		}
-		
-		/// <summary>
-		/// Gives back the next token. A second call to Peek() gives the next token after the last call for Peek() and so on.
-		/// </summary>
-		/// <returns>An <see cref="Token"/> object.</returns>
-		public Token Peek()
-		{
-//			Console.WriteLine("Call to Peek");
-			if (peekToken.next == null) {
-				peekToken.next = Next();
-			}
-			peekToken = peekToken.next;
-			return peekToken;
-		}
-		
-		protected static bool IsIdentifierPart(int ch)
-		{
-			if (ch == 95) return true;  // 95 = '_'
-			if (ch == -1) return false;
-			return char.IsLetterOrDigit((char)ch); // accept unicode letters
-		}
-		
-		protected static bool IsHex(char digit)
-		{
-			return Char.IsDigit(digit) || ('A' <= digit && digit <= 'F') || ('a' <= digit && digit <= 'f');
-		}
-		
-		protected int GetHexNumber(char digit)
-		{
-			if (Char.IsDigit(digit)) {
-				return digit - '0';
-			}
-			if ('A' <= digit && digit <= 'F') {
-				return digit - 'A' + 0xA;
-			}
-			if ('a' <= digit && digit <= 'f') {
-				return digit - 'a' + 0xA;
-			}
-			errors.Error(line, col, String.Format("Invalid hex number '" + digit + "'"));
-			return 0;
-		}
-		protected TextLocation lastLineEnd = new TextLocation(1, 1);
-		protected TextLocation curLineEnd = new TextLocation(1, 1);
-		protected void LineBreak ()
-		{
-			lastLineEnd = curLineEnd;
-			curLineEnd = new TextLocation (line, col - 1);
-		}
-		protected bool HandleLineEnd(char ch)
-		{
-			// Handle MS-DOS or MacOS line ends.
-			if (ch == '\r') {
-				if (reader.Peek() == '\n') { // MS-DOS line end '\r\n'
-					ReaderRead(); // LineBreak (); called by ReaderRead ();
-					return true;
-				} else { // assume MacOS line end which is '\r'
-					LineBreak ();
-					return true;
-				}
-			}
-			if (ch == '\n') {
-				LineBreak ();
-				return true;
-			}
-			return false;
-		}
-		
-		protected void SkipToEndOfLine()
-		{
-			int nextChar;
-			while ((nextChar = reader.Read()) != -1) {
-				if (nextChar == '\r') {
-					if (reader.Peek() == '\n')
-						reader.Read();
-					nextChar = '\n';
-				}
-				if (nextChar == '\n') {
-					++line;
-					col = 1;
-					break;
-				}
-			}
-		}
-		
-		protected string ReadToEndOfLine()
-		{
-			sb.Length = 0;
-			int nextChar;
-			while ((nextChar = reader.Read()) != -1) {
-				char ch = (char)nextChar;
-				
-				if (nextChar == '\r') {
-					if (reader.Peek() == '\n')
-						reader.Read();
-					nextChar = '\n';
-				}
-				// Return read string, if EOL is reached
-				if (nextChar == '\n') {
-					++line;
-					col = 1;
-					return sb.ToString();
-				}
-				
-				sb.Append(ch);
-			}
-			
-			// Got EOF before EOL
-			string retStr = sb.ToString();
-			col += retStr.Length;
-			return retStr;
-		}
-		
-		public event EventHandler<SavepointEventArgs> SavepointReached;
-		
-		protected virtual void OnSavepointReached(SavepointEventArgs e)
-		{
-			if (SavepointReached != null) {
-				SavepointReached(this, e);
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/VBLexerMemento.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/VBLexerMemento.cs
deleted file mode 100644
index 30e9d0f8cd..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/VBLexerMemento.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.NRefactory.VB.Parser
-{
-	public sealed class VBLexerMemento
-	{
-		public int Line { get; set; }
-		public int Column { get; set; }
-		public int PrevTokenKind { get; set; }
-		public bool LineEnd { get; set; }
-		public bool IsAtLineBegin { get; set; }
-		public bool MisreadExclamationMarkAsTypeCharacter { get; set; }
-		public bool EncounteredLineContinuation { get; set; }
-		public ExpressionFinderState ExpressionFinder { get; set; }
-		public Stack<XmlModeInfo> XmlModeInfoStack { get; set; }
-		public bool InXmlMode { get; set; }
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/XmlModeInfo.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/XmlModeInfo.cs
deleted file mode 100644
index 2141ac3532..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Lexer/XmlModeInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.Parser
-{
-	public class XmlModeInfo : ICloneable
-	{
-		public bool inXmlTag, inXmlCloseTag, isDocumentStart;
-		public int level;
-		
-		public XmlModeInfo(bool isSpecial)
-		{
-			level = isSpecial ? -1 : 0;
-			inXmlTag = inXmlCloseTag = isDocumentStart = false;
-		}
-		
-		public object Clone()
-		{
-			return new XmlModeInfo(false) {
-				inXmlCloseTag = this.inXmlCloseTag,
-				inXmlTag = this.inXmlTag,
-				isDocumentStart = this.isDocumentStart,
-				level = this.level
-			};
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/OutputVisitor/IOutputFormatter.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/OutputVisitor/IOutputFormatter.cs
deleted file mode 100644
index 056b0d1cda..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/OutputVisitor/IOutputFormatter.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB
-{
-	/// <summary>
-	/// Output formatter for the Output visitor.
-	/// </summary>
-	public interface IOutputFormatter
-	{
-		void StartNode(AstNode node);
-		void EndNode(AstNode node);
-		
-		/// <summary>
-		/// Writes an identifier.
-		/// If the identifier conflicts with a keyword, the output visitor will
-		/// call <c>WriteToken("[")</c> before and <c>WriteToken("]")</c> after calling WriteIdentifier().
-		/// </summary>
-		void WriteIdentifier(string identifier);
-		
-		/// <summary>
-		/// Writes a keyword to the output.
-		/// </summary>
-		void WriteKeyword(string keyword);
-		
-		/// <summary>
-		/// Writes a token to the output.
-		/// </summary>
-		void WriteToken(string token);
-		void Space();
-		
-		void Indent();
-		void Unindent();
-		
-		void NewLine();
-		
-		void WriteComment(bool isDocumentation, string content);
-		
-		void MarkFoldStart();
-		void MarkFoldEnd();
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/OutputVisitor/OutputVisitor.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/OutputVisitor/OutputVisitor.cs
deleted file mode 100644
index 7edd3a525f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/OutputVisitor/OutputVisitor.cs
+++ /dev/null
@@ -1,2659 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB
-{
-	/// <summary>
-	/// Description of OutputVisitor.
-	/// </summary>
-	public class OutputVisitor : IAstVisitor<object, object>
-	{
-		readonly IOutputFormatter formatter;
-		readonly VBFormattingOptions policy;
-		
-		readonly Stack<AstNode> containerStack = new Stack<AstNode>();
-		readonly Stack<AstNode> positionStack = new Stack<AstNode>();
-		
-		/// <summary>
-		/// Used to insert the minimal amount of spaces so that the lexer recognizes the tokens that were written.
-		/// </summary>
-		LastWritten lastWritten;
-		
-		enum LastWritten
-		{
-			Whitespace,
-			Other,
-			KeywordOrIdentifier
-		}
-		
-		public OutputVisitor(TextWriter textWriter, VBFormattingOptions formattingPolicy)
-		{
-			if (textWriter == null)
-				throw new ArgumentNullException("textWriter");
-			if (formattingPolicy == null)
-				throw new ArgumentNullException("formattingPolicy");
-			this.formatter = new TextWriterOutputFormatter(textWriter);
-			this.policy = formattingPolicy;
-		}
-		
-		public OutputVisitor(IOutputFormatter formatter, VBFormattingOptions formattingPolicy)
-		{
-			if (formatter == null)
-				throw new ArgumentNullException("formatter");
-			if (formattingPolicy == null)
-				throw new ArgumentNullException("formattingPolicy");
-			this.formatter = formatter;
-			this.policy = formattingPolicy;
-		}
-		
-		public object VisitCompilationUnit(CompilationUnit compilationUnit, object data)
-		{
-			// don't do node tracking as we visit all children directly
-			foreach (AstNode node in compilationUnit.Children)
-				node.AcceptVisitor(this, data);
-			return null;
-		}
-		
-		public object VisitBlockStatement(BlockStatement blockStatement, object data)
-		{
-			StartNode(blockStatement);
-			foreach (var stmt in blockStatement) {
-				stmt.AcceptVisitor(this, data);
-				NewLine();
-			}
-			return EndNode(blockStatement);
-		}
-		
-		public object VisitPatternPlaceholder(AstNode placeholder, Pattern pattern, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public object VisitTypeParameterDeclaration(TypeParameterDeclaration typeParameterDeclaration, object data)
-		{
-			StartNode(typeParameterDeclaration);
-			
-			switch (typeParameterDeclaration.Variance) {
-				case ICSharpCode.NRefactory.TypeSystem.VarianceModifier.Invariant:
-					break;
-				case ICSharpCode.NRefactory.TypeSystem.VarianceModifier.Covariant:
-					WriteKeyword("Out");
-					break;
-				case ICSharpCode.NRefactory.TypeSystem.VarianceModifier.Contravariant:
-					WriteKeyword("In");
-					break;
-				default:
-					throw new Exception("Invalid value for VarianceModifier");
-			}
-			
-			WriteIdentifier(typeParameterDeclaration.Name);
-			if (typeParameterDeclaration.Constraints.Any()) {
-				WriteKeyword("As");
-				if (typeParameterDeclaration.Constraints.Count > 1)
-					WriteToken("{", TypeParameterDeclaration.Roles.LBrace);
-				WriteCommaSeparatedList(typeParameterDeclaration.Constraints);
-				if (typeParameterDeclaration.Constraints.Count > 1)
-					WriteToken("}", TypeParameterDeclaration.Roles.RBrace);
-			}
-			
-			return EndNode(typeParameterDeclaration);
-		}
-		
-		public object VisitParameterDeclaration(ParameterDeclaration parameterDeclaration, object data)
-		{
-			StartNode(parameterDeclaration);
-			WriteAttributes(parameterDeclaration.Attributes);
-			WriteModifiers(parameterDeclaration.ModifierTokens);
-			WriteIdentifier(parameterDeclaration.Name.Name);
-			if (!parameterDeclaration.Type.IsNull) {
-				WriteKeyword("As");
-				parameterDeclaration.Type.AcceptVisitor(this, data);
-			}
-			if (!parameterDeclaration.OptionalValue.IsNull) {
-				WriteToken("=", ParameterDeclaration.Roles.Assign);
-				parameterDeclaration.OptionalValue.AcceptVisitor(this, data);
-			}
-			return EndNode(parameterDeclaration);
-		}
-		
-		public object VisitVBTokenNode(VBTokenNode vBTokenNode, object data)
-		{
-			var mod = vBTokenNode as VBModifierToken;
-			if (mod != null) {
-				StartNode(vBTokenNode);
-				WriteKeyword(VBModifierToken.GetModifierName(mod.Modifier));
-				return EndNode(vBTokenNode);
-			} else {
-				throw new NotSupportedException("Should never visit individual tokens");
-			}
-		}
-		
-		public object VisitAliasImportsClause(AliasImportsClause aliasImportsClause, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public object VisitAttribute(ICSharpCode.NRefactory.VB.Ast.Attribute attribute, object data)
-		{
-			StartNode(attribute);
-			
-			if (attribute.Target != AttributeTarget.None) {
-				switch (attribute.Target) {
-					case AttributeTarget.None:
-						break;
-					case AttributeTarget.Assembly:
-						WriteKeyword("Assembly");
-						break;
-					case AttributeTarget.Module:
-						WriteKeyword("Module");
-						break;
-					default:
-						throw new Exception("Invalid value for AttributeTarget");
-				}
-				WriteToken(":", Ast.Attribute.Roles.Colon);
-				Space();
-			}
-			attribute.Type.AcceptVisitor(this, data);
-			WriteCommaSeparatedListInParenthesis(attribute.Arguments, false);
-			
-			return EndNode(attribute);
-		}
-		
-		public object VisitAttributeBlock(AttributeBlock attributeBlock, object data)
-		{
-			StartNode(attributeBlock);
-			
-			WriteToken("<", AttributeBlock.Roles.LChevron);
-			WriteCommaSeparatedList(attributeBlock.Attributes);
-			WriteToken(">", AttributeBlock.Roles.RChevron);
-			if (attributeBlock.Parent is ParameterDeclaration)
-				Space();
-			else
-				NewLine();
-			
-			return EndNode(attributeBlock);
-		}
-		
-		public object VisitImportsStatement(ImportsStatement importsStatement, object data)
-		{
-			StartNode(importsStatement);
-			
-			WriteKeyword("Imports", AstNode.Roles.Keyword);
-			Space();
-			WriteCommaSeparatedList(importsStatement.ImportsClauses);
-			NewLine();
-			
-			return EndNode(importsStatement);
-		}
-		
-		public object VisitMemberImportsClause(MemberImportsClause memberImportsClause, object data)
-		{
-			StartNode(memberImportsClause);
-			memberImportsClause.Member.AcceptVisitor(this, data);
-			return EndNode(memberImportsClause);
-		}
-		
-		public object VisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration, object data)
-		{
-			StartNode(namespaceDeclaration);
-			NewLine();
-			WriteKeyword("Namespace");
-			bool isFirst = true;
-			foreach (Identifier node in namespaceDeclaration.Identifiers) {
-				if (isFirst) {
-					isFirst = false;
-				} else {
-					WriteToken(".", NamespaceDeclaration.Roles.Dot);
-				}
-				node.AcceptVisitor(this, null);
-			}
-			NewLine();
-			WriteMembers(namespaceDeclaration.Members);
-			WriteKeyword("End");
-			WriteKeyword("Namespace");
-			NewLine();
-			return EndNode(namespaceDeclaration);
-		}
-		
-		public object VisitOptionStatement(OptionStatement optionStatement, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public object VisitTypeDeclaration(TypeDeclaration typeDeclaration, object data)
-		{
-			StartNode(typeDeclaration);
-			WriteAttributes(typeDeclaration.Attributes);
-			WriteModifiers(typeDeclaration.ModifierTokens);
-			WriteClassTypeKeyword(typeDeclaration);
-			WriteIdentifier(typeDeclaration.Name.Name);
-			MarkFoldStart();
-			NewLine();
-			
-			if (!typeDeclaration.InheritsType.IsNull) {
-				Indent();
-				WriteKeyword("Inherits");
-				typeDeclaration.InheritsType.AcceptVisitor(this, data);
-				Unindent();
-				NewLine();
-			}
-			if (typeDeclaration.ImplementsTypes.Any()) {
-				Indent();
-				WriteImplementsClause(typeDeclaration.ImplementsTypes);
-				Unindent();
-				NewLine();
-			}
-			
-			if (!typeDeclaration.InheritsType.IsNull || typeDeclaration.ImplementsTypes.Any())
-			NewLine();
-			
-			WriteMembers(typeDeclaration.Members);
-			
-			WriteKeyword("End");
-			WriteClassTypeKeyword(typeDeclaration);
-			MarkFoldEnd();
-			NewLine();
-			return EndNode(typeDeclaration);
-		}
-
-		void WriteClassTypeKeyword(TypeDeclaration typeDeclaration)
-		{
-			switch (typeDeclaration.ClassType) {
-				case ClassType.Class:
-					WriteKeyword("Class");
-					break;
-				case ClassType.Interface:
-					WriteKeyword("Interface");
-					break;
-				case ClassType.Struct:
-					WriteKeyword("Structure");
-					break;
-				case ClassType.Module:
-					WriteKeyword("Module");
-					break;
-				default:
-					throw new Exception("Invalid value for ClassType");
-			}
-		}
-		
-		public object VisitXmlNamespaceImportsClause(XmlNamespaceImportsClause xmlNamespaceImportsClause, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public object VisitEnumDeclaration(EnumDeclaration enumDeclaration, object data)
-		{
-			StartNode(enumDeclaration);
-			
-			WriteAttributes(enumDeclaration.Attributes);
-			WriteModifiers(enumDeclaration.ModifierTokens);
-			WriteKeyword("Enum");
-			WriteIdentifier(enumDeclaration.Name.Name);
-			if (!enumDeclaration.UnderlyingType.IsNull) {
-				Space();
-				WriteKeyword("As");
-				enumDeclaration.UnderlyingType.AcceptVisitor(this, data);
-			}
-			MarkFoldStart();
-			NewLine();
-			
-			Indent();
-			foreach (var member in enumDeclaration.Members) {
-				member.AcceptVisitor(this, null);
-			}
-			Unindent();
-			
-			WriteKeyword("End");
-			WriteKeyword("Enum");
-			MarkFoldEnd();
-			NewLine();
-			
-			return EndNode(enumDeclaration);
-		}
-		
-		public object VisitEnumMemberDeclaration(EnumMemberDeclaration enumMemberDeclaration, object data)
-		{
-			StartNode(enumMemberDeclaration);
-			
-			WriteAttributes(enumMemberDeclaration.Attributes);
-			WriteIdentifier(enumMemberDeclaration.Name.Name);
-			
-			if (!enumMemberDeclaration.Value.IsNull) {
-				Space();
-				WriteToken("=", EnumMemberDeclaration.Roles.Assign);
-				Space();
-				enumMemberDeclaration.Value.AcceptVisitor(this, data);
-			}
-			NewLine();
-			
-			return EndNode(enumMemberDeclaration);
-		}
-		
-		public object VisitDelegateDeclaration(DelegateDeclaration delegateDeclaration, object data)
-		{
-			StartNode(delegateDeclaration);
-			
-			WriteAttributes(delegateDeclaration.Attributes);
-			WriteModifiers(delegateDeclaration.ModifierTokens);
-			WriteKeyword("Delegate");
-			if (delegateDeclaration.IsSub)
-				WriteKeyword("Sub");
-			else
-				WriteKeyword("Function");
-			WriteIdentifier(delegateDeclaration.Name.Name);
-			WriteTypeParameters(delegateDeclaration.TypeParameters);
-			WriteCommaSeparatedListInParenthesis(delegateDeclaration.Parameters, false);
-			if (!delegateDeclaration.IsSub) {
-				Space();
-				WriteKeyword("As");
-				WriteAttributes(delegateDeclaration.ReturnTypeAttributes);
-				delegateDeclaration.ReturnType.AcceptVisitor(this, data);
-			}
-			NewLine();
-			
-			return EndNode(delegateDeclaration);
-		}
-		
-		public object VisitIdentifier(Identifier identifier, object data)
-		{
-			StartNode(identifier);
-			WriteIdentifier(identifier.Name);
-			WriteTypeCharacter(identifier.TypeCharacter);
-			return EndNode(identifier);
-		}
-		
-		public object VisitXmlIdentifier(XmlIdentifier xmlIdentifier, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public object VisitXmlLiteralString(XmlLiteralString xmlLiteralString, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public object VisitSimpleNameExpression(SimpleNameExpression simpleNameExpression, object data)
-		{
-			StartNode(simpleNameExpression);
-			
-			simpleNameExpression.Identifier.AcceptVisitor(this, data);
-			WriteTypeArguments(simpleNameExpression.TypeArguments);
-			
-			return EndNode(simpleNameExpression);
-		}
-		
-		public object VisitPrimitiveExpression(PrimitiveExpression primitiveExpression, object data)
-		{
-			StartNode(primitiveExpression);
-			
-			WritePrimitiveValue(primitiveExpression.Value);
-			
-			return EndNode(primitiveExpression);
-		}
-		
-		public object VisitInstanceExpression(InstanceExpression instanceExpression, object data)
-		{
-			StartNode(instanceExpression);
-			
-			switch (instanceExpression.Type) {
-				case InstanceExpressionType.Me:
-					WriteKeyword("Me");
-					break;
-				case InstanceExpressionType.MyBase:
-					WriteKeyword("MyBase");
-					break;
-				case InstanceExpressionType.MyClass:
-					WriteKeyword("MyClass");
-					break;
-				default:
-					throw new Exception("Invalid value for InstanceExpressionType");
-			}
-			
-			return EndNode(instanceExpression);
-		}
-		
-		public object VisitParenthesizedExpression(ParenthesizedExpression parenthesizedExpression, object data)
-		{
-			StartNode(parenthesizedExpression);
-			
-			LPar();
-			parenthesizedExpression.Expression.AcceptVisitor(this, data);
-			RPar();
-			
-			return EndNode(parenthesizedExpression);
-		}
-		
-		public object VisitGetTypeExpression(GetTypeExpression getTypeExpression, object data)
-		{
-			StartNode(getTypeExpression);
-			
-			WriteKeyword("GetType");
-			LPar();
-			getTypeExpression.Type.AcceptVisitor(this, data);
-			RPar();
-			
-			return EndNode(getTypeExpression);
-		}
-		
-		public object VisitTypeOfIsExpression(TypeOfIsExpression typeOfIsExpression, object data)
-		{
-			StartNode(typeOfIsExpression);
-			
-			WriteKeyword("TypeOf");
-			typeOfIsExpression.TypeOfExpression.AcceptVisitor(this, data);
-			WriteKeyword("Is");
-			typeOfIsExpression.Type.AcceptVisitor(this, data);
-			
-			return EndNode(typeOfIsExpression);
-		}
-		
-		public object VisitGetXmlNamespaceExpression(GetXmlNamespaceExpression getXmlNamespaceExpression, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public object VisitMemberAccessExpression(MemberAccessExpression memberAccessExpression, object data)
-		{
-			StartNode(memberAccessExpression);
-			
-			memberAccessExpression.Target.AcceptVisitor(this, data);
-			WriteToken(".", MemberAccessExpression.Roles.Dot);
-			memberAccessExpression.MemberName.AcceptVisitor(this, data);
-			WriteTypeArguments(memberAccessExpression.TypeArguments);
-			
-			return EndNode(memberAccessExpression);
-		}
-		
-		public object VisitTypeReferenceExpression(TypeReferenceExpression typeReferenceExpression, object data)
-		{
-			StartNode(typeReferenceExpression);
-			
-			typeReferenceExpression.Type.AcceptVisitor(this, data);
-			
-			return EndNode(typeReferenceExpression);
-		}
-		
-		public object VisitEventMemberSpecifier(EventMemberSpecifier eventMemberSpecifier, object data)
-		{
-			StartNode(eventMemberSpecifier);
-			
-			eventMemberSpecifier.Target.AcceptVisitor(this, data);
-			WriteToken(".", EventMemberSpecifier.Roles.Dot);
-			eventMemberSpecifier.Member.AcceptVisitor(this, data);
-			
-			return EndNode(eventMemberSpecifier);
-		}
-		
-		public object VisitInterfaceMemberSpecifier(InterfaceMemberSpecifier interfaceMemberSpecifier, object data)
-		{
-			StartNode(interfaceMemberSpecifier);
-			
-			interfaceMemberSpecifier.Target.AcceptVisitor(this, data);
-			WriteToken(".", EventMemberSpecifier.Roles.Dot);
-			interfaceMemberSpecifier.Member.AcceptVisitor(this, data);
-			
-			return EndNode(interfaceMemberSpecifier);
-		}
-		
-		#region TypeMembers
-		public object VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration, object data)
-		{
-			StartNode(constructorDeclaration);
-			
-			WriteAttributes(constructorDeclaration.Attributes);
-			WriteModifiers(constructorDeclaration.ModifierTokens);
-			WriteKeyword("Sub");
-			WriteKeyword("New");
-			WriteCommaSeparatedListInParenthesis(constructorDeclaration.Parameters, false);
-			MarkFoldStart();
-			NewLine();
-			
-			Indent();
-			WriteBlock(constructorDeclaration.Body);
-			Unindent();
-			
-			WriteKeyword("End");
-			WriteKeyword("Sub");
-			MarkFoldEnd();
-			NewLine();
-			
-			return EndNode(constructorDeclaration);
-		}
-		
-		public object VisitMethodDeclaration(MethodDeclaration methodDeclaration, object data)
-		{
-			StartNode(methodDeclaration);
-			
-			WriteAttributes(methodDeclaration.Attributes);
-			WriteModifiers(methodDeclaration.ModifierTokens);
-			if (methodDeclaration.IsSub)
-				WriteKeyword("Sub");
-			else
-				WriteKeyword("Function");
-			methodDeclaration.Name.AcceptVisitor(this, data);
-			WriteTypeParameters(methodDeclaration.TypeParameters);
-			WriteCommaSeparatedListInParenthesis(methodDeclaration.Parameters, false);
-			if (!methodDeclaration.IsSub && !methodDeclaration.ReturnType.IsNull) {
-				Space();
-				WriteKeyword("As");
-				WriteAttributes(methodDeclaration.ReturnTypeAttributes);
-				methodDeclaration.ReturnType.AcceptVisitor(this, data);
-			}
-			WriteHandlesClause(methodDeclaration.HandlesClause);
-			WriteImplementsClause(methodDeclaration.ImplementsClause);
-			if (!methodDeclaration.Body.IsNull) {
-				MarkFoldStart();
-				NewLine();
-				Indent();
-				WriteBlock(methodDeclaration.Body);
-				Unindent();
-				WriteKeyword("End");
-				if (methodDeclaration.IsSub)
-					WriteKeyword("Sub");
-				else
-					WriteKeyword("Function");
-				MarkFoldEnd();
-			}
-			NewLine();
-			
-			return EndNode(methodDeclaration);
-		}
-
-		public object VisitFieldDeclaration(FieldDeclaration fieldDeclaration, object data)
-		{
-			StartNode(fieldDeclaration);
-			
-			WriteAttributes(fieldDeclaration.Attributes);
-			WriteModifiers(fieldDeclaration.ModifierTokens);
-			WriteCommaSeparatedList(fieldDeclaration.Variables);
-			NewLine();
-			
-			return EndNode(fieldDeclaration);
-		}
-		
-		public object VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration, object data)
-		{
-			StartNode(propertyDeclaration);
-			
-			WriteAttributes(propertyDeclaration.Attributes);
-			WriteModifiers(propertyDeclaration.ModifierTokens);
-			WriteKeyword("Property");
-			WriteIdentifier(propertyDeclaration.Name.Name);
-			WriteCommaSeparatedListInParenthesis(propertyDeclaration.Parameters, false);
-			if (!propertyDeclaration.ReturnType.IsNull) {
-				Space();
-				WriteKeyword("As");
-				WriteAttributes(propertyDeclaration.ReturnTypeAttributes);
-				propertyDeclaration.ReturnType.AcceptVisitor(this, data);
-			}
-			
-			bool needsBody = !propertyDeclaration.Getter.Body.IsNull || !propertyDeclaration.Setter.Body.IsNull;
-			
-			if (needsBody) {
-				MarkFoldStart();
-				NewLine();
-				Indent();
-				
-				if (!propertyDeclaration.Getter.Body.IsNull) {
-					propertyDeclaration.Getter.AcceptVisitor(this, data);
-				}
-				
-				if (!propertyDeclaration.Setter.Body.IsNull) {
-					propertyDeclaration.Setter.AcceptVisitor(this, data);
-				}
-				Unindent();
-				
-				WriteKeyword("End");
-				WriteKeyword("Property");
-				MarkFoldEnd();
-			}
-			NewLine();
-			
-			return EndNode(propertyDeclaration);
-		}
-		#endregion
-		
-		#region TypeName
-		public object VisitPrimitiveType(PrimitiveType primitiveType, object data)
-		{
-			StartNode(primitiveType);
-			
-			WriteKeyword(primitiveType.Keyword);
-			
-			return EndNode(primitiveType);
-		}
-		
-		public object VisitQualifiedType(QualifiedType qualifiedType, object data)
-		{
-			StartNode(qualifiedType);
-			
-			qualifiedType.Target.AcceptVisitor(this, data);
-			WriteToken(".", AstNode.Roles.Dot);
-			WriteIdentifier(qualifiedType.Name);
-			WriteTypeArguments(qualifiedType.TypeArguments);
-			
-			return EndNode(qualifiedType);
-		}
-		
-		public object VisitComposedType(ComposedType composedType, object data)
-		{
-			StartNode(composedType);
-			
-			composedType.BaseType.AcceptVisitor(this, data);
-			if (composedType.HasNullableSpecifier)
-				WriteToken("?", ComposedType.Roles.QuestionMark);
-			WriteArraySpecifiers(composedType.ArraySpecifiers);
-			
-			return EndNode(composedType);
-		}
-		
-		public object VisitArraySpecifier(ArraySpecifier arraySpecifier, object data)
-		{
-			StartNode(arraySpecifier);
-			
-			LPar();
-			for (int i = 0; i < arraySpecifier.Dimensions - 1; i++) {
-				WriteToken(",", ArraySpecifier.Roles.Comma);
-			}
-			RPar();
-			
-			return EndNode(arraySpecifier);
-		}
-		
-		public object VisitSimpleType(SimpleType simpleType, object data)
-		{
-			StartNode(simpleType);
-			
-			WriteIdentifier(simpleType.Identifier);
-			WriteTypeArguments(simpleType.TypeArguments);
-			
-			return EndNode(simpleType);
-		}
-		#endregion
-		
-		#region StartNode/EndNode
-		void StartNode(AstNode node)
-		{
-			// Ensure that nodes are visited in the proper nested order.
-			// Jumps to different subtrees are allowed only for the child of a placeholder node.
-			Debug.Assert(containerStack.Count == 0 || node.Parent == containerStack.Peek());
-			if (positionStack.Count > 0)
-				WriteSpecialsUpToNode(node);
-			containerStack.Push(node);
-			positionStack.Push(node.FirstChild);
-			formatter.StartNode(node);
-		}
-		
-		object EndNode(AstNode node)
-		{
-			Debug.Assert(node == containerStack.Peek());
-			AstNode pos = positionStack.Pop();
-			Debug.Assert(pos == null || pos.Parent == node);
-			WriteSpecials(pos, null);
-			containerStack.Pop();
-			formatter.EndNode(node);
-			return null;
-		}
-		#endregion
-		
-		#region WriteSpecials
-		/// <summary>
-		/// Writes all specials from start to end (exclusive). Does not touch the positionStack.
-		/// </summary>
-		void WriteSpecials(AstNode start, AstNode end)
-		{
-			for (AstNode pos = start; pos != end; pos = pos.NextSibling) {
-				if (pos.Role == AstNode.Roles.Comment) {
-					pos.AcceptVisitor(this, null);
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Writes all specials between the current position (in the positionStack) and the next
-		/// node with the specified role. Advances the current position.
-		/// </summary>
-		void WriteSpecialsUpToRole(Role role)
-		{
-			for (AstNode pos = positionStack.Peek(); pos != null; pos = pos.NextSibling) {
-				if (pos.Role == role) {
-					WriteSpecials(positionStack.Pop(), pos);
-					positionStack.Push(pos);
-					break;
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Writes all specials between the current position (in the positionStack) and the specified node.
-		/// Advances the current position.
-		/// </summary>
-		void WriteSpecialsUpToNode(AstNode node)
-		{
-			for (AstNode pos = positionStack.Peek(); pos != null; pos = pos.NextSibling) {
-				if (pos == node) {
-					WriteSpecials(positionStack.Pop(), pos);
-					positionStack.Push(pos);
-					break;
-				}
-			}
-		}
-		
-		void WriteSpecialsUpToRole(Role role, AstNode nextNode)
-		{
-			// Look for the role between the current position and the nextNode.
-			for (AstNode pos = positionStack.Peek(); pos != null && pos != nextNode; pos = pos.NextSibling) {
-				if (pos.Role == AstNode.Roles.Comma) {
-					WriteSpecials(positionStack.Pop(), pos);
-					positionStack.Push(pos);
-					break;
-				}
-			}
-		}
-		#endregion
-		
-		#region Comma
-		/// <summary>
-		/// Writes a comma.
-		/// </summary>
-		/// <param name="nextNode">The next node after the comma.</param>
-		/// <param name="noSpacesAfterComma">When set prevents printing a space after comma.</param>
-		void Comma(AstNode nextNode, bool noSpaceAfterComma = false)
-		{
-			WriteSpecialsUpToRole(AstNode.Roles.Comma, nextNode);
-			formatter.WriteToken(",");
-			lastWritten = LastWritten.Other;
-			Space(!noSpaceAfterComma); // TODO: Comma policy has changed.
-		}
-		
-		void WriteCommaSeparatedList(IEnumerable<AstNode> list)
-		{
-			bool isFirst = true;
-			foreach (AstNode node in list) {
-				if (isFirst) {
-					isFirst = false;
-				} else {
-					Comma(node);
-				}
-				node.AcceptVisitor(this, null);
-			}
-		}
-		
-		void WriteCommaSeparatedListInParenthesis(IEnumerable<AstNode> list, bool spaceWithin)
-		{
-			LPar();
-			if (list.Any()) {
-				Space(spaceWithin);
-				WriteCommaSeparatedList(list);
-				Space(spaceWithin);
-			}
-			RPar();
-		}
-		
-		#if DOTNET35
-		void WriteCommaSeparatedList(IEnumerable<VariableInitializer> list)
-		{
-			WriteCommaSeparatedList(list);
-		}
-		
-		void WriteCommaSeparatedList(IEnumerable<AstType> list)
-		{
-			WriteCommaSeparatedList(list);
-		}
-		
-		void WriteCommaSeparatedListInParenthesis(IEnumerable<Expression> list, bool spaceWithin)
-		{
-			WriteCommaSeparatedListInParenthesis(list.SafeCast<Expression, AstNode>(), spaceWithin);
-		}
-		
-		void WriteCommaSeparatedListInParenthesis(IEnumerable<ParameterDeclaration> list, bool spaceWithin)
-		{
-			WriteCommaSeparatedListInParenthesis(list.SafeCast<ParameterDeclaration, AstNode>(), spaceWithin);
-		}
-
-		#endif
-
-		void WriteCommaSeparatedListInBrackets(IEnumerable<ParameterDeclaration> list, bool spaceWithin)
-		{
-			WriteToken("[", AstNode.Roles.LBracket);
-			if (list.Any()) {
-				Space(spaceWithin);
-				WriteCommaSeparatedList(list);
-				Space(spaceWithin);
-			}
-			WriteToken("]", AstNode.Roles.RBracket);
-		}
-
-		void WriteCommaSeparatedListInBrackets(IEnumerable<Expression> list)
-		{
-			WriteToken ("[", AstNode.Roles.LBracket);
-			if (list.Any ()) {
-				Space();
-				WriteCommaSeparatedList(list);
-				Space();
-			}
-			WriteToken ("]", AstNode.Roles.RBracket);
-		}
-		#endregion
-		
-		#region Write tokens
-		/// <summary>
-		/// Writes a keyword, and all specials up to
-		/// </summary>
-		void WriteKeyword(string keyword, Role<VBTokenNode> tokenRole = null)
-		{
-			WriteSpecialsUpToRole(tokenRole ?? AstNode.Roles.Keyword);
-			if (lastWritten == LastWritten.KeywordOrIdentifier)
-				formatter.Space();
-			formatter.WriteKeyword(keyword);
-			lastWritten = LastWritten.KeywordOrIdentifier;
-		}
-		
-		void WriteIdentifier(string identifier, Role<Identifier> identifierRole = null)
-		{
-			WriteSpecialsUpToRole(identifierRole ?? AstNode.Roles.Identifier);
-			if (IsKeyword(identifier, containerStack.Peek())) {
-				if (lastWritten == LastWritten.KeywordOrIdentifier)
-					Space(); // this space is not strictly required, so we call Space()
-				formatter.WriteToken("[");
-			} else if (lastWritten == LastWritten.KeywordOrIdentifier) {
-				formatter.Space(); // this space is strictly required, so we directly call the formatter
-			}
-			formatter.WriteIdentifier(identifier);
-			if (IsKeyword(identifier, containerStack.Peek())) {
-				formatter.WriteToken("]");
-			}
-			lastWritten = LastWritten.KeywordOrIdentifier;
-		}
-		
-		void WriteToken(string token, Role<VBTokenNode> tokenRole)
-		{
-			WriteSpecialsUpToRole(tokenRole);
-			// Avoid that two +, - or ? tokens are combined into a ++, -- or ?? token.
-			// Note that we don't need to handle tokens like = because there's no valid
-			// C# program that contains the single token twice in a row.
-			// (for +, - and &, this can happen with unary operators;
-			// for ?, this can happen in "a is int? ? b : c" or "a as int? ?? 0";
-			// and for /, this can happen with "1/ *ptr" or "1/ //comment".)
-//			if (lastWritten == LastWritten.Plus && token[0] == '+'
-//			    || lastWritten == LastWritten.Minus && token[0] == '-'
-//			    || lastWritten == LastWritten.Ampersand && token[0] == '&'
-//			    || lastWritten == LastWritten.QuestionMark && token[0] == '?'
-//			    || lastWritten == LastWritten.Division && token[0] == '*')
-//			{
-//				formatter.Space();
-//			}
-			formatter.WriteToken(token);
-//			if (token == "+")
-//				lastWritten = LastWritten.Plus;
-//			else if (token == "-")
-//				lastWritten = LastWritten.Minus;
-//			else if (token == "&")
-//				lastWritten = LastWritten.Ampersand;
-//			else if (token == "?")
-//				lastWritten = LastWritten.QuestionMark;
-//			else if (token == "/")
-//				lastWritten = LastWritten.Division;
-//			else
-			lastWritten = LastWritten.Other;
-		}
-		
-		void WriteTypeCharacter(TypeCode typeCharacter)
-		{
-			switch (typeCharacter) {
-				case TypeCode.Empty:
-				case TypeCode.Object:
-				case TypeCode.DBNull:
-				case TypeCode.Boolean:
-				case TypeCode.Char:
-					
-					break;
-				case TypeCode.SByte:
-					
-					break;
-				case TypeCode.Byte:
-					
-					break;
-				case TypeCode.Int16:
-					
-					break;
-				case TypeCode.UInt16:
-					
-					break;
-				case TypeCode.Int32:
-					WriteToken("%", null);
-					break;
-				case TypeCode.UInt32:
-					
-					break;
-				case TypeCode.Int64:
-					WriteToken("&", null);
-					break;
-				case TypeCode.UInt64:
-					
-					break;
-				case TypeCode.Single:
-					WriteToken("!", null);
-					break;
-				case TypeCode.Double:
-					WriteToken("#", null);
-					break;
-				case TypeCode.Decimal:
-					WriteToken("@", null);
-					break;
-				case TypeCode.DateTime:
-					
-					break;
-				case TypeCode.String:
-					WriteToken("$", null);
-					break;
-				default:
-					throw new Exception("Invalid value for TypeCode");
-			}
-		}
-		
-		void LPar()
-		{
-			WriteToken("(", AstNode.Roles.LPar);
-		}
-		
-		void RPar()
-		{
-			WriteToken(")", AstNode.Roles.LPar);
-		}
-		
-		/// <summary>
-		/// Writes a space depending on policy.
-		/// </summary>
-		void Space(bool addSpace = true)
-		{
-			if (addSpace) {
-				formatter.Space();
-				lastWritten = LastWritten.Whitespace;
-			}
-		}
-		
-		void NewLine()
-		{
-			formatter.NewLine();
-			lastWritten = LastWritten.Whitespace;
-		}
-		
-		void Indent()
-		{
-			formatter.Indent();
-		}
-		
-		void Unindent()
-		{
-			formatter.Unindent();
-		}
-		
-		void MarkFoldStart()
-		{
-			formatter.MarkFoldStart();
-		}
-		
-		void MarkFoldEnd()
-		{
-			formatter.MarkFoldEnd();
-		}
-		#endregion
-		
-		#region IsKeyword Test
-		static readonly HashSet<string> unconditionalKeywords = new HashSet<string>(StringComparer.OrdinalIgnoreCase) {
-			"AddHandler", "AddressOf", "Alias", "And", "AndAlso", "As", "Boolean", "ByRef", "Byte",
-			"ByVal", "Call", "Case", "Catch", "CBool", "CByte", "CChar", "CInt", "Class", "CLng",
-			"CObj", "Const", "Continue", "CSByte", "CShort", "CSng", "CStr", "CType", "CUInt",
-			"CULng", "CUShort", "Date", "Decimal", "Declare", "Default", "Delegate", "Dim",
-			"DirectCast", "Do", "Double", "Each", "Else", "ElseIf", "End", "EndIf", "Enum", "Erase",
-			"Error", "Event", "Exit", "False", "Finally", "For", "Friend", "Function", "Get",
-			"GetType", "GetXmlNamespace", "Global", "GoSub", "GoTo", "Handles", "If", "Implements",
-			"Imports", "In", "Inherits", "Integer", "Interface", "Is", "IsNot", "Let", "Lib", "Like",
-			"Long", "Loop", "Me", "Mod", "Module", "MustInherit", "MustOverride", "MyBase", "MyClass",
-			"Namespace", "Narrowing", "New", "Next", "Not", "Nothing", "NotInheritable", "NotOverridable",
-			"Object", "Of", "On", "Operator", "Option", "Optional", "Or", "OrElse", "Overloads",
-			"Overridable", "Overrides", "ParamArray", "Partial", "Private", "Property", "Protected",
-			"Public", "RaiseEvent", "ReadOnly", "ReDim", "REM", "RemoveHandler", "Resume", "Return",
-			"SByte", "Select", "Set", "Shadows", "Shared", "Short", "Single", "Static", "Step", "Stop",
-			"String", "Structure", "Sub", "SyncLock", "Then", "Throw", "To", "True", "Try", "TryCast",
-			"TypeOf", "UInteger", "ULong", "UShort", "Using", "Variant", "Wend", "When", "While",
-			"Widening", "With", "WithEvents", "WriteOnly", "Xor"
-		};
-		
-		static readonly HashSet<string> queryKeywords = new HashSet<string> {
-			
-		};
-		
-		/// <summary>
-		/// Determines whether the specified identifier is a keyword in the given context.
-		/// </summary>
-		public static bool IsKeyword(string identifier, AstNode context)
-		{
-			if (unconditionalKeywords.Contains(identifier))
-				return true;
-//			if (context.Ancestors.Any(a => a is QueryExpression)) {
-//				if (queryKeywords.Contains(identifier))
-//					return true;
-//			}
-			return false;
-		}
-		#endregion
-		
-		#region Write constructs
-		void WriteTypeArguments(IEnumerable<AstType> typeArguments)
-		{
-			if (typeArguments.Any()) {
-				LPar();
-				WriteKeyword("Of");
-				WriteCommaSeparatedList(typeArguments);
-				RPar();
-			}
-		}
-		
-		void WriteTypeParameters(IEnumerable<TypeParameterDeclaration> typeParameters)
-		{
-			if (typeParameters.Any()) {
-				LPar();
-				WriteKeyword("Of");
-				WriteCommaSeparatedList(typeParameters);
-				RPar();
-			}
-		}
-		
-		void WriteModifiers(IEnumerable<VBModifierToken> modifierTokens)
-		{
-			foreach (VBModifierToken modifier in modifierTokens) {
-				modifier.AcceptVisitor(this, null);
-			}
-		}
-		
-		void WriteArraySpecifiers(IEnumerable<ArraySpecifier> arraySpecifiers)
-		{
-			foreach (ArraySpecifier specifier in arraySpecifiers) {
-				specifier.AcceptVisitor(this, null);
-			}
-		}
-		
-		void WriteQualifiedIdentifier(IEnumerable<Identifier> identifiers)
-		{
-			bool first = true;
-			foreach (Identifier ident in identifiers) {
-				if (first) {
-					first = false;
-					if (lastWritten == LastWritten.KeywordOrIdentifier)
-						formatter.Space();
-				} else {
-					WriteSpecialsUpToRole(AstNode.Roles.Dot, ident);
-					formatter.WriteToken(".");
-					lastWritten = LastWritten.Other;
-				}
-				WriteSpecialsUpToNode(ident);
-				formatter.WriteIdentifier(ident.Name);
-				lastWritten = LastWritten.KeywordOrIdentifier;
-			}
-		}
-		
-		void WriteEmbeddedStatement(Statement embeddedStatement)
-		{
-			if (embeddedStatement.IsNull)
-				return;
-			BlockStatement block = embeddedStatement as BlockStatement;
-			if (block != null)
-				VisitBlockStatement(block, null);
-			else
-				embeddedStatement.AcceptVisitor(this, null);
-		}
-		
-		void WriteBlock(BlockStatement body)
-		{
-			if (body.IsNull)
-				NewLine();
-			else
-				VisitBlockStatement(body, null);
-		}
-		
-		void WriteMembers(IEnumerable<AstNode> members)
-		{
-			Indent();
-			bool isFirst = true;
-			foreach (var member in members) {
-				if (isFirst) {
-					isFirst = false;
-				} else {
-					NewLine();
-				}
-				member.AcceptVisitor(this, null);
-			}
-			Unindent();
-		}
-		
-		void WriteAttributes(IEnumerable<AttributeBlock> attributes)
-		{
-			foreach (AttributeBlock attr in attributes) {
-				attr.AcceptVisitor(this, null);
-			}
-		}
-		
-		void WritePrivateImplementationType(AstType privateImplementationType)
-		{
-			if (!privateImplementationType.IsNull) {
-				privateImplementationType.AcceptVisitor(this, null);
-				WriteToken(".", AstNode.Roles.Dot);
-			}
-		}
-		
-		void WriteImplementsClause(AstNodeCollection<InterfaceMemberSpecifier> implementsClause)
-		{
-			if (implementsClause.Any()) {
-				Space();
-				WriteKeyword("Implements");
-				WriteCommaSeparatedList(implementsClause);
-			}
-		}
-		
-		void WriteImplementsClause(AstNodeCollection<AstType> implementsClause)
-		{
-			if (implementsClause.Any()) {
-				WriteKeyword("Implements");
-				WriteCommaSeparatedList(implementsClause);
-			}
-		}
-		
-		void WriteHandlesClause(AstNodeCollection<EventMemberSpecifier> handlesClause)
-		{
-			if (handlesClause.Any()) {
-				Space();
-				WriteKeyword("Handles");
-				WriteCommaSeparatedList(handlesClause);
-			}
-		}
-		
-		void WritePrimitiveValue(object val)
-		{
-			if (val == null) {
-				WriteKeyword("Nothing");
-				return;
-			}
-			
-			if (val is bool) {
-				if ((bool)val) {
-					WriteKeyword("True");
-				} else {
-					WriteKeyword("False");
-				}
-				return;
-			}
-			
-			if (val is string) {
-				formatter.WriteToken("\"" + ConvertString(val.ToString()) + "\"");
-				lastWritten = LastWritten.Other;
-			} else if (val is char) {
-				formatter.WriteToken("\"" + ConvertCharLiteral((char)val) + "\"c");
-				lastWritten = LastWritten.Other;
-			} else if (val is decimal) {
-				formatter.WriteToken(((decimal)val).ToString(NumberFormatInfo.InvariantInfo) + "D");
-				lastWritten = LastWritten.Other;
-			} else if (val is float) {
-				float f = (float)val;
-				if (float.IsInfinity(f) || float.IsNaN(f)) {
-					// Strictly speaking, these aren't PrimitiveExpressions;
-					// but we still support writing these to make life easier for code generators.
-					WriteKeyword("Single");
-					WriteToken(".", AstNode.Roles.Dot);
-					if (float.IsPositiveInfinity(f))
-						WriteIdentifier("PositiveInfinity");
-					else if (float.IsNegativeInfinity(f))
-						WriteIdentifier("NegativeInfinity");
-					else
-						WriteIdentifier("NaN");
-					return;
-				}
-				formatter.WriteToken(f.ToString("R", NumberFormatInfo.InvariantInfo) + "F");
-				lastWritten = LastWritten.Other;
-			} else if (val is double) {
-				double f = (double)val;
-				if (double.IsInfinity(f) || double.IsNaN(f)) {
-					// Strictly speaking, these aren't PrimitiveExpressions;
-					// but we still support writing these to make life easier for code generators.
-					WriteKeyword("Double");
-					WriteToken(".", AstNode.Roles.Dot);
-					if (double.IsPositiveInfinity(f))
-						WriteIdentifier("PositiveInfinity");
-					else if (double.IsNegativeInfinity(f))
-						WriteIdentifier("NegativeInfinity");
-					else
-						WriteIdentifier("NaN");
-					return;
-				}
-				string number = f.ToString("R", NumberFormatInfo.InvariantInfo);
-				if (number.IndexOf('.') < 0 && number.IndexOf('E') < 0)
-					number += ".0";
-				formatter.WriteToken(number);
-				// needs space if identifier follows number; this avoids mistaking the following identifier as type suffix
-				lastWritten = LastWritten.KeywordOrIdentifier;
-			} else if (val is IFormattable) {
-				StringBuilder b = new StringBuilder();
-//				if (primitiveExpression.LiteralFormat == LiteralFormat.HexadecimalNumber) {
-//					b.Append("0x");
-//					b.Append(((IFormattable)val).ToString("x", NumberFormatInfo.InvariantInfo));
-//				} else {
-				b.Append(((IFormattable)val).ToString(null, NumberFormatInfo.InvariantInfo));
-//				}
-				if (val is uint || val is ulong) {
-					b.Append("U");
-				}
-				if (val is long || val is ulong) {
-					b.Append("L");
-				}
-				formatter.WriteToken(b.ToString());
-				// needs space if identifier follows number; this avoids mistaking the following identifier as type suffix
-				lastWritten = LastWritten.KeywordOrIdentifier;
-			} else {
-				formatter.WriteToken(val.ToString());
-				lastWritten = LastWritten.Other;
-			}
-		}
-		#endregion
-		
-		#region ConvertLiteral
-		static string ConvertCharLiteral(char ch)
-		{
-			if (ch == '"') return "\"\"";
-			return ch.ToString();
-		}
-		
-		static string ConvertString(string str)
-		{
-			StringBuilder sb = new StringBuilder();
-			foreach (char ch in str) {
-				sb.Append(ConvertCharLiteral(ch));
-			}
-			return sb.ToString();
-		}
-		#endregion
-		
-		public object VisitVariableIdentifier(VariableIdentifier variableIdentifier, object data)
-		{
-			StartNode(variableIdentifier);
-			
-			WriteIdentifier(variableIdentifier.Name.Name);
-			if (variableIdentifier.HasNullableSpecifier)
-				WriteToken("?", VariableIdentifier.Roles.QuestionMark);
-			WriteArraySpecifiers(variableIdentifier.ArraySpecifiers);
-			
-			return EndNode(variableIdentifier);
-		}
-		
-		public object VisitAccessor(Accessor accessor, object data)
-		{
-			StartNode(accessor);
-			WriteAttributes(accessor.Attributes);
-			WriteModifiers(accessor.ModifierTokens);
-			if (accessor.Role == PropertyDeclaration.GetterRole) {
-				WriteKeyword("Get");
-			} else if (accessor.Role == PropertyDeclaration.SetterRole) {
-				WriteKeyword("Set");
-			} else if (accessor.Role == EventDeclaration.AddHandlerRole) {
-				WriteKeyword("AddHandler");
-			} else if (accessor.Role == EventDeclaration.RemoveHandlerRole) {
-				WriteKeyword("RemoveHandler");
-			} else if (accessor.Role == EventDeclaration.RaiseEventRole) {
-				WriteKeyword("RaiseEvent");
-			}
-			if (accessor.Parameters.Any())
-				WriteCommaSeparatedListInParenthesis(accessor.Parameters, false);
-			NewLine();
-			Indent();
-			WriteBlock(accessor.Body);
-			Unindent();
-			WriteKeyword("End");
-
-			if (accessor.Role == PropertyDeclaration.GetterRole) {
-				WriteKeyword("Get");
-			} else if (accessor.Role == PropertyDeclaration.SetterRole) {
-				WriteKeyword("Set");
-			} else if (accessor.Role == EventDeclaration.AddHandlerRole) {
-				WriteKeyword("AddHandler");
-			} else if (accessor.Role == EventDeclaration.RemoveHandlerRole) {
-				WriteKeyword("RemoveHandler");
-			} else if (accessor.Role == EventDeclaration.RaiseEventRole) {
-				WriteKeyword("RaiseEvent");
-			}
-			NewLine();
-			
-			return EndNode(accessor);
-		}
-
-		
-		public object VisitLabelDeclarationStatement(LabelDeclarationStatement labelDeclarationStatement, object data)
-		{
-			StartNode(labelDeclarationStatement);
-			
-			labelDeclarationStatement.Label.AcceptVisitor(this, data);
-			WriteToken(":", LabelDeclarationStatement.Roles.Colon);
-			
-			return EndNode(labelDeclarationStatement);
-		}
-		
-		public object VisitLocalDeclarationStatement(LocalDeclarationStatement localDeclarationStatement, object data)
-		{
-			StartNode(localDeclarationStatement);
-			
-			if (localDeclarationStatement.ModifierToken != null && !localDeclarationStatement.ModifierToken.IsNull)
-				WriteModifiers(new [] { localDeclarationStatement.ModifierToken });
-			WriteCommaSeparatedList(localDeclarationStatement.Variables);
-			
-			return EndNode(localDeclarationStatement);
-		}
-		
-		public object VisitWithStatement(WithStatement withStatement, object data)
-		{
-			StartNode(withStatement);
-			WriteKeyword("With");
-			withStatement.Expression.AcceptVisitor(this, data);
-			NewLine();
-			Indent();
-			withStatement.Body.AcceptVisitor(this, data);
-			Unindent();
-			WriteKeyword("End");
-			WriteKeyword("With");
-			return EndNode(withStatement);
-		}
-		
-		public object VisitSyncLockStatement(SyncLockStatement syncLockStatement, object data)
-		{
-			StartNode(syncLockStatement);
-			WriteKeyword("SyncLock");
-			syncLockStatement.Expression.AcceptVisitor(this, data);
-			NewLine();
-			Indent();
-			syncLockStatement.Body.AcceptVisitor(this, data);
-			Unindent();
-			WriteKeyword("End");
-			WriteKeyword("SyncLock");
-			return EndNode(syncLockStatement);
-		}
-		
-		public object VisitTryStatement(TryStatement tryStatement, object data)
-		{
-			StartNode(tryStatement);
-			WriteKeyword("Try");
-			NewLine();
-			Indent();
-			tryStatement.Body.AcceptVisitor(this, data);
-			Unindent();
-			foreach (var clause in tryStatement.CatchBlocks) {
-				clause.AcceptVisitor(this, data);
-			}
-			if (!tryStatement.FinallyBlock.IsNull) {
-				WriteKeyword("Finally");
-				NewLine();
-				Indent();
-				tryStatement.FinallyBlock.AcceptVisitor(this, data);
-				Unindent();
-			}
-			WriteKeyword("End");
-			WriteKeyword("Try");
-			return EndNode(tryStatement);
-		}
-		
-		public object VisitCatchBlock(CatchBlock catchBlock, object data)
-		{
-			StartNode(catchBlock);
-			WriteKeyword("Catch");
-			catchBlock.ExceptionVariable.AcceptVisitor(this, data);
-			if (!catchBlock.ExceptionType.IsNull) {
-				WriteKeyword("As");
-				catchBlock.ExceptionType.AcceptVisitor(this, data);
-			}
-			NewLine();
-			Indent();
-			foreach (var stmt in catchBlock) {
-				stmt.AcceptVisitor(this, data);
-				NewLine();
-			}
-			Unindent();
-			return EndNode(catchBlock);
-		}
-		
-		public object VisitExpressionStatement(ExpressionStatement expressionStatement, object data)
-		{
-			StartNode(expressionStatement);
-			expressionStatement.Expression.AcceptVisitor(this, data);
-			return EndNode(expressionStatement);
-		}
-		
-		public object VisitThrowStatement(ThrowStatement throwStatement, object data)
-		{
-			StartNode(throwStatement);
-			
-			WriteKeyword("Throw");
-			throwStatement.Expression.AcceptVisitor(this, data);
-			
-			return EndNode(throwStatement);
-		}
-		
-		public object VisitIfElseStatement(IfElseStatement ifElseStatement, object data)
-		{
-			StartNode(ifElseStatement);
-			WriteKeyword("If");
-			ifElseStatement.Condition.AcceptVisitor(this, data);
-			Space();
-			WriteKeyword("Then");
-			NewLine();
-			Indent();
-			ifElseStatement.Body.AcceptVisitor(this, data);
-			Unindent();
-			if (!ifElseStatement.ElseBlock.IsNull) {
-				WriteKeyword("Else");
-				NewLine();
-				Indent();
-				ifElseStatement.ElseBlock.AcceptVisitor(this, data);
-				Unindent();
-			}
-			WriteKeyword("End");
-			WriteKeyword("If");
-			return EndNode(ifElseStatement);
-		}
-		
-		public object VisitReturnStatement(ReturnStatement returnStatement, object data)
-		{
-			StartNode(returnStatement);
-			WriteKeyword("Return");
-			returnStatement.Expression.AcceptVisitor(this, data);
-			return EndNode(returnStatement);
-		}
-		
-		public object VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression, object data)
-		{
-			StartNode(binaryOperatorExpression);
-			binaryOperatorExpression.Left.AcceptVisitor(this, data);
-			Space();
-			switch (binaryOperatorExpression.Operator) {
-				case BinaryOperatorType.BitwiseAnd:
-					WriteKeyword("And");
-					break;
-				case BinaryOperatorType.BitwiseOr:
-					WriteKeyword("Or");
-					break;
-				case BinaryOperatorType.LogicalAnd:
-					WriteKeyword("AndAlso");
-					break;
-				case BinaryOperatorType.LogicalOr:
-					WriteKeyword("OrElse");
-					break;
-				case BinaryOperatorType.ExclusiveOr:
-					WriteKeyword("Xor");
-					break;
-				case BinaryOperatorType.GreaterThan:
-					WriteToken(">", BinaryOperatorExpression.OperatorRole);
-					break;
-				case BinaryOperatorType.GreaterThanOrEqual:
-					WriteToken(">=", BinaryOperatorExpression.OperatorRole);
-					break;
-				case BinaryOperatorType.Equality:
-					WriteToken("=", BinaryOperatorExpression.OperatorRole);
-					break;
-				case BinaryOperatorType.InEquality:
-					WriteToken("<>", BinaryOperatorExpression.OperatorRole);
-					break;
-				case BinaryOperatorType.LessThan:
-					WriteToken("<", BinaryOperatorExpression.OperatorRole);
-					break;
-				case BinaryOperatorType.LessThanOrEqual:
-					WriteToken("<=", BinaryOperatorExpression.OperatorRole);
-					break;
-				case BinaryOperatorType.Add:
-					WriteToken("+", BinaryOperatorExpression.OperatorRole);
-					break;
-				case BinaryOperatorType.Subtract:
-					WriteToken("-", BinaryOperatorExpression.OperatorRole);
-					break;
-				case BinaryOperatorType.Multiply:
-					WriteToken("*", BinaryOperatorExpression.OperatorRole);
-					break;
-				case BinaryOperatorType.Divide:
-					WriteToken("/", BinaryOperatorExpression.OperatorRole);
-					break;
-				case BinaryOperatorType.Modulus:
-					WriteKeyword("Mod");
-					break;
-				case BinaryOperatorType.DivideInteger:
-					WriteToken("\\", BinaryOperatorExpression.OperatorRole);
-					break;
-				case BinaryOperatorType.Power:
-					WriteToken("*", BinaryOperatorExpression.OperatorRole);
-					break;
-				case BinaryOperatorType.Concat:
-					WriteToken("&", BinaryOperatorExpression.OperatorRole);
-					break;
-				case BinaryOperatorType.ShiftLeft:
-					WriteToken("<<", BinaryOperatorExpression.OperatorRole);
-					break;
-				case BinaryOperatorType.ShiftRight:
-					WriteToken(">>", BinaryOperatorExpression.OperatorRole);
-					break;
-				case BinaryOperatorType.ReferenceEquality:
-					WriteKeyword("Is");
-					break;
-				case BinaryOperatorType.ReferenceInequality:
-					WriteKeyword("IsNot");
-					break;
-				case BinaryOperatorType.Like:
-					WriteKeyword("Like");
-					break;
-				case BinaryOperatorType.DictionaryAccess:
-					WriteToken("!", BinaryOperatorExpression.OperatorRole);
-					break;
-				default:
-					throw new Exception("Invalid value for BinaryOperatorType: " + binaryOperatorExpression.Operator);
-			}
-			Space();
-			binaryOperatorExpression.Right.AcceptVisitor(this, data);
-			return EndNode(binaryOperatorExpression);
-		}
-		
-		public object VisitIdentifierExpression(IdentifierExpression identifierExpression, object data)
-		{
-			StartNode(identifierExpression);
-			identifierExpression.Identifier.AcceptVisitor(this, data);
-			WriteTypeArguments(identifierExpression.TypeArguments);
-			return EndNode(identifierExpression);
-		}
-		
-		public object VisitAssignmentExpression(AssignmentExpression assignmentExpression, object data)
-		{
-			StartNode(assignmentExpression);
-			assignmentExpression.Left.AcceptVisitor(this, data);
-			Space();
-			switch (assignmentExpression.Operator) {
-				case AssignmentOperatorType.Assign:
-					WriteToken("=", AssignmentExpression.OperatorRole);
-					break;
-				case AssignmentOperatorType.Add:
-					WriteToken("+=", AssignmentExpression.OperatorRole);
-					break;
-				case AssignmentOperatorType.Subtract:
-					WriteToken("-=", AssignmentExpression.OperatorRole);
-					break;
-				case AssignmentOperatorType.Multiply:
-					WriteToken("*=", AssignmentExpression.OperatorRole);
-					break;
-				case AssignmentOperatorType.Divide:
-					WriteToken("/=", AssignmentExpression.OperatorRole);
-					break;
-				case AssignmentOperatorType.Power:
-					WriteToken("^=", AssignmentExpression.OperatorRole);
-					break;
-				case AssignmentOperatorType.DivideInteger:
-					WriteToken("\\=", AssignmentExpression.OperatorRole);
-					break;
-				case AssignmentOperatorType.ConcatString:
-					WriteToken("&=", AssignmentExpression.OperatorRole);
-					break;
-				case AssignmentOperatorType.ShiftLeft:
-					WriteToken("<<=", AssignmentExpression.OperatorRole);
-					break;
-				case AssignmentOperatorType.ShiftRight:
-					WriteToken(">>=", AssignmentExpression.OperatorRole);
-					break;
-				default:
-					throw new Exception("Invalid value for AssignmentOperatorType: " + assignmentExpression.Operator);
-			}
-			Space();
-			assignmentExpression.Right.AcceptVisitor(this, data);
-			return EndNode(assignmentExpression);
-		}
-		
-		public object VisitInvocationExpression(InvocationExpression invocationExpression, object data)
-		{
-			StartNode(invocationExpression);
-			invocationExpression.Target.AcceptVisitor(this, data);
-			WriteCommaSeparatedListInParenthesis(invocationExpression.Arguments, false);
-			return EndNode(invocationExpression);
-		}
-		
-		public object VisitArrayInitializerExpression(ArrayInitializerExpression arrayInitializerExpression, object data)
-		{
-			StartNode(arrayInitializerExpression);
-			WriteToken("{", ArrayInitializerExpression.Roles.LBrace);
-			Space();
-			WriteCommaSeparatedList(arrayInitializerExpression.Elements);
-			Space();
-			WriteToken("}", ArrayInitializerExpression.Roles.RBrace);
-			return EndNode(arrayInitializerExpression);
-		}
-		
-		public object VisitArrayCreateExpression(ArrayCreateExpression arrayCreateExpression, object data)
-		{
-			StartNode(arrayCreateExpression);
-			WriteKeyword("New");
-			Space();
-			arrayCreateExpression.Type.AcceptVisitor(this, data);
-			WriteCommaSeparatedListInParenthesis(arrayCreateExpression.Arguments, false);
-			foreach (var specifier in arrayCreateExpression.AdditionalArraySpecifiers) {
-				specifier.AcceptVisitor(this, data);
-			}
-			if (!arrayCreateExpression.Initializer.IsNull) {
-				Space();
-				WriteToken("=", ArrayCreateExpression.Roles.Assign);
-				Space();
-				arrayCreateExpression.Initializer.AcceptVisitor(this, data);
-			}
-			return EndNode(arrayCreateExpression);
-		}
-		
-		public object VisitObjectCreationExpression(ObjectCreationExpression objectCreationExpression, object data)
-		{
-			StartNode(objectCreationExpression);
-			
-			WriteKeyword("New");
-			objectCreationExpression.Type.AcceptVisitor(this, data);
-			WriteCommaSeparatedListInParenthesis(objectCreationExpression.Arguments, false);
-			if (!objectCreationExpression.Initializer.IsNull) {
-				Space();
-				if (objectCreationExpression.Initializer.Elements.Any(x => x is FieldInitializerExpression))
-					WriteKeyword("With");
-				else
-					WriteKeyword("From");
-				Space();
-				objectCreationExpression.Initializer.AcceptVisitor(this, data);
-			}
-			
-			return EndNode(objectCreationExpression);
-		}
-		
-		public object VisitCastExpression(CastExpression castExpression, object data)
-		{
-			StartNode(castExpression);
-			
-			switch (castExpression.CastType) {
-				case CastType.DirectCast:
-					WriteKeyword("DirectCast");
-					break;
-				case CastType.TryCast:
-					WriteKeyword("TryCast");
-					break;
-				case CastType.CType:
-					WriteKeyword("CType");
-					break;
-				case CastType.CBool:
-					WriteKeyword("CBool");
-					break;
-				case CastType.CByte:
-					WriteKeyword("CByte");
-					break;
-				case CastType.CChar:
-					WriteKeyword("CChar");
-					break;
-				case CastType.CDate:
-					WriteKeyword("CDate");
-					break;
-				case CastType.CDec:
-					WriteKeyword("CType");
-					break;
-				case CastType.CDbl:
-					WriteKeyword("CDec");
-					break;
-				case CastType.CInt:
-					WriteKeyword("CInt");
-					break;
-				case CastType.CLng:
-					WriteKeyword("CLng");
-					break;
-				case CastType.CObj:
-					WriteKeyword("CObj");
-					break;
-				case CastType.CSByte:
-					WriteKeyword("CSByte");
-					break;
-				case CastType.CShort:
-					WriteKeyword("CShort");
-					break;
-				case CastType.CSng:
-					WriteKeyword("CSng");
-					break;
-				case CastType.CStr:
-					WriteKeyword("CStr");
-					break;
-				case CastType.CUInt:
-					WriteKeyword("CUInt");
-					break;
-				case CastType.CULng:
-					WriteKeyword("CULng");
-					break;
-				case CastType.CUShort:
-					WriteKeyword("CUShort");
-					break;
-				default:
-					throw new Exception("Invalid value for CastType");
-			}
-			
-			WriteToken("(", CastExpression.Roles.LPar);
-			castExpression.Expression.AcceptVisitor(this, data);
-			
-			if (castExpression.CastType == CastType.CType ||
-			    castExpression.CastType == CastType.DirectCast ||
-			    castExpression.CastType == CastType.TryCast) {
-				WriteToken(",", CastExpression.Roles.Comma);
-				Space();
-				castExpression.Type.AcceptVisitor(this, data);
-			}
-			
-			WriteToken(")", CastExpression.Roles.RPar);
-			
-			return EndNode(castExpression);
-		}
-		
-		public object VisitComment(Comment comment, object data)
-		{
-			formatter.WriteComment(comment.IsDocumentationComment, comment.Content);
-			return null;
-		}
-		
-		public object VisitEventDeclaration(EventDeclaration eventDeclaration, object data)
-		{
-			StartNode(eventDeclaration);
-			
-			WriteAttributes(eventDeclaration.Attributes);
-			WriteModifiers(eventDeclaration.ModifierTokens);
-			if (eventDeclaration.IsCustom)
-				WriteKeyword("Custom");
-			WriteKeyword("Event");
-			WriteIdentifier(eventDeclaration.Name.Name);
-			if (!eventDeclaration.IsCustom && eventDeclaration.ReturnType.IsNull)
-				WriteCommaSeparatedListInParenthesis(eventDeclaration.Parameters, false);
-			if (!eventDeclaration.ReturnType.IsNull) {
-				Space();
-				WriteKeyword("As");
-				eventDeclaration.ReturnType.AcceptVisitor(this, data);
-			}
-			WriteImplementsClause(eventDeclaration.ImplementsClause);
-			
-			if (eventDeclaration.IsCustom) {
-				MarkFoldStart();
-				NewLine();
-				Indent();
-				
-				eventDeclaration.AddHandlerBlock.AcceptVisitor(this, data);
-				eventDeclaration.RemoveHandlerBlock.AcceptVisitor(this, data);
-				eventDeclaration.RaiseEventBlock.AcceptVisitor(this, data);
-				
-				Unindent();
-				WriteKeyword("End");
-				WriteKeyword("Event");
-				MarkFoldEnd();
-			}
-			NewLine();
-			
-			return EndNode(eventDeclaration);
-		}
-		
-		public object VisitUnaryOperatorExpression(UnaryOperatorExpression unaryOperatorExpression, object data)
-		{
-			StartNode(unaryOperatorExpression);
-			
-			switch (unaryOperatorExpression.Operator) {
-				case UnaryOperatorType.Not:
-					WriteKeyword("Not");
-					break;
-				case UnaryOperatorType.Minus:
-					WriteToken("-", UnaryOperatorExpression.OperatorRole);
-					break;
-				case UnaryOperatorType.Plus:
-					WriteToken("+", UnaryOperatorExpression.OperatorRole);
-					break;
-				case UnaryOperatorType.AddressOf:
-					WriteKeyword("AddressOf");
-					break;
-				case UnaryOperatorType.Await:
-					WriteKeyword("Await");
-					break;
-				default:
-					throw new Exception("Invalid value for UnaryOperatorType");
-			}
-			
-			unaryOperatorExpression.Expression.AcceptVisitor(this, data);
-			
-			return EndNode(unaryOperatorExpression);
-		}
-		
-		public object VisitFieldInitializerExpression(FieldInitializerExpression fieldInitializerExpression, object data)
-		{
-			StartNode(fieldInitializerExpression);
-			
-			if (fieldInitializerExpression.IsKey && fieldInitializerExpression.Parent is AnonymousObjectCreationExpression) {
-				WriteKeyword("Key");
-				Space();
-			}
-			
-			WriteToken(".", FieldInitializerExpression.Roles.Dot);
-			fieldInitializerExpression.Identifier.AcceptVisitor(this, data);
-			
-			Space();
-			WriteToken("=", FieldInitializerExpression.Roles.Assign);
-			Space();
-			fieldInitializerExpression.Expression.AcceptVisitor(this, data);
-			
-			return EndNode(fieldInitializerExpression);
-		}
-		
-		public object VisitNamedArgumentExpression(NamedArgumentExpression namedArgumentExpression, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public object VisitConditionalExpression(ConditionalExpression conditionalExpression, object data)
-		{
-			StartNode(conditionalExpression);
-			
-			WriteKeyword("If");
-			WriteToken("(", ConditionalExpression.Roles.LPar);
-			
-			conditionalExpression.ConditionExpression.AcceptVisitor(this, data);
-			WriteToken(",", ConditionalExpression.Roles.Comma);
-			Space();
-			
-			if (!conditionalExpression.TrueExpression.IsNull) {
-				conditionalExpression.TrueExpression.AcceptVisitor(this, data);
-				WriteToken(",", ConditionalExpression.Roles.Comma);
-				Space();
-			}
-			
-			conditionalExpression.FalseExpression.AcceptVisitor(this, data);
-			
-			WriteToken(")", ConditionalExpression.Roles.RPar);
-			
-			return EndNode(conditionalExpression);
-		}
-		
-		public object VisitWhileStatement(WhileStatement whileStatement, object data)
-		{
-			StartNode(whileStatement);
-			
-			WriteKeyword("While");
-			Space();
-			whileStatement.Condition.AcceptVisitor(this, data);
-			NewLine();
-			Indent();
-			whileStatement.Body.AcceptVisitor(this, data);
-			Unindent();
-			WriteKeyword("End");
-			WriteKeyword("While");
-			
-			return EndNode(whileStatement);
-		}
-		
-		public object VisitExitStatement(ExitStatement exitStatement, object data)
-		{
-			StartNode(exitStatement);
-			
-			WriteKeyword("Exit");
-			
-			switch (exitStatement.ExitKind) {
-				case ExitKind.Sub:
-					WriteKeyword("Sub");
-					break;
-				case ExitKind.Function:
-					WriteKeyword("Function");
-					break;
-				case ExitKind.Property:
-					WriteKeyword("Property");
-					break;
-				case ExitKind.Do:
-					WriteKeyword("Do");
-					break;
-				case ExitKind.For:
-					WriteKeyword("For");
-					break;
-				case ExitKind.While:
-					WriteKeyword("While");
-					break;
-				case ExitKind.Select:
-					WriteKeyword("Select");
-					break;
-				case ExitKind.Try:
-					WriteKeyword("Try");
-					break;
-				default:
-					throw new Exception("Invalid value for ExitKind");
-			}
-			
-			return EndNode(exitStatement);
-		}
-		
-		public object VisitForStatement(ForStatement forStatement, object data)
-		{
-			StartNode(forStatement);
-			
-			WriteKeyword("For");
-			forStatement.Variable.AcceptVisitor(this, data);
-			WriteKeyword("To");
-			forStatement.ToExpression.AcceptVisitor(this, data);
-			if (!forStatement.StepExpression.IsNull) {
-				WriteKeyword("Step");
-				Space();
-				forStatement.StepExpression.AcceptVisitor(this, data);
-			}
-			NewLine();
-			Indent();
-			forStatement.Body.AcceptVisitor(this, data);
-			Unindent();
-			WriteKeyword("Next");
-			
-			return EndNode(forStatement);
-		}
-		
-		public object VisitForEachStatement(ForEachStatement forEachStatement, object data)
-		{
-			StartNode(forEachStatement);
-			
-			WriteKeyword("For");
-			WriteKeyword("Each");
-			forEachStatement.Variable.AcceptVisitor(this, data);
-			Space();
-			WriteKeyword("In");
-			forEachStatement.InExpression.AcceptVisitor(this, data);
-			NewLine();
-			Indent();
-			forEachStatement.Body.AcceptVisitor(this, data);
-			Unindent();
-			WriteKeyword("Next");
-			
-			return EndNode(forEachStatement);
-		}
-		
-		public object VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration, object data)
-		{
-			StartNode(operatorDeclaration);
-			
-			WriteAttributes(operatorDeclaration.Attributes);
-			WriteModifiers(operatorDeclaration.ModifierTokens);
-			WriteKeyword("Operator");
-			switch (operatorDeclaration.Operator) {
-				case OverloadableOperatorType.Add:
-				case OverloadableOperatorType.UnaryPlus:
-					WriteToken("+", OperatorDeclaration.Roles.Keyword);
-					break;
-				case OverloadableOperatorType.Subtract:
-				case OverloadableOperatorType.UnaryMinus:
-					WriteToken("-", OperatorDeclaration.Roles.Keyword);
-					break;
-				case OverloadableOperatorType.Multiply:
-					WriteToken("*", OperatorDeclaration.Roles.Keyword);
-					break;
-				case OverloadableOperatorType.Divide:
-					WriteToken("/", OperatorDeclaration.Roles.Keyword);
-					break;
-				case OverloadableOperatorType.Modulus:
-					WriteKeyword("Mod");
-					break;
-				case OverloadableOperatorType.Concat:
-					WriteToken("&", OperatorDeclaration.Roles.Keyword);
-					break;
-				case OverloadableOperatorType.Not:
-					WriteKeyword("Not");
-					break;
-				case OverloadableOperatorType.BitwiseAnd:
-					WriteKeyword("And");
-					break;
-				case OverloadableOperatorType.BitwiseOr:
-					WriteKeyword("Or");
-					break;
-				case OverloadableOperatorType.ExclusiveOr:
-					WriteKeyword("Xor");
-					break;
-				case OverloadableOperatorType.ShiftLeft:
-					WriteToken("<<", OperatorDeclaration.Roles.Keyword);
-					break;
-				case OverloadableOperatorType.ShiftRight:
-					WriteToken(">>", OperatorDeclaration.Roles.Keyword);
-					break;
-				case OverloadableOperatorType.GreaterThan:
-					WriteToken(">", OperatorDeclaration.Roles.Keyword);
-					break;
-				case OverloadableOperatorType.GreaterThanOrEqual:
-					WriteToken(">=", OperatorDeclaration.Roles.Keyword);
-					break;
-				case OverloadableOperatorType.Equality:
-					WriteToken("=", OperatorDeclaration.Roles.Keyword);
-					break;
-				case OverloadableOperatorType.InEquality:
-					WriteToken("<>", OperatorDeclaration.Roles.Keyword);
-					break;
-				case OverloadableOperatorType.LessThan:
-					WriteToken("<", OperatorDeclaration.Roles.Keyword);
-					break;
-				case OverloadableOperatorType.LessThanOrEqual:
-					WriteToken("<=", OperatorDeclaration.Roles.Keyword);
-					break;
-				case OverloadableOperatorType.IsTrue:
-					WriteKeyword("IsTrue");
-					break;
-				case OverloadableOperatorType.IsFalse:
-					WriteKeyword("IsFalse");
-					break;
-				case OverloadableOperatorType.Like:
-					WriteKeyword("Like");
-					break;
-				case OverloadableOperatorType.Power:
-					WriteToken("^", OperatorDeclaration.Roles.Keyword);
-					break;
-				case OverloadableOperatorType.CType:
-					WriteKeyword("CType");
-					break;
-				case OverloadableOperatorType.DivideInteger:
-					WriteToken("\\", OperatorDeclaration.Roles.Keyword);
-					break;
-				default:
-					throw new Exception("Invalid value for OverloadableOperatorType");
-			}
-			WriteCommaSeparatedListInParenthesis(operatorDeclaration.Parameters, false);
-			if (!operatorDeclaration.ReturnType.IsNull) {
-				Space();
-				WriteKeyword("As");
-				WriteAttributes(operatorDeclaration.ReturnTypeAttributes);
-				operatorDeclaration.ReturnType.AcceptVisitor(this, data);
-			}
-			if (!operatorDeclaration.Body.IsNull) {
-				MarkFoldStart();
-				NewLine();
-				Indent();
-				WriteBlock(operatorDeclaration.Body);
-				Unindent();
-				WriteKeyword("End");
-				WriteKeyword("Operator");
-				MarkFoldEnd();
-			}
-			NewLine();
-			
-			return EndNode(operatorDeclaration);
-		}
-		
-		public object VisitSelectStatement(SelectStatement selectStatement, object data)
-		{
-			StartNode(selectStatement);
-			
-			WriteKeyword("Select");
-			WriteKeyword("Case");
-			selectStatement.Expression.AcceptVisitor(this, data);
-			NewLine();
-			Indent();
-			
-			foreach (CaseStatement stmt in selectStatement.Cases) {
-				stmt.AcceptVisitor(this, data);
-			}
-			
-			Unindent();
-			WriteKeyword("End");
-			WriteKeyword("Select");
-			
-			return EndNode(selectStatement);
-		}
-		
-		public object VisitCaseStatement(CaseStatement caseStatement, object data)
-		{
-			StartNode(caseStatement);
-			
-			WriteKeyword("Case");
-			if (caseStatement.Clauses.Count == 1 && caseStatement.Clauses.First().Expression.IsNull)
-				WriteKeyword("Else");
-			else {
-				Space();
-				WriteCommaSeparatedList(caseStatement.Clauses);
-			}
-			NewLine();
-			Indent();
-			caseStatement.Body.AcceptVisitor(this, data);
-			Unindent();
-			
-			return EndNode(caseStatement);
-		}
-		
-		public object VisitSimpleCaseClause(SimpleCaseClause simpleCaseClause, object data)
-		{
-			StartNode(simpleCaseClause);
-			simpleCaseClause.Expression.AcceptVisitor(this, data);
-			return EndNode(simpleCaseClause);
-		}
-		
-		public object VisitRangeCaseClause(RangeCaseClause rangeCaseClause, object data)
-		{
-			StartNode(rangeCaseClause);
-			rangeCaseClause.Expression.AcceptVisitor(this, data);
-			WriteKeyword("To");
-			rangeCaseClause.ToExpression.AcceptVisitor(this, data);
-			return EndNode(rangeCaseClause);
-		}
-		
-		public object VisitComparisonCaseClause(ComparisonCaseClause comparisonCaseClause, object data)
-		{
-			StartNode(comparisonCaseClause);
-			switch (comparisonCaseClause.Operator) {
-				case ComparisonOperator.Equality:
-					WriteToken("=", ComparisonCaseClause.OperatorRole);
-					break;
-				case ComparisonOperator.InEquality:
-					WriteToken("<>", ComparisonCaseClause.OperatorRole);
-					break;
-				case ComparisonOperator.LessThan:
-					WriteToken("<", ComparisonCaseClause.OperatorRole);
-					break;
-				case ComparisonOperator.GreaterThan:
-					WriteToken(">", ComparisonCaseClause.OperatorRole);
-					break;
-				case ComparisonOperator.LessThanOrEqual:
-					WriteToken("<=", ComparisonCaseClause.OperatorRole);
-					break;
-				case ComparisonOperator.GreaterThanOrEqual:
-					WriteToken(">=", ComparisonCaseClause.OperatorRole);
-					break;
-				default:
-					throw new Exception("Invalid value for ComparisonOperator");
-			}
-			Space();
-			comparisonCaseClause.Expression.AcceptVisitor(this, data);
-			return EndNode(comparisonCaseClause);
-		}
-
-		
-		public object VisitYieldStatement(YieldStatement yieldStatement, object data)
-		{
-			StartNode(yieldStatement);
-			WriteKeyword("Yield");
-			yieldStatement.Expression.AcceptVisitor(this, data);
-			return EndNode(yieldStatement);
-		}
-		
-		public object VisitVariableInitializer(VariableInitializer variableInitializer, object data)
-		{
-			StartNode(variableInitializer);
-			
-			variableInitializer.Identifier.AcceptVisitor(this, data);
-			if (!variableInitializer.Type.IsNull) {
-				WriteKeyword("As");
-				variableInitializer.Type.AcceptVisitor(this, data);
-			}
-			if (!variableInitializer.Expression.IsNull) {
-				Space();
-				WriteToken("=", VariableInitializer.Roles.Assign);
-				Space();
-				variableInitializer.Expression.AcceptVisitor(this, data);
-			}
-			
-			return EndNode(variableInitializer);
-		}
-		
-		public object VisitVariableDeclaratorWithTypeAndInitializer(VariableDeclaratorWithTypeAndInitializer variableDeclaratorWithTypeAndInitializer, object data)
-		{
-			StartNode(variableDeclaratorWithTypeAndInitializer);
-			
-			WriteCommaSeparatedList(variableDeclaratorWithTypeAndInitializer.Identifiers);
-			WriteKeyword("As");
-			variableDeclaratorWithTypeAndInitializer.Type.AcceptVisitor(this, data);
-			if (!variableDeclaratorWithTypeAndInitializer.Initializer.IsNull) {
-				Space();
-				WriteToken("=", VariableDeclarator.Roles.Assign);
-				Space();
-				variableDeclaratorWithTypeAndInitializer.Initializer.AcceptVisitor(this, data);
-			}
-			
-			return EndNode(variableDeclaratorWithTypeAndInitializer);
-		}
-		
-		public object VisitVariableDeclaratorWithObjectCreation(VariableDeclaratorWithObjectCreation variableDeclaratorWithObjectCreation, object data)
-		{
-			StartNode(variableDeclaratorWithObjectCreation);
-			
-			WriteCommaSeparatedList(variableDeclaratorWithObjectCreation.Identifiers);
-			WriteKeyword("As");
-			variableDeclaratorWithObjectCreation.Initializer.AcceptVisitor(this, data);
-			
-			return EndNode(variableDeclaratorWithObjectCreation);
-		}
-		
-		public object VisitDoLoopStatement(DoLoopStatement doLoopStatement, object data)
-		{
-			StartNode(doLoopStatement);
-			
-			WriteKeyword("Do");
-			if (doLoopStatement.ConditionType == ConditionType.DoUntil) {
-				WriteKeyword("Until");
-				doLoopStatement.Expression.AcceptVisitor(this, data);
-			}
-			if (doLoopStatement.ConditionType == ConditionType.DoWhile) {
-				WriteKeyword("While");
-				doLoopStatement.Expression.AcceptVisitor(this, data);
-			}
-			NewLine();
-			Indent();
-			doLoopStatement.Body.AcceptVisitor(this, data);
-			Unindent();
-			WriteKeyword("Loop");
-			if (doLoopStatement.ConditionType == ConditionType.LoopUntil) {
-				WriteKeyword("Until");
-				doLoopStatement.Expression.AcceptVisitor(this, data);
-			}
-			if (doLoopStatement.ConditionType == ConditionType.LoopWhile) {
-				WriteKeyword("While");
-				doLoopStatement.Expression.AcceptVisitor(this, data);
-			}
-			
-			return EndNode(doLoopStatement);
-		}
-		
-		public object VisitUsingStatement(UsingStatement usingStatement, object data)
-		{
-			StartNode(usingStatement);
-			
-			WriteKeyword("Using");
-			WriteCommaSeparatedList(usingStatement.Resources);
-			NewLine();
-			Indent();
-			usingStatement.Body.AcceptVisitor(this, data);
-			Unindent();
-			WriteKeyword("End");
-			WriteKeyword("Using");
-			
-			return EndNode(usingStatement);
-		}
-		
-		public object VisitGoToStatement(GoToStatement goToStatement, object data)
-		{
-			StartNode(goToStatement);
-			
-			WriteKeyword("GoTo");
-			goToStatement.Label.AcceptVisitor(this, data);
-			
-			return EndNode(goToStatement);
-		}
-		
-		public object VisitSingleLineSubLambdaExpression(SingleLineSubLambdaExpression singleLineSubLambdaExpression, object data)
-		{
-			StartNode(singleLineSubLambdaExpression);
-			
-			WriteModifiers(singleLineSubLambdaExpression.ModifierTokens);
-			WriteKeyword("Sub");
-			WriteCommaSeparatedListInParenthesis(singleLineSubLambdaExpression.Parameters, false);
-			Space();
-			singleLineSubLambdaExpression.EmbeddedStatement.AcceptVisitor(this, data);
-			
-			return EndNode(singleLineSubLambdaExpression);
-		}
-		
-		public object VisitSingleLineFunctionLambdaExpression(SingleLineFunctionLambdaExpression singleLineFunctionLambdaExpression, object data)
-		{
-			StartNode(singleLineFunctionLambdaExpression);
-			
-			WriteModifiers(singleLineFunctionLambdaExpression.ModifierTokens);
-			WriteKeyword("Function");
-			WriteCommaSeparatedListInParenthesis(singleLineFunctionLambdaExpression.Parameters, false);
-			Space();
-			singleLineFunctionLambdaExpression.EmbeddedExpression.AcceptVisitor(this, data);
-			
-			return EndNode(singleLineFunctionLambdaExpression);
-		}
-		
-		public object VisitMultiLineLambdaExpression(MultiLineLambdaExpression multiLineLambdaExpression, object data)
-		{
-			StartNode(multiLineLambdaExpression);
-			
-			WriteModifiers(multiLineLambdaExpression.ModifierTokens);
-			if (multiLineLambdaExpression.IsSub)
-				WriteKeyword("Sub");
-			else
-				WriteKeyword("Function");
-			WriteCommaSeparatedListInParenthesis(multiLineLambdaExpression.Parameters, false);
-			NewLine();
-			Indent();
-			multiLineLambdaExpression.Body.AcceptVisitor(this, data);
-			Unindent();
-			WriteKeyword("End");
-			if (multiLineLambdaExpression.IsSub)
-				WriteKeyword("Sub");
-			else
-				WriteKeyword("Function");
-			
-			return EndNode(multiLineLambdaExpression);
-		}
-		
-		public object VisitQueryExpression(QueryExpression queryExpression, object data)
-		{
-			StartNode(queryExpression);
-			
-			foreach (var op in queryExpression.QueryOperators) {
-				op.AcceptVisitor(this, data);
-			}
-			
-			return EndNode(queryExpression);
-		}
-		
-		public object VisitContinueStatement(ContinueStatement continueStatement, object data)
-		{
-			StartNode(continueStatement);
-			
-			WriteKeyword("Continue");
-			
-			switch (continueStatement.ContinueKind) {
-				case ContinueKind.Do:
-					WriteKeyword("Do");
-					break;
-				case ContinueKind.For:
-					WriteKeyword("For");
-					break;
-				case ContinueKind.While:
-					WriteKeyword("While");
-					break;
-				default:
-					throw new Exception("Invalid value for ContinueKind");
-			}
-			
-			return EndNode(continueStatement);
-		}
-		
-		public object VisitExternalMethodDeclaration(ExternalMethodDeclaration externalMethodDeclaration, object data)
-		{
-			StartNode(externalMethodDeclaration);
-			
-			WriteAttributes(externalMethodDeclaration.Attributes);
-			WriteModifiers(externalMethodDeclaration.ModifierTokens);
-			WriteKeyword("Declare");
-			switch (externalMethodDeclaration.CharsetModifier) {
-				case CharsetModifier.None:
-					break;
-				case CharsetModifier.Auto:
-					WriteKeyword("Auto");
-					break;
-				case CharsetModifier.Unicode:
-					WriteKeyword("Unicode");
-					break;
-				case CharsetModifier.Ansi:
-					WriteKeyword("Ansi");
-					break;
-				default:
-					throw new Exception("Invalid value for CharsetModifier");
-			}
-			if (externalMethodDeclaration.IsSub)
-				WriteKeyword("Sub");
-			else
-				WriteKeyword("Function");
-			externalMethodDeclaration.Name.AcceptVisitor(this, data);
-			WriteKeyword("Lib");
-			Space();
-			WritePrimitiveValue(externalMethodDeclaration.Library);
-			Space();
-			if (externalMethodDeclaration.Alias != null) {
-				WriteKeyword("Alias");
-				Space();
-				WritePrimitiveValue(externalMethodDeclaration.Alias);
-				Space();
-			}
-			WriteCommaSeparatedListInParenthesis(externalMethodDeclaration.Parameters, false);
-			if (!externalMethodDeclaration.IsSub && !externalMethodDeclaration.ReturnType.IsNull) {
-				Space();
-				WriteKeyword("As");
-				WriteAttributes(externalMethodDeclaration.ReturnTypeAttributes);
-				externalMethodDeclaration.ReturnType.AcceptVisitor(this, data);
-			}
-			NewLine();
-			
-			return EndNode(externalMethodDeclaration);
-		}
-		
-		public static string ToVBNetString(PrimitiveExpression primitiveExpression)
-		{
-			var writer = new StringWriter();
-			new OutputVisitor(writer, new VBFormattingOptions()).WritePrimitiveValue(primitiveExpression.Value);
-			return writer.ToString();
-		}
-		
-		public object VisitEmptyExpression(EmptyExpression emptyExpression, object data)
-		{
-			StartNode(emptyExpression);
-			
-			return EndNode(emptyExpression);
-		}
-		
-		public object VisitAnonymousObjectCreationExpression(AnonymousObjectCreationExpression anonymousObjectCreationExpression, object data)
-		{
-			StartNode(anonymousObjectCreationExpression);
-			
-			WriteKeyword("New");
-			WriteKeyword("With");
-			
-			WriteToken("{", AnonymousObjectCreationExpression.Roles.LBrace);
-			Space();
-			WriteCommaSeparatedList(anonymousObjectCreationExpression.Initializer);
-			Space();
-			WriteToken("}", AnonymousObjectCreationExpression.Roles.RBrace);
-			
-			return EndNode(anonymousObjectCreationExpression);
-		}
-		
-		public object VisitCollectionRangeVariableDeclaration(CollectionRangeVariableDeclaration collectionRangeVariableDeclaration, object data)
-		{
-			StartNode(collectionRangeVariableDeclaration);
-			
-			collectionRangeVariableDeclaration.Identifier.AcceptVisitor(this, data);
-			if (!collectionRangeVariableDeclaration.Type.IsNull) {
-				WriteKeyword("As");
-				collectionRangeVariableDeclaration.Type.AcceptVisitor(this, data);
-			}
-			WriteKeyword("In");
-			collectionRangeVariableDeclaration.Expression.AcceptVisitor(this, data);
-			
-			return EndNode(collectionRangeVariableDeclaration);
-		}
-		
-		public object VisitFromQueryOperator(FromQueryOperator fromQueryOperator, object data)
-		{
-			StartNode(fromQueryOperator);
-			
-			WriteKeyword("From");
-			WriteCommaSeparatedList(fromQueryOperator.Variables);
-			
-			return EndNode(fromQueryOperator);
-		}
-		
-		public object VisitAggregateQueryOperator(AggregateQueryOperator aggregateQueryOperator, object data)
-		{
-			StartNode(aggregateQueryOperator);
-			
-			WriteKeyword("Aggregate");
-			aggregateQueryOperator.Variable.AcceptVisitor(this, data);
-			
-			foreach (var operators in aggregateQueryOperator.SubQueryOperators) {
-				operators.AcceptVisitor(this, data);
-			}
-			
-			WriteKeyword("Into");
-			WriteCommaSeparatedList(aggregateQueryOperator.IntoExpressions);
-			
-			return EndNode(aggregateQueryOperator);
-		}
-		
-		public object VisitSelectQueryOperator(SelectQueryOperator selectQueryOperator, object data)
-		{
-			StartNode(selectQueryOperator);
-			
-			WriteKeyword("Select");
-			WriteCommaSeparatedList(selectQueryOperator.Variables);
-			
-			return EndNode(selectQueryOperator);
-		}
-		
-		public object VisitDistinctQueryOperator(DistinctQueryOperator distinctQueryOperator, object data)
-		{
-			StartNode(distinctQueryOperator);
-			
-			WriteKeyword("Distinct");
-			
-			return EndNode(distinctQueryOperator);
-		}
-		
-		public object VisitWhereQueryOperator(WhereQueryOperator whereQueryOperator, object data)
-		{
-			StartNode(whereQueryOperator);
-			
-			WriteKeyword("Where");
-			whereQueryOperator.Condition.AcceptVisitor(this, data);
-			
-			return EndNode(whereQueryOperator);
-		}
-		
-		public object VisitPartitionQueryOperator(PartitionQueryOperator partitionQueryOperator, object data)
-		{
-			StartNode(partitionQueryOperator);
-			
-			switch (partitionQueryOperator.Kind) {
-				case PartitionKind.Take:
-					WriteKeyword("Take");
-					break;
-				case PartitionKind.TakeWhile:
-					WriteKeyword("Take");
-					WriteKeyword("While");
-					break;
-				case PartitionKind.Skip:
-					WriteKeyword("Skip");
-					break;
-				case PartitionKind.SkipWhile:
-					WriteKeyword("Skip");
-					WriteKeyword("While");
-					break;
-				default:
-					throw new Exception("Invalid value for PartitionKind");
-			}
-			
-			partitionQueryOperator.Expression.AcceptVisitor(this, data);
-			
-			return EndNode(partitionQueryOperator);
-		}
-		
-		public object VisitOrderExpression(OrderExpression orderExpression, object data)
-		{
-			StartNode(orderExpression);
-			
-			orderExpression.Expression.AcceptVisitor(this, data);
-			
-			switch (orderExpression.Direction) {
-				case QueryOrderingDirection.None:
-					break;
-				case QueryOrderingDirection.Ascending:
-					WriteKeyword("Ascending");
-					break;
-				case QueryOrderingDirection.Descending:
-					WriteKeyword("Descending");
-					break;
-				default:
-					throw new Exception("Invalid value for QueryExpressionOrderingDirection");
-			}
-			
-			return EndNode(orderExpression);
-		}
-		
-		public object VisitOrderByQueryOperator(OrderByQueryOperator orderByQueryOperator, object data)
-		{
-			StartNode(orderByQueryOperator);
-			
-			WriteKeyword("Order");
-			WriteKeyword("By");
-			WriteCommaSeparatedList(orderByQueryOperator.Expressions);
-			
-			return EndNode(orderByQueryOperator);
-		}
-		
-		public object VisitLetQueryOperator(LetQueryOperator letQueryOperator, object data)
-		{
-			StartNode(letQueryOperator);
-			
-			WriteKeyword("Let");
-			WriteCommaSeparatedList(letQueryOperator.Variables);
-			
-			return EndNode(letQueryOperator);
-		}
-		
-		public object VisitGroupByQueryOperator(GroupByQueryOperator groupByQueryOperator, object data)
-		{
-			StartNode(groupByQueryOperator);
-			
-			WriteKeyword("Group");
-			WriteCommaSeparatedList(groupByQueryOperator.GroupExpressions);
-			WriteKeyword("By");
-			WriteCommaSeparatedList(groupByQueryOperator.ByExpressions);
-			WriteKeyword("Into");
-			WriteCommaSeparatedList(groupByQueryOperator.IntoExpressions);
-			
-			return EndNode(groupByQueryOperator);
-		}
-		
-		public object VisitJoinQueryOperator(JoinQueryOperator joinQueryOperator, object data)
-		{
-			StartNode(joinQueryOperator);
-			
-			WriteKeyword("Join");
-			joinQueryOperator.JoinVariable.AcceptVisitor(this, data);
-			if (!joinQueryOperator.SubJoinQuery.IsNull) {
-				joinQueryOperator.SubJoinQuery.AcceptVisitor(this, data);
-			}
-			WriteKeyword("On");
-			bool first = true;
-			foreach (var cond in joinQueryOperator.JoinConditions) {
-				if (first)
-					first = false;
-				else
-					WriteKeyword("And");
-				cond.AcceptVisitor(this, data);
-			}
-			
-			return EndNode(joinQueryOperator);
-		}
-		
-		public object VisitJoinCondition(JoinCondition joinCondition, object data)
-		{
-			StartNode(joinCondition);
-			
-			joinCondition.Left.AcceptVisitor(this, data);
-			WriteKeyword("Equals");
-			joinCondition.Right.AcceptVisitor(this, data);
-			
-			return EndNode(joinCondition);
-		}
-		
-		public object VisitGroupJoinQueryOperator(GroupJoinQueryOperator groupJoinQueryOperator, object data)
-		{
-			StartNode(groupJoinQueryOperator);
-			
-			WriteKeyword("Group");
-			WriteKeyword("Join");
-			groupJoinQueryOperator.JoinVariable.AcceptVisitor(this, data);
-			if (!groupJoinQueryOperator.SubJoinQuery.IsNull) {
-				groupJoinQueryOperator.SubJoinQuery.AcceptVisitor(this, data);
-			}
-			WriteKeyword("On");
-			bool first = true;
-			foreach (var cond in groupJoinQueryOperator.JoinConditions) {
-				if (first)
-					first = false;
-				else
-					WriteKeyword("And");
-				cond.AcceptVisitor(this, data);
-			}
-			WriteKeyword("Into");
-			WriteCommaSeparatedList(groupJoinQueryOperator.IntoExpressions);
-			
-			return EndNode(groupJoinQueryOperator);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/OutputVisitor/TextWriterOutputFormatter.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/OutputVisitor/TextWriterOutputFormatter.cs
deleted file mode 100644
index f5b610d163..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/OutputVisitor/TextWriterOutputFormatter.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.IO;
-
-namespace ICSharpCode.NRefactory.VB
-{
-	/// <summary>
-	/// Writes VB code into a TextWriter.
-	/// </summary>
-	public class TextWriterOutputFormatter : IOutputFormatter
-	{
-		readonly TextWriter textWriter;
-		int indentation;
-		bool needsIndent = true;
-		
-		public TextWriterOutputFormatter(TextWriter textWriter)
-		{
-			if (textWriter == null)
-				throw new ArgumentNullException("textWriter");
-			this.textWriter = textWriter;
-		}
-		
-		public void WriteIdentifier(string ident)
-		{
-			WriteIndentation();
-			textWriter.Write(ident);
-		}
-		
-		public void WriteKeyword(string keyword)
-		{
-			WriteIndentation();
-			textWriter.Write(keyword);
-		}
-		
-		public void WriteToken(string token)
-		{
-			WriteIndentation();
-			textWriter.Write(token);
-		}
-		
-		public void Space()
-		{
-			WriteIndentation();
-			textWriter.Write(' ');
-		}
-		
-		void WriteIndentation()
-		{
-			if (needsIndent) {
-				needsIndent = false;
-				for (int i = 0; i < indentation; i++) {
-					textWriter.Write('\t');
-				}
-			}
-		}
-		
-		public void NewLine()
-		{
-			textWriter.WriteLine();
-			needsIndent = true;
-		}
-		
-		public void Indent()
-		{
-			indentation++;
-		}
-		
-		public void Unindent()
-		{
-			indentation--;
-		}
-		
-		public virtual void StartNode(AstNode node)
-		{
-		}
-		
-		public virtual void EndNode(AstNode node)
-		{
-		}
-		
-		public void WriteComment(bool isDocumentation, string content)
-		{
-			WriteIndentation();
-			if (isDocumentation)
-				textWriter.Write("'''");
-			else
-				textWriter.Write("'");
-			textWriter.WriteLine(content);
-		}
-		
-		public void MarkFoldStart()
-		{
-		}
-		
-		public void MarkFoldEnd()
-		{
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/OutputVisitor/VBFormattingOptions.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/OutputVisitor/VBFormattingOptions.cs
deleted file mode 100644
index 5dbf95054c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/OutputVisitor/VBFormattingOptions.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB
-{
-	/// <summary>
-	/// Description of VBFormattingOptions.
-	/// </summary>
-	public class VBFormattingOptions
-	{
-		public VBFormattingOptions()
-		{
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/Errors.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/Errors.cs
deleted file mode 100644
index ab9e615bdd..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/Errors.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Text;
-
-namespace ICSharpCode.NRefactory.VB.Parser
-{
-	public delegate void ErrorCodeProc(int line, int col, int n);
-	public delegate void ErrorMsgProc(int line, int col, string msg);
-	
-	public class Errors
-	{
-		int count = 0;  // number of errors detected
-		public ErrorCodeProc SynErr;
-		public ErrorCodeProc SemErr;
-		public ErrorMsgProc  Error;
-		StringBuilder errorText = new StringBuilder();
-		
-		public string ErrorOutput {
-			get {
-				return errorText.ToString();
-			}
-		}
-		
-		public Errors()
-		{
-			SynErr = new ErrorCodeProc(DefaultCodeError);  // syntactic errors
-			SemErr = new ErrorCodeProc(DefaultCodeError);  // semantic errors
-			Error  = new ErrorMsgProc(DefaultMsgError);    // user defined string based errors
-		}
-		
-		public int Count {
-			get {
-				return count;
-			}
-		}
-		
-		void DefaultCodeError(int line, int col, int n)
-		{
-			errorText.AppendLine(String.Format("-- line {0} col {1}: error {2}", line, col, n));
-			count++;
-		}
-	
-		void DefaultMsgError(int line, int col, string s) {
-			errorText.AppendLine(String.Format("-- line {0} col {1}: {2}", line, col, s));
-			count++;
-		}
-	} // Errors
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/Parser.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/Parser.cs
deleted file mode 100644
index aa12c27f37..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/Parser.cs
+++ /dev/null
@@ -1,760 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Text;
-using ICSharpCode.NRefactory.VB.Ast;
-using ICSharpCode.NRefactory.VB.Parser;
-using ASTAttribute = ICSharpCode.NRefactory.VB.Ast.Attribute;
-using Roles = ICSharpCode.NRefactory.VB.AstNode.Roles;
-
-
-
-
-namespace ICSharpCode.NRefactory.VB.Parser {
-
-
-// ----------------------------------------------------------------------------
-// Parser
-// ----------------------------------------------------------------------------
-//! A Coco/R Parser
-partial class VBParser
-{
-	public const int _EOF = 0;
-	public const int _EOL = 1;
-	public const int _ident = 2;
-	public const int _LiteralString = 3;
-	public const int _LiteralCharacter = 4;
-	public const int _LiteralInteger = 5;
-	public const int _LiteralDouble = 6;
-	public const int _LiteralSingle = 7;
-	public const int _LiteralDecimal = 8;
-	public const int _LiteralDate = 9;
-	public const int _XmlOpenTag = 10;
-	public const int _XmlCloseTag = 11;
-	public const int _XmlStartInlineVB = 12;
-	public const int _XmlEndInlineVB = 13;
-	public const int _XmlCloseTagEmptyElement = 14;
-	public const int _XmlOpenEndTag = 15;
-	public const int _XmlContent = 16;
-	public const int _XmlComment = 17;
-	public const int _XmlCData = 18;
-	public const int _XmlProcessingInstruction = 19;
-	public const int maxT = 238;  //<! max term (w/o pragmas)
-
-	const bool T = true;
-	const bool x = false;
-	const int minErrDist = 2;
-
-	public Errors  errors;
-
-
-
-
-	void Get () {
-		lexer.NextToken();
-
-	}
-
-	bool StartOf (int s) {
-		return set[s].Get(la.kind);
-	}
-
-	void ExpectWeak (int n, int follow) {
-		if (la.kind == n) Get();
-		else {
-			SynErr(n);
-			while (!StartOf(follow)) Get();
-		}
-	}
-
-
-	bool WeakSeparator(int n, int syFol, int repFol) {
-		int kind = la.kind;
-		if (kind == n) {Get(); return true;}
-		else if (StartOf(repFol)) {return false;}
-		else {
-			SynErr(n);
-			while (!(set[syFol].Get(kind) || set[repFol].Get(kind) || set[0].Get(kind))) {
-				Get();
-				kind = la.kind;
-			}
-			return StartOf(syFol);
-		}
-	}
-
-
-	void VB() {
-		compilationUnit = new CompilationUnit();
-			NodeStart(compilationUnit);
-			Get();
-
-		while (la.kind == 1 || la.kind == 21) {
-			StatementTerminator();
-		}
-		while (la.kind == 173) {
-			OptionStatement(CompilationUnit.MemberRole);
-			while (la.kind == 1 || la.kind == 21) {
-				StatementTerminator();
-			}
-		}
-		while (la.kind == 137) {
-			ImportsStatement(CompilationUnit.MemberRole);
-			while (la.kind == 1 || la.kind == 21) {
-				StatementTerminator();
-			}
-		}
-	}
-
-	void StatementTerminator() {
-		while (!(la.kind == 0 || la.kind == 1 || la.kind == 21)) {SynErr(239); Get();}
-		if (la.kind == 1) {
-			Get();
-			AddTerminal(Roles.StatementTerminator);
-		} else if (la.kind == 21) {
-			Get();
-			AddTerminal(Roles.StatementTerminator);
-		} else SynErr(240);
-	}
-
-	void OptionStatement(Role role) {
-		var result = new OptionStatement(); NodeStart(result);
-		Expect(173);
-		AddTerminal(Roles.Keyword);
-		if (la.kind == 121) {
-			Get();
-			AddTerminal(Ast.OptionStatement.OptionTypeRole);
-			result.OptionType = OptionType.Explicit;
-			if (la.kind == 170 || la.kind == 171) {
-				OnOff(result);
-			}
-		} else if (la.kind == 207) {
-			Get();
-			AddTerminal(Ast.OptionStatement.OptionTypeRole);
-			result.OptionType = OptionType.Strict;
-			if (la.kind == 170 || la.kind == 171) {
-				OnOff(result);
-			}
-		} else if (la.kind == 139) {
-			Get();
-			AddTerminal(Ast.OptionStatement.OptionTypeRole);
-			result.OptionType = OptionType.Infer;
-			if (la.kind == 170 || la.kind == 171) {
-				OnOff(result);
-			}
-		} else if (la.kind == 87) {
-			Get();
-			AddTerminal(Ast.OptionStatement.OptionTypeRole);
-			result.OptionType = OptionType.Compare;
-			BinaryText(result);
-		} else SynErr(241);
-		StatementTerminator();
-		NodeEnd(result, role);
-	}
-
-	void ImportsStatement(Role role) {
-		var result = new ImportsStatement(); NodeStart(result);
-		Expect(137);
-		AddTerminal(Roles.Keyword);
-		ImportsClause();
-		while (la.kind == 22) {
-			Get();
-			ImportsClause();
-		}
-		StatementTerminator();
-		NodeEnd(result, role);
-	}
-
-	void Identifier() {
-		if (StartOf(1)) {
-			IdentifierForFieldDeclaration();
-		} else if (la.kind == 98) {
-			Get();
-		} else SynErr(242);
-	}
-
-	void IdentifierForFieldDeclaration() {
-		switch (la.kind) {
-		case 2: {
-			Get();
-			break;
-		}
-		case 58: {
-			Get();
-			break;
-		}
-		case 62: {
-			Get();
-			break;
-		}
-		case 64: {
-			Get();
-			break;
-		}
-		case 65: {
-			Get();
-			break;
-		}
-		case 66: {
-			Get();
-			break;
-		}
-		case 67: {
-			Get();
-			break;
-		}
-		case 70: {
-			Get();
-			break;
-		}
-		case 87: {
-			Get();
-			break;
-		}
-		case 104: {
-			Get();
-			break;
-		}
-		case 107: {
-			Get();
-			break;
-		}
-		case 116: {
-			Get();
-			break;
-		}
-		case 121: {
-			Get();
-			break;
-		}
-		case 126: {
-			Get();
-			break;
-		}
-		case 133: {
-			Get();
-			break;
-		}
-		case 139: {
-			Get();
-			break;
-		}
-		case 143: {
-			Get();
-			break;
-		}
-		case 146: {
-			Get();
-			break;
-		}
-		case 147: {
-			Get();
-			break;
-		}
-		case 170: {
-			Get();
-			break;
-		}
-		case 176: {
-			Get();
-			break;
-		}
-		case 178: {
-			Get();
-			break;
-		}
-		case 184: {
-			Get();
-			break;
-		}
-		case 203: {
-			Get();
-			break;
-		}
-		case 212: {
-			Get();
-			break;
-		}
-		case 213: {
-			Get();
-			break;
-		}
-		case 223: {
-			Get();
-			break;
-		}
-		case 224: {
-			Get();
-			break;
-		}
-		case 230: {
-			Get();
-			break;
-		}
-		default: SynErr(243); break;
-		}
-	}
-
-	void TypeName(out AstType type) {
-		type = null;
-		if (StartOf(2)) {
-			PrimitiveTypeName(out type);
-		} else if (StartOf(3)) {
-			QualifiedTypeName(out type);
-		} else SynErr(244);
-	}
-
-	void PrimitiveTypeName(out AstType type) {
-		type = null;
-		switch (la.kind) {
-		case 168: {
-			Get();
-			type = new PrimitiveType("Object", t.Location);
-			break;
-		}
-		case 68: {
-			Get();
-			type = new PrimitiveType("Boolean", t.Location);
-			break;
-		}
-		case 99: {
-			Get();
-			type = new PrimitiveType("Date", t.Location);
-			break;
-		}
-		case 82: {
-			Get();
-			type = new PrimitiveType("Char", t.Location);
-			break;
-		}
-		case 208: {
-			Get();
-			type = new PrimitiveType("String", t.Location);
-			break;
-		}
-		case 100: {
-			Get();
-			type = new PrimitiveType("Decimal", t.Location);
-			break;
-		}
-		case 71: {
-			Get();
-			type = new PrimitiveType("Byte", t.Location);
-			break;
-		}
-		case 201: {
-			Get();
-			type = new PrimitiveType("Short", t.Location);
-			break;
-		}
-		case 141: {
-			Get();
-			type = new PrimitiveType("Integer", t.Location);
-			break;
-		}
-		case 151: {
-			Get();
-			type = new PrimitiveType("Long", t.Location);
-			break;
-		}
-		case 202: {
-			Get();
-			type = new PrimitiveType("Single", t.Location);
-			break;
-		}
-		case 109: {
-			Get();
-			type = new PrimitiveType("Double", t.Location);
-			break;
-		}
-		case 221: {
-			Get();
-			type = new PrimitiveType("UInteger", t.Location);
-			break;
-		}
-		case 222: {
-			Get();
-			type = new PrimitiveType("ULong", t.Location);
-			break;
-		}
-		case 225: {
-			Get();
-			type = new PrimitiveType("UShort", t.Location);
-			break;
-		}
-		case 196: {
-			Get();
-			type = new PrimitiveType("SByte", t.Location);
-			break;
-		}
-		default: SynErr(245); break;
-		}
-	}
-
-	void QualifiedTypeName(out AstType type) {
-		if (la.kind == 130) {
-			Get();
-		} else if (StartOf(4)) {
-			Identifier();
-		} else SynErr(246);
-		type = new SimpleType(t.val, t.Location);
-		while (la.kind == 26) {
-			Get();
-			Identifier();
-			type = new QualifiedType(type, new Identifier (t.val, t.Location));
-		}
-	}
-
-	void OnOff(OptionStatement os) {
-		if (la.kind == 171) {
-			Get();
-			AddTerminal(Ast.OptionStatement.OptionValueRole);
-			os.OptionValue = OptionValue.On;
-		} else if (la.kind == 170) {
-			Get();
-			AddTerminal(Ast.OptionStatement.OptionValueRole);
-			os.OptionValue  = OptionValue.Off;
-		} else SynErr(247);
-	}
-
-	void BinaryText(OptionStatement os) {
-		if (la.kind == 213) {
-			Get();
-			AddTerminal(Ast.OptionStatement.OptionValueRole);
-			os.OptionValue = OptionValue.Text;
-		} else if (la.kind == 67) {
-			Get();
-			AddTerminal(Ast.OptionStatement.OptionValueRole);
-			os.OptionValue  = OptionValue.Binary;
-		} else SynErr(248);
-	}
-
-	void ImportsClause() {
-		if (IsAliasImportsClause()) {
-			AliasImportsClause(Ast.ImportsStatement.ImportsClauseRole);
-		} else if (StartOf(5)) {
-			MemberImportsClause(Ast.ImportsStatement.ImportsClauseRole);
-		} else if (la.kind == 10) {
-			XmlNamespaceImportsClause(Ast.ImportsStatement.ImportsClauseRole);
-		} else SynErr(249);
-		while (!(StartOf(6))) {SynErr(250); Get();}
-	}
-
-	void AliasImportsClause(Role role) {
-		var result = new AliasImportsClause(); NodeStart(result);
-		AstType alias;
-		Identifier();
-		result.Name = new Identifier (t.val, t.Location);
-		Expect(20);
-		TypeName(out alias);
-		result.Alias = alias;
-		NodeEnd(result, role);
-	}
-
-	void MemberImportsClause(Role role) {
-		var result = new MemberImportsClause(); NodeStart(result);
-		AstType member;
-		TypeName(out member);
-		result.Member = member;
-		NodeEnd(result, role);
-	}
-
-	void XmlNamespaceImportsClause(Role role) {
-		var result = new XmlNamespaceImportsClause(); NodeStart(result);
-		Expect(10);
-		AddTerminal(Roles.XmlOpenTag);
-		Identifier();
-		Expect(20);
-		AddTerminal(Roles.Assign);
-		Expect(3);
-		Expect(11);
-		AddTerminal(Roles.XmlCloseTag);
-		NodeEnd(result, role);
-	}
-
-
-
-	public void ParseRoot() {
-		VB();
-		Expect(0); // expect end-of-file automatically added
-
-	}
-
-	static readonly BitArray[] set = {
-		new BitArray(new int[] {6291459, 0, 0, 0, 0, 0, 0, 0}),
-		new BitArray(new int[] {4, 1140850688, 8388687, 1108347136, 821280, 17105920, -2144335872, 65}),
-		new BitArray(new int[] {0, 0, 262288, 8216, 8396800, 256, 1610679824, 2}),
-		new BitArray(new int[] {4, 1140850688, 8388687, 1108347140, 821284, 17105920, -2144335872, 65}),
-		new BitArray(new int[] {4, 1140850688, 8388687, 1108347140, 821280, 17105920, -2144335872, 65}),
-		new BitArray(new int[] {4, 1140850688, 8650975, 1108355356, 9218084, 17106176, -533656048, 67}),
-		new BitArray(new int[] {6291459, 0, 0, 0, 0, 0, 0, 0})
-
-	};
-	
-	void SynErr(int line, int col, int errorNumber)
-	{
-		this.Errors.Error(line, col, GetMessage(errorNumber));
-	}
-	
-	string GetMessage(int errorNumber)
-	{
-		switch (errorNumber) {
-						case 0: return "EOF expected";
-			case 1: return "EOL expected";
-			case 2: return "ident expected";
-			case 3: return "LiteralString expected";
-			case 4: return "LiteralCharacter expected";
-			case 5: return "LiteralInteger expected";
-			case 6: return "LiteralDouble expected";
-			case 7: return "LiteralSingle expected";
-			case 8: return "LiteralDecimal expected";
-			case 9: return "LiteralDate expected";
-			case 10: return "XmlOpenTag expected";
-			case 11: return "XmlCloseTag expected";
-			case 12: return "XmlStartInlineVB expected";
-			case 13: return "XmlEndInlineVB expected";
-			case 14: return "XmlCloseTagEmptyElement expected";
-			case 15: return "XmlOpenEndTag expected";
-			case 16: return "XmlContent expected";
-			case 17: return "XmlComment expected";
-			case 18: return "XmlCData expected";
-			case 19: return "XmlProcessingInstruction expected";
-			case 20: return "\"=\" expected";
-			case 21: return "\":\" expected";
-			case 22: return "\",\" expected";
-			case 23: return "\"&\" expected";
-			case 24: return "\"/\" expected";
-			case 25: return "\"\\\\\" expected";
-			case 26: return "\".\" expected";
-			case 27: return "\"...\" expected";
-			case 28: return "\".@\" expected";
-			case 29: return "\"!\" expected";
-			case 30: return "\"-\" expected";
-			case 31: return "\"+\" expected";
-			case 32: return "\"^\" expected";
-			case 33: return "\"?\" expected";
-			case 34: return "\"*\" expected";
-			case 35: return "\"{\" expected";
-			case 36: return "\"}\" expected";
-			case 37: return "\"(\" expected";
-			case 38: return "\")\" expected";
-			case 39: return "\">\" expected";
-			case 40: return "\"<\" expected";
-			case 41: return "\"<>\" expected";
-			case 42: return "\">=\" expected";
-			case 43: return "\"<=\" expected";
-			case 44: return "\"<<\" expected";
-			case 45: return "\">>\" expected";
-			case 46: return "\"+=\" expected";
-			case 47: return "\"^=\" expected";
-			case 48: return "\"-=\" expected";
-			case 49: return "\"*=\" expected";
-			case 50: return "\"/=\" expected";
-			case 51: return "\"\\\\=\" expected";
-			case 52: return "\"<<=\" expected";
-			case 53: return "\">>=\" expected";
-			case 54: return "\"&=\" expected";
-			case 55: return "\":=\" expected";
-			case 56: return "\"AddHandler\" expected";
-			case 57: return "\"AddressOf\" expected";
-			case 58: return "\"Aggregate\" expected";
-			case 59: return "\"Alias\" expected";
-			case 60: return "\"And\" expected";
-			case 61: return "\"AndAlso\" expected";
-			case 62: return "\"Ansi\" expected";
-			case 63: return "\"As\" expected";
-			case 64: return "\"Ascending\" expected";
-			case 65: return "\"Assembly\" expected";
-			case 66: return "\"Auto\" expected";
-			case 67: return "\"Binary\" expected";
-			case 68: return "\"Boolean\" expected";
-			case 69: return "\"ByRef\" expected";
-			case 70: return "\"By\" expected";
-			case 71: return "\"Byte\" expected";
-			case 72: return "\"ByVal\" expected";
-			case 73: return "\"Call\" expected";
-			case 74: return "\"Case\" expected";
-			case 75: return "\"Catch\" expected";
-			case 76: return "\"CBool\" expected";
-			case 77: return "\"CByte\" expected";
-			case 78: return "\"CChar\" expected";
-			case 79: return "\"CDate\" expected";
-			case 80: return "\"CDbl\" expected";
-			case 81: return "\"CDec\" expected";
-			case 82: return "\"Char\" expected";
-			case 83: return "\"CInt\" expected";
-			case 84: return "\"Class\" expected";
-			case 85: return "\"CLng\" expected";
-			case 86: return "\"CObj\" expected";
-			case 87: return "\"Compare\" expected";
-			case 88: return "\"Const\" expected";
-			case 89: return "\"Continue\" expected";
-			case 90: return "\"CSByte\" expected";
-			case 91: return "\"CShort\" expected";
-			case 92: return "\"CSng\" expected";
-			case 93: return "\"CStr\" expected";
-			case 94: return "\"CType\" expected";
-			case 95: return "\"CUInt\" expected";
-			case 96: return "\"CULng\" expected";
-			case 97: return "\"CUShort\" expected";
-			case 98: return "\"Custom\" expected";
-			case 99: return "\"Date\" expected";
-			case 100: return "\"Decimal\" expected";
-			case 101: return "\"Declare\" expected";
-			case 102: return "\"Default\" expected";
-			case 103: return "\"Delegate\" expected";
-			case 104: return "\"Descending\" expected";
-			case 105: return "\"Dim\" expected";
-			case 106: return "\"DirectCast\" expected";
-			case 107: return "\"Distinct\" expected";
-			case 108: return "\"Do\" expected";
-			case 109: return "\"Double\" expected";
-			case 110: return "\"Each\" expected";
-			case 111: return "\"Else\" expected";
-			case 112: return "\"ElseIf\" expected";
-			case 113: return "\"End\" expected";
-			case 114: return "\"EndIf\" expected";
-			case 115: return "\"Enum\" expected";
-			case 116: return "\"Equals\" expected";
-			case 117: return "\"Erase\" expected";
-			case 118: return "\"Error\" expected";
-			case 119: return "\"Event\" expected";
-			case 120: return "\"Exit\" expected";
-			case 121: return "\"Explicit\" expected";
-			case 122: return "\"False\" expected";
-			case 123: return "\"Finally\" expected";
-			case 124: return "\"For\" expected";
-			case 125: return "\"Friend\" expected";
-			case 126: return "\"From\" expected";
-			case 127: return "\"Function\" expected";
-			case 128: return "\"Get\" expected";
-			case 129: return "\"GetType\" expected";
-			case 130: return "\"Global\" expected";
-			case 131: return "\"GoSub\" expected";
-			case 132: return "\"GoTo\" expected";
-			case 133: return "\"Group\" expected";
-			case 134: return "\"Handles\" expected";
-			case 135: return "\"If\" expected";
-			case 136: return "\"Implements\" expected";
-			case 137: return "\"Imports\" expected";
-			case 138: return "\"In\" expected";
-			case 139: return "\"Infer\" expected";
-			case 140: return "\"Inherits\" expected";
-			case 141: return "\"Integer\" expected";
-			case 142: return "\"Interface\" expected";
-			case 143: return "\"Into\" expected";
-			case 144: return "\"Is\" expected";
-			case 145: return "\"IsNot\" expected";
-			case 146: return "\"Join\" expected";
-			case 147: return "\"Key\" expected";
-			case 148: return "\"Let\" expected";
-			case 149: return "\"Lib\" expected";
-			case 150: return "\"Like\" expected";
-			case 151: return "\"Long\" expected";
-			case 152: return "\"Loop\" expected";
-			case 153: return "\"Me\" expected";
-			case 154: return "\"Mod\" expected";
-			case 155: return "\"Module\" expected";
-			case 156: return "\"MustInherit\" expected";
-			case 157: return "\"MustOverride\" expected";
-			case 158: return "\"MyBase\" expected";
-			case 159: return "\"MyClass\" expected";
-			case 160: return "\"Namespace\" expected";
-			case 161: return "\"Narrowing\" expected";
-			case 162: return "\"New\" expected";
-			case 163: return "\"Next\" expected";
-			case 164: return "\"Not\" expected";
-			case 165: return "\"Nothing\" expected";
-			case 166: return "\"NotInheritable\" expected";
-			case 167: return "\"NotOverridable\" expected";
-			case 168: return "\"Object\" expected";
-			case 169: return "\"Of\" expected";
-			case 170: return "\"Off\" expected";
-			case 171: return "\"On\" expected";
-			case 172: return "\"Operator\" expected";
-			case 173: return "\"Option\" expected";
-			case 174: return "\"Optional\" expected";
-			case 175: return "\"Or\" expected";
-			case 176: return "\"Order\" expected";
-			case 177: return "\"OrElse\" expected";
-			case 178: return "\"Out\" expected";
-			case 179: return "\"Overloads\" expected";
-			case 180: return "\"Overridable\" expected";
-			case 181: return "\"Overrides\" expected";
-			case 182: return "\"ParamArray\" expected";
-			case 183: return "\"Partial\" expected";
-			case 184: return "\"Preserve\" expected";
-			case 185: return "\"Private\" expected";
-			case 186: return "\"Property\" expected";
-			case 187: return "\"Protected\" expected";
-			case 188: return "\"Public\" expected";
-			case 189: return "\"RaiseEvent\" expected";
-			case 190: return "\"ReadOnly\" expected";
-			case 191: return "\"ReDim\" expected";
-			case 192: return "\"Rem\" expected";
-			case 193: return "\"RemoveHandler\" expected";
-			case 194: return "\"Resume\" expected";
-			case 195: return "\"Return\" expected";
-			case 196: return "\"SByte\" expected";
-			case 197: return "\"Select\" expected";
-			case 198: return "\"Set\" expected";
-			case 199: return "\"Shadows\" expected";
-			case 200: return "\"Shared\" expected";
-			case 201: return "\"Short\" expected";
-			case 202: return "\"Single\" expected";
-			case 203: return "\"Skip\" expected";
-			case 204: return "\"Static\" expected";
-			case 205: return "\"Step\" expected";
-			case 206: return "\"Stop\" expected";
-			case 207: return "\"Strict\" expected";
-			case 208: return "\"String\" expected";
-			case 209: return "\"Structure\" expected";
-			case 210: return "\"Sub\" expected";
-			case 211: return "\"SyncLock\" expected";
-			case 212: return "\"Take\" expected";
-			case 213: return "\"Text\" expected";
-			case 214: return "\"Then\" expected";
-			case 215: return "\"Throw\" expected";
-			case 216: return "\"To\" expected";
-			case 217: return "\"True\" expected";
-			case 218: return "\"Try\" expected";
-			case 219: return "\"TryCast\" expected";
-			case 220: return "\"TypeOf\" expected";
-			case 221: return "\"UInteger\" expected";
-			case 222: return "\"ULong\" expected";
-			case 223: return "\"Unicode\" expected";
-			case 224: return "\"Until\" expected";
-			case 225: return "\"UShort\" expected";
-			case 226: return "\"Using\" expected";
-			case 227: return "\"Variant\" expected";
-			case 228: return "\"Wend\" expected";
-			case 229: return "\"When\" expected";
-			case 230: return "\"Where\" expected";
-			case 231: return "\"While\" expected";
-			case 232: return "\"Widening\" expected";
-			case 233: return "\"With\" expected";
-			case 234: return "\"WithEvents\" expected";
-			case 235: return "\"WriteOnly\" expected";
-			case 236: return "\"Xor\" expected";
-			case 237: return "\"GetXmlNamespace\" expected";
-			case 238: return "??? expected";
-			case 239: return "this symbol not expected in StatementTerminator";
-			case 240: return "invalid StatementTerminator";
-			case 241: return "invalid OptionStatement";
-			case 242: return "invalid Identifier";
-			case 243: return "invalid IdentifierForFieldDeclaration";
-			case 244: return "invalid TypeName";
-			case 245: return "invalid PrimitiveTypeName";
-			case 246: return "invalid QualifiedTypeName";
-			case 247: return "invalid OnOff";
-			case 248: return "invalid BinaryText";
-			case 249: return "invalid ImportsClause";
-			case 250: return "this symbol not expected in ImportsClause";
-
-			default: return "error " + errorNumber;
-		}
-	}
-} // end Parser
-
-} // end namespace
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/Parser.frame b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/Parser.frame
deleted file mode 100644
index 4abbfccef2..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/Parser.frame
+++ /dev/null
@@ -1,119 +0,0 @@
-/*---------------------------------------------------------------------------*\
-    Compiler Generator Coco/R,
-    Copyright (c) 1990, 2004 Hanspeter Moessenboeck, University of Linz
-    extended by M. Loeberbauer & A. Woess, Univ. of Linz
-    with improvements by Pat Terry, Rhodes University
--------------------------------------------------------------------------------
-License
-    This file is part of Compiler Generator Coco/R
-
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2, or (at your option) any
-    later version.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-    As an exception, it is allowed to write an extension of Coco/R that is
-    used as a plugin in non-free software.
-
-    If not otherwise stated, any source code generated by Coco/R (other than
-    Coco/R itself) does not fall under the GNU General Public License.
-
-About this file
-    This is a so-called 'frame' file that contains skeleton code for
-    generating a final Scanner/Parser code.
-
-    The '-->TAG' text markers are used to delimit code chunks and typically
-    correspond to places where additional information is added by the
-    DFA or ParserGen code.
-
-    All information prior to the first 'begin' text marker is discarded.
-    If the grammar contains a '[copy]' .. '[/copy]' section, its contents
-    will added instead.
-\*---------------------------------------------------------------------------*/
--->begin
-
--->namespace
-
-// ----------------------------------------------------------------------------
-// Parser
-// ----------------------------------------------------------------------------
-//! A Coco/R Parser
-partial class VBParser
-{
--->constants
-	const bool T = true;
-	const bool x = false;
-	const int minErrDist = 2;
-
-	public Errors  errors;
-
-
--->declarations
-
-	void Get () {
-		lexer.NextToken();
--->pragmas
-	}
-
-	bool StartOf (int s) {
-		return set[s].Get(la.kind);
-	}
-
-	void ExpectWeak (int n, int follow) {
-		if (la.kind == n) Get();
-		else {
-			SynErr(n);
-			while (!StartOf(follow)) Get();
-		}
-	}
-
-
-	bool WeakSeparator(int n, int syFol, int repFol) {
-		int kind = la.kind;
-		if (kind == n) {Get(); return true;}
-		else if (StartOf(repFol)) {return false;}
-		else {
-			SynErr(n);
-			while (!(set[syFol].Get(kind) || set[repFol].Get(kind) || set[0].Get(kind))) {
-				Get();
-				kind = la.kind;
-			}
-			return StartOf(syFol);
-		}
-	}
-
-
--->productions
-
-	public void ParseRoot() {
--->parseRoot
-	}
-
-	static readonly BitArray[] set = {
--->initialization
-	};
-	
-	void SynErr(int line, int col, int errorNumber)
-	{
-		this.Errors.Error(line, col, GetMessage(errorNumber));
-	}
-	
-	string GetMessage(int errorNumber)
-	{
-		switch (errorNumber) {
-			-->errors
-			default: return "error " + errorNumber;
-		}
-	}
-} // end Parser
-
-$$$
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/VBParser.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/VBParser.cs
deleted file mode 100644
index bb3516cb2d..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/VBParser.cs
+++ /dev/null
@@ -1,436 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-
-using ICSharpCode.NRefactory.VB.Ast;
-using ICSharpCode.NRefactory.VB.Visitors;
-
-namespace ICSharpCode.NRefactory.VB.Parser
-{
-	internal partial class VBParser : IDisposable
-	{
-		VBLexer lexer;
-		Stack<AstNode> stack;
-		CompilationUnit compilationUnit;
-		int errDist = MinErrDist;
-		
-		const int    MinErrDist   = 2;
-		const string ErrMsgFormat = "-- line {0} col {1}: {2}";  // 0=line, 1=column, 2=text
-		
-		public VBParser(VBLexer lexer)
-		{
-			this.errors = lexer.Errors;
-			errors.SynErr = new ErrorCodeProc(SynErr);
-			this.lexer = (VBLexer)lexer;
-			this.stack = new Stack<AstNode>();
-		}
-		
-		#region Infrastructure
-		void NodeStart(AstNode node)
-		{
-			stack.Push(node);
-		}
-		
-		void NodeEnd(AstNode currentNode, Role role)
-		{
-			AstNode node = stack.Pop();
-			Debug.Assert(currentNode == node);
-			stack.Peek().AddChildUntyped(node, role);
-		}
-		
-		void AddTerminal(Role<VBTokenNode> role)
-		{
-			stack.Peek().AddChild(new VBTokenNode(t.Location, t.EndLocation), role);
-		}
-		
-		void AddChild<T>(T childNode, Role<T> role) where T : AstNode
-		{
-			if (childNode != null) {
-				stack.Peek().AddChild(childNode, role);
-			}
-		}
-		
-		StringBuilder qualidentBuilder = new StringBuilder();
-
-		Token t
-		{
-			[System.Diagnostics.DebuggerStepThrough]
-			get {
-				return lexer.Token;
-			}
-		}
-		
-		Token la
-		{
-			[System.Diagnostics.DebuggerStepThrough]
-			get {
-				return lexer.LookAhead;
-			}
-		}
-
-		Token Peek(int n)
-		{
-			lexer.StartPeek();
-			Token x = la;
-			while (n > 0) {
-				x = lexer.Peek();
-				n--;
-			}
-			return x;
-		}
-
-		public void Error(string s)
-		{
-			if (errDist >= MinErrDist) {
-				this.Errors.Error(la.line, la.col, s);
-			}
-			errDist = 0;
-		}
-		#endregion
-		
-		#region Parse
-		public void Parse()
-		{
-			ParseRoot();
-		}
-		
-		public AstType ParseAstType()
-		{
-			// TODO
-			return null;
-		}
-		
-//		public Expression ParseExpression()
-//		{
-//			lexer.SetInitialContext(SnippetType.Expression);
-//			lexer.NextToken();
-//			Location startLocation = la.Location;
-//			Expression expr;
-//			Expr(out expr);
-//			while (la.kind == Tokens.EOL) lexer.NextToken();
-//			if (expr != null) {
-//				expr.StartLocation = startLocation;
-//				expr.EndLocation = t.EndLocation;
-//				expr.AcceptVisitor(new SetParentVisitor(), null);
-//			}
-//			Expect(Tokens.EOF);
-//			return expr;
-//		}
-		
-//		public BlockStatement ParseBlock()
-//		{
-//			lexer.NextToken();
-//			compilationUnit = new CompilationUnit();
-//
-//			Location startLocation = la.Location;
-//			Statement st;
-//			Block(out st);
-//			if (st != null) {
-//				st.StartLocation = startLocation;
-//				if (t != null)
-//					st.EndLocation = t.EndLocation;
-//				else
-//					st.EndLocation = la.Location;
-//				st.AcceptVisitor(new SetParentVisitor(), null);
-//			}
-//			Expect(Tokens.EOF);
-//			return st as BlockStatement;
-//		}
-		
-//		public List<AstNode> ParseTypeMembers()
-//		{
-//			lexer.NextToken();
-//			TypeDeclaration newType = new TypeDeclaration(Modifiers.None, null);
-//			BlockStart(newType);
-//			ClassBody(newType);
-//			BlockEnd();
-//			Expect(Tokens.EOF);
-//			newType.AcceptVisitor(new SetParentVisitor(), null);
-//			return newType.Children;
-//		}
-		#endregion
-		
-		#region Conflict Resolvers
-		bool IsAliasImportsClause()
-		{
-			return IsIdentifierToken(la) && Peek(1).Kind == Tokens.Assign;
-		}
-		
-		static bool IsIdentifierToken(Token tk)
-		{
-			return Tokens.IdentifierTokens[tk.kind] || tk.kind == Tokens.Identifier;
-		}
-		#endregion
-		
-		/* True, if "." is followed by an ident */
-		bool DotAndIdentOrKw () {
-			int peek = Peek(1).kind;
-			return la.kind == Tokens.Dot && (peek == Tokens.Identifier || peek >= Tokens.AddHandler);
-		}
-		
-		bool IsIdentifiedExpressionRange()
-		{
-			// t = Select
-			// la = Identifier
-			// Peek(1) = As or Assign
-			Token token = Peek(1);
-			return IsIdentifierToken(la) && (token.kind == Tokens.As || token.kind == Tokens.Assign);
-		}
-		
-		bool IsQueryExpression()
-		{
-			return (la.kind == Tokens.From || la.kind == Tokens.Aggregate) && IsIdentifierToken(Peek(1));
-		}
-		
-		bool IsEndStmtAhead()
-		{
-			int peek = Peek(1).kind;
-			return la.kind == Tokens.End && (peek == Tokens.EOL || peek == Tokens.Colon);
-		}
-
-		bool IsNotClosingParenthesis() {
-			return la.kind != Tokens.CloseParenthesis;
-		}
-
-		/*
-			True, if ident is followed by "=" or by ":" and "="
-		 */
-		bool IsNamedAssign() {
-			return Peek(1).kind == Tokens.ColonAssign;
-		}
-
-		bool IsObjectCreation() {
-			return la.kind == Tokens.As && Peek(1).kind == Tokens.New;
-		}
-		
-		bool IsNewExpression() {
-			return la.kind == Tokens.New;
-		}
-
-		/*
-			True, if "<" is followed by the ident "assembly" or "module"
-		 */
-		bool IsGlobalAttrTarget () {
-			Token pt = Peek(1);
-			return la.kind == Tokens.LessThan && ( string.Equals(pt.val, "assembly", StringComparison.InvariantCultureIgnoreCase) || string.Equals(pt.val, "module", StringComparison.InvariantCultureIgnoreCase));
-		}
-
-		/*
-			True if the next token is a "(" and is followed by "," or ")"
-		 */
-		bool IsDims()
-		{
-			int peek = Peek(1).kind;
-			return la.kind == Tokens.OpenParenthesis
-				&& (peek == Tokens.Comma || peek == Tokens.CloseParenthesis);
-		}
-		
-		/*
-			True if the next token is an identifier
-		 */
-		bool IsLoopVariableDeclaration()
-		{
-			if (!IsIdentifierToken(la))
-				return false;
-			lexer.StartPeek();
-			Token x = lexer.Peek();
-			if (x.kind == Tokens.OpenParenthesis) {
-				do {
-					x = lexer.Peek();
-				} while (x.kind == Tokens.Comma);
-				if (x.kind != Tokens.CloseParenthesis)
-					return false;
-				x = lexer.Peek();
-			}
-			return x.kind == Tokens.As || x.kind == Tokens.Assign;
-		}
-
-		bool IsSize()
-		{
-			return la.kind == Tokens.OpenParenthesis;
-		}
-
-		/*
-			True, if the comma is not a trailing one,
-			like the last one in: a, b, c,
-		 */
-		bool NotFinalComma() {
-			int peek = Peek(1).kind;
-			return la.kind == Tokens.Comma &&
-				peek != Tokens.CloseCurlyBrace;
-		}
-
-		/*
-			True, if the next token is "Else" and this one
-			if followed by "If"
-		 */
-		bool IsElseIf()
-		{
-			int peek = Peek(1).kind;
-			return la.kind == Tokens.Else && peek == Tokens.If;
-		}
-
-		/*
-	True if the next token is goto and this one is
-	followed by minus ("-") (this is allowd in in
-	error clauses)
-		 */
-		bool IsNegativeLabelName()
-		{
-			int peek = Peek(1).kind;
-			return la.kind == Tokens.GoTo && peek == Tokens.Minus;
-		}
-
-		/*
-	True if the next statement is a "Resume next" statement
-		 */
-		bool IsResumeNext()
-		{
-			int peek = Peek(1).kind;
-			return la.kind == Tokens.Resume && peek == Tokens.Next;
-		}
-		
-		/// <summary>
-		/// Returns True, if ident/literal integer is followed by ":"
-		/// </summary>
-		bool IsLabel()
-		{
-			return (la.kind == Tokens.Identifier || la.kind == Tokens.LiteralInteger)
-				&& Peek(1).kind == Tokens.Colon;
-		}
-		
-		/// <summary>
-		/// Returns true if a property declaration is an automatic property.
-		/// </summary>
-		bool IsAutomaticProperty()
-		{
-			lexer.StartPeek();
-			Token tn = la;
-			int braceCount = 0;
-
-			// look for attributes
-			while (tn.kind == Tokens.LessThan) {
-				while (braceCount > 0 || tn.kind != Tokens.GreaterThan) {
-					tn = lexer.Peek();
-					if (tn.kind == Tokens.OpenParenthesis)
-						braceCount++;
-					if (tn.kind == Tokens.CloseParenthesis)
-						braceCount--;
-				}
-				Debug.Assert(tn.kind == Tokens.GreaterThan);
-				tn = lexer.Peek();
-			}
-			
-			// look for modifiers
-			var allowedTokens = new[] {
-				Tokens.Public, Tokens.Protected,
-				Tokens.Friend, Tokens.Private
-			};
-
-			while (allowedTokens.Contains(tn.kind))
-				tn = lexer.Peek();
-			
-			if (tn.Kind != Tokens.Get && tn.Kind != Tokens.Set)
-				return true;
-
-			return false;
-		}
-
-		bool IsNotStatementSeparator()
-		{
-			return la.kind == Tokens.Colon && Peek(1).kind == Tokens.EOL;
-		}
-
-		static bool IsMustOverride(AttributedNode node)
-		{
-			return node.Modifiers.HasFlag(Modifiers.MustOverride);
-		}
-
-		/* Writes the type name represented through the expression into the string builder. */
-		/* Returns true when the expression was converted successfully, returns false when */
-		/* There was an unknown expression (e.g. TypeReferenceExpression) in it */
-//		bool WriteFullTypeName(StringBuilder b, Expression expr)
-//		{
-//			MemberReferenceExpression fre = expr as MemberReferenceExpression;
-//			if (fre != null) {
-//				bool result = WriteFullTypeName(b, fre.TargetObject);
-//				if (b.Length > 0) b.Append('.');
-//				b.Append(fre.MemberName);
-//				return result;
-//			} else if (expr is SimpleNameExpression) {
-//				b.Append(((SimpleNameExpression)expr).Identifier);
-//				return true;
-//			} else {
-//				return false;
-//			}
-//		}
-		
-		void EnsureIsZero(Expression expr)
-		{
-			if (!(expr is PrimitiveExpression) || (expr as PrimitiveExpression).StringValue != "0")
-				Error("lower bound of array must be zero");
-		}
-		
-		public bool ParseMethodBodies { get; set; }
-		
-		public VBLexer Lexer {
-			get {
-				return lexer;
-			}
-		}
-		
-		public Errors Errors {
-			get {
-				return errors;
-			}
-		}
-		
-		public CompilationUnit CompilationUnit {
-			get {
-				return compilationUnit;
-			}
-		}
-		
-		void SynErr(int n)
-		{
-			if (errDist >= MinErrDist) {
-				errors.SynErr(lexer.LookAhead.line, lexer.LookAhead.col, n);
-			}
-			errDist = 0;
-		}
-		
-		void SemErr(string msg)
-		{
-			if (errDist >= MinErrDist) {
-				errors.Error(lexer.Token.line, lexer.Token.col, msg);
-			}
-			errDist = 0;
-		}
-		
-		void Expect(int n)
-		{
-			if (lexer.LookAhead.kind == n) {
-				lexer.NextToken();
-			} else {
-				SynErr(n);
-			}
-		}
-		
-		#region System.IDisposable interface implementation
-		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly")]
-		public void Dispose()
-		{
-			errors = null;
-			if (lexer != null) {
-				lexer.Dispose();
-			}
-			lexer = null;
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/vb.atg b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/vb.atg
deleted file mode 100644
index f6787ab95e..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Parser/vb.atg
+++ /dev/null
@@ -1,460 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Text;
-using ICSharpCode.NRefactory.VB.Ast;
-using ICSharpCode.NRefactory.VB.Parser;
-using ASTAttribute = ICSharpCode.NRefactory.VB.Ast.Attribute;
-using Roles = ICSharpCode.NRefactory.VB.AstNode.Roles;
-
-COMPILER VB
-
-#region AUTOGENERATED TOKENS SECTION
-TOKENS
-	/* ----- terminal classes ----- */
-	/* EOF is 0 */
-	EOL
-	ident
-	LiteralString
-	LiteralCharacter
-	LiteralInteger
-	LiteralDouble
-	LiteralSingle
-	LiteralDecimal
-	LiteralDate
-	XmlOpenTag					// <
-	XmlCloseTag				// >
-	XmlStartInlineVB			// <%=
-	XmlEndInlineVB				// %>
-	XmlCloseTagEmptyElement	// />
-	XmlOpenEndTag				// </
-	XmlContent					// ...
-	XmlComment					// <!-- ... -->
-	XmlCData					// <![CDATA[...]]>
-	XmlProcessingInstruction	
-
-	/* ----- special character ----- */
-	"="
-	":"
-	","
-	"&"
-	"/"
-	"\\"
-	"."
-	"..."
-	".@"
-	"!"
-	"-"
-	"+"
-	"^"
-	"?"
-	"*"
-	"{"
-	"}"
-	"("
-	")"
-	">"
-	"<"
-	"<>"
-	">="
-	"<="
-	"<<"
-	">>"
-	"+="
-	"^="
-	"-="
-	"*="
-	"/="
-	"\\="
-	"<<="
-	">>="
-	"&="
-	":="
-
-	/* ----- keywords ----- */
-	"AddHandler"
-	"AddressOf"
-	"Aggregate"
-	"Alias"
-	"And"
-	"AndAlso"
-	"Ansi"
-	"As"
-	"Ascending"
-	"Assembly"
-	"Auto"
-	"Binary"
-	"Boolean"
-	"ByRef"
-	"By"
-	"Byte"
-	"ByVal"
-	"Call"
-	"Case"
-	"Catch"
-	"CBool"
-	"CByte"
-	"CChar"
-	"CDate"
-	"CDbl"
-	"CDec"
-	"Char"
-	"CInt"
-	"Class"
-	"CLng"
-	"CObj"
-	"Compare"
-	"Const"
-	"Continue"
-	"CSByte"
-	"CShort"
-	"CSng"
-	"CStr"
-	"CType"
-	"CUInt"
-	"CULng"
-	"CUShort"
-	"Custom"
-	"Date"
-	"Decimal"
-	"Declare"
-	"Default"
-	"Delegate"
-	"Descending"
-	"Dim"
-	"DirectCast"
-	"Distinct"
-	"Do"
-	"Double"
-	"Each"
-	"Else"
-	"ElseIf"
-	"End"
-	"EndIf"
-	"Enum"
-	"Equals"
-	"Erase"
-	"Error"
-	"Event"
-	"Exit"
-	"Explicit"
-	"False"
-	"Finally"
-	"For"
-	"Friend"
-	"From"
-	"Function"
-	"Get"
-	"GetType"
-	"Global"
-	"GoSub"
-	"GoTo"
-	"Group"
-	"Handles"
-	"If"
-	"Implements"
-	"Imports"
-	"In"
-	"Infer"
-	"Inherits"
-	"Integer"
-	"Interface"
-	"Into"
-	"Is"
-	"IsNot"
-	"Join"
-	"Key"
-	"Let"
-	"Lib"
-	"Like"
-	"Long"
-	"Loop"
-	"Me"
-	"Mod"
-	"Module"
-	"MustInherit"
-	"MustOverride"
-	"MyBase"
-	"MyClass"
-	"Namespace"
-	"Narrowing"
-	"New"
-	"Next"
-	"Not"
-	"Nothing"
-	"NotInheritable"
-	"NotOverridable"
-	"Object"
-	"Of"
-	"Off"
-	"On"
-	"Operator"
-	"Option"
-	"Optional"
-	"Or"
-	"Order"
-	"OrElse"
-	"Out"
-	"Overloads"
-	"Overridable"
-	"Overrides"
-	"ParamArray"
-	"Partial"
-	"Preserve"
-	"Private"
-	"Property"
-	"Protected"
-	"Public"
-	"RaiseEvent"
-	"ReadOnly"
-	"ReDim"
-	"Rem"
-	"RemoveHandler"
-	"Resume"
-	"Return"
-	"SByte"
-	"Select"
-	"Set"
-	"Shadows"
-	"Shared"
-	"Short"
-	"Single"
-	"Skip"
-	"Static"
-	"Step"
-	"Stop"
-	"Strict"
-	"String"
-	"Structure"
-	"Sub"
-	"SyncLock"
-	"Take"
-	"Text"
-	"Then"
-	"Throw"
-	"To"
-	"True"
-	"Try"
-	"TryCast"
-	"TypeOf"
-	"UInteger"
-	"ULong"
-	"Unicode"
-	"Until"
-	"UShort"
-	"Using"
-	"Variant"
-	"Wend"
-	"When"
-	"Where"
-	"While"
-	"Widening"
-	"With"
-	"WithEvents"
-	"WriteOnly"
-	"Xor"
-	"GetXmlNamespace"
-#endregion
-
-PRODUCTIONS
-
-#region General
-
-VB =
-(.
-	compilationUnit = new CompilationUnit();
-	NodeStart(compilationUnit);
-	Get();
-.)
-	{ StatementTerminator }
-	{ OptionStatement<CompilationUnit.MemberRole> { StatementTerminator } }
-	{ ImportsStatement<CompilationUnit.MemberRole> { StatementTerminator } }
-/*	{ IF (IsGlobalAttrTarget()) GlobalAttributeSection { StatementTerminator } }
-	{ NamespaceMemberDecl { StatementTerminator } } */
-.
-
-StatementTerminator = SYNC ( EOL<Roles.StatementTerminator> | ":"<Roles.StatementTerminator> ) .
-
-#region Identifier
-
-//IdentifierOrKeyword<out string identifier> = ANY (. identifier = t.val; .) .
-
-// This production handles pseudo keywords that are needed in the grammar
-Identifier	=
-	IdentifierForFieldDeclaration
-	| "Custom"
-.
-
-IdentifierForFieldDeclaration =
-	ident
-	| "Aggregate"
-	| "Ansi"
-	| "Ascending"
-	| "Assembly"
-	| "Auto"
-	| "Binary"
-	| "By"
-	| "Compare"
-	| "Descending"
-	| "Distinct"
-	| "Equals"
-	| "Explicit"
-	| "From"
-	| "Group"
-	| "Infer"
-	| "Into"
-	| "Join"
-	| "Key"
-	| "Off"
-	| "Order"
-	| "Out"
-	| "Preserve"
-	| "Skip"
-	| "Take"
-	| "Text"
-	| "Unicode"
-	| "Until"
-	| "Where"
-.
-#endregion
-
-TypeName<out AstType type> (. type = null; .) =
-	PrimitiveTypeName<out type> |
-	QualifiedTypeName<out type>
-.
-QualifiedTypeName<out AstType type> =
-	( "Global" | Identifier ) (. type = new SimpleType(t.val, t.Location); .)
-	{ "." Identifier (. type = new QualifiedType(type, new Identifier(t.val, t.Location)); .) }
-	// TODO : add TypeArguments
-.
-
-PrimitiveTypeName<out AstType type> (. type = null; .) =
-	"Object"		(. type = new PrimitiveType("Object", t.Location); .)
-	| "Boolean"	(. type = new PrimitiveType("Boolean", t.Location); .)
-	| "Date"		(. type = new PrimitiveType("Date", t.Location); .)
-	| "Char"		(. type = new PrimitiveType("Char", t.Location); .)
-	| "String"		(. type = new PrimitiveType("String", t.Location); .)
-	| "Decimal"	(. type = new PrimitiveType("Decimal", t.Location); .)
-	| "Byte"		(. type = new PrimitiveType("Byte", t.Location); .)
-	| "Short"		(. type = new PrimitiveType("Short", t.Location); .)
-	| "Integer"	(. type = new PrimitiveType("Integer", t.Location); .)
-	| "Long"		(. type = new PrimitiveType("Long", t.Location); .)
-	| "Single"		(. type = new PrimitiveType("Single", t.Location); .)
-	| "Double"		(. type = new PrimitiveType("Double", t.Location); .)
-	| "UInteger"	(. type = new PrimitiveType("UInteger", t.Location); .)
-	| "ULong"		(. type = new PrimitiveType("ULong", t.Location); .)
-	| "UShort"		(. type = new PrimitiveType("UShort", t.Location); .)
-	| "SByte"		(. type = new PrimitiveType("SByte", t.Location); .)
-.
-
-/*
-ParameterModifier<ParamModifierList m> =
-	"ByVal"			(. m.Add(ParameterModifiers.In); .)
-	| "ByRef"			(. m.Add(ParameterModifiers.Ref); .)
-	| "Optional"		(. m.Add(ParameterModifiers.Optional); .)
-	| "ParamArray"	(. m.Add(ParameterModifiers.Params); .)
-.
-
-TypeModifier<ModifierList m> =
-	  "Public"				(. m.Add(Modifiers.Public, t.Location); .)
-	| "Protected"			(. m.Add(Modifiers.Protected, t.Location); .)
-	| "Friend"				(. m.Add(Modifiers.Internal, t.Location); .)
-	| "Private"			(. m.Add(Modifiers.Private, t.Location); .)
-	| "Shared"				(. m.Add(Modifiers.Static, t.Location); .)
-	| "Shadows"			(. m.Add(Modifiers.New, t.Location); .)
-	| "MustInherit"		(. m.Add(Modifiers.Abstract, t.Location); .)
-	| "NotInheritable"	(. m.Add(Modifiers.Sealed, t.Location); .)
-	| "Partial"			(. m.Add(Modifiers.Partial, t.Location); .)
-.
-
-MemberModifier<ModifierList m> =
-	  "MustInherit"		(.m.Add(Modifiers.Abstract, t.Location);.)
-	| "Default"			(.m.Add(Modifiers.Default, t.Location);.)
-	| "Friend"			(.m.Add(Modifiers.Internal, t.Location);.)
-	| "Shadows"			(.m.Add(Modifiers.New, t.Location);.)
-	| "Overrides"		(.m.Add(Modifiers.Override, t.Location);.)
-	| "MustOverride"	(.m.Add(Modifiers.Abstract, t.Location);.)
-	| "Private"			(.m.Add(Modifiers.Private, t.Location);.)
-	| "Protected"		(.m.Add(Modifiers.Protected, t.Location);.)
-	| "Public"			(.m.Add(Modifiers.Public, t.Location);.)
-	| "NotInheritable"	(.m.Add(Modifiers.Sealed, t.Location);.)
-	| "NotOverridable"	(.m.Add(Modifiers.Sealed, t.Location);.)
-	| "Shared"			(.m.Add(Modifiers.Static, t.Location);.)
-	| "Overridable"		(.m.Add(Modifiers.Virtual, t.Location);.)
-	| "Overloads"		(.m.Add(Modifiers.Overloads, t.Location);.)
-	| "ReadOnly"		(.m.Add(Modifiers.ReadOnly, t.Location);.)
-	| "WriteOnly"		(.m.Add(Modifiers.WriteOnly, t.Location);.)
-	| "WithEvents"		(.m.Add(Modifiers.WithEvents, t.Location);.)
-	| "Dim"				(.m.Add(Modifiers.Dim, t.Location);.)
-	| "Partial"			(.m.Add(Modifiers.Partial, t.Location);.)
-.
-
-PropertyAccessorAccessModifier<out Modifiers m> =
-	(. m = Modifiers.None; .)
-	{
-		"Public"    (. m |= Modifiers.Public; .)
-	 |  "Protected" (. m |= Modifiers.Protected; .)
-	 |  "Friend"    (. m |= Modifiers.Internal; .)
-	 |  "Private"   (. m |= Modifiers.Private; .)
-	}
-.
-*/
-#endregion
-
-#region Global
-
-#region OptionStatement
-
-OptionStatement<auto> =
-	"Option"<Roles.Keyword> (
-		"Explicit"<Ast.OptionStatement.OptionTypeRole> (. result.OptionType = OptionType.Explicit; .) [ OnOff<result> ]
-		| "Strict"<Ast.OptionStatement.OptionTypeRole> (. result.OptionType = OptionType.Strict; .) [ OnOff<result> ]
-		| "Infer"<Ast.OptionStatement.OptionTypeRole> (. result.OptionType = OptionType.Infer; .) [ OnOff<result> ]
-		| "Compare"<Ast.OptionStatement.OptionTypeRole> (. result.OptionType = OptionType.Compare; .) BinaryText<result>
-	) StatementTerminator
-.
-
-OnOff<OptionStatement os> =
-	"On"<Ast.OptionStatement.OptionValueRole> (. os.OptionValue = OptionValue.On; .)
-	| "Off"<Ast.OptionStatement.OptionValueRole> (. os.OptionValue  = OptionValue.Off; .)
-.
-
-BinaryText<OptionStatement os> =
-	"Text"<Ast.OptionStatement.OptionValueRole> (. os.OptionValue = OptionValue.Text; .)
-	| "Binary"<Ast.OptionStatement.OptionValueRole> (. os.OptionValue  = OptionValue.Binary; .)
-.
-
-#endregion
-
-#region ImportsStatement
-
-ImportsStatement<auto> =
-	"Imports"<Roles.Keyword> ImportsClause { "," ImportsClause } StatementTerminator
-.
-
-ImportsClause =
-	( IF (IsAliasImportsClause())
-		AliasImportsClause<Ast.ImportsStatement.ImportsClauseRole> |
-	MemberImportsClause<Ast.ImportsStatement.ImportsClauseRole> |
-	XmlNamespaceImportsClause<Ast.ImportsStatement.ImportsClauseRole> ) SYNC .
-
-AliasImportsClause<auto> (. AstType alias; .) =
-	// Type characters are not allowed in identifiers here
-	Identifier (. result.Name = new Identifier(t.val, t.Location); .) "=" TypeName<out alias> (. result.Alias = alias; .)
-.
-
-MemberImportsClause<auto> (. AstType member; .) =
-	TypeName<out member> (. result.Member = member; .)
-.
-
-XmlNamespaceImportsClause<auto> =
-	XmlOpenTag<Roles.XmlOpenTag> Identifier/*<Roles.XmlIdentifier>*/ "="<Roles.Assign> LiteralString/*<Roles.XmlLiteralString>*/ XmlCloseTag<Roles.XmlCloseTag>
-.
-
-#endregion
-
-#endregion
-
-END VB .
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/AbstractOutputFormatter.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/AbstractOutputFormatter.cs
deleted file mode 100644
index c858d664bf..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/AbstractOutputFormatter.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections;
-using System.Text;
-
-namespace ICSharpCode.NRefactory.VB.PrettyPrinter
-{
-	/// <summary>
-	/// Base class of output formatters.
-	/// </summary>
-	public abstract class AbstractOutputFormatter : IOutputFormatter
-	{
-		StringBuilder text = new StringBuilder();
-		
-		int           indentationLevel = 0;
-		bool          indent         = true;
-		bool          doNewLine      = true;
-		AbstractPrettyPrintOptions prettyPrintOptions;
-		
-		public bool IsInMemberBody { get; set; }
-		
-		public int IndentationLevel {
-			get {
-				return indentationLevel;
-			}
-			set {
-				indentationLevel = value;
-			}
-		}
-		
-		public string Text {
-			get {
-				return text.ToString();
-			}
-		}
-		
-		public int TextLength {
-			get {
-				return text.Length;
-			}
-		}
-		
-		
-		public bool DoIndent {
-			get {
-				return indent;
-			}
-			set {
-				indent = value;
-			}
-		}
-		
-		public bool DoNewLine {
-			get {
-				return doNewLine;
-			}
-			set {
-				doNewLine = value;
-			}
-		}
-		
-		protected AbstractOutputFormatter(AbstractPrettyPrintOptions prettyPrintOptions)
-		{
-			this.prettyPrintOptions = prettyPrintOptions;
-		}
-		
-		internal bool isIndented = false;
-		public void Indent()
-		{
-			if (DoIndent) {
-				int indent = 0;
-				while (indent < prettyPrintOptions.IndentSize * indentationLevel) {
-					char ch = prettyPrintOptions.IndentationChar;
-					if (ch == '\t' && indent + prettyPrintOptions.TabSize > prettyPrintOptions.IndentSize * indentationLevel) {
-						ch = ' ';
-					}
-					text.Append(ch);
-					if (ch == '\t') {
-						indent += prettyPrintOptions.TabSize;
-					} else {
-						++indent;
-					}
-				}
-				isIndented = true;
-			}
-		}
-		
-		public void Reset ()
-		{
-			text.Length = 0;
-			isIndented = false;
-		}
-		
-		public void Space()
-		{
-			text.Append(' ');
-			isIndented = false;
-		}
-		
-		internal int lastLineStart = 0;
-		internal int lineBeforeLastStart = 0;
-		
-		public bool LastCharacterIsNewLine {
-			get {
-				return text.Length == lastLineStart;
-			}
-		}
-		
-		public bool LastCharacterIsWhiteSpace {
-			get {
-				return text.Length == 0 || char.IsWhiteSpace(text[text.Length - 1]);
-			}
-		}
-		
-		public virtual void NewLine()
-		{
-			if (DoNewLine) {
-				if (!LastCharacterIsNewLine) {
-					lineBeforeLastStart = lastLineStart;
-				}
-				text.AppendLine();
-				lastLineStart = text.Length;
-				isIndented = false;
-			}
-		}
-		
-		public virtual void EndFile()
-		{
-		}
-		
-		protected void WriteLineInPreviousLine(string txt, bool forceWriteInPreviousBlock)
-		{
-			WriteInPreviousLine(txt + Environment.NewLine, forceWriteInPreviousBlock);
-		}
-		protected void WriteLineInPreviousLine(string txt, bool forceWriteInPreviousBlock, bool indent)
-		{
-			WriteInPreviousLine(txt + Environment.NewLine, forceWriteInPreviousBlock, indent);
-		}
-		
-		protected void WriteInPreviousLine(string txt, bool forceWriteInPreviousBlock)
-		{
-			WriteInPreviousLine(txt, forceWriteInPreviousBlock, true);
-		}
-		protected void WriteInPreviousLine(string txt, bool forceWriteInPreviousBlock, bool indent)
-		{
-			if (txt.Length == 0) return;
-			
-			bool lastCharacterWasNewLine = LastCharacterIsNewLine;
-			if (lastCharacterWasNewLine) {
-				if (forceWriteInPreviousBlock == false) {
-					if (indent && txt != Environment.NewLine) Indent();
-					text.Append(txt);
-					lineBeforeLastStart = lastLineStart;
-					lastLineStart = text.Length;
-					return;
-				}
-				lastLineStart = lineBeforeLastStart;
-			}
-			string lastLine = text.ToString(lastLineStart, text.Length - lastLineStart);
-			text.Remove(lastLineStart, text.Length - lastLineStart);
-			if (indent && txt != Environment.NewLine) {
-				if (forceWriteInPreviousBlock) ++indentationLevel;
-				Indent();
-				if (forceWriteInPreviousBlock) --indentationLevel;
-			}
-			text.Append(txt);
-			lineBeforeLastStart = lastLineStart;
-			lastLineStart = text.Length;
-			text.Append(lastLine);
-			if (lastCharacterWasNewLine) {
-				lineBeforeLastStart = lastLineStart;
-				lastLineStart = text.Length;
-			}
-			isIndented = false;
-		}
-		
-		/// <summary>
-		/// Prints a text that cannot be inserted before using WriteInPreviousLine
-		/// into the current line
-		/// </summary>
-		protected void PrintSpecialText(string specialText)
-		{
-			lineBeforeLastStart = text.Length;
-			text.Append(specialText);
-			lastLineStart = text.Length;
-			isIndented = false;
-		}
-		
-		public void PrintTokenList(ArrayList tokenList)
-		{
-			foreach (int token in tokenList) {
-				PrintToken(token);
-				Space();
-			}
-		}
-		
-//		public abstract void PrintComment(Comment comment, bool forceWriteInPreviousBlock);
-		
-//		public virtual void PrintPreprocessingDirective(PreprocessingDirective directive, bool forceWriteInPreviousBlock)
-//		{
-//			if (!directive.Expression.IsNull) {
-////				CSharpOutputVisitor visitor = new CSharpOutputVisitor();
-////				directive.Expression.AcceptVisitor(visitor, null);
-////				WriteLineInPreviousLine(directive.Cmd + " " + visitor.Text, forceWriteInPreviousBlock);
-//			} else if (string.IsNullOrEmpty(directive.Arg))
-//				WriteLineInPreviousLine(directive.Cmd, forceWriteInPreviousBlock);
-//			else
-//				WriteLineInPreviousLine(directive.Cmd + " " + directive.Arg, forceWriteInPreviousBlock);
-//		}
-		
-		public void PrintBlankLine(bool forceWriteInPreviousBlock)
-		{
-			WriteInPreviousLine(Environment.NewLine, forceWriteInPreviousBlock);
-		}
-		
-		public abstract void PrintToken(int token);
-		
-		public void PrintText(string text)
-		{
-			this.text.Append(text);
-			isIndented = false;
-		}
-		
-		public abstract void PrintIdentifier(string identifier);
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/AbstractPrettyPrintOptions.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/AbstractPrettyPrintOptions.cs
deleted file mode 100644
index 7da8a578cd..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/AbstractPrettyPrintOptions.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-namespace ICSharpCode.NRefactory.VB.PrettyPrinter
-{
-	/// <summary>
-	/// Description of PrettyPrintOptions.	
-	/// </summary>
-	public class AbstractPrettyPrintOptions
-	{
-		char indentationChar = '\t';
-		int  tabSize         = 4;
-		int  indentSize      = 4;
-		
-		public char IndentationChar {
-			get {
-				return indentationChar;
-			}
-			set {
-				indentationChar = value;
-			}
-		}
-		
-		public int TabSize {
-			get {
-				return tabSize;
-			}
-			set {
-				tabSize = value;
-			}
-		}
-		
-		public int IndentSize {
-			get {
-				return indentSize;
-			}
-			set {
-				indentSize = value;
-			}
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/IOutputAstVisitor.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/IOutputAstVisitor.cs
deleted file mode 100644
index 049696dad4..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/IOutputAstVisitor.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.PrettyPrinter
-{
-//	public interface IOutputDomVisitor : IAstVisitor
-//	{
-//		event Action<INode> BeforeNodeVisit;
-//		event Action<INode> AfterNodeVisit;
-//		
-//		string Text {
-//			get;
-//		}
-//		
-//		Errors Errors {
-//			get;
-//		}
-//		
-//		AbstractPrettyPrintOptions Options {
-//			get;
-//		}
-//		IOutputFormatter OutputFormatter {
-//			get;
-//		}
-//	}
-	
-	public interface IOutputFormatter
-	{
-		int IndentationLevel {
-			get;
-			set;
-		}
-		string Text {
-			get;
-		}
-		bool IsInMemberBody {
-			get;
-			set;
-		}
-		void NewLine();
-		void Indent();
-//		void PrintComment(Comment comment, bool forceWriteInPreviousBlock);
-//		void PrintPreprocessingDirective(PreprocessingDirective directive, bool forceWriteInPreviousBlock);
-		void PrintBlankLine(bool forceWriteInPreviousBlock);
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/SpecialNodesInserter.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/SpecialNodesInserter.cs
deleted file mode 100644
index f44d91263c..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/SpecialNodesInserter.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.PrettyPrinter
-{
-//	public class SpecialOutputVisitor : ISpecialVisitor
-//	{
-//		readonly IOutputFormatter formatter;
-//		
-//		public SpecialOutputVisitor(IOutputFormatter formatter)
-//		{
-//			this.formatter = formatter;
-//		}
-//		
-//		public bool ForceWriteInPreviousLine;
-//		
-//		public object Visit(ISpecial special, object data)
-//		{
-//			Console.WriteLine("Warning: SpecialOutputVisitor.Visit(ISpecial) called with " + special);
-//			return data;
-//		}
-//		
-//		public object Visit(BlankLine special, object data)
-//		{
-//			formatter.PrintBlankLine(ForceWriteInPreviousLine);
-//			return data;
-//		}
-//		
-//		public object Visit(Comment special, object data)
-//		{
-//			formatter.PrintComment(special, ForceWriteInPreviousLine);
-//			return data;
-//		}
-//		
-//		public object Visit(PreprocessingDirective special, object data)
-//		{
-//			formatter.PrintPreprocessingDirective(special, ForceWriteInPreviousLine);
-//			return data;
-//		}
-//	}
-//	
-//	/// <summary>
-//	/// This class inserts specials between INodes.
-//	/// </summary>
-//	public sealed class SpecialNodesInserter : IDisposable
-//	{
-//		IEnumerator<ISpecial> enumerator;
-//		SpecialOutputVisitor visitor;
-//		bool available; // true when more specials are available
-//		
-//		public SpecialNodesInserter(IEnumerable<ISpecial> specials, SpecialOutputVisitor visitor)
-//		{
-//			if (specials == null) throw new ArgumentNullException("specials");
-//			if (visitor == null) throw new ArgumentNullException("visitor");
-//			enumerator = specials.GetEnumerator();
-//			this.visitor = visitor;
-//			available = enumerator.MoveNext();
-//		}
-//		
-//		void WriteCurrent()
-//		{
-//			enumerator.Current.AcceptVisitor(visitor, null);
-//			available = enumerator.MoveNext();
-//		}
-//		
-//		AttributedNode currentAttributedNode;
-//		
-//		/// <summary>
-//		/// Writes all specials up to the start position of the node.
-//		/// </summary>
-//		public void AcceptNodeStart(INode node)
-//		{
-//			if (node is AttributedNode) {
-//				currentAttributedNode = node as AttributedNode;
-//				if (currentAttributedNode.Attributes.Count == 0) {
-//					AcceptPoint(node.StartLocation);
-//					currentAttributedNode = null;
-//				}
-//			} else {
-//				AcceptPoint(node.StartLocation);
-//			}
-//		}
-//		
-//		/// <summary>
-//		/// Writes all specials up to the end position of the node.
-//		/// </summary>
-//		public void AcceptNodeEnd(INode node)
-//		{
-//			visitor.ForceWriteInPreviousLine = true;
-//			AcceptPoint(node.EndLocation);
-//			visitor.ForceWriteInPreviousLine = false;
-//			if (currentAttributedNode != null) {
-//				if (node == currentAttributedNode.Attributes[currentAttributedNode.Attributes.Count - 1]) {
-//					AcceptPoint(currentAttributedNode.StartLocation);
-//					currentAttributedNode = null;
-//				}
-//			}
-//		}
-//		
-//		/// <summary>
-//		/// Writes all specials up to the specified location.
-//		/// </summary>
-//		public void AcceptPoint(Location loc)
-//		{
-//			while (available && enumerator.Current.StartPosition <= loc) {
-//				WriteCurrent();
-//			}
-//		}
-//		
-//		/// <summary>
-//		/// Outputs all missing specials to the writer.
-//		/// </summary>
-//		public void Finish()
-//		{
-//			while (available) {
-//				WriteCurrent();
-//			}
-//		}
-//		
-//		void IDisposable.Dispose()
-//		{
-//			Finish();
-//		}
-//		
-//		/// <summary>
-//		/// Registers a new SpecialNodesInserter with the output visitor.
-//		/// Make sure to call Finish() (or Dispose()) on the returned SpecialNodesInserter
-//		/// when the output is finished.
-//		/// </summary>
-//		public static SpecialNodesInserter Install(IEnumerable<ISpecial> specials, IOutputDomVisitor outputVisitor)
-//		{
-//			SpecialNodesInserter sni = new SpecialNodesInserter(specials, new SpecialOutputVisitor(outputVisitor.OutputFormatter));
-//			outputVisitor.BeforeNodeVisit += sni.AcceptNodeStart;
-//			outputVisitor.AfterNodeVisit  += sni.AcceptNodeEnd;
-//			return sni;
-//		}
-//	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/VBNet/VBNetOutputFormatter.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/VBNet/VBNetOutputFormatter.cs
deleted file mode 100644
index aadd790af1..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/VBNet/VBNetOutputFormatter.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using ICSharpCode.NRefactory.VB.Parser;
-
-namespace ICSharpCode.NRefactory.VB.PrettyPrinter
-{
-	/// <summary>
-	/// Description of VBNetOutputFormatter.
-	/// </summary>
-	public sealed class VBNetOutputFormatter : AbstractOutputFormatter
-	{
-		public VBNetOutputFormatter(VBNetPrettyPrintOptions prettyPrintOptions) : base(prettyPrintOptions)
-		{
-		}
-		
-		public override void PrintToken(int token)
-		{
-			PrintText(Tokens.GetTokenString(token));
-		}
-		
-		public override void PrintIdentifier(string identifier)
-		{
-			if (Keywords.IsNonIdentifierKeyword(identifier)) {
-				PrintText("[");
-				PrintText(identifier);
-				PrintText("]");
-			} else {
-				PrintText(identifier);
-			}
-		}
-		
-//		public override void PrintComment(Comment comment, bool forceWriteInPreviousBlock)
-//		{
-//			switch (comment.CommentType) {
-//				case CommentType.Block:
-//					WriteLineInPreviousLine("'" + comment.CommentText.Replace("\n", "\n'"), forceWriteInPreviousBlock);
-//					break;
-//				case CommentType.Documentation:
-//					WriteLineInPreviousLine("'''" + comment.CommentText, forceWriteInPreviousBlock);
-//					break;
-//				default:
-//					WriteLineInPreviousLine("'" + comment.CommentText, forceWriteInPreviousBlock);
-//					break;
-//			}
-//		}
-		
-//		public override void PrintPreprocessingDirective(PreprocessingDirective directive, bool forceWriteInPreviousBlock)
-//		{
-//			if (IsInMemberBody
-//			    && (string.Equals(directive.Cmd, "#Region", StringComparison.InvariantCultureIgnoreCase)
-//			        || string.Equals(directive.Cmd, "#End", StringComparison.InvariantCultureIgnoreCase)
-//			        && directive.Arg.StartsWith("Region", StringComparison.InvariantCultureIgnoreCase)))
-//			{
-//				WriteLineInPreviousLine("'" + directive.Cmd + " " + directive.Arg, forceWriteInPreviousBlock);
-//			} else if (!directive.Expression.IsNull) {
-//				VBNetOutputVisitor visitor = new VBNetOutputVisitor();
-//				directive.Expression.AcceptVisitor(visitor, null);
-//				WriteLineInPreviousLine(directive.Cmd + " " + visitor.Text + " Then", forceWriteInPreviousBlock);
-//			} else {
-//				base.PrintPreprocessingDirective(directive, forceWriteInPreviousBlock);
-//			}
-//		}
-		
-		public void PrintLineContinuation()
-		{
-			if (!LastCharacterIsWhiteSpace)
-				Space();
-			PrintText("_" + Environment.NewLine);
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/VBNet/VBNetOutputVisitor.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/VBNet/VBNetOutputVisitor.cs
deleted file mode 100644
index d4635d1d12..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/VBNet/VBNetOutputVisitor.cs
+++ /dev/null
@@ -1,3023 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Linq;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Text;
-
-using ICSharpCode.NRefactory.VB.Ast;
-using ICSharpCode.NRefactory.VB.Parser;
-using ICSharpCode.NRefactory.VB.Visitors;
-
-namespace ICSharpCode.NRefactory.VB.PrettyPrinter
-{
-//	public sealed class VBNetOutputVisitor : NodeTrackingAstVisitor, IOutputDomVisitor
-//	{
-//		Errors                  errors             = new Errors();
-//		VBNetOutputFormatter    outputFormatter;
-//		VBNetPrettyPrintOptions prettyPrintOptions = new VBNetPrettyPrintOptions();
-//		TypeDeclaration         currentType;
-//		
-//		Stack<int> exitTokenStack = new Stack<int>();
-//		
-//		public string Text {
-//			get {
-//				return outputFormatter.Text;
-//			}
-//		}
-//		
-//		public Errors Errors {
-//			get {
-//				return errors;
-//			}
-//		}
-//		
-//		AbstractPrettyPrintOptions IOutputDomVisitor.Options {
-//			get { return prettyPrintOptions; }
-//		}
-//		
-//		public VBNetPrettyPrintOptions Options {
-//			get { return prettyPrintOptions; }
-//		}
-//		
-//		public IOutputFormatter OutputFormatter {
-//			get {
-//				return outputFormatter;
-//			}
-//		}
-//		
-//		public VBNetOutputVisitor()
-//		{
-//			outputFormatter = new VBNetOutputFormatter(prettyPrintOptions);
-//		}
-//		
-//		public event Action<INode> BeforeNodeVisit;
-//		public event Action<INode> AfterNodeVisit;
-//		
-//		protected override void BeginVisit(INode node)
-//		{
-//			if (BeforeNodeVisit != null) {
-//				BeforeNodeVisit(node);
-//			}
-//			base.BeginVisit(node);
-//		}
-//		
-//		protected override void EndVisit(INode node)
-//		{
-//			base.EndVisit(node);
-//			if (AfterNodeVisit != null) {
-//				AfterNodeVisit(node);
-//			}
-//		}
-//		
-//		object TrackedVisit(INode node, object data)
-//		{
-//			return node.AcceptVisitor(this, data);
-//		}
-//		
-//		void Error(string text, Location position)
-//		{
-//			errors.Error(position.Line, position.Column, text);
-//		}
-//		
-//		void UnsupportedNode(INode node)
-//		{
-//			Error(node.GetType().Name + " is unsupported", node.StartLocation);
-//		}
-//		
-//		#region ICSharpCode.NRefactory.Parser.IAstVisitor interface implementation
-//		public override object TrackedVisitCompilationUnit(CompilationUnit compilationUnit, object data)
-//		{
-//			compilationUnit.AcceptChildren(this, data);
-//			outputFormatter.EndFile();
-//			return null;
-//		}
-//		
-//		/// <summary>
-//		/// Converts type name to primitive type name. Returns typeString if typeString is not
-//		/// a primitive type.
-//		/// </summary>
-//		static string ConvertTypeString(string typeString)
-//		{
-//			string primitiveType;
-//			if (TypeReference.PrimitiveTypesVBReverse.TryGetValue(typeString, out primitiveType))
-//				return primitiveType;
-//			else
-//				return typeString;
-//		}
-//
-//		public override object TrackedVisitTypeReference(TypeReference typeReference, object data)
-//		{
-//			if (typeReference == TypeReference.ClassConstraint) {
-//				outputFormatter.PrintToken(Tokens.Class);
-//			} else if (typeReference == TypeReference.StructConstraint) {
-//				outputFormatter.PrintToken(Tokens.Structure);
-//			} else if (typeReference == TypeReference.NewConstraint) {
-//				outputFormatter.PrintToken(Tokens.New);
-//			} else {
-//				PrintTypeReferenceWithoutArray(typeReference);
-//				if (typeReference.IsArrayType) {
-//					PrintArrayRank(typeReference.RankSpecifier, 0);
-//				}
-//			}
-//			return null;
-//		}
-//		
-//		void PrintTypeReferenceWithoutArray(TypeReference typeReference)
-//		{
-//			if (typeReference.IsGlobal) {
-//				outputFormatter.PrintToken(Tokens.Global);
-//				outputFormatter.PrintToken(Tokens.Dot);
-//			}
-//			bool printGenerics = true;
-//			if (typeReference.IsKeyword) {
-//				outputFormatter.PrintText(ConvertTypeString(typeReference.Type));
-//			} else {
-//				outputFormatter.PrintIdentifier(typeReference.Type);
-//			}
-//			if (printGenerics && typeReference.GenericTypes != null && typeReference.GenericTypes.Count > 0) {
-//				outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//				outputFormatter.PrintToken(Tokens.Of);
-//				outputFormatter.Space();
-//				AppendCommaSeparatedList(typeReference.GenericTypes);
-//				outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			}
-//			for (int i = 0; i < typeReference.PointerNestingLevel; ++i) {
-//				outputFormatter.PrintToken(Tokens.Times);
-//			}
-//		}
-//		
-//		void PrintArrayRank(int[] rankSpecifier, int startRank)
-//		{
-//			for (int i = startRank; i < rankSpecifier.Length; ++i) {
-//				outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//				for (int j = 0; j < rankSpecifier[i]; ++j) {
-//					outputFormatter.PrintToken(Tokens.Comma);
-//				}
-//				outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			}
-//		}
-//		
-//		public override object TrackedVisitInnerClassTypeReference(InnerClassTypeReference innerClassTypeReference, object data)
-//		{
-//			TrackedVisit(innerClassTypeReference.BaseType, data);
-//			outputFormatter.PrintToken(Tokens.Dot);
-//			return VisitTypeReference((TypeReference)innerClassTypeReference, data);
-//		}
-//		
-//		#region Global scope
-//		bool printAttributeSectionInline; // is set to true when printing parameter's attributes
-//		
-//		public override object TrackedVisitAttributeSection(AttributeSection attributeSection, object data)
-//		{
-//			if (!printAttributeSectionInline)
-//				outputFormatter.Indent();
-//			outputFormatter.PrintText("<");
-//			if (!string.IsNullOrEmpty(attributeSection.AttributeTarget) && !string.Equals(attributeSection.AttributeTarget, "return", StringComparison.OrdinalIgnoreCase)) {
-//				outputFormatter.PrintText(char.ToUpperInvariant(attributeSection.AttributeTarget[0]) + attributeSection.AttributeTarget.Substring(1));
-//				outputFormatter.PrintToken(Tokens.Colon);
-//				outputFormatter.Space();
-//			}
-//			Debug.Assert(attributeSection.Attributes != null);
-//			AppendCommaSeparatedList(attributeSection.Attributes);
-//			
-//			outputFormatter.PrintText(">");
-//			
-//			if ("assembly".Equals(attributeSection.AttributeTarget, StringComparison.InvariantCultureIgnoreCase)
-//			    || "module".Equals(attributeSection.AttributeTarget, StringComparison.InvariantCultureIgnoreCase)) {
-//				outputFormatter.NewLine();
-//			} else {
-//				if (printAttributeSectionInline)
-//					outputFormatter.Space();
-//				else
-//					outputFormatter.PrintLineContinuation();
-//			}
-//			
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitAttribute(ICSharpCode.NRefactory.VB.Ast.Attribute attribute, object data)
-//		{
-//			outputFormatter.PrintIdentifier(attribute.Type);
-//			if (attribute.PositionalArguments.Count > 0 || attribute.NamedArguments.Count > 0) {
-//				outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//				AppendCommaSeparatedList(attribute.PositionalArguments);
-//				
-//				if (attribute.NamedArguments.Count > 0) {
-//					if (attribute.PositionalArguments.Count > 0) {
-//						outputFormatter.PrintToken(Tokens.Comma);
-//						outputFormatter.Space();
-//					}
-//					AppendCommaSeparatedList(attribute.NamedArguments);
-//				}
-//				outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			}
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitNamedArgumentExpression(NamedArgumentExpression namedArgumentExpression, object data)
-//		{
-//			outputFormatter.PrintIdentifier(namedArgumentExpression.Name);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Colon);
-//			outputFormatter.PrintToken(Tokens.Assign);
-//			outputFormatter.Space();
-//			TrackedVisit(namedArgumentExpression.Expression, data);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitUsing(ImportsClause @using, object data)
-//		{
-//			Debug.Fail("Should never be called. The usings should be handled in Visit(UsingDeclaration)");
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitUsingDeclaration(ImportsStatement usingDeclaration, object data)
-//		{
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.Imports);
-//			outputFormatter.Space();
-//			for (int i = 0; i < usingDeclaration.ImportsClauses.Count; ++i) {
-//				outputFormatter.PrintIdentifier(((ImportsClause)usingDeclaration.ImportsClauses[i]).Name);
-//				if (((ImportsClause)usingDeclaration.ImportsClauses[i]).IsAlias) {
-//					outputFormatter.Space();
-//					outputFormatter.PrintToken(Tokens.Assign);
-//					outputFormatter.Space();
-//					TrackedVisit(((ImportsClause)usingDeclaration.ImportsClauses[i]).Alias, data);
-//				}
-//				if (i + 1 < usingDeclaration.ImportsClauses.Count) {
-//					outputFormatter.PrintToken(Tokens.Comma);
-//					outputFormatter.Space();
-//				}
-//			}
-//			outputFormatter.NewLine();
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration, object data)
-//		{
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.Namespace);
-//			outputFormatter.Space();
-//			outputFormatter.PrintIdentifier(namespaceDeclaration.Name);
-//			outputFormatter.NewLine();
-//			
-//			++outputFormatter.IndentationLevel;
-//			namespaceDeclaration.AcceptChildren(this, data);
-//			--outputFormatter.IndentationLevel;
-//			
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.End);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Namespace);
-//			outputFormatter.NewLine();
-//			return null;
-//		}
-//		
-//		static int GetTypeToken(TypeDeclaration typeDeclaration)
-//		{
-//			switch (typeDeclaration.Type) {
-//				case ClassType.Class:
-//					return Tokens.Class;
-//				case ClassType.Enum:
-//					return Tokens.Enum;
-//				case ClassType.Interface:
-//					return Tokens.Interface;
-//				case ClassType.Struct:
-//					return Tokens.Structure;
-//				case ClassType.Module:
-//					return Tokens.Module;
-//				default:
-//					return Tokens.Class;
-//			}
-//		}
-//		
-//		void PrintTemplates(List<TemplateDefinition> templates)
-//		{
-//			if (templates != null && templates.Count > 0) {
-//				outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//				outputFormatter.PrintToken(Tokens.Of);
-//				outputFormatter.Space();
-//				AppendCommaSeparatedList(templates);
-//				outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			}
-//		}
-//		
-//		public override object TrackedVisitTypeDeclaration(TypeDeclaration typeDeclaration, object data)
-//		{
-//			VisitAttributes(typeDeclaration.Attributes, data);
-//			
-//			outputFormatter.Indent();
-//			OutputModifier(typeDeclaration.Modifier, true, false);
-//			
-//			int typeToken = GetTypeToken(typeDeclaration);
-//			outputFormatter.PrintToken(typeToken);
-//			outputFormatter.Space();
-//			outputFormatter.PrintIdentifier(typeDeclaration.Name);
-//			
-//			PrintTemplates(typeDeclaration.Templates);
-//			
-//			if (typeDeclaration.Type == ClassType.Enum
-//			    && typeDeclaration.BaseTypes != null && typeDeclaration.BaseTypes.Count > 0)
-//			{
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.As);
-//				outputFormatter.Space();
-//				foreach (TypeReference baseTypeRef in typeDeclaration.BaseTypes) {
-//					TrackedVisit(baseTypeRef, data);
-//				}
-//			}
-//			
-//			outputFormatter.NewLine();
-//			++outputFormatter.IndentationLevel;
-//			
-//			if (typeDeclaration.BaseTypes != null && typeDeclaration.Type != ClassType.Enum) {
-//				foreach (TypeReference baseTypeRef in typeDeclaration.BaseTypes) {
-//					outputFormatter.Indent();
-//					
-//					string baseType = baseTypeRef.Type;
-//					if (baseType.IndexOf('.') >= 0) {
-//						baseType = baseType.Substring(baseType.LastIndexOf('.') + 1);
-//					}
-//					bool baseTypeIsInterface = baseType.Length >= 2 && baseType[0] == 'I' && Char.IsUpper(baseType[1]);
-//					
-//					if (!baseTypeIsInterface || typeDeclaration.Type == ClassType.Interface) {
-//						outputFormatter.PrintToken(Tokens.Inherits);
-//					} else {
-//						outputFormatter.PrintToken(Tokens.Implements);
-//					}
-//					outputFormatter.Space();
-//					TrackedVisit(baseTypeRef, data);
-//					outputFormatter.NewLine();
-//				}
-//			}
-//			
-//			TypeDeclaration oldType = currentType;
-//			currentType = typeDeclaration;
-//			
-//			if (typeDeclaration.Type == ClassType.Enum) {
-//				OutputEnumMembers(typeDeclaration, data);
-//			} else {
-//				typeDeclaration.AcceptChildren(this, data);
-//			}
-//			currentType = oldType;
-//			
-//			--outputFormatter.IndentationLevel;
-//			
-//			
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.End);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(typeToken);
-//			outputFormatter.NewLine();
-//			return null;
-//		}
-//		
-//		void OutputEnumMembers(TypeDeclaration typeDeclaration, object data)
-//		{
-//			foreach (FieldDeclaration fieldDeclaration in typeDeclaration.Children) {
-//				BeginVisit(fieldDeclaration);
-//				VariableDeclaration f = (VariableDeclaration)fieldDeclaration.Fields[0];
-//				VisitAttributes(fieldDeclaration.Attributes, data);
-//				outputFormatter.Indent();
-//				outputFormatter.PrintIdentifier(f.Name);
-//				if (f.Initializer != null && !f.Initializer.IsNull) {
-//					outputFormatter.Space();
-//					outputFormatter.PrintToken(Tokens.Assign);
-//					outputFormatter.Space();
-//					TrackedVisit(f.Initializer, data);
-//				}
-//				outputFormatter.NewLine();
-//				EndVisit(fieldDeclaration);
-//			}
-//		}
-//		
-//		public override object TrackedVisitTemplateDefinition(TemplateDefinition templateDefinition, object data)
-//		{
-//			VisitAttributes(templateDefinition.Attributes, data);
-//			switch (templateDefinition.VarianceModifier) {
-//				case VarianceModifier.Invariant:
-//					// nothing
-//					break;
-//				case VarianceModifier.Covariant:
-//					outputFormatter.Space();
-//					outputFormatter.PrintToken(Tokens.Out);
-//					outputFormatter.Space();
-//					break;
-//				case VarianceModifier.Contravariant:
-//					outputFormatter.Space();
-//					outputFormatter.PrintToken(Tokens.In);
-//					outputFormatter.Space();
-//					break;
-//				default:
-//					throw new Exception("Invalid value for VarianceModifier");
-//			}
-//			outputFormatter.PrintIdentifier(templateDefinition.Name);
-//			if (templateDefinition.Bases.Count > 0) {
-//				outputFormatter.PrintText(" As ");
-//				VisitReturnTypeAttributes(templateDefinition.Attributes, data);
-//				if (templateDefinition.Bases.Count == 1) {
-//					TrackedVisit(templateDefinition.Bases[0], data);
-//				} else {
-//					outputFormatter.PrintToken(Tokens.OpenCurlyBrace);
-//					AppendCommaSeparatedList(templateDefinition.Bases);
-//					outputFormatter.PrintToken(Tokens.CloseCurlyBrace);
-//				}
-//			}
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitDelegateDeclaration(DelegateDeclaration delegateDeclaration, object data)
-//		{
-//			VisitAttributes(delegateDeclaration.Attributes, data);
-//			
-//			outputFormatter.Indent();
-//			OutputModifier(delegateDeclaration.Modifier, true, false);
-//			outputFormatter.PrintToken(Tokens.Delegate);
-//			outputFormatter.Space();
-//			
-//			bool isFunction = (delegateDeclaration.ReturnType.Type != "System.Void");
-//			if (isFunction) {
-//				outputFormatter.PrintToken(Tokens.Function);
-//				outputFormatter.Space();
-//			} else {
-//				outputFormatter.PrintToken(Tokens.Sub);
-//				outputFormatter.Space();
-//			}
-//			outputFormatter.PrintIdentifier(delegateDeclaration.Name);
-//			
-//			PrintTemplates(delegateDeclaration.Templates);
-//			
-//			outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			AppendCommaSeparatedList(delegateDeclaration.Parameters);
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			
-//			if (isFunction) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.As);
-//				outputFormatter.Space();
-//				VisitReturnTypeAttributes(delegateDeclaration.Attributes, data);
-//				TrackedVisit(delegateDeclaration.ReturnType, data);
-//			}
-//			outputFormatter.NewLine();
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitOptionDeclaration(OptionDeclaration optionDeclaration, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.Option);
-//			outputFormatter.Space();
-//			switch (optionDeclaration.OptionType) {
-//				case OptionType.Strict:
-//					outputFormatter.PrintToken(Tokens.Strict);
-//					outputFormatter.Space();
-//					outputFormatter.PrintToken(optionDeclaration.OptionValue ? Tokens.On : Tokens.Off);
-//					break;
-//				case OptionType.Explicit:
-//					outputFormatter.PrintToken(Tokens.Explicit);
-//					outputFormatter.Space();
-//					outputFormatter.PrintToken(optionDeclaration.OptionValue ? Tokens.On : Tokens.Off);
-//					break;
-//				case OptionType.Infer:
-//					outputFormatter.PrintToken(Tokens.Infer);
-//					outputFormatter.Space();
-//					outputFormatter.PrintToken(optionDeclaration.OptionValue ? Tokens.On : Tokens.Off);
-//					break;
-//				case OptionType.CompareBinary:
-//					outputFormatter.PrintToken(Tokens.Compare);
-//					outputFormatter.Space();
-//					outputFormatter.PrintToken(Tokens.Binary);
-//					break;
-//				case OptionType.CompareText:
-//					outputFormatter.PrintToken(Tokens.Compare);
-//					outputFormatter.Space();
-//					outputFormatter.PrintToken(Tokens.Text);
-//					break;
-//			}
-//			outputFormatter.NewLine();
-//			return null;
-//		}
-//		#endregion
-//		
-//		#region Type level
-//		TypeReference currentVariableType;
-//		public override object TrackedVisitFieldDeclaration(FieldDeclaration fieldDeclaration, object data)
-//		{
-//			
-//			VisitAttributes(fieldDeclaration.Attributes, data);
-//			outputFormatter.Indent();
-//			if (fieldDeclaration.Modifier == Modifiers.None) {
-//				outputFormatter.PrintToken(Tokens.Private);
-//				outputFormatter.Space();
-//			} else {
-//				OutputModifier(fieldDeclaration.Modifier, false, true);
-//			}
-//			currentVariableType = fieldDeclaration.TypeReference;
-//			AppendCommaSeparatedList(fieldDeclaration.Fields);
-//			currentVariableType = null;
-//			
-//			outputFormatter.NewLine();
-//
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitVariableDeclaration(VariableDeclaration variableDeclaration, object data)
-//		{
-//			outputFormatter.PrintIdentifier(variableDeclaration.Name);
-//			
-//			TypeReference varType = currentVariableType;
-//			if (varType != null && varType.IsNull)
-//				varType = null;
-//			if (varType == null && !variableDeclaration.TypeReference.IsNull)
-//				varType = variableDeclaration.TypeReference;
-//			
-//			if (varType != null) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.As);
-//				outputFormatter.Space();
-//				ObjectCreateExpression init = variableDeclaration.Initializer as ObjectCreateExpression;
-//				if (init != null && TypeReference.AreEqualReferences(init.CreateType, varType)) {
-//					TrackedVisit(variableDeclaration.Initializer, data);
-//					return null;
-//				} else {
-//					TrackedVisit(varType, data);
-//				}
-//			}
-//			
-//			if (!variableDeclaration.Initializer.IsNull) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.Assign);
-//				outputFormatter.Space();
-//				TrackedVisit(variableDeclaration.Initializer, data);
-//			}
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitPropertyDeclaration(PropertyDeclaration propertyDeclaration, object data)
-//		{
-//			VisitAttributes(propertyDeclaration.Attributes, data);
-//			outputFormatter.Indent();
-//			OutputModifier(propertyDeclaration.Modifier);
-//			
-//			if ((propertyDeclaration.Modifier & (Modifiers.ReadOnly | Modifiers.WriteOnly)) == Modifiers.None) {
-//				if (propertyDeclaration.IsReadOnly) {
-//					outputFormatter.PrintToken(Tokens.ReadOnly);
-//					outputFormatter.Space();
-//				} else if (propertyDeclaration.IsWriteOnly) {
-//					outputFormatter.PrintToken(Tokens.WriteOnly);
-//					outputFormatter.Space();
-//				}
-//			}
-//			
-//			outputFormatter.PrintToken(Tokens.Property);
-//			outputFormatter.Space();
-//			outputFormatter.PrintIdentifier(propertyDeclaration.Name);
-//			
-//			outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			AppendCommaSeparatedList(propertyDeclaration.Parameters);
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			
-//			if (!propertyDeclaration.TypeReference.IsNull) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.As);
-//				outputFormatter.Space();
-//				
-//				VisitReturnTypeAttributes(propertyDeclaration.Attributes, data);
-//				
-//				ObjectCreateExpression init = propertyDeclaration.Initializer as ObjectCreateExpression;
-//				if (init != null && TypeReference.AreEqualReferences(init.CreateType, propertyDeclaration.TypeReference)) {
-//					TrackedVisit(propertyDeclaration.Initializer, data);
-//				} else {
-//					TrackedVisit(propertyDeclaration.TypeReference, data);
-//				}
-//			}
-//			
-//			PrintInterfaceImplementations(propertyDeclaration.InterfaceImplementations);
-//			
-//			if (!propertyDeclaration.Initializer.IsNull && !(propertyDeclaration.Initializer is ObjectCreateExpression)) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.Assign);
-//				outputFormatter.Space();
-//				TrackedVisit(propertyDeclaration.Initializer, data);
-//			}
-//			
-//			outputFormatter.NewLine();
-//			
-//			if (!IsAbstract(propertyDeclaration) && (propertyDeclaration.GetRegion.Block != NullBlockStatement.Instance  || propertyDeclaration.SetRegion.Block != NullBlockStatement.Instance)) {
-//				outputFormatter.IsInMemberBody = true;
-//				++outputFormatter.IndentationLevel;
-//				exitTokenStack.Push(Tokens.Property);
-//				TrackedVisit(propertyDeclaration.GetRegion, data);
-//				TrackedVisit(propertyDeclaration.SetRegion, data);
-//				exitTokenStack.Pop();
-//				--outputFormatter.IndentationLevel;
-//				outputFormatter.IsInMemberBody = false;
-//				
-//				outputFormatter.Indent();
-//				outputFormatter.PrintToken(Tokens.End);
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.Property);
-//				outputFormatter.NewLine();
-//			}
-//			
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitPropertyGetRegion(PropertyGetRegion propertyGetRegion, object data)
-//		{
-//			VisitAttributes(propertyGetRegion.Attributes, data);
-//			outputFormatter.Indent();
-//			OutputModifier(propertyGetRegion.Modifier);
-//			outputFormatter.PrintToken(Tokens.Get);
-//			outputFormatter.NewLine();
-//			
-//			++outputFormatter.IndentationLevel;
-//			TrackedVisit(propertyGetRegion.Block, data);
-//			--outputFormatter.IndentationLevel;
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.End);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Get);
-//			outputFormatter.NewLine();
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitPropertySetRegion(PropertySetRegion propertySetRegion, object data)
-//		{
-//			VisitAttributes(propertySetRegion.Attributes, data);
-//			outputFormatter.Indent();
-//			OutputModifier(propertySetRegion.Modifier);
-//			outputFormatter.PrintToken(Tokens.Set);
-//			outputFormatter.NewLine();
-//			
-//			++outputFormatter.IndentationLevel;
-//			TrackedVisit(propertySetRegion.Block, data);
-//			--outputFormatter.IndentationLevel;
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.End);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Set);
-//			outputFormatter.NewLine();
-//			return null;
-//		}
-//		
-//		TypeReference currentEventType = null;
-//		public override object TrackedVisitEventDeclaration(EventDeclaration eventDeclaration, object data)
-//		{
-//			bool customEvent = eventDeclaration.HasAddRegion  || eventDeclaration.HasRemoveRegion;
-//			
-//			VisitAttributes(eventDeclaration.Attributes, data);
-//			outputFormatter.Indent();
-//			OutputModifier(eventDeclaration.Modifier);
-//			if (customEvent) {
-//				outputFormatter.PrintText("Custom");
-//				outputFormatter.Space();
-//			}
-//			
-//			outputFormatter.PrintToken(Tokens.Event);
-//			outputFormatter.Space();
-//			outputFormatter.PrintIdentifier(eventDeclaration.Name);
-//			
-//			if (eventDeclaration.Parameters.Count > 0) {
-//				outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//				this.AppendCommaSeparatedList(eventDeclaration.Parameters);
-//				outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			}
-//			if (!eventDeclaration.TypeReference.IsNull) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.As);
-//				outputFormatter.Space();
-//				VisitReturnTypeAttributes(eventDeclaration.Attributes, data);
-//				TrackedVisit(eventDeclaration.TypeReference, data);
-//			}
-//			
-//			PrintInterfaceImplementations(eventDeclaration.InterfaceImplementations);
-//			
-//			if (!eventDeclaration.Initializer.IsNull) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.Assign);
-//				outputFormatter.Space();
-//				TrackedVisit(eventDeclaration.Initializer, data);
-//			}
-//			
-//			outputFormatter.NewLine();
-//			
-//			if (customEvent) {
-//				++outputFormatter.IndentationLevel;
-//				currentEventType = eventDeclaration.TypeReference;
-//				exitTokenStack.Push(Tokens.Sub);
-//				TrackedVisit(eventDeclaration.AddRegion, data);
-//				TrackedVisit(eventDeclaration.RemoveRegion, data);
-//				exitTokenStack.Pop();
-//				--outputFormatter.IndentationLevel;
-//				
-//				outputFormatter.Indent();
-//				outputFormatter.PrintToken(Tokens.End);
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.Event);
-//				outputFormatter.NewLine();
-//			}
-//			return null;
-//		}
-//		
-//		void PrintInterfaceImplementations(IList<InterfaceImplementation> list)
-//		{
-//			if (list == null || list.Count == 0)
-//				return;
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Implements);
-//			for (int i = 0; i < list.Count; i++) {
-//				if (i > 0)
-//					outputFormatter.PrintToken(Tokens.Comma);
-//				outputFormatter.Space();
-//				TrackedVisit(list[i].InterfaceType, null);
-//				outputFormatter.PrintToken(Tokens.Dot);
-//				outputFormatter.PrintIdentifier(list[i].MemberName);
-//			}
-//		}
-//		
-//		public override object TrackedVisitEventAddRegion(EventAddRegion eventAddRegion, object data)
-//		{
-//			VisitAttributes(eventAddRegion.Attributes, data);
-//			outputFormatter.Indent();
-//			outputFormatter.PrintText("AddHandler(");
-//			if (eventAddRegion.Parameters.Count == 0) {
-//				outputFormatter.PrintToken(Tokens.ByVal);
-//				outputFormatter.Space();
-//				outputFormatter.PrintIdentifier("value");
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.As);
-//				outputFormatter.Space();
-//				TrackedVisit(currentEventType, data);
-//			} else {
-//				this.AppendCommaSeparatedList(eventAddRegion.Parameters);
-//			}
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			outputFormatter.NewLine();
-//			
-//			++outputFormatter.IndentationLevel;
-//			TrackedVisit(eventAddRegion.Block, data);
-//			--outputFormatter.IndentationLevel;
-//			
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.End);
-//			outputFormatter.Space();
-//			outputFormatter.PrintText("AddHandler");
-//			outputFormatter.NewLine();
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitEventRemoveRegion(EventRemoveRegion eventRemoveRegion, object data)
-//		{
-//			VisitAttributes(eventRemoveRegion.Attributes, data);
-//			outputFormatter.Indent();
-//			outputFormatter.PrintText("RemoveHandler");
-//			outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			if (eventRemoveRegion.Parameters.Count == 0) {
-//				outputFormatter.PrintToken(Tokens.ByVal);
-//				outputFormatter.Space();
-//				outputFormatter.PrintIdentifier("value");
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.As);
-//				outputFormatter.Space();
-//				TrackedVisit(currentEventType, data);
-//			} else {
-//				this.AppendCommaSeparatedList(eventRemoveRegion.Parameters);
-//			}
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			outputFormatter.NewLine();
-//			
-//			++outputFormatter.IndentationLevel;
-//			TrackedVisit(eventRemoveRegion.Block, data);
-//			--outputFormatter.IndentationLevel;
-//			
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.End);
-//			outputFormatter.Space();
-//			outputFormatter.PrintText("RemoveHandler");
-//			outputFormatter.NewLine();
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitEventRaiseRegion(EventRaiseRegion eventRaiseRegion, object data)
-//		{
-//			VisitAttributes(eventRaiseRegion.Attributes, data);
-//			outputFormatter.Indent();
-//			outputFormatter.PrintText("RaiseEvent");
-//			outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			if (eventRaiseRegion.Parameters.Count == 0) {
-//				outputFormatter.PrintToken(Tokens.ByVal);
-//				outputFormatter.Space();
-//				outputFormatter.PrintIdentifier("value");
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.As);
-//				outputFormatter.Space();
-//				TrackedVisit(currentEventType, data);
-//			} else {
-//				this.AppendCommaSeparatedList(eventRaiseRegion.Parameters);
-//			}
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			outputFormatter.NewLine();
-//			
-//			++outputFormatter.IndentationLevel;
-//			TrackedVisit(eventRaiseRegion.Block, data);
-//			--outputFormatter.IndentationLevel;
-//			
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.End);
-//			outputFormatter.Space();
-//			outputFormatter.PrintText("RaiseEvent");
-//			outputFormatter.NewLine();
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitParameterDeclarationExpression(ParameterDeclarationExpression parameterDeclarationExpression, object data)
-//		{
-//			printAttributeSectionInline = true;
-//			VisitAttributes(parameterDeclarationExpression.Attributes, data);
-//			printAttributeSectionInline = false;
-//			OutputModifier(parameterDeclarationExpression.ParamModifier);
-//			outputFormatter.PrintIdentifier(parameterDeclarationExpression.ParameterName);
-//			if (!parameterDeclarationExpression.TypeReference.IsNull) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.As);
-//				outputFormatter.Space();
-//				VisitReturnTypeAttributes(parameterDeclarationExpression.Attributes, data);
-//				TrackedVisit(parameterDeclarationExpression.TypeReference, data);
-//			}
-//			if (!parameterDeclarationExpression.DefaultValue.IsNull) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.Assign);
-//				outputFormatter.Space();
-//				TrackedVisit(parameterDeclarationExpression.DefaultValue, data);
-//			}
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitMethodDeclaration(MethodDeclaration methodDeclaration, object data)
-//		{
-//			VisitAttributes(methodDeclaration.Attributes, data);
-//			if (methodDeclaration.IsExtensionMethod) {
-//				outputFormatter.Indent();
-//				outputFormatter.PrintText("<System.Runtime.CompilerServices.Extension> _");
-//				outputFormatter.NewLine();
-//			}
-//			outputFormatter.Indent();
-//			OutputModifier(methodDeclaration.Modifier);
-//			
-//			bool isSub = methodDeclaration.TypeReference.IsNull ||
-//				methodDeclaration.TypeReference.Type == "System.Void";
-//			
-//			if (isSub) {
-//				outputFormatter.PrintToken(Tokens.Sub);
-//			} else {
-//				outputFormatter.PrintToken(Tokens.Function);
-//			}
-//			outputFormatter.Space();
-//			outputFormatter.PrintIdentifier(methodDeclaration.Name);
-//			
-//			PrintTemplates(methodDeclaration.Templates);
-//			
-//			outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			AppendCommaSeparatedList(methodDeclaration.Parameters);
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			
-//			if (!isSub) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.As);
-//				outputFormatter.Space();
-//				VisitReturnTypeAttributes(methodDeclaration.Attributes, data);
-//				TrackedVisit(methodDeclaration.TypeReference, data);
-//			}
-//			
-//			PrintInterfaceImplementations(methodDeclaration.InterfaceImplementations);
-//			
-//			if (methodDeclaration.HandlesClause.Count > 0) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.Handles);
-//				for (int i = 0; i < methodDeclaration.HandlesClause.Count; i++) {
-//					if (i > 0)
-//						outputFormatter.PrintToken(Tokens.Comma);
-//					outputFormatter.Space();
-//					outputFormatter.PrintText(methodDeclaration.HandlesClause[i]);
-//				}
-//			}
-//			
-//			outputFormatter.NewLine();
-//			
-//			if (!IsAbstract(methodDeclaration)) {
-//				outputFormatter.IsInMemberBody = true;
-//				BeginVisit(methodDeclaration.Body);
-//				++outputFormatter.IndentationLevel;
-//				exitTokenStack.Push(isSub ? Tokens.Sub : Tokens.Function);
-//				// we're doing the tracking manually using BeginVisit/EndVisit, so call Tracked... directly
-//				this.TrackedVisitBlockStatement(methodDeclaration.Body, data);
-//				exitTokenStack.Pop();
-//				--outputFormatter.IndentationLevel;
-//				
-//				outputFormatter.Indent();
-//				outputFormatter.PrintToken(Tokens.End);
-//				outputFormatter.Space();
-//				if (isSub) {
-//					outputFormatter.PrintToken(Tokens.Sub);
-//				} else {
-//					outputFormatter.PrintToken(Tokens.Function);
-//				}
-//				outputFormatter.NewLine();
-//				EndVisit(methodDeclaration.Body);
-//				outputFormatter.IsInMemberBody = false;
-//			}
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitInterfaceImplementation(InterfaceImplementation interfaceImplementation, object data)
-//		{
-//			throw new InvalidOperationException();
-//		}
-//		
-//		bool IsAbstract(AttributedNode node)
-//		{
-//			if ((node.Modifier & Modifiers.Abstract) == Modifiers.Abstract)
-//				return true;
-//			return currentType != null && currentType.Type == ClassType.Interface;
-//		}
-//		
-//		public override object TrackedVisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration, object data)
-//		{
-//			VisitAttributes(constructorDeclaration.Attributes, data);
-//			outputFormatter.Indent();
-//			OutputModifier(constructorDeclaration.Modifier);
-//			outputFormatter.PrintToken(Tokens.Sub);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.New);
-//			outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			AppendCommaSeparatedList(constructorDeclaration.Parameters);
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			outputFormatter.NewLine();
-//			
-//			outputFormatter.IsInMemberBody = true;
-//			++outputFormatter.IndentationLevel;
-//			exitTokenStack.Push(Tokens.Sub);
-//			
-//			TrackedVisit(constructorDeclaration.ConstructorInitializer, data);
-//			
-//			TrackedVisit(constructorDeclaration.Body, data);
-//			exitTokenStack.Pop();
-//			--outputFormatter.IndentationLevel;
-//			outputFormatter.IsInMemberBody = false;
-//			
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.End);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Sub);
-//			outputFormatter.NewLine();
-//			
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitConstructorInitializer(ConstructorInitializer constructorInitializer, object data)
-//		{
-//			outputFormatter.Indent();
-//			if (constructorInitializer.ConstructorInitializerType == ConstructorInitializerType.This) {
-//				outputFormatter.PrintToken(Tokens.Me);
-//			} else {
-//				outputFormatter.PrintToken(Tokens.MyBase);
-//			}
-//			outputFormatter.PrintToken(Tokens.Dot);
-//			outputFormatter.PrintToken(Tokens.New);
-//			outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			AppendCommaSeparatedList(constructorInitializer.Arguments);
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			
-//			outputFormatter.NewLine();
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitOperatorDeclaration(OperatorDeclaration operatorDeclaration, object data)
-//		{
-//			VisitAttributes(operatorDeclaration.Attributes, data);
-//			outputFormatter.Indent();
-//			OutputModifier(operatorDeclaration.Modifier);
-//			
-//			if (operatorDeclaration.IsConversionOperator) {
-//				if (operatorDeclaration.ConversionType == ConversionType.Implicit) {
-//					outputFormatter.PrintToken(Tokens.Widening);
-//				} else {
-//					outputFormatter.PrintToken(Tokens.Narrowing);
-//				}
-//				outputFormatter.Space();
-//			}
-//			
-//			outputFormatter.PrintToken(Tokens.Operator);
-//			outputFormatter.Space();
-//			
-//			int op = -1;
-//			
-//			switch(operatorDeclaration.OverloadableOperator)
-//			{
-//				case OverloadableOperatorType.Add:
-//				case OverloadableOperatorType.UnaryPlus:
-//					op = Tokens.Plus;
-//					break;
-//				case OverloadableOperatorType.UnaryMinus:
-//				case OverloadableOperatorType.Subtract:
-//					op = Tokens.Minus;
-//					break;
-//				case OverloadableOperatorType.Multiply:
-//					op = Tokens.Times;
-//					break;
-//				case OverloadableOperatorType.Divide:
-//					op = Tokens.Div;
-//					break;
-//				case OverloadableOperatorType.Modulus:
-//					op = Tokens.Mod;
-//					break;
-//				case OverloadableOperatorType.Concat:
-//					op = Tokens.ConcatString;
-//					break;
-//				case OverloadableOperatorType.Not:
-//					op = Tokens.Not;
-//					break;
-//				case OverloadableOperatorType.BitNot:
-//					op = Tokens.Not;
-//					break;
-//				case OverloadableOperatorType.BitwiseAnd:
-//					op = Tokens.And;
-//					break;
-//				case OverloadableOperatorType.BitwiseOr:
-//					op = Tokens.Or;
-//					break;
-//				case OverloadableOperatorType.ExclusiveOr:
-//					op = Tokens.Xor;
-//					break;
-//				case OverloadableOperatorType.ShiftLeft:
-//					op = Tokens.ShiftLeft;
-//					break;
-//				case OverloadableOperatorType.ShiftRight:
-//					op = Tokens.ShiftRight;
-//					break;
-//				case OverloadableOperatorType.GreaterThan:
-//					op = Tokens.GreaterThan;
-//					break;
-//				case OverloadableOperatorType.GreaterThanOrEqual:
-//					op = Tokens.GreaterEqual;
-//					break;
-//				case OverloadableOperatorType.Equality:
-//					op = Tokens.Assign;
-//					break;
-//				case OverloadableOperatorType.InEquality:
-//					op = Tokens.NotEqual;
-//					break;
-//				case OverloadableOperatorType.LessThan:
-//					op = Tokens.LessThan;
-//					break;
-//				case OverloadableOperatorType.LessThanOrEqual:
-//					op = Tokens.LessEqual;
-//					break;
-//				case OverloadableOperatorType.Increment:
-//					Error("Increment operator is not supported in Visual Basic", operatorDeclaration.StartLocation);
-//					break;
-//				case OverloadableOperatorType.Decrement:
-//					Error("Decrement operator is not supported in Visual Basic", operatorDeclaration.StartLocation);
-//					break;
-//				case OverloadableOperatorType.IsTrue:
-//					outputFormatter.PrintText("IsTrue");
-//					break;
-//				case OverloadableOperatorType.IsFalse:
-//					outputFormatter.PrintText("IsFalse");
-//					break;
-//				case OverloadableOperatorType.Like:
-//					op = Tokens.Like;
-//					break;
-//				case OverloadableOperatorType.Power:
-//					op = Tokens.Power;
-//					break;
-//				case OverloadableOperatorType.CType:
-//					op = Tokens.CType;
-//					break;
-//				case OverloadableOperatorType.DivideInteger:
-//					op = Tokens.DivInteger;
-//					break;
-//			}
-//			
-//			
-//			
-//			if (operatorDeclaration.IsConversionOperator) {
-//				outputFormatter.PrintToken(Tokens.CType);
-//			} else {
-//				if(op != -1)  outputFormatter.PrintToken(op);
-//			}
-//			
-//			PrintTemplates(operatorDeclaration.Templates);
-//			outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			AppendCommaSeparatedList(operatorDeclaration.Parameters);
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			if (!operatorDeclaration.TypeReference.IsNull) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.As);
-//				outputFormatter.Space();
-//				VisitReturnTypeAttributes(operatorDeclaration.Attributes, data);
-//				TrackedVisit(operatorDeclaration.TypeReference, data);
-//			}
-//			
-//			outputFormatter.NewLine();
-//			
-//			++outputFormatter.IndentationLevel;
-//			TrackedVisit(operatorDeclaration.Body, data);
-//			--outputFormatter.IndentationLevel;
-//			
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.End);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Operator);
-//			outputFormatter.NewLine();
-//			
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitDeclareDeclaration(DeclareDeclaration declareDeclaration, object data)
-//		{
-//			VisitAttributes(declareDeclaration.Attributes, data);
-//			outputFormatter.Indent();
-//			OutputModifier(declareDeclaration.Modifier);
-//			outputFormatter.PrintToken(Tokens.Declare);
-//			outputFormatter.Space();
-//			
-//			switch (declareDeclaration.Charset) {
-//				case CharsetModifier.Auto:
-//					outputFormatter.PrintToken(Tokens.Auto);
-//					outputFormatter.Space();
-//					break;
-//				case CharsetModifier.Unicode:
-//					outputFormatter.PrintToken(Tokens.Unicode);
-//					outputFormatter.Space();
-//					break;
-//				case CharsetModifier.Ansi:
-//					outputFormatter.PrintToken(Tokens.Ansi);
-//					outputFormatter.Space();
-//					break;
-//			}
-//			
-//			bool isVoid = declareDeclaration.TypeReference.IsNull || declareDeclaration.TypeReference.Type == "System.Void";
-//			if (isVoid) {
-//				outputFormatter.PrintToken(Tokens.Sub);
-//			} else {
-//				outputFormatter.PrintToken(Tokens.Function);
-//			}
-//			outputFormatter.Space();
-//			
-//			outputFormatter.PrintIdentifier(declareDeclaration.Name);
-//			
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Lib);
-//			outputFormatter.Space();
-//			outputFormatter.PrintText(ConvertString(declareDeclaration.Library));
-//			outputFormatter.Space();
-//			
-//			if (declareDeclaration.Alias.Length > 0) {
-//				outputFormatter.PrintToken(Tokens.Alias);
-//				outputFormatter.Space();
-//				outputFormatter.PrintText(ConvertString(declareDeclaration.Alias));
-//				outputFormatter.Space();
-//			}
-//			
-//			outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			AppendCommaSeparatedList(declareDeclaration.Parameters);
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			
-//			if (!isVoid) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.As);
-//				outputFormatter.Space();
-//				VisitReturnTypeAttributes(declareDeclaration.Attributes, data);
-//				TrackedVisit(declareDeclaration.TypeReference, data);
-//			}
-//			
-//			outputFormatter.NewLine();
-//			
-//			return null;
-//		}
-//		#endregion
-//		
-//		#region Statements
-//		public override object TrackedVisitBlockStatement(BlockStatement blockStatement, object data)
-//		{
-//			if (blockStatement.Parent is BlockStatement) {
-//				outputFormatter.Indent();
-//				outputFormatter.PrintText("If True Then");
-//				outputFormatter.NewLine();
-//				outputFormatter.IndentationLevel += 1;
-//			}
-//			VisitStatementList(blockStatement.Children);
-//			if (blockStatement.Parent is BlockStatement) {
-//				outputFormatter.IndentationLevel -= 1;
-//				outputFormatter.Indent();
-//				outputFormatter.PrintText("End If");
-//				outputFormatter.NewLine();
-//			}
-//			return null;
-//		}
-//		
-//		void PrintIndentedBlock(Statement stmt)
-//		{
-//			outputFormatter.IndentationLevel += 1;
-//			if (stmt is BlockStatement) {
-//				TrackedVisit(stmt, null);
-//			} else {
-//				outputFormatter.Indent();
-//				TrackedVisit(stmt, null);
-//				outputFormatter.NewLine();
-//			}
-//			outputFormatter.IndentationLevel -= 1;
-//		}
-//		
-//		void PrintIndentedBlock(IEnumerable statements)
-//		{
-//			outputFormatter.IndentationLevel += 1;
-//			VisitStatementList(statements);
-//			outputFormatter.IndentationLevel -= 1;
-//		}
-//		
-//		void VisitStatementList(IEnumerable statements)
-//		{
-//			foreach (Statement stmt in statements) {
-//				if (stmt is BlockStatement) {
-//					TrackedVisit(stmt, null);
-//				} else {
-//					outputFormatter.Indent();
-//					TrackedVisit(stmt, null);
-//					outputFormatter.NewLine();
-//				}
-//			}
-//		}
-//		
-//		public override object TrackedVisitAddHandlerStatement(AddHandlerStatement addHandlerStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.AddHandler);
-//			outputFormatter.Space();
-//			TrackedVisit(addHandlerStatement.EventExpression, data);
-//			outputFormatter.PrintToken(Tokens.Comma);
-//			outputFormatter.Space();
-//			TrackedVisit(addHandlerStatement.HandlerExpression, data);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitRemoveHandlerStatement(RemoveHandlerStatement removeHandlerStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.RemoveHandler);
-//			outputFormatter.Space();
-//			TrackedVisit(removeHandlerStatement.EventExpression, data);
-//			outputFormatter.PrintToken(Tokens.Comma);
-//			outputFormatter.Space();
-//			TrackedVisit(removeHandlerStatement.HandlerExpression, data);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitRaiseEventStatement(RaiseEventStatement raiseEventStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.RaiseEvent);
-//			outputFormatter.Space();
-//			outputFormatter.PrintIdentifier(raiseEventStatement.EventName);
-//			outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			AppendCommaSeparatedList(raiseEventStatement.Arguments);
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitEraseStatement(EraseStatement eraseStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.Erase);
-//			outputFormatter.Space();
-//			AppendCommaSeparatedList(eraseStatement.Expressions);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitErrorStatement(ErrorStatement errorStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.Error);
-//			outputFormatter.Space();
-//			TrackedVisit(errorStatement.Expression, data);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitOnErrorStatement(OnErrorStatement onErrorStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.On);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Error);
-//			outputFormatter.Space();
-//			TrackedVisit(onErrorStatement.EmbeddedStatement, data);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitReDimStatement(ReDimStatement reDimStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.ReDim);
-//			outputFormatter.Space();
-//			if (reDimStatement.IsPreserve) {
-//				outputFormatter.PrintToken(Tokens.Preserve);
-//				outputFormatter.Space();
-//			}
-//			
-//			AppendCommaSeparatedList(reDimStatement.ReDimClauses);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitExpressionStatement(ExpressionStatement expressionStatement, object data)
-//		{
-//			TrackedVisit(expressionStatement.Expression, data);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitLocalVariableDeclaration(LocalVariableDeclaration localVariableDeclaration, object data)
-//		{
-//			if (localVariableDeclaration.Modifier != Modifiers.None) {
-//				OutputModifier(localVariableDeclaration.Modifier & ~Modifiers.Dim);
-//			}
-//			if (!isUsingResourceAcquisition) {
-//				if ((localVariableDeclaration.Modifier & Modifiers.Const) == 0) {
-//					outputFormatter.PrintToken(Tokens.Dim);
-//				}
-//				outputFormatter.Space();
-//			}
-//			currentVariableType = localVariableDeclaration.TypeReference;
-//			
-//			AppendCommaSeparatedList(localVariableDeclaration.Variables);
-//			currentVariableType = null;
-//			
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitReturnStatement(ReturnStatement returnStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.Return);
-//			if (!returnStatement.Expression.IsNull) {
-//				outputFormatter.Space();
-//				TrackedVisit(returnStatement.Expression, data);
-//			}
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitIfElseStatement(IfElseStatement ifElseStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.If);
-//			outputFormatter.Space();
-//			TrackedVisit(ifElseStatement.Condition, data);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Then);
-//			outputFormatter.NewLine();
-//			
-//			PrintIndentedBlock(ifElseStatement.TrueStatement);
-//			
-//			foreach (ElseIfSection elseIfSection in ifElseStatement.ElseIfSections) {
-//				TrackedVisit(elseIfSection, data);
-//			}
-//			
-//			if (ifElseStatement.HasElseStatements) {
-//				outputFormatter.Indent();
-//				outputFormatter.PrintToken(Tokens.Else);
-//				outputFormatter.NewLine();
-//				PrintIndentedBlock(ifElseStatement.FalseStatement);
-//			}
-//			
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.End);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.If);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitElseIfSection(ElseIfSection elseIfSection, object data)
-//		{
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.ElseIf);
-//			outputFormatter.Space();
-//			TrackedVisit(elseIfSection.Condition, data);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Then);
-//			outputFormatter.NewLine();
-//			PrintIndentedBlock(elseIfSection.EmbeddedStatement);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitLabelStatement(LabelStatement labelStatement, object data)
-//		{
-//			outputFormatter.PrintIdentifier(labelStatement.Label);
-//			outputFormatter.PrintToken(Tokens.Colon);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitGotoStatement(GotoStatement gotoStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.GoTo);
-//			outputFormatter.Space();
-//			outputFormatter.PrintIdentifier(gotoStatement.Label);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitSwitchStatement(SwitchStatement switchStatement, object data)
-//		{
-//			exitTokenStack.Push(Tokens.Select);
-//			outputFormatter.PrintToken(Tokens.Select);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Case);
-//			outputFormatter.Space();
-//			TrackedVisit(switchStatement.SwitchExpression, data);
-//			outputFormatter.NewLine();
-//			++outputFormatter.IndentationLevel;
-//			foreach (SwitchSection section in switchStatement.SwitchSections) {
-//				TrackedVisit(section, data);
-//			}
-//			--outputFormatter.IndentationLevel;
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.End);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Select);
-//			exitTokenStack.Pop();
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitSwitchSection(SwitchSection switchSection, object data)
-//		{
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.Case);
-//			outputFormatter.Space();
-//			this.AppendCommaSeparatedList(switchSection.SwitchLabels);
-//			outputFormatter.NewLine();
-//			
-//			PrintIndentedBlock(switchSection.Children);
-//			
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitCaseLabel(CaseLabel caseLabel, object data)
-//		{
-//			if (caseLabel.IsDefault) {
-//				outputFormatter.PrintToken(Tokens.Else);
-//			} else {
-//				if (caseLabel.BinaryOperatorType != BinaryOperatorType.None) {
-//					switch (caseLabel.BinaryOperatorType) {
-//						case BinaryOperatorType.Equality:
-//							outputFormatter.PrintToken(Tokens.Assign);
-//							break;
-//						case BinaryOperatorType.InEquality:
-//							outputFormatter.PrintToken(Tokens.LessThan);
-//							outputFormatter.PrintToken(Tokens.GreaterThan);
-//							break;
-//							
-//						case BinaryOperatorType.GreaterThan:
-//							outputFormatter.PrintToken(Tokens.GreaterThan);
-//							break;
-//						case BinaryOperatorType.GreaterThanOrEqual:
-//							outputFormatter.PrintToken(Tokens.GreaterEqual);
-//							break;
-//						case BinaryOperatorType.LessThan:
-//							outputFormatter.PrintToken(Tokens.LessThan);
-//							break;
-//						case BinaryOperatorType.LessThanOrEqual:
-//							outputFormatter.PrintToken(Tokens.LessEqual);
-//							break;
-//					}
-//					outputFormatter.Space();
-//				}
-//				
-//				TrackedVisit(caseLabel.Label, data);
-//				if (!caseLabel.ToExpression.IsNull) {
-//					outputFormatter.Space();
-//					outputFormatter.PrintToken(Tokens.To);
-//					outputFormatter.Space();
-//					TrackedVisit(caseLabel.ToExpression, data);
-//				}
-//			}
-//			
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitStopStatement(StopStatement stopStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.Stop);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitResumeStatement(ResumeStatement resumeStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.Resume);
-//			outputFormatter.Space();
-//			if (resumeStatement.IsResumeNext) {
-//				outputFormatter.PrintToken(Tokens.Next);
-//			} else {
-//				outputFormatter.PrintIdentifier(resumeStatement.LabelName);
-//			}
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitEndStatement(EndStatement endStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.End);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitContinueStatement(ContinueStatement continueStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.Continue);
-//			outputFormatter.Space();
-//			switch (continueStatement.ContinueType) {
-//				case ContinueType.Do:
-//					outputFormatter.PrintToken(Tokens.Do);
-//					break;
-//				case ContinueType.For:
-//					outputFormatter.PrintToken(Tokens.For);
-//					break;
-//				case ContinueType.While:
-//					outputFormatter.PrintToken(Tokens.While);
-//					break;
-//				default:
-//					outputFormatter.PrintToken(exitTokenStack.Peek());
-//					break;
-//			}
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitDoLoopStatement(DoLoopStatement doLoopStatement, object data)
-//		{
-//			if (doLoopStatement.ConditionPosition == ConditionPosition.None) {
-//				Error(String.Format("Unknown condition position for loop : {0}.", doLoopStatement), doLoopStatement.StartLocation);
-//			}
-//			
-//			if (doLoopStatement.ConditionPosition == ConditionPosition.Start) {
-//				switch (doLoopStatement.ConditionType) {
-//					case ConditionType.DoWhile:
-//						exitTokenStack.Push(Tokens.Do);
-//						outputFormatter.PrintToken(Tokens.Do);
-//						outputFormatter.Space();
-//						outputFormatter.PrintToken(Tokens.While);
-//						break;
-//					case ConditionType.While:
-//						exitTokenStack.Push(Tokens.While);
-//						outputFormatter.PrintToken(Tokens.While);
-//						break;
-//					case ConditionType.Until:
-//						exitTokenStack.Push(Tokens.Do);
-//						outputFormatter.PrintToken(Tokens.Do);
-//						outputFormatter.Space();
-//						outputFormatter.PrintToken(Tokens.While);
-//						break;
-//					default:
-//						throw new InvalidOperationException();
-//				}
-//				outputFormatter.Space();
-//				TrackedVisit(doLoopStatement.Condition, null);
-//			} else {
-//				exitTokenStack.Push(Tokens.Do);
-//				outputFormatter.PrintToken(Tokens.Do);
-//			}
-//			
-//			outputFormatter.NewLine();
-//			
-//			PrintIndentedBlock(doLoopStatement.EmbeddedStatement);
-//			
-//			outputFormatter.Indent();
-//			if (doLoopStatement.ConditionPosition == ConditionPosition.Start && doLoopStatement.ConditionType == ConditionType.While) {
-//				outputFormatter.PrintToken(Tokens.End);
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.While);
-//			} else {
-//				outputFormatter.PrintToken(Tokens.Loop);
-//			}
-//			
-//			if (doLoopStatement.ConditionPosition == ConditionPosition.End && !doLoopStatement.Condition.IsNull) {
-//				outputFormatter.Space();
-//				switch (doLoopStatement.ConditionType) {
-//					case ConditionType.While:
-//					case ConditionType.DoWhile:
-//						outputFormatter.PrintToken(Tokens.While);
-//						break;
-//					case ConditionType.Until:
-//						outputFormatter.PrintToken(Tokens.Until);
-//						break;
-//				}
-//				outputFormatter.Space();
-//				TrackedVisit(doLoopStatement.Condition, null);
-//			}
-//			exitTokenStack.Pop();
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitForeachStatement(ForeachStatement foreachStatement, object data)
-//		{
-//			exitTokenStack.Push(Tokens.For);
-//			outputFormatter.PrintToken(Tokens.For);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Each);
-//			outputFormatter.Space();
-//			
-//			// loop control variable
-//			outputFormatter.PrintIdentifier(foreachStatement.VariableName);
-//			if (!foreachStatement.TypeReference.IsNull) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.As);
-//				outputFormatter.Space();
-//				TrackedVisit(foreachStatement.TypeReference, data);
-//			}
-//			
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.In);
-//			outputFormatter.Space();
-//			
-//			TrackedVisit(foreachStatement.Expression, data);
-//			outputFormatter.NewLine();
-//			
-//			PrintIndentedBlock(foreachStatement.EmbeddedStatement);
-//			
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.Next);
-//			if (!foreachStatement.NextExpression.IsNull) {
-//				outputFormatter.Space();
-//				TrackedVisit(foreachStatement.NextExpression, data);
-//			}
-//			exitTokenStack.Pop();
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitLockStatement(LockStatement lockStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.SyncLock);
-//			outputFormatter.Space();
-//			TrackedVisit(lockStatement.LockExpression, data);
-//			outputFormatter.NewLine();
-//			
-//			PrintIndentedBlock(lockStatement.EmbeddedStatement);
-//			
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.End);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.SyncLock);
-//			return null;
-//		}
-//		
-//		bool isUsingResourceAcquisition;
-//		
-//		public override object TrackedVisitUsingStatement(UsingStatement usingStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.Using);
-//			outputFormatter.Space();
-//			
-//			isUsingResourceAcquisition = true;
-//			TrackedVisit(usingStatement.ResourceAcquisition, data);
-//			isUsingResourceAcquisition = false;
-//			outputFormatter.NewLine();
-//			
-//			PrintIndentedBlock(usingStatement.EmbeddedStatement);
-//			
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.End);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Using);
-//			
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitWithStatement(WithStatement withStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.With);
-//			outputFormatter.Space();
-//			TrackedVisit(withStatement.Expression, data);
-//			outputFormatter.NewLine();
-//			
-//			PrintIndentedBlock(withStatement.Body);
-//			
-//			outputFormatter.PrintToken(Tokens.End);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.With);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitTryCatchStatement(TryCatchStatement tryCatchStatement, object data)
-//		{
-//			exitTokenStack.Push(Tokens.Try);
-//			outputFormatter.PrintToken(Tokens.Try);
-//			outputFormatter.NewLine();
-//			
-//			PrintIndentedBlock(tryCatchStatement.StatementBlock);
-//			
-//			foreach (CatchClause catchClause in tryCatchStatement.CatchClauses) {
-//				TrackedVisit(catchClause, data);
-//			}
-//			
-//			if (!tryCatchStatement.FinallyBlock.IsNull) {
-//				outputFormatter.Indent();
-//				outputFormatter.PrintToken(Tokens.Finally);
-//				outputFormatter.NewLine();
-//				PrintIndentedBlock(tryCatchStatement.FinallyBlock);
-//			}
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.End);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Try);
-//			exitTokenStack.Pop();
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitCatchClause(CatchClause catchClause, object data)
-//		{
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.Catch);
-//			
-//			if (!catchClause.TypeReference.IsNull) {
-//				outputFormatter.Space();
-//				if (catchClause.VariableName.Length > 0) {
-//					outputFormatter.PrintIdentifier(catchClause.VariableName);
-//				} else {
-//					outputFormatter.PrintIdentifier("generatedExceptionName");
-//				}
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.As);
-//				outputFormatter.Space();
-//				outputFormatter.PrintIdentifier(catchClause.TypeReference.Type);
-//			}
-//			
-//			if (!catchClause.Condition.IsNull)  {
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.When);
-//				outputFormatter.Space();
-//				TrackedVisit(catchClause.Condition, data);
-//			}
-//			outputFormatter.NewLine();
-//			
-//			PrintIndentedBlock(catchClause.StatementBlock);
-//			
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitThrowStatement(ThrowStatement throwStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.Throw);
-//			if (!throwStatement.Expression.IsNull) {
-//				outputFormatter.Space();
-//				TrackedVisit(throwStatement.Expression, data);
-//			}
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitExitStatement(ExitStatement exitStatement, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.Exit);
-//			if (exitStatement.ExitType != ExitType.None) {
-//				outputFormatter.Space();
-//				switch (exitStatement.ExitType) {
-//					case ExitType.Sub:
-//						outputFormatter.PrintToken(Tokens.Sub);
-//						break;
-//					case ExitType.Function:
-//						outputFormatter.PrintToken(Tokens.Function);
-//						break;
-//					case ExitType.Property:
-//						outputFormatter.PrintToken(Tokens.Property);
-//						break;
-//					case ExitType.Do:
-//						outputFormatter.PrintToken(Tokens.Do);
-//						break;
-//					case ExitType.For:
-//						outputFormatter.PrintToken(Tokens.For);
-//						break;
-//					case ExitType.Try:
-//						outputFormatter.PrintToken(Tokens.Try);
-//						break;
-//					case ExitType.While:
-//						outputFormatter.PrintToken(Tokens.While);
-//						break;
-//					case ExitType.Select:
-//						outputFormatter.PrintToken(Tokens.Select);
-//						break;
-//					default:
-//						Error(String.Format("Unsupported exit type : {0}", exitStatement.ExitType), exitStatement.StartLocation);
-//						break;
-//				}
-//			}
-//			
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitForNextStatement(ForNextStatement forNextStatement, object data)
-//		{
-//			exitTokenStack.Push(Tokens.For);
-//			outputFormatter.PrintToken(Tokens.For);
-//			outputFormatter.Space();
-//			
-//			if (!forNextStatement.LoopVariableExpression.IsNull) {
-//				TrackedVisit(forNextStatement.LoopVariableExpression, data);
-//			} else {
-//				outputFormatter.PrintIdentifier(forNextStatement.VariableName);
-//				
-//				if (!forNextStatement.TypeReference.IsNull) {
-//					outputFormatter.Space();
-//					outputFormatter.PrintToken(Tokens.As);
-//					outputFormatter.Space();
-//					TrackedVisit(forNextStatement.TypeReference, data);
-//				}
-//			}
-//			
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Assign);
-//			outputFormatter.Space();
-//			
-//			TrackedVisit(forNextStatement.Start, data);
-//			
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.To);
-//			outputFormatter.Space();
-//			
-//			TrackedVisit(forNextStatement.End, data);
-//			
-//			if (!forNextStatement.Step.IsNull) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.Step);
-//				outputFormatter.Space();
-//				TrackedVisit(forNextStatement.Step, data);
-//			}
-//			outputFormatter.NewLine();
-//			
-//			PrintIndentedBlock(forNextStatement.EmbeddedStatement);
-//			
-//			outputFormatter.Indent();
-//			outputFormatter.PrintToken(Tokens.Next);
-//			
-//			if (forNextStatement.NextExpressions.Count > 0) {
-//				outputFormatter.Space();
-//				AppendCommaSeparatedList(forNextStatement.NextExpressions);
-//			}
-//			exitTokenStack.Pop();
-//			return null;
-//		}
-//		#endregion
-//		
-//		#region Expressions
-//		
-//		public override object TrackedVisitClassReferenceExpression(ClassReferenceExpression classReferenceExpression, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.MyClass);
-//			return null;
-//		}
-//		
-//		
-//		static string ConvertCharLiteral(char ch)
-//		{
-//			if (Char.IsControl(ch)) {
-//				string charName = GetCharName(ch);
-//				if (charName != null)
-//					return "ControlChars." + charName;
-//				else
-//					return "ChrW(" + ((int)ch).ToString() + ")";
-//			} else if (ch == '"') {
-//				return "\"\"\"\"C";
-//			} else {
-//				return "\"" + ch.ToString() + "\"C";
-//			}
-//		}
-//		
-//		static string GetCharName(char ch)
-//		{
-//			switch (ch) {
-//				case '\b':
-//					return "Back";
-//				case '\r':
-//					return "Cr";
-//				case '\f':
-//					return "FormFeed";
-//				case '\n':
-//					return "Lf";
-//				case '\0':
-//					return "NullChar";
-//				case '\t':
-//					return "Tab";
-//				case '\v':
-//					return "VerticalTab";
-//				default:
-//					return null;
-//			}
-//		}
-//		
-//		static string ConvertString(string str)
-//		{
-//			StringBuilder sb = new StringBuilder();
-//			bool inString = false;
-//			foreach (char ch in str) {
-//				if (char.IsControl(ch)) {
-//					if (inString) {
-//						sb.Append('"');
-//						inString = false;
-//					}
-//					if (sb.Length > 0)
-//						sb.Append(" & ");
-//					string charName = GetCharName(ch);
-//					if (charName != null)
-//						sb.Append("vb" + charName);
-//					else
-//						sb.Append("ChrW(" + ((int)ch) + ")");
-//				} else {
-//					if (!inString) {
-//						if (sb.Length > 0)
-//							sb.Append(" & ");
-//						sb.Append('"');
-//						inString = true;
-//					}
-//					if (ch == '"') {
-//						sb.Append("\"\"");
-//					} else {
-//						sb.Append(ch);
-//					}
-//				}
-//			}
-//			if (inString)
-//				sb.Append('"');
-//			if (sb.Length == 0)
-//				return "\"\"";
-//			return sb.ToString();
-//		}
-//		
-//		public override object TrackedVisitPrimitiveExpression(PrimitiveExpression primitiveExpression, object data)
-//		{
-//			outputFormatter.PrintText(ToVBNetString(primitiveExpression));
-//			return null;
-//		}
-//		
-//		internal static string ToVBNetString(PrimitiveExpression primitiveExpression)
-//		{
-//			object val = primitiveExpression.Value;
-//			if (val == null) {
-//				return "Nothing";
-//			}
-//			if (val is bool) {
-//				if ((bool)primitiveExpression.Value) {
-//					return "True";
-//				} else {
-//					return "False";
-//				}
-//			}
-//			
-//			if (val is string) {
-//				return ConvertString((string)val);
-//			}
-//			
-//			if (val is char) {
-//				return ConvertCharLiteral((char)primitiveExpression.Value);
-//			}
-//
-//			if (val is decimal) {
-//				return ((decimal)primitiveExpression.Value).ToString(NumberFormatInfo.InvariantInfo) + "D";
-//			}
-//			
-//			if (val is float) {
-//				return ((float)primitiveExpression.Value).ToString(NumberFormatInfo.InvariantInfo) + "F";
-//			}
-//			
-//			if (val is double) {
-//				string text = ((double)val).ToString(NumberFormatInfo.InvariantInfo);
-//				if (text.IndexOf('.') < 0 && text.IndexOf('E') < 0)
-//					return text + ".0";
-//				else
-//					return text;
-//			}
-//			
-//			if (val is IFormattable) {
-//				StringBuilder b = new StringBuilder();
-//				if (primitiveExpression.LiteralFormat == LiteralFormat.HexadecimalNumber) {
-//					b.Append("&H");
-//					b.Append(((IFormattable)val).ToString("x", NumberFormatInfo.InvariantInfo));
-//				} else {
-//					b.Append(((IFormattable)val).ToString(null, NumberFormatInfo.InvariantInfo));
-//				}
-//				if (val is ushort || val is uint || val is ulong) {
-//					b.Append('U');
-//					if (val is uint)
-//						b.Append('I');
-//				}
-//				if (val is long || val is ulong)
-//					b.Append('L');
-//				if (val is short || val is ushort)
-//					b.Append('S');
-//				return b.ToString();
-//			} else {
-//				return val.ToString();
-//			}
-//		}
-//		
-//		public override object TrackedVisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression, object data)
-//		{
-//			int  op = 0;
-//			switch (binaryOperatorExpression.Op) {
-//				case BinaryOperatorType.Concat:
-//					op = Tokens.ConcatString;
-//					break;
-//					
-//				case BinaryOperatorType.Add:
-//					op = Tokens.Plus;
-//					break;
-//					
-//				case BinaryOperatorType.Subtract:
-//					op = Tokens.Minus;
-//					break;
-//					
-//				case BinaryOperatorType.Multiply:
-//					op = Tokens.Times;
-//					break;
-//					
-//				case BinaryOperatorType.Divide:
-//					op = Tokens.Div;
-//					break;
-//					
-//				case BinaryOperatorType.DivideInteger:
-//					op = Tokens.DivInteger;
-//					break;
-//					
-//				case BinaryOperatorType.Modulus:
-//					op = Tokens.Mod;
-//					break;
-//					
-//				case BinaryOperatorType.ShiftLeft:
-//					op = Tokens.ShiftLeft;
-//					break;
-//					
-//				case BinaryOperatorType.ShiftRight:
-//					op = Tokens.ShiftRight;
-//					break;
-//					
-//				case BinaryOperatorType.BitwiseAnd:
-//					op = Tokens.And;
-//					break;
-//				case BinaryOperatorType.BitwiseOr:
-//					op = Tokens.Or;
-//					break;
-//				case BinaryOperatorType.ExclusiveOr:
-//					op = Tokens.Xor;
-//					break;
-//					
-//				case BinaryOperatorType.LogicalAnd:
-//					op = Tokens.AndAlso;
-//					break;
-//				case BinaryOperatorType.LogicalOr:
-//					op = Tokens.OrElse;
-//					break;
-//				case BinaryOperatorType.ReferenceEquality:
-//					op = Tokens.Is;
-//					break;
-//				case BinaryOperatorType.ReferenceInequality:
-//					op = Tokens.IsNot;
-//					break;
-//					
-//				case BinaryOperatorType.Equality:
-//					op = Tokens.Assign;
-//					break;
-//				case BinaryOperatorType.GreaterThan:
-//					op = Tokens.GreaterThan;
-//					break;
-//				case BinaryOperatorType.GreaterThanOrEqual:
-//					op = Tokens.GreaterEqual;
-//					break;
-//				case BinaryOperatorType.InEquality:
-//					op = Tokens.NotEqual;
-//					break;
-//				case BinaryOperatorType.NullCoalescing:
-//					outputFormatter.PrintText("If(");
-//					TrackedVisit(binaryOperatorExpression.Left, data);
-//					outputFormatter.PrintToken(Tokens.Comma);
-//					outputFormatter.Space();
-//					TrackedVisit(binaryOperatorExpression.Right, data);
-//					outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//					return null;
-//				case BinaryOperatorType.DictionaryAccess:
-//					{
-//						PrimitiveExpression pright = binaryOperatorExpression.Right as PrimitiveExpression;
-//						TrackedVisit(binaryOperatorExpression.Left, data);
-//						if (pright != null && pright.Value is string) {
-//							outputFormatter.PrintText("!" + (string)pright.Value);
-//						} else {
-//							outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//							TrackedVisit(binaryOperatorExpression.Right, data);
-//							outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//						}
-//						return null;
-//					}
-//				case BinaryOperatorType.LessThan:
-//					op = Tokens.LessThan;
-//					break;
-//				case BinaryOperatorType.LessThanOrEqual:
-//					op = Tokens.LessEqual;
-//					break;
-//			}
-//			
-//			
-//			BinaryOperatorExpression childBoe = binaryOperatorExpression.Left as BinaryOperatorExpression;
-//			bool requireParenthesis = childBoe != null && OperatorPrecedence.ComparePrecedenceVB(binaryOperatorExpression.Op, childBoe.Op) > 0;
-//			if (requireParenthesis)
-//				outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			TrackedVisit(binaryOperatorExpression.Left, data);
-//			if (requireParenthesis)
-//				outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(op);
-//			outputFormatter.Space();
-//			
-//			childBoe = binaryOperatorExpression.Right as BinaryOperatorExpression;
-//			requireParenthesis = childBoe != null && OperatorPrecedence.ComparePrecedenceVB(binaryOperatorExpression.Op, childBoe.Op) >= 0;
-//			if (requireParenthesis)
-//				outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			TrackedVisit(binaryOperatorExpression.Right, data);
-//			if (requireParenthesis)
-//				outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitParenthesizedExpression(ParenthesizedExpression parenthesizedExpression, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			TrackedVisit(parenthesizedExpression.Expression, data);
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitInvocationExpression(InvocationExpression invocationExpression, object data)
-//		{
-//			TrackedVisit(invocationExpression.TargetObject, data);
-//			outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			AppendCommaSeparatedList(invocationExpression.Arguments);
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			return null;
-//		}
-//		
-//		void PrintTypeArguments(List<TypeReference> typeArguments)
-//		{
-//			if (typeArguments != null && typeArguments.Count > 0) {
-//				outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//				outputFormatter.PrintToken(Tokens.Of);
-//				outputFormatter.Space();
-//				AppendCommaSeparatedList(typeArguments);
-//				outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			}
-//		}
-//		
-//		public override object TrackedVisitIdentifierExpression(SimpleNameExpression identifierExpression, object data)
-//		{
-//			outputFormatter.PrintIdentifier(identifierExpression.Identifier);
-//			PrintTypeArguments(identifierExpression.TypeArguments);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitTypeReferenceExpression(TypeReferenceExpression typeReferenceExpression, object data)
-//		{
-//			TrackedVisit(typeReferenceExpression.TypeReference, data);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitUnaryOperatorExpression(UnaryOperatorExpression unaryOperatorExpression, object data)
-//		{
-//			switch (unaryOperatorExpression.Op) {
-//				case UnaryOperatorType.Not:
-//				case UnaryOperatorType.BitNot:
-//					outputFormatter.PrintToken(Tokens.Not);
-//					outputFormatter.Space();
-//					TrackedVisit(unaryOperatorExpression.Expression, data);
-//					return null;
-//					
-//				case UnaryOperatorType.Decrement:
-//					outputFormatter.PrintText("System.Threading.Interlocked.Decrement(");
-//					TrackedVisit(unaryOperatorExpression.Expression, data);
-//					outputFormatter.PrintText(")");
-//					return null;
-//					
-//				case UnaryOperatorType.Increment:
-//					outputFormatter.PrintText("System.Threading.Interlocked.Increment(");
-//					TrackedVisit(unaryOperatorExpression.Expression, data);
-//					outputFormatter.PrintText(")");
-//					return null;
-//					
-//				case UnaryOperatorType.Minus:
-//					outputFormatter.PrintToken(Tokens.Minus);
-//					TrackedVisit(unaryOperatorExpression.Expression, data);
-//					return null;
-//					
-//				case UnaryOperatorType.Plus:
-//					outputFormatter.PrintToken(Tokens.Plus);
-//					TrackedVisit(unaryOperatorExpression.Expression, data);
-//					return null;
-//					
-//				case UnaryOperatorType.PostDecrement:
-//					outputFormatter.PrintText("System.Math.Max(System.Threading.Interlocked.Decrement(");
-//					TrackedVisit(unaryOperatorExpression.Expression, data);
-//					outputFormatter.PrintText("),");
-//					TrackedVisit(unaryOperatorExpression.Expression, data);
-//					outputFormatter.PrintText(" + 1)");
-//					return null;
-//					
-//				case UnaryOperatorType.PostIncrement:
-//					outputFormatter.PrintText("System.Math.Max(System.Threading.Interlocked.Increment(");
-//					TrackedVisit(unaryOperatorExpression.Expression, data);
-//					outputFormatter.PrintText("),");
-//					TrackedVisit(unaryOperatorExpression.Expression, data);
-//					outputFormatter.PrintText(" - 1)");
-//					return null;
-//					
-//				case UnaryOperatorType.Dereference:
-//					outputFormatter.PrintToken(Tokens.Times);
-//					TrackedVisit(unaryOperatorExpression.Expression, data);
-//					return null;
-//				case UnaryOperatorType.AddressOf:
-//					outputFormatter.PrintToken(Tokens.AddressOf);
-//					TrackedVisit(unaryOperatorExpression.Expression, data);
-//					return null;
-//				default:
-//					Error("unknown unary operator: " + unaryOperatorExpression.Op.ToString(), unaryOperatorExpression.StartLocation);
-//					outputFormatter.PrintText(unaryOperatorExpression.Op.ToString());
-//					outputFormatter.PrintText("(");
-//					TrackedVisit(unaryOperatorExpression.Expression, data);
-//					outputFormatter.PrintText(")");
-//					return null;
-//			}
-//		}
-//		
-//		public override object TrackedVisitAssignmentExpression(AssignmentExpression assignmentExpression, object data)
-//		{
-//			int  op = 0;
-//			bool unsupportedOpAssignment = false;
-//			switch (assignmentExpression.Op) {
-//				case AssignmentOperatorType.Assign:
-//					op = Tokens.Assign;
-//					break;
-//				case AssignmentOperatorType.Add:
-//					op = Tokens.PlusAssign;
-//					break;
-//				case AssignmentOperatorType.Subtract:
-//					op = Tokens.MinusAssign;
-//					break;
-//				case AssignmentOperatorType.Multiply:
-//					op = Tokens.TimesAssign;
-//					break;
-//				case AssignmentOperatorType.Divide:
-//					op = Tokens.DivAssign;
-//					break;
-//				case AssignmentOperatorType.ShiftLeft:
-//					op = Tokens.ShiftLeftAssign;
-//					break;
-//				case AssignmentOperatorType.ShiftRight:
-//					op = Tokens.ShiftRightAssign;
-//					break;
-//					
-//				case AssignmentOperatorType.ExclusiveOr:
-//					op = Tokens.Xor;
-//					unsupportedOpAssignment = true;
-//					break;
-//				case AssignmentOperatorType.Modulus:
-//					op = Tokens.Mod;
-//					unsupportedOpAssignment = true;
-//					break;
-//				case AssignmentOperatorType.BitwiseAnd:
-//					op = Tokens.And;
-//					unsupportedOpAssignment = true;
-//					break;
-//				case AssignmentOperatorType.BitwiseOr:
-//					op = Tokens.Or;
-//					unsupportedOpAssignment = true;
-//					break;
-//			}
-//			
-//			TrackedVisit(assignmentExpression.Left, data);
-//			outputFormatter.Space();
-//			
-//			if (unsupportedOpAssignment) { // left = left OP right
-//				outputFormatter.PrintToken(Tokens.Assign);
-//				outputFormatter.Space();
-//				TrackedVisit(assignmentExpression.Left, data);
-//				outputFormatter.Space();
-//			}
-//			
-//			outputFormatter.PrintToken(op);
-//			outputFormatter.Space();
-//			TrackedVisit(assignmentExpression.Right, data);
-//			
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitTypeOfExpression(TypeOfExpression typeOfExpression, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.GetType);
-//			outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			TrackedVisit(typeOfExpression.TypeReference, data);
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitDefaultValueExpression(DefaultValueExpression defaultValueExpression, object data)
-//		{
-//			// assigning nothing to a generic type in VB compiles to a DefaultValueExpression
-//			outputFormatter.PrintToken(Tokens.Nothing);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitTypeOfIsExpression(TypeOfIsExpression typeOfIsExpression, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.TypeOf);
-//			outputFormatter.Space();
-//			TrackedVisit(typeOfIsExpression.Expression, data);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Is);
-//			outputFormatter.Space();
-//			TrackedVisit(typeOfIsExpression.TypeReference, data);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitAddressOfExpression(AddressOfExpression addressOfExpression, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.AddressOf);
-//			outputFormatter.Space();
-//			TrackedVisit(addressOfExpression.Expression, data);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitCastExpression(CastExpression castExpression, object data)
-//		{
-//			if (castExpression.CastType == CastType.TryCast) {
-//				return PrintCast(Tokens.TryCast, castExpression);
-//			}
-//			if (castExpression.CastType == CastType.Cast || castExpression.CastTo.IsArrayType) {
-//				return PrintCast(Tokens.DirectCast, castExpression);
-//			}
-//			switch (castExpression.CastTo.Type) {
-//				case "System.Boolean":
-//					outputFormatter.PrintToken(Tokens.CBool);
-//					break;
-//				case "System.Byte":
-//					outputFormatter.PrintToken(Tokens.CByte);
-//					break;
-//				case "System.SByte":
-//					outputFormatter.PrintToken(Tokens.CSByte);
-//					break;
-//				case "System.Char":
-//					outputFormatter.PrintToken(Tokens.CChar);
-//					break;
-//				case "System.DateTime":
-//					outputFormatter.PrintToken(Tokens.CDate);
-//					break;
-//				case "System.Decimal":
-//					outputFormatter.PrintToken(Tokens.CDec);
-//					break;
-//				case "System.Double":
-//					outputFormatter.PrintToken(Tokens.CDbl);
-//					break;
-//				case "System.Int16":
-//					outputFormatter.PrintToken(Tokens.CShort);
-//					break;
-//				case "System.Int32":
-//					outputFormatter.PrintToken(Tokens.CInt);
-//					break;
-//				case "System.Int64":
-//					outputFormatter.PrintToken(Tokens.CLng);
-//					break;
-//				case "System.UInt16":
-//					outputFormatter.PrintToken(Tokens.CUShort);
-//					break;
-//				case "System.UInt32":
-//					outputFormatter.PrintToken(Tokens.CUInt);
-//					break;
-//				case "System.UInt64":
-//					outputFormatter.PrintToken(Tokens.CULng);
-//					break;
-//				case "System.Object":
-//					outputFormatter.PrintToken(Tokens.CObj);
-//					break;
-//				case "System.Single":
-//					outputFormatter.PrintToken(Tokens.CSng);
-//					break;
-//				case "System.String":
-//					outputFormatter.PrintToken(Tokens.CStr);
-//					break;
-//				default:
-//					return PrintCast(Tokens.CType, castExpression);
-//			}
-//			outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			TrackedVisit(castExpression.Expression, data);
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			return null;
-//		}
-//		
-//		object PrintCast(int castToken, CastExpression castExpression)
-//		{
-//			outputFormatter.PrintToken(castToken);
-//			outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			TrackedVisit(castExpression.Expression, null);
-//			outputFormatter.PrintToken(Tokens.Comma);
-//			outputFormatter.Space();
-//			TrackedVisit(castExpression.CastTo, null);
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitThisReferenceExpression(ThisReferenceExpression thisReferenceExpression, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.Me);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitBaseReferenceExpression(BaseReferenceExpression baseReferenceExpression, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.MyBase);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitObjectCreateExpression(ObjectCreateExpression objectCreateExpression, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.New);
-//			if (!objectCreateExpression.IsAnonymousType) {
-//				outputFormatter.Space();
-//				TrackedVisit(objectCreateExpression.CreateType, data);
-//				outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//				AppendCommaSeparatedList(objectCreateExpression.Parameters);
-//				outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			}
-//			CollectionInitializerExpression initializer = objectCreateExpression.ObjectInitializer;
-//			if (!initializer.IsNull) {
-//				outputFormatter.Space();
-//				if (initializer.CreateExpressions.Any(ce => ce is MemberInitializerExpression))
-//					outputFormatter.PrintToken(Tokens.With);
-//				else
-//					outputFormatter.PrintToken(Tokens.From);
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.OpenCurlyBrace);
-//				outputFormatter.IndentationLevel++;
-//				for (int i = 0; i < initializer.CreateExpressions.Count; i++) {
-//					Expression expr = initializer.CreateExpressions[i];
-//					if (i > 0)
-//						outputFormatter.PrintToken(Tokens.Comma);
-//					outputFormatter.PrintLineContinuation();
-//					outputFormatter.Indent();
-//					TrackedVisit(expr, data);
-//				}
-//				outputFormatter.IndentationLevel--;
-//				outputFormatter.PrintLineContinuation();
-//				outputFormatter.Indent();
-//				outputFormatter.PrintToken(Tokens.CloseCurlyBrace);
-//			}
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitArrayCreateExpression(ArrayCreateExpression arrayCreateExpression, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.New);
-//			outputFormatter.Space();
-//			PrintTypeReferenceWithoutArray(arrayCreateExpression.CreateType);
-//			
-//			if (arrayCreateExpression.Arguments.Count > 0) {
-//				outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//				AppendCommaSeparatedList(arrayCreateExpression.Arguments);
-//				outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//				PrintArrayRank(arrayCreateExpression.CreateType.RankSpecifier, 1);
-//			} else {
-//				PrintArrayRank(arrayCreateExpression.CreateType.RankSpecifier, 0);
-//			}
-//			
-//			outputFormatter.Space();
-//			
-//			if (arrayCreateExpression.ArrayInitializer.IsNull) {
-//				outputFormatter.PrintToken(Tokens.OpenCurlyBrace);
-//				outputFormatter.PrintToken(Tokens.CloseCurlyBrace);
-//			} else {
-//				TrackedVisit(arrayCreateExpression.ArrayInitializer, data);
-//			}
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitCollectionInitializerExpression(CollectionInitializerExpression arrayInitializerExpression, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.OpenCurlyBrace);
-//			this.AppendCommaSeparatedList(arrayInitializerExpression.CreateExpressions);
-//			outputFormatter.PrintToken(Tokens.CloseCurlyBrace);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitMemberInitializerExpression(MemberInitializerExpression memberInitializerExpression, object data)
-//		{
-//			if (memberInitializerExpression.IsKey) {
-//				outputFormatter.PrintToken(Tokens.Key);
-//				outputFormatter.Space();
-//			}
-//			outputFormatter.PrintToken(Tokens.Dot);
-//			outputFormatter.PrintIdentifier(memberInitializerExpression.Name);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Assign);
-//			outputFormatter.Space();
-//			TrackedVisit(memberInitializerExpression.Expression, data);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitMemberReferenceExpression(MemberReferenceExpression memberReferenceExpression, object data)
-//		{
-//			TrackedVisit(memberReferenceExpression.TargetObject, data);
-//			outputFormatter.PrintToken(Tokens.Dot);
-//			if (string.Equals(memberReferenceExpression.MemberName, "New", StringComparison.OrdinalIgnoreCase)
-//			    && (memberReferenceExpression.TargetObject is BaseReferenceExpression || memberReferenceExpression.TargetObject is ThisReferenceExpression || memberReferenceExpression.TargetObject is ClassReferenceExpression))
-//			{
-//				outputFormatter.PrintToken(Tokens.New);
-//			} else {
-//				outputFormatter.PrintIdentifier(memberReferenceExpression.MemberName);
-//			}
-//			PrintTypeArguments(memberReferenceExpression.TypeArguments);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitDirectionExpression(DirectionExpression directionExpression, object data)
-//		{
-//			// VB does not need to specify the direction in method calls
-//			TrackedVisit(directionExpression.Expression, data);
-//			return null;
-//		}
-//		
-//		
-//		public override object TrackedVisitConditionalExpression(ConditionalExpression conditionalExpression, object data)
-//		{
-//			outputFormatter.PrintText("If");
-//			outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			TrackedVisit(conditionalExpression.Condition, data);
-//			outputFormatter.PrintToken(Tokens.Comma);
-//			outputFormatter.Space();
-//			TrackedVisit(conditionalExpression.TrueExpression, data);
-//			outputFormatter.PrintToken(Tokens.Comma);
-//			outputFormatter.Space();
-//			TrackedVisit(conditionalExpression.FalseExpression, data);
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			return null;
-//		}
-//		
-//		#endregion
-//		#endregion
-//		
-//		
-//		void OutputModifier(ParameterModifiers modifier)
-//		{
-//			if ((modifier & ParameterModifiers.Optional) == ParameterModifiers.Optional) {
-//				outputFormatter.PrintToken(Tokens.Optional);
-//				outputFormatter.Space();
-//			}
-//			if ((modifier & ParameterModifiers.Ref) == ParameterModifiers.Ref
-//			    || (modifier & ParameterModifiers.Out) == ParameterModifiers.Out) {
-//				outputFormatter.PrintToken(Tokens.ByRef);
-//				outputFormatter.Space();
-//			}
-//			if ((modifier & ParameterModifiers.Params) == ParameterModifiers.Params) {
-//				outputFormatter.PrintToken(Tokens.ParamArray);
-//				outputFormatter.Space();
-//			}
-//			if (prettyPrintOptions.OutputByValModifier &&
-//			    (modifier & (ParameterModifiers.Params | ParameterModifiers.Ref)) == ParameterModifiers.None)
-//			{
-//				outputFormatter.PrintToken(Tokens.ByVal);
-//				outputFormatter.Space();
-//			}
-//		}
-//		
-//		void OutputModifier(Modifiers modifier)
-//		{
-//			OutputModifier(modifier, false, false);
-//		}
-//		
-//		void OutputModifier(Modifiers modifier, bool forTypeDecl, bool forFieldDecl)
-//		{
-//			if ((modifier & Modifiers.Public) == Modifiers.Public) {
-//				outputFormatter.PrintToken(Tokens.Public);
-//				outputFormatter.Space();
-//			} else if ((modifier & Modifiers.Private) == Modifiers.Private) {
-//				outputFormatter.PrintToken(Tokens.Private);
-//				outputFormatter.Space();
-//			} else if ((modifier & (Modifiers.Protected | Modifiers.Internal)) == (Modifiers.Protected | Modifiers.Internal)) {
-//				outputFormatter.PrintToken(Tokens.Protected);
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.Friend);
-//				outputFormatter.Space();
-//			} else if ((modifier & Modifiers.Internal) == Modifiers.Internal) {
-//				outputFormatter.PrintToken(Tokens.Friend);
-//				outputFormatter.Space();
-//			} else if ((modifier & Modifiers.Protected) == Modifiers.Protected) {
-//				outputFormatter.PrintToken(Tokens.Protected);
-//				outputFormatter.Space();
-//			}
-//			
-//			if ((modifier & Modifiers.Static) == Modifiers.Static) {
-//				outputFormatter.PrintToken(Tokens.Shared);
-//				outputFormatter.Space();
-//			}
-//			if ((modifier & Modifiers.Virtual) == Modifiers.Virtual) {
-//				outputFormatter.PrintToken(Tokens.Overridable);
-//				outputFormatter.Space();
-//			}
-//			if ((modifier & Modifiers.Abstract) == Modifiers.Abstract) {
-//				if (forFieldDecl)
-//					outputFormatter.PrintToken(Tokens.Dim);
-//				else if (forTypeDecl)
-//					outputFormatter.PrintToken(Tokens.MustInherit);
-//				else
-//					outputFormatter.PrintToken(Tokens.MustOverride);
-//				outputFormatter.Space();
-//			}
-//			if ((modifier & Modifiers.Dim) == Modifiers.Dim) {
-//				outputFormatter.PrintToken(Tokens.Dim);
-//				outputFormatter.Space();
-//			}
-//			if ((modifier & Modifiers.Overloads) == Modifiers.Overloads) {
-//				outputFormatter.PrintToken(Tokens.Overloads);
-//				outputFormatter.Space();
-//			}
-//			if ((modifier & Modifiers.Override) == Modifiers.Override) {
-//				outputFormatter.PrintToken(Tokens.Overrides);
-//				outputFormatter.Space();
-//			}
-//			if ((modifier & Modifiers.New) == Modifiers.New) {
-//				outputFormatter.PrintToken(Tokens.Shadows);
-//				outputFormatter.Space();
-//			}
-//			
-//			if ((modifier & Modifiers.Sealed) == Modifiers.Sealed) {
-//				outputFormatter.PrintToken(forTypeDecl ? Tokens.NotInheritable : Tokens.NotOverridable);
-//				outputFormatter.Space();
-//			}
-//			
-//			if ((modifier & Modifiers.ReadOnly) == Modifiers.ReadOnly) {
-//				outputFormatter.PrintToken(Tokens.ReadOnly);
-//				outputFormatter.Space();
-//			}
-//			if ((modifier & Modifiers.WriteOnly) == Modifiers.WriteOnly) {
-//				outputFormatter.PrintToken(Tokens.WriteOnly);
-//				outputFormatter.Space();
-//			}
-//			if ((modifier & Modifiers.Const) == Modifiers.Const) {
-//				outputFormatter.PrintToken(Tokens.Const);
-//				outputFormatter.Space();
-//			}
-//			if ((modifier & Modifiers.WithEvents) == Modifiers.WithEvents) {
-//				outputFormatter.PrintToken(Tokens.WithEvents);
-//				outputFormatter.Space();
-//			}
-//			if ((modifier & Modifiers.Partial) == Modifiers.Partial) {
-//				outputFormatter.PrintToken(Tokens.Partial);
-//				outputFormatter.Space();
-//			}
-//			
-//			if ((modifier & Modifiers.Extern) == Modifiers.Extern) {
-//				// not required in VB
-//			}
-//			
-//			if ((modifier & Modifiers.Default) == Modifiers.Default) {
-//				outputFormatter.PrintToken(Tokens.Default);
-//				outputFormatter.Space();
-//			}
-//			
-//			if ((modifier & Modifiers.Volatile) == Modifiers.Volatile) {
-//				Error("'Volatile' modifier not convertable", Location.Empty);
-//			}
-//			
-//			if ((modifier & Modifiers.Unsafe) == Modifiers.Unsafe) {
-//				Error("'Unsafe' modifier not convertable", Location.Empty);
-//			}
-//		}
-//		
-//		public void AppendCommaSeparatedList<T>(ICollection<T> list) where T : class, INode
-//		{
-//			if (list != null) {
-//				int i = 0;
-//				foreach (T node in list) {
-//					TrackedVisit(node, null);
-//					if (i + 1 < list.Count) {
-//						outputFormatter.PrintToken(Tokens.Comma);
-//						outputFormatter.Space();
-//						if ((i + 1) % 6 == 0) {
-//							outputFormatter.PrintLineContinuation();
-//							outputFormatter.Indent();
-//							outputFormatter.PrintText("\t");
-//						}
-//					}
-//					i++;
-//				}
-//			}
-//		}
-//		
-//		void VisitAttributes(ICollection attributes, object data)
-//		{
-//			if (attributes == null) {
-//				return;
-//			}
-//			foreach (AttributeSection section in attributes) {
-//				if (string.Equals(section.AttributeTarget, "return", StringComparison.OrdinalIgnoreCase))
-//					continue;
-//				TrackedVisit(section, data);
-//			}
-//		}
-//		
-//		void VisitReturnTypeAttributes(ICollection attributes, object data)
-//		{
-//			if (attributes == null) {
-//				return;
-//			}
-//			printAttributeSectionInline = true;
-//			foreach (AttributeSection section in attributes) {
-//				if (string.Equals(section.AttributeTarget, "return", StringComparison.OrdinalIgnoreCase)) {
-//					TrackedVisit(section, data);
-//				}
-//			}
-//			printAttributeSectionInline = false;
-//		}
-//		
-//		public override object TrackedVisitLambdaExpression(LambdaExpression lambdaExpression, object data)
-//		{
-//			bool isSub = !lambdaExpression.ReturnType.IsNull &&
-//				lambdaExpression.ReturnType.Type == "System.Void" && lambdaExpression.ReturnType.IsKeyword;
-//			
-//			if (isSub)
-//				outputFormatter.PrintToken(Tokens.Sub);
-//			else
-//				outputFormatter.PrintToken(Tokens.Function);
-//			
-//			outputFormatter.PrintToken(Tokens.OpenParenthesis);
-//			AppendCommaSeparatedList(lambdaExpression.Parameters);
-//			outputFormatter.PrintToken(Tokens.CloseParenthesis);
-//			
-//			outputFormatter.Space();
-//			
-//			if (!lambdaExpression.ExpressionBody.IsNull) {
-//				return lambdaExpression.ExpressionBody.AcceptVisitor(this, data);
-//			} else {
-//				if (!isSub && !lambdaExpression.ReturnType.IsNull) {
-//					outputFormatter.PrintToken(Tokens.As);
-//					outputFormatter.Space();
-//					TrackedVisit(lambdaExpression.ReturnType, data);
-//				}
-//				
-//				if (lambdaExpression.StatementBody is BlockStatement)
-//					outputFormatter.NewLine();
-//				
-//				TrackedVisit(lambdaExpression.StatementBody, data);
-//				
-//				if (lambdaExpression.StatementBody is BlockStatement) {
-//					outputFormatter.NewLine();
-//					outputFormatter.PrintToken(Tokens.End);
-//					outputFormatter.Space();
-//					if (isSub)
-//						outputFormatter.PrintToken(Tokens.Sub);
-//					else
-//						outputFormatter.PrintToken(Tokens.Function);
-//				}
-//				
-//				return null;
-//			}
-//		}
-//		
-//		public override object TrackedVisitQueryExpression(QueryExpression queryExpression, object data)
-//		{
-//			outputFormatter.IndentationLevel++;
-//			for (int i = 0; i < queryExpression.Clauses.Count; i++) {
-//				QueryExpressionClause clause = queryExpression.Clauses[i];
-//				if (!clause.IsNull) {
-//					if (i != 0) {
-//						outputFormatter.PrintLineContinuation();
-//						outputFormatter.Indent();
-//					}
-//					clause.AcceptVisitor(this, null);
-//				}
-//			}
-//			outputFormatter.IndentationLevel--;
-//			return null;
-//		}
-//		
-//		void PrintClause(QueryExpressionClause clause)
-//		{
-//
-//		}
-//		
-//		public override object TrackedVisitQueryExpressionFromClause(QueryExpressionFromClause fromClause, object data)
-//		{
-//			outputFormatter.PrintText("From");
-//			outputFormatter.Space();
-//			for (int i = 0; i < fromClause.Sources.Count; i++) {
-//				CollectionRangeVariable clause = fromClause.Sources[i];
-//				outputFormatter.PrintIdentifier(clause.Identifier);
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.In);
-//				outputFormatter.Space();
-//				clause.Expression.AcceptVisitor(this, data);
-//				if (i < fromClause.Sources.Count - 1)
-//					outputFormatter.PrintToken(Tokens.Comma);
-//			}
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitQueryExpressionJoinClause(QueryExpressionJoinClause joinClause, object data)
-//		{
-//			outputFormatter.PrintText("Join");
-//			outputFormatter.Space();
-//			CollectionRangeVariable clause = joinClause.Source;
-//			outputFormatter.PrintIdentifier(clause.Identifier);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.In);
-//			outputFormatter.Space();
-//			clause.Expression.AcceptVisitor(this, data);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.On);
-//			outputFormatter.Space();
-//			joinClause.OnExpression.AcceptVisitor(this, data);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Assign);
-//			outputFormatter.Space();
-//			joinClause.EqualsExpression.AcceptVisitor(this, data);
-//			if (!string.IsNullOrEmpty(joinClause.IntoIdentifier)) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintText("Into");
-//				outputFormatter.Space();
-//				outputFormatter.PrintIdentifier(joinClause.IntoIdentifier);
-//			}
-//			return null;
-//		}
-//		
-////		void VisitQueryExpressionFromOrJoinClause(QueryExpressionFromOrJoinClause clause, object data)
-////		{
-////			outputFormatter.PrintIdentifier(clause.Identifier);
-////			outputFormatter.Space();
-////			outputFormatter.PrintToken(Tokens.In);
-////			outputFormatter.Space();
-////			clause.InExpression.AcceptVisitor(this, data);
-////		}
-//		
-//		public override object TrackedVisitQueryExpressionLetClause(QueryExpressionLetClause letClause, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.Let);
-//			outputFormatter.Space();
-//			outputFormatter.PrintIdentifier(letClause.Identifier);
-//			outputFormatter.Space();
-//			outputFormatter.PrintToken(Tokens.Assign);
-//			outputFormatter.Space();
-//			return letClause.Expression.AcceptVisitor(this, data);
-//		}
-//		
-//		public override object TrackedVisitQueryExpressionGroupClause(QueryExpressionGroupClause groupClause, object data)
-//		{
-//			outputFormatter.PrintText("Group");
-//			outputFormatter.Space();
-//			groupClause.Projection.AcceptVisitor(this, data);
-//			outputFormatter.Space();
-//			outputFormatter.PrintText("By");
-//			outputFormatter.Space();
-//			return groupClause.GroupBy.AcceptVisitor(this, data);
-//		}
-//		
-//		public override object TrackedVisitQueryExpressionOrderClause(QueryExpressionOrderClause queryExpressionOrderClause, object data)
-//		{
-//			outputFormatter.PrintText("Order By");
-//			outputFormatter.Space();
-//			AppendCommaSeparatedList(queryExpressionOrderClause.Orderings);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitQueryExpressionOrdering(QueryExpressionOrdering ordering, object data)
-//		{
-//			ordering.Criteria.AcceptVisitor(this, data);
-//			if (ordering.Direction == QueryExpressionOrderingDirection.Ascending) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintText("Ascending");
-//			} else if (ordering.Direction == QueryExpressionOrderingDirection.Descending) {
-//				outputFormatter.Space();
-//				outputFormatter.PrintText("Descending");
-//			}
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitQueryExpressionSelectVBClause(QueryExpressionSelectVBClause selectClause, object data)
-//		{
-//			outputFormatter.PrintToken(Tokens.Select);
-//			outputFormatter.Space();
-//			foreach (ExpressionRangeVariable var in selectClause.Variables) {
-//				var.AcceptVisitor(this, data);
-//			}
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitQueryExpressionWhereClause(QueryExpressionWhereClause whereClause, object data)
-//		{
-//			outputFormatter.Space();
-//			outputFormatter.PrintText("Where");
-//			outputFormatter.Space();
-//			return whereClause.Condition.AcceptVisitor(this, data);
-//		}
-//		
-//		public override object TrackedVisitExternAliasDirective(ExternAliasDirective externAliasDirective, object data)
-//		{
-//			UnsupportedNode(externAliasDirective);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitXmlContentExpression(XmlContentExpression xmlContentExpression, object data)
-//		{
-//			switch (xmlContentExpression.Type) {
-//				case XmlContentType.Comment:
-//					outputFormatter.PrintText("<!--" + xmlContentExpression.Content + "-->");
-//					break;
-//				case XmlContentType.Text:
-//					outputFormatter.PrintText(xmlContentExpression.Content);
-//					break;
-//				case XmlContentType.CData:
-//					outputFormatter.PrintText("<![CDATA[" + xmlContentExpression.Content + "]]>");
-//					break;
-//				case XmlContentType.ProcessingInstruction:
-//					outputFormatter.PrintText("<?" + xmlContentExpression.Content + "?>");
-//					break;
-//				default:
-//					throw new Exception("Invalid value for XmlContentType");
-//			}
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitXmlEmbeddedExpression(XmlEmbeddedExpression xmlEmbeddedExpression, object data)
-//		{
-//			outputFormatter.PrintText("<%=");
-//			outputFormatter.Space();
-//			xmlEmbeddedExpression.InlineVBExpression.AcceptVisitor(this, data);
-//			outputFormatter.Space();
-//			outputFormatter.PrintText("%>");
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitXmlAttributeExpression(XmlAttributeExpression xmlAttributeExpression, object data)
-//		{
-//			outputFormatter.PrintText(xmlAttributeExpression.Name);
-//			outputFormatter.PrintToken(Tokens.Assign);
-//			if (xmlAttributeExpression.IsLiteralValue) {
-//				if (xmlAttributeExpression.UseDoubleQuotes)
-//					outputFormatter.PrintText("\"");
-//				else
-//					outputFormatter.PrintText("'");
-//				outputFormatter.PrintText(xmlAttributeExpression.LiteralValue);
-//				if (xmlAttributeExpression.UseDoubleQuotes)
-//					outputFormatter.PrintText("\"");
-//				else
-//					outputFormatter.PrintText("'");
-//			} else
-//				xmlAttributeExpression.ExpressionValue.AcceptVisitor(this, data);
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitXmlElementExpression(XmlElementExpression xmlElementExpression, object data)
-//		{
-//			outputFormatter.PrintText("<");
-//			if (xmlElementExpression.NameIsExpression) {
-//				outputFormatter.PrintToken(Tokens.XmlStartInlineVB);
-//				outputFormatter.Space();
-//				xmlElementExpression.NameExpression.AcceptVisitor(this, data);
-//				outputFormatter.Space();
-//				outputFormatter.PrintToken(Tokens.XmlEndInlineVB);
-//			} else {
-//				outputFormatter.PrintText(xmlElementExpression.XmlName);
-//			}
-//			foreach (XmlExpression attribute in xmlElementExpression.Attributes) {
-//				outputFormatter.Space();
-//				attribute.AcceptVisitor(this, data);
-//			}
-//			if (xmlElementExpression.Children.Any()) {
-//				outputFormatter.PrintText(">");
-//				foreach (INode node in xmlElementExpression.Children) {
-//					node.AcceptVisitor(this, data);
-//				}
-//				outputFormatter.PrintText("</");
-//				if (!xmlElementExpression.NameIsExpression)
-//					outputFormatter.PrintText(xmlElementExpression.XmlName);
-//				outputFormatter.PrintText(">");
-//			} else {
-//				outputFormatter.Space();
-//				outputFormatter.PrintText("/>");
-//			}
-//			return null;
-//		}
-//		
-//		public override object TrackedVisitXmlMemberAccessExpression(XmlMemberAccessExpression xmlMemberAccessExpression, object data)
-//		{
-//			xmlMemberAccessExpression.TargetObject.AcceptVisitor(this, data);
-//			switch (xmlMemberAccessExpression.AxisType) {
-//				case XmlAxisType.Element:
-//					outputFormatter.PrintToken(Tokens.Dot);
-//					break;
-//				case XmlAxisType.Attribute:
-//					outputFormatter.PrintToken(Tokens.DotAt);
-//					break;
-//				case XmlAxisType.Descendents:
-//					outputFormatter.PrintToken(Tokens.TripleDot);
-//					break;
-//				default:
-//					throw new Exception("Invalid value for XmlAxisType");
-//			}
-//			if (xmlMemberAccessExpression.IsXmlIdentifier)
-//				outputFormatter.PrintText("<" + xmlMemberAccessExpression.Identifier + ">");
-//			else
-//				outputFormatter.PrintIdentifier(xmlMemberAccessExpression.Identifier);
-//			return null;
-//		}
-//	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/VBNet/VBNetPrettyPrintOptions.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/VBNet/VBNetPrettyPrintOptions.cs
deleted file mode 100644
index 8178afde06..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/PrettyPrinter/VBNet/VBNetPrettyPrintOptions.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.NRefactory.VB.PrettyPrinter
-{
-	/// <summary>
-	/// Description of VBNetPrettyPrintOptions.
-	/// </summary>
-	public class VBNetPrettyPrintOptions : AbstractPrettyPrintOptions
-	{
-		/// <summary>
-		/// Gets/Sets if the optional "ByVal" modifier should be written.
-		/// </summary>
-		public bool OutputByValModifier { get; set; }
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Properties/AssemblyInfo.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Properties/AssemblyInfo.cs
deleted file mode 100644
index 98785222b7..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-#region Using directives
-
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-#endregion
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ICSharpCode.NRefactory.VB")]
-[assembly: AssemblyDescription("VB syntax tree")]
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/VBParser.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/VBParser.cs
deleted file mode 100644
index 5f62f952ae..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/VBParser.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-
-using ICSharpCode.NRefactory.VB.Ast;
-using ICSharpCode.NRefactory.VB.Parser;
-
-namespace ICSharpCode.NRefactory.VB
-{
-	public enum SnippetType
-	{
-		None,
-		CompilationUnit,
-		Expression,
-		Statements,
-		TypeMembers
-	}
-	
-	public class VBParser
-	{
-		bool hasErrors;
-		Errors errors;
-		
-		public CompilationUnit Parse(string content)
-		{
-			return Parse(new StringReader(content));
-		}
-		
-		public CompilationUnit Parse(TextReader reader)
-		{
-			var parser = new ICSharpCode.NRefactory.VB.Parser.VBParser(new VBLexer(reader));
-			parser.Parse();
-			hasErrors = parser.Errors.Count > 0;
-			errors = parser.Errors;
-			return parser.CompilationUnit;
-		}
-		
-		public AstNode ParseSnippet(TextReader reader)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public bool HasErrors {
-			get { return hasErrors; }
-		}
-		
-		public Errors Errors {
-			get { return errors; }
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs
deleted file mode 100644
index 88caf76b57..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs
+++ /dev/null
@@ -1,2247 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.VB.Ast;
-
-namespace ICSharpCode.NRefactory.VB.Visitors
-{
-	public interface IEnvironmentProvider
-	{
-		string RootNamespace { get; }
-		string GetTypeNameForAttribute(CSharp.Attribute attribute);
-		TypeKind GetTypeKindForAstType(CSharp.AstType type);
-		TypeCode ResolveExpression(CSharp.Expression expression);
-		bool? IsReferenceType(CSharp.Expression expression);
-		//ITypeResolveContext ResolveContext { get; }
-		IType ResolveType(AstType type, TypeDeclaration entity = null);
-	}
-	
-	/// <summary>
-	/// Description of CSharpToVBConverterVisitor.
-	/// </summary>
-	public class CSharpToVBConverterVisitor : CSharp.IAstVisitor<object, VB.AstNode>
-	{
-		IEnvironmentProvider provider;
-		Stack<BlockStatement> blocks;
-		Stack<TypeDeclaration> types;
-		Stack<MemberInfo> members;
-		
-		class MemberInfo
-		{
-			public bool inIterator;
-		}
-		
-		public CSharpToVBConverterVisitor(IEnvironmentProvider provider)
-		{
-			this.provider = provider;
-			this.blocks = new Stack<BlockStatement>();
-			this.types = new Stack<TypeDeclaration>();
-			this.members = new Stack<MemberInfo>();
-		}
-		
-		public AstNode VisitAnonymousMethodExpression(CSharp.AnonymousMethodExpression anonymousMethodExpression, object data)
-		{
-			members.Push(new MemberInfo());
-			
-			var expr = new MultiLineLambdaExpression() {
-				IsSub = true,
-				Body = (BlockStatement)anonymousMethodExpression.Body.AcceptVisitor(this, data)
-			};
-			
-			ConvertNodes(anonymousMethodExpression.Parameters, expr.Parameters);
-			
-			if (members.Pop().inIterator) {
-				expr.Modifiers |= LambdaExpressionModifiers.Iterator;
-			}
-			
-			return EndNode(anonymousMethodExpression, expr);
-		}
-		
-		public AstNode VisitUndocumentedExpression(CSharp.UndocumentedExpression undocumentedExpression, object data)
-		{
-			var invocation = new InvocationExpression();
-			
-			switch (undocumentedExpression.UndocumentedExpressionType) {
-				case CSharp.UndocumentedExpressionType.ArgListAccess:
-				case CSharp.UndocumentedExpressionType.ArgList:
-					invocation.Target = new IdentifierExpression { Identifier = "__ArgList" };
-					break;
-				case CSharp.UndocumentedExpressionType.RefValue:
-					invocation.Target = new IdentifierExpression { Identifier = "__RefValue" };
-					break;
-				case CSharp.UndocumentedExpressionType.RefType:
-					invocation.Target = new IdentifierExpression { Identifier = "__RefType" };
-					break;
-				case CSharp.UndocumentedExpressionType.MakeRef:
-					invocation.Target = new IdentifierExpression { Identifier = "__MakeRef" };
-					break;
-				default:
-					throw new Exception("Invalid value for UndocumentedExpressionType");
-			}
-			
-			ConvertNodes(undocumentedExpression.Arguments, invocation.Arguments);
-			
-			return EndNode(undocumentedExpression, invocation);
-		}
-		
-		public AstNode VisitArrayCreateExpression(CSharp.ArrayCreateExpression arrayCreateExpression, object data)
-		{
-			var expr = new ArrayCreateExpression() {
-				Type = (AstType)arrayCreateExpression.Type.AcceptVisitor(this, data),
-				Initializer = (ArrayInitializerExpression)arrayCreateExpression.Initializer.AcceptVisitor(this, data)
-			};
-			ConvertNodes(arrayCreateExpression.Arguments, expr.Arguments);
-			ConvertNodes(arrayCreateExpression.AdditionalArraySpecifiers, expr.AdditionalArraySpecifiers);
-			
-			return EndNode(arrayCreateExpression, expr);
-		}
-		
-		public AstNode VisitArrayInitializerExpression(CSharp.ArrayInitializerExpression arrayInitializerExpression, object data)
-		{
-			var expr = new ArrayInitializerExpression();
-			ConvertNodes(arrayInitializerExpression.Elements, expr.Elements);
-			
-			return EndNode(arrayInitializerExpression, expr);
-		}
-		
-		public AstNode VisitAsExpression(CSharp.AsExpression asExpression, object data)
-		{
-			return EndNode(asExpression, new CastExpression(CastType.TryCast, (AstType)asExpression.Type.AcceptVisitor(this, data), (Expression)asExpression.Expression.AcceptVisitor(this, data)));
-		}
-		
-		public AstNode VisitAssignmentExpression(CSharp.AssignmentExpression assignmentExpression, object data)
-		{
-			var left = (Expression)assignmentExpression.Left.AcceptVisitor(this, data);
-			var op = AssignmentOperatorType.None;
-			var right = (Expression)assignmentExpression.Right.AcceptVisitor(this, data);
-			
-			switch (assignmentExpression.Operator) {
-				case ICSharpCode.NRefactory.CSharp.AssignmentOperatorType.Assign:
-					op = AssignmentOperatorType.Assign;
-					break;
-				case ICSharpCode.NRefactory.CSharp.AssignmentOperatorType.Add:
-					op = AssignmentOperatorType.Add;
-					break;
-				case ICSharpCode.NRefactory.CSharp.AssignmentOperatorType.Subtract:
-					op = AssignmentOperatorType.Subtract;
-					break;
-				case ICSharpCode.NRefactory.CSharp.AssignmentOperatorType.Multiply:
-					op = AssignmentOperatorType.Multiply;
-					break;
-				case ICSharpCode.NRefactory.CSharp.AssignmentOperatorType.Divide:
-					op = AssignmentOperatorType.Divide;
-					break;
-				case ICSharpCode.NRefactory.CSharp.AssignmentOperatorType.Modulus:
-					op = AssignmentOperatorType.Assign;
-					right = new BinaryOperatorExpression((Expression)left.Clone(), BinaryOperatorType.Modulus, right);
-					break;
-				case ICSharpCode.NRefactory.CSharp.AssignmentOperatorType.ShiftLeft:
-					op = AssignmentOperatorType.ShiftLeft;
-					break;
-				case ICSharpCode.NRefactory.CSharp.AssignmentOperatorType.ShiftRight:
-					op = AssignmentOperatorType.ShiftRight;
-					break;
-				case ICSharpCode.NRefactory.CSharp.AssignmentOperatorType.BitwiseAnd:
-					op = AssignmentOperatorType.Assign;
-					right = new BinaryOperatorExpression((Expression)left.Clone(), BinaryOperatorType.BitwiseAnd, right);
-					break;
-				case ICSharpCode.NRefactory.CSharp.AssignmentOperatorType.BitwiseOr:
-					op = AssignmentOperatorType.Assign;
-					right = new BinaryOperatorExpression((Expression)left.Clone(), BinaryOperatorType.BitwiseOr, right);
-					break;
-				case ICSharpCode.NRefactory.CSharp.AssignmentOperatorType.ExclusiveOr:
-					op = AssignmentOperatorType.Assign;
-					right = new BinaryOperatorExpression((Expression)left.Clone(), BinaryOperatorType.ExclusiveOr, right);
-					break;
-				default:
-					throw new Exception("Invalid value for AssignmentOperatorType: " + assignmentExpression.Operator);
-			}
-			
-			var expr = new AssignmentExpression(left, op, right);
-			return EndNode(assignmentExpression, expr);
-		}
-		
-		public AstNode VisitBaseReferenceExpression(CSharp.BaseReferenceExpression baseReferenceExpression, object data)
-		{
-			InstanceExpression result = new InstanceExpression(InstanceExpressionType.MyBase, baseReferenceExpression.StartLocation);
-			
-			return EndNode(baseReferenceExpression, result);
-		}
-		
-		public AstNode VisitBinaryOperatorExpression(CSharp.BinaryOperatorExpression binaryOperatorExpression, object data)
-		{
-			var left = (Expression)binaryOperatorExpression.Left.AcceptVisitor(this, data);
-			var op = BinaryOperatorType.None;
-			var right = (Expression)binaryOperatorExpression.Right.AcceptVisitor(this, data);
-			
-			switch (binaryOperatorExpression.Operator) {
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.BitwiseAnd:
-					op = BinaryOperatorType.BitwiseAnd;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.BitwiseOr:
-					op = BinaryOperatorType.BitwiseOr;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.ConditionalAnd:
-					op = BinaryOperatorType.LogicalAnd;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.ConditionalOr:
-					op = BinaryOperatorType.LogicalOr;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.ExclusiveOr:
-					op = BinaryOperatorType.ExclusiveOr;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.GreaterThan:
-					op = BinaryOperatorType.GreaterThan;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.GreaterThanOrEqual:
-					op = BinaryOperatorType.GreaterThanOrEqual;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.Equality:
-					if (IsReferentialEquality(binaryOperatorExpression))
-						op = BinaryOperatorType.ReferenceEquality;
-					else
-						op = BinaryOperatorType.Equality;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.InEquality:
-					if (IsReferentialEquality(binaryOperatorExpression))
-						op = BinaryOperatorType.ReferenceInequality;
-					else
-						op = BinaryOperatorType.InEquality;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.LessThan:
-					op = BinaryOperatorType.LessThan;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.LessThanOrEqual:
-					op = BinaryOperatorType.LessThanOrEqual;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.Add:
-					// TODO might be string concatenation
-					op = BinaryOperatorType.Add;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.Subtract:
-					op = BinaryOperatorType.Subtract;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.Multiply:
-					op = BinaryOperatorType.Multiply;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.Divide:
-					op = BinaryOperatorType.Divide;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.Modulus:
-					op = BinaryOperatorType.Modulus;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.ShiftLeft:
-					op = BinaryOperatorType.ShiftLeft;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.ShiftRight:
-					op = BinaryOperatorType.ShiftRight;
-					break;
-				case ICSharpCode.NRefactory.CSharp.BinaryOperatorType.NullCoalescing:
-					var nullCoalescing = new ConditionalExpression {
-						ConditionExpression = left,
-						FalseExpression = right
-					};
-					return EndNode(binaryOperatorExpression, nullCoalescing);
-				default:
-					throw new Exception("Invalid value for BinaryOperatorType: " + binaryOperatorExpression.Operator);
-			}
-			
-			return EndNode(binaryOperatorExpression, new BinaryOperatorExpression(left, op, right));
-		}
-		
-		bool IsReferentialEquality(CSharp.BinaryOperatorExpression binaryOperatorExpression)
-		{
-			var left = provider.IsReferenceType(binaryOperatorExpression.Left);
-			var right = provider.IsReferenceType(binaryOperatorExpression.Right);
-			
-			var leftCode = provider.ResolveExpression(binaryOperatorExpression.Left);
-			var rightCode = provider.ResolveExpression(binaryOperatorExpression.Right);
-			
-			return (left == true || right == true) && (leftCode != TypeCode.String && rightCode != TypeCode.String);
-		}
-		
-		public AstNode VisitCastExpression(CSharp.CastExpression castExpression, object data)
-		{
-			var expr = new CastExpression();
-			
-			expr.Type = (AstType)castExpression.Type.AcceptVisitor(this, data);
-			// TODO read additional type information from annotation
-			// (int)x is equivalent to CInt(Math.Truncate(x))
-			expr.CastType = GetCastType(expr.Type, null);
-			expr.Expression = (Expression)castExpression.Expression.AcceptVisitor(this, data);
-			
-			if (expr.CastType != CastType.CType)
-				expr.Type = null;
-			
-			return EndNode(castExpression, expr);
-		}
-		
-		CastType GetCastType(AstType type, object typeInformation)
-		{
-			var primType = type as PrimitiveType;
-			if (primType == null)
-				return CastType.CType;
-			
-			switch (primType.Keyword) {
-				case "Boolean":
-					return CastType.CBool;
-				case "Byte":
-					return CastType.CByte;
-				case "Char":
-					return CastType.CChar;
-				case "Date":
-					return CastType.CDate;
-				case "Double":
-					return CastType.CDbl;
-				case "Decimal":
-					return CastType.CDec;
-				case "Integer":
-					return CastType.CInt;
-				case "Long":
-					return CastType.CLng;
-				case "Object":
-					return CastType.CObj;
-				case "SByte":
-					return CastType.CSByte;
-				case "Short":
-					return CastType.CShort;
-				case "Single":
-					return CastType.CSng;
-				case "String":
-					return CastType.CStr;
-				case "UInteger":
-					return CastType.CUInt;
-				case "ULong":
-					return CastType.CULng;
-				case "UShort":
-					return CastType.CUShort;
-			}
-			
-			return CastType.CType;
-		}
-		
-		public AstNode VisitCheckedExpression(CSharp.CheckedExpression checkedExpression, object data)
-		{
-			blocks.Peek().AddChild(new Comment(" The following expression was wrapped in a checked-expression", false), AstNode.Roles.Comment);
-			return EndNode(checkedExpression, checkedExpression.Expression.AcceptVisitor(this, data));
-		}
-		
-		public AstNode VisitConditionalExpression(CSharp.ConditionalExpression conditionalExpression, object data)
-		{
-			var cond = new ConditionalExpression() {
-				ConditionExpression = (Expression)conditionalExpression.Condition.AcceptVisitor(this, data),
-				TrueExpression = (Expression)conditionalExpression.TrueExpression.AcceptVisitor(this, data),
-				FalseExpression = (Expression)conditionalExpression.FalseExpression.AcceptVisitor(this, data)
-			};
-			
-			return EndNode(conditionalExpression, cond);
-		}
-		
-		public AstNode VisitDefaultValueExpression(CSharp.DefaultValueExpression defaultValueExpression, object data)
-		{
-			// Nothing is equivalent to default(T) for reference and value types.
-			return EndNode(defaultValueExpression, new PrimitiveExpression(null));
-		}
-		
-		public AstNode VisitDirectionExpression(CSharp.DirectionExpression directionExpression, object data)
-		{
-			return EndNode(directionExpression, (Expression)directionExpression.Expression.AcceptVisitor(this, data));
-		}
-		
-		public AstNode VisitIdentifierExpression(CSharp.IdentifierExpression identifierExpression, object data)
-		{
-			var expr = new IdentifierExpression();
-			expr.Identifier = new Identifier(identifierExpression.Identifier, TextLocation.Empty);
-			ConvertNodes(identifierExpression.TypeArguments, expr.TypeArguments);
-			
-			return EndNode(identifierExpression, expr);
-		}
-		
-		public AstNode VisitIndexerExpression(CSharp.IndexerExpression indexerExpression, object data)
-		{
-			var expr = new InvocationExpression((Expression)indexerExpression.Target.AcceptVisitor(this, data));
-			ConvertNodes(indexerExpression.Arguments, expr.Arguments);
-			return EndNode(indexerExpression, expr);
-		}
-		
-		public AstNode VisitInvocationExpression(CSharp.InvocationExpression invocationExpression, object data)
-		{
-			var expr = new InvocationExpression(
-				(Expression)invocationExpression.Target.AcceptVisitor(this, data));
-			ConvertNodes(invocationExpression.Arguments, expr.Arguments);
-			
-			return EndNode(invocationExpression, expr);
-		}
-		
-		public AstNode VisitIsExpression(CSharp.IsExpression isExpression, object data)
-		{
-			var expr = new TypeOfIsExpression() {
-				Type = (AstType)isExpression.Type.AcceptVisitor(this, data),
-				TypeOfExpression = (Expression)isExpression.Expression.AcceptVisitor(this, data)
-			};
-			
-			return EndNode(isExpression, expr);
-		}
-		
-		public AstNode VisitLambdaExpression(CSharp.LambdaExpression lambdaExpression, object data)
-		{
-			LambdaExpression expr = null;
-			
-			if (lambdaExpression.Body is CSharp.Expression) {
-				var singleLine = new SingleLineFunctionLambdaExpression() {
-					EmbeddedExpression = (Expression)lambdaExpression.Body.AcceptVisitor(this, data)
-				};
-				ConvertNodes(lambdaExpression.Parameters, singleLine.Parameters);
-				expr = singleLine;
-			} else
-				throw new NotImplementedException();
-			
-			return EndNode(lambdaExpression, expr);
-		}
-		
-		public AstNode VisitMemberReferenceExpression(CSharp.MemberReferenceExpression memberReferenceExpression, object data)
-		{
-			var memberAccessExpression = new MemberAccessExpression();
-			
-			memberAccessExpression.Target = (Expression)memberReferenceExpression.Target.AcceptVisitor(this, data);
-			memberAccessExpression.MemberName = new Identifier(memberReferenceExpression.MemberName, TextLocation.Empty);
-			ConvertNodes(memberReferenceExpression.TypeArguments, memberAccessExpression.TypeArguments);
-			
-			return EndNode(memberReferenceExpression, memberAccessExpression);
-		}
-		
-		public AstNode VisitNamedArgumentExpression(CSharp.NamedArgumentExpression namedArgumentExpression, object data)
-		{
-			Expression expr = new NamedArgumentExpression {
-				Identifier = namedArgumentExpression.Name,
-				Expression = (Expression)namedArgumentExpression.Expression.AcceptVisitor(this, data)
-			};
-			
-			return EndNode(namedArgumentExpression, expr);
-		}
-		
-		public AstNode VisitNamedExpression(CSharp.NamedExpression namedExpression, object data)
-		{
-			Expression expr = new FieldInitializerExpression {
-				IsKey = true,
-				Identifier = namedExpression.Name,
-				Expression = (Expression)namedExpression.Expression.AcceptVisitor(this, data)
-			};
-			return EndNode(namedExpression, expr);
-		}
-		
-		public AstNode VisitNullReferenceExpression(CSharp.NullReferenceExpression nullReferenceExpression, object data)
-		{
-			return EndNode(nullReferenceExpression, new PrimitiveExpression(null));
-		}
-		
-		public AstNode VisitObjectCreateExpression(CSharp.ObjectCreateExpression objectCreateExpression, object data)
-		{
-			var expr = new ObjectCreationExpression((AstType)objectCreateExpression.Type.AcceptVisitor(this, data));
-			ConvertNodes(objectCreateExpression.Arguments, expr.Arguments);
-			if (!objectCreateExpression.Initializer.IsNull)
-				expr.Initializer = (ArrayInitializerExpression)objectCreateExpression.Initializer.AcceptVisitor(this, data);
-			
-			return EndNode(objectCreateExpression, expr);
-		}
-		
-		public AstNode VisitAnonymousTypeCreateExpression(CSharp.AnonymousTypeCreateExpression anonymousTypeCreateExpression, object data)
-		{
-			var expr = new AnonymousObjectCreationExpression();
-			
-			ConvertNodes(anonymousTypeCreateExpression.Initializers, expr.Initializer);
-			
-			return EndNode(anonymousTypeCreateExpression, expr);
-		}
-		
-		public AstNode VisitParenthesizedExpression(CSharp.ParenthesizedExpression parenthesizedExpression, object data)
-		{
-			var result = new ParenthesizedExpression();
-			
-			result.Expression = (Expression)parenthesizedExpression.Expression.AcceptVisitor(this, data);
-			
-			return EndNode(parenthesizedExpression, result);
-		}
-		
-		public AstNode VisitPointerReferenceExpression(CSharp.PointerReferenceExpression pointerReferenceExpression, object data)
-		{
-			return EndNode(pointerReferenceExpression,((Expression)pointerReferenceExpression.Target.AcceptVisitor(this, data)).Invoke("Dereference").Member(pointerReferenceExpression.MemberName));
-		}
-		
-		public AstNode VisitPrimitiveExpression(CSharp.PrimitiveExpression primitiveExpression, object data)
-		{
-			Expression expr;
-			
-			if (!string.IsNullOrEmpty(primitiveExpression.Value as string) || primitiveExpression.Value is char)
-				expr = ConvertToConcat(primitiveExpression.Value.ToString());
-			else
-				expr = new PrimitiveExpression(primitiveExpression.Value);
-			
-			return EndNode(primitiveExpression, expr);
-		}
-		
-		Expression ConvertToConcat(string literal)
-		{
-			Stack<Expression> parts = new Stack<Expression>();
-			int start = 0;
-			
-			for (int i = 0; i < literal.Length; i++) {
-				string part;
-				switch (literal[i]) {
-					case '\0':
-						part = literal.Substring(start, i - start);
-						if (!string.IsNullOrEmpty(part))
-							parts.Push(new PrimitiveExpression(part));
-						parts.Push(new IdentifierExpression("vbNullChar"));
-						start = i + 1;
-						break;
-					case '\b':
-						part = literal.Substring(start, i - start);
-						if (!string.IsNullOrEmpty(part))
-							parts.Push(new PrimitiveExpression(part));
-						parts.Push(new IdentifierExpression("vbBack"));
-						start = i + 1;
-						break;
-					case '\f':
-						part = literal.Substring(start, i - start);
-						if (!string.IsNullOrEmpty(part))
-							parts.Push(new PrimitiveExpression(part));
-						parts.Push(new IdentifierExpression("vbFormFeed"));
-						start = i + 1;
-						break;
-					case '\r':
-						part = literal.Substring(start, i - start);
-						if (!string.IsNullOrEmpty(part))
-							parts.Push(new PrimitiveExpression(part));
-						if (i + 1 < literal.Length && literal[i + 1] == '\n') {
-							i++;
-							parts.Push(new IdentifierExpression("vbCrLf"));
-						} else
-							parts.Push(new IdentifierExpression("vbCr"));
-						start = i + 1;
-						break;
-					case '\n':
-						part = literal.Substring(start, i - start);
-						if (!string.IsNullOrEmpty(part))
-							parts.Push(new PrimitiveExpression(part));
-						parts.Push(new IdentifierExpression("vbLf"));
-						start = i + 1;
-						break;
-					case '\t':
-						part = literal.Substring(start, i - start);
-						if (!string.IsNullOrEmpty(part))
-							parts.Push(new PrimitiveExpression(part));
-						parts.Push(new IdentifierExpression("vbTab"));
-						start = i + 1;
-						break;
-					case '\v':
-						part = literal.Substring(start, i - start);
-						if (!string.IsNullOrEmpty(part))
-							parts.Push(new PrimitiveExpression(part));
-						parts.Push(new IdentifierExpression("vbVerticalTab"));
-						start = i + 1;
-						break;
-					default:
-						if ((int)literal[i] > 255) {
-							part = literal.Substring(start, i - start);
-							if (!string.IsNullOrEmpty(part))
-								parts.Push(new PrimitiveExpression(part));
-							parts.Push(new InvocationExpression(new IdentifierExpression("ChrW"), new PrimitiveExpression((int)literal[i])));
-						} else
-							continue;
-						start = i + 1;
-						break;
-				}
-				
-			}
-			
-			if (start < literal.Length) {
-				string part = literal.Substring(start);
-				parts.Push(new PrimitiveExpression(part));
-			}
-			
-			Expression current = parts.Pop();
-			
-			while (parts.Any())
-				current = new BinaryOperatorExpression(parts.Pop(), BinaryOperatorType.Concat, current);
-			
-			return current;
-		}
-		
-		public AstNode VisitSizeOfExpression(CSharp.SizeOfExpression sizeOfExpression, object data)
-		{
-			return EndNode(
-				sizeOfExpression,
-				new InvocationExpression(
-					new IdentifierExpression() { Identifier = "__SizeOf" },
-					new TypeReferenceExpression((AstType)sizeOfExpression.Type.AcceptVisitor(this, data))
-				)
-			);
-		}
-		
-		public AstNode VisitStackAllocExpression(CSharp.StackAllocExpression stackAllocExpression, object data)
-		{
-			return EndNode(
-				stackAllocExpression,
-				new InvocationExpression(
-					new IdentifierExpression() { Identifier = "__StackAlloc" },
-					new TypeReferenceExpression((AstType)stackAllocExpression.Type.AcceptVisitor(this, data)),
-					(Expression)stackAllocExpression.CountExpression.AcceptVisitor(this, data)
-				)
-			);
-		}
-		
-		public AstNode VisitThisReferenceExpression(CSharp.ThisReferenceExpression thisReferenceExpression, object data)
-		{
-			InstanceExpression result = new InstanceExpression(InstanceExpressionType.Me, thisReferenceExpression.StartLocation);
-			return EndNode(thisReferenceExpression, result);
-		}
-		
-		public AstNode VisitTypeOfExpression(CSharp.TypeOfExpression typeOfExpression, object data)
-		{
-			var expr = new GetTypeExpression();
-			expr.Type = (AstType)typeOfExpression.Type.AcceptVisitor(this, data);
-			return EndNode(typeOfExpression, expr);
-		}
-		
-		public AstNode VisitTypeReferenceExpression(CSharp.TypeReferenceExpression typeReferenceExpression, object data)
-		{
-			var expr = new TypeReferenceExpression((AstType)typeReferenceExpression.Type.AcceptVisitor(this, data));
-			return EndNode(typeReferenceExpression, expr);
-		}
-		
-		public AstNode VisitUnaryOperatorExpression(CSharp.UnaryOperatorExpression unaryOperatorExpression, object data)
-		{
-			Expression expr;
-
-			switch (unaryOperatorExpression.Operator) {
-				case ICSharpCode.NRefactory.CSharp.UnaryOperatorType.Not:
-				case ICSharpCode.NRefactory.CSharp.UnaryOperatorType.BitNot:
-					expr = new UnaryOperatorExpression() {
-						Expression = (Expression)unaryOperatorExpression.Expression.AcceptVisitor(this, data),
-						Operator = UnaryOperatorType.Not
-					};
-					break;
-				case ICSharpCode.NRefactory.CSharp.UnaryOperatorType.Minus:
-					expr = new UnaryOperatorExpression() {
-						Expression = (Expression)unaryOperatorExpression.Expression.AcceptVisitor(this, data),
-						Operator = UnaryOperatorType.Minus
-					};
-					break;
-				case ICSharpCode.NRefactory.CSharp.UnaryOperatorType.Plus:
-					expr = new UnaryOperatorExpression() {
-						Expression = (Expression)unaryOperatorExpression.Expression.AcceptVisitor(this, data),
-						Operator = UnaryOperatorType.Plus
-					};
-					break;
-				case ICSharpCode.NRefactory.CSharp.UnaryOperatorType.Increment:
-					expr = new InvocationExpression();
-					((InvocationExpression)expr).Target = new IdentifierExpression() { Identifier = "__Increment" };
-					((InvocationExpression)expr).Arguments.Add((Expression)unaryOperatorExpression.Expression.AcceptVisitor(this, data));
-					break;
-				case ICSharpCode.NRefactory.CSharp.UnaryOperatorType.PostIncrement:
-					expr = new InvocationExpression();
-					((InvocationExpression)expr).Target = new IdentifierExpression() { Identifier = "__PostIncrement" };
-					((InvocationExpression)expr).Arguments.Add((Expression)unaryOperatorExpression.Expression.AcceptVisitor(this, data));
-					break;
-				case ICSharpCode.NRefactory.CSharp.UnaryOperatorType.Decrement:
-					expr = new InvocationExpression();
-					((InvocationExpression)expr).Target = new IdentifierExpression() { Identifier = "__Decrement" };
-					((InvocationExpression)expr).Arguments.Add((Expression)unaryOperatorExpression.Expression.AcceptVisitor(this, data));
-					break;
-				case ICSharpCode.NRefactory.CSharp.UnaryOperatorType.PostDecrement:
-					expr = new InvocationExpression();
-					((InvocationExpression)expr).Target = new IdentifierExpression() { Identifier = "__PostDecrement" };
-					((InvocationExpression)expr).Arguments.Add((Expression)unaryOperatorExpression.Expression.AcceptVisitor(this, data));
-					break;
-				case ICSharpCode.NRefactory.CSharp.UnaryOperatorType.AddressOf:
-					expr = new UnaryOperatorExpression() {
-						Expression = (Expression)unaryOperatorExpression.Expression.AcceptVisitor(this, data),
-						Operator = UnaryOperatorType.AddressOf
-					};
-					break;
-				case ICSharpCode.NRefactory.CSharp.UnaryOperatorType.Dereference:
-					expr = new InvocationExpression();
-					((InvocationExpression)expr).Target = new IdentifierExpression() { Identifier = "__Dereference" };
-					((InvocationExpression)expr).Arguments.Add((Expression)unaryOperatorExpression.Expression.AcceptVisitor(this, data));
-					break;
-				case ICSharpCode.NRefactory.CSharp.UnaryOperatorType.Await:
-					expr = new UnaryOperatorExpression() {
-						Expression = (Expression)unaryOperatorExpression.Expression.AcceptVisitor(this, data),
-						Operator = UnaryOperatorType.Await
-					};
-					break;
-				default:
-					throw new Exception("Invalid value for UnaryOperatorType");
-			}
-			
-			return EndNode(unaryOperatorExpression, expr);
-		}
-		
-		public AstNode VisitUncheckedExpression(CSharp.UncheckedExpression uncheckedExpression, object data)
-		{
-			blocks.Peek().AddChild(new Comment(" The following expression was wrapped in a unchecked-expression", false), AstNode.Roles.Comment);
-			return EndNode(uncheckedExpression, uncheckedExpression.Expression.AcceptVisitor(this, data));
-		}
-		
-		public AstNode VisitEmptyExpression(CSharp.EmptyExpression emptyExpression, object data)
-		{
-			return EndNode(emptyExpression, new EmptyExpression());
-		}
-		
-		public AstNode VisitQueryExpression(CSharp.QueryExpression queryExpression, object data)
-		{
-			var expr = new QueryExpression();
-			ConvertNodes(queryExpression.Clauses, expr.QueryOperators);
-			return EndNode(queryExpression, expr);
-		}
-		
-		public AstNode VisitQueryContinuationClause(CSharp.QueryContinuationClause queryContinuationClause, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public AstNode VisitQueryFromClause(CSharp.QueryFromClause queryFromClause, object data)
-		{
-			var op = new FromQueryOperator();
-			op.Variables.Add(
-				new CollectionRangeVariableDeclaration {
-					Identifier = new VariableIdentifier { Name = queryFromClause.Identifier },
-					Type = (AstType)queryFromClause.Type.AcceptVisitor(this, data),
-					Expression = (Expression)queryFromClause.Expression.AcceptVisitor(this, data)
-				}
-			);
-			
-			return EndNode(queryFromClause, op);
-		}
-		
-		public AstNode VisitQueryLetClause(CSharp.QueryLetClause queryLetClause, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public AstNode VisitQueryWhereClause(CSharp.QueryWhereClause queryWhereClause, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public AstNode VisitQueryJoinClause(CSharp.QueryJoinClause queryJoinClause, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public AstNode VisitQueryOrderClause(CSharp.QueryOrderClause queryOrderClause, object data)
-		{
-			var op = new OrderByQueryOperator();
-			
-			ConvertNodes(queryOrderClause.Orderings, op.Expressions);
-			
-			return EndNode(queryOrderClause, op);
-		}
-		
-		public AstNode VisitQueryOrdering(CSharp.QueryOrdering queryOrdering, object data)
-		{
-			var expr = new OrderExpression();
-			
-			expr.Direction = (QueryOrderingDirection)queryOrdering.Direction;
-			expr.Expression = (Expression)queryOrdering.Expression.AcceptVisitor(this, data);
-			
-			return EndNode(queryOrdering, expr);
-		}
-		
-		int selectVarCount = 0;
-		
-		public AstNode VisitQuerySelectClause(CSharp.QuerySelectClause querySelectClause, object data)
-		{
-			var op = new SelectQueryOperator();
-			
-			op.Variables.Add(
-				new VariableInitializer {
-					Identifier = new VariableIdentifier { Name = "SelectVar" + selectVarCount },
-					Expression = (Expression)querySelectClause.Expression.AcceptVisitor(this, data)
-				});
-			
-			return EndNode(querySelectClause, op);
-		}
-		
-		public AstNode VisitQueryGroupClause(CSharp.QueryGroupClause queryGroupClause, object data)
-		{
-			var op = new GroupByQueryOperator();
-			
-			throw new NotImplementedException();
-			
-			return EndNode(queryGroupClause, op);
-		}
-		
-		public AstNode VisitAttribute(CSharp.Attribute attribute, object data)
-		{
-			var attr = new VB.Ast.Attribute();
-			AttributeTarget target;
-			Enum.TryParse(((CSharp.AttributeSection)attribute.Parent).AttributeTarget, true, out target);
-			attr.Target = target;
-			attr.Type = (AstType)attribute.Type.AcceptVisitor(this, data);
-			ConvertNodes(attribute.Arguments, attr.Arguments);
-			
-			return EndNode(attribute, attr);
-		}
-		
-		public AstNode VisitAttributeSection(CSharp.AttributeSection attributeSection, object data)
-		{
-			AttributeBlock block = new AttributeBlock();
-			ConvertNodes(attributeSection.Attributes, block.Attributes);
-			return EndNode(attributeSection, block);
-		}
-		
-		public AstNode VisitDelegateDeclaration(CSharp.DelegateDeclaration delegateDeclaration, object data)
-		{
-			var result = new DelegateDeclaration();
-			
-			ConvertNodes(delegateDeclaration.Attributes.Where(section => section.AttributeTarget != "return"), result.Attributes);
-			ConvertNodes(delegateDeclaration.ModifierTokens, result.ModifierTokens);
-			result.Name = new Identifier(delegateDeclaration.Name, TextLocation.Empty);
-			result.IsSub = IsSub(delegateDeclaration.ReturnType);
-			ConvertNodes(delegateDeclaration.Parameters, result.Parameters);
-			ConvertNodes(delegateDeclaration.TypeParameters, result.TypeParameters);
-			ConvertNodes(delegateDeclaration.Attributes.Where(section => section.AttributeTarget == "return"), result.ReturnTypeAttributes);
-			if (!result.IsSub)
-				result.ReturnType = (AstType)delegateDeclaration.ReturnType.AcceptVisitor(this, data);
-			return EndNode(delegateDeclaration, result);
-		}
-		
-		public AstNode VisitNamespaceDeclaration(CSharp.NamespaceDeclaration namespaceDeclaration, object data)
-		{
-			var newNamespace = new NamespaceDeclaration();
-			
-			ConvertNodes(namespaceDeclaration.Identifiers, newNamespace.Identifiers);
-			ConvertNodes(namespaceDeclaration.Members, newNamespace.Members);
-			
-			return EndNode(namespaceDeclaration, newNamespace);
-		}
-		
-		public AstNode VisitTypeDeclaration(CSharp.TypeDeclaration typeDeclaration, object data)
-		{
-			// TODO add missing features!
-			
-			if (typeDeclaration.ClassType == CSharp.ClassType.Enum) {
-				var type = new EnumDeclaration();
-				CopyAnnotations(typeDeclaration, type);
-				
-				ConvertNodes(typeDeclaration.Attributes, type.Attributes);
-				ConvertNodes(typeDeclaration.ModifierTokens, type.ModifierTokens);
-				
-				if (typeDeclaration.BaseTypes.Any()) {
-					var first = typeDeclaration.BaseTypes.First();
-					
-					type.UnderlyingType = (AstType)first.AcceptVisitor(this, data);
-				}
-				
-				type.Name = new Identifier(typeDeclaration.Name, TextLocation.Empty);
-				
-				ConvertNodes(typeDeclaration.Members, type.Members);
-				
-				return EndNode(typeDeclaration, type);
-			} else {
-				var type = new TypeDeclaration();
-				CopyAnnotations(typeDeclaration, type);
-				
-				CSharp.Attribute stdModAttr;
-				
-				if (typeDeclaration.ClassType == CSharp.ClassType.Class && HasAttribute(typeDeclaration.Attributes, "Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute", out stdModAttr)) {
-					type.ClassType = ClassType.Module;
-					// remove AttributeSection if only one attribute is present
-					var attrSec = (CSharp.AttributeSection)stdModAttr.Parent;
-					if (attrSec.Attributes.Count == 1)
-						attrSec.Remove();
-					else
-						stdModAttr.Remove();
-				} else {
-					switch (typeDeclaration.ClassType) {
-						case CSharp.ClassType.Class:
-							type.ClassType = ClassType.Class;
-							break;
-						case CSharp.ClassType.Struct:
-							type.ClassType = ClassType.Struct;
-							break;
-						case CSharp.ClassType.Interface:
-							type.ClassType = ClassType.Interface;
-							break;
-						default:
-							throw new InvalidOperationException("Invalid value for ClassType");
-					}
-				}
-				
-				if ((typeDeclaration.Modifiers & CSharp.Modifiers.Static) == CSharp.Modifiers.Static) {
-					type.ClassType = ClassType.Module;
-					typeDeclaration.Modifiers &= ~CSharp.Modifiers.Static;
-				}
-				
-				ConvertNodes(typeDeclaration.Attributes, type.Attributes);
-				ConvertNodes(typeDeclaration.ModifierTokens, type.ModifierTokens);
-				
-				if (typeDeclaration.BaseTypes.Any()) {
-					var first = typeDeclaration.BaseTypes.First();
-					
-					if (provider.GetTypeKindForAstType(first) != TypeKind.Interface) {
-						ConvertNodes(typeDeclaration.BaseTypes.Skip(1), type.ImplementsTypes);
-						type.InheritsType = (AstType)first.AcceptVisitor(this, data);
-					} else
-						ConvertNodes(typeDeclaration.BaseTypes, type.ImplementsTypes);
-				}
-				
-				type.Name = typeDeclaration.Name;
-				
-				types.Push(type);
-				ConvertNodes(typeDeclaration.Members, type.Members);
-				types.Pop();
-				
-				return EndNode(typeDeclaration, type);
-			}
-		}
-		
-		public AstNode VisitUsingAliasDeclaration(CSharp.UsingAliasDeclaration usingAliasDeclaration, object data)
-		{
-			var imports = new ImportsStatement();
-			
-			var clause = new AliasImportsClause() {
-				Name = new Identifier(usingAliasDeclaration.Alias, TextLocation.Empty),
-				Alias = (AstType)usingAliasDeclaration.Import.AcceptVisitor(this, data)
-			};
-			
-			imports.AddChild(clause, ImportsStatement.ImportsClauseRole);
-			
-			return EndNode(usingAliasDeclaration, imports);
-		}
-		
-		public AstNode VisitUsingDeclaration(CSharp.UsingDeclaration usingDeclaration, object data)
-		{
-			var imports = new ImportsStatement();
-			
-			var clause = new MemberImportsClause() {
-				Member = (AstType)usingDeclaration.Import.AcceptVisitor(this, data)
-			};
-			
-			imports.AddChild(clause, ImportsStatement.ImportsClauseRole);
-			
-			return EndNode(usingDeclaration, imports);
-		}
-		
-		public AstNode VisitExternAliasDeclaration(CSharp.ExternAliasDeclaration externAliasDeclaration, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public AstNode VisitBlockStatement(CSharp.BlockStatement blockStatement, object data)
-		{
-			var block = new BlockStatement();
-			blocks.Push(block);
-			ConvertNodes(blockStatement, block.Statements);
-			blocks.Pop();
-			return EndNode(blockStatement, block);
-		}
-		
-		public AstNode VisitBreakStatement(CSharp.BreakStatement breakStatement, object data)
-		{
-			var exit = new ExitStatement(ExitKind.None);
-			
-			foreach (var stmt in breakStatement.Ancestors) {
-				if (stmt is CSharp.MethodDeclaration) {
-					exit.ExitKind = IsSub(((CSharp.MethodDeclaration)stmt).ReturnType) ? ExitKind.Sub : ExitKind.Function;
-					break;
-				}
-				if (stmt is CSharp.PropertyDeclaration) {
-					exit.ExitKind = ExitKind.Property;
-					break;
-				}
-				if (stmt is CSharp.DoWhileStatement) {
-					exit.ExitKind = ExitKind.Do;
-					break;
-				}
-				if (stmt is CSharp.ForStatement || stmt is CSharp.ForeachStatement) {
-					exit.ExitKind = ExitKind.For;
-					break;
-				}
-				if (stmt is CSharp.WhileStatement) {
-					exit.ExitKind = ExitKind.While;
-					break;
-				}
-				if (stmt is CSharp.SwitchStatement) {
-					exit.ExitKind = ExitKind.Select;
-					break;
-				}
-				if (stmt is CSharp.TryCatchStatement) {
-					exit.ExitKind = ExitKind.Try;
-					break;
-				}
-			}
-			
-			return EndNode(breakStatement, exit);
-		}
-		
-		public AstNode VisitCheckedStatement(CSharp.CheckedStatement checkedStatement, object data)
-		{
-			blocks.Peek().AddChild(new Comment(" The following expression was wrapped in a checked-statement", false), AstNode.Roles.Comment);
-			var body = (BlockStatement)checkedStatement.Body.AcceptVisitor(this, data);
-			
-			foreach (var stmt in body) {
-				stmt.Remove();
-				blocks.Peek().Add(stmt);
-			}
-			
-			return EndNode<AstNode>(checkedStatement, null);
-		}
-		
-		public AstNode VisitContinueStatement(CSharp.ContinueStatement continueStatement, object data)
-		{
-			var @continue = new ContinueStatement(ContinueKind.None);
-			
-			foreach (var stmt in continueStatement.Ancestors) {
-				if (stmt is CSharp.DoWhileStatement) {
-					@continue.ContinueKind = ContinueKind.Do;
-					break;
-				}
-				if (stmt is CSharp.ForStatement || stmt is CSharp.ForeachStatement) {
-					@continue.ContinueKind = ContinueKind.For;
-					break;
-				}
-				if (stmt is CSharp.WhileStatement) {
-					@continue.ContinueKind = ContinueKind.While;
-					break;
-				}
-			}
-			
-			return EndNode(continueStatement, @continue);
-		}
-		
-		public AstNode VisitDoWhileStatement(CSharp.DoWhileStatement doWhileStatement, object data)
-		{
-			var stmt = new DoLoopStatement();
-			
-			stmt.ConditionType = ConditionType.LoopWhile;
-			stmt.Expression = (Expression)doWhileStatement.Condition.AcceptVisitor(this, data);
-			stmt.Body = (BlockStatement)doWhileStatement.EmbeddedStatement.AcceptVisitor(this, data);
-			
-			return EndNode(doWhileStatement, stmt);
-		}
-		
-		public AstNode VisitEmptyStatement(CSharp.EmptyStatement emptyStatement, object data)
-		{
-			return EndNode<Statement>(emptyStatement, null);
-		}
-		
-		public AstNode VisitExpressionStatement(CSharp.ExpressionStatement expressionStatement, object data)
-		{
-			var expr = new ExpressionStatement((Expression)expressionStatement.Expression.AcceptVisitor(this, data));
-			return EndNode(expressionStatement, expr);
-		}
-		
-		public AstNode VisitFixedStatement(CSharp.FixedStatement fixedStatement, object data)
-		{
-			var block = blocks.Peek();
-			block.AddChild(new Comment(" Emulating fixed-Statement, might not be entirely correct!", false), AstNode.Roles.Comment);
-			
-			var variables = new LocalDeclarationStatement();
-			variables.Modifiers = Modifiers.Dim;
-			var stmt = new TryStatement();
-			stmt.FinallyBlock = new BlockStatement();
-			foreach (var decl in fixedStatement.Variables) {
-				var v = new VariableDeclaratorWithTypeAndInitializer {
-					Identifiers = { new VariableIdentifier { Name = decl.Name } },
-					Type = new SimpleType("GCHandle"),
-					Initializer = new InvocationExpression(
-						new MemberAccessExpression { Target = new IdentifierExpression { Identifier = "GCHandle" }, MemberName = "Alloc" },
-						(Expression)decl.Initializer.AcceptVisitor(this, data),
-						new MemberAccessExpression { Target = new IdentifierExpression { Identifier = "GCHandleType" }, MemberName = "Pinned" }
-					)
-				};
-				variables.Variables.Add(v);
-				stmt.FinallyBlock.Add(new IdentifierExpression { Identifier = decl.Name }.Invoke("Free"));
-			}
-			
-			block.Add(variables);
-			
-			stmt.Body = (BlockStatement)fixedStatement.EmbeddedStatement.AcceptVisitor(this, data);
-			
-			foreach (var ident in stmt.Body.Descendants.OfType<IdentifierExpression>()) {
-				ident.ReplaceWith(expr => ((Expression)expr).Invoke("AddrOfPinnedObject"));
-			}
-			
-			return EndNode(fixedStatement, stmt);
-		}
-		
-		public AstNode VisitForeachStatement(CSharp.ForeachStatement foreachStatement, object data)
-		{
-			var stmt = new ForEachStatement() {
-				Body = (BlockStatement)foreachStatement.EmbeddedStatement.AcceptVisitor(this, data),
-				InExpression = (Expression)foreachStatement.InExpression.AcceptVisitor(this, data),
-				Variable = new VariableInitializer() {
-					Identifier = new VariableIdentifier() { Name = foreachStatement.VariableName },
-					Type = (AstType)foreachStatement.VariableType.AcceptVisitor(this, data)
-				}
-			};
-			
-			return EndNode(foreachStatement, stmt);
-		}
-		
-		public AstNode VisitForStatement(CSharp.ForStatement forStatement, object data)
-		{
-			// for (;;) ;
-			if (!forStatement.Initializers.Any() && forStatement.Condition.IsNull && !forStatement.Iterators.Any())
-				return EndNode(forStatement, new WhileStatement() { Condition = new PrimitiveExpression(true), Body = (BlockStatement)forStatement.EmbeddedStatement.AcceptVisitor(this, data) });
-			
-			CSharp.AstNode counterLoop = new CSharp.ForStatement() {
-				Initializers = {
-					new NamedNode(
-						"iteratorVar",
-						new Choice {
-							new CSharp.VariableDeclarationStatement {
-								Type = new Choice {
-									new CSharp.PrimitiveType("long"),
-									new CSharp.PrimitiveType("ulong"),
-									new CSharp.PrimitiveType("int"),
-									new CSharp.PrimitiveType("uint"),
-									new CSharp.PrimitiveType("short"),
-									new CSharp.PrimitiveType("ushort"),
-									new CSharp.PrimitiveType("sbyte"),
-									new CSharp.PrimitiveType("byte")
-								},
-								Variables = {
-									new AnyNode()
-								}
-							},
-							new CSharp.ExpressionStatement(
-								new CSharp.AssignmentExpression()
-							)
-						})
-				},
-				Condition = new NamedNode(
-					"condition",
-					new CSharp.BinaryOperatorExpression {
-						Left = new NamedNode("ident", new CSharp.IdentifierExpression(Pattern.AnyString)),
-						Operator = CSharp.BinaryOperatorType.Any,
-						Right = new AnyNode("endExpr")
-					}),
-				Iterators = {
-					new CSharp.ExpressionStatement(
-						new NamedNode(
-							"increment",
-							new CSharp.AssignmentExpression {
-								Left = new Backreference("ident"),
-								Operator = CSharp.AssignmentOperatorType.Any,
-								Right = new NamedNode("factor", new AnyNode())
-							}
-						)
-					)
-				},
-				EmbeddedStatement = new NamedNode("body", new AnyNode())
-			};
-			
-			var match = counterLoop.Match(forStatement);
-			
-			if (match.Success) {
-				var init = match.Get<CSharp.Statement>("iteratorVar").SingleOrDefault();
-				
-				AstNode iteratorVariable;
-				
-				if (init is CSharp.VariableDeclarationStatement) {
-					var var = ((CSharp.VariableDeclarationStatement)init).Variables.First();
-					iteratorVariable = new VariableInitializer() {
-						Identifier = new VariableIdentifier { Name = var.Name },
-						Type = (AstType)((CSharp.VariableDeclarationStatement)init).Type.AcceptVisitor(this, data),
-						Expression = (Expression)var.Initializer.AcceptVisitor(this, data)
-					};
-				} else if (init is CSharp.ExpressionStatement) {
-					iteratorVariable = init.AcceptVisitor(this, data);
-				} else goto end;
-				
-				Expression toExpr = Expression.Null;
-				
-				var cond = match.Get<CSharp.BinaryOperatorExpression>("condition").SingleOrDefault();
-				var endExpr = (Expression)match.Get<CSharp.Expression>("endExpr").SingleOrDefault().AcceptVisitor(this, data);
-				
-				if (cond.Operator == CSharp.BinaryOperatorType.LessThanOrEqual ||
-				    cond.Operator == CSharp.BinaryOperatorType.GreaterThanOrEqual) {
-					toExpr = endExpr;
-				}
-				
-				if (cond.Operator == CSharp.BinaryOperatorType.LessThan)
-					toExpr = new BinaryOperatorExpression(endExpr, BinaryOperatorType.Subtract, new PrimitiveExpression(1));
-				if (cond.Operator == CSharp.BinaryOperatorType.GreaterThan)
-					toExpr = new BinaryOperatorExpression(endExpr, BinaryOperatorType.Add, new PrimitiveExpression(1));
-				
-				Expression stepExpr = Expression.Null;
-				
-				var increment = match.Get<CSharp.AssignmentExpression>("increment").SingleOrDefault();
-				var factorExpr = (Expression)match.Get<CSharp.Expression>("factor").SingleOrDefault().AcceptVisitor(this, data);
-				
-				if (increment.Operator == CSharp.AssignmentOperatorType.Add && (factorExpr is PrimitiveExpression && !IsEqual(((PrimitiveExpression)factorExpr).Value, 1)))
-					stepExpr = factorExpr;
-				if (increment.Operator == CSharp.AssignmentOperatorType.Subtract)
-					stepExpr = new UnaryOperatorExpression(UnaryOperatorType.Minus, factorExpr);
-				
-				return new ForStatement() {
-					Variable = iteratorVariable,
-					ToExpression = toExpr,
-					StepExpression = stepExpr,
-					Body = (BlockStatement)match.Get<CSharp.Statement>("body").Single().AcceptVisitor(this, data)
-				};
-			}
-			
-		end:
-			var stmt = new WhileStatement() {
-				Condition = (Expression)forStatement.Condition.AcceptVisitor(this, data),
-				Body = (BlockStatement)forStatement.EmbeddedStatement.AcceptVisitor(this, data)
-			};
-			ConvertNodes(forStatement.Iterators, stmt.Body.Statements);
-			foreach (var initializer in forStatement.Initializers)
-				blocks.Peek().Statements.Add((Statement)initializer.AcceptVisitor(this, data));
-			
-			return EndNode(forStatement, stmt);
-		}
-		
-		bool IsEqual(object value, int num)
-		{
-			if (value is byte)
-				return (byte)value == num;
-			if (value is sbyte)
-				return (sbyte)value == num;
-			if (value is short)
-				return (short)value == num;
-			if (value is ushort)
-				return (ushort)value == num;
-			if (value is int)
-				return (int)value == num;
-			if (value is uint)
-				return (uint)value == num;
-			if (value is long)
-				return (long)value == num;
-			if (value is ulong)
-				return (ulong)value == (ulong)num;
-			
-			throw new InvalidCastException();
-		}
-		
-		public AstNode VisitGotoCaseStatement(CSharp.GotoCaseStatement gotoCaseStatement, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public AstNode VisitGotoDefaultStatement(CSharp.GotoDefaultStatement gotoDefaultStatement, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public AstNode VisitGotoStatement(CSharp.GotoStatement gotoStatement, object data)
-		{
-			return EndNode(gotoStatement, new GoToStatement() { Label = new IdentifierExpression() { Identifier = gotoStatement.Label } });
-		}
-		
-		public AstNode VisitIfElseStatement(CSharp.IfElseStatement ifElseStatement, object data)
-		{
-			var stmt = new IfElseStatement();
-			
-			stmt.Condition = (Expression)ifElseStatement.Condition.AcceptVisitor(this, data);
-			stmt.Body = (Statement)ifElseStatement.TrueStatement.AcceptVisitor(this, data);
-			stmt.ElseBlock = (Statement)ifElseStatement.FalseStatement.AcceptVisitor(this, data);
-			
-			return EndNode(ifElseStatement, stmt);
-		}
-		
-		public AstNode VisitLabelStatement(CSharp.LabelStatement labelStatement, object data)
-		{
-			return EndNode(labelStatement, new LabelDeclarationStatement() { Label = new IdentifierExpression() { Identifier = labelStatement.Label } });
-		}
-		
-		public AstNode VisitLockStatement(CSharp.LockStatement lockStatement, object data)
-		{
-			var stmt = new SyncLockStatement();
-			
-			stmt.Expression = (Expression)lockStatement.Expression.AcceptVisitor(this, data);
-			stmt.Body = (BlockStatement)lockStatement.EmbeddedStatement.AcceptVisitor(this, data);
-			
-			return EndNode(lockStatement, stmt);
-		}
-		
-		public AstNode VisitReturnStatement(CSharp.ReturnStatement returnStatement, object data)
-		{
-			var stmt = new ReturnStatement((Expression)returnStatement.Expression.AcceptVisitor(this, data));
-			
-			return EndNode(returnStatement, stmt);
-		}
-		
-		public AstNode VisitSwitchStatement(CSharp.SwitchStatement switchStatement, object data)
-		{
-			var stmt = new SelectStatement() { Expression = (Expression)switchStatement.Expression.AcceptVisitor(this, data) };
-			ConvertNodes(switchStatement.SwitchSections, stmt.Cases);
-			
-			return EndNode(switchStatement, stmt);
-		}
-		
-		public AstNode VisitSwitchSection(CSharp.SwitchSection switchSection, object data)
-		{
-			var caseStmt = new CaseStatement();
-			ConvertNodes(switchSection.CaseLabels, caseStmt.Clauses);
-			if (switchSection.Statements.Count == 1 && switchSection.Statements.FirstOrDefault() is CSharp.BlockStatement)
-				caseStmt.Body = (BlockStatement)switchSection.Statements.FirstOrDefault().AcceptVisitor(this, data);
-			else {
-				caseStmt.Body = new BlockStatement();
-				ConvertNodes(switchSection.Statements, caseStmt.Body.Statements);
-			}
-			if (caseStmt.Body.LastOrDefault() is ExitStatement && ((ExitStatement)caseStmt.Body.LastOrDefault()).ExitKind == ExitKind.Select)
-				caseStmt.Body.LastOrDefault().Remove();
-			return EndNode(switchSection, caseStmt);
-		}
-		
-		public AstNode VisitCaseLabel(CSharp.CaseLabel caseLabel, object data)
-		{
-			return EndNode(caseLabel, new SimpleCaseClause() { Expression = (Expression)caseLabel.Expression.AcceptVisitor(this, data) });
-		}
-		
-		public AstNode VisitThrowStatement(CSharp.ThrowStatement throwStatement, object data)
-		{
-			return EndNode(throwStatement, new ThrowStatement((Expression)throwStatement.Expression.AcceptVisitor(this, data)));
-		}
-		
-		public AstNode VisitTryCatchStatement(CSharp.TryCatchStatement tryCatchStatement, object data)
-		{
-			var stmt = new TryStatement();
-			
-			stmt.Body = (BlockStatement)tryCatchStatement.TryBlock.AcceptVisitor(this, data);
-			stmt.FinallyBlock = (BlockStatement)tryCatchStatement.FinallyBlock.AcceptVisitor(this, data);
-			ConvertNodes(tryCatchStatement.CatchClauses, stmt.CatchBlocks);
-			
-			return EndNode(tryCatchStatement, stmt);
-		}
-		
-		public AstNode VisitCatchClause(CSharp.CatchClause catchClause, object data)
-		{
-			var clause = new CatchBlock();
-			
-			clause.ExceptionType = (AstType)catchClause.Type.AcceptVisitor(this, data);
-			clause.ExceptionVariable = catchClause.VariableName;
-			ConvertNodes(catchClause.Body.Statements, clause.Statements);
-			
-			return EndNode(catchClause, clause);
-		}
-		
-		public AstNode VisitUncheckedStatement(CSharp.UncheckedStatement uncheckedStatement, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public AstNode VisitUnsafeStatement(CSharp.UnsafeStatement unsafeStatement, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public AstNode VisitUsingStatement(CSharp.UsingStatement usingStatement, object data)
-		{
-			var stmt = new UsingStatement();
-			
-			stmt.Resources.Add(usingStatement.ResourceAcquisition.AcceptVisitor(this, data));
-			stmt.Body = (BlockStatement)usingStatement.EmbeddedStatement.AcceptVisitor(this, data);
-			
-			return EndNode(usingStatement, stmt);
-		}
-		
-		public AstNode VisitVariableDeclarationStatement(CSharp.VariableDeclarationStatement variableDeclarationStatement, object data)
-		{
-			var decl = new LocalDeclarationStatement();
-			decl.Modifiers = Modifiers.Dim;
-			ConvertNodes(variableDeclarationStatement.Variables, decl.Variables);
-			
-			return EndNode(variableDeclarationStatement, decl);
-		}
-		
-		public AstNode VisitWhileStatement(CSharp.WhileStatement whileStatement, object data)
-		{
-			var stmt = new WhileStatement() {
-				Condition = (Expression)whileStatement.Condition.AcceptVisitor(this, data),
-				Body = (BlockStatement)whileStatement.EmbeddedStatement.AcceptVisitor(this, data)
-			};
-			
-			return EndNode(whileStatement, stmt);
-		}
-		
-		public AstNode VisitYieldBreakStatement(CSharp.YieldBreakStatement yieldBreakStatement, object data)
-		{
-			var frame = members.Peek();
-			frame.inIterator = true;
-			return EndNode(yieldBreakStatement, new ReturnStatement());
-		}
-		
-		public AstNode VisitYieldReturnStatement(CSharp.YieldReturnStatement yieldReturnStatement, object data)
-		{
-			var frame = members.Peek();
-			frame.inIterator = true;
-			return EndNode(yieldReturnStatement, new YieldStatement((Expression)yieldReturnStatement.Expression.AcceptVisitor(this, data)));
-		}
-		
-		public AstNode VisitAccessor(CSharp.Accessor accessor, object data)
-		{
-			var result = new Accessor();
-			
-			ConvertNodes(accessor.Attributes, result.Attributes);
-			ConvertNodes(accessor.ModifierTokens, result.ModifierTokens);
-			result.Body = (BlockStatement)accessor.Body.AcceptVisitor(this, data);
-			
-			return EndNode(accessor, result);
-		}
-		
-		public AstNode VisitConstructorDeclaration(CSharp.ConstructorDeclaration constructorDeclaration, object data)
-		{
-			var result = new ConstructorDeclaration();
-			
-			ConvertNodes(constructorDeclaration.Attributes, result.Attributes);
-			ConvertNodes(constructorDeclaration.ModifierTokens, result.ModifierTokens);
-			ConvertNodes(constructorDeclaration.Parameters, result.Parameters);
-			result.Body = (BlockStatement)constructorDeclaration.Body.AcceptVisitor(this, data);
-			if (!constructorDeclaration.Initializer.IsNull)
-				result.Body.Statements.InsertBefore(result.Body.FirstOrDefault(), (Statement)constructorDeclaration.Initializer.AcceptVisitor(this, data));
-			
-			return EndNode(constructorDeclaration, result);
-		}
-		
-		public AstNode VisitConstructorInitializer(CSharp.ConstructorInitializer constructorInitializer, object data)
-		{
-			var result = new InvocationExpression(
-				new MemberAccessExpression() {
-					Target = new InstanceExpression(constructorInitializer.ConstructorInitializerType == CSharp.ConstructorInitializerType.This ? InstanceExpressionType.Me : InstanceExpressionType.MyBase, TextLocation.Empty),
-					MemberName = new Identifier("New", TextLocation.Empty)
-				}
-			);
-			ConvertNodes(constructorInitializer.Arguments, result.Arguments);
-			
-			return EndNode(constructorInitializer, new ExpressionStatement(result));
-		}
-		
-		public AstNode VisitDestructorDeclaration(CSharp.DestructorDeclaration destructorDeclaration, object data)
-		{
-			var finalizer = new MethodDeclaration() { Name = "Finalize", IsSub = true };
-			
-			ConvertNodes(destructorDeclaration.Attributes, finalizer.Attributes);
-			ConvertNodes(destructorDeclaration.ModifierTokens, finalizer.ModifierTokens);
-			finalizer.Body = (BlockStatement)destructorDeclaration.Body.AcceptVisitor(this, data);
-			
-			return EndNode(destructorDeclaration, finalizer);
-		}
-		
-		public AstNode VisitEnumMemberDeclaration(CSharp.EnumMemberDeclaration enumMemberDeclaration, object data)
-		{
-			var result = new EnumMemberDeclaration();
-			
-			ConvertNodes(enumMemberDeclaration.Attributes, result.Attributes);
-			result.Name = new Identifier(enumMemberDeclaration.Name, TextLocation.Empty);
-			result.Value = (Expression)enumMemberDeclaration.Initializer.AcceptVisitor(this, data);
-			
-			return EndNode(enumMemberDeclaration, result);
-		}
-		
-		public AstNode VisitEventDeclaration(CSharp.EventDeclaration eventDeclaration, object data)
-		{
-			members.Push(new MemberInfo());
-			
-			foreach (var evt in eventDeclaration.Variables) {
-				var result = new EventDeclaration();
-
-				ConvertNodes(eventDeclaration.Attributes, result.Attributes);
-				if (types.Any() && types.Peek().ClassType == ClassType.Module)
-					eventDeclaration.Modifiers &= ~CSharp.Modifiers.Static;
-				result.Modifiers = ConvertModifiers(eventDeclaration.Modifiers, eventDeclaration);
-				result.Name = evt.Name;
-				result.ReturnType = (AstType)eventDeclaration.ReturnType.AcceptVisitor(this, data);
-				
-//				CreateImplementsClausesForEvent(result);
-				
-				types.Peek().Members.Add(result);
-			}
-			
-			members.Pop();
-			
-			return EndNode<EventDeclaration>(eventDeclaration, null);
-		}
-		
-		public AstNode VisitCustomEventDeclaration(CSharp.CustomEventDeclaration customEventDeclaration, object data)
-		{
-			var result = new EventDeclaration();
-			
-			members.Push(new MemberInfo());
-			
-			ConvertNodes(customEventDeclaration.Attributes, result.Attributes);
-			if (types.Any() && types.Peek().ClassType == ClassType.Module)
-				customEventDeclaration.Modifiers &= ~CSharp.Modifiers.Static;
-			result.Modifiers = ConvertModifiers(customEventDeclaration.Modifiers, customEventDeclaration);
-			result.IsCustom = true;
-			result.Name = new Identifier(customEventDeclaration.Name, TextLocation.Empty);
-			result.ReturnType = (AstType)customEventDeclaration.ReturnType.AcceptVisitor(this, data);
-			if (!customEventDeclaration.PrivateImplementationType.IsNull)
-				result.ImplementsClause.Add(
-					new InterfaceMemberSpecifier((AstType)customEventDeclaration.PrivateImplementationType.AcceptVisitor(this, data), customEventDeclaration.Name));
-//			else
-//				CreateImplementsClausesForEvent(result);
-			result.AddHandlerBlock = (Accessor)customEventDeclaration.AddAccessor.AcceptVisitor(this, data);
-			result.RemoveHandlerBlock = (Accessor)customEventDeclaration.RemoveAccessor.AcceptVisitor(this, data);
-			
-			members.Pop();
-			
-			return EndNode(customEventDeclaration, result);
-		}
-		
-		public AstNode VisitFieldDeclaration(CSharp.FieldDeclaration fieldDeclaration, object data)
-		{
-			var decl = new FieldDeclaration();
-			
-			members.Push(new MemberInfo());
-			
-			ConvertNodes(fieldDeclaration.Attributes, decl.Attributes);
-			if (types.Any() && types.Peek().ClassType == ClassType.Module)
-				fieldDeclaration.Modifiers &= ~CSharp.Modifiers.Static;
-			decl.Modifiers = ConvertModifiers(fieldDeclaration.Modifiers, fieldDeclaration);
-			ConvertNodes(fieldDeclaration.Variables, decl.Variables);
-			
-			members.Pop();
-			
-			return EndNode(fieldDeclaration, decl);
-		}
-		
-		public AstNode VisitIndexerDeclaration(CSharp.IndexerDeclaration indexerDeclaration, object data)
-		{
-			var decl = new PropertyDeclaration();
-			
-			members.Push(new MemberInfo());
-			
-			ConvertNodes(indexerDeclaration.Attributes.Where(section => section.AttributeTarget != "return"), decl.Attributes);
-			decl.Getter = (Accessor)indexerDeclaration.Getter.AcceptVisitor(this, data);
-			if (types.Any() && types.Peek().ClassType == ClassType.Module)
-				indexerDeclaration.Modifiers &= ~CSharp.Modifiers.Static;
-			decl.Modifiers = ConvertModifiers(indexerDeclaration.Modifiers, indexerDeclaration);
-			decl.Name = new Identifier(indexerDeclaration.Name, TextLocation.Empty);
-			ConvertNodes(indexerDeclaration.Parameters, decl.Parameters);
-			ConvertNodes(indexerDeclaration.Attributes.Where(section => section.AttributeTarget == "return"), decl.ReturnTypeAttributes);
-			if (!indexerDeclaration.PrivateImplementationType.IsNull)
-				decl.ImplementsClause.Add(
-					new InterfaceMemberSpecifier((AstType)indexerDeclaration.PrivateImplementationType.AcceptVisitor(this, data),
-					                             indexerDeclaration.Name));
-			decl.ReturnType = (AstType)indexerDeclaration.ReturnType.AcceptVisitor(this, data);
-			decl.Setter = (Accessor)indexerDeclaration.Setter.AcceptVisitor(this, data);
-			
-			if (!decl.Setter.IsNull) {
-				decl.Setter.Parameters.Add(new ParameterDeclaration() {
-				                           	Name = new Identifier("value", TextLocation.Empty),
-				                           	Type = (AstType)indexerDeclaration.ReturnType.AcceptVisitor(this, data),
-				                           });
-			}
-			
-			members.Pop();
-			
-			return EndNode(indexerDeclaration, decl);
-		}
-		
-		public AstNode VisitMethodDeclaration(CSharp.MethodDeclaration methodDeclaration, object data)
-		{
-			CSharp.Attribute attr;
-			
-			if (types.Any() && types.Peek().ClassType == ClassType.Module)
-				methodDeclaration.Modifiers &= ~CSharp.Modifiers.Static;
-			
-			if ((methodDeclaration.Modifiers & CSharp.Modifiers.Extern) == CSharp.Modifiers.Extern && HasAttribute(methodDeclaration.Attributes, "System.Runtime.InteropServices.DllImportAttribute", out attr)) {
-				var result = new ExternalMethodDeclaration();
-				
-				members.Push(new MemberInfo());
-				
-				// remove AttributeSection if only one attribute is present
-				var attrSec = (CSharp.AttributeSection)attr.Parent;
-				if (attrSec.Attributes.Count == 1)
-					attrSec.Remove();
-				else
-					attr.Remove();
-				
-				result.Library = (attr.Arguments.First().AcceptVisitor(this, data) as PrimitiveExpression).Value.ToString();
-				result.CharsetModifier = ConvertCharset(attr.Arguments);
-				result.Alias = ConvertAlias(attr.Arguments);
-				
-				ConvertNodes(methodDeclaration.Attributes.Where(section => section.AttributeTarget != "return"), result.Attributes);
-				ConvertNodes(methodDeclaration.ModifierTokens, result.ModifierTokens);
-				result.Name = new Identifier(methodDeclaration.Name, TextLocation.Empty);
-				result.IsSub = IsSub(methodDeclaration.ReturnType);
-				ConvertNodes(methodDeclaration.Parameters, result.Parameters);
-				ConvertNodes(methodDeclaration.Attributes.Where(section => section.AttributeTarget == "return"), result.ReturnTypeAttributes);
-				if (!result.IsSub)
-					result.ReturnType = (AstType)methodDeclaration.ReturnType.AcceptVisitor(this, data);
-				
-				if (members.Pop().inIterator) {
-					result.Modifiers |= Modifiers.Iterator;
-				}
-				
-				return EndNode(methodDeclaration, result);
-			} else {
-				var result = new MethodDeclaration();
-				
-				members.Push(new MemberInfo());
-				
-				ConvertNodes(methodDeclaration.Attributes.Where(section => section.AttributeTarget != "return"), result.Attributes);
-				ConvertNodes(methodDeclaration.ModifierTokens, result.ModifierTokens);
-				result.Name = new Identifier(methodDeclaration.Name, TextLocation.Empty);
-				result.IsSub = IsSub(methodDeclaration.ReturnType);
-				ConvertNodes(methodDeclaration.Parameters, result.Parameters);
-				ConvertNodes(methodDeclaration.TypeParameters, result.TypeParameters);
-				ConvertNodes(methodDeclaration.Attributes.Where(section => section.AttributeTarget == "return"), result.ReturnTypeAttributes);
-				if (!methodDeclaration.PrivateImplementationType.IsNull)
-					result.ImplementsClause.Add(
-						new InterfaceMemberSpecifier((AstType)methodDeclaration.PrivateImplementationType.AcceptVisitor(this, data),
-						                             methodDeclaration.Name));
-//				else
-//					CreateImplementsClausesForMethod(result);
-				if (!result.IsSub)
-					result.ReturnType = (AstType)methodDeclaration.ReturnType.AcceptVisitor(this, data);
-				
-				if (methodDeclaration.IsExtensionMethod) {
-					result.Attributes.Add(
-						new AttributeBlock {
-							Attributes = {
-								new Ast.Attribute {
-									Type = AstType.FromName("System.Runtime.CompilerServices.ExtensionAttribute")
-								}
-							}
-						});
-				}
-				
-				result.Body = (BlockStatement)methodDeclaration.Body.AcceptVisitor(this, data);
-				
-				if (members.Pop().inIterator) {
-					result.Modifiers |= Modifiers.Iterator;
-				}
-				
-				return EndNode(methodDeclaration, result);
-			}
-		}
-		
-		void CreateImplementsClausesForMethod(MethodDeclaration result)
-		{
-			if (!types.Any()) return;
-			var current = types.Peek();
-			if (current.ClassType == ClassType.Interface)
-				return;
-			
-			foreach (var type in current.ImplementsTypes) {
-				var resolved = provider.ResolveType(type, current);
-				var found = resolved.GetMembers(m => m.EntityType == EntityType.Method && m.Name == result.Name.Name);
-				if (found.FirstOrDefault() != null) {
-					result.ImplementsClause.Add(new InterfaceMemberSpecifier((AstType)type.Clone(), found.FirstOrDefault().Name));
-				}
-			}
-		}
-		
-		void CreateImplementsClausesForEvent(EventDeclaration result)
-		{
-			if (!types.Any()) return;
-			var current = types.Peek();
-			if (current.ClassType == ClassType.Interface)
-				return;
-			
-			foreach (var type in current.ImplementsTypes) {
-				var resolved = provider.ResolveType(type, current);
-				var found = resolved.GetMembers(m => m.EntityType == EntityType.Event && m.Name == result.Name.Name);
-				if (found.FirstOrDefault() != null) {
-					result.ImplementsClause.Add(new InterfaceMemberSpecifier((AstType)type.Clone(), found.FirstOrDefault().Name));
-				}
-			}
-		}
-		
-		string ConvertAlias(CSharp.AstNodeCollection<CSharp.Expression> arguments)
-		{
-			var pattern = new CSharp.AssignmentExpression() {
-				Left = new CSharp.IdentifierExpression("EntryPoint"),
-				Operator = CSharp.AssignmentOperatorType.Assign,
-				Right = new AnyNode("alias")
-			};
-			
-			var result = arguments
-				.Select(expr => pattern.Match(expr))
-				.FirstOrDefault(r => r.Success);
-			
-			if (result.Success && result.Has("alias")) {
-				return result.Get<CSharp.PrimitiveExpression>("alias")
-					.First().Value.ToString();
-			}
-			
-			return null;
-		}
-		
-		CharsetModifier ConvertCharset(CSharp.AstNodeCollection<CSharp.Expression> arguments)
-		{
-			var pattern = new CSharp.AssignmentExpression() {
-				Left = new CSharp.IdentifierExpression("CharSet"),
-				Operator = CSharp.AssignmentOperatorType.Assign,
-				Right = new NamedNode(
-					"modifier",
-					new CSharp.MemberReferenceExpression() {
-						Target = new CSharp.IdentifierExpression("CharSet"),
-						MemberName = Pattern.AnyString
-					})
-			};
-			
-			var result = arguments
-				.Select(expr => pattern.Match(expr))
-				.FirstOrDefault(r => r.Success);
-			
-			if (result.Success && result.Has("modifier")) {
-				switch (result.Get<CSharp.MemberReferenceExpression>("modifier").First().MemberName) {
-					case "Auto":
-						return CharsetModifier.Auto;
-					case "Ansi":
-						return CharsetModifier.Ansi;
-					case "Unicode":
-						return CharsetModifier.Unicode;
-				}
-			}
-			
-			return CharsetModifier.None;
-		}
-		
-		bool IsSub(CSharp.AstType returnType)
-		{
-			var t = returnType as CSharp.PrimitiveType;
-			return t != null && t.Keyword == "void";
-		}
-		
-		public AstNode VisitOperatorDeclaration(CSharp.OperatorDeclaration operatorDeclaration, object data)
-		{
-			MemberDeclaration result;
-			members.Push(new MemberInfo());
-			
-			if (types.Any() && types.Peek().ClassType == ClassType.Module)
-				operatorDeclaration.Modifiers &= ~CSharp.Modifiers.Static;
-			
-			if (operatorDeclaration.OperatorType == CSharp.OperatorType.Increment || operatorDeclaration.OperatorType == CSharp.OperatorType.Decrement) {
-				var m = new MethodDeclaration();
-				result = m;
-				
-				ConvertNodes(operatorDeclaration.Attributes.Where(section => section.AttributeTarget != "return"), m.Attributes);
-				ConvertNodes(operatorDeclaration.ModifierTokens, m.ModifierTokens);
-				m.Name = operatorDeclaration.OperatorType == CSharp.OperatorType.Increment ? "op_Increment" : "op_Decrement";
-				ConvertNodes(operatorDeclaration.Parameters, m.Parameters);
-				ConvertNodes(operatorDeclaration.Attributes.Where(section => section.AttributeTarget == "return"), m.ReturnTypeAttributes);
-				m.ReturnType = (AstType)operatorDeclaration.ReturnType.AcceptVisitor(this, data);
-				m.Body = (BlockStatement)operatorDeclaration.Body.AcceptVisitor(this, data);
-			} else {
-				var op = new OperatorDeclaration();
-				result = op;
-				
-				ConvertNodes(operatorDeclaration.Attributes.Where(section => section.AttributeTarget != "return"), op.Attributes);
-				ConvertNodes(operatorDeclaration.ModifierTokens, op.ModifierTokens);
-				switch (operatorDeclaration.OperatorType) {
-					case ICSharpCode.NRefactory.CSharp.OperatorType.LogicalNot:
-					case ICSharpCode.NRefactory.CSharp.OperatorType.OnesComplement:
-						op.Operator = OverloadableOperatorType.Not;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.True:
-						op.Operator = OverloadableOperatorType.IsTrue;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.False:
-						op.Operator = OverloadableOperatorType.IsFalse;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.Implicit:
-						op.Modifiers |= Modifiers.Widening;
-						op.Operator = OverloadableOperatorType.CType;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.Explicit:
-						op.Modifiers |= Modifiers.Narrowing;
-						op.Operator = OverloadableOperatorType.CType;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.Addition:
-						op.Operator = OverloadableOperatorType.Add;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.Subtraction:
-						op.Operator = OverloadableOperatorType.Subtract;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.UnaryPlus:
-						op.Operator = OverloadableOperatorType.UnaryPlus;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.UnaryNegation:
-						op.Operator = OverloadableOperatorType.UnaryMinus;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.Multiply:
-						op.Operator = OverloadableOperatorType.Multiply;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.Division:
-						op.Operator = OverloadableOperatorType.Divide;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.Modulus:
-						op.Operator = OverloadableOperatorType.Modulus;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.BitwiseAnd:
-						op.Operator = OverloadableOperatorType.BitwiseAnd;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.BitwiseOr:
-						op.Operator = OverloadableOperatorType.BitwiseOr;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.ExclusiveOr:
-						op.Operator = OverloadableOperatorType.ExclusiveOr;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.LeftShift:
-						op.Operator = OverloadableOperatorType.ShiftLeft;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.RightShift:
-						op.Operator = OverloadableOperatorType.ShiftRight;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.Equality:
-						op.Operator = OverloadableOperatorType.Equality;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.Inequality:
-						op.Operator = OverloadableOperatorType.InEquality;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.GreaterThan:
-						op.Operator = OverloadableOperatorType.GreaterThan;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.LessThan:
-						op.Operator = OverloadableOperatorType.LessThan;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.GreaterThanOrEqual:
-						op.Operator = OverloadableOperatorType.GreaterThanOrEqual;
-						break;
-					case ICSharpCode.NRefactory.CSharp.OperatorType.LessThanOrEqual:
-						op.Operator = OverloadableOperatorType.LessThanOrEqual;
-						break;
-					default:
-						throw new Exception("Invalid value for OperatorType");
-				}
-				ConvertNodes(operatorDeclaration.Parameters, op.Parameters);
-				ConvertNodes(operatorDeclaration.Attributes.Where(section => section.AttributeTarget == "return"), op.ReturnTypeAttributes);
-				op.ReturnType = (AstType)operatorDeclaration.ReturnType.AcceptVisitor(this, data);
-				op.Body = (BlockStatement)operatorDeclaration.Body.AcceptVisitor(this, data);
-			}
-			
-			members.Pop();
-			
-			return EndNode(operatorDeclaration, result);
-			
-		}
-		
-		public AstNode VisitParameterDeclaration(CSharp.ParameterDeclaration parameterDeclaration, object data)
-		{
-			var param = new ParameterDeclaration();
-			
-			ConvertNodes(parameterDeclaration.Attributes, param.Attributes);
-			param.Modifiers = ConvertParamModifiers(parameterDeclaration.ParameterModifier);
-			if ((parameterDeclaration.ParameterModifier & ICSharpCode.NRefactory.CSharp.ParameterModifier.Out) == ICSharpCode.NRefactory.CSharp.ParameterModifier.Out) {
-				AttributeBlock block = new AttributeBlock();
-				block.Attributes.Add(new Ast.Attribute() { Type = new SimpleType("Out") });
-				param.Attributes.Add(block);
-			}
-			param.Name = new Identifier(parameterDeclaration.Name, TextLocation.Empty);
-			param.Type = (AstType)parameterDeclaration.Type.AcceptVisitor(this, data);
-			param.OptionalValue = (Expression)parameterDeclaration.DefaultExpression.AcceptVisitor(this, data);
-			if (!param.OptionalValue.IsNull)
-				param.Modifiers |= Modifiers.Optional;
-			
-			return EndNode(parameterDeclaration, param);
-		}
-		
-		Modifiers ConvertParamModifiers(CSharp.ParameterModifier mods)
-		{
-			switch (mods) {
-				case ICSharpCode.NRefactory.CSharp.ParameterModifier.None:
-				case ICSharpCode.NRefactory.CSharp.ParameterModifier.This:
-					return Modifiers.None;
-				case ICSharpCode.NRefactory.CSharp.ParameterModifier.Ref:
-				case ICSharpCode.NRefactory.CSharp.ParameterModifier.Out:
-					return Modifiers.ByRef;
-				case ICSharpCode.NRefactory.CSharp.ParameterModifier.Params:
-					return Modifiers.ParamArray;
-				default:
-					throw new Exception("Invalid value for ParameterModifier");
-			}
-		}
-		
-		public AstNode VisitPropertyDeclaration(CSharp.PropertyDeclaration propertyDeclaration, object data)
-		{
-			var decl = new PropertyDeclaration();
-			
-			members.Push(new MemberInfo());
-			
-			if (types.Any() && types.Peek().ClassType == ClassType.Module)
-				propertyDeclaration.Modifiers &= ~CSharp.Modifiers.Static;
-			
-			ConvertNodes(propertyDeclaration.Attributes.Where(section => section.AttributeTarget != "return"), decl.Attributes);
-			decl.Getter = (Accessor)propertyDeclaration.Getter.AcceptVisitor(this, data);
-			decl.Modifiers = ConvertModifiers(propertyDeclaration.Modifiers, propertyDeclaration);
-			decl.Name = new Identifier(propertyDeclaration.Name, TextLocation.Empty);
-			ConvertNodes(propertyDeclaration.Attributes.Where(section => section.AttributeTarget == "return"), decl.ReturnTypeAttributes);
-			if (!propertyDeclaration.PrivateImplementationType.IsNull)
-				decl.ImplementsClause.Add(
-					new InterfaceMemberSpecifier((AstType)propertyDeclaration.PrivateImplementationType.AcceptVisitor(this, data),
-					                             propertyDeclaration.Name));
-			decl.ReturnType = (AstType)propertyDeclaration.ReturnType.AcceptVisitor(this, data);
-			decl.Setter = (Accessor)propertyDeclaration.Setter.AcceptVisitor(this, data);
-			
-			if (!decl.Setter.IsNull) {
-				decl.Setter.Parameters.Add(new ParameterDeclaration() {
-				                           	Name = new Identifier("value", TextLocation.Empty),
-				                           	Type = (AstType)propertyDeclaration.ReturnType.AcceptVisitor(this, data),
-				                           });
-			}
-			
-			if (members.Pop().inIterator) {
-				decl.Modifiers |= Modifiers.Iterator;
-			}
-			
-			return EndNode(propertyDeclaration, decl);
-		}
-		
-		public AstNode VisitVariableInitializer(CSharp.VariableInitializer variableInitializer, object data)
-		{
-			var decl = new VariableDeclaratorWithTypeAndInitializer();
-			
-			// look for type in parent
-			decl.Type = (AstType)variableInitializer.Parent
-				.GetChildByRole(ICSharpCode.NRefactory.CSharp.Roles.Type)
-				.AcceptVisitor(this, data);
-			decl.Identifiers.Add(new VariableIdentifier() { Name = variableInitializer.Name });
-			decl.Initializer = (Expression)variableInitializer.Initializer.AcceptVisitor(this, data);
-			
-			return EndNode(variableInitializer, decl);
-		}
-		
-		public AstNode VisitFixedFieldDeclaration(CSharp.FixedFieldDeclaration fixedFieldDeclaration, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public AstNode VisitFixedVariableInitializer(CSharp.FixedVariableInitializer fixedVariableInitializer, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public AstNode VisitSyntaxTree(CSharp.SyntaxTree syntaxTree, object data)
-		{
-			var unit = new CompilationUnit();
-
-			foreach (var node in syntaxTree.Children)
-				unit.AddChild(node.AcceptVisitor(this, null), CompilationUnit.MemberRole);
-			
-			return EndNode(syntaxTree, unit);
-		}
-		
-		public AstNode VisitSimpleType(CSharp.SimpleType simpleType, object data)
-		{
-			var type = new SimpleType(simpleType.Identifier);
-			ConvertNodes(simpleType.TypeArguments, type.TypeArguments);
-			
-			return EndNode(simpleType, type);
-		}
-		
-		public AstNode VisitMemberType(CSharp.MemberType memberType, object data)
-		{
-			AstType target = null;
-			
-			if (memberType.Target is CSharp.SimpleType && ((CSharp.SimpleType)(memberType.Target)).Identifier.Equals("global", StringComparison.Ordinal))
-				target = new PrimitiveType("Global");
-			else
-				target = (AstType)memberType.Target.AcceptVisitor(this, data);
-			
-			var type = new QualifiedType(target, new Identifier(memberType.MemberName, TextLocation.Empty));
-			ConvertNodes(memberType.TypeArguments, type.TypeArguments);
-			
-			return EndNode(memberType, type);
-		}
-		
-		public AstNode VisitComposedType(CSharp.ComposedType composedType, object data)
-		{
-			AstType type = new ComposedType();
-			
-			ConvertNodes(composedType.ArraySpecifiers, ((ComposedType)type).ArraySpecifiers);
-			((ComposedType)type).BaseType = (AstType)composedType.BaseType.AcceptVisitor(this, data);
-			((ComposedType)type).HasNullableSpecifier = composedType.HasNullableSpecifier;
-			
-			for (int i = 0; i < composedType.PointerRank; i++) {
-				var tmp = new SimpleType() { Identifier = "__Pointer" };
-				tmp.TypeArguments.Add(type);
-				type = tmp;
-			}
-			
-			return EndNode(composedType, type);
-		}
-		
-		public AstNode VisitArraySpecifier(CSharp.ArraySpecifier arraySpecifier, object data)
-		{
-			return EndNode(arraySpecifier, new ArraySpecifier(arraySpecifier.Dimensions));
-		}
-		
-		public AstNode VisitPrimitiveType(CSharp.PrimitiveType primitiveType, object data)
-		{
-			string typeName;
-			
-			switch (primitiveType.Keyword) {
-				case "object":
-					typeName = "Object";
-					break;
-				case "bool":
-					typeName = "Boolean";
-					break;
-				case "char":
-					typeName = "Char";
-					break;
-				case "sbyte":
-					typeName = "SByte";
-					break;
-				case "byte":
-					typeName = "Byte";
-					break;
-				case "short":
-					typeName = "Short";
-					break;
-				case "ushort":
-					typeName = "UShort";
-					break;
-				case "int":
-					typeName = "Integer";
-					break;
-				case "uint":
-					typeName = "UInteger";
-					break;
-				case "long":
-					typeName = "Long";
-					break;
-				case "ulong":
-					typeName = "ULong";
-					break;
-				case "float":
-					typeName = "Single";
-					break;
-				case "double":
-					typeName = "Double";
-					break;
-				case "decimal":
-					typeName = "Decimal";
-					break;
-				case "string":
-					typeName = "String";
-					break;
-					// generic constraints
-				case "new":
-					typeName = "New";
-					break;
-				case "struct":
-					typeName = "Structure";
-					break;
-				case "class":
-					typeName = "Class";
-					break;
-				case "void":
-					typeName = "Void";
-					break;
-				default:
-					typeName = "unknown";
-					break;
-			}
-			
-			return EndNode(primitiveType, new PrimitiveType(typeName));
-		}
-		
-		public AstNode VisitComment (CSharp.Comment comment, object data)
-		{
-			var c = new Comment (comment.Content, comment.CommentType == CSharp.CommentType.Documentation);
-			
-			if (comment.CommentType == CSharp.CommentType.MultiLine)
-				throw new NotImplementedException ();
-			
-			return EndNode (comment, c);
-		}
-		
-		public AstNode VisitPreProcessorDirective (CSharp.PreProcessorDirective preProcessorDirective, object data)
-		{
-			// TODO
-			return null;
-		}
-
-		public AstNode VisitTypeParameterDeclaration(CSharp.TypeParameterDeclaration typeParameterDeclaration, object data)
-		{
-			var param = new TypeParameterDeclaration() {
-				Variance = typeParameterDeclaration.Variance,
-				Name = typeParameterDeclaration.Name
-			};
-			
-			var constraint = typeParameterDeclaration.Parent
-				.GetChildrenByRole(ICSharpCode.NRefactory.CSharp.Roles.Constraint)
-				.SingleOrDefault(c => c.TypeParameter.Identifier == typeParameterDeclaration.Name);
-			
-			if (constraint != null)
-				ConvertNodes(constraint.BaseTypes, param.Constraints);
-			
-			// TODO : typeParameterDeclaration.Attributes get lost?
-			//ConvertNodes(typeParameterDeclaration.Attributes
-			
-			return EndNode(typeParameterDeclaration, param);
-		}
-		
-		public AstNode VisitConstraint(CSharp.Constraint constraint, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public AstNode VisitCSharpTokenNode(CSharp.CSharpTokenNode cSharpTokenNode, object data)
-		{
-			var mod = cSharpTokenNode as CSharp.CSharpModifierToken;
-			if (mod != null) {
-				var convertedModifiers = ConvertModifiers(mod.Modifier, mod.Parent);
-				VBModifierToken token = null;
-				if (convertedModifiers != Modifiers.None) {
-					token = new VBModifierToken(TextLocation.Empty, convertedModifiers);
-					return EndNode(cSharpTokenNode, token);
-				}
-				return EndNode(cSharpTokenNode, token);
-			} else {
-				throw new NotSupportedException("Should never visit individual tokens");
-			}
-		}
-		
-		Modifiers ConvertModifiers(CSharp.Modifiers modifier, CSharp.AstNode container)
-		{
-			if ((modifier & CSharp.Modifiers.Any) == CSharp.Modifiers.Any)
-				return Modifiers.Any;
-			
-			var mod = Modifiers.None;
-			
-			if ((modifier & CSharp.Modifiers.Const) == CSharp.Modifiers.Const)
-				mod |= Modifiers.Const;
-			if ((modifier & CSharp.Modifiers.Abstract) == CSharp.Modifiers.Abstract) {
-				if (container is CSharp.TypeDeclaration)
-					mod |= Modifiers.MustInherit;
-				else
-					mod |= Modifiers.MustOverride;
-			}
-			if ((modifier & CSharp.Modifiers.Static) == CSharp.Modifiers.Static)
-				mod |= Modifiers.Shared;
-			
-			if ((modifier & CSharp.Modifiers.Public) == CSharp.Modifiers.Public)
-				mod |= Modifiers.Public;
-			if ((modifier & CSharp.Modifiers.Protected) == CSharp.Modifiers.Protected)
-				mod |= Modifiers.Protected;
-			if ((modifier & CSharp.Modifiers.Internal) == CSharp.Modifiers.Internal)
-				mod |= Modifiers.Friend;
-			if ((modifier & CSharp.Modifiers.Private) == CSharp.Modifiers.Private)
-				mod |= Modifiers.Private;
-			if (container is CSharp.IndexerDeclaration)
-				mod |= Modifiers.Default;
-			bool writeable = IsWriteableProperty(container);
-			bool readable = IsReadableProperty(container);
-			if (writeable && !readable)
-				mod |= Modifiers.WriteOnly;
-			if (readable && !writeable)
-				mod |= Modifiers.ReadOnly;
-			
-			if ((modifier & CSharp.Modifiers.Override) == CSharp.Modifiers.Override)
-				mod |= Modifiers.Overrides;
-			if ((modifier & CSharp.Modifiers.Virtual) == CSharp.Modifiers.Virtual)
-				mod |= Modifiers.Overridable;
-			if ((modifier & CSharp.Modifiers.Async) == CSharp.Modifiers.Async)
-				mod |= Modifiers.Async;
-			
-			return mod;
-		}
-		
-		bool IsReadableProperty(ICSharpCode.NRefactory.CSharp.AstNode container)
-		{
-			if (container is CSharp.IndexerDeclaration) {
-				var i = container as CSharp.IndexerDeclaration;
-				return !i.Getter.IsNull;
-			}
-			
-			if (container is CSharp.PropertyDeclaration) {
-				var p = container as CSharp.PropertyDeclaration;
-				return !p.Getter.IsNull;
-			}
-			
-			return false;
-		}
-		
-		bool IsWriteableProperty(ICSharpCode.NRefactory.CSharp.AstNode container)
-		{
-			if (container is CSharp.IndexerDeclaration) {
-				var i = container as CSharp.IndexerDeclaration;
-				return !i.Setter.IsNull;
-			}
-			
-			if (container is CSharp.PropertyDeclaration) {
-				var p = container as CSharp.PropertyDeclaration;
-				return !p.Setter.IsNull;
-			}
-			
-			return false;
-		}
-		
-		public AstNode VisitIdentifier(CSharp.Identifier identifier, object data)
-		{
-			var ident = new Identifier(identifier.Name, identifier.StartLocation);
-			
-			return EndNode(identifier, ident);
-		}
-		
-		public AstNode VisitPatternPlaceholder(CSharp.AstNode placeholder, ICSharpCode.NRefactory.PatternMatching.Pattern pattern, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		void ConvertNodes<T>(IEnumerable<CSharp.AstNode> nodes, VB.AstNodeCollection<T> result) where T : VB.AstNode
-		{
-			foreach (var node in nodes) {
-				T n = (T)node.AcceptVisitor(this, null);
-				if (n != null)
-					result.Add(n);
-			}
-		}
-		
-		T EndNode<T>(CSharp.AstNode node, T result) where T : VB.AstNode
-		{
-			if (result != null) {
-				CopyAnnotations(node, result);
-			}
-			
-			return result;
-		}
-
-		void CopyAnnotations<T>(CSharp.AstNode node, T result) where T : VB.AstNode
-		{
-			foreach (var ann in node.Annotations)
-				result.AddAnnotation(ann);
-		}
-		
-		bool HasAttribute(CSharp.AstNodeCollection<CSharp.AttributeSection> attributes, string name, out CSharp.Attribute foundAttribute)
-		{
-			foreach (var attr in attributes.SelectMany(a => a.Attributes)) {
-				if (provider.GetTypeNameForAttribute(attr) == name) {
-					foundAttribute = attr;
-					return true;
-				}
-			}
-			foundAttribute = null;
-			return false;
-		}
-		
-		public AstNode VisitDocumentationReference(CSharp.DocumentationReference documentationReference, object data)
-		{
-			throw new NotImplementedException();
-		}
-		
-		public AstNode VisitNewLine(CSharp.NewLineNode newLineNode, object data)
-		{
-			return null;
-		}
-		
-		public AstNode VisitWhitespace(CSharp.WhitespaceNode whitespaceNode, object data)
-		{
-			return null;
-		}
-		
-		public AstNode VisitText(CSharp.TextNode textNode, object data)
-		{
-			return null;
-		}
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Xml/DocumentationElement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Xml/DocumentationElement.cs
index 17d17e1f7d..43e816b31c 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Xml/DocumentationElement.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Xml/DocumentationElement.cs
@@ -198,9 +198,13 @@ namespace ICSharpCode.NRefactory.Xml
 			List<XmlDocumentationElement> list = new List<XmlDocumentationElement>();
 			foreach (var child in childObjects) {
 				var childText = child as AXmlText;
+				var childTag = child as AXmlTag;
 				var childElement = child as AXmlElement;
 				if (childText != null) {
 					list.Add(new XmlDocumentationElement(childText.Value, declaringEntity));
+				} else if (childTag != null && childTag.IsCData) {
+					foreach (var text in childTag.Children.OfType<AXmlText>())
+						list.Add(new XmlDocumentationElement(text.Value, declaringEntity));
 				} else if (childElement != null) {
 					if (nestingLevel < 5 && childElement.Name == "inheritdoc") {
 						string cref = childElement.GetAttributeValue("cref");
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Xml/ICSharpCode.NRefactory.Xml.csproj b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Xml/ICSharpCode.NRefactory.Xml.csproj
index aff2555fcb..352e44ae65 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Xml/ICSharpCode.NRefactory.Xml.csproj
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Xml/ICSharpCode.NRefactory.Xml.csproj
@@ -1,113 +1,121 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <PropertyGroup>
-    <ProjectGuid>{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <OutputType>Library</OutputType>
-    <RootNamespace>ICSharpCode.NRefactory.Xml</RootNamespace>
-    <AssemblyName>ICSharpCode.NRefactory.Xml</AssemblyName>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <NoStdLib>False</NoStdLib>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\ICSharpCode.NRefactory.snk</AssemblyOriginatorKeyFile>
-    <DelaySign>False</DelaySign>
-    <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <OutputPath>..\bin\$(Configuration)\</OutputPath>
-    <DocumentationFile>..\bin\$(Configuration)\ICSharpCode.NRefactory.Xml.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>4194304</BaseAddress>
-    <FileAlignment>4096</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <Optimize>False</Optimize>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <Optimize>True</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>PdbOnly</DebugType>
-    <DebugSymbols>false</DebugSymbols>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Debug' ">
-    <Optimize>False</Optimize>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG;TRACE;NET_4_5</DefineConstants>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
-    <DebugType>Full</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Release' ">
-    <Optimize>True</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>TRACE;NET_4_5</DefineConstants>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
-    <DebugType>PdbOnly</DebugType>
-    <DebugSymbols>false</DebugSymbols>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AXmlAttribute.cs" />
-    <Compile Include="AXmlDocument.cs" />
-    <Compile Include="AXmlElement.cs" />
-    <Compile Include="AXmlObject.cs" />
-    <Compile Include="AXmlReader.cs" />
-    <Compile Include="AXmlTag.cs" />
-    <Compile Include="AXmlText.cs" />
-    <Compile Include="AXmlVisitor.cs" />
-    <Compile Include="DocumentationElement.cs" />
-    <Compile Include="IncrementalParserState.cs" />
-    <Compile Include="InternalDocument.cs" />
-    <Compile Include="ObjectIterator.cs" />
-    <Compile Include="ReuseEqualityComparer.cs" />
-    <Compile Include="SyntaxError.cs" />
-    <Compile Include="TagMatchingHeuristics.cs" />
-    <Compile Include="TextType.cs" />
-    <Compile Include="Log.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TagReader.cs" />
-    <Compile Include="AXmlParser.cs" />
-    <Compile Include="TokenReader.cs" />
-    <Compile Include="XmlSegment.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <PropertyGroup>
+    <ProjectGuid>{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <OutputType>Library</OutputType>
+    <RootNamespace>ICSharpCode.NRefactory.Xml</RootNamespace>
+    <AssemblyName>ICSharpCode.NRefactory.Xml</AssemblyName>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <NoStdLib>False</NoStdLib>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\ICSharpCode.NRefactory.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>False</DelaySign>
+    <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputPath>..\bin\$(Configuration)\</OutputPath>
+    <DocumentationFile>..\bin\$(Configuration)\ICSharpCode.NRefactory.Xml.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE;FULL_AST;NET_4_0</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE;FULL_AST;NET_4_0</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <OutputPath>..\bin\Release\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <OutputPath>..\bin\Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Debug' ">
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE;FULL_AST;NET_4_0;NET_4_5</DefineConstants>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <OutputPath>..\bin\net_4_5_Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Release' ">
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE;FULL_AST;NET_4_0;NET_4_5</DefineConstants>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <OutputPath>..\bin\net_4_5_Release\</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
+      <Link>Properties\GlobalAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="AXmlAttribute.cs" />
+    <Compile Include="AXmlDocument.cs" />
+    <Compile Include="AXmlElement.cs" />
+    <Compile Include="AXmlObject.cs" />
+    <Compile Include="AXmlReader.cs" />
+    <Compile Include="AXmlTag.cs" />
+    <Compile Include="AXmlText.cs" />
+    <Compile Include="AXmlVisitor.cs" />
+    <Compile Include="DocumentationElement.cs" />
+    <Compile Include="IncrementalParserState.cs" />
+    <Compile Include="InternalDocument.cs" />
+    <Compile Include="ObjectIterator.cs" />
+    <Compile Include="ReuseEqualityComparer.cs" />
+    <Compile Include="SyntaxError.cs" />
+    <Compile Include="TagMatchingHeuristics.cs" />
+    <Compile Include="TextType.cs" />
+    <Compile Include="Log.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TagReader.cs" />
+    <Compile Include="AXmlParser.cs" />
+    <Compile Include="TokenReader.cs" />
+    <Compile Include="XmlSegment.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
+      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
+      <Name>ICSharpCode.NRefactory</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Analysis/SymbolCollector.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Analysis/SymbolCollector.cs
index fdd7408d08..7a8959e885 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Analysis/SymbolCollector.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Analysis/SymbolCollector.cs
@@ -85,7 +85,6 @@ namespace ICSharpCode.NRefactory.Analysis
 		/// <returns>The related symbols.</returns>
 		/// <param name="g">The type graph.</param>
 		/// <param name="m">The symbol to search</param>
-		/// <param name="includeOverloads">If set to <c>true</c> overloads are included in the rename.</param>
 		public IEnumerable<ISymbol> GetRelatedSymbols(TypeGraph g, ISymbol m)
 		{
 			switch (m.SymbolKind) {
@@ -118,36 +117,38 @@ namespace ICSharpCode.NRefactory.Analysis
 			case SymbolKind.Indexer:
 			case SymbolKind.Event:
 			case SymbolKind.Property:
-				return new ISymbol[] { m };
-
-			case SymbolKind.Method:
-				var method = (IMethod)m;
+			case SymbolKind.Method: {
+				var member = (IMember)m;
 				List<ISymbol> symbols = new List<ISymbol> ();
-				if (method.ImplementedInterfaceMembers.Count > 0) {
-					foreach (var m2 in method.ImplementedInterfaceMembers) {
+				if (member.ImplementedInterfaceMembers.Count > 0) {
+					foreach (var m2 in member.ImplementedInterfaceMembers) {
 						symbols.AddRange (GetRelatedSymbols (g, m2));
 					}
 				} else {
-					symbols.Add (method);
+					symbols.Add (member);
 				}
 
-				if (method.DeclaringType.Kind == TypeKind.Interface) {
-					foreach (var derivedType in g.GetNode (method.DeclaringTypeDefinition).DerivedTypes) {
-						var member = SearchMember (derivedType.TypeDefinition, method);
-						if (member != null)
-							symbols.Add (member);
+				if (member.DeclaringType.Kind == TypeKind.Interface) {
+					foreach (var derivedType in g.GetNode (member.DeclaringTypeDefinition).DerivedTypes) {
+						var mem = SearchMember (derivedType.TypeDefinition, member);
+						if (mem != null)
+							symbols.Add (mem);
 					}
 				}
 
 
 				if (IncludeOverloads) {
 					IncludeOverloads = false;
-					foreach (var m3 in CollectOverloads (g, method)) {
-						symbols.AddRange (GetRelatedSymbols (g, m3));
+					if (member is IMethod) {
+						foreach (var m3 in CollectOverloads (g, (IMethod)member)) {
+							symbols.AddRange (GetRelatedSymbols (g, m3));
+						}
+					} else if (member.SymbolKind == SymbolKind.Indexer) {
+						symbols.AddRange (member.DeclaringTypeDefinition.GetProperties (p => p.IsIndexer));
 					}
 				}
 				return MakeUnique (symbols);
-			
+			}
 			case SymbolKind.Namespace:
 				// TODO?
 				return new ISymbol[] { m };
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Completion/DisplayFlags.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Completion/DisplayFlags.cs
index a94db3f214..fb7acf9991 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Completion/DisplayFlags.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Completion/DisplayFlags.cs
@@ -33,7 +33,9 @@ namespace ICSharpCode.NRefactory.Completion
 		None = 0,
 		Hidden = 1,
 		Obsolete = 2,
-		DescriptionHasMarkup = 4
+		DescriptionHasMarkup = 4,
+		NamedArgument = 8,
+		IsImportCompletion = 16
 	}
 }
 
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Completion/FrameworkLookup.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Completion/FrameworkLookup.cs
new file mode 100644
index 0000000000..93084da7b9
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Completion/FrameworkLookup.cs
@@ -0,0 +1,490 @@
+//
+// FrameworkLookup.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+
+namespace ICSharpCode.NRefactory.Completion
+{
+	/// <summary>
+	/// The framework lookup provides a fast lookup where an unknow type or extension method may be defined in.
+	/// </summary>
+	public sealed class FrameworkLookup 
+	{
+		/*		 Binary format:
+		 * [Header]
+		 *    [Version] : [Major (byte)] [Minor (byte)] [Build  (byte)]
+		 * 	  [#Types (int)]
+		 *    [#Methods (int)]
+		 *    [#Assemblies (int)]
+		 * [AssemblyListTable] : #Assemblies x [OffsetToAssemblyLists (int)]
+		 * [TypeLookupTable] : #Types x ( [NameHash (int)] [AssemblyPtrToAssemblyListTable (ushort)]
+		 * [ExtMethodLookupTable] : #Methods x ( [NameHash (int)] [AssemblyPtrToAssemblyListTable (ushort)]
+		 * [AssemblyLists] 
+		 *    [#Count (byte)]
+		 *    #Count x [AssemblyLookup] : [Package (string)] [FullName (string)] [Namespace (string)] 
+		*/
+		const int headerSize = 
+			3 + // Version
+			4 + // #Types
+			4 + // #Methods
+			4   // #Assembly
+			/*			+ 4*/;
+
+		public static readonly Version CurrentVersion = new Version (2, 0, 1);
+		public static readonly FrameworkLookup Empty = new FrameworkLookup ();
+
+		string fileName;
+		int[] assemblyListTable;
+		int[] typeLookupTable;
+		int[] extLookupTable;
+
+		/// <summary>
+		/// This method tries to get a matching extension method.
+		/// </summary>
+		/// <returns>The extension method lookups.</returns>
+		/// <param name="resolveResult">The resolve result.</param>
+		public IEnumerable<AssemblyLookup> GetExtensionMethodLookups (UnknownMemberResolveResult resolveResult)
+		{
+			return GetLookup (resolveResult.MemberName, extLookupTable, headerSize + assemblyListTable.Length * 4 + typeLookupTable.Length * 8);
+		}
+
+		/// <summary>
+		/// Tries to get a type out of an unknow identifier result.
+		/// </summary>
+		/// <returns>The assemblies the type may be defined (if any).</returns>
+		/// <param name="resolveResult">The resolve result.</param>
+		/// <param name="typeParameterCount">Type parameter count.</param>
+		/// <param name="isInsideAttributeType">If set to <c>true</c> this resolve result may be inside an attribute.</param>
+		public IEnumerable<AssemblyLookup> GetLookups (UnknownIdentifierResolveResult resolveResult, int typeParameterCount, bool isInsideAttributeType)
+		{
+			string name = isInsideAttributeType ? resolveResult.Identifier + "Attribute" : resolveResult.Identifier;
+
+			var identifier = GetIdentifier (name, typeParameterCount);
+			return GetLookup (identifier, typeLookupTable, headerSize + assemblyListTable.Length * 4);
+		}
+
+		/// <summary>
+		/// Tries to get a type out of an unknow member resolve result. (In case of fully qualified names)
+		/// </summary>
+		/// <returns>The assemblies the type may be defined (if any).</returns>
+		/// <param name="resolveResult">The resolve result.</param>
+		/// <param name="fullMemberName"></param>
+		/// <param name="typeParameterCount">Type parameter count.</param>
+		/// <param name="isInsideAttributeType">If set to <c>true</c> this resolve result may be inside an attribute.</param>
+		public IEnumerable<AssemblyLookup> GetLookups (UnknownMemberResolveResult resolveResult, string fullMemberName, int typeParameterCount, bool isInsideAttributeType)
+		{
+			string name = isInsideAttributeType ? resolveResult.MemberName + "Attribute" : resolveResult.MemberName;
+
+			var identifier = GetIdentifier (name, typeParameterCount);
+			foreach (var lookup in GetLookup (identifier, typeLookupTable, headerSize + assemblyListTable.Length * 4)) {
+				if (fullMemberName.StartsWith (lookup.Namespace, StringComparison.Ordinal))
+					yield return lookup;
+			}
+		}
+
+		/// <summary>
+		/// The assembly lookup determines where a type might be defined.
+		/// It contains the assembly &amp; the namespace.
+		/// </summary>
+		public struct AssemblyLookup
+		{
+			readonly string nspace;
+
+			/// <summary>
+			/// The namespace the requested type is in.
+			/// </summary>
+			public string Namespace {
+				get {
+					return nspace;
+				}
+			}
+
+			readonly string fullName;
+			/// <summary>
+			/// Gets the full name af the assembly.
+			/// </summary>
+			public string FullName {
+				get {
+					return fullName;
+				}
+			}
+
+			readonly string package;
+			/// <summary>
+			/// Gets the package the assembly is in.
+			/// </summary>
+			public string Package {
+				get {
+					return package;
+				}
+			}
+
+			/// <summary>
+			/// Initializes a new instance of the <see cref="AssemblyLookup"/> struct.
+			/// </summary>
+			/// <param name="package">The package name.</param>
+			/// <param name="fullName">The full name of the assembly.</param>
+			/// <param name="nspace">The namespace the type is in.</param>
+			internal AssemblyLookup (string package, string fullName, string nspace)
+			{
+				if (nspace == null)
+					throw new ArgumentNullException ("nspace");
+				if (fullName == null)
+					throw new ArgumentNullException ("fullName");
+				this.package = package;
+				this.fullName = fullName;
+				this.nspace = nspace;
+			}
+
+			public override string ToString ()
+			{
+				return string.Format ("[AssemblyLookup: Namespace={0}, FullName={1}, Package={2}]", Namespace, FullName, Package);
+			}
+
+			public override bool Equals (object obj)
+			{
+				if (obj == null)
+					return false;
+				//					if (ReferenceEquals (this, obj))
+				//						return true;
+				if (obj.GetType () != typeof(AssemblyLookup))
+					return false;
+				var other = (AssemblyLookup)obj;
+				return Namespace == other.Namespace && FullName == other.FullName && Package == other.Package;
+			}
+
+			public override int GetHashCode ()
+			{
+				unchecked {
+					return (Namespace != null ? Namespace.GetHashCode () : 0) ^
+						(FullName != null ? FullName.GetHashCode () : 0) ^ 
+						(Package != null ? Package.GetHashCode () : 0);
+				}
+			}
+		}
+
+		/// <summary>
+		/// This method returns a new framework builder to build a new framework lookup data file.
+		/// </summary>
+		/// <param name="fileName">The file name of the data file.</param>
+		public static FrameworkBuilder Create (string fileName)
+		{
+			return new FrameworkBuilder (fileName);
+		}
+
+		/// <summary>
+		/// Loads a framework lookup object from a file. May return null, if the file wasn't found or has a version mismatch.
+		/// </summary>
+		/// <param name="fileName">File name.</param>
+		public static FrameworkLookup Load (string fileName)
+		{
+			try {
+				if (!File.Exists (fileName))
+					return null;
+			} catch (Exception) {
+				return null;
+			}
+			var result = new FrameworkLookup ();
+			result.fileName = fileName;
+			var fs = File.OpenRead (fileName);
+			using (var reader = new BinaryReader (fs, Encoding.UTF8)) {
+				var major = reader.ReadByte ();
+				var minor = reader.ReadByte ();
+				var build = reader.ReadByte ();
+				var version = new Version (major, minor, build);
+				if (version != CurrentVersion)
+					return null;
+				int typeLookupListCount = reader.ReadInt32 ();
+				int extLookupListCount = reader.ReadInt32 ();
+				int assemblyLookupCount = reader.ReadInt32 ();
+
+				result.assemblyListTable = new int[assemblyLookupCount];
+				for (int i = 0; i < assemblyLookupCount; i++) {
+					result.assemblyListTable[i] = reader.ReadInt32 ();
+				}
+
+				result.typeLookupTable = new int[typeLookupListCount];
+				for (int i = 0; i < typeLookupListCount; i++) {
+					result.typeLookupTable [i] = reader.ReadInt32 ();
+					// skip list offset
+					reader.ReadInt32 ();
+				}
+
+				result.extLookupTable = new int[extLookupListCount];
+				for (int i = 0; i < extLookupListCount; i++) {
+					result.extLookupTable [i] = reader.ReadInt32 ();
+					// skip list offset
+					reader.ReadInt32 ();
+				}
+			}
+			return result;
+		}
+
+		FrameworkLookup ()
+		{
+		}
+
+		IEnumerable<AssemblyLookup> GetLookup (string identifier, int[] lookupTable, int tableOffset)
+		{
+			if (lookupTable == null)
+				yield break;
+
+			int index = Array.BinarySearch (lookupTable, GetStableHashCode (identifier));
+			if (index < 0)
+				yield break;
+
+			using (var reader = new BinaryReader (File.Open (fileName, FileMode.Open, FileAccess.Read, FileShare.Read), Encoding.UTF8)) {
+				reader.BaseStream.Seek (tableOffset + index * 8 + 4, SeekOrigin.Begin);
+				int listPtr = reader.ReadInt32 ();
+
+				reader.BaseStream.Seek (listPtr, SeekOrigin.Begin);
+				var b = reader.ReadInt32 ();
+				var assemblies = new List<ushort> ();
+				while (b-- > 0) {
+					var assembly = reader.ReadUInt16 ();
+					if (assembly < 0 || assembly >= assemblyListTable.Length)
+						throw new InvalidDataException ("Assembly lookup was " + assembly + " but only " + assemblyListTable.Length + " are known.");
+					assemblies.Add (assembly);
+				}
+				foreach (var assembly in assemblies) {
+					reader.BaseStream.Seek (assemblyListTable [assembly], SeekOrigin.Begin);
+
+					var package = reader.ReadString ();
+					var fullName = reader.ReadString ();
+					var ns = reader.ReadString ();
+					yield return new AssemblyLookup (package, fullName, ns);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Retrieves a hash code for the specified string that is stable across
+		/// .NET upgrades.
+		/// 
+		/// Use this method instead of the normal <c>string.GetHashCode</c> if the hash code
+		/// is persisted to disk.
+		/// </summary>
+		static int GetStableHashCode(string text)
+		{
+			unchecked {
+				int h = 0;
+				foreach (char c in text) {
+					h = (h << 5) - h + c;
+				}
+				return h;
+			}
+		}
+
+		static string GetIdentifier (string identifier, int tc)
+		{
+			if (tc == 0)
+				return identifier;
+			return identifier + "`" + tc;
+		}
+
+		public class FrameworkBuilder : IDisposable
+		{
+			readonly string fileName;
+
+			Dictionary<int, List<ushort>> typeLookup = new Dictionary<int, List<ushort>>  ();
+			Dictionary<int, List<ushort>> extensionMethodLookup = new Dictionary<int, List<ushort>>  ();
+			List<AssemblyLookup> assemblyLookups = new List<AssemblyLookup> ();
+			Dictionary<int, string> methodCheck = new Dictionary<int, string> ();
+			Dictionary<int, string> typeCheck = new Dictionary<int, string> ();
+
+			internal FrameworkBuilder (string fileName)
+			{
+				this.fileName = fileName;
+			}
+
+			static int[] WriteTable (MemoryStream stream, Dictionary<int, List<ushort>> table, out List<KeyValuePair<int, List<ushort>>> list)
+			{
+				list = new List<KeyValuePair<int, List<ushort>>> (table);
+				list.Sort ((x, y) => x.Key.CompareTo (y.Key));
+
+				var result = new int[list.Count];
+				using (var bw = new BinaryWriter (stream)) {
+					for (int i = 0; i < result.Length; i++) {
+						result [i] = (int)stream.Length;
+						bw.Write (list [i].Value.Count);
+						foreach (var ii in list [i].Value)
+							bw.Write (ii);
+					}
+				}
+
+				return result;
+			}
+
+			#region IDisposable implementation
+
+			void IDisposable.Dispose ()
+			{
+				var typeLookupMemory = new MemoryStream ();
+				List<KeyValuePair<int, List<ushort>>> typeLookupList;
+				var typeTable = WriteTable (typeLookupMemory, typeLookup, out typeLookupList);
+
+				var extMethodLookupMemory = new MemoryStream ();
+				List<KeyValuePair<int, List<ushort>>> extMethodLookuplist;
+				var extMethodTable = WriteTable (extMethodLookupMemory, extensionMethodLookup, out extMethodLookuplist);
+
+				var assemblyLookupMemory = new MemoryStream ();
+				var assemblyPositionTable = new int[assemblyLookups.Count];
+				using (var writer = new BinaryWriter (assemblyLookupMemory, Encoding.UTF8)) {
+					for (int i = 0; i < assemblyLookups.Count; i++) {
+						var lookup = assemblyLookups[i];
+						assemblyPositionTable[i] = (int)assemblyLookupMemory.Length;
+						writer.Write (lookup.Package);
+						writer.Write (lookup.FullName);
+						writer.Write (lookup.Namespace);
+					}
+				}
+
+				using (var stream = new BinaryWriter (File.OpenWrite (fileName), Encoding.UTF8)) {
+					stream.Write ((byte)CurrentVersion.Major);
+					stream.Write ((byte)CurrentVersion.Minor);
+					stream.Write ((byte)CurrentVersion.Build);
+
+					stream.Write (typeLookupList.Count);
+					stream.Write (extMethodLookuplist.Count);
+					stream.Write (assemblyLookups.Count);
+
+					var typeBuffer = typeLookupMemory.ToArray ();
+					var extMethodBuffer = extMethodLookupMemory.ToArray ();
+
+					int dataOffset = 
+						headerSize + 
+						assemblyLookups.Count * 4 + 
+						typeLookupList.Count * (4 + 4) + 
+						extMethodLookuplist.Count * (4 + 4);
+
+					for (int i = 0; i < assemblyLookups.Count; i++) {
+						stream.Write ((int)(dataOffset + typeBuffer.Length + extMethodBuffer.Length + assemblyPositionTable[i]));
+					}
+
+					for (int i = 0; i < typeLookupList.Count; i++) {
+						stream.Write (typeLookupList [i].Key);
+						stream.Write (dataOffset + typeTable[i]);
+					}
+
+					for (int i = 0; i < extMethodLookuplist.Count; i++) {
+						stream.Write (extMethodLookuplist [i].Key);
+						stream.Write (dataOffset + typeBuffer.Length + extMethodTable[i]);
+					}
+
+					stream.Write (typeBuffer);
+					stream.Write (extMethodBuffer);
+					stream.Write (assemblyLookupMemory.ToArray ());
+					stream.Flush ();
+				}
+			}
+			#endregion
+
+			struct FrameworkLookupId 
+			{
+				public string PackageName;
+				public string AssemblyName;
+				public string NameSpace;
+			}
+
+			Dictionary<FrameworkLookupId, ushort> frameworkLookupTable = new Dictionary<FrameworkLookupId, ushort> ();
+			ushort GetLookup (string packageName, string assemblyName, string ns)
+			{
+				var id = new FrameworkLookupId {
+					PackageName = packageName,
+					AssemblyName = assemblyName,
+					NameSpace = ns
+				};
+				ushort value;
+				if (frameworkLookupTable.TryGetValue (id, out value))
+					return value;
+
+				var result = new AssemblyLookup (packageName, assemblyName, ns);
+				assemblyLookups.Add (result);
+				var index = assemblyLookups.Count - 1;
+				if (index > ushort.MaxValue)
+					throw new InvalidOperationException ("Assembly lookup list overflow > " + ushort.MaxValue + " assemblies.");
+				frameworkLookupTable.Add (id, (ushort)index);
+				return (ushort)index;
+			}
+
+			bool AddToTable (string packageName, string assemblyName, Dictionary<int, List<ushort>> table, Dictionary<int, string> checkTable, string id, string ns)
+			{
+				List<ushort> list;
+				var hash = GetStableHashCode (id);
+
+				if (!table.TryGetValue (hash, out list)) {
+					list = new List<ushort> ();
+					table [hash] = list;
+				} else {
+					string existingString;
+					if (checkTable.TryGetValue (hash, out existingString)) {
+						if (existingString != id)
+							throw new InvalidOperationException ("Duplicate hash for " + existingString + " and "+ id); 
+					} else {
+						checkTable.Add (hash, id);
+					}
+				}
+				var assemblyLookup = GetLookup (packageName, assemblyName, ns);
+				if (!list.Any (a => a.Equals (assemblyLookup))) {
+					list.Add (assemblyLookup);
+					return true;
+				}
+				return false;
+			}
+
+			/// <summary>
+			/// Add a type to the framework lookup.
+			/// </summary>
+			/// <param name="packageName">The package the assembly of the type is defined (can be null).</param>
+			/// <param name="fullAssemblyName">The full assembly name the type is defined (needs to be != null).</param>
+			/// <param name="type">The type definition  (needs to be != null).</param>
+			public void AddLookup (string packageName, string fullAssemblyName, IUnresolvedTypeDefinition type)
+			{
+				if (fullAssemblyName == null)
+					throw new ArgumentNullException ("fullAssemblyName");
+				if (type == null)
+					throw new ArgumentNullException ("type");
+				var id = GetIdentifier (type.Name, type.TypeParameters.Count);
+				if (AddToTable (packageName, fullAssemblyName, typeLookup, typeCheck, id, type.Namespace)) {
+					if (type.IsSealed || type.IsStatic) {
+						foreach (var method in type.Methods) {
+							var m = method as DefaultUnresolvedMethod;
+							if (m == null || !m.IsExtensionMethod)
+								continue;
+							AddToTable (packageName, fullAssemblyName, extensionMethodLookup, methodCheck, method.Name, method.DeclaringTypeDefinition.Namespace);
+						}
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Editor/ITextPasteHandler.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Editor/ITextPasteHandler.cs
new file mode 100644
index 0000000000..3e2a11c71c
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Editor/ITextPasteHandler.cs
@@ -0,0 +1,51 @@
+// ITextPasteHandler.cs
+//
+// Author:
+//   Mike Krüger <mkrueger@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+namespace ICSharpCode.NRefactory.Editor
+{
+	/// <summary>
+	/// The text paste handler can do formattings to a text that is about to be pasted
+	/// into the text document.
+	/// </summary>
+	public interface ITextPasteHandler
+	{
+		/// <summary>
+		/// Formats plain text that is inserted at a specified offset.
+		/// </summary>
+		/// <returns>
+		/// The text that will get inserted at that position.
+		/// </returns>
+		/// <param name="offset">The offset where the text will be inserted.</param>
+		/// <param name="text">The text to be inserted.</param>
+		/// <param name="copyData">Additional data in case the text was copied from a Mono.TextEditor.</param>
+		string FormatPlainText(int offset, string text, byte[] copyData);
+
+		/// <summary>
+		/// Gets the copy data for a specific segment inside the document. This can contain additional information.
+		/// </summary>
+		/// <param name="segment">The text segment that is about to be copied.</param>
+		byte[] GetCopyData(ISegment segment);
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Editor/UnicodeNewline.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Editor/UnicodeNewline.cs
new file mode 100644
index 0000000000..a82c959545
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Editor/UnicodeNewline.cs
@@ -0,0 +1,358 @@
+//
+// UnicodeNewline.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace ICSharpCode.NRefactory
+{
+	public enum UnicodeNewline {
+		Unknown,
+
+		/// <summary>
+		/// Line Feed, U+000A
+		/// </summary>
+		LF = 0x0A,
+
+
+		CRLF = 0x0D0A,
+
+		/// <summary>
+		/// Carriage Return, U+000D
+		/// </summary>
+		CR = 0x0D,
+
+		/// <summary>
+		/// Next Line, U+0085
+		/// </summary>
+		NEL = 0x85,
+
+		/// <summary>
+		/// Vertical Tab, U+000B
+		/// </summary>
+		VT = 0x0B,
+
+		/// <summary>
+		/// Form Feed, U+000C
+		/// </summary>
+		FF = 0x0C,
+
+		/// <summary>
+		/// Line Separator, U+2028
+		/// </summary>
+		LS = 0x2028,
+
+		/// <summary>
+		/// Paragraph Separator, U+2029
+		/// </summary>
+		PS = 0x2029
+	}
+
+
+	/// <summary>
+	/// Defines unicode new lines according to  Unicode Technical Report #13
+	/// http://www.unicode.org/standard/reports/tr13/tr13-5.html
+	/// </summary>
+	public static class NewLine
+	{
+		/// <summary>
+		/// Carriage Return, U+000D
+		/// </summary>
+		public const char CR = (char)0x0D;
+
+		/// <summary>
+		/// Line Feed, U+000A
+		/// </summary>
+		public const char LF = (char)0x0A;
+
+		/// <summary>
+		/// Next Line, U+0085
+		/// </summary>
+		public const char NEL = (char)0x85;
+
+		/// <summary>
+		/// Vertical Tab, U+000B
+		/// </summary>
+		public const char VT  = (char)0x0B;
+
+		/// <summary>
+		/// Form Feed, U+000C
+		/// </summary>
+		public const char FF  = (char)0x0C;
+
+		/// <summary>
+		/// Line Separator, U+2028
+		/// </summary>
+		public const char LS  = (char)0x2028;
+
+		/// <summary>
+		/// Paragraph Separator, U+2029
+		/// </summary>
+		public const char PS  = (char)0x2029;
+
+		/// <summary>
+		/// Determines if a char is a new line delimiter.
+		/// </summary>
+		/// <returns>0 == no new line, otherwise it returns either 1 or 2 depending of the length of the delimiter.</returns>
+		/// <param name="curChar">The current character.</param>
+		/// <param name="nextChar">A callback getting the next character (may be null).</param>
+		public static int GetDelimiterLength (char curChar, Func<char> nextChar = null)
+		{
+			if (curChar == CR) {
+				if (nextChar != null && nextChar () == LF)
+					return 2;
+				return 1;
+			}
+
+			if (curChar == LF || curChar == NEL || curChar == VT || curChar == FF || curChar == LS || curChar == PS)
+				return 1;
+			return 0;
+		}
+
+		/// <summary>
+		/// Determines if a char is a new line delimiter.
+		/// </summary>
+		/// <returns>0 == no new line, otherwise it returns either 1 or 2 depending of the length of the delimiter.</returns>
+		/// <param name="curChar">The current character.</param>
+		/// <param name="nextChar">The next character (if != LF then length will always be 0 or 1).</param>
+		public static int GetDelimiterLength (char curChar, char nextChar)
+		{
+			if (curChar == CR) {
+				if (nextChar == LF)
+					return 2;
+				return 1;
+			}
+
+			if (curChar == LF || curChar == NEL || curChar == VT || curChar == FF || curChar == LS || curChar == PS)
+				return 1;
+			return 0;
+		}
+
+
+		/// <summary>
+		/// Determines if a char is a new line delimiter.
+		/// </summary>
+		/// <returns>0 == no new line, otherwise it returns either 1 or 2 depending of the length of the delimiter.</returns>
+		/// <param name="curChar">The current character.</param>
+		/// <param name = "length">The length of the delimiter</param>
+		/// <param name = "type">The type of the delimiter</param>
+		/// <param name="nextChar">A callback getting the next character (may be null).</param>
+		public static bool TryGetDelimiterLengthAndType (char curChar, out int length, out UnicodeNewline type, Func<char> nextChar = null)
+		{
+			if (curChar == CR) {
+				if (nextChar != null && nextChar () == LF) {
+					length = 2;
+					type = UnicodeNewline.CRLF;
+				} else {
+					length = 1;
+					type = UnicodeNewline.CR;
+
+				}
+				return true;
+			}
+
+			switch (curChar) {
+			case LF:
+				type = UnicodeNewline.LF;
+				length = 1;
+				return true;
+			case NEL:
+				type = UnicodeNewline.NEL;
+				length = 1;
+				return true;
+			case VT:
+				type = UnicodeNewline.VT;
+				length = 1;
+				return true;
+			case FF:
+				type = UnicodeNewline.FF;
+				length = 1;
+				return true;
+			case LS:
+				type = UnicodeNewline.LS;
+				length = 1;
+				return true;
+			case PS:
+				type = UnicodeNewline.PS;
+				length = 1;
+				return true;
+			}
+			length = -1;
+			type = UnicodeNewline.Unknown;
+			return false;
+		}
+
+		/// <summary>
+		/// Determines if a char is a new line delimiter.
+		/// </summary>
+		/// <returns>0 == no new line, otherwise it returns either 1 or 2 depending of the length of the delimiter.</returns>
+		/// <param name="curChar">The current character.</param>
+		/// <param name = "length">The length of the delimiter</param>
+		/// <param name = "type">The type of the delimiter</param>
+		/// <param name="nextChar">The next character (if != LF then length will always be 0 or 1).</param>
+		public static bool TryGetDelimiterLengthAndType (char curChar, out int length, out UnicodeNewline type, char nextChar)
+		{
+			if (curChar == CR) {
+				if (nextChar == LF) {
+					length = 2;
+					type = UnicodeNewline.CRLF;
+				} else {
+					length = 1;
+					type = UnicodeNewline.CR;
+
+				}
+				return true;
+			}
+
+			switch (curChar) {
+			case LF:
+				type = UnicodeNewline.LF;
+				length = 1;
+				return true;
+			case NEL:
+				type = UnicodeNewline.NEL;
+				length = 1;
+				return true;
+			case VT:
+				type = UnicodeNewline.VT;
+				length = 1;
+				return true;
+			case FF:
+				type = UnicodeNewline.FF;
+				length = 1;
+				return true;
+			case LS:
+				type = UnicodeNewline.LS;
+				length = 1;
+				return true;
+			case PS:
+				type = UnicodeNewline.PS;
+				length = 1;
+				return true;
+			}
+			length = -1;
+			type = UnicodeNewline.Unknown;
+			return false;
+		}
+
+		/// <summary>
+		/// Gets the new line type of a given char/next char.
+		/// </summary>
+		/// <returns>0 == no new line, otherwise it returns either 1 or 2 depending of the length of the delimiter.</returns>
+		/// <param name="curChar">The current character.</param>
+		/// <param name="nextChar">A callback getting the next character (may be null).</param>
+		public static UnicodeNewline GetDelimiterType (char curChar, Func<char> nextChar = null)
+		{
+			switch (curChar) {
+				case CR:
+				if (nextChar != null && nextChar () == LF)
+					return UnicodeNewline.CRLF;
+				return UnicodeNewline.CR;
+				case LF:
+				return UnicodeNewline.LF;
+				case NEL:
+				return UnicodeNewline.NEL;
+				case VT:
+				return UnicodeNewline.VT;
+				case FF:
+				return UnicodeNewline.FF;
+				case LS:
+				return UnicodeNewline.LS;
+				case PS:
+				return UnicodeNewline.PS;
+			}
+			return UnicodeNewline.Unknown;
+		}
+
+		/// <summary>
+		/// Gets the new line type of a given char/next char.
+		/// </summary>
+		/// <returns>0 == no new line, otherwise it returns either 1 or 2 depending of the length of the delimiter.</returns>
+		/// <param name="curChar">The current character.</param>
+		/// <param name="nextChar">The next character (if != LF then length will always be 0 or 1).</param>
+		public static UnicodeNewline GetDelimiterType (char curChar, char nextChar)
+		{
+			switch (curChar) {
+			case CR:
+				if (nextChar == LF)
+					return UnicodeNewline.CRLF;
+				return UnicodeNewline.CR;
+			case LF:
+				return UnicodeNewline.LF;
+			case NEL:
+				return UnicodeNewline.NEL;
+			case VT:
+				return UnicodeNewline.VT;
+			case FF:
+				return UnicodeNewline.FF;
+			case LS:
+				return UnicodeNewline.LS;
+			case PS:
+				return UnicodeNewline.PS;
+			}
+			return UnicodeNewline.Unknown;
+		}
+
+		/// <summary>
+		/// Determines if a char is a new line delimiter. 
+		/// 
+		/// Note that the only 2 char wide new line is CR LF and both chars are new line
+		/// chars on their own. For most cases GetDelimiterLength is the better choice.
+		/// </summary>
+		public static bool IsNewLine(char ch)
+		{
+			return GetDelimiterLength (ch) > 0;
+		}
+
+		/// <summary>
+		/// Gets the new line as a string.
+		/// </summary>
+		public static string GetString (UnicodeNewline newLine)
+		{
+			switch (newLine) {
+			case UnicodeNewline.Unknown:
+				return "";
+			case UnicodeNewline.LF:
+				return "\n";
+			case UnicodeNewline.CRLF:
+				return "\r\n";
+			case UnicodeNewline.CR:
+				return "\r";
+			case UnicodeNewline.NEL:
+				return "\u0085";
+			case UnicodeNewline.VT:
+				return "\u000B";
+			case UnicodeNewline.FF:
+				return "\u000C";
+			case UnicodeNewline.LS:
+				return "\u2028";
+			case UnicodeNewline.PS:
+				return "\u2029";
+			default:
+				throw new ArgumentOutOfRangeException ();
+			}
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/IAnnotatable.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/IAnnotatable.cs
index dedc90135b..9030de417e 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/IAnnotatable.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/IAnnotatable.cs
@@ -105,7 +105,7 @@ namespace ICSharpCode.NRefactory
 			if (cloneable != null)
 				annotations = cloneable.Clone();
 		}
-		
+
 		sealed class AnnotationList : List<object>, ICloneable
 		{
 			// There are two uses for this custom list type:
@@ -181,7 +181,7 @@ namespace ICSharpCode.NRefactory
 			AnnotationList list = oldAnnotations as AnnotationList;
 			if (list != null) {
 				lock (list)
-					list.RemoveAll (obj => type.IsInstanceOfType (obj));
+					list.RemoveAll(type.IsInstanceOfType);
 			} else if (type.IsInstanceOfType (oldAnnotations)) {
 				if (Interlocked.CompareExchange (ref this.annotations, null, oldAnnotations) != oldAnnotations) {
 					// Operation failed (some other thread wrote to this.annotations first)
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj b/src/Libraries/NRefactory/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
index 2df94728d8..b9ff77ae35 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
@@ -1,305 +1,308 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <PropertyGroup>
-    <ProjectGuid>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <OutputType>Library</OutputType>
-    <RootNamespace>ICSharpCode.NRefactory</RootNamespace>
-    <AssemblyName>ICSharpCode.NRefactory</AssemblyName>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <NoStdLib>False</NoStdLib>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <RunCodeAnalysis>False</RunCodeAnalysis>
-    <CodeAnalysisRules>-Microsoft.Design#CA1000;-Microsoft.Design#CA1004;-Microsoft.Design#CA1005;-Microsoft.Design#CA1006;-Microsoft.Design#CA1026;-Microsoft.Design#CA1033;-Microsoft.Design#CA1051;-Microsoft.Design#CA1063;-Microsoft.Naming#CA1702;-Microsoft.Naming#CA1704;-Microsoft.Naming#CA1710;-Microsoft.Naming#CA1716;-Microsoft.Naming#CA1720;-Microsoft.Performance#CA1800;-Microsoft.Security#CA2104</CodeAnalysisRules>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\ICSharpCode.NRefactory.snk</AssemblyOriginatorKeyFile>
-    <DelaySign>False</DelaySign>
-    <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>1591</NoWarn>
-    <OutputPath>..\bin\$(Configuration)\</OutputPath>
-    <DocumentationFile>..\bin\$(Configuration)\ICSharpCode.NRefactory.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>465371136</BaseAddress>
-    <FileAlignment>4096</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <StartAction>Project</StartAction>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <Optimize>True</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <OutputPath>..\bin\Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <OutputPath>..\bin\Release\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Debug' ">
-    <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_4_5</DefineConstants>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <StartAction>Project</StartAction>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <OutputPath>..\bin\net_4_5_Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Release' ">
-    <Optimize>True</Optimize>
-    <DefineConstants>TRACE;NET_4_5</DefineConstants>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <OutputPath>..\bin\net_4_5_Release\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Analysis\AbiComparer.cs" />
-    <Compile Include="Analysis\TypeGraph.cs" />
-    <Compile Include="Analysis\TypeGraphNode.cs" />
-    <Compile Include="Documentation\DocumentationComment.cs" />
-    <Compile Include="Documentation\GetPotentiallyNestedClassTypeReference.cs" />
-    <Compile Include="Documentation\IDocumentationProvider.cs" />
-    <Compile Include="Editor\IDocument.cs" />
-    <Compile Include="Editor\IDocumentLine.cs" />
-    <Compile Include="Editor\ISegment.cs" />
-    <Compile Include="Editor\ITextAnchor.cs" />
-    <Compile Include="Editor\ITextSource.cs" />
-    <Compile Include="Editor\ReadOnlyDocument.cs" />
-    <Compile Include="Editor\StringBuilderDocument.cs" />
-    <Compile Include="Editor\StringTextSource.cs" />
-    <Compile Include="Editor\TextChangeEventArgs.cs" />
-    <Compile Include="Editor\TextSourceVersionProvider.cs" />
-    <Compile Include="IAnnotatable.cs" />
-    <Compile Include="PatternMatching\BacktrackingInfo.cs" />
-    <Compile Include="PatternMatching\Choice.cs" />
-    <Compile Include="PatternMatching\AnyNode.cs" />
-    <Compile Include="PatternMatching\Backreference.cs" />
-    <Compile Include="PatternMatching\INode.cs" />
-    <Compile Include="PatternMatching\Match.cs" />
-    <Compile Include="PatternMatching\NamedNode.cs" />
-    <Compile Include="PatternMatching\OptionalNode.cs" />
-    <Compile Include="PatternMatching\Repeat.cs" />
-    <Compile Include="PatternMatching\Pattern.cs" />
-    <Compile Include="Documentation\XmlDocumentationProvider.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\GlobalAssemblyInfo.cs" />
-    <Compile Include="Role.cs" />
-    <Compile Include="Semantics\AmbiguousResolveResult.cs" />
-    <Compile Include="Semantics\ArrayAccessResolveResult.cs" />
-    <Compile Include="Semantics\ArrayCreateResolveResult.cs" />
-    <Compile Include="Semantics\ByReferenceResolveResult.cs" />
-    <Compile Include="Semantics\ConstantResolveResult.cs" />
-    <Compile Include="Semantics\ConversionResolveResult.cs" />
-    <Compile Include="Semantics\SizeOfResolveResult.cs" />
-    <Compile Include="Semantics\ErrorResolveResult.cs" />
-    <Compile Include="Semantics\Conversion.cs" />
-    <Compile Include="Semantics\ForEachResolveResult.cs" />
-    <Compile Include="Semantics\InitializedObjectResolveResult.cs" />
-    <Compile Include="Semantics\InvocationResolveResult.cs" />
-    <Compile Include="Semantics\LocalResolveResult.cs" />
-    <Compile Include="Semantics\MemberResolveResult.cs" />
-    <Compile Include="Semantics\NamedArgumentResolveResult.cs" />
-    <Compile Include="Semantics\NamespaceResolveResult.cs" />
-    <Compile Include="Semantics\OperatorResolveResult.cs" />
-    <Compile Include="Semantics\ResolveResult.cs" />
-    <Compile Include="Semantics\ThisResolveResult.cs" />
-    <Compile Include="Semantics\TypeIsResolveResult.cs" />
-    <Compile Include="Semantics\TypeOfResolveResult.cs" />
-    <Compile Include="Semantics\TypeResolveResult.cs" />
-    <Compile Include="Semantics\UnknownMemberResolveResult.cs" />
-    <Compile Include="TextLocation.cs" />
-    <Compile Include="TypeSystem\Accessibility.cs" />
-    <Compile Include="TypeSystem\AnonymousType.cs" />
-    <Compile Include="TypeSystem\ArrayType.cs" />
-    <Compile Include="TypeSystem\AssemblyQualifiedTypeName.cs" />
-    <Compile Include="TypeSystem\ByReferenceType.cs" />
-    <Compile Include="TypeSystem\CecilLoader.cs" />
-    <Compile Include="TypeSystem\ComHelper.cs" />
-    <Compile Include="TypeSystem\DefaultSolutionSnapshot.cs" />
-    <Compile Include="TypeSystem\DomRegion.cs" />
-    <Compile Include="TypeSystem\EntityType.cs" />
-    <Compile Include="TypeSystem\ISymbol.cs" />
-    <Compile Include="TypeSystem\TypeParameterSubstitution.cs" />
-    <Compile Include="TypeSystem\TypeSystemExtensions.cs" />
-    <Compile Include="TypeSystem\FullTypeName.cs" />
-    <Compile Include="TypeSystem\IAmbience.cs" />
-    <Compile Include="TypeSystem\IAssembly.cs" />
-    <Compile Include="TypeSystem\IAttribute.cs" />
-    <Compile Include="TypeSystem\ICompilation.cs" />
-    <Compile Include="TypeSystem\IConstantValue.cs" />
-    <Compile Include="TypeSystem\IEntity.cs" />
-    <Compile Include="TypeSystem\IEvent.cs" />
-    <Compile Include="TypeSystem\IField.cs" />
-    <Compile Include="TypeSystem\IFreezable.cs" />
-    <Compile Include="TypeSystem\IInterningProvider.cs" />
-    <Compile Include="TypeSystem\IMember.cs" />
-    <Compile Include="TypeSystem\IMethod.cs" />
-    <Compile Include="TypeSystem\Implementation\AbstractFreezable.cs" />
-    <Compile Include="TypeSystem\Implementation\AbstractResolvedEntity.cs" />
-    <Compile Include="TypeSystem\Implementation\AbstractResolvedMember.cs" />
-    <Compile Include="TypeSystem\Implementation\AbstractResolvedTypeParameter.cs" />
-    <Compile Include="TypeSystem\Implementation\AbstractType.cs" />
-    <Compile Include="TypeSystem\Implementation\AbstractUnresolvedEntity.cs" />
-    <Compile Include="TypeSystem\Implementation\AbstractUnresolvedMember.cs" />
-    <Compile Include="TypeSystem\Implementation\AccessorOwnerMemberReference.cs" />
-    <Compile Include="TypeSystem\Implementation\BaseTypeCollector.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultAssemblyReference.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultAttribute.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultMemberReference.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultParameter.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultResolvedEvent.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultResolvedField.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultResolvedMethod.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultResolvedProperty.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultResolvedTypeDefinition.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultResolvedTypeParameter.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedAssembly.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedAttribute.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedEvent.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedField.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedMethod.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedParameter.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedProperty.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedTypeDefinition.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedTypeParameter.cs" />
-    <Compile Include="TypeSystem\Implementation\DummyTypeParameter.cs" />
-    <Compile Include="TypeSystem\Implementation\ExplicitInterfaceImplementationMemberReference.cs" />
-    <Compile Include="TypeSystem\Implementation\FullNameAndTypeParameterCount.cs" />
-    <Compile Include="TypeSystem\Implementation\GetClassTypeReference.cs" />
-    <Compile Include="TypeSystem\Implementation\GetMembersHelper.cs" />
-    <Compile Include="TypeSystem\Implementation\KnownTypeCache.cs" />
-    <Compile Include="TypeSystem\Implementation\MergedNamespace.cs" />
-    <Compile Include="TypeSystem\Implementation\MinimalCorlib.cs" />
-    <Compile Include="TypeSystem\Implementation\NestedTypeReference.cs" />
-    <Compile Include="TypeSystem\Implementation\SimpleCompilation.cs" />
-    <Compile Include="TypeSystem\Implementation\SimpleConstantValue.cs" />
-    <Compile Include="TypeSystem\Implementation\SimpleInterningProvider.cs" />
-    <Compile Include="TypeSystem\Implementation\SpecializedEvent.cs" />
-    <Compile Include="TypeSystem\Implementation\SpecializedField.cs" />
-    <Compile Include="TypeSystem\Implementation\SpecializedMember.cs" />
-    <Compile Include="TypeSystem\Implementation\SpecializedMethod.cs" />
-    <Compile Include="TypeSystem\Implementation\SpecializedProperty.cs" />
-    <Compile Include="TypeSystem\Implementation\SpecializingMemberReference.cs" />
-    <Compile Include="TypeSystem\Implementation\TypeParameterReference.cs" />
-    <Compile Include="TypeSystem\Implementation\TypeWithElementType.cs" />
-    <Compile Include="TypeSystem\Implementation\UnknownType.cs" />
-    <Compile Include="TypeSystem\Implementation\VoidTypeDefinition.cs" />
-    <Compile Include="TypeSystem\INamedElement.cs" />
-    <Compile Include="TypeSystem\INamespace.cs" />
-    <Compile Include="TypeSystem\InheritanceHelper.cs" />
-    <Compile Include="TypeSystem\IntersectionType.cs" />
-    <Compile Include="TypeSystem\IParameter.cs" />
-    <Compile Include="TypeSystem\IParameterizedMember.cs" />
-    <Compile Include="TypeSystem\IUnresolvedFile.cs" />
-    <Compile Include="TypeSystem\IProjectContent.cs" />
-    <Compile Include="TypeSystem\IProperty.cs" />
-    <Compile Include="TypeSystem\ISolutionSnapshot.cs" />
-    <Compile Include="TypeSystem\ISupportsInterning.cs" />
-    <Compile Include="TypeSystem\IType.cs" />
-    <Compile Include="TypeSystem\ITypeDefinition.cs" />
-    <Compile Include="TypeSystem\ITypeParameter.cs" />
-    <Compile Include="TypeSystem\ITypeReference.cs" />
-    <Compile Include="TypeSystem\KnownTypeReference.cs" />
-    <Compile Include="TypeSystem\NullableType.cs" />
-    <Compile Include="TypeSystem\ParameterizedType.cs" />
-    <Compile Include="TypeSystem\ParameterListComparer.cs" />
-    <Compile Include="TypeSystem\ProjectReference.cs" />
-    <Compile Include="TypeSystem\ReflectionNameParseException.cs" />
-    <Compile Include="TypeSystem\SimpleTypeResolveContext.cs" />
-    <Compile Include="TypeSystem\TopLevelTypeName.cs" />
-    <Compile Include="TypeSystem\TypeKind.cs" />
-    <Compile Include="TypeSystem\TypeVisitor.cs" />
-    <Compile Include="TypeSystem\IVariable.cs" />
-    <Compile Include="TypeSystem\PointerType.cs" />
-    <Compile Include="TypeSystem\ReflectionHelper.cs" />
-    <Compile Include="TypeSystem\SpecialType.cs" />
-    <Compile Include="Utils\7BitEncodedInts.cs" />
-    <Compile Include="Utils\BitVector16.cs" />
-    <Compile Include="Utils\BusyManager.cs" />
-    <Compile Include="Utils\CacheManager.cs" />
-    <Compile Include="Utils\CallbackOnDispose.cs" />
-    <Compile Include="Utils\CSharpPrimitiveCast.cs" />
-    <Compile Include="Utils\EmptyList.cs" />
-    <Compile Include="Utils\ExtensionMethods.cs" />
-    <Compile Include="Utils\FastSerializer.cs" />
-    <Compile Include="Utils\GraphVizGraph.cs" />
-    <Compile Include="Utils\ImmutableStack.cs" />
-    <Compile Include="Utils\KeyComparer.cs" />
-    <Compile Include="Utils\LazyInit.cs" />
-    <Compile Include="Utils\MultiDictionary.cs" />
-    <Compile Include="Utils\Platform.cs" />
-    <Compile Include="Utils\ProjectedList.cs" />
-    <Compile Include="Utils\ReferenceComparer.cs" />
-    <Compile Include="Utils\TreeTraversal.cs" />
-    <Compile Include="TypeSystem\Error.cs" />
-    <Compile Include="Completion\ICompletionData.cs" />
-    <Compile Include="Completion\DisplayFlags.cs" />
-    <Compile Include="Completion\IEntityCompletionData.cs" />
-    <Compile Include="Completion\CompletionCategory.cs" />
-    <Compile Include="Completion\IParameterDataProvider.cs" />
-    <Compile Include="Completion\IVariableCompletionData.cs" />
-    <Compile Include="Documentation\IdStringProvider.cs" />
-    <Compile Include="Documentation\IdStringMemberReference.cs" />
-    <Compile Include="Utils\CompositeFormatStringParser\CompositeFormatStringParser.cs" />
-    <Compile Include="Utils\CompositeFormatStringParser\TextSegment.cs" />
-    <Compile Include="Utils\CompositeFormatStringParser\FormatItem.cs" />
-    <Compile Include="Utils\CompositeFormatStringParser\FormatStringSegmentBase.cs" />
-    <Compile Include="Utils\CompositeFormatStringParser\IFormatStringSegment.cs" />
-    <Compile Include="Utils\CompositeFormatStringParser\IFormatStringError.cs" />
-    <Compile Include="Completion\CompletionExtensionMethods.cs" />
-    <Compile Include="Refactoring\IssueMarker.cs" />
-    <Compile Include="Refactoring\Severity.cs" />
-    <Compile Include="Analysis\SymbolCollector.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Completion\" />
-    <Folder Include="TypeSystem\" />
-    <Folder Include="Utils\CompositeFormatStringParser\" />
-    <Folder Include="Refactoring\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\doc\Pattern Matching.html">
-      <Link>PatternMatching\Pattern Matching.html</Link>
-    </None>
-    <None Include="..\doc\XML Documentation.html">
-      <Link>Documentation\XML Documentation.html</Link>
-    </None>
-    <None Include="TypeSystem\IkvmLoader.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\..\cecil\Mono.Cecil.csproj">
-      <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
-      <Name>Mono.Cecil</Name>
-    </ProjectReference>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <PropertyGroup>
+    <ProjectGuid>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <OutputType>Library</OutputType>
+    <RootNamespace>ICSharpCode.NRefactory</RootNamespace>
+    <AssemblyName>ICSharpCode.NRefactory</AssemblyName>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <NoStdLib>False</NoStdLib>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <RunCodeAnalysis>False</RunCodeAnalysis>
+    <CodeAnalysisRules>-Microsoft.Design#CA1000;-Microsoft.Design#CA1004;-Microsoft.Design#CA1005;-Microsoft.Design#CA1006;-Microsoft.Design#CA1026;-Microsoft.Design#CA1033;-Microsoft.Design#CA1051;-Microsoft.Design#CA1063;-Microsoft.Naming#CA1702;-Microsoft.Naming#CA1704;-Microsoft.Naming#CA1710;-Microsoft.Naming#CA1716;-Microsoft.Naming#CA1720;-Microsoft.Performance#CA1800;-Microsoft.Security#CA2104</CodeAnalysisRules>
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\ICSharpCode.NRefactory.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>False</DelaySign>
+    <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>1591</NoWarn>
+    <OutputPath>..\bin\$(Configuration)\</OutputPath>
+    <DocumentationFile>..\bin\$(Configuration)\ICSharpCode.NRefactory.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>465371136</BaseAddress>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <Optimize>False</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <StartAction>Project</StartAction>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <Optimize>True</Optimize>
+    <DefineConstants>TRACE</DefineConstants>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+    <OutputPath>..\bin\Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <OutputPath>..\bin\Release\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Debug' ">
+    <Optimize>False</Optimize>
+    <DefineConstants>DEBUG;TRACE;NET_4_5</DefineConstants>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <StartAction>Project</StartAction>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <OutputPath>..\bin\net_4_5_Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Release' ">
+    <Optimize>True</Optimize>
+    <DefineConstants>TRACE;NET_4_5</DefineConstants>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <OutputPath>..\bin\net_4_5_Release\</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Analysis\AbiComparer.cs" />
+    <Compile Include="Analysis\TypeGraph.cs" />
+    <Compile Include="Analysis\TypeGraphNode.cs" />
+    <Compile Include="Documentation\DocumentationComment.cs" />
+    <Compile Include="Documentation\GetPotentiallyNestedClassTypeReference.cs" />
+    <Compile Include="Documentation\IDocumentationProvider.cs" />
+    <Compile Include="Editor\IDocument.cs" />
+    <Compile Include="Editor\IDocumentLine.cs" />
+    <Compile Include="Editor\ISegment.cs" />
+    <Compile Include="Editor\ITextAnchor.cs" />
+    <Compile Include="Editor\ITextSource.cs" />
+    <Compile Include="Editor\ReadOnlyDocument.cs" />
+    <Compile Include="Editor\StringBuilderDocument.cs" />
+    <Compile Include="Editor\StringTextSource.cs" />
+    <Compile Include="Editor\TextChangeEventArgs.cs" />
+    <Compile Include="Editor\TextSourceVersionProvider.cs" />
+    <Compile Include="IAnnotatable.cs" />
+    <Compile Include="PatternMatching\BacktrackingInfo.cs" />
+    <Compile Include="PatternMatching\Choice.cs" />
+    <Compile Include="PatternMatching\AnyNode.cs" />
+    <Compile Include="PatternMatching\Backreference.cs" />
+    <Compile Include="PatternMatching\INode.cs" />
+    <Compile Include="PatternMatching\Match.cs" />
+    <Compile Include="PatternMatching\NamedNode.cs" />
+    <Compile Include="PatternMatching\OptionalNode.cs" />
+    <Compile Include="PatternMatching\Repeat.cs" />
+    <Compile Include="PatternMatching\Pattern.cs" />
+    <Compile Include="Documentation\XmlDocumentationProvider.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\GlobalAssemblyInfo.cs" />
+    <Compile Include="Role.cs" />
+    <Compile Include="Semantics\AmbiguousResolveResult.cs" />
+    <Compile Include="Semantics\ArrayAccessResolveResult.cs" />
+    <Compile Include="Semantics\ArrayCreateResolveResult.cs" />
+    <Compile Include="Semantics\ByReferenceResolveResult.cs" />
+    <Compile Include="Semantics\ConstantResolveResult.cs" />
+    <Compile Include="Semantics\ConversionResolveResult.cs" />
+    <Compile Include="Semantics\SizeOfResolveResult.cs" />
+    <Compile Include="Semantics\ErrorResolveResult.cs" />
+    <Compile Include="Semantics\Conversion.cs" />
+    <Compile Include="Semantics\ForEachResolveResult.cs" />
+    <Compile Include="Semantics\InitializedObjectResolveResult.cs" />
+    <Compile Include="Semantics\InvocationResolveResult.cs" />
+    <Compile Include="Semantics\LocalResolveResult.cs" />
+    <Compile Include="Semantics\MemberResolveResult.cs" />
+    <Compile Include="Semantics\NamedArgumentResolveResult.cs" />
+    <Compile Include="Semantics\NamespaceResolveResult.cs" />
+    <Compile Include="Semantics\OperatorResolveResult.cs" />
+    <Compile Include="Semantics\ResolveResult.cs" />
+    <Compile Include="Semantics\ThisResolveResult.cs" />
+    <Compile Include="Semantics\TypeIsResolveResult.cs" />
+    <Compile Include="Semantics\TypeOfResolveResult.cs" />
+    <Compile Include="Semantics\TypeResolveResult.cs" />
+    <Compile Include="Semantics\UnknownMemberResolveResult.cs" />
+    <Compile Include="TextLocation.cs" />
+    <Compile Include="TypeSystem\Accessibility.cs" />
+    <Compile Include="TypeSystem\AnonymousType.cs" />
+    <Compile Include="TypeSystem\ArrayType.cs" />
+    <Compile Include="TypeSystem\AssemblyQualifiedTypeName.cs" />
+    <Compile Include="TypeSystem\ByReferenceType.cs" />
+    <Compile Include="TypeSystem\ComHelper.cs" />
+    <Compile Include="TypeSystem\DefaultSolutionSnapshot.cs" />
+    <Compile Include="TypeSystem\DomRegion.cs" />
+    <Compile Include="TypeSystem\EntityType.cs" />
+    <Compile Include="TypeSystem\Implementation\BlobReader.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultVariable.cs" />
+    <Compile Include="TypeSystem\Implementation\ResolvedAttributeBlob.cs" />
+    <Compile Include="TypeSystem\Implementation\UnresolvedAttributeBlob.cs" />
+    <Compile Include="TypeSystem\Implementation\UnresolvedSecurityDeclarationBlob.cs" />
+    <Compile Include="TypeSystem\ISymbol.cs" />
+    <Compile Include="TypeSystem\TypeParameterSubstitution.cs" />
+    <Compile Include="TypeSystem\TypeSystemExtensions.cs" />
+    <Compile Include="TypeSystem\FullTypeName.cs" />
+    <Compile Include="TypeSystem\IAmbience.cs" />
+    <Compile Include="TypeSystem\IAssembly.cs" />
+    <Compile Include="TypeSystem\IAttribute.cs" />
+    <Compile Include="TypeSystem\ICompilation.cs" />
+    <Compile Include="TypeSystem\IConstantValue.cs" />
+    <Compile Include="TypeSystem\IEntity.cs" />
+    <Compile Include="TypeSystem\IEvent.cs" />
+    <Compile Include="TypeSystem\IField.cs" />
+    <Compile Include="TypeSystem\IFreezable.cs" />
+    <Compile Include="TypeSystem\IInterningProvider.cs" />
+    <Compile Include="TypeSystem\IMember.cs" />
+    <Compile Include="TypeSystem\IMethod.cs" />
+    <Compile Include="TypeSystem\Implementation\AbstractFreezable.cs" />
+    <Compile Include="TypeSystem\Implementation\AbstractResolvedEntity.cs" />
+    <Compile Include="TypeSystem\Implementation\AbstractResolvedMember.cs" />
+    <Compile Include="TypeSystem\Implementation\AbstractResolvedTypeParameter.cs" />
+    <Compile Include="TypeSystem\Implementation\AbstractType.cs" />
+    <Compile Include="TypeSystem\Implementation\AbstractUnresolvedEntity.cs" />
+    <Compile Include="TypeSystem\Implementation\AbstractUnresolvedMember.cs" />
+    <Compile Include="TypeSystem\Implementation\AccessorOwnerMemberReference.cs" />
+    <Compile Include="TypeSystem\Implementation\BaseTypeCollector.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultAssemblyReference.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultAttribute.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultMemberReference.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultParameter.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultResolvedEvent.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultResolvedField.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultResolvedMethod.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultResolvedProperty.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultResolvedTypeDefinition.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultResolvedTypeParameter.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedAssembly.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedAttribute.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedEvent.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedField.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedMethod.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedParameter.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedProperty.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedTypeDefinition.cs" />
+    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedTypeParameter.cs" />
+    <Compile Include="TypeSystem\Implementation\DummyTypeParameter.cs" />
+    <Compile Include="TypeSystem\Implementation\ExplicitInterfaceImplementationMemberReference.cs" />
+    <Compile Include="TypeSystem\Implementation\FullNameAndTypeParameterCount.cs" />
+    <Compile Include="TypeSystem\Implementation\GetClassTypeReference.cs" />
+    <Compile Include="TypeSystem\Implementation\GetMembersHelper.cs" />
+    <Compile Include="TypeSystem\Implementation\KnownTypeCache.cs" />
+    <Compile Include="TypeSystem\Implementation\MergedNamespace.cs" />
+    <Compile Include="TypeSystem\Implementation\MinimalCorlib.cs" />
+    <Compile Include="TypeSystem\Implementation\NestedTypeReference.cs" />
+    <Compile Include="TypeSystem\Implementation\SimpleCompilation.cs" />
+    <Compile Include="TypeSystem\Implementation\SimpleConstantValue.cs" />
+    <Compile Include="TypeSystem\Implementation\SimpleInterningProvider.cs" />
+    <Compile Include="TypeSystem\Implementation\SpecializedEvent.cs" />
+    <Compile Include="TypeSystem\Implementation\SpecializedField.cs" />
+    <Compile Include="TypeSystem\Implementation\SpecializedMember.cs" />
+    <Compile Include="TypeSystem\Implementation\SpecializedMethod.cs" />
+    <Compile Include="TypeSystem\Implementation\SpecializedProperty.cs" />
+    <Compile Include="TypeSystem\Implementation\SpecializingMemberReference.cs" />
+    <Compile Include="TypeSystem\Implementation\TypeParameterReference.cs" />
+    <Compile Include="TypeSystem\Implementation\TypeWithElementType.cs" />
+    <Compile Include="TypeSystem\Implementation\UnknownType.cs" />
+    <Compile Include="TypeSystem\Implementation\VoidTypeDefinition.cs" />
+    <Compile Include="TypeSystem\INamedElement.cs" />
+    <Compile Include="TypeSystem\INamespace.cs" />
+    <Compile Include="TypeSystem\InheritanceHelper.cs" />
+    <Compile Include="TypeSystem\IntersectionType.cs" />
+    <Compile Include="TypeSystem\IParameter.cs" />
+    <Compile Include="TypeSystem\IParameterizedMember.cs" />
+    <Compile Include="TypeSystem\IUnresolvedFile.cs" />
+    <Compile Include="TypeSystem\IProjectContent.cs" />
+    <Compile Include="TypeSystem\IProperty.cs" />
+    <Compile Include="TypeSystem\ISolutionSnapshot.cs" />
+    <Compile Include="TypeSystem\ISupportsInterning.cs" />
+    <Compile Include="TypeSystem\IType.cs" />
+    <Compile Include="TypeSystem\ITypeDefinition.cs" />
+    <Compile Include="TypeSystem\ITypeParameter.cs" />
+    <Compile Include="TypeSystem\ITypeReference.cs" />
+    <Compile Include="TypeSystem\KnownTypeReference.cs" />
+    <Compile Include="TypeSystem\NullableType.cs" />
+    <Compile Include="TypeSystem\ParameterizedType.cs" />
+    <Compile Include="TypeSystem\ParameterListComparer.cs" />
+    <Compile Include="TypeSystem\ProjectReference.cs" />
+    <Compile Include="TypeSystem\ReflectionNameParseException.cs" />
+    <Compile Include="TypeSystem\SimpleTypeResolveContext.cs" />
+    <Compile Include="TypeSystem\TopLevelTypeName.cs" />
+    <Compile Include="TypeSystem\TypeKind.cs" />
+    <Compile Include="TypeSystem\TypeVisitor.cs" />
+    <Compile Include="TypeSystem\IVariable.cs" />
+    <Compile Include="TypeSystem\PointerType.cs" />
+    <Compile Include="TypeSystem\ReflectionHelper.cs" />
+    <Compile Include="TypeSystem\SpecialType.cs" />
+    <Compile Include="Utils\7BitEncodedInts.cs" />
+    <Compile Include="Utils\BitVector16.cs" />
+    <Compile Include="Utils\BusyManager.cs" />
+    <Compile Include="Utils\CacheManager.cs" />
+    <Compile Include="Utils\CallbackOnDispose.cs" />
+    <Compile Include="Utils\CSharpPrimitiveCast.cs" />
+    <Compile Include="Utils\EmptyList.cs" />
+    <Compile Include="Utils\ExtensionMethods.cs" />
+    <Compile Include="Utils\FastSerializer.cs" />
+    <Compile Include="Utils\GraphVizGraph.cs" />
+    <Compile Include="Utils\ImmutableStack.cs" />
+    <Compile Include="Utils\KeyComparer.cs" />
+    <Compile Include="Utils\LazyInit.cs" />
+    <Compile Include="Utils\MultiDictionary.cs" />
+    <Compile Include="Utils\Platform.cs" />
+    <Compile Include="Utils\ProjectedList.cs" />
+    <Compile Include="Utils\ReferenceComparer.cs" />
+    <Compile Include="Utils\TreeTraversal.cs" />
+    <Compile Include="TypeSystem\Error.cs" />
+    <Compile Include="Completion\ICompletionData.cs" />
+    <Compile Include="Completion\DisplayFlags.cs" />
+    <Compile Include="Completion\IEntityCompletionData.cs" />
+    <Compile Include="Completion\CompletionCategory.cs" />
+    <Compile Include="Completion\IParameterDataProvider.cs" />
+    <Compile Include="Completion\IVariableCompletionData.cs" />
+    <Compile Include="Documentation\IdStringProvider.cs" />
+    <Compile Include="Documentation\IdStringMemberReference.cs" />
+    <Compile Include="Utils\CompositeFormatStringParser\CompositeFormatStringParser.cs" />
+    <Compile Include="Utils\CompositeFormatStringParser\TextSegment.cs" />
+    <Compile Include="Utils\CompositeFormatStringParser\FormatItem.cs" />
+    <Compile Include="Utils\CompositeFormatStringParser\FormatStringSegmentBase.cs" />
+    <Compile Include="Utils\CompositeFormatStringParser\IFormatStringSegment.cs" />
+    <Compile Include="Utils\CompositeFormatStringParser\IFormatStringError.cs" />
+    <Compile Include="Completion\CompletionExtensionMethods.cs" />
+    <Compile Include="Refactoring\IssueMarker.cs" />
+    <Compile Include="Refactoring\Severity.cs" />
+    <Compile Include="Analysis\SymbolCollector.cs" />
+    <Compile Include="TypeSystem\AssemblyLoader.cs" />
+    <Compile Include="Editor\UnicodeNewline.cs" />
+    <Compile Include="Completion\FrameworkLookup.cs" />
+    <Compile Include="Utils\ComparableList.cs" />
+    <Compile Include="PatternMatching\AnyNodeOrNull.cs" />
+    <Compile Include="Editor\ITextPasteHandler.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Completion\" />
+    <Folder Include="TypeSystem\" />
+    <Folder Include="Utils\CompositeFormatStringParser\" />
+    <Folder Include="Refactoring\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\doc\Pattern Matching.html">
+      <Link>PatternMatching\Pattern Matching.html</Link>
+    </None>
+    <None Include="..\doc\XML Documentation.html">
+      <Link>Documentation\XML Documentation.html</Link>
+    </None>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/AnyNode.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/AnyNode.cs
index 07802a7a6f..f212ba9d43 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/AnyNode.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/AnyNode.cs
@@ -43,4 +43,5 @@ namespace ICSharpCode.NRefactory.PatternMatching
 			return other != null && !other.IsNull;
 		}
 	}
+
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/AnyNodeOrNull.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/AnyNodeOrNull.cs
new file mode 100644
index 0000000000..092897a4ed
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/AnyNodeOrNull.cs
@@ -0,0 +1,58 @@
+//
+// AnyNodeOrNull.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+
+namespace ICSharpCode.NRefactory.PatternMatching
+{
+	/// <summary>
+	/// Matches any node.
+	/// </summary>
+	/// <remarks>Does not match null nodes.</remarks>
+	public class AnyNodeOrNull : Pattern
+	{
+		readonly string groupName;
+
+		public string GroupName {
+			get { return groupName; }
+		}
+
+		public AnyNodeOrNull(string groupName = null)
+		{
+			this.groupName = groupName;
+		}
+
+		public override bool DoMatch(INode other, Match match)
+		{
+			if (other == null) {
+				match.AddNull(this.groupName);
+			} else {
+				match.Add(this.groupName, other);
+			}
+			return true;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/Backreference.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/Backreference.cs
index 57a49f447a..eaf17b4454 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/Backreference.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/Backreference.cs
@@ -41,7 +41,10 @@ namespace ICSharpCode.NRefactory.PatternMatching
 		
 		public override bool DoMatch(INode other, Match match)
 		{
-			return match.Get(referencedGroupName).Last().IsMatch(other);
+			var last = match.Get (referencedGroupName).Last ();
+			if (last == null && other == null)
+				return true;
+			return last.IsMatch(other);
 		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/BacktrackingInfo.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/BacktrackingInfo.cs
index 005c59864d..6a0d3ee8ef 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/BacktrackingInfo.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/BacktrackingInfo.cs
@@ -18,6 +18,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace ICSharpCode.NRefactory.PatternMatching
 {
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/Match.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/Match.cs
index 75bb0cb497..1a9a9f6667 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/Match.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/PatternMatching/Match.cs
@@ -89,5 +89,12 @@ namespace ICSharpCode.NRefactory.PatternMatching
 				results.Add(new KeyValuePair<string, INode>(groupName, node));
 			}
 		}
+
+		internal void AddNull (string groupName)
+		{
+			if (groupName != null) {
+				results.Add(new KeyValuePair<string, INode>(groupName, null));
+			}
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Properties/AssemblyInfo.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Properties/AssemblyInfo.cs
index 1351053bad..3a01e1530f 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Properties/AssemblyInfo.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Properties/AssemblyInfo.cs
@@ -15,6 +15,7 @@
 // FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
+using System.Runtime.CompilerServices;
 
 #region Using directives
 
@@ -31,3 +32,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("Type system and other language-independent parts of NRefactory")]
 
 [assembly: CLSCompliant(true)]
+
+[assembly: InternalsVisibleTo("ICSharpCode.NRefactory.Cecil, PublicKey=00240000048000009400000006020000002400005253413100040000010001004dcf3979c4e902efa4dd2163a039701ed5822e6f1134d77737296abbb97bf0803083cfb2117b4f5446a217782f5c7c634f9fe1fc60b4c11d62c5b3d33545036706296d31903ddcf750875db38a8ac379512f51620bb948c94d0831125fbc5fe63707cbb93f48c1459c4d1749eb7ac5e681a2f0d6d7c60fa527a3c0b8f92b02bf")]
+[assembly: InternalsVisibleTo("ICSharpCode.NRefactory.IKVM, PublicKey=00240000048000009400000006020000002400005253413100040000010001004dcf3979c4e902efa4dd2163a039701ed5822e6f1134d77737296abbb97bf0803083cfb2117b4f5446a217782f5c7c634f9fe1fc60b4c11d62c5b3d33545036706296d31903ddcf750875db38a8ac379512f51620bb948c94d0831125fbc5fe63707cbb93f48c1459c4d1749eb7ac5e681a2f0d6d7c60fa527a3c0b8f92b02bf")]
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Properties/GlobalAssemblyInfo.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Properties/GlobalAssemblyInfo.cs
index 2b34828e62..e86e37ba15 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Properties/GlobalAssemblyInfo.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Properties/GlobalAssemblyInfo.cs
@@ -29,7 +29,7 @@ using System.Runtime.InteropServices;
 // associated with an assembly.
 [assembly: AssemblyCompany("ICSharpCode")]
 [assembly: AssemblyProduct("SharpDevelop/MonoDevelop")]
-[assembly: AssemblyCopyright("Copyright 2010-2013 AlphaSierraPapa")]
+[assembly: AssemblyCopyright("Copyright 2010-2013 AlphaSierraPapa and Xamarin Inc.")]
 
 // This sets the default COM visibility of types in the assembly to invisible.
 // If you need to expose a type to COM, use [ComVisible(true)] on that type.
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Refactoring/IssueMarker.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Refactoring/IssueMarker.cs
index ea029c43cb..8fdd2aafb2 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Refactoring/IssueMarker.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Refactoring/IssueMarker.cs
@@ -40,7 +40,12 @@ namespace ICSharpCode.NRefactory.Refactoring
 		/// <summary>
 		/// The region is marked as underline in the severity color.
 		/// </summary>
-		Underline,
+		WavedLine,
+
+		/// <summary>
+		/// The region is marked as dotted line in the severity color.
+		/// </summary>
+		DottedLine,
 
 		/// <summary>
 		/// The text is grayed out.
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Semantics/ConversionResolveResult.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Semantics/ConversionResolveResult.cs
index bcdc18ffab..8ae2f54374 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Semantics/ConversionResolveResult.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Semantics/ConversionResolveResult.cs
@@ -26,7 +26,7 @@ namespace ICSharpCode.NRefactory.Semantics
 	/// Represents an implicit or explicit type conversion.
 	/// <c>conversionResolveResult.Input.Type</c> is the source type;
 	/// <c>conversionResolveResult.Type</c> is the target type.
-	/// The <see cref="Conversion"/> property provides details about the type of conversion.
+	/// The <see cref="Conversion"/> property provides details about the kind of conversion.
 	/// </summary>
 	public class ConversionResolveResult : ResolveResult
 	{
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Semantics/MemberResolveResult.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Semantics/MemberResolveResult.cs
index 2ad2e18552..85bafc0c57 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Semantics/MemberResolveResult.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Semantics/MemberResolveResult.cs
@@ -39,7 +39,7 @@ namespace ICSharpCode.NRefactory.Semantics
 		readonly bool isVirtualCall;
 		
 		public MemberResolveResult(ResolveResult targetResult, IMember member, IType returnTypeOverride = null)
-			: base(returnTypeOverride ?? (member.SymbolKind == SymbolKind.Constructor ? member.DeclaringType : member.ReturnType))
+			: base(returnTypeOverride ?? ComputeType(member))
 		{
 			this.targetResult = targetResult;
 			this.member = member;
@@ -55,7 +55,7 @@ namespace ICSharpCode.NRefactory.Semantics
 		}
 		
 		public MemberResolveResult(ResolveResult targetResult, IMember member, bool isVirtualCall, IType returnTypeOverride = null)
-			: base(returnTypeOverride ?? (member.SymbolKind == SymbolKind.Constructor ? member.DeclaringType : member.ReturnType))
+			: base(returnTypeOverride ?? ComputeType(member))
 		{
 			this.targetResult = targetResult;
 			this.member = member;
@@ -68,6 +68,19 @@ namespace ICSharpCode.NRefactory.Semantics
 			}
 		}
 		
+		static IType ComputeType(IMember member)
+		{
+			switch (member.SymbolKind) {
+				case SymbolKind.Constructor:
+					return member.DeclaringType;
+				case SymbolKind.Field:
+					if (((IField)member).IsFixed)
+						return new PointerType(member.ReturnType);
+					break;
+			}
+			return member.ReturnType;
+		}
+		
 		public MemberResolveResult(ResolveResult targetResult, IMember member, IType returnType, bool isConstant, object constantValue)
 			: base(returnType)
 		{
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/AssemblyLoader.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/AssemblyLoader.cs
new file mode 100644
index 0000000000..db230f461a
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/AssemblyLoader.cs
@@ -0,0 +1,94 @@
+//
+// AssemblyLoader.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Reflection;
+using System.Threading;
+using ICSharpCode.NRefactory.Documentation;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+
+namespace ICSharpCode.NRefactory.TypeSystem
+{
+	public enum AssemblyLoaderBackend {
+		Auto,
+		Cecil,
+		IKVM
+	}
+
+	public abstract class AssemblyLoader
+	{
+		public static AssemblyLoader Create ()
+		{
+			return Create (AssemblyLoaderBackend.Auto);
+		}
+		
+		public static AssemblyLoader Create (AssemblyLoaderBackend backend)
+		{
+			switch (backend) {
+				case AssemblyLoaderBackend.Auto:
+				case AssemblyLoaderBackend.Cecil:
+					return (AssemblyLoader)Assembly.Load ("ICSharpCode.NRefactory.Cecil").CreateInstance ("ICSharpCode.NRefactory.TypeSystem.CecilLoader");
+				case AssemblyLoaderBackend.IKVM:
+					return (AssemblyLoader)Assembly.Load ("ICSharpCode.NRefactory.IKVM").CreateInstance ("ICSharpCode.NRefactory.TypeSystem.IkvmLoader");
+				default:
+					throw new ArgumentOutOfRangeException ();
+			}
+		}
+
+		/// <summary>
+		/// Specifies whether to include internal members. The default is false.
+		/// </summary>
+		public bool IncludeInternalMembers { get; set; }
+		
+		/// <summary>
+		/// Gets/Sets the cancellation token used by the assembly loader.
+		/// </summary>
+		public CancellationToken CancellationToken { get; set; }
+		
+		/// <summary>
+		/// Gets/Sets the documentation provider that is used to retrieve the XML documentation for all members.
+		/// </summary>
+		public IDocumentationProvider DocumentationProvider { get; set; }
+
+		[CLSCompliant(false)]
+		protected InterningProvider interningProvider = new SimpleInterningProvider();
+
+		/// <summary>
+		/// Gets/Sets the interning provider.
+		/// </summary>
+		public InterningProvider InterningProvider {
+			get { return interningProvider; }
+			set {
+				if (value == null)
+					throw new ArgumentNullException();
+				interningProvider = value;
+			}
+		}
+		
+		public abstract IUnresolvedAssembly LoadAssemblyFile(string fileName);
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs
deleted file mode 100644
index a8b0c6b88f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs
+++ /dev/null
@@ -1,2381 +0,0 @@
-// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this
-// software and associated documentation files (the "Software"), to deal in the Software
-// without restriction, including without limitation the rights to use, copy, modify, merge,
-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Threading;
-using ICSharpCode.NRefactory.Documentation;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using ICSharpCode.NRefactory.Utils;
-using Mono.Cecil;
-
-namespace ICSharpCode.NRefactory.TypeSystem
-{
-	/// <summary>
-	/// Allows loading an IProjectContent from an already compiled assembly.
-	/// </summary>
-	/// <remarks>Instance methods are not thread-safe; you need to create multiple instances of CecilLoader
-	/// if you want to load multiple project contents in parallel.</remarks>
-	public class CecilLoader
-	{
-		/// <summary>
-		/// Version number of the cecil loader.
-		/// Should be incremented when fixing bugs in the cecil loader so that project contents cached on disk
-		/// (which might be incorrect due to the bug) are re-created.
-		/// </summary>
-		const int cecilLoaderVersion = 1;
-		
-		#region Options
-		/// <summary>
-		/// Specifies whether to include internal members. The default is false.
-		/// </summary>
-		public bool IncludeInternalMembers { get; set; }
-		
-		/// <summary>
-		/// Specifies whether to use lazy loading. The default is false.
-		/// If this property is set to true, the CecilLoader will not copy all the relevant information
-		/// out of the Cecil object model, but will maintain references to the Cecil objects.
-		/// This speeds up the loading process and avoids loading unnecessary information, but it causes
-		/// the Cecil objects to stay in memory (which can significantly increase memory usage).
-		/// It also prevents serialization of the Cecil-loaded type system.
-		/// </summary>
-		/// <remarks>
-		/// Because the type system can be used on multiple threads, but Cecil is not
-		/// thread-safe for concurrent read access, the CecilLoader will lock on the <see cref="ModuleDefinition"/> instance
-		/// for every delay-loading operation.
-		/// If you access the Cecil objects directly in your application, you may need to take the same lock.
-		/// </remarks>
-		public bool LazyLoad { get; set; }
-		
-		/// <summary>
-		/// Gets/Sets the documentation provider that is used to retrieve the XML documentation for all members.
-		/// </summary>
-		public IDocumentationProvider DocumentationProvider { get; set; }
-		
-		InterningProvider interningProvider;
-		
-		/// <summary>
-		/// Gets/Sets the interning provider.
-		/// </summary>
-		public InterningProvider InterningProvider {
-			get { return interningProvider; }
-			set {
-				if (value == null)
-					throw new ArgumentNullException();
-				interningProvider = value;
-			}
-		}
-		
-		/// <summary>
-		/// Gets/Sets the cancellation token used by the cecil loader.
-		/// </summary>
-		public CancellationToken CancellationToken { get; set; }
-		
-		/// <summary>
-		/// This delegate gets executed whenever an entity was loaded.
-		/// </summary>
-		/// <remarks>
-		/// This callback may be to build a dictionary that maps between
-		/// entities and cecil objects.
-		/// Warning: if delay-loading is used and the type system is accessed by multiple threads,
-		/// the callback may be invoked concurrently on multiple threads.
-		/// </remarks>
-		public Action<IUnresolvedEntity, MemberReference> OnEntityLoaded { get; set; }
-		
-		/// <summary>
-		/// Gets a value indicating whether this instance stores references to the cecil objects.
-		/// </summary>
-		/// <value>
-		/// <c>true</c> if this instance has references to the cecil objects; otherwise, <c>false</c>.
-		/// </value>
-		public bool HasCecilReferences { get { return typeSystemTranslationTable != null; } }
-		#endregion
-		
-		ModuleDefinition currentModule;
-		CecilUnresolvedAssembly currentAssembly;
-		
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.TypeSystem.CecilLoader"/> class.
-		/// </summary>
-		public CecilLoader()
-		{
-			// Enable interning by default.
-			this.InterningProvider = new SimpleInterningProvider();
-		}
-		
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.TypeSystem.CecilLoader"/> class.
-		/// </summary>
-		/// <param name='createCecilReferences'>
-		/// If true references to the cecil objects are hold. In this case the cecil loader can do a type system -> cecil mapping.
-		/// </param>
-		[Obsolete("The built-in entity<->cecil mapping is obsolete. Use the OnEntityLoaded callback instead!")]
-		public CecilLoader(bool createCecilReferences) : this()
-		{
-			if (createCecilReferences)
-				typeSystemTranslationTable = new Dictionary<object, object> ();
-		}
-		
-		/// <summary>
-		/// Creates a nested CecilLoader for lazy-loading.
-		/// </summary>
-		private CecilLoader(CecilLoader loader)
-		{
-			// use a shared typeSystemTranslationTable
-			this.typeSystemTranslationTable = loader.typeSystemTranslationTable;
-			this.IncludeInternalMembers = loader.IncludeInternalMembers;
-			this.LazyLoad = loader.LazyLoad;
-			this.OnEntityLoaded = loader.OnEntityLoaded;
-			this.currentModule = loader.currentModule;
-			this.currentAssembly = loader.currentAssembly;
-			// don't use interning - the interning provider is most likely not thread-safe
-			this.interningProvider = InterningProvider.Dummy;
-			// don't use cancellation for delay-loaded members
-		}
-
-		#region Load From AssemblyDefinition
-		/// <summary>
-		/// Loads the assembly definition into a project content.
-		/// </summary>
-		/// <returns>Unresolved type system representing the assembly</returns>
-		[CLSCompliant(false)]
-		public IUnresolvedAssembly LoadAssembly(AssemblyDefinition assemblyDefinition)
-		{
-			if (assemblyDefinition == null)
-				throw new ArgumentNullException("assemblyDefinition");
-			return LoadModule(assemblyDefinition.MainModule);
-		}
-		
-		/// <summary>
-		/// Loads the module definition into a project content.
-		/// </summary>
-		/// <returns>Unresolved type system representing the assembly</returns>
-		[CLSCompliant(false)]
-		public IUnresolvedAssembly LoadModule(ModuleDefinition moduleDefinition)
-		{
-			if (moduleDefinition == null)
-				throw new ArgumentNullException("moduleDefinition");
-			
-			this.currentModule = moduleDefinition;
-			
-			// Read assembly and module attributes
-			IList<IUnresolvedAttribute> assemblyAttributes = new List<IUnresolvedAttribute>();
-			IList<IUnresolvedAttribute> moduleAttributes = new List<IUnresolvedAttribute>();
-			AssemblyDefinition assemblyDefinition = moduleDefinition.Assembly;
-			if (assemblyDefinition != null) {
-				AddAttributes(assemblyDefinition, assemblyAttributes);
-			}
-			AddAttributes(moduleDefinition, moduleAttributes);
-			
-			assemblyAttributes = interningProvider.InternList(assemblyAttributes);
-			moduleAttributes = interningProvider.InternList(moduleAttributes);
-			
-			this.currentAssembly = new CecilUnresolvedAssembly(assemblyDefinition != null ? assemblyDefinition.Name.FullName : moduleDefinition.Name, this.DocumentationProvider);
-			currentAssembly.Location = moduleDefinition.FullyQualifiedName;
-			currentAssembly.AssemblyAttributes.AddRange(assemblyAttributes);
-			currentAssembly.ModuleAttributes.AddRange(assemblyAttributes);
-			
-			// Register type forwarders:
-			foreach (ExportedType type in moduleDefinition.ExportedTypes) {
-				if (type.IsForwarder) {
-					int typeParameterCount;
-					string ns = type.Namespace;
-					string name = ReflectionHelper.SplitTypeParameterCountFromReflectionName(type.Name, out typeParameterCount);
-					ns = interningProvider.Intern(ns);
-					name = interningProvider.Intern(name);
-					var typeRef = new GetClassTypeReference(GetAssemblyReference(type.Scope), ns, name, typeParameterCount);
-					typeRef = interningProvider.Intern(typeRef);
-					var key = new TopLevelTypeName(ns, name, typeParameterCount);
-					currentAssembly.AddTypeForwarder(key, typeRef);
-				}
-			}
-			
-			// Create and register all types:
-			CecilLoader cecilLoaderCloneForLazyLoading = LazyLoad ? new CecilLoader(this) : null;
-			List<TypeDefinition> cecilTypeDefs = new List<TypeDefinition>();
-			List<DefaultUnresolvedTypeDefinition> typeDefs = new List<DefaultUnresolvedTypeDefinition>();
-			foreach (TypeDefinition td in moduleDefinition.Types) {
-				this.CancellationToken.ThrowIfCancellationRequested();
-				if (this.IncludeInternalMembers || (td.Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.Public) {
-					string name = td.Name;
-					if (name.Length == 0)
-						continue;
-					
-					if (this.LazyLoad) {
-						var t = new LazyCecilTypeDefinition(cecilLoaderCloneForLazyLoading, td);
-						currentAssembly.AddTypeDefinition(t);
-						RegisterCecilObject(t, td);
-					} else {
-						var t = CreateTopLevelTypeDefinition(td);
-						cecilTypeDefs.Add(td);
-						typeDefs.Add(t);
-						currentAssembly.AddTypeDefinition(t);
-						// The registration will happen after the members are initialized
-					}
-				}
-			}
-			// Initialize the type's members:
-			for (int i = 0; i < typeDefs.Count; i++) {
-				InitTypeDefinition(cecilTypeDefs[i], typeDefs[i]);
-			}
-			
-			AddToTypeSystemTranslationTable(this.currentAssembly, assemblyDefinition);
-			// Freezing the assembly here is important:
-			// otherwise it will be frozen when a compilation is first created
-			// from it. But freezing has the effect of changing some collection instances
-			// (to ReadOnlyCollection). This hidden mutation was causing a crash
-			// when the FastSerializer was saving the assembly at the same time as
-			// the first compilation was created from it.
-			// By freezing the assembly now, we ensure it is usable on multiple
-			// threads without issues.
-			currentAssembly.Freeze();
-			
-			var result = this.currentAssembly;
-			this.currentAssembly = null;
-			this.currentModule = null;
-			return result;
-		}
-		
-		/// <summary>
-		/// Sets the current module.
-		/// This causes ReadTypeReference() to use <see cref="DefaultAssemblyReference.CurrentAssembly"/> for references
-		/// in that module.
-		/// </summary>
-		[CLSCompliant(false)]
-		public void SetCurrentModule(ModuleDefinition module)
-		{
-			this.currentModule = module;
-		}
-		
-		/// <summary>
-		/// Loads a type from Cecil.
-		/// </summary>
-		/// <param name="typeDefinition">The Cecil TypeDefinition.</param>
-		/// <returns>ITypeDefinition representing the Cecil type.</returns>
-		[CLSCompliant(false)]
-		public IUnresolvedTypeDefinition LoadType(TypeDefinition typeDefinition)
-		{
-			if (typeDefinition == null)
-				throw new ArgumentNullException("typeDefinition");
-			var td = CreateTopLevelTypeDefinition(typeDefinition);
-			InitTypeDefinition(typeDefinition, td);
-			return td;
-		}
-		#endregion
-		
-		#region IUnresolvedAssembly implementation
-		[Serializable, FastSerializerVersion(cecilLoaderVersion)]
-		sealed class CecilUnresolvedAssembly : DefaultUnresolvedAssembly, IDocumentationProvider
-		{
-			readonly IDocumentationProvider documentationProvider;
-			
-			public CecilUnresolvedAssembly(string fullAssemblyName, IDocumentationProvider documentationProvider)
-				: base(fullAssemblyName)
-			{
-				this.documentationProvider = documentationProvider;
-			}
-			
-			DocumentationComment IDocumentationProvider.GetDocumentation(IEntity entity)
-			{
-				if (documentationProvider != null)
-					return documentationProvider.GetDocumentation(entity);
-				else
-					return null;
-			}
-		}
-		#endregion
-		
-		#region Load Assembly From Disk
-		public IUnresolvedAssembly LoadAssemblyFile(string fileName)
-		{
-			if (fileName == null)
-				throw new ArgumentNullException("fileName");
-			var param = new ReaderParameters { AssemblyResolver = new DummyAssemblyResolver() };
-			ModuleDefinition module = ModuleDefinition.ReadModule(fileName, param);
-			return LoadModule(module);
-		}
-		
-		// used to prevent Cecil from loading referenced assemblies
-		sealed class DummyAssemblyResolver : IAssemblyResolver
-		{
-			public AssemblyDefinition Resolve(AssemblyNameReference name)
-			{
-				return null;
-			}
-			
-			public AssemblyDefinition Resolve(string fullName)
-			{
-				return null;
-			}
-			
-			public AssemblyDefinition Resolve(AssemblyNameReference name, ReaderParameters parameters)
-			{
-				return null;
-			}
-			
-			public AssemblyDefinition Resolve(string fullName, ReaderParameters parameters)
-			{
-				return null;
-			}
-		}
-		#endregion
-		
-		#region Read Type Reference
-		/// <summary>
-		/// Reads a type reference.
-		/// </summary>
-		/// <param name="type">The Cecil type reference that should be converted into
-		/// a type system type reference.</param>
-		/// <param name="typeAttributes">Attributes associated with the Cecil type reference.
-		/// This is used to support the 'dynamic' type.</param>
-		[CLSCompliant(false)]
-		public ITypeReference ReadTypeReference(TypeReference type, ICustomAttributeProvider typeAttributes = null)
-		{
-			int typeIndex = 0;
-			return CreateType(type, typeAttributes, ref typeIndex);
-		}
-		
-		ITypeReference CreateType(TypeReference type, ICustomAttributeProvider typeAttributes, ref int typeIndex)
-		{
-			while (type is OptionalModifierType || type is RequiredModifierType) {
-				type = ((TypeSpecification)type).ElementType;
-			}
-			if (type == null) {
-				return SpecialType.UnknownType;
-			}
-			
-			if (type is Mono.Cecil.ByReferenceType) {
-				typeIndex++;
-				return interningProvider.Intern(
-					new ByReferenceTypeReference(
-						CreateType(
-							(type as Mono.Cecil.ByReferenceType).ElementType,
-							typeAttributes, ref typeIndex)));
-			} else if (type is Mono.Cecil.PointerType) {
-				typeIndex++;
-				return interningProvider.Intern(
-					new PointerTypeReference(
-						CreateType(
-							(type as Mono.Cecil.PointerType).ElementType,
-							typeAttributes, ref typeIndex)));
-			} else if (type is Mono.Cecil.ArrayType) {
-				typeIndex++;
-				return interningProvider.Intern(
-					new ArrayTypeReference(
-						CreateType(
-							(type as Mono.Cecil.ArrayType).ElementType,
-							typeAttributes, ref typeIndex),
-						(type as Mono.Cecil.ArrayType).Rank));
-			} else if (type is GenericInstanceType) {
-				GenericInstanceType gType = (GenericInstanceType)type;
-				ITypeReference baseType = CreateType(gType.ElementType, typeAttributes, ref typeIndex);
-				ITypeReference[] para = new ITypeReference[gType.GenericArguments.Count];
-				for (int i = 0; i < para.Length; ++i) {
-					typeIndex++;
-					para[i] = CreateType(gType.GenericArguments[i], typeAttributes, ref typeIndex);
-				}
-				return interningProvider.Intern(new ParameterizedTypeReference(baseType, para));
-			} else if (type is GenericParameter) {
-				GenericParameter typeGP = (GenericParameter)type;
-				return TypeParameterReference.Create(typeGP.Owner is MethodDefinition ? SymbolKind.Method : SymbolKind.TypeDefinition, typeGP.Position);
-			} else if (type.IsNested) {
-				ITypeReference typeRef = CreateType(type.DeclaringType, typeAttributes, ref typeIndex);
-				int partTypeParameterCount;
-				string namepart = ReflectionHelper.SplitTypeParameterCountFromReflectionName(type.Name, out partTypeParameterCount);
-				namepart = interningProvider.Intern(namepart);
-				return interningProvider.Intern(new NestedTypeReference(typeRef, namepart, partTypeParameterCount));
-			} else {
-				string ns = interningProvider.Intern(type.Namespace ?? string.Empty);
-				string name = type.Name;
-				if (name == null)
-					throw new InvalidOperationException("type.Name returned null. Type: " + type.ToString());
-				
-				if (name == "Object" && ns == "System" && HasDynamicAttribute(typeAttributes, typeIndex)) {
-					return SpecialType.Dynamic;
-				} else {
-					int typeParameterCount;
-					name = ReflectionHelper.SplitTypeParameterCountFromReflectionName(name, out typeParameterCount);
-					name = interningProvider.Intern(name);
-					if (currentAssembly != null) {
-						IUnresolvedTypeDefinition c = currentAssembly.GetTypeDefinition(ns, name, typeParameterCount);
-						if (c != null)
-							return c;
-					}
-					return interningProvider.Intern(new GetClassTypeReference(GetAssemblyReference(type.Scope), ns, name, typeParameterCount));
-				}
-			}
-		}
-		
-		IAssemblyReference GetAssemblyReference(IMetadataScope scope)
-		{
-			if (scope == null || scope == currentModule)
-				return DefaultAssemblyReference.CurrentAssembly;
-			else
-				return interningProvider.Intern(new DefaultAssemblyReference(scope.Name));
-		}
-		
-		static bool HasDynamicAttribute(ICustomAttributeProvider attributeProvider, int typeIndex)
-		{
-			if (attributeProvider == null || !attributeProvider.HasCustomAttributes)
-				return false;
-			foreach (CustomAttribute a in attributeProvider.CustomAttributes) {
-				TypeReference type = a.AttributeType;
-				if (type.Name == "DynamicAttribute" && type.Namespace == "System.Runtime.CompilerServices") {
-					if (a.ConstructorArguments.Count == 1) {
-						CustomAttributeArgument[] values = a.ConstructorArguments[0].Value as CustomAttributeArgument[];
-						if (values != null && typeIndex < values.Length && values[typeIndex].Value is bool)
-							return (bool)values[typeIndex].Value;
-					}
-					return true;
-				}
-			}
-			return false;
-		}
-		#endregion
-		
-		#region Read Attributes
-		#region Assembly Attributes
-		static readonly ITypeReference assemblyVersionAttributeTypeRef = typeof(System.Reflection.AssemblyVersionAttribute).ToTypeReference();
-		
-		void AddAttributes(AssemblyDefinition assembly, IList<IUnresolvedAttribute> outputList)
-		{
-			if (assembly.HasCustomAttributes) {
-				AddCustomAttributes(assembly.CustomAttributes, outputList);
-			}
-			if (assembly.HasSecurityDeclarations) {
-				AddSecurityAttributes(assembly.SecurityDeclarations, outputList);
-			}
-			
-			// AssemblyVersionAttribute
-			if (assembly.Name.Version != null) {
-				var assemblyVersion = new DefaultUnresolvedAttribute(assemblyVersionAttributeTypeRef, new[] { KnownTypeReference.String });
-				assemblyVersion.PositionalArguments.Add(CreateSimpleConstantValue(KnownTypeReference.String, assembly.Name.Version.ToString()));
-				outputList.Add(interningProvider.Intern(assemblyVersion));
-			}
-		}
-		
-		IConstantValue CreateSimpleConstantValue(ITypeReference type, object value)
-		{
-			return interningProvider.Intern(new SimpleConstantValue(type, interningProvider.InternValue(value)));
-		}
-		#endregion
-		
-		#region Module Attributes
-		void AddAttributes(ModuleDefinition module, IList<IUnresolvedAttribute> outputList)
-		{
-			if (module.HasCustomAttributes) {
-				AddCustomAttributes(module.CustomAttributes, outputList);
-			}
-		}
-		#endregion
-		
-		#region Parameter Attributes
-		static readonly IUnresolvedAttribute inAttribute = new DefaultUnresolvedAttribute(typeof(InAttribute).ToTypeReference());
-		static readonly IUnresolvedAttribute outAttribute = new DefaultUnresolvedAttribute(typeof(OutAttribute).ToTypeReference());
-		
-		void AddAttributes(ParameterDefinition parameter, DefaultUnresolvedParameter targetParameter)
-		{
-			if (!targetParameter.IsOut) {
-				if (parameter.IsIn)
-					targetParameter.Attributes.Add(inAttribute);
-				if (parameter.IsOut)
-					targetParameter.Attributes.Add(outAttribute);
-			}
-			if (parameter.HasCustomAttributes) {
-				AddCustomAttributes(parameter.CustomAttributes, targetParameter.Attributes);
-			}
-			if (parameter.HasMarshalInfo) {
-				targetParameter.Attributes.Add(ConvertMarshalInfo(parameter.MarshalInfo));
-			}
-		}
-		#endregion
-		
-		#region Method Attributes
-		static readonly ITypeReference dllImportAttributeTypeRef = typeof(DllImportAttribute).ToTypeReference();
-		static readonly SimpleConstantValue trueValue = new SimpleConstantValue(KnownTypeReference.Boolean, true);
-		static readonly SimpleConstantValue falseValue = new SimpleConstantValue(KnownTypeReference.Boolean, false);
-		static readonly ITypeReference callingConventionTypeRef = typeof(CallingConvention).ToTypeReference();
-		static readonly IUnresolvedAttribute preserveSigAttribute = new DefaultUnresolvedAttribute(typeof(PreserveSigAttribute).ToTypeReference());
-		static readonly ITypeReference methodImplAttributeTypeRef = typeof(MethodImplAttribute).ToTypeReference();
-		static readonly ITypeReference methodImplOptionsTypeRef = typeof(MethodImplOptions).ToTypeReference();
-		
-		static bool HasAnyAttributes(MethodDefinition methodDefinition)
-		{
-			if (methodDefinition.HasPInvokeInfo)
-				return true;
-			if ((methodDefinition.ImplAttributes & ~MethodImplAttributes.CodeTypeMask) != 0)
-				return true;
-			if (methodDefinition.MethodReturnType.HasFieldMarshal)
-				return true;
-			return methodDefinition.HasCustomAttributes || methodDefinition.MethodReturnType.HasCustomAttributes;
-		}
-		
-		void AddAttributes(MethodDefinition methodDefinition, IList<IUnresolvedAttribute> attributes, IList<IUnresolvedAttribute> returnTypeAttributes)
-		{
-			MethodImplAttributes implAttributes = methodDefinition.ImplAttributes & ~MethodImplAttributes.CodeTypeMask;
-			
-			#region DllImportAttribute
-			if (methodDefinition.HasPInvokeInfo && methodDefinition.PInvokeInfo != null) {
-				PInvokeInfo info = methodDefinition.PInvokeInfo;
-				var dllImport = new DefaultUnresolvedAttribute(dllImportAttributeTypeRef, new[] { KnownTypeReference.String });
-				dllImport.PositionalArguments.Add(CreateSimpleConstantValue(KnownTypeReference.String, info.Module.Name));
-				
-				if (info.IsBestFitDisabled)
-					dllImport.AddNamedFieldArgument("BestFitMapping", falseValue);
-				if (info.IsBestFitEnabled)
-					dllImport.AddNamedFieldArgument("BestFitMapping", trueValue);
-				
-				CallingConvention callingConvention;
-				switch (info.Attributes & PInvokeAttributes.CallConvMask) {
-					case (PInvokeAttributes)0:
-						Debug.WriteLine ("P/Invoke calling convention not set on:" + methodDefinition.FullName);
-						callingConvention = CallingConvention.StdCall;
-						break;
-					case PInvokeAttributes.CallConvCdecl:
-						callingConvention = CallingConvention.Cdecl;
-						break;
-					case PInvokeAttributes.CallConvFastcall:
-						callingConvention = CallingConvention.FastCall;
-						break;
-					case PInvokeAttributes.CallConvStdCall:
-						callingConvention = CallingConvention.StdCall;
-						break;
-					case PInvokeAttributes.CallConvThiscall:
-						callingConvention = CallingConvention.ThisCall;
-						break;
-					case PInvokeAttributes.CallConvWinapi:
-						callingConvention = CallingConvention.Winapi;
-						break;
-					default:
-						throw new NotSupportedException("unknown calling convention");
-				}
-				if (callingConvention != CallingConvention.Winapi)
-					dllImport.AddNamedFieldArgument("CallingConvention", CreateSimpleConstantValue(callingConventionTypeRef, (int)callingConvention));
-				
-				CharSet charSet = CharSet.None;
-				switch (info.Attributes & PInvokeAttributes.CharSetMask) {
-					case PInvokeAttributes.CharSetAnsi:
-						charSet = CharSet.Ansi;
-						break;
-					case PInvokeAttributes.CharSetAuto:
-						charSet = CharSet.Auto;
-						break;
-					case PInvokeAttributes.CharSetUnicode:
-						charSet = CharSet.Unicode;
-						break;
-				}
-				if (charSet != CharSet.None)
-					dllImport.AddNamedFieldArgument("CharSet", CreateSimpleConstantValue(charSetTypeRef, (int)charSet));
-				
-				if (!string.IsNullOrEmpty(info.EntryPoint) && info.EntryPoint != methodDefinition.Name)
-					dllImport.AddNamedFieldArgument("EntryPoint", CreateSimpleConstantValue(KnownTypeReference.String, info.EntryPoint));
-				
-				if (info.IsNoMangle)
-					dllImport.AddNamedFieldArgument("ExactSpelling", trueValue);
-				
-				if ((implAttributes & MethodImplAttributes.PreserveSig) == MethodImplAttributes.PreserveSig)
-					implAttributes &= ~MethodImplAttributes.PreserveSig;
-				else
-					dllImport.AddNamedFieldArgument("PreserveSig", falseValue);
-				
-				if (info.SupportsLastError)
-					dllImport.AddNamedFieldArgument("SetLastError", trueValue);
-				
-				if (info.IsThrowOnUnmappableCharDisabled)
-					dllImport.AddNamedFieldArgument("ThrowOnUnmappableChar", falseValue);
-				if (info.IsThrowOnUnmappableCharEnabled)
-					dllImport.AddNamedFieldArgument("ThrowOnUnmappableChar", trueValue);
-				
-				attributes.Add(interningProvider.Intern(dllImport));
-			}
-			#endregion
-			
-			#region PreserveSigAttribute
-			if (implAttributes == MethodImplAttributes.PreserveSig) {
-				attributes.Add(preserveSigAttribute);
-				implAttributes = 0;
-			}
-			#endregion
-			
-			#region MethodImplAttribute
-			if (implAttributes != 0) {
-				var methodImpl = new DefaultUnresolvedAttribute(methodImplAttributeTypeRef, new[] { methodImplOptionsTypeRef });
-				methodImpl.PositionalArguments.Add(CreateSimpleConstantValue(methodImplOptionsTypeRef, (int)implAttributes));
-				attributes.Add(interningProvider.Intern(methodImpl));
-			}
-			#endregion
-			
-			if (methodDefinition.HasCustomAttributes) {
-				AddCustomAttributes(methodDefinition.CustomAttributes, attributes);
-			}
-			if (methodDefinition.HasSecurityDeclarations) {
-				AddSecurityAttributes(methodDefinition.SecurityDeclarations, attributes);
-			}
-			if (methodDefinition.MethodReturnType.HasMarshalInfo) {
-				returnTypeAttributes.Add(ConvertMarshalInfo(methodDefinition.MethodReturnType.MarshalInfo));
-			}
-			if (methodDefinition.MethodReturnType.HasCustomAttributes) {
-				AddCustomAttributes(methodDefinition.MethodReturnType.CustomAttributes, returnTypeAttributes);
-			}
-		}
-		#endregion
-		
-		#region Type Attributes
-		static readonly DefaultUnresolvedAttribute serializableAttribute = new DefaultUnresolvedAttribute(typeof(SerializableAttribute).ToTypeReference());
-		static readonly DefaultUnresolvedAttribute comImportAttribute = new DefaultUnresolvedAttribute(typeof(ComImportAttribute).ToTypeReference());
-		static readonly ITypeReference structLayoutAttributeTypeRef = typeof(StructLayoutAttribute).ToTypeReference();
-		static readonly ITypeReference layoutKindTypeRef = typeof(LayoutKind).ToTypeReference();
-		static readonly ITypeReference charSetTypeRef = typeof(CharSet).ToTypeReference();
-		
-		void AddAttributes(TypeDefinition typeDefinition, IUnresolvedTypeDefinition targetEntity)
-		{
-			// SerializableAttribute
-			if (typeDefinition.IsSerializable)
-				targetEntity.Attributes.Add(serializableAttribute);
-			
-			// ComImportAttribute
-			if (typeDefinition.IsImport)
-				targetEntity.Attributes.Add(comImportAttribute);
-			
-			#region StructLayoutAttribute
-			LayoutKind layoutKind = LayoutKind.Auto;
-			switch (typeDefinition.Attributes & TypeAttributes.LayoutMask) {
-				case TypeAttributes.SequentialLayout:
-					layoutKind = LayoutKind.Sequential;
-					break;
-				case TypeAttributes.ExplicitLayout:
-					layoutKind = LayoutKind.Explicit;
-					break;
-			}
-			CharSet charSet = CharSet.None;
-			switch (typeDefinition.Attributes & TypeAttributes.StringFormatMask) {
-				case TypeAttributes.AnsiClass:
-					charSet = CharSet.Ansi;
-					break;
-				case TypeAttributes.AutoClass:
-					charSet = CharSet.Auto;
-					break;
-				case TypeAttributes.UnicodeClass:
-					charSet = CharSet.Unicode;
-					break;
-			}
-			LayoutKind defaultLayoutKind = (typeDefinition.IsValueType && !typeDefinition.IsEnum) ? LayoutKind.Sequential: LayoutKind.Auto;
-			if (layoutKind != defaultLayoutKind || charSet != CharSet.Ansi || typeDefinition.PackingSize > 0 || typeDefinition.ClassSize > 0) {
-				DefaultUnresolvedAttribute structLayout = new DefaultUnresolvedAttribute(structLayoutAttributeTypeRef, new[] { layoutKindTypeRef });
-				structLayout.PositionalArguments.Add(CreateSimpleConstantValue(layoutKindTypeRef, (int)layoutKind));
-				if (charSet != CharSet.Ansi) {
-					structLayout.AddNamedFieldArgument("CharSet", CreateSimpleConstantValue(charSetTypeRef, (int)charSet));
-				}
-				if (typeDefinition.PackingSize > 0) {
-					structLayout.AddNamedFieldArgument("Pack", CreateSimpleConstantValue(KnownTypeReference.Int32, (int)typeDefinition.PackingSize));
-				}
-				if (typeDefinition.ClassSize > 0) {
-					structLayout.AddNamedFieldArgument("Size", CreateSimpleConstantValue(KnownTypeReference.Int32, (int)typeDefinition.ClassSize));
-				}
-				targetEntity.Attributes.Add(interningProvider.Intern(structLayout));
-			}
-			#endregion
-			
-			if (typeDefinition.HasCustomAttributes) {
-				AddCustomAttributes(typeDefinition.CustomAttributes, targetEntity.Attributes);
-			}
-			if (typeDefinition.HasSecurityDeclarations) {
-				AddSecurityAttributes(typeDefinition.SecurityDeclarations, targetEntity.Attributes);
-			}
-		}
-		#endregion
-		
-		#region Field Attributes
-		static readonly ITypeReference fieldOffsetAttributeTypeRef = typeof(FieldOffsetAttribute).ToTypeReference();
-		static readonly IUnresolvedAttribute nonSerializedAttribute = new DefaultUnresolvedAttribute(typeof(NonSerializedAttribute).ToTypeReference());
-		
-		void AddAttributes(FieldDefinition fieldDefinition, IUnresolvedEntity targetEntity)
-		{
-			// FieldOffsetAttribute
-			if (fieldDefinition.HasLayoutInfo) {
-				DefaultUnresolvedAttribute fieldOffset = new DefaultUnresolvedAttribute(fieldOffsetAttributeTypeRef, new[] { KnownTypeReference.Int32 });
-				fieldOffset.PositionalArguments.Add(CreateSimpleConstantValue(KnownTypeReference.Int32, fieldDefinition.Offset));
-				targetEntity.Attributes.Add(interningProvider.Intern(fieldOffset));
-			}
-			
-			// NonSerializedAttribute
-			if (fieldDefinition.IsNotSerialized) {
-				targetEntity.Attributes.Add(nonSerializedAttribute);
-			}
-			
-			if (fieldDefinition.HasMarshalInfo) {
-				targetEntity.Attributes.Add(ConvertMarshalInfo(fieldDefinition.MarshalInfo));
-			}
-			
-			if (fieldDefinition.HasCustomAttributes) {
-				AddCustomAttributes(fieldDefinition.CustomAttributes, targetEntity.Attributes);
-			}
-		}
-		#endregion
-		
-		#region Event Attributes
-		void AddAttributes(EventDefinition eventDefinition, IUnresolvedEntity targetEntity)
-		{
-			if (eventDefinition.HasCustomAttributes) {
-				AddCustomAttributes(eventDefinition.CustomAttributes, targetEntity.Attributes);
-			}
-		}
-		#endregion
-		
-		#region Property Attributes
-		void AddAttributes(PropertyDefinition propertyDefinition, IUnresolvedEntity targetEntity)
-		{
-			if (propertyDefinition.HasCustomAttributes) {
-				AddCustomAttributes(propertyDefinition.CustomAttributes, targetEntity.Attributes);
-			}
-		}
-		#endregion
-		
-		#region MarshalAsAttribute (ConvertMarshalInfo)
-		static readonly ITypeReference marshalAsAttributeTypeRef = typeof(MarshalAsAttribute).ToTypeReference();
-		static readonly ITypeReference unmanagedTypeTypeRef = typeof(UnmanagedType).ToTypeReference();
-		
-		IUnresolvedAttribute ConvertMarshalInfo(MarshalInfo marshalInfo)
-		{
-			DefaultUnresolvedAttribute attr = new DefaultUnresolvedAttribute(marshalAsAttributeTypeRef, new[] { unmanagedTypeTypeRef });
-			attr.PositionalArguments.Add(CreateSimpleConstantValue(unmanagedTypeTypeRef, (int)marshalInfo.NativeType));
-			
-			FixedArrayMarshalInfo fami = marshalInfo as FixedArrayMarshalInfo;
-			if (fami != null) {
-				attr.AddNamedFieldArgument("SizeConst", CreateSimpleConstantValue(KnownTypeReference.Int32, (int)fami.Size));
-				if (fami.ElementType != NativeType.None)
-					attr.AddNamedFieldArgument("ArraySubType", CreateSimpleConstantValue(unmanagedTypeTypeRef, (int)fami.ElementType));
-			}
-			SafeArrayMarshalInfo sami = marshalInfo as SafeArrayMarshalInfo;
-			if (sami != null && sami.ElementType != VariantType.None) {
-				attr.AddNamedFieldArgument("SafeArraySubType", CreateSimpleConstantValue(typeof(VarEnum).ToTypeReference(), (int)sami.ElementType));
-			}
-			ArrayMarshalInfo ami = marshalInfo as ArrayMarshalInfo;
-			if (ami != null) {
-				if (ami.ElementType != NativeType.Max)
-					attr.AddNamedFieldArgument("ArraySubType", CreateSimpleConstantValue(unmanagedTypeTypeRef, (int)ami.ElementType));
-				if (ami.Size >= 0)
-					attr.AddNamedFieldArgument("SizeConst", CreateSimpleConstantValue(KnownTypeReference.Int32, (int)ami.Size));
-				if (ami.SizeParameterMultiplier != 0 && ami.SizeParameterIndex >= 0)
-					attr.AddNamedFieldArgument("SizeParamIndex", CreateSimpleConstantValue(KnownTypeReference.Int16, (short)ami.SizeParameterIndex));
-			}
-			CustomMarshalInfo cmi = marshalInfo as CustomMarshalInfo;
-			if (cmi != null) {
-				attr.AddNamedFieldArgument("MarshalType", CreateSimpleConstantValue(KnownTypeReference.String, cmi.ManagedType.FullName));
-				if (!string.IsNullOrEmpty(cmi.Cookie))
-					attr.AddNamedFieldArgument("MarshalCookie", CreateSimpleConstantValue(KnownTypeReference.String, cmi.Cookie));
-			}
-			FixedSysStringMarshalInfo fssmi = marshalInfo as FixedSysStringMarshalInfo;
-			if (fssmi != null) {
-				attr.AddNamedFieldArgument("SizeConst", CreateSimpleConstantValue(KnownTypeReference.Int32, (int)fssmi.Size));
-			}
-			
-			return InterningProvider.Intern(attr);
-		}
-		#endregion
-		
-		#region Custom Attributes (ReadAttribute)
-		void AddCustomAttributes(Mono.Collections.Generic.Collection<CustomAttribute> attributes, IList<IUnresolvedAttribute> targetCollection)
-		{
-			foreach (var cecilAttribute in attributes) {
-				TypeReference type = cecilAttribute.AttributeType;
-				if (type.Namespace == "System.Runtime.CompilerServices") {
-					if (type.Name == "DynamicAttribute" || type.Name == "ExtensionAttribute" || type.Name == "DecimalConstantAttribute")
-						continue;
-				} else if (type.Name == "ParamArrayAttribute" && type.Namespace == "System") {
-					continue;
-				}
-				targetCollection.Add(ReadAttribute(cecilAttribute));
-			}
-		}
-		
-		[CLSCompliant(false)]
-		public IUnresolvedAttribute ReadAttribute(CustomAttribute attribute)
-		{
-			if (attribute == null)
-				throw new ArgumentNullException("attribute");
-			MethodReference ctor = attribute.Constructor;
-			ITypeReference attributeType = ReadTypeReference(attribute.AttributeType);
-			IList<ITypeReference> ctorParameterTypes = EmptyList<ITypeReference>.Instance;
-			if (ctor.HasParameters) {
-				ctorParameterTypes = new ITypeReference[ctor.Parameters.Count];
-				for (int i = 0; i < ctorParameterTypes.Count; i++) {
-					ctorParameterTypes[i] = ReadTypeReference(ctor.Parameters[i].ParameterType);
-				}
-				ctorParameterTypes = interningProvider.InternList(ctorParameterTypes);
-			}
-			return interningProvider.Intern(new CecilUnresolvedAttribute(attributeType, ctorParameterTypes, attribute.GetBlob()));
-		}
-		#endregion
-		
-		#region CecilUnresolvedAttribute
-		static int GetBlobHashCode(byte[] blob)
-		{
-			unchecked {
-				int hash = 0;
-				foreach (byte b in blob) {
-					hash *= 257;
-					hash += b;
-				}
-				return hash;
-			}
-		}
-		
-		static bool BlobEquals(byte[] a, byte[] b)
-		{
-			if (a.Length != b.Length)
-				return false;
-			for (int i = 0; i < a.Length; i++) {
-				if (a[i] != b[i])
-					return false;
-			}
-			return true;
-		}
-		
-		[Serializable, FastSerializerVersion(cecilLoaderVersion)]
-		sealed class CecilUnresolvedAttribute : IUnresolvedAttribute, ISupportsInterning
-		{
-			internal readonly ITypeReference attributeType;
-			internal readonly IList<ITypeReference> ctorParameterTypes;
-			internal readonly byte[] blob;
-			
-			public CecilUnresolvedAttribute(ITypeReference attributeType, IList<ITypeReference> ctorParameterTypes, byte[] blob)
-			{
-				Debug.Assert(attributeType != null);
-				Debug.Assert(ctorParameterTypes != null);
-				Debug.Assert(blob != null);
-				this.attributeType = attributeType;
-				this.ctorParameterTypes = ctorParameterTypes;
-				this.blob = blob;
-			}
-			
-			DomRegion IUnresolvedAttribute.Region {
-				get { return DomRegion.Empty; }
-			}
-			
-			IAttribute IUnresolvedAttribute.CreateResolvedAttribute(ITypeResolveContext context)
-			{
-				if (context.CurrentAssembly == null)
-					throw new InvalidOperationException("Cannot resolve CecilUnresolvedAttribute without a parent assembly");
-				return new CecilResolvedAttribute(context, this);
-			}
-			
-			int ISupportsInterning.GetHashCodeForInterning()
-			{
-				return attributeType.GetHashCode() ^ ctorParameterTypes.GetHashCode() ^ GetBlobHashCode(blob);
-			}
-			
-			bool ISupportsInterning.EqualsForInterning(ISupportsInterning other)
-			{
-				CecilUnresolvedAttribute o = other as CecilUnresolvedAttribute;
-				return o != null && attributeType == o.attributeType && ctorParameterTypes == o.ctorParameterTypes
-					&& BlobEquals(blob, o.blob);
-			}
-		}
-		#endregion
-		
-		#region CecilResolvedAttribute
-		sealed class CecilResolvedAttribute : IAttribute
-		{
-			readonly ITypeResolveContext context;
-			readonly byte[] blob;
-			readonly IList<ITypeReference> ctorParameterTypes;
-			readonly IType attributeType;
-			
-			IMethod constructor;
-			volatile bool constructorResolved;
-			
-			IList<ResolveResult> positionalArguments;
-			IList<KeyValuePair<IMember, ResolveResult>> namedArguments;
-			
-			public CecilResolvedAttribute(ITypeResolveContext context, CecilUnresolvedAttribute unresolved)
-			{
-				this.context = context;
-				this.blob = unresolved.blob;
-				this.ctorParameterTypes = unresolved.ctorParameterTypes;
-				this.attributeType = unresolved.attributeType.Resolve(context);
-			}
-			
-			public CecilResolvedAttribute(ITypeResolveContext context, IType attributeType)
-			{
-				this.context = context;
-				this.attributeType = attributeType;
-				this.ctorParameterTypes = EmptyList<ITypeReference>.Instance;
-			}
-			
-			public DomRegion Region {
-				get { return DomRegion.Empty; }
-			}
-			
-			public IType AttributeType {
-				get { return attributeType; }
-			}
-			
-			public IMethod Constructor {
-				get {
-					if (!constructorResolved) {
-						constructor = ResolveConstructor();
-						constructorResolved = true;
-					}
-					return constructor;
-				}
-			}
-			
-			IMethod ResolveConstructor()
-			{
-				var parameterTypes = ctorParameterTypes.Resolve(context);
-				foreach (var ctor in attributeType.GetConstructors(m => m.Parameters.Count == parameterTypes.Count)) {
-					bool ok = true;
-					for (int i = 0; i < parameterTypes.Count; i++) {
-						if (!ctor.Parameters[i].Type.Equals(parameterTypes[i])) {
-							ok = false;
-							break;
-						}
-					}
-					if (ok)
-						return ctor;
-				}
-				return null;
-			}
-			
-			public IList<ResolveResult> PositionalArguments {
-				get {
-					var result = LazyInit.VolatileRead(ref this.positionalArguments);
-					if (result != null) {
-						return result;
-					}
-					DecodeBlob();
-					return positionalArguments;
-				}
-			}
-			
-			public IList<KeyValuePair<IMember, ResolveResult>> NamedArguments {
-				get {
-					var result = LazyInit.VolatileRead(ref this.namedArguments);
-					if (result != null) {
-						return result;
-					}
-					DecodeBlob();
-					return namedArguments;
-				}
-			}
-			
-			public override string ToString()
-			{
-				return "[" + attributeType.ToString() + "(...)]";
-			}
-			
-			void DecodeBlob()
-			{
-				var positionalArguments = new List<ResolveResult>();
-				var namedArguments = new List<KeyValuePair<IMember, ResolveResult>>();
-				DecodeBlob(positionalArguments, namedArguments);
-				Interlocked.CompareExchange(ref this.positionalArguments, positionalArguments, null);
-				Interlocked.CompareExchange(ref this.namedArguments, namedArguments, null);
-			}
-			
-			void DecodeBlob(List<ResolveResult> positionalArguments, List<KeyValuePair<IMember, ResolveResult>> namedArguments)
-			{
-				if (blob == null)
-					return;
-				BlobReader reader = new BlobReader(blob, context.CurrentAssembly);
-				if (reader.ReadUInt16() != 0x0001) {
-					Debug.WriteLine("Unknown blob prolog");
-					return;
-				}
-				foreach (var ctorParameter in ctorParameterTypes.Resolve(context)) {
-					ResolveResult arg = reader.ReadFixedArg(ctorParameter);
-					positionalArguments.Add(arg);
-					if (arg.IsError) {
-						// After a decoding error, we must stop decoding the blob because
-						// we might have read too few bytes due to the error.
-						// Just fill up the remaining arguments with ErrorResolveResult:
-						while (positionalArguments.Count < ctorParameterTypes.Count)
-							positionalArguments.Add(ErrorResolveResult.UnknownError);
-						return;
-					}
-				}
-				ushort numNamed = reader.ReadUInt16();
-				for (int i = 0; i < numNamed; i++) {
-					var namedArg = reader.ReadNamedArg(attributeType);
-					if (namedArg.Key != null)
-						namedArguments.Add(namedArg);
-				}
-			}
-		}
-		#endregion
-		
-		#region class BlobReader
-		class BlobReader
-		{
-			byte[] buffer;
-			int position;
-			readonly IAssembly currentResolvedAssembly;
-
-			public BlobReader(byte[] buffer, IAssembly currentResolvedAssembly)
-			{
-				if (buffer == null)
-					throw new ArgumentNullException("buffer");
-				this.buffer = buffer;
-				this.currentResolvedAssembly = currentResolvedAssembly;
-			}
-			
-			public byte ReadByte()
-			{
-				return buffer[position++];
-			}
-
-			public sbyte ReadSByte()
-			{
-				unchecked {
-					return(sbyte) ReadByte();
-				}
-			}
-			
-			public byte[] ReadBytes(int length)
-			{
-				var bytes = new byte[length];
-				Buffer.BlockCopy(buffer, position, bytes, 0, length);
-				position += length;
-				return bytes;
-			}
-
-			public ushort ReadUInt16()
-			{
-				unchecked {
-					ushort value =(ushort)(buffer[position]
-					                       |(buffer[position + 1] << 8));
-					position += 2;
-					return value;
-				}
-			}
-
-			public short ReadInt16()
-			{
-				unchecked {
-					return(short) ReadUInt16();
-				}
-			}
-
-			public uint ReadUInt32()
-			{
-				unchecked {
-					uint value =(uint)(buffer[position]
-					                   |(buffer[position + 1] << 8)
-					                   |(buffer[position + 2] << 16)
-					                   |(buffer[position + 3] << 24));
-					position += 4;
-					return value;
-				}
-			}
-
-			public int ReadInt32()
-			{
-				unchecked {
-					return(int) ReadUInt32();
-				}
-			}
-
-			public ulong ReadUInt64()
-			{
-				unchecked {
-					uint low = ReadUInt32();
-					uint high = ReadUInt32();
-
-					return(((ulong) high) << 32) | low;
-				}
-			}
-
-			public long ReadInt64()
-			{
-				unchecked {
-					return(long) ReadUInt64();
-				}
-			}
-
-			public uint ReadCompressedUInt32()
-			{
-				unchecked {
-					byte first = ReadByte();
-					if((first & 0x80) == 0)
-						return first;
-
-					if((first & 0x40) == 0)
-						return((uint)(first & ~0x80) << 8)
-							| ReadByte();
-
-					return((uint)(first & ~0xc0) << 24)
-						|(uint) ReadByte() << 16
-						|(uint) ReadByte() << 8
-						| ReadByte();
-				}
-			}
-
-			public float ReadSingle()
-			{
-				unchecked {
-					if(!BitConverter.IsLittleEndian) {
-						var bytes = ReadBytes(4);
-						Array.Reverse(bytes);
-						return BitConverter.ToSingle(bytes, 0);
-					}
-
-					float value = BitConverter.ToSingle(buffer, position);
-					position += 4;
-					return value;
-				}
-			}
-
-			public double ReadDouble()
-			{
-				unchecked {
-					if(!BitConverter.IsLittleEndian) {
-						var bytes = ReadBytes(8);
-						Array.Reverse(bytes);
-						return BitConverter.ToDouble(bytes, 0);
-					}
-
-					double value = BitConverter.ToDouble(buffer, position);
-					position += 8;
-					return value;
-				}
-			}
-			
-			public ResolveResult ReadFixedArg(IType argType)
-			{
-				if (argType.Kind == TypeKind.Array) {
-					if (((ArrayType)argType).Dimensions != 1) {
-						// Only single-dimensional arrays are supported
-						return ErrorResolveResult.UnknownError;
-					}
-					IType elementType = ((ArrayType)argType).ElementType;
-					uint numElem = ReadUInt32();
-					if (numElem == 0xffffffff) {
-						// null reference
-						return new ConstantResolveResult(argType, null);
-					} else {
-						ResolveResult[] elements = new ResolveResult[numElem];
-						for (int i = 0; i < elements.Length; i++) {
-							elements[i] = ReadElem(elementType);
-							// Stop decoding when encountering an error:
-							if (elements[i].IsError)
-								return ErrorResolveResult.UnknownError;
-						}
-						IType int32 = currentResolvedAssembly.Compilation.FindType(KnownTypeCode.Int32);
-						ResolveResult[] sizeArgs = { new ConstantResolveResult(int32, elements.Length) };
-						return new ArrayCreateResolveResult(argType, sizeArgs, elements);
-					}
-				} else {
-					return ReadElem(argType);
-				}
-			}
-			
-			public ResolveResult ReadElem(IType elementType)
-			{
-				ITypeDefinition underlyingType;
-				if (elementType.Kind == TypeKind.Enum) {
-					underlyingType = elementType.GetDefinition().EnumUnderlyingType.GetDefinition();
-				} else {
-					underlyingType = elementType.GetDefinition();
-				}
-				if (underlyingType == null)
-					return ErrorResolveResult.UnknownError;
-				KnownTypeCode typeCode = underlyingType.KnownTypeCode;
-				if (typeCode == KnownTypeCode.Object) {
-					// boxed value type
-					IType boxedTyped = ReadCustomAttributeFieldOrPropType();
-					ResolveResult elem = ReadElem(boxedTyped);
-					if (elem.IsCompileTimeConstant && elem.ConstantValue == null)
-						return new ConstantResolveResult(elementType, null);
-					else
-						return new ConversionResolveResult(elementType, elem, Conversion.BoxingConversion);
-				} else if (typeCode == KnownTypeCode.Type) {
-					return new TypeOfResolveResult(underlyingType, ReadType());
-				} else {
-					return new ConstantResolveResult(elementType, ReadElemValue(typeCode));
-				}
-			}
-			
-			object ReadElemValue(KnownTypeCode typeCode)
-			{
-				switch (typeCode) {
-					case KnownTypeCode.Boolean:
-						return ReadByte() != 0;
-					case KnownTypeCode.Char:
-						return (char)ReadUInt16();
-					case KnownTypeCode.SByte:
-						return ReadSByte();
-					case KnownTypeCode.Byte:
-						return ReadByte();
-					case KnownTypeCode.Int16:
-						return ReadInt16();
-					case KnownTypeCode.UInt16:
-						return ReadUInt16();
-					case KnownTypeCode.Int32:
-						return ReadInt32();
-					case KnownTypeCode.UInt32:
-						return ReadUInt32();
-					case KnownTypeCode.Int64:
-						return ReadInt64();
-					case KnownTypeCode.UInt64:
-						return ReadUInt64();
-					case KnownTypeCode.Single:
-						return ReadSingle();
-					case KnownTypeCode.Double:
-						return ReadDouble();
-					case KnownTypeCode.String:
-						return ReadSerString();
-					default:
-						throw new NotSupportedException();
-				}
-			}
-			
-			public string ReadSerString ()
-			{
-				if (buffer [position] == 0xff) {
-					position++;
-					return null;
-				}
-
-				int length = (int) ReadCompressedUInt32();
-				if (length == 0)
-					return string.Empty;
-
-				string @string = System.Text.Encoding.UTF8.GetString(
-					buffer, position,
-					buffer [position + length - 1] == 0 ? length - 1 : length);
-
-				position += length;
-				return @string;
-			}
-			
-			public KeyValuePair<IMember, ResolveResult> ReadNamedArg(IType attributeType)
-			{
-				SymbolKind memberType;
-				var b = ReadByte();
-				switch (b) {
-					case 0x53:
-						memberType = SymbolKind.Field;
-						break;
-					case 0x54:
-						memberType = SymbolKind.Property;
-						break;
-					default:
-						throw new NotSupportedException(string.Format("Custom member type 0x{0:x} is not supported.", b));
-				}
-				IType type = ReadCustomAttributeFieldOrPropType();
-				string name = ReadSerString();
-				ResolveResult val = ReadFixedArg(type);
-				IMember member = null;
-				// Use last matching member, as GetMembers() returns members from base types first.
-				foreach (IMember m in attributeType.GetMembers(m => m.SymbolKind == memberType && m.Name == name)) {
-					if (m.ReturnType.Equals(type))
-						member = m;
-				}
-				return new KeyValuePair<IMember, ResolveResult>(member, val);
-			}
-
-			IType ReadCustomAttributeFieldOrPropType()
-			{
-				ICompilation compilation = currentResolvedAssembly.Compilation;
-				var b = ReadByte();
-				switch (b) {
-					case 0x02:
-						return compilation.FindType(KnownTypeCode.Boolean);
-					case 0x03:
-						return compilation.FindType(KnownTypeCode.Char);
-					case 0x04:
-						return compilation.FindType(KnownTypeCode.SByte);
-					case 0x05:
-						return compilation.FindType(KnownTypeCode.Byte);
-					case 0x06:
-						return compilation.FindType(KnownTypeCode.Int16);
-					case 0x07:
-						return compilation.FindType(KnownTypeCode.UInt16);
-					case 0x08:
-						return compilation.FindType(KnownTypeCode.Int32);
-					case 0x09:
-						return compilation.FindType(KnownTypeCode.UInt32);
-					case 0x0a:
-						return compilation.FindType(KnownTypeCode.Int64);
-					case 0x0b:
-						return compilation.FindType(KnownTypeCode.UInt64);
-					case 0x0c:
-						return compilation.FindType(KnownTypeCode.Single);
-					case 0x0d:
-						return compilation.FindType(KnownTypeCode.Double);
-					case 0x0e:
-						return compilation.FindType(KnownTypeCode.String);
-					case 0x1d:
-						return new ArrayType(compilation, ReadCustomAttributeFieldOrPropType());
-					case 0x50:
-						return compilation.FindType(KnownTypeCode.Type);
-					case 0x51: // boxed value type
-						return compilation.FindType(KnownTypeCode.Object);
-					case 0x55: // enum
-						return ReadType();
-					default:
-						throw new NotSupportedException(string.Format("Custom attribute type 0x{0:x} is not supported.", b));
-				}
-			}
-			
-			IType ReadType()
-			{
-				string typeName = ReadSerString();
-				ITypeReference typeReference = ReflectionHelper.ParseReflectionName(typeName);
-				IType typeInCurrentAssembly = typeReference.Resolve(new SimpleTypeResolveContext(currentResolvedAssembly));
-				if (typeInCurrentAssembly.Kind != TypeKind.Unknown)
-					return typeInCurrentAssembly;
-				
-				// look for the type in mscorlib
-				ITypeDefinition systemObject = currentResolvedAssembly.Compilation.FindType(KnownTypeCode.Object).GetDefinition();
-				if (systemObject != null) {
-					return typeReference.Resolve(new SimpleTypeResolveContext(systemObject.ParentAssembly));
-				} else {
-					// couldn't find corlib - return the unknown IType for the current assembly
-					return typeInCurrentAssembly;
-				}
-			}
-		}
-		#endregion
-		
-		#region Security Attributes
-		static readonly ITypeReference securityActionTypeReference = typeof(System.Security.Permissions.SecurityAction).ToTypeReference();
-		static readonly ITypeReference permissionSetAttributeTypeReference = typeof(System.Security.Permissions.PermissionSetAttribute).ToTypeReference();
-		
-		/// <summary>
-		/// Reads a security declaration.
-		/// </summary>
-		[CLSCompliant(false)]
-		public IList<IUnresolvedAttribute> ReadSecurityDeclaration(SecurityDeclaration secDecl)
-		{
-			if (secDecl == null)
-				throw new ArgumentNullException("secDecl");
-			var result = new List<IUnresolvedAttribute>();
-			AddSecurityAttributes(secDecl, result);
-			return result;
-		}
-		
-		void AddSecurityAttributes(Mono.Collections.Generic.Collection<SecurityDeclaration> securityDeclarations, IList<IUnresolvedAttribute> targetCollection)
-		{
-			foreach (var secDecl in securityDeclarations) {
-				AddSecurityAttributes(secDecl, targetCollection);
-			}
-		}
-		
-		void AddSecurityAttributes(SecurityDeclaration secDecl, IList<IUnresolvedAttribute> targetCollection)
-		{
-			byte[] blob = secDecl.GetBlob();
-			BlobReader reader = new BlobReader(blob, null);
-			var securityAction = new SimpleConstantValue(securityActionTypeReference, (int)secDecl.Action);
-			if (reader.ReadByte() == '.') {
-				// binary attribute
-				uint attributeCount = reader.ReadCompressedUInt32();
-				UnresolvedSecurityDeclaration unresolvedSecDecl = new UnresolvedSecurityDeclaration(securityAction, blob);
-				unresolvedSecDecl = interningProvider.Intern(unresolvedSecDecl);
-				for (uint i = 0; i < attributeCount; i++) {
-					targetCollection.Add(interningProvider.Intern(new UnresolvedSecurityAttribute(unresolvedSecDecl, (int)i)));
-				}
-			} else {
-				// for backward compatibility with .NET 1.0: XML-encoded attribute
-				var attr = new DefaultUnresolvedAttribute(permissionSetAttributeTypeReference);
-				attr.ConstructorParameterTypes.Add(securityActionTypeReference);
-				attr.PositionalArguments.Add(securityAction);
-				string xml = System.Text.Encoding.Unicode.GetString(blob);
-				attr.AddNamedPropertyArgument("XML", CreateSimpleConstantValue(KnownTypeReference.String, xml));
-				targetCollection.Add(interningProvider.Intern(attr));
-			}
-		}
-		
-		[Serializable, FastSerializerVersion(cecilLoaderVersion)]
-		sealed class UnresolvedSecurityDeclaration : ISupportsInterning
-		{
-			readonly IConstantValue securityAction;
-			readonly byte[] blob;
-			
-			public UnresolvedSecurityDeclaration(IConstantValue securityAction, byte[] blob)
-			{
-				Debug.Assert(securityAction != null);
-				Debug.Assert(blob != null);
-				this.securityAction = securityAction;
-				this.blob = blob;
-			}
-			
-			public IList<IAttribute> Resolve(IAssembly currentAssembly)
-			{
-				// TODO: make this a per-assembly cache
-//				CacheManager cache = currentAssembly.Compilation.CacheManager;
-//				IList<IAttribute> result = (IList<IAttribute>)cache.GetShared(this);
-//				if (result != null)
-//					return result;
-				
-				ITypeResolveContext context = new SimpleTypeResolveContext(currentAssembly);
-				BlobReader reader = new BlobReader(blob, currentAssembly);
-				if (reader.ReadByte() != '.') {
-					// should not use UnresolvedSecurityDeclaration for XML secdecls
-					throw new InvalidOperationException();
-				}
-				ResolveResult securityActionRR = securityAction.Resolve(context);
-				uint attributeCount = reader.ReadCompressedUInt32();
-				IAttribute[] attributes = new IAttribute[attributeCount];
-				try {
-					ReadSecurityBlob(reader, attributes, context, securityActionRR);
-				} catch (NotSupportedException ex) {
-					// ignore invalid blobs
-					Debug.WriteLine(ex.ToString());
-				}
-				for (int i = 0; i < attributes.Length; i++) {
-					if (attributes[i] == null)
-						attributes[i] = new CecilResolvedAttribute(context, SpecialType.UnknownType);
-				}
-				return attributes;
-//				return (IList<IAttribute>)cache.GetOrAddShared(this, attributes);
-			}
-			
-			void ReadSecurityBlob(BlobReader reader, IAttribute[] attributes, ITypeResolveContext context, ResolveResult securityActionRR)
-			{
-				for (int i = 0; i < attributes.Length; i++) {
-					string attributeTypeName = reader.ReadSerString();
-					ITypeReference attributeTypeRef = ReflectionHelper.ParseReflectionName(attributeTypeName);
-					IType attributeType = attributeTypeRef.Resolve(context);
-					
-					reader.ReadCompressedUInt32(); // ??
-					// The specification seems to be incorrect here, so I'm using the logic from Cecil instead.
-					uint numNamed = reader.ReadCompressedUInt32();
-					
-					var namedArgs = new List<KeyValuePair<IMember, ResolveResult>>((int)numNamed);
-					for (uint j = 0; j < numNamed; j++) {
-						var namedArg = reader.ReadNamedArg(attributeType);
-						if (namedArg.Key != null)
-							namedArgs.Add(namedArg);
-						
-					}
-					attributes[i] = new DefaultAttribute(
-						attributeType,
-						positionalArguments: new ResolveResult[] { securityActionRR },
-						namedArguments: namedArgs);
-				}
-			}
-			
-			int ISupportsInterning.GetHashCodeForInterning()
-			{
-				return securityAction.GetHashCode() ^ GetBlobHashCode(blob);
-			}
-			
-			bool ISupportsInterning.EqualsForInterning(ISupportsInterning other)
-			{
-				UnresolvedSecurityDeclaration o = other as UnresolvedSecurityDeclaration;
-				return o != null && securityAction == o.securityAction && BlobEquals(blob, o.blob);
-			}
-		}
-		
-		[Serializable, FastSerializerVersion(cecilLoaderVersion)]
-		sealed class UnresolvedSecurityAttribute : IUnresolvedAttribute, ISupportsInterning
-		{
-			readonly UnresolvedSecurityDeclaration secDecl;
-			readonly int index;
-			
-			public UnresolvedSecurityAttribute(UnresolvedSecurityDeclaration secDecl, int index)
-			{
-				Debug.Assert(secDecl != null);
-				this.secDecl = secDecl;
-				this.index = index;
-			}
-			
-			DomRegion IUnresolvedAttribute.Region {
-				get { return DomRegion.Empty; }
-			}
-			
-			IAttribute IUnresolvedAttribute.CreateResolvedAttribute(ITypeResolveContext context)
-			{
-				return secDecl.Resolve(context.CurrentAssembly)[index];
-			}
-			
-			int ISupportsInterning.GetHashCodeForInterning()
-			{
-				return index ^ secDecl.GetHashCode();
-			}
-			
-			bool ISupportsInterning.EqualsForInterning(ISupportsInterning other)
-			{
-				UnresolvedSecurityAttribute attr = other as UnresolvedSecurityAttribute;
-				return attr != null && index == attr.index && secDecl == attr.secDecl;
-			}
-		}
-		#endregion
-		#endregion
-		
-		#region Read Type Definition
-		DefaultUnresolvedTypeDefinition CreateTopLevelTypeDefinition(TypeDefinition typeDefinition)
-		{
-			string name = ReflectionHelper.SplitTypeParameterCountFromReflectionName(typeDefinition.Name);
-			var td = new DefaultUnresolvedTypeDefinition(typeDefinition.Namespace, name);
-			if (typeDefinition.HasGenericParameters)
-				InitTypeParameters(typeDefinition, td.TypeParameters);
-			return td;
-		}
-		
-		static void InitTypeParameters(TypeDefinition typeDefinition, IList<IUnresolvedTypeParameter> typeParameters)
-		{
-			// Type parameters are initialized within the constructor so that the class can be put into the type storage
-			// before the rest of the initialization runs - this allows it to be available for early binding as soon as possible.
-			for (int i = 0; i < typeDefinition.GenericParameters.Count; i++) {
-				if (typeDefinition.GenericParameters[i].Position != i)
-					throw new InvalidOperationException("g.Position != i");
-				typeParameters.Add(new DefaultUnresolvedTypeParameter(
-					SymbolKind.TypeDefinition, i, typeDefinition.GenericParameters[i].Name));
-			}
-		}
-		
-		void InitTypeParameterConstraints(TypeDefinition typeDefinition, IList<IUnresolvedTypeParameter> typeParameters)
-		{
-			for (int i = 0; i < typeParameters.Count; i++) {
-				var tp = (DefaultUnresolvedTypeParameter)typeParameters[i];
-				AddConstraints(tp, typeDefinition.GenericParameters[i]);
-				tp.ApplyInterningProvider(interningProvider);
-			}
-		}
-		
-		void InitTypeDefinition(TypeDefinition typeDefinition, DefaultUnresolvedTypeDefinition td)
-		{
-			td.Kind = GetTypeKind(typeDefinition);
-			InitTypeModifiers(typeDefinition, td);
-			InitTypeParameterConstraints(typeDefinition, td.TypeParameters);
-			
-			// nested types can be initialized only after generic parameters were created
-			InitNestedTypes(typeDefinition, td, td.NestedTypes);
-			AddAttributes(typeDefinition, td);
-			td.HasExtensionMethods = HasExtensionAttribute(typeDefinition);
-			
-			InitBaseTypes(typeDefinition, td.BaseTypes);
-			
-			td.AddDefaultConstructorIfRequired = (td.Kind == TypeKind.Struct || td.Kind == TypeKind.Enum);
-			InitMembers(typeDefinition, td, td.Members);
-			td.ApplyInterningProvider(interningProvider);
-			td.Freeze();
-			RegisterCecilObject(td, typeDefinition);
-		}
-		
-		void InitBaseTypes(TypeDefinition typeDefinition, IList<ITypeReference> baseTypes)
-		{
-			// set base classes
-			if (typeDefinition.IsEnum) {
-				foreach (FieldDefinition enumField in typeDefinition.Fields) {
-					if (!enumField.IsStatic) {
-						baseTypes.Add(ReadTypeReference(enumField.FieldType));
-						break;
-					}
-				}
-			} else {
-				if (typeDefinition.BaseType != null) {
-					baseTypes.Add(ReadTypeReference(typeDefinition.BaseType));
-				}
-				if (typeDefinition.HasInterfaces) {
-					foreach (TypeReference iface in typeDefinition.Interfaces) {
-						baseTypes.Add(ReadTypeReference(iface));
-					}
-				}
-			}
-		}
-		
-		void InitNestedTypes(TypeDefinition typeDefinition, IUnresolvedTypeDefinition declaringTypeDefinition, IList<IUnresolvedTypeDefinition> nestedTypes)
-		{
-			if (!typeDefinition.HasNestedTypes)
-				return;
-			foreach (TypeDefinition nestedTypeDef in typeDefinition.NestedTypes) {
-				TypeAttributes visibility = nestedTypeDef.Attributes & TypeAttributes.VisibilityMask;
-				if (this.IncludeInternalMembers
-				    || visibility == TypeAttributes.NestedPublic
-				    || visibility == TypeAttributes.NestedFamily
-				    || visibility == TypeAttributes.NestedFamORAssem)
-				{
-					string name = nestedTypeDef.Name;
-					int pos = name.LastIndexOf('/');
-					if (pos > 0)
-						name = name.Substring(pos + 1);
-					name = ReflectionHelper.SplitTypeParameterCountFromReflectionName(name);
-					var nestedType = new DefaultUnresolvedTypeDefinition(declaringTypeDefinition, name);
-					InitTypeParameters(nestedTypeDef, nestedType.TypeParameters);
-					nestedTypes.Add(nestedType);
-					InitTypeDefinition(nestedTypeDef, nestedType);
-				}
-			}
-		}
-		
-		static TypeKind GetTypeKind(TypeDefinition typeDefinition)
-		{
-			// set classtype
-			if (typeDefinition.IsInterface) {
-				return TypeKind.Interface;
-			} else if (typeDefinition.IsEnum) {
-				return TypeKind.Enum;
-			} else if (typeDefinition.IsValueType) {
-				return TypeKind.Struct;
-			} else if (IsDelegate(typeDefinition)) {
-				return TypeKind.Delegate;
-			} else if (IsModule(typeDefinition)) {
-				return TypeKind.Module;
-			} else {
-				return TypeKind.Class;
-			}
-		}
-		
-		static void InitTypeModifiers(TypeDefinition typeDefinition, AbstractUnresolvedEntity td)
-		{
-			td.IsSealed = typeDefinition.IsSealed;
-			td.IsAbstract = typeDefinition.IsAbstract;
-			switch (typeDefinition.Attributes & TypeAttributes.VisibilityMask) {
-				case TypeAttributes.NotPublic:
-				case TypeAttributes.NestedAssembly:
-					td.Accessibility = Accessibility.Internal;
-					break;
-				case TypeAttributes.Public:
-				case TypeAttributes.NestedPublic:
-					td.Accessibility = Accessibility.Public;
-					break;
-				case TypeAttributes.NestedPrivate:
-					td.Accessibility = Accessibility.Private;
-					break;
-				case TypeAttributes.NestedFamily:
-					td.Accessibility = Accessibility.Protected;
-					break;
-				case TypeAttributes.NestedFamANDAssem:
-					td.Accessibility = Accessibility.ProtectedAndInternal;
-					break;
-				case TypeAttributes.NestedFamORAssem:
-					td.Accessibility = Accessibility.ProtectedOrInternal;
-					break;
-			}
-		}
-		
-		static bool IsDelegate(TypeDefinition type)
-		{
-			if (type.BaseType != null && type.BaseType.Namespace == "System") {
-				if (type.BaseType.Name == "MulticastDelegate")
-					return true;
-				if (type.BaseType.Name == "Delegate" && type.Name != "MulticastDelegate")
-					return true;
-			}
-			return false;
-		}
-		
-		static bool IsModule(TypeDefinition type)
-		{
-			if (!type.HasCustomAttributes)
-				return false;
-			foreach (var att in type.CustomAttributes) {
-				if (att.AttributeType.FullName == "Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute"
-				    || att.AttributeType.FullName == "System.Runtime.CompilerServices.CompilerGlobalScopeAttribute")
-				{
-					return true;
-				}
-			}
-			return false;
-		}
-		
-		void InitMembers(TypeDefinition typeDefinition, IUnresolvedTypeDefinition td, IList<IUnresolvedMember> members)
-		{
-			if (typeDefinition.HasMethods) {
-				foreach (MethodDefinition method in typeDefinition.Methods) {
-					if (IsVisible(method.Attributes) && !IsAccessor(method.SemanticsAttributes)) {
-						SymbolKind type = SymbolKind.Method;
-						if (method.IsSpecialName) {
-							if (method.IsConstructor)
-								type = SymbolKind.Constructor;
-							else if (method.Name.StartsWith("op_", StringComparison.Ordinal))
-								type = SymbolKind.Operator;
-						}
-						members.Add(ReadMethod(method, td, type));
-					}
-				}
-			}
-			if (typeDefinition.HasFields) {
-				foreach (FieldDefinition field in typeDefinition.Fields) {
-					if (IsVisible(field.Attributes) && !field.IsSpecialName) {
-						members.Add(ReadField(field, td));
-					}
-				}
-			}
-			if (typeDefinition.HasProperties) {
-				string defaultMemberName = null;
-				var defaultMemberAttribute = typeDefinition.CustomAttributes.FirstOrDefault(
-					a => a.AttributeType.FullName == typeof(System.Reflection.DefaultMemberAttribute).FullName);
-				if (defaultMemberAttribute != null && defaultMemberAttribute.ConstructorArguments.Count == 1) {
-					defaultMemberName = defaultMemberAttribute.ConstructorArguments[0].Value as string;
-				}
-				foreach (PropertyDefinition property in typeDefinition.Properties) {
-					bool getterVisible = property.GetMethod != null && IsVisible(property.GetMethod.Attributes);
-					bool setterVisible = property.SetMethod != null && IsVisible(property.SetMethod.Attributes);
-					if (getterVisible || setterVisible) {
-						SymbolKind type = SymbolKind.Property;
-						if (property.HasParameters) {
-							// Try to detect indexer:
-							if (property.Name == defaultMemberName) {
-								type = SymbolKind.Indexer; // normal indexer
-							} else if (property.Name.EndsWith(".Item", StringComparison.Ordinal) && (property.GetMethod ?? property.SetMethod).HasOverrides) {
-								// explicit interface implementation of indexer
-								type = SymbolKind.Indexer;
-								// We can't really tell parameterized properties and indexers apart in this case without
-								// resolving the interface, so we rely on the "Item" naming convention instead.
-							}
-						}
-						members.Add(ReadProperty(property, td, type));
-					}
-				}
-			}
-			if (typeDefinition.HasEvents) {
-				foreach (EventDefinition ev in typeDefinition.Events) {
-					if (ev.AddMethod != null && IsVisible(ev.AddMethod.Attributes)) {
-						members.Add(ReadEvent(ev, td));
-					}
-				}
-			}
-		}
-		
-		static bool IsAccessor(MethodSemanticsAttributes semantics)
-		{
-			return !(semantics == MethodSemanticsAttributes.None || semantics == MethodSemanticsAttributes.Other);
-		}
-		#endregion
-		
-		#region Lazy-Loaded Type Definition
-		sealed class LazyCecilTypeDefinition : AbstractUnresolvedEntity, IUnresolvedTypeDefinition
-		{
-			readonly CecilLoader loader;
-			readonly string namespaceName;
-			readonly TypeDefinition cecilTypeDef;
-			readonly TypeKind kind;
-			readonly IList<IUnresolvedTypeParameter> typeParameters;
-			
-			IList<ITypeReference> baseTypes;
-			IList<IUnresolvedTypeDefinition> nestedTypes;
-			IList<IUnresolvedMember> members;
-			
-			public LazyCecilTypeDefinition(CecilLoader loader, TypeDefinition typeDefinition)
-			{
-				this.loader = loader;
-				this.cecilTypeDef = typeDefinition;
-				this.SymbolKind = SymbolKind.TypeDefinition;
-				this.namespaceName = cecilTypeDef.Namespace;
-				this.Name = ReflectionHelper.SplitTypeParameterCountFromReflectionName(cecilTypeDef.Name);
-				var tps = new List<IUnresolvedTypeParameter>();
-				InitTypeParameters(cecilTypeDef, tps);
-				this.typeParameters = FreezableHelper.FreezeList(tps);
-				
-				this.kind = GetTypeKind(typeDefinition);
-				InitTypeModifiers(typeDefinition, this);
-				loader.InitTypeParameterConstraints(typeDefinition, typeParameters);
-				
-				loader.AddAttributes(typeDefinition, this);
-				flags[FlagHasExtensionMethods] = HasExtensionAttribute(typeDefinition);
-				
-				this.ApplyInterningProvider(loader.interningProvider);
-				this.Freeze();
-			}
-			
-			public override string Namespace {
-				get { return namespaceName; }
-				set { throw new NotSupportedException(); }
-			}
-			
-			public override string ReflectionName {
-				get { return cecilTypeDef.FullName; }
-			}
-			
-			public FullTypeName FullTypeName {
-				get {
-					return new TopLevelTypeName(namespaceName, this.Name, typeParameters.Count);
-				}
-			}
-			
-			public TypeKind Kind {
-				get { return kind; }
-			}
-			
-			public IList<IUnresolvedTypeParameter> TypeParameters {
-				get { return typeParameters; }
-			}
-			
-			public IList<ITypeReference> BaseTypes {
-				get {
-					var result = LazyInit.VolatileRead(ref this.baseTypes);
-					if (result != null) {
-						return result;
-					}
-					lock (loader.currentModule) {
-						result = new List<ITypeReference>();
-						loader.InitBaseTypes(cecilTypeDef, result);
-						return LazyInit.GetOrSet(ref this.baseTypes, FreezableHelper.FreezeList(result));
-					}
-				}
-			}
-			
-			public IList<IUnresolvedTypeDefinition> NestedTypes {
-				get {
-					var result = LazyInit.VolatileRead(ref this.nestedTypes);
-					if (result != null) {
-						return result;
-					}
-					lock (loader.currentModule) {
-						if (this.nestedTypes != null)
-							return this.nestedTypes;
-						result = new List<IUnresolvedTypeDefinition>();
-						loader.InitNestedTypes(cecilTypeDef, this, result);
-						return LazyInit.GetOrSet(ref this.nestedTypes, FreezableHelper.FreezeList(result));
-					}
-				}
-			}
-			
-			public IList<IUnresolvedMember> Members {
-				get {
-					var result = LazyInit.VolatileRead(ref this.members);
-					if (result != null) {
-						return result;
-					}
-					lock (loader.currentModule) {
-						if (this.members != null)
-							return this.members;
-						result = new List<IUnresolvedMember>();
-						loader.InitMembers(cecilTypeDef, this, result);
-						return LazyInit.GetOrSet(ref this.members, FreezableHelper.FreezeList(result));
-					}
-				}
-			}
-			
-			public IEnumerable<IUnresolvedMethod> Methods {
-				get { return Members.OfType<IUnresolvedMethod>(); }
-			}
-			
-			public IEnumerable<IUnresolvedProperty> Properties {
-				get { return Members.OfType<IUnresolvedProperty>(); }
-			}
-			
-			public IEnumerable<IUnresolvedField> Fields {
-				get { return Members.OfType<IUnresolvedField>(); }
-			}
-			
-			public IEnumerable<IUnresolvedEvent> Events {
-				get { return Members.OfType<IUnresolvedEvent>(); }
-			}
-			
-			public bool AddDefaultConstructorIfRequired {
-				get { return kind == TypeKind.Struct || kind == TypeKind.Enum; }
-			}
-			
-			public bool? HasExtensionMethods {
-				get { return flags[FlagHasExtensionMethods]; }
-				// we always return true or false, never null.
-				// FlagHasNoExtensionMethods is unused in LazyCecilTypeDefinition
-			}
-			
-			public override object Clone()
-			{
-				throw new NotSupportedException();
-			}
-			
-			public IType Resolve(ITypeResolveContext context)
-			{
-				if (context == null)
-					throw new ArgumentNullException("context");
-				if (context.CurrentAssembly == null)
-					throw new ArgumentException("An ITypeDefinition cannot be resolved in a context without a current assembly.");
-				return context.CurrentAssembly.GetTypeDefinition(this.FullTypeName)
-					?? (IType)new UnknownType(this.Namespace, this.Name, this.TypeParameters.Count);
-			}
-			
-			public ITypeResolveContext CreateResolveContext(ITypeResolveContext parentContext)
-			{
-				return parentContext;
-			}
-		}
-		#endregion
-		
-		#region Read Method
-		[CLSCompliant(false)]
-		public IUnresolvedMethod ReadMethod(MethodDefinition method, IUnresolvedTypeDefinition parentType, SymbolKind methodType = SymbolKind.Method)
-		{
-			return ReadMethod(method, parentType, methodType, null);
-		}
-		
-		IUnresolvedMethod ReadMethod(MethodDefinition method, IUnresolvedTypeDefinition parentType, SymbolKind methodType, IUnresolvedMember accessorOwner)
-		{
-			if (method == null)
-				return null;
-			DefaultUnresolvedMethod m = new DefaultUnresolvedMethod(parentType, method.Name);
-			m.SymbolKind = methodType;
-			m.AccessorOwner = accessorOwner;
-			m.HasBody = method.HasBody;
-			if (method.HasGenericParameters) {
-				for (int i = 0; i < method.GenericParameters.Count; i++) {
-					if (method.GenericParameters[i].Position != i)
-						throw new InvalidOperationException("g.Position != i");
-					m.TypeParameters.Add(new DefaultUnresolvedTypeParameter(
-						SymbolKind.Method, i, method.GenericParameters[i].Name));
-				}
-				for (int i = 0; i < method.GenericParameters.Count; i++) {
-					var tp = (DefaultUnresolvedTypeParameter)m.TypeParameters[i];
-					AddConstraints(tp, method.GenericParameters[i]);
-					tp.ApplyInterningProvider(interningProvider);
-				}
-			}
-			
-			m.ReturnType = ReadTypeReference(method.ReturnType, typeAttributes: method.MethodReturnType);
-			
-			if (HasAnyAttributes(method))
-				AddAttributes(method, m.Attributes, m.ReturnTypeAttributes);
-			TranslateModifiers(method, m);
-			
-			if (method.HasParameters) {
-				foreach (ParameterDefinition p in method.Parameters) {
-					m.Parameters.Add(ReadParameter(p));
-				}
-			}
-			
-			// mark as extension method if the attribute is set
-			if (method.IsStatic && HasExtensionAttribute(method)) {
-				m.IsExtensionMethod = true;
-			}
-
-			int lastDot = method.Name.LastIndexOf('.');
-			if (lastDot >= 0 && method.HasOverrides) {
-				// To be consistent with the parser-initialized type system, shorten the method name:
-				m.Name = method.Name.Substring(lastDot + 1);
-				m.IsExplicitInterfaceImplementation = true;
-				foreach (var or in method.Overrides) {
-					m.ExplicitInterfaceImplementations.Add(new DefaultMemberReference(
-						accessorOwner != null ? SymbolKind.Accessor : SymbolKind.Method,
-						ReadTypeReference(or.DeclaringType),
-						or.Name, or.GenericParameters.Count, m.Parameters.Select(p => p.Type).ToList()));
-				}
-			}
-
-			FinishReadMember(m, method);
-			return m;
-		}
-		
-		static bool HasExtensionAttribute(ICustomAttributeProvider provider)
-		{
-			if (provider.HasCustomAttributes) {
-				foreach (var attr in provider.CustomAttributes) {
-					if (attr.AttributeType.Name == "ExtensionAttribute" && attr.AttributeType.Namespace == "System.Runtime.CompilerServices")
-						return true;
-				}
-			}
-			return false;
-		}
-		
-		bool IsVisible(MethodAttributes att)
-		{
-			att &= MethodAttributes.MemberAccessMask;
-			return IncludeInternalMembers
-				|| att == MethodAttributes.Public
-				|| att == MethodAttributes.Family
-				|| att == MethodAttributes.FamORAssem;
-		}
-		
-		static Accessibility GetAccessibility(MethodAttributes attr)
-		{
-			switch (attr & MethodAttributes.MemberAccessMask) {
-				case MethodAttributes.Public:
-					return Accessibility.Public;
-				case MethodAttributes.FamANDAssem:
-					return Accessibility.ProtectedAndInternal;
-				case MethodAttributes.Assembly:
-					return Accessibility.Internal;
-				case MethodAttributes.Family:
-					return Accessibility.Protected;
-				case MethodAttributes.FamORAssem:
-					return Accessibility.ProtectedOrInternal;
-				default:
-					return Accessibility.Private;
-			}
-		}
-		
-		void TranslateModifiers(MethodDefinition method, AbstractUnresolvedMember m)
-		{
-			if (m.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
-				// interface members don't have modifiers, but we want to handle them as "public abstract"
-				m.Accessibility = Accessibility.Public;
-				m.IsAbstract = true;
-			} else {
-				m.Accessibility = GetAccessibility(method.Attributes);
-				if (method.IsAbstract) {
-					m.IsAbstract = true;
-					m.IsOverride = !method.IsNewSlot;
-				} else if (method.IsFinal) {
-					if (!method.IsNewSlot) {
-						m.IsSealed = true;
-						m.IsOverride = true;
-					}
-				} else if (method.IsVirtual) {
-					if (method.IsNewSlot)
-						m.IsVirtual = true;
-					else
-						m.IsOverride = true;
-				}
-				m.IsStatic = method.IsStatic;
-			}
-		}
-		#endregion
-		
-		#region Read Parameter
-		[CLSCompliant(false)]
-		public IUnresolvedParameter ReadParameter(ParameterDefinition parameter)
-		{
-			if (parameter == null)
-				throw new ArgumentNullException("parameter");
-			var type = ReadTypeReference(parameter.ParameterType, typeAttributes: parameter);
-			var p = new DefaultUnresolvedParameter(type, interningProvider.Intern(parameter.Name));
-			
-			if (parameter.ParameterType is Mono.Cecil.ByReferenceType) {
-				if (!parameter.IsIn && parameter.IsOut)
-					p.IsOut = true;
-				else
-					p.IsRef = true;
-			}
-			AddAttributes(parameter, p);
-			
-			if (parameter.IsOptional) {
-				p.DefaultValue = CreateSimpleConstantValue(type, parameter.Constant);
-			}
-			
-			if (parameter.ParameterType is Mono.Cecil.ArrayType) {
-				foreach (CustomAttribute att in parameter.CustomAttributes) {
-					if (att.AttributeType.FullName == typeof(ParamArrayAttribute).FullName) {
-						p.IsParams = true;
-						break;
-					}
-				}
-			}
-			
-			return interningProvider.Intern(p);
-		}
-		#endregion
-		
-		#region Read Field
-		bool IsVisible(FieldAttributes att)
-		{
-			att &= FieldAttributes.FieldAccessMask;
-			return IncludeInternalMembers
-				|| att == FieldAttributes.Public
-				|| att == FieldAttributes.Family
-				|| att == FieldAttributes.FamORAssem;
-		}
-
-		decimal? TryDecodeDecimalConstantAttribute(CustomAttribute attribute)
-		{
-			if (attribute.ConstructorArguments.Count != 5)
-				return null;
-
-			BlobReader reader = new BlobReader(attribute.GetBlob(), null);
-			if (reader.ReadUInt16() != 0x0001) {
-				Debug.WriteLine("Unknown blob prolog");
-				return null;
-			}
-
-			// DecimalConstantAttribute has the arguments (byte scale, byte sign, uint hi, uint mid, uint low) or (byte scale, byte sign, int hi, int mid, int low)
-			// Both of these invoke the Decimal constructor (int lo, int mid, int hi, bool isNegative, byte scale) with explicit argument conversions if required.
-			var ctorArgs = new object[attribute.ConstructorArguments.Count];
-			for (int i = 0; i < ctorArgs.Length; i++) {
-				switch (attribute.ConstructorArguments[i].Type.FullName) {
-					case "System.Byte":
-						ctorArgs[i] = reader.ReadByte();
-						break;
-					case "System.Int32":
-						ctorArgs[i] = reader.ReadInt32();
-						break;
-					case "System.UInt32":
-						ctorArgs[i] = unchecked((int)reader.ReadUInt32());
-						break;
-					default:
-						return null;
-				}
-			}
-
-			if (!ctorArgs.Select(a => a.GetType()).SequenceEqual(new[] { typeof(byte), typeof(byte), typeof(int), typeof(int), typeof(int) }))
-				return null;
-
-			return new decimal((int)ctorArgs[4], (int)ctorArgs[3], (int)ctorArgs[2], (byte)ctorArgs[1] != 0, (byte)ctorArgs[0]);
-		}
-		
-		[CLSCompliant(false)]
-		public IUnresolvedField ReadField(FieldDefinition field, IUnresolvedTypeDefinition parentType)
-		{
-			if (field == null)
-				throw new ArgumentNullException("field");
-			if (parentType == null)
-				throw new ArgumentNullException("parentType");
-			
-			DefaultUnresolvedField f = new DefaultUnresolvedField(parentType, field.Name);
-			f.Accessibility = GetAccessibility(field.Attributes);
-			f.IsReadOnly = field.IsInitOnly;
-			f.IsStatic = field.IsStatic;
-			f.ReturnType = ReadTypeReference(field.FieldType, typeAttributes: field);
-			if (field.HasConstant) {
-				f.ConstantValue = CreateSimpleConstantValue(f.ReturnType, field.Constant);
-			}
-			else {
-				var decConstant = field.CustomAttributes.FirstOrDefault(a => a.AttributeType.FullName == "System.Runtime.CompilerServices.DecimalConstantAttribute");
-				if (decConstant != null) {
-					var constValue = TryDecodeDecimalConstantAttribute(decConstant);
-					if (constValue != null)
-						f.ConstantValue = CreateSimpleConstantValue(f.ReturnType, constValue);
-				}
-			}
-			AddAttributes(field, f);
-			
-			RequiredModifierType modreq = field.FieldType as RequiredModifierType;
-			if (modreq != null && modreq.ModifierType.FullName == typeof(IsVolatile).FullName) {
-				f.IsVolatile = true;
-			}
-			
-			FinishReadMember(f, field);
-			return f;
-		}
-		
-		static Accessibility GetAccessibility(FieldAttributes attr)
-		{
-			switch (attr & FieldAttributes.FieldAccessMask) {
-				case FieldAttributes.Public:
-					return Accessibility.Public;
-				case FieldAttributes.FamANDAssem:
-					return Accessibility.ProtectedAndInternal;
-				case FieldAttributes.Assembly:
-					return Accessibility.Internal;
-				case FieldAttributes.Family:
-					return Accessibility.Protected;
-				case FieldAttributes.FamORAssem:
-					return Accessibility.ProtectedOrInternal;
-				default:
-					return Accessibility.Private;
-			}
-		}
-		#endregion
-		
-		#region Type Parameter Constraints
-		void AddConstraints(DefaultUnresolvedTypeParameter tp, GenericParameter g)
-		{
-			switch (g.Attributes & GenericParameterAttributes.VarianceMask) {
-				case GenericParameterAttributes.Contravariant:
-					tp.Variance = VarianceModifier.Contravariant;
-					break;
-				case GenericParameterAttributes.Covariant:
-					tp.Variance = VarianceModifier.Covariant;
-					break;
-			}
-			
-			tp.HasReferenceTypeConstraint = g.HasReferenceTypeConstraint;
-			tp.HasValueTypeConstraint = g.HasNotNullableValueTypeConstraint;
-			tp.HasDefaultConstructorConstraint = g.HasDefaultConstructorConstraint;
-			
-			if (g.HasConstraints) {
-				foreach (TypeReference constraint in g.Constraints) {
-					tp.Constraints.Add(ReadTypeReference(constraint));
-				}
-			}
-		}
-		#endregion
-		
-		#region Read Property
-
-		Accessibility MergePropertyAccessibility (Accessibility left, Accessibility right)
-		{
-			if (left == Accessibility.Public || right == Accessibility.Public)
-				return Accessibility.Public;
-
-			if (left == Accessibility.ProtectedOrInternal || right == Accessibility.ProtectedOrInternal)
-				return Accessibility.ProtectedOrInternal;
-
-			if (left == Accessibility.Protected && right == Accessibility.Internal || 
-			    left == Accessibility.Internal && right == Accessibility.Protected)
-				return Accessibility.ProtectedOrInternal;
-
-			if (left == Accessibility.Protected || right == Accessibility.Protected)
-				return Accessibility.Protected;
-
-			if (left == Accessibility.Internal || right == Accessibility.Internal)
-				return Accessibility.Internal;
-
-			if (left == Accessibility.ProtectedAndInternal || right == Accessibility.ProtectedAndInternal)
-				return Accessibility.ProtectedAndInternal;
-
-			return left;
-		}
-
-		[CLSCompliant(false)]
-		public IUnresolvedProperty ReadProperty(PropertyDefinition property, IUnresolvedTypeDefinition parentType, SymbolKind propertyType = SymbolKind.Property)
-		{
-			if (property == null)
-				throw new ArgumentNullException("property");
-			if (parentType == null)
-				throw new ArgumentNullException("parentType");
-			DefaultUnresolvedProperty p = new DefaultUnresolvedProperty(parentType, property.Name);
-			p.SymbolKind = propertyType;
-			TranslateModifiers(property.GetMethod ?? property.SetMethod, p);
-			if (property.GetMethod != null && property.SetMethod != null)
-				p.Accessibility = MergePropertyAccessibility (GetAccessibility (property.GetMethod.Attributes), GetAccessibility (property.SetMethod.Attributes));
-
-			p.ReturnType = ReadTypeReference(property.PropertyType, typeAttributes: property);
-			
-			p.Getter = ReadMethod(property.GetMethod, parentType, SymbolKind.Accessor, p);
-			p.Setter = ReadMethod(property.SetMethod, parentType, SymbolKind.Accessor, p);
-			
-			if (property.HasParameters) {
-				foreach (ParameterDefinition par in property.Parameters) {
-					p.Parameters.Add(ReadParameter(par));
-				}
-			}
-			AddAttributes(property, p);
-
-			var accessor = p.Getter ?? p.Setter;
-			if (accessor != null && accessor.IsExplicitInterfaceImplementation) {
-				p.Name = property.Name.Substring(property.Name.LastIndexOf('.') + 1);
-				p.IsExplicitInterfaceImplementation = true;
-				foreach (var mr in accessor.ExplicitInterfaceImplementations) {
-					p.ExplicitInterfaceImplementations.Add(new AccessorOwnerMemberReference(mr));
-				}
-			}
-
-			FinishReadMember(p, property);
-			return p;
-		}
-		#endregion
-		
-		#region Read Event
-		[CLSCompliant(false)]
-		public IUnresolvedEvent ReadEvent(EventDefinition ev, IUnresolvedTypeDefinition parentType)
-		{
-			if (ev == null)
-				throw new ArgumentNullException("ev");
-			if (parentType == null)
-				throw new ArgumentNullException("parentType");
-			
-			DefaultUnresolvedEvent e = new DefaultUnresolvedEvent(parentType, ev.Name);
-			TranslateModifiers(ev.AddMethod, e);
-			e.ReturnType = ReadTypeReference(ev.EventType, typeAttributes: ev);
-			
-			e.AddAccessor    = ReadMethod(ev.AddMethod,    parentType, SymbolKind.Accessor, e);
-			e.RemoveAccessor = ReadMethod(ev.RemoveMethod, parentType, SymbolKind.Accessor, e);
-			e.InvokeAccessor = ReadMethod(ev.InvokeMethod, parentType, SymbolKind.Accessor, e);
-			
-			AddAttributes(ev, e);
-			
-			var accessor = e.AddAccessor ?? e.RemoveAccessor ?? e.InvokeAccessor;
-			if (accessor != null && accessor.IsExplicitInterfaceImplementation) {
-				e.Name = ev.Name.Substring(ev.Name.LastIndexOf('.') + 1);
-				e.IsExplicitInterfaceImplementation = true;
-				foreach (var mr in accessor.ExplicitInterfaceImplementations) {
-					e.ExplicitInterfaceImplementations.Add(new AccessorOwnerMemberReference(mr));
-				}
-			}
-
-			FinishReadMember(e, ev);
-			
-			return e;
-		}
-		#endregion
-		
-		#region FinishReadMember / Interning
-		void FinishReadMember(AbstractUnresolvedMember member, MemberReference cecilDefinition)
-		{
-			member.ApplyInterningProvider(interningProvider);
-			member.Freeze();
-			RegisterCecilObject(member, cecilDefinition);
-		}
-		#endregion
-		
-		#region Type system translation table
-		readonly Dictionary<object, object> typeSystemTranslationTable;
-		
-		void RegisterCecilObject(IUnresolvedEntity typeSystemObject, MemberReference cecilObject)
-		{
-			if (OnEntityLoaded != null)
-				OnEntityLoaded(typeSystemObject, cecilObject);
-			
-			AddToTypeSystemTranslationTable(typeSystemObject, cecilObject);
-		}
-		
-		void AddToTypeSystemTranslationTable(object typeSystemObject, object cecilObject)
-		{
-			if (typeSystemTranslationTable != null) {
-				// When lazy-loading, the dictionary might be shared between multiple cecil-loaders that are used concurrently
-				lock (typeSystemTranslationTable) {
-					typeSystemTranslationTable[typeSystemObject] = cecilObject;
-				}
-			}
-		}
-		
-		T InternalGetCecilObject<T> (object typeSystemObject) where T : class
-		{
-			if (typeSystemObject == null)
-				throw new ArgumentNullException ("typeSystemObject");
-			if (!HasCecilReferences)
-				throw new NotSupportedException ("This instance contains no cecil references.");
-			object result;
-			lock (typeSystemTranslationTable) {
-				if (!typeSystemTranslationTable.TryGetValue (typeSystemObject, out result))
-					return null;
-			}
-			return result as T;
-		}
-		
-		[CLSCompliant(false)]
-		public AssemblyDefinition GetCecilObject (IUnresolvedAssembly content)
-		{
-			return InternalGetCecilObject<AssemblyDefinition> (content);
-		}
-		
-		[CLSCompliant(false)]
-		public TypeDefinition GetCecilObject (IUnresolvedTypeDefinition type)
-		{
-			if (type == null)
-				throw new ArgumentNullException ("type");
-			return InternalGetCecilObject<TypeDefinition> (type);
-		}
-		
-		[CLSCompliant(false)]
-		public MethodDefinition GetCecilObject (IUnresolvedMethod method)
-		{
-			return InternalGetCecilObject<MethodDefinition> (method);
-		}
-		
-		[CLSCompliant(false)]
-		public FieldDefinition GetCecilObject (IUnresolvedField field)
-		{
-			return InternalGetCecilObject<FieldDefinition> (field);
-		}
-		
-		[CLSCompliant(false)]
-		public EventDefinition GetCecilObject (IUnresolvedEvent evt)
-		{
-			return InternalGetCecilObject<EventDefinition> (evt);
-		}
-		
-		[CLSCompliant(false)]
-		public PropertyDefinition GetCecilObject (IUnresolvedProperty property)
-		{
-			return InternalGetCecilObject<PropertyDefinition> (property);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IField.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IField.cs
index 922554f8f5..79d619fb24 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IField.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IField.cs
@@ -40,7 +40,14 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		/// Gets whether this field is a constant (C#-like const).
 		/// </summary>
 		bool IsConst { get; }
-		
+
+		/// <summary>
+		/// Gets whether this field is a fixed size buffer (C#-like fixed).
+		/// If this is true, then ConstantValue contains the size of the buffer.
+		/// </summary>
+		bool IsFixed { get; }
+
+
 		IConstantValue ConstantValue { get; }
 		
 		/// <summary>
@@ -80,5 +87,11 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		/// Gets whether this field is volatile.
 		/// </summary>
 		bool IsVolatile { get; }
+
+		/// <summary>
+		/// Gets whether this field is a fixed size buffer (C#-like fixed).
+		/// If this is true, then ConstantValue contains the size of the buffer.
+		/// </summary>
+		bool IsFixed { get; }
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IParameter.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IParameter.cs
index 87ae98f8bb..74f23c6917 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IParameter.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IParameter.cs
@@ -94,5 +94,11 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		/// The default value is given by the <see cref="IVariable.ConstantValue"/> property.
 		/// </summary>
 		bool IsOptional { get; }
+		
+		/// <summary>
+		/// Gets the owner of this parameter.
+		/// May return null; for example when parameters belong to lambdas or anonymous methods.
+		/// </summary>
+		IParameterizedMember Owner { get; }
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IkvmLoader.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IkvmLoader.cs
deleted file mode 100644
index 60b40d693f..0000000000
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IkvmLoader.cs
+++ /dev/null
@@ -1,2113 +0,0 @@
-//
-// IkvmLoader.cs
-//
-// Author:
-//       Daniel Grunwald <daniel@danielgrunwald.de>
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Threading;
-using ICSharpCode.NRefactory.Documentation;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using ICSharpCode.NRefactory.Utils;
-using IKVM.Reflection;
-
-namespace ICSharpCode.NRefactory.TypeSystem
-{
-	/// <summary>
-	/// Allows loading an IProjectContent from an already compiled assembly.
-	/// </summary>
-	/// <remarks>Instance methods are not thread-safe; you need to create multiple instances of CecilLoader
-	/// if you want to load multiple project contents in parallel.</remarks>
-	public class IkvmLoader 
-	{
-		/// <summary>
-		/// Version number of the ikvm loader.
-		/// Should be incremented when fixing bugs in the ikvm loader so that project contents cached on disk
-		/// (which might be incorrect due to the bug) are re-created.
-		/// </summary>
-		const int ikvmLoaderVersion = 1;
-
-		#region Options
-		/// <summary>
-		/// Specifies whether to include internal members. The default is false.
-		/// </summary>
-		public bool IncludeInternalMembers { get; set; }
-
-		/// <summary>
-		/// Gets/Sets the documentation provider that is used to retrieve the XML documentation for all members.
-		/// </summary>
-		public IDocumentationProvider DocumentationProvider { get; set; }
-
-		InterningProvider interningProvider;
-
-		/// <summary>
-		/// Gets/Sets the interning provider.
-		/// </summary>
-		public InterningProvider InterningProvider {
-			get { return interningProvider; }
-			set {
-				if (value == null)
-					throw new ArgumentNullException();
-				interningProvider = value;
-			}
-		}
-
-		/// <summary>
-		/// Gets/Sets the cancellation token used by the cecil loader.
-		/// </summary>
-		public CancellationToken CancellationToken { get; set; }
-
-		/// <summary>
-		/// This delegate gets executed whenever an entity was loaded.
-		/// </summary>
-		/// <remarks>
-		/// This callback may be to build a dictionary that maps between
-		/// entities and cecil objects.
-		/// Warning: if delay-loading is used and the type system is accessed by multiple threads,
-		/// the callback may be invoked concurrently on multiple threads.
-		/// </remarks>
-		public Action<IUnresolvedEntity, MemberInfo> OnEntityLoaded { get; set; }
-		#endregion
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.TypeSystem.IkvmLoader"/> class.
-		/// </summary>
-		public IkvmLoader()
-		{
-			// Enable interning by default.
-			this.InterningProvider = new SimpleInterningProvider();
-		}
-
-		#region Load Assembly From Disk
-
-		public IUnresolvedAssembly LoadAssemblyFile(string fileName)
-		{
-			if (fileName == null)
-				throw new ArgumentNullException("fileName");
-		
-			using (var universe = new Universe (UniverseOptions.DisablePseudoCustomAttributeRetrieval | UniverseOptions.SupressReferenceTypeIdentityConversion)) {
-				universe.AssemblyResolve += delegate(object sender, IKVM.Reflection.ResolveEventArgs args) {
-					return universe.CreateMissingAssembly(args.Name);
-				};
-				return LoadAssembly (universe.LoadFile (fileName));
-			}
-		}
-
-		#endregion
-
-		IkvmUnresolvedAssembly currentAssembly;
-		Assembly currentAssemblyDefinition;
-
-		/// <summary>
-		/// Loads the assembly definition into a project content.
-		/// </summary>
-		/// <returns>Unresolved type system representing the assembly</returns>
-
-		[CLSCompliant(false)]
-		public IUnresolvedAssembly LoadAssembly(Assembly assembly)
-		{
-			if (assembly == null)
-				throw new ArgumentNullException ("assembly");
-
-			// Read assembly and module attributes
-			IList<IUnresolvedAttribute> assemblyAttributes = new List<IUnresolvedAttribute>();
-			IList<IUnresolvedAttribute> moduleAttributes = new List<IUnresolvedAttribute>();
-			AddAttributes(assembly, assemblyAttributes);
-			AddAttributes(assembly.ManifestModule, moduleAttributes);
-
-			assemblyAttributes = interningProvider.InternList(assemblyAttributes);
-			moduleAttributes = interningProvider.InternList(moduleAttributes);
-
-			currentAssemblyDefinition = assembly;
-			currentAssembly = new IkvmUnresolvedAssembly (assembly.FullName, DocumentationProvider);
-			currentAssembly.Location = assembly.Location;
-			currentAssembly.AssemblyAttributes.AddRange(assemblyAttributes);
-			currentAssembly.ModuleAttributes.AddRange(moduleAttributes);
-			// Register type forwarders:
-			foreach (var type in assembly.ManifestModule.__GetExportedTypes ()) {
-				if (type.Assembly != assembly) {
-					int typeParameterCount;
-					string ns = type.Namespace;
-					string name = ReflectionHelper.SplitTypeParameterCountFromReflectionName(type.Name, out typeParameterCount);
-					ns = interningProvider.Intern(ns);
-					name = interningProvider.Intern(name);
-					var typeRef = new GetClassTypeReference(GetAssemblyReference(type.Assembly), ns, name, typeParameterCount);
-					typeRef = interningProvider.Intern(typeRef);
-					var key = new TopLevelTypeName(ns, name, typeParameterCount);
-					currentAssembly.AddTypeForwarder(key, typeRef);
-				}
-			}
-
-			// Create and register all types:
-			var ikvmTypeDefs = new List<IKVM.Reflection.Type>();
-			var typeDefs = new List<DefaultUnresolvedTypeDefinition>();
-
-			foreach (var td in assembly.GetTypes ()) {
-				if (td.DeclaringType != null)
-					continue;
-				CancellationToken.ThrowIfCancellationRequested();
-
-				if (IncludeInternalMembers || td.IsPublic) {
-					string name = td.Name;
-					if (name.Length == 0)
-						continue;
-
-					var t = CreateTopLevelTypeDefinition(td);
-					ikvmTypeDefs.Add(td);
-					typeDefs.Add(t);
-					currentAssembly.AddTypeDefinition(t);
-					// The registration will happen after the members are initialized
-				}
-			}
-
-			// Initialize the type's members:
-			for (int i = 0; i < typeDefs.Count; i++) {
-				InitTypeDefinition(ikvmTypeDefs[i], typeDefs[i]);
-			}
-
-			// Freezing the assembly here is important:
-			// otherwise it will be frozen when a compilation is first created
-			// from it. But freezing has the effect of changing some collection instances
-			// (to ReadOnlyCollection). This hidden mutation was causing a crash
-			// when the FastSerializer was saving the assembly at the same time as
-			// the first compilation was created from it.
-			// By freezing the assembly now, we ensure it is usable on multiple
-			// threads without issues.
-			currentAssembly.Freeze();
-
-			var result = currentAssembly;
-			currentAssembly = null;
-			return result;
-		}
-
-		#region IUnresolvedAssembly implementation
-		[Serializable, FastSerializerVersion(ikvmLoaderVersion)]
-		sealed class IkvmUnresolvedAssembly : DefaultUnresolvedAssembly, IDocumentationProvider
-		{
-			readonly IDocumentationProvider documentationProvider;
-
-			public IkvmUnresolvedAssembly(string fullAssemblyName, IDocumentationProvider documentationProvider)
-				: base(fullAssemblyName)
-			{
-				this.documentationProvider = documentationProvider;
-			}
-
-			DocumentationComment IDocumentationProvider.GetDocumentation(IEntity entity)
-			{
-				if (documentationProvider != null)
-					return documentationProvider.GetDocumentation (entity);
-				return null;
-			}
-		}
-		#endregion
-
-		#region Read Type Reference
-		/// <summary>
-		/// Reads a type reference.
-		/// </summary>
-		/// <param name="type">The Cecil type reference that should be converted into
-		/// a type system type reference.</param>
-		/// <param name="typeAttributes">Attributes associated with the Cecil type reference.
-		/// This is used to support the 'dynamic' type.</param>
-		[CLSCompliant(false)]
-		public ITypeReference ReadTypeReference(IKVM.Reflection.Type type, IEnumerable<CustomAttributeData> typeAttributes = null)
-		{
-			int typeIndex = 0;
-			return CreateTypeReference(type, typeAttributes, ref typeIndex);
-		}
-
-		ITypeReference CreateTypeReference(IKVM.Reflection.Type type, IEnumerable<CustomAttributeData> typeAttributes, ref int typeIndex)
-		{
-			// TODO:
-			//			while (type is OptionalModifierType || type is RequiredModifierType) {
-			//				type = ((TypeSpecification)type).ElementType;
-			//			}
-
-			if (type == null) {
-				return SpecialType.UnknownType;
-			}
-			if (type.IsByRef) {
-				typeIndex++;
-				return interningProvider.Intern (
-					new ByReferenceTypeReference (
-					CreateTypeReference (
-					type.GetElementType (),
-					typeAttributes, ref typeIndex)));
-			}
-			if (type.IsPointer) {
-				typeIndex++;
-				return interningProvider.Intern (
-					new PointerTypeReference (
-					CreateTypeReference (
-					type.GetElementType (),
-					typeAttributes, ref typeIndex)));
-			}
-			if (type.IsArray) {
-				typeIndex++;
-				return interningProvider.Intern (
-					new ArrayTypeReference (
-						CreateTypeReference (
-						type.GetElementType (),
-						typeAttributes, ref typeIndex),
-						type.GetArrayRank ()));
-			}
-			if (type.IsConstructedGenericType) {
-				ITypeReference baseType = CreateTypeReference (type.GetGenericTypeDefinition (), typeAttributes, ref typeIndex);
-				var args = type.GetGenericArguments ();
-				var para = new ITypeReference[args.Length];
-				for (int i = 0; i < para.Length; ++i) {
-					typeIndex++;
-					para [i] = CreateTypeReference (args [i], typeAttributes, ref typeIndex);
-				}
-				return interningProvider.Intern (new ParameterizedTypeReference (baseType, para));
-			}
-			if (type.IsGenericParameter) {
-				return TypeParameterReference.Create (type.DeclaringMethod != null ? SymbolKind.Method : SymbolKind.TypeDefinition, type.GenericParameterPosition);
-			}
-			if (type.IsNested) {
-				ITypeReference typeRef = CreateTypeReference (type.DeclaringType, typeAttributes, ref typeIndex);
-				int partTypeParameterCount;
-				string namepart = ReflectionHelper.SplitTypeParameterCountFromReflectionName (type.Name, out partTypeParameterCount);
-				namepart = interningProvider.Intern (namepart);
-				return interningProvider.Intern (new NestedTypeReference (typeRef, namepart, partTypeParameterCount));
-			}
-
-			string ns = interningProvider.Intern (type.Namespace ?? string.Empty);
-			string name = type.Name;
-			if (name == null)
-				throw new InvalidOperationException ("type.Name returned null. Type: " + type);
-
-			if (name == "Object" && ns == "System" && HasDynamicAttribute (typeAttributes, typeIndex)) {
-				return SpecialType.Dynamic;
-			}
-			int typeParameterCount;
-			name = ReflectionHelper.SplitTypeParameterCountFromReflectionName (name, out typeParameterCount);
-			name = interningProvider.Intern (name);
-			if (currentAssembly != null) {
-				IUnresolvedTypeDefinition c = currentAssembly.GetTypeDefinition (ns, name, typeParameterCount);
-				if (c != null)
-					return c;
-			}
-			return interningProvider.Intern (new GetClassTypeReference (GetAssemblyReference (type.Assembly), ns, name, typeParameterCount));
-		}
-
-		IAssemblyReference GetAssemblyReference(Assembly scope)
-		{
-			if (scope == null || scope == currentAssemblyDefinition)
-				return DefaultAssemblyReference.CurrentAssembly;
-			return interningProvider.Intern (new DefaultAssemblyReference (scope.FullName));
-		}
-
-		static bool HasDynamicAttribute(IEnumerable<CustomAttributeData> attributeProvider, int typeIndex)
-		{
-			if (attributeProvider == null)
-				return false;
-			foreach (var a in attributeProvider) {
-				var type = a.AttributeType;
-				if (type.Name == "DynamicAttribute" && type.Namespace == "System.Runtime.CompilerServices") {
-					if (a.ConstructorArguments.Count == 1) {
-						var values = a.ConstructorArguments[0].Value as CustomAttributeTypedArgument[];
-						if (values != null && typeIndex < values.Length && values[typeIndex].Value is bool) {
-							return (bool)values [typeIndex].Value;
-						}
-					}
-					return true;
-				}
-			}
-			return false;
-		}
-		#endregion
-
-		#region Read Attributes
-		#region Assembly Attributes
-		static readonly ITypeReference assemblyVersionAttributeTypeRef = typeof(System.Reflection.AssemblyVersionAttribute).ToTypeReference();
-
-		void AddAttributes(Assembly assembly, IList<IUnresolvedAttribute> outputList)
-		{
-			AddCustomAttributes(assembly.CustomAttributes, outputList);
-			AddSecurityAttributes(CustomAttributeData.__GetDeclarativeSecurity (assembly), outputList);
-
-			// AssemblyVersionAttribute
-			if (assembly.GetName ().Version != null) {
-				var assemblyVersion = new DefaultUnresolvedAttribute(assemblyVersionAttributeTypeRef, new[] { KnownTypeReference.String });
-				assemblyVersion.PositionalArguments.Add(CreateSimpleConstantValue(KnownTypeReference.String, assembly.GetName ().Version.ToString()));
-				outputList.Add(interningProvider.Intern(assemblyVersion));
-			}
-		}
-
-		IConstantValue CreateSimpleConstantValue(ITypeReference type, object value)
-		{
-			return interningProvider.Intern(new SimpleConstantValue(type, interningProvider.InternValue(value)));
-		}
-		#endregion
-
-		#region Module Attributes
-		void AddAttributes(Module module, IList<IUnresolvedAttribute> outputList)
-		{
-			AddCustomAttributes(module.CustomAttributes, outputList);
-		}
-		#endregion
-
-		#region Parameter Attributes
-		static readonly IUnresolvedAttribute inAttribute = new DefaultUnresolvedAttribute(typeof(InAttribute).ToTypeReference());
-		static readonly IUnresolvedAttribute outAttribute = new DefaultUnresolvedAttribute(typeof(OutAttribute).ToTypeReference());
-
-		void AddAttributes(ParameterInfo parameter, DefaultUnresolvedParameter targetParameter)
-		{
-			if (!targetParameter.IsOut) {
-				if (parameter.IsIn)
-					targetParameter.Attributes.Add(inAttribute);
-				if (parameter.IsOut)
-					targetParameter.Attributes.Add(outAttribute);
-			}
-			AddCustomAttributes(parameter.CustomAttributes, targetParameter.Attributes);
-
-			FieldMarshal marshalInfo;
-			if (parameter.__TryGetFieldMarshal (out marshalInfo)) {
-				targetParameter.Attributes.Add(ConvertMarshalInfo(marshalInfo));
-			}
-		}
-		#endregion
-
-		#region Method Attributes
-		static readonly ITypeReference dllImportAttributeTypeRef = typeof(DllImportAttribute).ToTypeReference();
-		static readonly SimpleConstantValue trueValue = new SimpleConstantValue(KnownTypeReference.Boolean, true);
-		static readonly SimpleConstantValue falseValue = new SimpleConstantValue(KnownTypeReference.Boolean, false);
-		static readonly ITypeReference callingConventionTypeRef = typeof(CallingConvention).ToTypeReference();
-		static readonly IUnresolvedAttribute preserveSigAttribute = new DefaultUnresolvedAttribute(typeof(PreserveSigAttribute).ToTypeReference());
-		static readonly ITypeReference methodImplAttributeTypeRef = typeof(MethodImplAttribute).ToTypeReference();
-		static readonly ITypeReference methodImplOptionsTypeRef = typeof(MethodImplOptions).ToTypeReference();
-
-		static bool HasAnyAttributes(MethodInfo methodDefinition)
-		{
-			if (methodDefinition.Attributes.HasFlag (MethodAttributes.PinvokeImpl))
-				return true;
-
-			if (methodDefinition.MethodImplementationFlags.HasFlag (MethodImplAttributes.CodeTypeMask))
-				return true;
-			if (methodDefinition.ReturnParameter.Attributes.HasFlag (ParameterAttributes.HasFieldMarshal))
-				return true;
-			return methodDefinition.CustomAttributes.Any ();
-		}
-
-		static bool HasAnyAttributes(ConstructorInfo methodDefinition)
-		{
-			if (methodDefinition.Attributes.HasFlag (MethodAttributes.PinvokeImpl))
-				return true;
-
-			if (methodDefinition.MethodImplementationFlags.HasFlag (MethodImplAttributes.CodeTypeMask))
-				return true;
-			return methodDefinition.CustomAttributes.Any ();
-		}
-
-		void AddAttributes(MethodInfo methodDefinition, IList<IUnresolvedAttribute> attributes, ICollection<IUnresolvedAttribute> returnTypeAttributes)
-		{
-			var implAttributes = methodDefinition.MethodImplementationFlags;
-
-			#region DllImportAttribute
-			if (methodDefinition.Attributes.HasFlag (MethodAttributes.PinvokeImpl)) {
-
-				ImplMapFlags flags;
-				string importName;
-				string importScope;
-				if (methodDefinition.__TryGetImplMap(out flags, out importName, out importScope)) {
-					var dllImport = new DefaultUnresolvedAttribute(dllImportAttributeTypeRef, new[] { KnownTypeReference.String });
-					dllImport.PositionalArguments.Add(CreateSimpleConstantValue(KnownTypeReference.String, importScope));
-
-					
-					if (flags.HasFlag (ImplMapFlags.BestFitOff))
-						dllImport.AddNamedFieldArgument("BestFitMapping", falseValue);
-					if (flags.HasFlag (ImplMapFlags.BestFitOn))
-						dllImport.AddNamedFieldArgument("BestFitMapping", trueValue);
-
-					CallingConvention callingConvention;
-					switch (flags & ImplMapFlags.CallConvMask) {
-						case (ImplMapFlags)0:
-							Debug.WriteLine ("P/Invoke calling convention not set on:" + methodDefinition.Name);
-							callingConvention = CallingConvention.StdCall;
-							break;
-						case ImplMapFlags.CallConvCdecl:
-							callingConvention = CallingConvention.Cdecl;
-							break;
-						case ImplMapFlags.CallConvFastcall:
-							callingConvention = CallingConvention.FastCall;
-							break;
-						case ImplMapFlags.CallConvStdcall:
-							callingConvention = CallingConvention.StdCall;
-							break;
-						case ImplMapFlags.CallConvThiscall:
-							callingConvention = CallingConvention.ThisCall;
-							break;
-						case ImplMapFlags.CallConvWinapi:
-							callingConvention = CallingConvention.Winapi;
-							break;
-						default:
-							throw new NotSupportedException("unknown calling convention");
-					}
-					if (!flags.HasFlag (ImplMapFlags.CallConvWinapi))
-						dllImport.AddNamedFieldArgument("CallingConvention", CreateSimpleConstantValue(callingConventionTypeRef, (int)callingConvention));
-
-					CharSet charSet = CharSet.None;
-					switch (flags & ImplMapFlags.CharSetMask) {
-						case ImplMapFlags.CharSetAnsi:
-							charSet = CharSet.Ansi;
-							break;
-						case ImplMapFlags.CharSetAuto:
-							charSet = CharSet.Auto;
-							break;
-						case ImplMapFlags.CharSetUnicode:
-							charSet = CharSet.Unicode;
-							break;
-					}
-					if (charSet != CharSet.None)
-						dllImport.AddNamedFieldArgument("CharSet", CreateSimpleConstantValue(charSetTypeRef, (int)charSet));
-
-					if (!string.IsNullOrEmpty(importName) && importName != methodDefinition.Name)
-						dllImport.AddNamedFieldArgument("EntryPoint", CreateSimpleConstantValue(KnownTypeReference.String, importName));
-
-					if (flags.HasFlag (ImplMapFlags.NoMangle))
-						dllImport.AddNamedFieldArgument("ExactSpelling", trueValue);
-
-					if ((implAttributes & MethodImplAttributes.PreserveSig) == MethodImplAttributes.PreserveSig)
-						implAttributes &= ~MethodImplAttributes.PreserveSig;
-					else
-						dllImport.AddNamedFieldArgument("PreserveSig", falseValue);
-
-					if (flags.HasFlag (ImplMapFlags.SupportsLastError))
-						dllImport.AddNamedFieldArgument("SetLastError", trueValue);
-
-					if (flags.HasFlag (ImplMapFlags.CharMapErrorOff))
-						dllImport.AddNamedFieldArgument("ThrowOnUnmappableChar", falseValue);
-					if (flags.HasFlag (ImplMapFlags.CharMapErrorOn))
-						dllImport.AddNamedFieldArgument("ThrowOnUnmappableChar", trueValue);
-
-					attributes.Add(interningProvider.Intern(dllImport));
-				}
-			}
-			#endregion
-
-			#region PreserveSigAttribute
-			if (implAttributes == MethodImplAttributes.PreserveSig) {
-				attributes.Add(preserveSigAttribute);
-				implAttributes = (MethodImplAttributes)0;
-			}
-			#endregion
-
-			#region MethodImplAttribute
-			if (implAttributes != MethodImplAttributes.IL) {
-				var methodImpl = new DefaultUnresolvedAttribute(methodImplAttributeTypeRef, new[] { methodImplOptionsTypeRef });
-				methodImpl.PositionalArguments.Add(CreateSimpleConstantValue(methodImplOptionsTypeRef, (int)implAttributes));
-				attributes.Add(interningProvider.Intern(methodImpl));
-			}
-			#endregion
-
-			var customAttributes = methodDefinition.CustomAttributes;
-			AddCustomAttributes (customAttributes, attributes);
-
-			if (methodDefinition.Attributes.HasFlag (MethodAttributes.HasSecurity)) {
-				AddSecurityAttributes(CustomAttributeData.__GetDeclarativeSecurity (methodDefinition), attributes);
-			}
-
-			FieldMarshal marshalInfo;
-			if (methodDefinition.ReturnParameter.__TryGetFieldMarshal (out marshalInfo)) {
-				returnTypeAttributes.Add(ConvertMarshalInfo(marshalInfo));
-			}
-// TODO: Not needed in ikvm - maybe a work around for a cecil bug ?
-//			AddCustomAttributes(methodDefinition.ReturnType.CustomAttributes, returnTypeAttributes);
-		}
-
-		void AddAttributes(ConstructorInfo methodDefinition, IList<IUnresolvedAttribute> attributes, IList<IUnresolvedAttribute> returnTypeAttributes)
-		{
-			var implAttributes = methodDefinition.MethodImplementationFlags;
-
-			#region PreserveSigAttribute
-			if (implAttributes == MethodImplAttributes.PreserveSig) {
-				attributes.Add(preserveSigAttribute);
-				implAttributes = 0;
-			}
-			#endregion
-
-			#region MethodImplAttribute
-			if (implAttributes != MethodImplAttributes.IL) {
-				var methodImpl = new DefaultUnresolvedAttribute(methodImplAttributeTypeRef, new[] { methodImplOptionsTypeRef });
-				methodImpl.PositionalArguments.Add(CreateSimpleConstantValue(methodImplOptionsTypeRef, (int)implAttributes));
-				attributes.Add(interningProvider.Intern(methodImpl));
-			}
-			#endregion
-
-			AddCustomAttributes(methodDefinition.CustomAttributes, attributes);
-
-			if (methodDefinition.Attributes.HasFlag (MethodAttributes.HasSecurity)) {
-				AddSecurityAttributes(CustomAttributeData.__GetDeclarativeSecurity (methodDefinition), attributes);
-			}
-		}
-		#endregion
-
-		#region Type Attributes
-		static readonly DefaultUnresolvedAttribute serializableAttribute = new DefaultUnresolvedAttribute(typeof(SerializableAttribute).ToTypeReference());
-		static readonly DefaultUnresolvedAttribute comImportAttribute = new DefaultUnresolvedAttribute(typeof(ComImportAttribute).ToTypeReference());
-		static readonly ITypeReference structLayoutAttributeTypeRef = typeof(StructLayoutAttribute).ToTypeReference();
-		static readonly ITypeReference layoutKindTypeRef = typeof(LayoutKind).ToTypeReference();
-		static readonly ITypeReference charSetTypeRef = typeof(CharSet).ToTypeReference();
-
-		void AddAttributes(IKVM.Reflection.Type typeDefinition, IUnresolvedTypeDefinition targetEntity)
-		{
-			// SerializableAttribute
-			if (typeDefinition.IsSerializable)
-				targetEntity.Attributes.Add(serializableAttribute);
-
-			// ComImportAttribute
-			if (typeDefinition.IsImport)
-				targetEntity.Attributes.Add(comImportAttribute);
-
-			#region StructLayoutAttribute
-			LayoutKind layoutKind = LayoutKind.Auto;
-			switch (typeDefinition.Attributes & TypeAttributes.LayoutMask) {
-				case TypeAttributes.SequentialLayout:
-				layoutKind = LayoutKind.Sequential;
-				break;
-				case TypeAttributes.ExplicitLayout:
-				layoutKind = LayoutKind.Explicit;
-				break;
-			}
-			CharSet charSet = CharSet.None;
-			switch (typeDefinition.Attributes & TypeAttributes.StringFormatMask) {
-				case TypeAttributes.AnsiClass:
-				charSet = CharSet.Ansi;
-				break;
-				case TypeAttributes.AutoClass:
-				charSet = CharSet.Auto;
-				break;
-				case TypeAttributes.UnicodeClass:
-				charSet = CharSet.Unicode;
-				break;
-			}
-
-
-			int packingSize;
-			int typeSize;
-			if (typeDefinition.__GetLayout (out packingSize, out typeSize)) {
-				LayoutKind defaultLayoutKind = (typeDefinition.IsValueType && !typeDefinition.IsEnum) ? LayoutKind.Sequential: LayoutKind.Auto;
-				if (layoutKind != defaultLayoutKind || charSet != CharSet.Ansi || packingSize > 0 || typeSize > 0) {
-					var structLayout = new DefaultUnresolvedAttribute(structLayoutAttributeTypeRef, new[] { layoutKindTypeRef });
-					structLayout.PositionalArguments.Add(CreateSimpleConstantValue(layoutKindTypeRef, (int)layoutKind));
-					if (charSet != CharSet.Ansi) {
-						structLayout.AddNamedFieldArgument("CharSet", CreateSimpleConstantValue(charSetTypeRef, (int)charSet));
-					}
-					if (packingSize > 0) {
-						structLayout.AddNamedFieldArgument("Pack", CreateSimpleConstantValue(KnownTypeReference.Int32, packingSize));
-					}
-					if (typeSize > 0) {
-						structLayout.AddNamedFieldArgument("Size", CreateSimpleConstantValue(KnownTypeReference.Int32, typeSize));
-					}
-					targetEntity.Attributes.Add(interningProvider.Intern(structLayout));
-				}
-			}
-			#endregion
-
-			AddCustomAttributes(typeDefinition.CustomAttributes, targetEntity.Attributes);
-
-			if (typeDefinition.Attributes.HasFlag (TypeAttributes.HasSecurity)) {
-				AddSecurityAttributes(CustomAttributeData.__GetDeclarativeSecurity(typeDefinition), targetEntity.Attributes);
-			}
-		}
-		#endregion
-
-		#region Field Attributes
-		static readonly ITypeReference fieldOffsetAttributeTypeRef = typeof(FieldOffsetAttribute).ToTypeReference();
-		static readonly IUnresolvedAttribute nonSerializedAttribute = new DefaultUnresolvedAttribute(typeof(NonSerializedAttribute).ToTypeReference());
-
-		void AddAttributes(FieldInfo fieldDefinition, IUnresolvedEntity targetEntity)
-		{
-			// FieldOffsetAttribute
-			int fOffset;
-			if (fieldDefinition.__TryGetFieldOffset(out fOffset)) {
-				var fieldOffset = new DefaultUnresolvedAttribute(fieldOffsetAttributeTypeRef, new[] { KnownTypeReference.Int32 });
-				fieldOffset.PositionalArguments.Add(CreateSimpleConstantValue(KnownTypeReference.Int32, fOffset));
-				targetEntity.Attributes.Add(interningProvider.Intern(fieldOffset));
-			}
-
-			// NonSerializedAttribute
-			if (fieldDefinition.IsNotSerialized) {
-				targetEntity.Attributes.Add(nonSerializedAttribute);
-			}
-			FieldMarshal marshal;
-			if (fieldDefinition.__TryGetFieldMarshal (out marshal))
-				targetEntity.Attributes.Add(ConvertMarshalInfo(marshal));
-
-			AddCustomAttributes(fieldDefinition.CustomAttributes, targetEntity.Attributes);
-		}
-		#endregion
-
-		#region Event Attributes
-		void AddAttributes(EventInfo eventDefinition, IUnresolvedEntity targetEntity)
-		{
-			AddCustomAttributes(eventDefinition.CustomAttributes, targetEntity.Attributes);
-		}
-		#endregion
-
-		#region Property Attributes
-		void AddAttributes(PropertyInfo propertyDefinition, IUnresolvedEntity targetEntity)
-		{
-			AddCustomAttributes(propertyDefinition.CustomAttributes, targetEntity.Attributes);
-		}
-		#endregion
-
-		#region MarshalAsAttribute (ConvertMarshalInfo)
-		static readonly ITypeReference marshalAsAttributeTypeRef = typeof(MarshalAsAttribute).ToTypeReference();
-		static readonly ITypeReference unmanagedTypeTypeRef = typeof(UnmanagedType).ToTypeReference();
-
-
-		IUnresolvedAttribute ConvertMarshalInfo(FieldMarshal marshalInfo)
-		{
-			DefaultUnresolvedAttribute attr = new DefaultUnresolvedAttribute(marshalAsAttributeTypeRef, new[] { unmanagedTypeTypeRef });
-			attr.PositionalArguments.Add(CreateSimpleConstantValue(unmanagedTypeTypeRef, (int)marshalInfo.UnmanagedType));
-
-
-			if (marshalInfo.UnmanagedType ==UnmanagedType.ByValArray) {
-				attr.AddNamedFieldArgument("SizeConst", CreateSimpleConstantValue(KnownTypeReference.Int32, (int)marshalInfo.SizeConst));
-				if (marshalInfo.ArraySubType.HasValue)
-					attr.AddNamedFieldArgument("ArraySubType", CreateSimpleConstantValue(unmanagedTypeTypeRef, (int)marshalInfo.ArraySubType.Value));
-			}
-
-			if (marshalInfo.UnmanagedType ==UnmanagedType.SafeArray) {
-				attr.AddNamedFieldArgument("SafeArraySubType", CreateSimpleConstantValue(typeof(VarEnum).ToTypeReference(), (int)marshalInfo.SafeArraySubType));
-			}
-
-			if (marshalInfo.UnmanagedType == UnmanagedType.LPArray) {
-				if (marshalInfo.ArraySubType != null)
-					attr.AddNamedFieldArgument("ArraySubType", CreateSimpleConstantValue(unmanagedTypeTypeRef, (int)marshalInfo.ArraySubType));
-				if (marshalInfo.SizeConst >= 0)
-					attr.AddNamedFieldArgument("SizeConst", CreateSimpleConstantValue(KnownTypeReference.Int32, (int)marshalInfo.SizeConst));
-				if (marshalInfo.SizeParamIndex >= 0)
-					attr.AddNamedFieldArgument("SizeParamIndex", CreateSimpleConstantValue(KnownTypeReference.Int16, (short)marshalInfo.SizeParamIndex));
-			}
-
-			if (marshalInfo.UnmanagedType == UnmanagedType.CustomMarshaler) {
-				attr.AddNamedFieldArgument("MarshalType", CreateSimpleConstantValue(KnownTypeReference.String, marshalInfo.MarshalTypeRef.FullName));
-				if (!string.IsNullOrEmpty(marshalInfo.MarshalCookie))
-					attr.AddNamedFieldArgument("MarshalCookie", CreateSimpleConstantValue(KnownTypeReference.String, marshalInfo.MarshalCookie));
-			}
-
-			if (marshalInfo.UnmanagedType == UnmanagedType.ByValTStr) {
-				attr.AddNamedFieldArgument("SizeConst", CreateSimpleConstantValue(KnownTypeReference.Int32, (int)marshalInfo.SizeConst));
-			}
-
-			return InterningProvider.Intern(attr);
-		}
-		#endregion
-
-		#region Custom Attributes (ReadAttribute)
-		void AddCustomAttributes(IEnumerable<CustomAttributeData> attributes, ICollection<IUnresolvedAttribute> targetCollection)
-		{
-			foreach (var cecilAttribute in attributes) {
-				var type = cecilAttribute.AttributeType;
-				if (type.Namespace == "System.Runtime.CompilerServices") {
-					if (type.Name == "DynamicAttribute" || type.Name == "ExtensionAttribute" || type.Name == "DecimalConstantAttribute")
-						continue;
-				} else if (type.Name == "ParamArrayAttribute" && type.Namespace == "System") {
-					continue;
-				}
-				targetCollection.Add(ReadAttribute(cecilAttribute));
-			}
-		}
-
-		[CLSCompliant(false)]
-		public IUnresolvedAttribute ReadAttribute(CustomAttributeData attribute)
-		{
-			if (attribute == null)
-				throw new ArgumentNullException("attribute");
-			var ctor = attribute.Constructor;
-			ITypeReference attributeType = ReadTypeReference(attribute.AttributeType);
-			IList<ITypeReference> ctorParameterTypes = EmptyList<ITypeReference>.Instance;
-			var parameters = ctor.GetParameters ();
-			if (parameters.Length > 0) {
-				ctorParameterTypes = new ITypeReference[parameters.Length];
-				for (int i = 0; i < ctorParameterTypes.Count; i++) {
-					ctorParameterTypes[i] = ReadTypeReference(parameters[i].ParameterType);
-				}
-				ctorParameterTypes = interningProvider.InternList(ctorParameterTypes);
-			}
-			return interningProvider.Intern(new CecilUnresolvedAttribute(attributeType, ctorParameterTypes, attribute.__GetBlob ()));
-		}
-		#endregion
-
-		#region CecilUnresolvedAttribute
-		static int GetBlobHashCode(byte[] blob)
-		{
-			unchecked {
-				int hash = 0;
-				foreach (byte b in blob) {
-					hash *= 257;
-					hash += b;
-				}
-				return hash;
-			}
-		}
-
-		static bool BlobEquals(byte[] a, byte[] b)
-		{
-			if (a.Length != b.Length)
-				return false;
-			for (int i = 0; i < a.Length; i++) {
-				if (a[i] != b[i])
-					return false;
-			}
-			return true;
-		}
-
-		[Serializable, FastSerializerVersion(ikvmLoaderVersion)]
-		sealed class CecilUnresolvedAttribute : IUnresolvedAttribute, ISupportsInterning
-		{
-			internal readonly ITypeReference attributeType;
-			internal readonly IList<ITypeReference> ctorParameterTypes;
-			internal readonly byte[] blob;
-
-			public CecilUnresolvedAttribute(ITypeReference attributeType, IList<ITypeReference> ctorParameterTypes, byte[] blob)
-			{
-				Debug.Assert(attributeType != null);
-				Debug.Assert(ctorParameterTypes != null);
-				Debug.Assert(blob != null);
-				this.attributeType = attributeType;
-				this.ctorParameterTypes = ctorParameterTypes;
-				this.blob = blob;
-			}
-
-			DomRegion IUnresolvedAttribute.Region {
-				get { return DomRegion.Empty; }
-			}
-
-			IAttribute IUnresolvedAttribute.CreateResolvedAttribute(ITypeResolveContext context)
-			{
-				if (context.CurrentAssembly == null)
-					throw new InvalidOperationException("Cannot resolve CecilUnresolvedAttribute without a parent assembly");
-				return new CecilResolvedAttribute(context, this);
-			}
-
-			int ISupportsInterning.GetHashCodeForInterning()
-			{
-				return attributeType.GetHashCode() ^ ctorParameterTypes.GetHashCode() ^ GetBlobHashCode(blob);
-			}
-
-			bool ISupportsInterning.EqualsForInterning(ISupportsInterning other)
-			{
-				var o = other as CecilUnresolvedAttribute;
-				return o != null && attributeType == o.attributeType && ctorParameterTypes == o.ctorParameterTypes
-					&& BlobEquals(blob, o.blob);
-			}
-		}
-		#endregion
-
-		#region CecilResolvedAttribute
-		sealed class CecilResolvedAttribute : IAttribute
-		{
-			readonly ITypeResolveContext context;
-			readonly byte[] blob;
-			readonly IList<ITypeReference> ctorParameterTypes;
-			readonly IType attributeType;
-
-			IMethod constructor;
-			volatile bool constructorResolved;
-
-			IList<ResolveResult> positionalArguments;
-			IList<KeyValuePair<IMember, ResolveResult>> namedArguments;
-
-			public CecilResolvedAttribute(ITypeResolveContext context, CecilUnresolvedAttribute unresolved)
-			{
-				this.context = context;
-				this.blob = unresolved.blob;
-				this.ctorParameterTypes = unresolved.ctorParameterTypes;
-				this.attributeType = unresolved.attributeType.Resolve(context);
-			}
-
-			public CecilResolvedAttribute(ITypeResolveContext context, IType attributeType)
-			{
-				this.context = context;
-				this.attributeType = attributeType;
-				this.ctorParameterTypes = EmptyList<ITypeReference>.Instance;
-			}
-
-			public DomRegion Region {
-				get { return DomRegion.Empty; }
-			}
-
-			public IType AttributeType {
-				get { return attributeType; }
-			}
-
-			public IMethod Constructor {
-				get {
-					if (!constructorResolved) {
-						constructor = ResolveConstructor();
-						constructorResolved = true;
-					}
-					return constructor;
-				}
-			}
-
-			IMethod ResolveConstructor()
-			{
-				var parameterTypes = ctorParameterTypes.Resolve(context);
-				foreach (var ctor in attributeType.GetConstructors(m => m.Parameters.Count == parameterTypes.Count)) {
-					bool ok = true;
-					for (int i = 0; i < parameterTypes.Count; i++) {
-						if (!ctor.Parameters[i].Type.Equals(parameterTypes[i])) {
-							ok = false;
-							break;
-						}
-					}
-					if (ok)
-						return ctor;
-				}
-				return null;
-			}
-
-			public IList<ResolveResult> PositionalArguments {
-				get {
-					var result = LazyInit.VolatileRead(ref positionalArguments);
-					if (result != null) {
-						return result;
-					}
-					DecodeBlob();
-					return positionalArguments;
-				}
-			}
-
-			public IList<KeyValuePair<IMember, ResolveResult>> NamedArguments {
-				get {
-					var result = LazyInit.VolatileRead(ref namedArguments);
-					if (result != null) {
-						return result;
-					}
-					DecodeBlob();
-					return namedArguments;
-				}
-			}
-
-			public override string ToString()
-			{
-				return "[" + attributeType + "(...)]";
-			}
-
-			void DecodeBlob()
-			{
-				var newPositionalArguments = new List<ResolveResult>();
-				var newNamedArguments = new List<KeyValuePair<IMember, ResolveResult>>();
-				DecodeBlob(newPositionalArguments, newNamedArguments);
-				Interlocked.CompareExchange(ref positionalArguments, newPositionalArguments, null);
-				Interlocked.CompareExchange(ref namedArguments, newNamedArguments, null);
-			}
-
-			void DecodeBlob(ICollection<ResolveResult> newPositionalArguments, ICollection<KeyValuePair<IMember, ResolveResult>> newNamedArguments)
-			{
-				if (blob == null)
-					return;
-				var reader = new BlobReader(blob, context.CurrentAssembly);
-				if (reader.ReadUInt16() != 0x0001) {
-					Debug.WriteLine("Unknown blob prolog");
-					return;
-				}
-				foreach (var ctorParameter in ctorParameterTypes.Resolve(context)) {
-					ResolveResult arg = reader.ReadFixedArg(ctorParameter);
-					newPositionalArguments.Add(arg);
-					if (arg.IsError) {
-						// After a decoding error, we must stop decoding the blob because
-						// we might have read too few bytes due to the error.
-						// Just fill up the remaining arguments with ErrorResolveResult:
-						while (newPositionalArguments.Count < ctorParameterTypes.Count)
-							newPositionalArguments.Add(ErrorResolveResult.UnknownError);
-						return;
-					}
-				}
-				ushort numNamed = reader.ReadUInt16();
-				for (int i = 0; i < numNamed; i++) {
-					var namedArg = reader.ReadNamedArg(attributeType);
-					if (namedArg.Key != null)
-						newNamedArguments.Add(namedArg);
-				}
-			}
-		}
-		#endregion
-
-		#region class BlobReader
-		class BlobReader
-		{
-			byte[] buffer;
-			int position;
-			readonly IAssembly currentResolvedAssembly;
-
-			public BlobReader(byte[] buffer, IAssembly currentResolvedAssembly)
-			{
-				if (buffer == null)
-					throw new ArgumentNullException("buffer");
-				this.buffer = buffer;
-				this.currentResolvedAssembly = currentResolvedAssembly;
-			}
-
-			public byte ReadByte()
-			{
-				return buffer[position++];
-			}
-
-			public sbyte ReadSByte()
-			{
-				unchecked {
-					return(sbyte) ReadByte();
-				}
-			}
-
-			public byte[] ReadBytes(int length)
-			{
-				var bytes = new byte[length];
-				Buffer.BlockCopy(buffer, position, bytes, 0, length);
-				position += length;
-				return bytes;
-			}
-
-			public ushort ReadUInt16()
-			{
-				unchecked {
-					ushort value =(ushort)(buffer[position]
-					                       |(buffer[position + 1] << 8));
-					position += 2;
-					return value;
-				}
-			}
-
-			public short ReadInt16()
-			{
-				unchecked {
-					return(short) ReadUInt16();
-				}
-			}
-
-			public uint ReadUInt32()
-			{
-				unchecked {
-					uint value =(uint)(buffer[position]
-					                   |(buffer[position + 1] << 8)
-					                   |(buffer[position + 2] << 16)
-					                   |(buffer[position + 3] << 24));
-					position += 4;
-					return value;
-				}
-			}
-
-			public int ReadInt32()
-			{
-				unchecked {
-					return(int) ReadUInt32();
-				}
-			}
-
-			public ulong ReadUInt64()
-			{
-				unchecked {
-					uint low = ReadUInt32();
-					uint high = ReadUInt32();
-
-					return(((ulong) high) << 32) | low;
-				}
-			}
-
-			public long ReadInt64()
-			{
-				unchecked {
-					return(long) ReadUInt64();
-				}
-			}
-
-			public uint ReadCompressedUInt32()
-			{
-				unchecked {
-					byte first = ReadByte();
-					if((first & 0x80) == 0)
-						return first;
-
-					if((first & 0x40) == 0)
-						return((uint)(first & ~0x80) << 8)
-							| ReadByte();
-
-					return((uint)(first & ~0xc0) << 24)
-						|(uint) ReadByte() << 16
-							|(uint) ReadByte() << 8
-							| ReadByte();
-				}
-			}
-
-			public float ReadSingle()
-			{
-				unchecked {
-					if(!BitConverter.IsLittleEndian) {
-						var bytes = ReadBytes(4);
-						Array.Reverse(bytes);
-						return BitConverter.ToSingle(bytes, 0);
-					}
-
-					float value = BitConverter.ToSingle(buffer, position);
-					position += 4;
-					return value;
-				}
-			}
-
-			public double ReadDouble()
-			{
-				unchecked {
-					if(!BitConverter.IsLittleEndian) {
-						var bytes = ReadBytes(8);
-						Array.Reverse(bytes);
-						return BitConverter.ToDouble(bytes, 0);
-					}
-
-					double value = BitConverter.ToDouble(buffer, position);
-					position += 8;
-					return value;
-				}
-			}
-
-			public ResolveResult ReadFixedArg(IType argType)
-			{
-				if (argType.Kind == TypeKind.Array) {
-					if (((ArrayType)argType).Dimensions != 1) {
-						// Only single-dimensional arrays are supported
-						return ErrorResolveResult.UnknownError;
-					}
-					IType elementType = ((ArrayType)argType).ElementType;
-					uint numElem = ReadUInt32();
-					if (numElem == 0xffffffff) {
-						// null reference
-						return new ConstantResolveResult(argType, null);
-					} else {
-						ResolveResult[] elements = new ResolveResult[numElem];
-						for (int i = 0; i < elements.Length; i++) {
-							elements[i] = ReadElem(elementType);
-							// Stop decoding when encountering an error:
-							if (elements[i].IsError)
-								return ErrorResolveResult.UnknownError;
-						}
-						IType int32 = currentResolvedAssembly.Compilation.FindType(KnownTypeCode.Int32);
-						ResolveResult[] sizeArgs = { new ConstantResolveResult(int32, elements.Length) };
-						return new ArrayCreateResolveResult(argType, sizeArgs, elements);
-					}
-				} else {
-					return ReadElem(argType);
-				}
-			}
-
-			public ResolveResult ReadElem(IType elementType)
-			{
-				ITypeDefinition underlyingType;
-				if (elementType.Kind == TypeKind.Enum) {
-					underlyingType = elementType.GetDefinition ().EnumUnderlyingType.GetDefinition ();
-				} else {
-					underlyingType = elementType.GetDefinition ();
-				}
-				if (underlyingType == null)
-					return ErrorResolveResult.UnknownError;
-				KnownTypeCode typeCode = underlyingType.KnownTypeCode;
-				if (typeCode == KnownTypeCode.Object) {
-					// boxed value type
-					IType boxedTyped = ReadCustomAttributeFieldOrPropType ();
-					ResolveResult elem = ReadElem (boxedTyped);
-					if (elem.IsCompileTimeConstant && elem.ConstantValue == null)
-						return new ConstantResolveResult (elementType, null);
-					return new ConversionResolveResult (elementType, elem, Conversion.BoxingConversion);
-				}
-				if (typeCode == KnownTypeCode.Type)
-					return new TypeOfResolveResult (underlyingType, ReadType ());
-				return new ConstantResolveResult (elementType, ReadElemValue (typeCode));
-			}
-
-			object ReadElemValue(KnownTypeCode typeCode)
-			{
-				switch (typeCode) {
-					case KnownTypeCode.Boolean:
-					return ReadByte() != 0;
-					case KnownTypeCode.Char:
-					return (char)ReadUInt16();
-					case KnownTypeCode.SByte:
-					return ReadSByte();
-					case KnownTypeCode.Byte:
-					return ReadByte();
-					case KnownTypeCode.Int16:
-					return ReadInt16();
-					case KnownTypeCode.UInt16:
-					return ReadUInt16();
-					case KnownTypeCode.Int32:
-					return ReadInt32();
-					case KnownTypeCode.UInt32:
-					return ReadUInt32();
-					case KnownTypeCode.Int64:
-					return ReadInt64();
-					case KnownTypeCode.UInt64:
-					return ReadUInt64();
-					case KnownTypeCode.Single:
-					return ReadSingle();
-					case KnownTypeCode.Double:
-					return ReadDouble();
-					case KnownTypeCode.String:
-					return ReadSerString();
-					default:
-					throw new NotSupportedException();
-				}
-			}
-
-			public string ReadSerString ()
-			{
-				if (buffer [position] == 0xff) {
-					position++;
-					return null;
-				}
-
-				int length = (int) ReadCompressedUInt32();
-				if (length == 0)
-					return string.Empty;
-
-				string @string = System.Text.Encoding.UTF8.GetString(
-					buffer, position,
-					buffer [position + length - 1] == 0 ? length - 1 : length);
-
-				position += length;
-				return @string;
-			}
-
-			public KeyValuePair<IMember, ResolveResult> ReadNamedArg(IType attributeType)
-			{
-				SymbolKind memberType;
-				var b = ReadByte();
-				switch (b) {
-					case 0x53:
-					memberType = SymbolKind.Field;
-					break;
-					case 0x54:
-					memberType = SymbolKind.Property;
-					break;
-					default:
-					throw new NotSupportedException(string.Format("Custom member type 0x{0:x} is not supported.", b));
-				}
-				IType type = ReadCustomAttributeFieldOrPropType();
-				string name = ReadSerString();
-				ResolveResult val = ReadFixedArg(type);
-				IMember member = null;
-				// Use last matching member, as GetMembers() returns members from base types first.
-				foreach (IMember m in attributeType.GetMembers(m => m.SymbolKind == memberType && m.Name == name)) {
-					if (m.ReturnType.Equals(type))
-						member = m;
-				}
-				return new KeyValuePair<IMember, ResolveResult>(member, val);
-			}
-
-			IType ReadCustomAttributeFieldOrPropType()
-			{
-				ICompilation compilation = currentResolvedAssembly.Compilation;
-				var b = ReadByte();
-				switch (b) {
-					case 0x02:
-					return compilation.FindType(KnownTypeCode.Boolean);
-					case 0x03:
-					return compilation.FindType(KnownTypeCode.Char);
-					case 0x04:
-					return compilation.FindType(KnownTypeCode.SByte);
-					case 0x05:
-					return compilation.FindType(KnownTypeCode.Byte);
-					case 0x06:
-					return compilation.FindType(KnownTypeCode.Int16);
-					case 0x07:
-					return compilation.FindType(KnownTypeCode.UInt16);
-					case 0x08:
-					return compilation.FindType(KnownTypeCode.Int32);
-					case 0x09:
-					return compilation.FindType(KnownTypeCode.UInt32);
-					case 0x0a:
-					return compilation.FindType(KnownTypeCode.Int64);
-					case 0x0b:
-					return compilation.FindType(KnownTypeCode.UInt64);
-					case 0x0c:
-					return compilation.FindType(KnownTypeCode.Single);
-					case 0x0d:
-					return compilation.FindType(KnownTypeCode.Double);
-					case 0x0e:
-					return compilation.FindType(KnownTypeCode.String);
-					case 0x1d:
-					return new ArrayType(compilation, ReadCustomAttributeFieldOrPropType());
-					case 0x50:
-					return compilation.FindType(KnownTypeCode.Type);
-					case 0x51: // boxed value type
-					return compilation.FindType(KnownTypeCode.Object);
-					case 0x55: // enum
-					return ReadType();
-					default:
-					throw new NotSupportedException(string.Format("Custom attribute type 0x{0:x} is not supported.", b));
-				}
-			}
-
-			IType ReadType()
-			{
-				string typeName = ReadSerString ();
-				ITypeReference typeReference = ReflectionHelper.ParseReflectionName (typeName);
-				IType typeInCurrentAssembly = typeReference.Resolve (new SimpleTypeResolveContext (currentResolvedAssembly));
-				if (typeInCurrentAssembly.Kind != TypeKind.Unknown)
-					return typeInCurrentAssembly;
-
-				// look for the type in mscorlib
-				ITypeDefinition systemObject = currentResolvedAssembly.Compilation.FindType (KnownTypeCode.Object).GetDefinition ();
-				if (systemObject != null)
-					return typeReference.Resolve (new SimpleTypeResolveContext (systemObject.ParentAssembly));
-				// couldn't find corlib - return the unknown IType for the current assembly
-				return typeInCurrentAssembly;
-			}
-		}
-		#endregion
-
-		#region Security Attributes
-		static readonly ITypeReference securityActionTypeReference = typeof(System.Security.Permissions.SecurityAction).ToTypeReference();
-		static readonly ITypeReference permissionSetAttributeTypeReference = typeof(System.Security.Permissions.PermissionSetAttribute).ToTypeReference();
-
-//		/// <summary>
-//		/// Reads a security declaration.
-//		/// </summary>
-//		[CLSCompliant(false)]
-//		public IList<IUnresolvedAttribute> ReadSecurityDeclaration(SecurityDeclaration secDecl)
-//		{
-//			if (secDecl == null)
-//				throw new ArgumentNullException("secDecl");
-//			var result = new List<IUnresolvedAttribute>();
-//			AddSecurityAttributes(secDecl, result);
-//			return result;
-//		}
-//
-//		void AddSecurityAttributes(Mono.Collections.Generic.Collection<SecurityDeclaration> securityDeclarations, IList<IUnresolvedAttribute> targetCollection)
-//		{
-//			foreach (var secDecl in securityDeclarations) {
-//				AddSecurityAttributes(secDecl, targetCollection);
-//			}
-//		}
-
-		void AddSecurityAttributes(IEnumerable<CustomAttributeData> securityAttributes, IList<IUnresolvedAttribute> targetCollection)
-		{
-			AddCustomAttributes (securityAttributes, targetCollection);
-		}
-
-		[Serializable, FastSerializerVersion(ikvmLoaderVersion)]
-		sealed class UnresolvedSecurityDeclaration : ISupportsInterning
-		{
-			readonly IConstantValue securityAction;
-			readonly byte[] blob;
-
-			public UnresolvedSecurityDeclaration(IConstantValue securityAction, byte[] blob)
-			{
-				Debug.Assert(securityAction != null);
-				Debug.Assert(blob != null);
-				this.securityAction = securityAction;
-				this.blob = blob;
-			}
-
-			public IList<IAttribute> Resolve(IAssembly currentAssembly)
-			{
-				// TODO: make this a per-assembly cache
-//				CacheManager cache = currentAssembly.Compilation.CacheManager;
-//				IList<IAttribute> result = (IList<IAttribute>)cache.GetShared(this);
-//				if (result != null)
-//					return result;
-
-				var context = new SimpleTypeResolveContext(currentAssembly);
-				var reader = new BlobReader(blob, currentAssembly);
-				if (reader.ReadByte() != '.') {
-					// should not use UnresolvedSecurityDeclaration for XML secdecls
-					throw new InvalidOperationException();
-				}
-				var securityActionRR = securityAction.Resolve(context);
-				uint attributeCount = reader.ReadCompressedUInt32();
-				var attributes = new IAttribute[attributeCount];
-				try {
-					ReadSecurityBlob(reader, attributes, context, securityActionRR);
-				} catch (NotSupportedException ex) {
-					// ignore invalid blobs
-					Debug.WriteLine(ex.ToString());
-				}
-				for (int i = 0; i < attributes.Length; i++) {
-					if (attributes[i] == null)
-						attributes[i] = new CecilResolvedAttribute(context, SpecialType.UnknownType);
-				}
-				return attributes;
-//				return (IList<IAttribute>)cache.GetOrAddShared(this, attributes);
-			}
-
-			void ReadSecurityBlob(BlobReader reader, IAttribute[] attributes, ITypeResolveContext context, ResolveResult securityActionRR)
-			{
-				for (int i = 0; i < attributes.Length; i++) {
-					string attributeTypeName = reader.ReadSerString();
-					ITypeReference attributeTypeRef = ReflectionHelper.ParseReflectionName(attributeTypeName);
-					IType attributeType = attributeTypeRef.Resolve(context);
-
-					reader.ReadCompressedUInt32(); // ??
-					// The specification seems to be incorrect here, so I'm using the logic from Cecil instead.
-					uint numNamed = reader.ReadCompressedUInt32();
-
-					var namedArgs = new List<KeyValuePair<IMember, ResolveResult>>((int)numNamed);
-					for (uint j = 0; j < numNamed; j++) {
-						var namedArg = reader.ReadNamedArg(attributeType);
-						if (namedArg.Key != null)
-							namedArgs.Add(namedArg);
-
-					}
-					attributes[i] = new DefaultAttribute(
-						attributeType,
-						positionalArguments: new ResolveResult[] { securityActionRR },
-					namedArguments: namedArgs);
-				}
-			}
-
-			int ISupportsInterning.GetHashCodeForInterning()
-			{
-				return securityAction.GetHashCode() ^ GetBlobHashCode(blob);
-			}
-
-			bool ISupportsInterning.EqualsForInterning(ISupportsInterning other)
-			{
-				var o = other as UnresolvedSecurityDeclaration;
-				return o != null && securityAction == o.securityAction && BlobEquals(blob, o.blob);
-			}
-		}
-
-		[Serializable, FastSerializerVersion(ikvmLoaderVersion)]
-		sealed class UnresolvedSecurityAttribute : IUnresolvedAttribute, ISupportsInterning
-		{
-			readonly UnresolvedSecurityDeclaration secDecl;
-			readonly int index;
-
-			public UnresolvedSecurityAttribute(UnresolvedSecurityDeclaration secDecl, int index)
-			{
-				Debug.Assert(secDecl != null);
-				this.secDecl = secDecl;
-				this.index = index;
-			}
-
-			DomRegion IUnresolvedAttribute.Region {
-				get { return DomRegion.Empty; }
-			}
-
-			IAttribute IUnresolvedAttribute.CreateResolvedAttribute(ITypeResolveContext context)
-			{
-				return secDecl.Resolve(context.CurrentAssembly)[index];
-			}
-
-			int ISupportsInterning.GetHashCodeForInterning()
-			{
-				return index ^ secDecl.GetHashCode();
-			}
-
-			bool ISupportsInterning.EqualsForInterning(ISupportsInterning other)
-			{
-				var attr = other as UnresolvedSecurityAttribute;
-				return attr != null && index == attr.index && secDecl == attr.secDecl;
-			}
-		}
-		#endregion
-		#endregion
-
-		#region Read Type Definition
-		DefaultUnresolvedTypeDefinition CreateTopLevelTypeDefinition(IKVM.Reflection.Type typeDefinition)
-		{
-			var td = new DefaultUnresolvedTypeDefinition(typeDefinition.Namespace ?? "", ReflectionHelper.SplitTypeParameterCountFromReflectionName (typeDefinition.Name));
-			if (typeDefinition.IsGenericTypeDefinition)
-				InitTypeParameters(typeDefinition, td.TypeParameters);
-			return td;
-		}
-
-		static void InitTypeParameters(IKVM.Reflection.Type typeDefinition, ICollection<IUnresolvedTypeParameter> typeParameters)
-		{
-			// Type parameters are initialized within the constructor so that the class can be put into the type storage
-			// before the rest of the initialization runs - this allows it to be available for early binding as soon as possible.
-			var genericArguments = typeDefinition.GetGenericArguments ();
-			for (int i = 0; i < genericArguments.Length; i++) {
-				if (genericArguments[i].GenericParameterPosition != i)
-					throw new InvalidOperationException("g.GenericParameterPosition != i");
-				typeParameters.Add(new DefaultUnresolvedTypeParameter(
-					SymbolKind.TypeDefinition, i, genericArguments [i].Name));
-			}
-		}
-
-		void InitTypeParameterConstraints(IKVM.Reflection.Type typeDefinition, IList<IUnresolvedTypeParameter> typeParameters)
-		{
-			var args = typeDefinition.GetGenericArguments ();
-			for (int i = 0; i < typeParameters.Count; i++) {
-				var tp = (DefaultUnresolvedTypeParameter)typeParameters[i];
-				AddConstraints(tp, args[i]);
-				tp.ApplyInterningProvider(interningProvider);
-			}
-		}
-
-		void InitTypeDefinition(IKVM.Reflection.Type typeDefinition, DefaultUnresolvedTypeDefinition td)
-		{
-			td.Kind = GetTypeKind(typeDefinition);
-			InitTypeModifiers(typeDefinition, td);
-			InitTypeParameterConstraints(typeDefinition, td.TypeParameters);
-
-			// nested types can be initialized only after generic parameters were created
-			InitNestedTypes(typeDefinition, td, td.NestedTypes);
-			AddAttributes(typeDefinition, td);
-			td.HasExtensionMethods = HasExtensionAttribute(typeDefinition);
-
-			InitBaseTypes(typeDefinition, td.BaseTypes);
-
-			td.AddDefaultConstructorIfRequired = (td.Kind == TypeKind.Struct || td.Kind == TypeKind.Enum);
-			InitMembers(typeDefinition, td, td.Members);
-			td.ApplyInterningProvider(interningProvider);
-			td.Freeze();
-			RegisterCecilObject(td, typeDefinition);
-		}
-
-		void InitBaseTypes(IKVM.Reflection.Type typeDefinition, ICollection<ITypeReference> baseTypes)
-		{
-			// set base classes
-			if (typeDefinition.IsEnum) {
-				foreach (var enumField in typeDefinition.__GetDeclaredFields ()) {
-					if (!enumField.IsStatic) {
-						baseTypes.Add(ReadTypeReference(enumField.FieldType));
-						break;
-					}
-				}
-			} else {
-				if (typeDefinition.BaseType != null) {
-					baseTypes.Add(ReadTypeReference(typeDefinition.BaseType));
-				}
-				foreach (var iface in typeDefinition.__GetDeclaredInterfaces ()) {
-					baseTypes.Add(ReadTypeReference(iface));
-				}
-			}
-		}
-
-		void InitNestedTypes(IKVM.Reflection.Type typeDefinition, IUnresolvedTypeDefinition declaringTypeDefinition, ICollection<IUnresolvedTypeDefinition> nestedTypes)
-		{
-			foreach (var nestedTypeDef in typeDefinition.__GetDeclaredTypes()) {
-				if (IncludeInternalMembers
-					|| nestedTypeDef.IsNestedPublic
-				    || nestedTypeDef.IsNestedFamily
-				    || nestedTypeDef.IsNestedFamORAssem)
-				{
-					string name = nestedTypeDef.Name;
-					int pos = name.LastIndexOf('/');
-					if (pos > 0)
-						name = name.Substring(pos + 1);
-					name = ReflectionHelper.SplitTypeParameterCountFromReflectionName(name);
-					var nestedType = new DefaultUnresolvedTypeDefinition(declaringTypeDefinition, name);
-					InitTypeParameters(nestedTypeDef, nestedType.TypeParameters);
-					nestedTypes.Add(nestedType);
-					InitTypeDefinition(nestedTypeDef, nestedType);
-				}
-			}
-		}
-
-		static TypeKind GetTypeKind(IKVM.Reflection.Type typeDefinition)
-		{
-			// set classtype
-			if (typeDefinition.IsInterface)
-				return TypeKind.Interface;
-			if (typeDefinition.IsEnum)
-				return TypeKind.Enum;
-			if (typeDefinition.IsValueType)
-				return TypeKind.Struct;
-			if (IsDelegate (typeDefinition))
-				return TypeKind.Delegate;
-			if (IsModule (typeDefinition))
-				return TypeKind.Module;
-			return TypeKind.Class;
-		}
-
-		static void InitTypeModifiers(IKVM.Reflection.Type typeDefinition, AbstractUnresolvedEntity td)
-		{
-			td.IsSealed = typeDefinition.IsSealed;
-			td.IsAbstract = typeDefinition.IsAbstract;
-			switch (typeDefinition.Attributes & TypeAttributes.VisibilityMask) {
-				case TypeAttributes.NotPublic:
-				case TypeAttributes.NestedAssembly:
-					td.Accessibility = Accessibility.Internal;
-					break;
-				case TypeAttributes.Public:
-				case TypeAttributes.NestedPublic:
-					td.Accessibility = Accessibility.Public;
-					break;
-				case TypeAttributes.NestedPrivate:
-					td.Accessibility = Accessibility.Private;
-					break;
-				case TypeAttributes.NestedFamily:
-					td.Accessibility = Accessibility.Protected;
-					break;
-				case TypeAttributes.NestedFamANDAssem:
-					td.Accessibility = Accessibility.ProtectedAndInternal;
-					break;
-				case TypeAttributes.NestedFamORAssem:
-					td.Accessibility = Accessibility.ProtectedOrInternal;
-					break;
-			}
-		}
-
-		static bool IsDelegate(IKVM.Reflection.Type type)
-		{
-			if (type.BaseType != null && type.BaseType.Namespace == "System") {
-				if (type.BaseType.Name == "MulticastDelegate")
-					return true;
-				if (type.BaseType.Name == "Delegate" && type.Name != "MulticastDelegate")
-					return true;
-			}
-			return false;
-		}
-
-		static bool IsModule(IKVM.Reflection.Type type)
-		{
-			foreach (var att in type.CustomAttributes) {
-				if (att.AttributeType.FullName == "Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute"
-				    || att.AttributeType.FullName == "System.Runtime.CompilerServices.CompilerGlobalScopeAttribute")
-				{
-					return true;
-				}
-			}
-			return false;
-		}
-
-		void InitMembers(IKVM.Reflection.Type typeDefinition, IUnresolvedTypeDefinition td, IList<IUnresolvedMember> members)
-		{
-			foreach (var method in typeDefinition.__GetDeclaredMethods ()) {
-				if (method.IsConstructor) {
-					if (IsVisible(method.Attributes)) {
-						SymbolKind type = SymbolKind.Constructor;
-						members.Add(ReadConstructor(method, td, type));
-					}
-					continue;
-				}
-				if (IsVisible(method.Attributes) && !IsAccessor(method)) {
-					SymbolKind type = SymbolKind.Method;
-					if (method.IsSpecialName) {
-						if (method.Name.StartsWith("op_", StringComparison.Ordinal))
-							type = SymbolKind.Operator;
-					}
-					members.Add(ReadMethod(method, td, type));
-				}
-			}
-
-			foreach (var field in typeDefinition.__GetDeclaredFields ()) {
-				if (IsVisible(field.Attributes) && !field.IsSpecialName) {
-					members.Add(ReadField(field, td));
-				}
-			}
-
-			string defaultMemberName = null;
-			var defaultMemberAttribute = typeDefinition.CustomAttributes.FirstOrDefault(
-				a => a.AttributeType.FullName == typeof(System.Reflection.DefaultMemberAttribute).FullName);
-			if (defaultMemberAttribute != null && defaultMemberAttribute.ConstructorArguments.Count == 1) {
-				defaultMemberName = defaultMemberAttribute.ConstructorArguments[0].Value as string;
-			}
-
-			foreach (var property in typeDefinition.__GetDeclaredProperties ()) {
-				bool getterVisible = property.GetMethod != null && IsVisible(property.GetMethod.Attributes);
-				bool setterVisible = property.SetMethod != null && IsVisible(property.SetMethod.Attributes);
-				if (getterVisible || setterVisible) {
-					SymbolKind type = SymbolKind.Property;
-					if (property.GetIndexParameters () != null) {
-						// Try to detect indexer:
-						if (property.Name == defaultMemberName) {
-							type = SymbolKind.Indexer; // normal indexer
-						}
-						// TODO: HasOverrides ?
-						else if (property.Name.EndsWith(".Item", StringComparison.Ordinal) /*&& (property.GetMethod ?? property.SetMethod).HasOverrides*/) {
-							// explicit interface implementation of indexer
-							type = SymbolKind.Indexer;
-							// We can't really tell parameterized properties and indexers apart in this case without
-							// resolving the interface, so we rely on the "Item" naming convention instead.
-						}
-					}
-					members.Add(ReadProperty(property, td, type));
-				}
-			}
-
-			foreach (var ev in typeDefinition.__GetDeclaredEvents ()) {
-				if (ev.AddMethod != null && IsVisible(ev.AddMethod.Attributes)) {
-					members.Add(ReadEvent(ev, td));
-				}
-			}
-		}
-
-		static bool IsAccessor(MethodBase methodInfo)
-		{
-			if (!methodInfo.IsSpecialName)
-				return false;
-
-			var name = methodInfo.Name;
-			return 
-				name.StartsWith("get_", StringComparison.Ordinal) ||
-				name.StartsWith("set_", StringComparison.Ordinal) ||
-				name.StartsWith("add_", StringComparison.Ordinal) ||
-				name.StartsWith("remove_", StringComparison.Ordinal) ||
-				name.StartsWith("raise_", StringComparison.Ordinal);
-		}
-		#endregion
-
-		#region Read Method
-		[CLSCompliant(false)]
-		public IUnresolvedMethod ReadMethod(MethodBase method, IUnresolvedTypeDefinition parentType, SymbolKind methodType = SymbolKind.Method)
-		{
-			return ReadMethod((MethodInfo)method, parentType, methodType, null);
-		}
-
-		IUnresolvedMethod ReadMethod(MethodInfo method, IUnresolvedTypeDefinition parentType, SymbolKind methodType, IUnresolvedMember accessorOwner)
-		{
-			if (method == null)
-				return null;
-			var m = new DefaultUnresolvedMethod(parentType, method.Name);
-			m.SymbolKind = methodType;
-			m.AccessorOwner = accessorOwner;
-			m.HasBody = !method.DeclaringType.IsInterface && (method.GetMethodImplementationFlags () & MethodImplAttributes.CodeTypeMask) == MethodImplAttributes.IL;
-			var genericArguments = method.GetGenericArguments ();
-			if (genericArguments != null) {
-				for (int i = 0; i < genericArguments.Length; i++) {
-					if (genericArguments[i].GenericParameterPosition != i)
-						throw new InvalidOperationException("g.Position != i");
-					m.TypeParameters.Add(new DefaultUnresolvedTypeParameter(
-						SymbolKind.Method, i, genericArguments[i].Name));
-				}
-				for (int i = 0; i < genericArguments.Length; i++) {
-					var tp = (DefaultUnresolvedTypeParameter)m.TypeParameters[i];
-					AddConstraints(tp, genericArguments[i]);
-					tp.ApplyInterningProvider(interningProvider);
-				}
-			}
-
-			m.ReturnType = ReadTypeReference(method.ReturnType, typeAttributes: method.ReturnParameter.CustomAttributes);
-
-			if (HasAnyAttributes(method))
-				AddAttributes(method, m.Attributes, m.ReturnTypeAttributes);
-			TranslateModifiers(method, m);
-
-			foreach (var p in method.GetParameters ()) {
-				m.Parameters.Add(ReadParameter(p));
-			}
-
-			// mark as extension method if the attribute is set
-			if (method.IsStatic && HasExtensionAttribute(method)) {
-				m.IsExtensionMethod = true;
-			}
-
-			int lastDot = method.Name.LastIndexOf('.');
-			if (lastDot >= 0 /*&& method.HasOverrides*/) {
-				// To be consistent with the parser-initialized type system, shorten the method name:
-				m.Name = method.Name.Substring(lastDot + 1);
-				m.IsExplicitInterfaceImplementation = true;
-				
-				foreach (var or in method.__GetMethodImpls ()) {
-					m.ExplicitInterfaceImplementations.Add(new DefaultMemberReference(
-						accessorOwner != null ? SymbolKind.Accessor : SymbolKind.Method,
-						ReadTypeReference(or.DeclaringType),
-						or.Name, or.GetGenericArguments ().Length, m.Parameters.Select(p => p.Type).ToList()));
-				}
-			}
-
-			FinishReadMember(m, method);
-			return m;
-		}
-
-		static bool HasExtensionAttribute(MemberInfo provider)
-		{
-			foreach (var attr in provider.CustomAttributes) {
-				if (attr.AttributeType.Name == "ExtensionAttribute" && attr.AttributeType.Namespace == "System.Runtime.CompilerServices")
-					return true;
-			}
-			return false;
-		}
-
-		bool IsVisible(MethodAttributes att)
-		{
-			att &= MethodAttributes.MemberAccessMask;
-			return IncludeInternalMembers
-				|| att == MethodAttributes.Public
-				|| att == MethodAttributes.Family
-				|| att == MethodAttributes.FamORAssem;
-		}
-
-		static Accessibility GetAccessibility(MethodAttributes attr)
-		{
-			switch (attr & MethodAttributes.MemberAccessMask) {
-				case MethodAttributes.Public:
-				return Accessibility.Public;
-				case MethodAttributes.FamANDAssem:
-				return Accessibility.ProtectedAndInternal;
-				case MethodAttributes.Assembly:
-				return Accessibility.Internal;
-				case MethodAttributes.Family:
-				return Accessibility.Protected;
-				case MethodAttributes.FamORAssem:
-				return Accessibility.ProtectedOrInternal;
-				default:
-				return Accessibility.Private;
-			}
-		}
-
-		void TranslateModifiers(MethodBase method, AbstractUnresolvedMember m)
-		{
-			if (m.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
-				// interface members don't have modifiers, but we want to handle them as "public abstract"
-				m.Accessibility = Accessibility.Public;
-				m.IsAbstract = true;
-			} else {
-				m.Accessibility = GetAccessibility(method.Attributes);
-				if (method.IsAbstract) {
-					m.IsAbstract = true;
-					m.IsOverride = !method.Attributes.HasFlag (MethodAttributes.NewSlot);
-				} else if (method.IsFinal) {
-					if (!method.Attributes.HasFlag (MethodAttributes.NewSlot)) {
-						m.IsSealed = true;
-						m.IsOverride = true;
-					}
-				} else if (method.IsVirtual) {
-					if (method.Attributes.HasFlag (MethodAttributes.NewSlot))
-						m.IsVirtual = true;
-					else
-						m.IsOverride = true;
-				}
-				m.IsStatic = method.IsStatic;
-			}
-		}
-		#endregion
-
-		#region Read Constructor
-		[CLSCompliant(false)]
-		public IUnresolvedMethod ReadConstructor(MethodBase method, IUnresolvedTypeDefinition parentType, SymbolKind methodType = SymbolKind.Method)
-		{
-			return ReadConstructor((ConstructorInfo)method, parentType, methodType, null);
-		}
-
-		IUnresolvedMethod ReadConstructor(ConstructorInfo method, IUnresolvedTypeDefinition parentType, SymbolKind methodType, IUnresolvedMember accessorOwner)
-		{
-			if (method == null)
-				return null;
-			var m = new DefaultUnresolvedMethod(parentType, method.Name);
-			m.SymbolKind = methodType;
-			m.AccessorOwner = accessorOwner;
-			m.HasBody = !method.DeclaringType.IsInterface && (method.GetMethodImplementationFlags () & MethodImplAttributes.CodeTypeMask) == MethodImplAttributes.IL;
-			var genericArguments = method.GetGenericArguments ();
-			if (genericArguments != null) {
-				for (int i = 0; i < genericArguments.Length; i++) {
-					if (genericArguments[i].GenericParameterPosition != i)
-						throw new InvalidOperationException("g.Position != i");
-					m.TypeParameters.Add(new DefaultUnresolvedTypeParameter(
-						SymbolKind.Method, i, genericArguments[i].Name));
-				}
-				for (int i = 0; i < genericArguments.Length; i++) {
-					var tp = (DefaultUnresolvedTypeParameter)m.TypeParameters[i];
-					AddConstraints(tp, genericArguments[i]);
-					tp.ApplyInterningProvider(interningProvider);
-				}
-			}
-			m.ReturnType = KnownTypeReference.Void;
-
-
-			if (HasAnyAttributes(method))
-				AddAttributes(method, m.Attributes, m.ReturnTypeAttributes);
-			TranslateModifiers(method, m);
-
-			foreach (var p in method.GetParameters ()) {
-				m.Parameters.Add(ReadParameter(p));
-			}
-
-			FinishReadMember(m, method);
-			return m;
-		}
-
-		#endregion
-
-		#region Read Parameter
-		[CLSCompliant(false)]
-		public IUnresolvedParameter ReadParameter(ParameterInfo parameter)
-		{
-			if (parameter == null)
-				throw new ArgumentNullException("parameter");
-			var type = ReadTypeReference(parameter.ParameterType, typeAttributes: parameter.CustomAttributes);
-			var p = new DefaultUnresolvedParameter(type, interningProvider.Intern(parameter.Name ?? "index"));
-
-			if (parameter.ParameterType.IsByRef) {
-				if (!parameter.IsIn && parameter.IsOut)
-					p.IsOut = true;
-				else
-					p.IsRef = true;
-			}
-			AddAttributes(parameter, p);
-
-			if (parameter.IsOptional) {
-				p.DefaultValue = CreateSimpleConstantValue(type, parameter.RawDefaultValue);
-			}
-
-			if (parameter.ParameterType.IsArray) {
-				foreach (var att in parameter.CustomAttributes) {
-					if (att.AttributeType.FullName == typeof(ParamArrayAttribute).FullName) {
-						p.IsParams = true;
-						break;
-					}
-				}
-			}
-
-			return interningProvider.Intern(p);
-		}
-		#endregion
-
-		#region Read Field
-		bool IsVisible(FieldAttributes att)
-		{
-			att &= FieldAttributes.FieldAccessMask;
-			return IncludeInternalMembers
-				|| att == FieldAttributes.Public
-					|| att == FieldAttributes.Family
-					|| att == FieldAttributes.FamORAssem;
-		}
-
-		decimal? TryDecodeDecimalConstantAttribute(CustomAttributeData attribute)
-		{
-			if (attribute.ConstructorArguments.Count != 5)
-				return null;
-
-			var reader = new BlobReader(attribute.__GetBlob(), null);
-			if (reader.ReadUInt16() != 0x0001) {
-				Debug.WriteLine("Unknown blob prolog");
-				return null;
-			}
-
-			// DecimalConstantAttribute has the arguments (byte scale, byte sign, uint hi, uint mid, uint low) or (byte scale, byte sign, int hi, int mid, int low)
-			// Both of these invoke the Decimal constructor (int lo, int mid, int hi, bool isNegative, byte scale) with explicit argument conversions if required.
-			var ctorArgs = new object[attribute.ConstructorArguments.Count];
-			for (int i = 0; i < ctorArgs.Length; i++) {
-				switch (attribute.ConstructorArguments[i].ArgumentType.FullName) {
-					case "System.Byte":
-					ctorArgs[i] = reader.ReadByte();
-					break;
-					case "System.Int32":
-					ctorArgs[i] = reader.ReadInt32();
-					break;
-					case "System.UInt32":
-					ctorArgs[i] = unchecked((int)reader.ReadUInt32());
-					break;
-					default:
-					return null;
-				}
-			}
-
-			if (!ctorArgs.Select(a => a.GetType()).SequenceEqual(new[] { typeof(byte), typeof(byte), typeof(int), typeof(int), typeof(int) }))
-				return null;
-
-			return new decimal((int)ctorArgs[4], (int)ctorArgs[3], (int)ctorArgs[2], (byte)ctorArgs[1] != 0, (byte)ctorArgs[0]);
-		}
-
-		[CLSCompliant(false)]
-		public IUnresolvedField ReadField(FieldInfo field, IUnresolvedTypeDefinition parentType)
-		{
-			if (field == null)
-				throw new ArgumentNullException("field");
-			if (parentType == null)
-				throw new ArgumentNullException("parentType");
-			var f = new DefaultUnresolvedField(parentType, field.Name);
-			f.Accessibility = GetAccessibility(field.Attributes);
-			f.IsReadOnly = field.IsInitOnly;
-			f.IsStatic = field.IsStatic;
-			f.ReturnType = ReadTypeReference(field.FieldType, typeAttributes: field.CustomAttributes);
-
-			if (field.Attributes.HasFlag (FieldAttributes.HasDefault)) {
-				f.ConstantValue = CreateSimpleConstantValue(f.ReturnType, field.GetRawConstantValue ());
-			}
-			else {
-				var decConstant = field.CustomAttributes.FirstOrDefault(a => a.AttributeType.FullName == "System.Runtime.CompilerServices.DecimalConstantAttribute");
-				if (decConstant != null) {
-					var constValue = TryDecodeDecimalConstantAttribute(decConstant);
-					if (constValue != null)
-						f.ConstantValue = CreateSimpleConstantValue(f.ReturnType, constValue);
-				}
-			}
-			AddAttributes(field, f);
-
-			if (field.GetRequiredCustomModifiers ().Any (mt => mt.FullName == typeof(IsVolatile).FullName)) {
-				f.IsVolatile = true;
-			}
-
-			FinishReadMember(f, field);
-			return f;
-		}
-
-		static Accessibility GetAccessibility(FieldAttributes attr)
-		{
-			switch (attr & FieldAttributes.FieldAccessMask) {
-				case FieldAttributes.Public:
-					return Accessibility.Public;
-				case FieldAttributes.FamANDAssem:
-					return Accessibility.ProtectedAndInternal;
-				case FieldAttributes.Assembly:
-					return Accessibility.Internal;
-				case FieldAttributes.Family:
-					return Accessibility.Protected;
-				case FieldAttributes.FamORAssem:
-					return Accessibility.ProtectedOrInternal;
-				default:
-					return Accessibility.Private;
-			}
-		}
-		#endregion
-
-		#region Type Parameter Constraints
-		void AddConstraints(DefaultUnresolvedTypeParameter tp, IKVM.Reflection.Type g)
-		{
-			if (g.GenericParameterAttributes.HasFlag (GenericParameterAttributes.Contravariant)) {
-				tp.Variance = VarianceModifier.Contravariant;
-			} else if (g.GenericParameterAttributes.HasFlag (GenericParameterAttributes.Covariant)) {
-				tp.Variance = VarianceModifier.Covariant;
-			}
-
-			tp.HasReferenceTypeConstraint = g.GenericParameterAttributes.HasFlag (GenericParameterAttributes.ReferenceTypeConstraint);
-			tp.HasValueTypeConstraint = g.GenericParameterAttributes.HasFlag (GenericParameterAttributes.NotNullableValueTypeConstraint);
-			tp.HasDefaultConstructorConstraint = g.GenericParameterAttributes.HasFlag (GenericParameterAttributes.DefaultConstructorConstraint);
-
-			foreach (var constraint in g.GetGenericParameterConstraints ()) {
-				tp.Constraints.Add(ReadTypeReference(constraint));
-			}
-		}
-		#endregion
-
-		#region Read Property
-
-		Accessibility MergePropertyAccessibility (Accessibility left, Accessibility right)
-		{
-			if (left == Accessibility.Public || right == Accessibility.Public)
-				return Accessibility.Public;
-
-			if (left == Accessibility.ProtectedOrInternal || right == Accessibility.ProtectedOrInternal)
-				return Accessibility.ProtectedOrInternal;
-
-			if (left == Accessibility.Protected && right == Accessibility.Internal || 
-			    left == Accessibility.Internal && right == Accessibility.Protected)
-				return Accessibility.ProtectedOrInternal;
-
-			if (left == Accessibility.Protected || right == Accessibility.Protected)
-				return Accessibility.Protected;
-
-			if (left == Accessibility.Internal || right == Accessibility.Internal)
-				return Accessibility.Internal;
-
-			if (left == Accessibility.ProtectedAndInternal || right == Accessibility.ProtectedAndInternal)
-				return Accessibility.ProtectedAndInternal;
-
-			return left;
-		}
-
-		[CLSCompliant(false)]
-		public IUnresolvedProperty ReadProperty(PropertyInfo property, IUnresolvedTypeDefinition parentType, SymbolKind propertyType = SymbolKind.Property)
-		{
-			if (property == null)
-				throw new ArgumentNullException("property");
-			if (parentType == null)
-				throw new ArgumentNullException("parentType");
-
-			var p = new DefaultUnresolvedProperty(parentType, property.Name);
-			p.SymbolKind = propertyType;
-			TranslateModifiers(property.GetMethod ?? property.SetMethod, p);
-			if (property.GetMethod != null && property.SetMethod != null)
-				p.Accessibility = MergePropertyAccessibility (GetAccessibility (property.GetMethod.Attributes), GetAccessibility (property.SetMethod.Attributes));
-			p.ReturnType = ReadTypeReference(property.PropertyType, typeAttributes: property.CustomAttributes);
-
-			p.Getter = ReadMethod(property.GetMethod, parentType, SymbolKind.Accessor, p);
-			p.Setter = ReadMethod(property.SetMethod, parentType, SymbolKind.Accessor, p);
-
-			foreach (var par in property.GetIndexParameters ()) {
-				p.Parameters.Add(ReadParameter(par));
-			}
-
-			AddAttributes(property, p);
-
-			var accessor = p.Getter ?? p.Setter;
-			if (accessor != null && accessor.IsExplicitInterfaceImplementation) {
-				p.Name = property.Name.Substring(property.Name.LastIndexOf('.') + 1);
-				p.IsExplicitInterfaceImplementation = true;
-				foreach (var mr in accessor.ExplicitInterfaceImplementations) {
-					p.ExplicitInterfaceImplementations.Add(new AccessorOwnerMemberReference(mr));
-				}
-			}
-
-			FinishReadMember(p, property);
-			return p;
-		}
-		#endregion
-
-		#region Read Event
-		[CLSCompliant(false)]
-		public IUnresolvedEvent ReadEvent(EventInfo ev, IUnresolvedTypeDefinition parentType)
-		{
-			if (ev == null)
-				throw new ArgumentNullException("ev");
-			if (parentType == null)
-				throw new ArgumentNullException("parentType");
-
-			DefaultUnresolvedEvent e = new DefaultUnresolvedEvent(parentType, ev.Name);
-			TranslateModifiers(ev.AddMethod, e);
-			e.ReturnType = ReadTypeReference(ev.EventHandlerType, typeAttributes: ev.CustomAttributes);
-
-			e.AddAccessor    = ReadMethod(ev.AddMethod,    parentType, SymbolKind.Accessor, e);
-			e.RemoveAccessor = ReadMethod(ev.RemoveMethod, parentType, SymbolKind.Accessor, e);
-			e.InvokeAccessor = ReadMethod(ev.RaiseMethod, parentType, SymbolKind.Accessor, e);
-
-			AddAttributes(ev, e);
-
-			var accessor = e.AddAccessor ?? e.RemoveAccessor ?? e.InvokeAccessor;
-			if (accessor != null && accessor.IsExplicitInterfaceImplementation) {
-				e.Name = ev.Name.Substring(ev.Name.LastIndexOf('.') + 1);
-				e.IsExplicitInterfaceImplementation = true;
-				foreach (var mr in accessor.ExplicitInterfaceImplementations) {
-					e.ExplicitInterfaceImplementations.Add(new AccessorOwnerMemberReference(mr));
-				}
-			}
-
-			FinishReadMember(e, ev);
-
-			return e;
-		}
-		#endregion
-
-		#region FinishReadMember / Interning
-		void FinishReadMember(AbstractUnresolvedMember member, MemberInfo ikvmDefinition)
-		{
-			member.ApplyInterningProvider(interningProvider);
-			member.Freeze();
-			RegisterCecilObject(member, ikvmDefinition);
-		}
-		#endregion
-
-		#region Type system translation table
-		void RegisterCecilObject(IUnresolvedEntity typeSystemObject, MemberInfo cecilObject)
-		{
-			if (OnEntityLoaded != null)
-				OnEntityLoaded(typeSystemObject, cecilObject);
-		}
-		#endregion
-	}
-}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/AbstractUnresolvedEntity.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/AbstractUnresolvedEntity.cs
index a1cc4ce433..f528292501 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/AbstractUnresolvedEntity.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/AbstractUnresolvedEntity.cs
@@ -61,6 +61,7 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 		// flags for DefaultField:
 		internal const ushort FlagFieldIsReadOnly = 0x1000;
 		internal const ushort FlagFieldIsVolatile = 0x2000;
+		internal const ushort FlagFieldIsFixedSize = 0x4000;
 		// flags for DefaultMethod:
 		internal const ushort FlagExtensionMethod = 0x1000;
 		internal const ushort FlagPartialMethod = 0x2000;
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/BlobReader.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/BlobReader.cs
new file mode 100644
index 0000000000..7c002416fc
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/BlobReader.cs
@@ -0,0 +1,387 @@
+//
+// BlobReader.cs
+//
+// Author:
+//       Daniel Grunwald <daniel@danielgrunwald.de>
+//
+// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.TypeSystem.Implementation
+{
+	sealed class BlobReader
+	{
+		internal static int GetBlobHashCode(byte[] blob)
+		{
+			unchecked {
+				int hash = 0;
+				foreach (byte b in blob) {
+					hash *= 257;
+					hash += b;
+				}
+				return hash;
+			}
+		}
+		
+		internal static bool BlobEquals(byte[] a, byte[] b)
+		{
+			if (a.Length != b.Length)
+				return false;
+			for (int i = 0; i < a.Length; i++) {
+				if (a[i] != b[i])
+					return false;
+			}
+			return true;
+		}
+		
+		byte[] buffer;
+		int position;
+		readonly IAssembly currentResolvedAssembly;
+
+		public BlobReader(byte[] buffer, IAssembly currentResolvedAssembly)
+		{
+			if (buffer == null)
+				throw new ArgumentNullException("buffer");
+			this.buffer = buffer;
+			this.currentResolvedAssembly = currentResolvedAssembly;
+		}
+		
+		public byte ReadByte()
+		{
+			return buffer[position++];
+		}
+
+		public sbyte ReadSByte()
+		{
+			unchecked {
+				return(sbyte) ReadByte();
+			}
+		}
+		
+		public byte[] ReadBytes(int length)
+		{
+			var bytes = new byte[length];
+			Buffer.BlockCopy(buffer, position, bytes, 0, length);
+			position += length;
+			return bytes;
+		}
+
+		public ushort ReadUInt16()
+		{
+			unchecked {
+				ushort value =(ushort)(buffer[position]
+				                       |(buffer[position + 1] << 8));
+				position += 2;
+				return value;
+			}
+		}
+
+		public short ReadInt16()
+		{
+			unchecked {
+				return(short) ReadUInt16();
+			}
+		}
+
+		public uint ReadUInt32()
+		{
+			unchecked {
+				uint value =(uint)(buffer[position]
+				                   |(buffer[position + 1] << 8)
+				                   |(buffer[position + 2] << 16)
+				                   |(buffer[position + 3] << 24));
+				position += 4;
+				return value;
+			}
+		}
+
+		public int ReadInt32()
+		{
+			unchecked {
+				return(int) ReadUInt32();
+			}
+		}
+
+		public ulong ReadUInt64()
+		{
+			unchecked {
+				uint low = ReadUInt32();
+				uint high = ReadUInt32();
+
+				return(((ulong) high) << 32) | low;
+			}
+		}
+
+		public long ReadInt64()
+		{
+			unchecked {
+				return(long) ReadUInt64();
+			}
+		}
+
+		public uint ReadCompressedUInt32()
+		{
+			unchecked {
+				byte first = ReadByte();
+				if((first & 0x80) == 0)
+					return first;
+
+				if((first & 0x40) == 0)
+					return((uint)(first & ~0x80) << 8)
+						| ReadByte();
+
+				return((uint)(first & ~0xc0) << 24)
+					|(uint) ReadByte() << 16
+					|(uint) ReadByte() << 8
+					| ReadByte();
+			}
+		}
+
+		public float ReadSingle()
+		{
+			unchecked {
+				if(!BitConverter.IsLittleEndian) {
+					var bytes = ReadBytes(4);
+					Array.Reverse(bytes);
+					return BitConverter.ToSingle(bytes, 0);
+				}
+
+				float value = BitConverter.ToSingle(buffer, position);
+				position += 4;
+				return value;
+			}
+		}
+
+		public double ReadDouble()
+		{
+			unchecked {
+				if(!BitConverter.IsLittleEndian) {
+					var bytes = ReadBytes(8);
+					Array.Reverse(bytes);
+					return BitConverter.ToDouble(bytes, 0);
+				}
+
+				double value = BitConverter.ToDouble(buffer, position);
+				position += 8;
+				return value;
+			}
+		}
+		
+		public ResolveResult ReadFixedArg(IType argType)
+		{
+			if (argType.Kind == TypeKind.Array) {
+				if (((ArrayType)argType).Dimensions != 1) {
+					// Only single-dimensional arrays are supported
+					return ErrorResolveResult.UnknownError;
+				}
+				IType elementType = ((ArrayType)argType).ElementType;
+				uint numElem = ReadUInt32();
+				if (numElem == 0xffffffff) {
+					// null reference
+					return new ConstantResolveResult(argType, null);
+				} else {
+					ResolveResult[] elements = new ResolveResult[numElem];
+					for (int i = 0; i < elements.Length; i++) {
+						elements[i] = ReadElem(elementType);
+						// Stop decoding when encountering an error:
+						if (elements[i].IsError)
+							return ErrorResolveResult.UnknownError;
+					}
+					IType int32 = currentResolvedAssembly.Compilation.FindType(KnownTypeCode.Int32);
+					ResolveResult[] sizeArgs = { new ConstantResolveResult(int32, elements.Length) };
+					return new ArrayCreateResolveResult(argType, sizeArgs, elements);
+				}
+			} else {
+				return ReadElem(argType);
+			}
+		}
+		
+		public ResolveResult ReadElem(IType elementType)
+		{
+			ITypeDefinition underlyingType;
+			if (elementType.Kind == TypeKind.Enum) {
+				underlyingType = elementType.GetDefinition().EnumUnderlyingType.GetDefinition();
+			} else {
+				underlyingType = elementType.GetDefinition();
+			}
+			if (underlyingType == null)
+				return ErrorResolveResult.UnknownError;
+			KnownTypeCode typeCode = underlyingType.KnownTypeCode;
+			if (typeCode == KnownTypeCode.Object) {
+				// boxed value type
+				IType boxedTyped = ReadCustomAttributeFieldOrPropType();
+				ResolveResult elem = ReadElem(boxedTyped);
+				if (elem.IsCompileTimeConstant && elem.ConstantValue == null)
+					return new ConstantResolveResult(elementType, null);
+				else
+					return new ConversionResolveResult(elementType, elem, Conversion.BoxingConversion);
+			} else if (typeCode == KnownTypeCode.Type) {
+				return new TypeOfResolveResult(underlyingType, ReadType());
+			} else {
+				return new ConstantResolveResult(elementType, ReadElemValue(typeCode));
+			}
+		}
+		
+		object ReadElemValue(KnownTypeCode typeCode)
+		{
+			switch (typeCode) {
+				case KnownTypeCode.Boolean:
+					return ReadByte() != 0;
+				case KnownTypeCode.Char:
+					return (char)ReadUInt16();
+				case KnownTypeCode.SByte:
+					return ReadSByte();
+				case KnownTypeCode.Byte:
+					return ReadByte();
+				case KnownTypeCode.Int16:
+					return ReadInt16();
+				case KnownTypeCode.UInt16:
+					return ReadUInt16();
+				case KnownTypeCode.Int32:
+					return ReadInt32();
+				case KnownTypeCode.UInt32:
+					return ReadUInt32();
+				case KnownTypeCode.Int64:
+					return ReadInt64();
+				case KnownTypeCode.UInt64:
+					return ReadUInt64();
+				case KnownTypeCode.Single:
+					return ReadSingle();
+				case KnownTypeCode.Double:
+					return ReadDouble();
+				case KnownTypeCode.String:
+					return ReadSerString();
+				default:
+					throw new NotSupportedException();
+			}
+		}
+		
+		public string ReadSerString ()
+		{
+			if (buffer [position] == 0xff) {
+				position++;
+				return null;
+			}
+
+			int length = (int) ReadCompressedUInt32();
+			if (length == 0)
+				return string.Empty;
+
+			string @string = System.Text.Encoding.UTF8.GetString(
+				buffer, position,
+				buffer [position + length - 1] == 0 ? length - 1 : length);
+
+			position += length;
+			return @string;
+		}
+		
+		public KeyValuePair<IMember, ResolveResult> ReadNamedArg(IType attributeType)
+		{
+			SymbolKind memberType;
+			var b = ReadByte();
+			switch (b) {
+				case 0x53:
+					memberType = SymbolKind.Field;
+					break;
+				case 0x54:
+					memberType = SymbolKind.Property;
+					break;
+				default:
+					throw new NotSupportedException(string.Format("Custom member type 0x{0:x} is not supported.", b));
+			}
+			IType type = ReadCustomAttributeFieldOrPropType();
+			string name = ReadSerString();
+			ResolveResult val = ReadFixedArg(type);
+			IMember member = null;
+			// Use last matching member, as GetMembers() returns members from base types first.
+			foreach (IMember m in attributeType.GetMembers(m => m.SymbolKind == memberType && m.Name == name)) {
+				if (m.ReturnType.Equals(type))
+					member = m;
+			}
+			return new KeyValuePair<IMember, ResolveResult>(member, val);
+		}
+
+		IType ReadCustomAttributeFieldOrPropType()
+		{
+			ICompilation compilation = currentResolvedAssembly.Compilation;
+			var b = ReadByte();
+			switch (b) {
+				case 0x02:
+					return compilation.FindType(KnownTypeCode.Boolean);
+				case 0x03:
+					return compilation.FindType(KnownTypeCode.Char);
+				case 0x04:
+					return compilation.FindType(KnownTypeCode.SByte);
+				case 0x05:
+					return compilation.FindType(KnownTypeCode.Byte);
+				case 0x06:
+					return compilation.FindType(KnownTypeCode.Int16);
+				case 0x07:
+					return compilation.FindType(KnownTypeCode.UInt16);
+				case 0x08:
+					return compilation.FindType(KnownTypeCode.Int32);
+				case 0x09:
+					return compilation.FindType(KnownTypeCode.UInt32);
+				case 0x0a:
+					return compilation.FindType(KnownTypeCode.Int64);
+				case 0x0b:
+					return compilation.FindType(KnownTypeCode.UInt64);
+				case 0x0c:
+					return compilation.FindType(KnownTypeCode.Single);
+				case 0x0d:
+					return compilation.FindType(KnownTypeCode.Double);
+				case 0x0e:
+					return compilation.FindType(KnownTypeCode.String);
+				case 0x1d:
+					return new ArrayType(compilation, ReadCustomAttributeFieldOrPropType());
+				case 0x50:
+					return compilation.FindType(KnownTypeCode.Type);
+				case 0x51: // boxed value type
+					return compilation.FindType(KnownTypeCode.Object);
+				case 0x55: // enum
+					return ReadType();
+				default:
+					throw new NotSupportedException(string.Format("Custom attribute type 0x{0:x} is not supported.", b));
+			}
+		}
+		
+		IType ReadType()
+		{
+			string typeName = ReadSerString();
+			ITypeReference typeReference = ReflectionHelper.ParseReflectionName(typeName);
+			IType typeInCurrentAssembly = typeReference.Resolve(new SimpleTypeResolveContext(currentResolvedAssembly));
+			if (typeInCurrentAssembly.Kind != TypeKind.Unknown)
+				return typeInCurrentAssembly;
+			
+			// look for the type in mscorlib
+			ITypeDefinition systemObject = currentResolvedAssembly.Compilation.FindType(KnownTypeCode.Object).GetDefinition();
+			if (systemObject != null) {
+				return typeReference.Resolve(new SimpleTypeResolveContext(systemObject.ParentAssembly));
+			} else {
+				// couldn't find corlib - return the unknown IType for the current assembly
+				return typeInCurrentAssembly;
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultParameter.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultParameter.cs
index 98301d74f6..77dac0bf3c 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultParameter.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultParameter.cs
@@ -33,6 +33,7 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 		readonly IList<IAttribute> attributes;
 		readonly bool isRef, isOut, isParams, isOptional;
 		readonly object defaultValue;
+		readonly IParameterizedMember owner;
 		
 		public DefaultParameter(IType type, string name)
 		{
@@ -44,7 +45,7 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 			this.name = name;
 		}
 		
-		public DefaultParameter(IType type, string name, DomRegion region = default(DomRegion), IList<IAttribute> attributes = null,
+		public DefaultParameter(IType type, string name, IParameterizedMember owner = null, DomRegion region = default(DomRegion), IList<IAttribute> attributes = null,
 		                        bool isRef = false, bool isOut = false, bool isParams = false, bool isOptional = false, object defaultValue = null)
 		{
 			if (type == null)
@@ -53,6 +54,7 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 				throw new ArgumentNullException("name");
 			this.type = type;
 			this.name = name;
+			this.owner = owner;
 			this.region = region;
 			this.attributes = attributes;
 			this.isRef = isRef;
@@ -66,6 +68,10 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 			get { return SymbolKind.Parameter; }
 		}
 		
+		public IParameterizedMember Owner {
+			get { return owner; }
+		}
+		
 		public IList<IAttribute> Attributes {
 			get { return attributes; }
 		}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultResolvedField.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultResolvedField.cs
index f0979fc030..0e482c3a3a 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultResolvedField.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultResolvedField.cs
@@ -47,7 +47,11 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 		public bool IsConst {
 			get { return ((IUnresolvedField)unresolved).IsConst; }
 		}
-		
+
+		public bool IsFixed {
+			get { return ((IUnresolvedField)unresolved).IsFixed; }
+		}
+
 		public object ConstantValue {
 			get {
 				ResolveResult rr = this.constantValue;
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultResolvedTypeDefinition.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultResolvedTypeDefinition.cs
index 275e97972f..ef874d754d 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultResolvedTypeDefinition.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultResolvedTypeDefinition.cs
@@ -94,8 +94,9 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 					return result;
 				}
 				result = new List<IAttribute>();
+				var context = parentContext.WithCurrentTypeDefinition(this);
 				foreach (IUnresolvedTypeDefinition part in parts) {
-					ITypeResolveContext parentContextForPart = part.CreateResolveContext(parentContext);
+					ITypeResolveContext parentContextForPart = part.CreateResolveContext(context);
 					foreach (var attr in part.Attributes) {
 						result.Add(attr.CreateResolvedAttribute(parentContextForPart));
 					}
@@ -499,13 +500,13 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 		}
 
 		public IList<IType> TypeArguments {
-			get { 
+			get {
 				// ToList() call is necessary because IList<> isn't covariant
 				return TypeParameters.ToList<IType>();
 			}
 		}
 
-		public bool IsParameterized { 
+		public bool IsParameterized {
 			get { return false; }
 		}
 
@@ -517,9 +518,19 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 				IList<IType> result = LazyInit.VolatileRead(ref this.directBaseTypes);
 				if (result != null) {
 					return result;
-				} else {
-					result = CalculateDirectBaseTypes();
-					return LazyInit.GetOrSet(ref this.directBaseTypes, result);
+				}
+				using (var busyLock = BusyManager.Enter(this)) {
+					if (busyLock.Success) {
+						result = CalculateDirectBaseTypes();
+						return LazyInit.GetOrSet(ref this.directBaseTypes, result);
+					} else {
+						// This can happen for "class Test : $Test.Base$ { public class Base {} }"
+						// and also for the valid code
+						// "class Test : Base<Test.Inner> { public class Inner {} }"
+						
+						// Don't cache the error!
+						return EmptyList<IType>.Instance;
+					}
 				}
 			}
 		}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultUnresolvedField.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultUnresolvedField.cs
index 8182a5fcc1..6b578e6f5d 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultUnresolvedField.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultUnresolvedField.cs
@@ -49,7 +49,7 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 		}
 		
 		public bool IsConst {
-			get { return constantValue != null; }
+			get { return constantValue != null && !IsFixed; }
 		}
 		
 		public bool IsReadOnly {
@@ -67,6 +67,14 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 				flags[FlagFieldIsVolatile] = value;
 			}
 		}
+
+		public bool IsFixed {
+			get { return flags[FlagFieldIsFixedSize]; }
+			set {
+				ThrowIfFrozen();
+				flags[FlagFieldIsFixedSize] = value;
+			}
+		}
 		
 		public IConstantValue ConstantValue {
 			get { return constantValue; }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultUnresolvedParameter.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultUnresolvedParameter.cs
index c03d91acb5..5e59a3990e 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultUnresolvedParameter.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultUnresolvedParameter.cs
@@ -154,7 +154,12 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 				hashCode += type.GetHashCode();
 				hashCode *= 31;
 				hashCode += name.GetHashCode();
-				hashCode += attributes != null ? attributes.Count : 0;
+				if (attributes != null) {
+					foreach (var attr in attributes)
+						hashCode ^= attr.GetHashCode ();
+				}
+				if (defaultValue != null)
+					hashCode ^= defaultValue.GetHashCode ();
 				return hashCode;
 			}
 		}
@@ -163,8 +168,8 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 		{
 			// compare everything except for the IsFrozen flag
 			DefaultUnresolvedParameter p = other as DefaultUnresolvedParameter;
-			return p != null && type == p.type && name == p.name && ListEquals(attributes, p.attributes)
-				&& defaultValue == p.defaultValue && region == p.region && (flags & ~1) == (p.flags & ~1);
+			return p != null && type == p.type && name == p.name &&
+				defaultValue == p.defaultValue && region == p.region && (flags & ~1) == (p.flags & ~1) && ListEquals(attributes, p.attributes);
 		}
 		
 		static bool ListEquals(IList<IUnresolvedAttribute> list1, IList<IUnresolvedAttribute> list2)
@@ -210,10 +215,11 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 					IsParams = this.IsParams
 				};
 			} else {
+				var owner = context.CurrentMember as IParameterizedMember;
 				var resolvedAttributes = attributes.CreateResolvedAttributes (context);
 				bool isOptional = resolvedAttributes != null && resolvedAttributes.Any (a => IsOptionalAttribute (a.AttributeType));
-				return new DefaultParameter (type.Resolve (context), name, region,
-				                            resolvedAttributes, IsRef, IsOut, IsParams, isOptional);
+				return new DefaultParameter (type.Resolve (context), name, owner, region,
+				                             resolvedAttributes, IsRef, IsOut, IsParams, isOptional);
 			}
 		}
 		
@@ -229,6 +235,7 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 			}
 			
 			SymbolKind ISymbol.SymbolKind { get { return SymbolKind.Parameter; } }
+			public IParameterizedMember Owner { get { return context.CurrentMember as IParameterizedMember; } }
 			public IType Type { get; internal set; }
 			public string Name { get; internal set; }
 			public DomRegion Region { get; internal set; }
@@ -248,13 +255,7 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 						rr = defaultValue.Resolve(context);
 						LazyInit.GetOrSet(ref this.resolvedDefaultValue, rr);
 					}
-					if (rr is ConversionResolveResult) {
-						var crr = (ConversionResolveResult)rr;
-						if (crr.Conversion.IsNullableConversion)
-							return crr.Input.ConstantValue;
-					}
 					return rr.ConstantValue;
-
 				}
 			}
 			
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultVariable.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultVariable.cs
new file mode 100644
index 0000000000..38d0eeacc4
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultVariable.cs
@@ -0,0 +1,77 @@
+// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+
+namespace ICSharpCode.NRefactory.TypeSystem.Implementation
+{
+	/// <summary>
+	/// Default implementation of <see cref="IVariable"/>.
+	/// </summary>
+	public sealed class DefaultVariable : IVariable
+	{
+		readonly string name;
+		readonly DomRegion region;
+		readonly IType type;
+		readonly object constantValue;
+		readonly bool isConst;
+		
+		public DefaultVariable(IType type, string name)
+		{
+			if (type == null)
+				throw new ArgumentNullException("type");
+			if (name == null)
+				throw new ArgumentNullException("name");
+			this.type = type;
+			this.name = name;
+		}
+		
+		public DefaultVariable(IType type, string name, DomRegion region = default(DomRegion),
+		                       bool isConst = false, object constantValue = null)
+			: this(type, name)
+		{
+			this.region = region;
+			this.isConst = isConst;
+			this.constantValue = constantValue;
+		}
+		
+		public string Name {
+			get { return name; }
+		}
+		
+		public DomRegion Region {
+			get { return region; }
+		}
+		
+		public IType Type {
+			get { return type; }
+		}
+		
+		public bool IsConst {
+			get { return isConst; }
+		}
+		
+		public object ConstantValue {
+			get { return constantValue; }
+		}
+		
+		public SymbolKind SymbolKind {
+			get { return SymbolKind.Variable; }
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/ResolvedAttributeBlob.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/ResolvedAttributeBlob.cs
new file mode 100644
index 0000000000..cc40a520b2
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/ResolvedAttributeBlob.cs
@@ -0,0 +1,164 @@
+//
+// ResolvedAttributeBlob.cs
+//
+// Author:
+//       Daniel Grunwald <daniel@danielgrunwald.de>
+//
+// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.Utils;
+
+namespace ICSharpCode.NRefactory.TypeSystem.Implementation
+{
+	sealed class CecilResolvedAttribute : IAttribute
+	{
+		readonly ITypeResolveContext context;
+		readonly byte[] blob;
+		readonly IList<ITypeReference> ctorParameterTypes;
+		readonly IType attributeType;
+		
+		IMethod constructor;
+		volatile bool constructorResolved;
+		
+		IList<ResolveResult> positionalArguments;
+		IList<KeyValuePair<IMember, ResolveResult>> namedArguments;
+		
+		public CecilResolvedAttribute(ITypeResolveContext context, UnresolvedAttributeBlob unresolved)
+		{
+			this.context = context;
+			this.blob = unresolved.blob;
+			this.ctorParameterTypes = unresolved.ctorParameterTypes;
+			this.attributeType = unresolved.attributeType.Resolve(context);
+		}
+		
+		public CecilResolvedAttribute(ITypeResolveContext context, IType attributeType)
+		{
+			this.context = context;
+			this.attributeType = attributeType;
+			this.ctorParameterTypes = EmptyList<ITypeReference>.Instance;
+		}
+		
+		DomRegion IAttribute.Region {
+			get { return DomRegion.Empty; }
+		}
+		
+		public IType AttributeType {
+			get { return attributeType; }
+		}
+		
+		public IMethod Constructor {
+			get {
+				if (!constructorResolved) {
+					constructor = ResolveConstructor();
+					constructorResolved = true;
+				}
+				return constructor;
+			}
+		}
+		
+		IMethod ResolveConstructor()
+		{
+			var parameterTypes = ctorParameterTypes.Resolve(context);
+			foreach (var ctor in attributeType.GetConstructors(m => m.Parameters.Count == parameterTypes.Count)) {
+				bool ok = true;
+				for (int i = 0; i < parameterTypes.Count; i++) {
+					if (!ctor.Parameters[i].Type.Equals(parameterTypes[i])) {
+						ok = false;
+						break;
+					}
+				}
+				if (ok)
+					return ctor;
+			}
+			return null;
+		}
+		
+		public IList<ResolveResult> PositionalArguments {
+			get {
+				var result = LazyInit.VolatileRead(ref this.positionalArguments);
+				if (result != null) {
+					return result;
+				}
+				DecodeBlob();
+				return positionalArguments;
+			}
+		}
+		
+		public IList<KeyValuePair<IMember, ResolveResult>> NamedArguments {
+			get {
+				var result = LazyInit.VolatileRead(ref this.namedArguments);
+				if (result != null) {
+					return result;
+				}
+				DecodeBlob();
+				return namedArguments;
+			}
+		}
+		
+		public override string ToString()
+		{
+			return "[" + attributeType.ToString() + "(...)]";
+		}
+		
+		void DecodeBlob()
+		{
+			var positionalArguments = new List<ResolveResult>();
+			var namedArguments = new List<KeyValuePair<IMember, ResolveResult>>();
+			DecodeBlob(positionalArguments, namedArguments);
+			Interlocked.CompareExchange(ref this.positionalArguments, positionalArguments, null);
+			Interlocked.CompareExchange(ref this.namedArguments, namedArguments, null);
+		}
+		
+		void DecodeBlob(List<ResolveResult> positionalArguments, List<KeyValuePair<IMember, ResolveResult>> namedArguments)
+		{
+			if (blob == null)
+				return;
+			BlobReader reader = new BlobReader(blob, context.CurrentAssembly);
+			if (reader.ReadUInt16() != 0x0001) {
+				Debug.WriteLine("Unknown blob prolog");
+				return;
+			}
+			foreach (var ctorParameter in ctorParameterTypes.Resolve(context)) {
+				ResolveResult arg = reader.ReadFixedArg(ctorParameter);
+				positionalArguments.Add(arg);
+				if (arg.IsError) {
+					// After a decoding error, we must stop decoding the blob because
+					// we might have read too few bytes due to the error.
+					// Just fill up the remaining arguments with ErrorResolveResult:
+					while (positionalArguments.Count < ctorParameterTypes.Count)
+						positionalArguments.Add(ErrorResolveResult.UnknownError);
+					return;
+				}
+			}
+			ushort numNamed = reader.ReadUInt16();
+			for (int i = 0; i < numNamed; i++) {
+				var namedArg = reader.ReadNamedArg(attributeType);
+				if (namedArg.Key != null)
+					namedArguments.Add(namedArg);
+			}
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedField.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedField.cs
index eefc707375..66f8a0ad01 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedField.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedField.cs
@@ -49,7 +49,11 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 		public bool IsConst {
 			get { return fieldDefinition.IsConst; }
 		}
-		
+
+		public bool IsFixed {
+			get { return fieldDefinition.IsFixed; }
+		}
+
 		public object ConstantValue {
 			get { return fieldDefinition.ConstantValue; }
 		}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedMember.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedMember.cs
index 48743dd028..982cebea8d 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedMember.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedMember.cs
@@ -366,12 +366,13 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 			} else {
 				var parameters = new IParameter[paramDefs.Count];
 				for (int i = 0; i < parameters.Length; i++) {
-					IType newType = paramDefs[i].Type.AcceptVisitor(substitution);
-					if (newType != paramDefs[i].Type) {
-						parameters[i] = new SpecializedParameter(paramDefs[i], newType);
-					} else {
-						parameters[i] = paramDefs[i];
-					}
+					var p = paramDefs[i];
+					IType newType = p.Type.AcceptVisitor(substitution);
+					parameters[i] = new DefaultParameter(
+						newType, p.Name, this,
+						p.Region, p.Attributes, p.IsRef, p.IsOut,
+						p.IsParams, p.IsOptional, p.ConstantValue
+					);
 				}
 				return Array.AsReadOnly(parameters);
 			}
@@ -395,67 +396,5 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 			b.Append(']');
 			return b.ToString();
 		}
-		
-		sealed class SpecializedParameter : IParameter
-		{
-			readonly IParameter originalParameter;
-			readonly IType newType;
-			
-			public SpecializedParameter(IParameter originalParameter, IType newType)
-			{
-				if (originalParameter is SpecializedParameter)
-					this.originalParameter = ((SpecializedParameter)originalParameter).originalParameter;
-				else
-					this.originalParameter = originalParameter;
-				this.newType = newType;
-			}
-			
-			SymbolKind ISymbol.SymbolKind { get { return SymbolKind.Parameter; } }
-			
-			public IList<IAttribute> Attributes {
-				get { return originalParameter.Attributes; }
-			}
-			
-			public bool IsRef {
-				get { return originalParameter.IsRef; }
-			}
-			
-			public bool IsOut {
-				get { return originalParameter.IsOut; }
-			}
-			
-			public bool IsParams {
-				get { return originalParameter.IsParams; }
-			}
-			
-			public bool IsOptional {
-				get { return originalParameter.IsOptional; }
-			}
-			
-			public string Name {
-				get { return originalParameter.Name; }
-			}
-			
-			public DomRegion Region {
-				get { return originalParameter.Region; }
-			}
-			
-			public IType Type {
-				get { return newType; }
-			}
-			
-			public bool IsConst {
-				get { return originalParameter.IsConst; }
-			}
-			
-			public object ConstantValue {
-				get { return originalParameter.ConstantValue; }
-			}
-			
-			public override string ToString()
-			{
-				return DefaultParameter.ToString(this);
-			}
-		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializingMemberReference.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializingMemberReference.cs
index da938db85e..bb66a8b93b 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializingMemberReference.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializingMemberReference.cs
@@ -40,6 +40,8 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 		public IMember Resolve(ITypeResolveContext context)
 		{
 			var memberDefinition = memberDefinitionReference.Resolve(context);
+			if (memberDefinition == null)
+				return null;
 			return memberDefinition.Specialize(
 				new TypeParameterSubstitution(
 					classTypeArgumentReferences != null ? classTypeArgumentReferences.Resolve(context) : null,
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/UnresolvedAttributeBlob.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/UnresolvedAttributeBlob.cs
new file mode 100644
index 0000000000..a66e979342
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/UnresolvedAttributeBlob.cs
@@ -0,0 +1,78 @@
+//
+// UnresolvedAttributeBlob.cs
+//
+// Author:
+//       Daniel Grunwald <daniel@danielgrunwald.de>
+//
+// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.TypeSystem.Implementation
+{
+	/// <summary>
+	/// <c>IUnresolvedAttribute</c> implementation that loads the arguments from a binary blob.
+	/// </summary>
+	[Serializable]
+	public sealed class UnresolvedAttributeBlob : IUnresolvedAttribute, ISupportsInterning
+	{
+		internal readonly ITypeReference attributeType;
+		internal readonly IList<ITypeReference> ctorParameterTypes;
+		internal readonly byte[] blob;
+		
+		public UnresolvedAttributeBlob(ITypeReference attributeType, IList<ITypeReference> ctorParameterTypes, byte[] blob)
+		{
+			if (attributeType == null)
+				throw new ArgumentNullException("attributeType");
+			if (ctorParameterTypes == null)
+				throw new ArgumentNullException("ctorParameterTypes");
+			if (blob == null)
+				throw new ArgumentNullException("blob");
+			this.attributeType = attributeType;
+			this.ctorParameterTypes = ctorParameterTypes;
+			this.blob = blob;
+		}
+		
+		DomRegion IUnresolvedAttribute.Region {
+			get { return DomRegion.Empty; }
+		}
+		
+		public IAttribute CreateResolvedAttribute(ITypeResolveContext context)
+		{
+			if (context.CurrentAssembly == null)
+				throw new InvalidOperationException("Cannot resolve CecilUnresolvedAttribute without a parent assembly");
+			return new CecilResolvedAttribute(context, this);
+		}
+		
+		int ISupportsInterning.GetHashCodeForInterning()
+		{
+			return attributeType.GetHashCode() ^ ctorParameterTypes.GetHashCode() ^ BlobReader.GetBlobHashCode(blob);
+		}
+		
+		bool ISupportsInterning.EqualsForInterning(ISupportsInterning other)
+		{
+			UnresolvedAttributeBlob o = other as UnresolvedAttributeBlob;
+			return o != null && attributeType == o.attributeType && ctorParameterTypes == o.ctorParameterTypes
+				&& BlobReader.BlobEquals(blob, o.blob);
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/UnresolvedSecurityDeclarationBlob.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/UnresolvedSecurityDeclarationBlob.cs
new file mode 100644
index 0000000000..0b4bc2cb8b
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/UnresolvedSecurityDeclarationBlob.cs
@@ -0,0 +1,152 @@
+// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using ICSharpCode.NRefactory.Semantics;
+
+namespace ICSharpCode.NRefactory.TypeSystem.Implementation
+{
+	[Serializable]
+	public sealed class UnresolvedSecurityDeclarationBlob
+	{
+		static readonly ITypeReference securityActionTypeReference = typeof(System.Security.Permissions.SecurityAction).ToTypeReference();
+		static readonly ITypeReference permissionSetAttributeTypeReference = typeof(System.Security.Permissions.PermissionSetAttribute).ToTypeReference();
+		
+		readonly IConstantValue securityAction;
+		readonly byte[] blob;
+		readonly IList<IUnresolvedAttribute> unresolvedAttributes = new List<IUnresolvedAttribute>();
+		
+		public UnresolvedSecurityDeclarationBlob(int securityAction, byte[] blob)
+		{
+			BlobReader reader = new BlobReader(blob, null);
+			this.securityAction = new SimpleConstantValue(securityActionTypeReference, securityAction);
+			this.blob = blob;
+			if (reader.ReadByte() == '.') {
+				// binary attribute
+				uint attributeCount = reader.ReadCompressedUInt32();
+				for (uint i = 0; i < attributeCount; i++) {
+					unresolvedAttributes.Add(new UnresolvedSecurityAttribute(this, (int)i));
+				}
+			} else {
+				// for backward compatibility with .NET 1.0: XML-encoded attribute
+				var attr = new DefaultUnresolvedAttribute(permissionSetAttributeTypeReference);
+				attr.ConstructorParameterTypes.Add(securityActionTypeReference);
+				attr.PositionalArguments.Add(this.securityAction);
+				string xml = System.Text.Encoding.Unicode.GetString(blob);
+				attr.AddNamedPropertyArgument("XML", new SimpleConstantValue(KnownTypeReference.String, xml));
+				unresolvedAttributes.Add(attr);
+			}
+		}
+		
+		public IList<IUnresolvedAttribute> UnresolvedAttributes {
+			get { return unresolvedAttributes; }
+		}
+		
+		public IList<IAttribute> Resolve(IAssembly currentAssembly)
+		{
+			// TODO: make this a per-assembly cache
+//				CacheManager cache = currentAssembly.Compilation.CacheManager;
+//				IList<IAttribute> result = (IList<IAttribute>)cache.GetShared(this);
+//				if (result != null)
+//					return result;
+			
+			ITypeResolveContext context = new SimpleTypeResolveContext(currentAssembly);
+			BlobReader reader = new BlobReader(blob, currentAssembly);
+			if (reader.ReadByte() != '.') {
+				// should not use UnresolvedSecurityDeclaration for XML secdecls
+				throw new InvalidOperationException();
+			}
+			ResolveResult securityActionRR = securityAction.Resolve(context);
+			uint attributeCount = reader.ReadCompressedUInt32();
+			IAttribute[] attributes = new IAttribute[attributeCount];
+			try {
+				ReadSecurityBlob(reader, attributes, context, securityActionRR);
+			} catch (NotSupportedException ex) {
+				// ignore invalid blobs
+				Debug.WriteLine(ex.ToString());
+			}
+			for (int i = 0; i < attributes.Length; i++) {
+				if (attributes[i] == null)
+					attributes[i] = new CecilResolvedAttribute(context, SpecialType.UnknownType);
+			}
+			return attributes;
+//				return (IList<IAttribute>)cache.GetOrAddShared(this, attributes);
+		}
+		
+		void ReadSecurityBlob(BlobReader reader, IAttribute[] attributes, ITypeResolveContext context, ResolveResult securityActionRR)
+		{
+			for (int i = 0; i < attributes.Length; i++) {
+				string attributeTypeName = reader.ReadSerString();
+				ITypeReference attributeTypeRef = ReflectionHelper.ParseReflectionName(attributeTypeName);
+				IType attributeType = attributeTypeRef.Resolve(context);
+				
+				reader.ReadCompressedUInt32(); // ??
+				// The specification seems to be incorrect here, so I'm using the logic from Cecil instead.
+				uint numNamed = reader.ReadCompressedUInt32();
+				
+				var namedArgs = new List<KeyValuePair<IMember, ResolveResult>>((int)numNamed);
+				for (uint j = 0; j < numNamed; j++) {
+					var namedArg = reader.ReadNamedArg(attributeType);
+					if (namedArg.Key != null)
+						namedArgs.Add(namedArg);
+					
+				}
+				attributes[i] = new DefaultAttribute(
+					attributeType,
+					positionalArguments: new ResolveResult[] { securityActionRR },
+					namedArguments: namedArgs);
+			}
+		}
+	}
+	
+	[Serializable]
+	sealed class UnresolvedSecurityAttribute : IUnresolvedAttribute, ISupportsInterning
+	{
+		readonly UnresolvedSecurityDeclarationBlob secDecl;
+		readonly int index;
+		
+		public UnresolvedSecurityAttribute(UnresolvedSecurityDeclarationBlob secDecl, int index)
+		{
+			Debug.Assert(secDecl != null);
+			this.secDecl = secDecl;
+			this.index = index;
+		}
+		
+		DomRegion IUnresolvedAttribute.Region {
+			get { return DomRegion.Empty; }
+		}
+		
+		IAttribute IUnresolvedAttribute.CreateResolvedAttribute(ITypeResolveContext context)
+		{
+			return secDecl.Resolve(context.CurrentAssembly)[index];
+		}
+		
+		int ISupportsInterning.GetHashCodeForInterning()
+		{
+			return index ^ secDecl.GetHashCode();
+		}
+		
+		bool ISupportsInterning.EqualsForInterning(ISupportsInterning other)
+		{
+			UnresolvedSecurityAttribute attr = other as UnresolvedSecurityAttribute;
+			return attr != null && index == attr.index && secDecl == attr.secDecl;
+		}
+	}
+}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/KnownTypeReference.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/KnownTypeReference.cs
index 39201e781d..034a61a147 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/KnownTypeReference.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/KnownTypeReference.cs
@@ -107,6 +107,8 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		IList,
 		/// <summary><c>System.Collections.Generic.IList{T}</c></summary>
 		IListOfT,
+		/// <summary><c>System.Collections.Generic.IReadOnlyCollection{T}</c></summary>
+		IReadOnlyCollectionOfT,
 		/// <summary><c>System.Collections.Generic.IReadOnlyList{T}</c></summary>
 		IReadOnlyListOfT,
 		/// <summary><c>System.Threading.Tasks.Task</c></summary>
@@ -171,6 +173,7 @@ namespace ICSharpCode.NRefactory.TypeSystem
 			new KnownTypeReference(KnownTypeCode.IList,          "System.Collections", "IList"),
 			new KnownTypeReference(KnownTypeCode.IListOfT,       "System.Collections.Generic", "IList", 1),
 
+			new KnownTypeReference(KnownTypeCode.IReadOnlyCollectionOfT, "System.Collections.Generic", "IReadOnlyCollection", 1),
 			new KnownTypeReference(KnownTypeCode.IReadOnlyListOfT, "System.Collections.Generic", "IReadOnlyList", 1),
 			new KnownTypeReference(KnownTypeCode.Task,        "System.Threading.Tasks", "Task"),
 			new KnownTypeReference(KnownTypeCode.TaskOfT,     "System.Threading.Tasks", "Task", 1, baseType: KnownTypeCode.Task),
@@ -369,6 +372,11 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		/// </summary>
 		public static readonly KnownTypeReference IListOfT = Get(KnownTypeCode.IListOfT);
 		
+		/// <summary>
+		/// Gets a type reference pointing to the <c>System.Collections.Generic.IReadOnlyCollection{T}</c> type.
+		/// </summary>
+		public static readonly KnownTypeReference IReadOnlyCollectionOfT = Get(KnownTypeCode.IReadOnlyCollectionOfT);
+		
 		/// <summary>
 		/// Gets a type reference pointing to the <c>System.Collections.Generic.IReadOnlyList{T}</c> type.
 		/// </summary>
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/ParameterListComparer.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/ParameterListComparer.cs
index a4f14f3fba..82447a516f 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/ParameterListComparer.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/ParameterListComparer.cs
@@ -28,18 +28,41 @@ namespace ICSharpCode.NRefactory.TypeSystem
 	/// </summary>
 	/// <remarks>
 	/// 'ref int' and 'out int' are considered to be equal.
-	/// "Method{T}(T a)" and "Method{S}(S b)" are also considered equal.
+	/// 'object' and 'dynamic' are also equal.
+	/// For generic methods, "Method{T}(T a)" and "Method{S}(S b)" are considered equal.
 	/// However, "Method(T a)" and "Method(S b)" are not considered equal when the type parameters T and S belong to classes.
 	/// </remarks>
 	public sealed class ParameterListComparer : IEqualityComparer<IList<IParameter>>
 	{
 		public static readonly ParameterListComparer Instance = new ParameterListComparer();
 		
+		sealed class NormalizeTypeVisitor : TypeVisitor
+		{
+			public override IType VisitTypeParameter(ITypeParameter type)
+			{
+				if (type.OwnerType == SymbolKind.Method) {
+					return DummyTypeParameter.GetMethodTypeParameter(type.Index);
+				} else {
+					return base.VisitTypeParameter(type);
+				}
+			}
+			
+			public override IType VisitTypeDefinition(ITypeDefinition type)
+			{
+				if (type.KnownTypeCode == KnownTypeCode.Object)
+					return SpecialType.Dynamic;
+				return base.VisitTypeDefinition(type);
+			}
+		}
+		
+		static readonly NormalizeTypeVisitor normalizationVisitor = new NormalizeTypeVisitor();
+		
 		/// <summary>
 		/// Replaces all occurrences of method type parameters in the given type
 		/// by normalized type parameters. This allows comparing parameter types from different
 		/// generic methods.
 		/// </summary>
+		[Obsolete("Use DummyTypeParameter.NormalizeMethodTypeParameters instead if you only need to normalize type parameters. Also, consider if you need to normalize object vs. dynamic as well.")]
 		public IType NormalizeMethodTypeParameters(IType type)
 		{
 			return DummyTypeParameter.NormalizeMethodTypeParameters(type);
@@ -62,8 +85,8 @@ namespace ICSharpCode.NRefactory.TypeSystem
 				// We want to consider the parameter lists "Method<T>(T a)" and "Method<S>(S b)" as equal.
 				// However, the parameter types are not considered equal, as T is a different type parameter than S.
 				// In order to compare the method signatures, we will normalize all method type parameters.
-				IType aType = DummyTypeParameter.NormalizeMethodTypeParameters(a.Type);
-				IType bType = DummyTypeParameter.NormalizeMethodTypeParameters(b.Type);
+				IType aType = a.Type.AcceptVisitor(normalizationVisitor);
+				IType bType = b.Type.AcceptVisitor(normalizationVisitor);
 				
 				if (!aType.Equals(bType))
 					return false;
@@ -77,7 +100,7 @@ namespace ICSharpCode.NRefactory.TypeSystem
 			unchecked {
 				foreach (IParameter p in obj) {
 					hashCode *= 27;
-					IType type = DummyTypeParameter.NormalizeMethodTypeParameters(p.Type);
+					IType type = p.Type.AcceptVisitor(normalizationVisitor);
 					hashCode += type.GetHashCode();
 				}
 			}
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/TypeSystemExtensions.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/TypeSystemExtensions.cs
index 2c615bf028..8a1c82583b 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/TypeSystemExtensions.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/TypeSystemExtensions.cs
@@ -203,6 +203,57 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		#endregion
 		
 		#region Import
+		/// <summary>
+		/// Imports a symbol from another compilation.
+		/// </summary>
+		public static ISymbol Import(this ICompilation compilation, ISymbol symbol)
+		{
+			if (compilation == null)
+				throw new ArgumentNullException("compilation");
+			if (symbol == null)
+				return null;
+			switch (symbol.SymbolKind) {
+				case SymbolKind.TypeParameter:
+					return (ITypeParameter)Import(compilation, (IType)symbol);
+				case SymbolKind.Variable:
+					IVariable v = (IVariable)symbol;
+					return new DefaultVariable(
+						Import(compilation, v.Type),
+						v.Name, v.Region, v.IsConst, v.ConstantValue
+					);
+				case SymbolKind.Parameter:
+					IParameter p = (IParameter)symbol;
+					if (p.Owner != null) {
+						int index = p.Owner.Parameters.IndexOf(p);
+						var owner = (IParameterizedMember)Import(compilation, p.Owner);
+						if (owner == null || index < 0 || index >= owner.Parameters.Count)
+							return null;
+						return owner.Parameters[index];
+					} else {
+						return new DefaultParameter(
+							Import(compilation, p.Type),
+							p.Name, null, p.Region,
+							null, p.IsRef, p.IsOut, p.IsParams
+						);
+					}
+				case SymbolKind.Namespace:
+					INamespace ns = (INamespace)symbol;
+					if (ns.ParentNamespace == null) {
+						return compilation.RootNamespace;
+					} else {
+						INamespace importedParent = Import(compilation, ns.ParentNamespace);
+						if (importedParent != null)
+							return importedParent.GetChildNamespace(ns.Name);
+						else
+							return null;
+					}
+				default:
+					if (symbol is IEntity)
+						return Import(compilation, (IEntity)symbol);
+					throw new NotSupportedException("Unsupported symbol kind: " + symbol.SymbolKind);
+			}
+		}
+		
 		/// <summary>
 		/// Imports a type from another compilation.
 		/// </summary>
@@ -635,6 +686,26 @@ namespace ICSharpCode.NRefactory.TypeSystem
 			                     	return typeDef != null && typeDef.FullTypeName == attributeType;
 			                     }, inherit);
 		}
+
+		/// <summary>
+		/// Gets the attribute of the specified attribute type (or derived attribute types).
+		/// </summary>
+		/// <param name="entity">The entity on which the attributes are declared.</param>
+		/// <param name="inherit">
+		/// Specifies whether attributes inherited from base classes and base members (if the given <paramref name="entity"/> in an <c>override</c>)
+		/// should be returned. The default is <c>true</c>.
+		/// </param>
+		/// <returns>
+		/// Returns the attribute that was found; or <c>null</c> if none was found.
+		/// If inherit is true, an from the entity itself will be returned if possible;
+		/// and the base entity will only be searched if none exists.
+		/// </returns>
+		public static IEnumerable<IAttribute> GetAttributes(this IEntity entity, bool inherit = true)
+		{
+			if (entity == null)
+				throw new ArgumentNullException ("entity");
+			return GetAttributes(entity, a => true, inherit);
+		}
 		
 		static IEnumerable<IAttribute> GetAttributes(IEntity entity, Predicate<IType> attributeTypePredicate, bool inherit)
 		{
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Utils/ComparableList.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Utils/ComparableList.cs
new file mode 100644
index 0000000000..62dcad7814
--- /dev/null
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Utils/ComparableList.cs
@@ -0,0 +1,166 @@
+//
+// NullValueAnalysisTests.cs
+//
+// Author:
+//       Luís Reis <luiscubal@gmail.com
+//
+// Copyright (c) 2013 Luís Reis
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory.Utils
+{
+	/// <summary>
+	/// A list that can be compared to other ComparableLists for equality.
+	/// Can not be used to store null values.
+	/// </summary>
+	public sealed class ComparableList<T> : IList<T>, IEquatable<ComparableList<T>>
+	{
+		List<T> elements;
+
+		public ComparableList()
+		{
+			elements = new List<T> ();
+		}
+
+		public ComparableList(IEnumerable<T> values)
+		{
+			elements = new List<T> (values);
+		}
+
+		public int IndexOf (T item)
+		{
+			if (item == null)
+				throw new ArgumentNullException ("item");
+			return elements.IndexOf (item);
+		}
+
+		public void Insert (int index, T item)
+		{
+			elements.Insert (index, item);
+		}
+
+		public void RemoveAt (int index)
+		{
+			elements.RemoveAt (index);
+		}
+
+		public T this [int index] {
+			get {
+				return elements [index];
+			}
+			set {
+				elements [index] = value;
+			}
+		}
+
+		public void Add (T item)
+		{
+			elements.Add (item);
+		}
+
+		public void Clear ()
+		{
+			elements.Clear ();
+		}
+
+		public bool Contains (T item)
+		{
+			return elements.Contains (item);
+		}
+
+		public void CopyTo (T[] array, int arrayIndex)
+		{
+			elements.CopyTo (array, arrayIndex);
+		}
+
+		public bool Remove (T item)
+		{
+			return elements.Remove (item);
+		}
+
+		public int Count {
+			get {
+				return elements.Count;
+			}
+		}
+
+		public bool IsReadOnly {
+			get {
+				return false;
+			}
+		}
+
+		public IEnumerator<T> GetEnumerator()
+		{
+			return elements.GetEnumerator();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator ();
+		}
+
+		public override bool Equals (object obj)
+		{
+			return Equals (obj as ComparableList<T>);
+		}
+
+		public bool Equals (ComparableList<T> obj)
+		{
+			if (obj == null || Count != obj.Count) {
+				return false;
+			}
+
+			for (int index = 0; index < Count; ++index) {
+				if (!this [index].Equals(obj [index])) {
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		public override int GetHashCode ()
+		{
+			int hash = 19;
+			foreach (var item in this) {
+				unchecked {
+					hash *= 31;
+					hash += item.GetHashCode();
+				}
+			}
+			return hash;
+		}
+
+		public static bool operator==(ComparableList<T> item1, ComparableList<T> item2) {
+			if (object.ReferenceEquals (item1, null))
+				return object.ReferenceEquals (item2, null);
+			return item1.Equals (item2);
+		}
+
+		public static bool operator!=(ComparableList<T> item1, ComparableList<T> item2) {
+			return !(item1 == item2);
+		}
+	}
+}
+
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Utils/ExtensionMethods.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Utils/ExtensionMethods.cs
index ba667b075e..e5829b2c2f 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/Utils/ExtensionMethods.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/Utils/ExtensionMethods.cs
@@ -24,7 +24,7 @@ namespace ICSharpCode.NRefactory.Utils
 	/// <summary>
 	/// Contains extension methods for use within NRefactory.
 	/// </summary>
-	internal static class ExtensionMethods
+	static class ExtensionMethods
 	{
 		public static void AddRange<T>(this ICollection<T> target, IEnumerable<T> input)
 		{
diff --git a/src/Libraries/NRefactory/NRefactory.sln b/src/Libraries/NRefactory/NRefactory.sln
index 7cf9d71272..c7577382c0 100644
--- a/src/Libraries/NRefactory/NRefactory.sln
+++ b/src/Libraries/NRefactory/NRefactory.sln
@@ -1,203 +1,275 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-# SharpDevelop 5.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DC98210E-1646-483B-819A-2BB8272461E4}"
-	ProjectSection(SolutionItems) = preProject
-		Packages\ICSharpCode.NRefactory.nuspec = Packages\ICSharpCode.NRefactory.nuspec
-		ICSharpCode.NRefactory.snk = ICSharpCode.NRefactory.snk
-		README = README
-		doc\TODO = doc\TODO
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Tests", "ICSharpCode.NRefactory.Tests\ICSharpCode.NRefactory.Tests.csproj", "{63D3B27A-D966-4902-90B3-30290E1692F1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "..\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSharp", "ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj", "{53DCA265-3C3C-42F9-B647-F72BA678122B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.GtkDemo", "ICSharpCode.NRefactory.GtkDemo\ICSharpCode.NRefactory.GtkDemo.csproj", "{A7EEF7F8-238F-459D-95A9-96467539641D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.ConsistencyCheck", "ICSharpCode.NRefactory.ConsistencyCheck\ICSharpCode.NRefactory.ConsistencyCheck.csproj", "{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Xml", "ICSharpCode.NRefactory.Xml\ICSharpCode.NRefactory.Xml.csproj", "{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSharp.AstVerifier", "ICSharpCode.NRefactory.CSharp.AstVerifier\ICSharpCode.NRefactory.CSharp.AstVerifier.csproj", "{961DADFA-7CE6-429F-BC22-47630D6DB826}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Demo", "ICSharpCode.NRefactory.Demo\ICSharpCode.NRefactory.Demo.csproj", "{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x86 = Release|x86
-		net_4_5_Debug|Any CPU = net_4_5_Debug|Any CPU
-		net_4_5_Debug|x86 = net_4_5_Debug|x86
-		net_4_5_Release|Any CPU = net_4_5_Release|Any CPU
-		net_4_5_Release|x86 = net_4_5_Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|x86.Build.0 = Debug|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|x86.ActiveCfg = Release|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|x86.Build.0 = Release|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Release|x86.Build.0 = net_4_5_Release|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|x86.ActiveCfg = Debug|x86
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|x86.Build.0 = Debug|x86
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.Release|x86.ActiveCfg = Release|x86
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.Release|x86.Build.0 = Release|x86
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|x86
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|x86
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|x86
-		{63D3B27A-D966-4902-90B3-30290E1692F1}.net_4_5_Release|x86.Build.0 = net_4_5_Release|x86
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|x86.ActiveCfg = net_4_0_Debug|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|x86.Build.0 = net_4_0_Debug|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.Build.0 = net_4_0_Release|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|x86.ActiveCfg = net_4_0_Release|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|x86.Build.0 = net_4_0_Release|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.net_4_5_Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.net_4_5_Debug|x86.ActiveCfg = net_4_0_Debug|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.net_4_5_Debug|x86.Build.0 = net_4_0_Debug|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.net_4_5_Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.net_4_5_Release|Any CPU.Build.0 = net_4_0_Release|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.net_4_5_Release|x86.ActiveCfg = net_4_0_Release|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.net_4_5_Release|x86.Build.0 = net_4_0_Release|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|x86.Build.0 = Debug|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|x86.ActiveCfg = Release|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|x86.Build.0 = Release|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|Any CPU
-		{53DCA265-3C3C-42F9-B647-F72BA678122B}.net_4_5_Release|x86.Build.0 = net_4_5_Release|Any CPU
-		{A7EEF7F8-238F-459D-95A9-96467539641D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7EEF7F8-238F-459D-95A9-96467539641D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7EEF7F8-238F-459D-95A9-96467539641D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A7EEF7F8-238F-459D-95A9-96467539641D}.Debug|x86.Build.0 = Debug|Any CPU
-		{A7EEF7F8-238F-459D-95A9-96467539641D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7EEF7F8-238F-459D-95A9-96467539641D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A7EEF7F8-238F-459D-95A9-96467539641D}.Release|x86.ActiveCfg = Release|Any CPU
-		{A7EEF7F8-238F-459D-95A9-96467539641D}.Release|x86.Build.0 = Release|Any CPU
-		{A7EEF7F8-238F-459D-95A9-96467539641D}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
-		{A7EEF7F8-238F-459D-95A9-96467539641D}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
-		{A7EEF7F8-238F-459D-95A9-96467539641D}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|Any CPU
-		{A7EEF7F8-238F-459D-95A9-96467539641D}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|Any CPU
-		{A7EEF7F8-238F-459D-95A9-96467539641D}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
-		{A7EEF7F8-238F-459D-95A9-96467539641D}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
-		{A7EEF7F8-238F-459D-95A9-96467539641D}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|Any CPU
-		{A7EEF7F8-238F-459D-95A9-96467539641D}.net_4_5_Release|x86.Build.0 = net_4_5_Release|Any CPU
-		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Debug|x86.ActiveCfg = Debug|x86
-		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Debug|x86.Build.0 = Debug|x86
-		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Release|x86.ActiveCfg = Release|x86
-		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Release|x86.Build.0 = Release|x86
-		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
-		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
-		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|x86
-		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|x86
-		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
-		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
-		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|x86
-		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.net_4_5_Release|x86.Build.0 = net_4_5_Release|x86
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Debug|x86.Build.0 = Debug|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|x86.ActiveCfg = Release|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|x86.Build.0 = Release|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|Any CPU
-		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.net_4_5_Release|x86.Build.0 = net_4_5_Release|Any CPU
-		{961DADFA-7CE6-429F-BC22-47630D6DB826}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{961DADFA-7CE6-429F-BC22-47630D6DB826}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{961DADFA-7CE6-429F-BC22-47630D6DB826}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{961DADFA-7CE6-429F-BC22-47630D6DB826}.Debug|x86.Build.0 = Debug|Any CPU
-		{961DADFA-7CE6-429F-BC22-47630D6DB826}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{961DADFA-7CE6-429F-BC22-47630D6DB826}.Release|Any CPU.Build.0 = Release|Any CPU
-		{961DADFA-7CE6-429F-BC22-47630D6DB826}.Release|x86.ActiveCfg = Release|Any CPU
-		{961DADFA-7CE6-429F-BC22-47630D6DB826}.Release|x86.Build.0 = Release|Any CPU
-		{961DADFA-7CE6-429F-BC22-47630D6DB826}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
-		{961DADFA-7CE6-429F-BC22-47630D6DB826}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
-		{961DADFA-7CE6-429F-BC22-47630D6DB826}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|Any CPU
-		{961DADFA-7CE6-429F-BC22-47630D6DB826}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|Any CPU
-		{961DADFA-7CE6-429F-BC22-47630D6DB826}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
-		{961DADFA-7CE6-429F-BC22-47630D6DB826}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
-		{961DADFA-7CE6-429F-BC22-47630D6DB826}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|Any CPU
-		{961DADFA-7CE6-429F-BC22-47630D6DB826}.net_4_5_Release|x86.Build.0 = net_4_5_Release|Any CPU
-		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Debug|x86.ActiveCfg = Debug|x86
-		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Debug|x86.Build.0 = Debug|x86
-		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Release|x86.ActiveCfg = Release|x86
-		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Release|x86.Build.0 = Release|x86
-		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
-		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
-		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|x86
-		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|x86
-		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
-		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
-		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|x86
-		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.net_4_5_Release|x86.Build.0 = net_4_5_Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = ICSharpCode.NRefactory.Demo\ICSharpCode.NRefactory.Demo.csproj
-		Policies = $0
-		$0.TextStylePolicy = $1
-		$1.FileWidth = 120
-		$1.TabWidth = 4
-		$1.IndentWidth = 4
-		$1.EolMarker = Unix
-		$1.inheritsSet = Mono
-		$1.inheritsScope = text/plain
-		$1.scope = text/plain
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DC98210E-1646-483B-819A-2BB8272461E4}"
+	ProjectSection(SolutionItems) = preProject
+		Packages\ICSharpCode.NRefactory.nuspec = Packages\ICSharpCode.NRefactory.nuspec
+		ICSharpCode.NRefactory.snk = ICSharpCode.NRefactory.snk
+		README = README
+		doc\TODO = doc\TODO
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Tests", "ICSharpCode.NRefactory.Tests\ICSharpCode.NRefactory.Tests.csproj", "{63D3B27A-D966-4902-90B3-30290E1692F1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "..\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSharp", "ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj", "{53DCA265-3C3C-42F9-B647-F72BA678122B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.GtkDemo", "ICSharpCode.NRefactory.GtkDemo\ICSharpCode.NRefactory.GtkDemo.csproj", "{A7EEF7F8-238F-459D-95A9-96467539641D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.ConsistencyCheck", "ICSharpCode.NRefactory.ConsistencyCheck\ICSharpCode.NRefactory.ConsistencyCheck.csproj", "{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Xml", "ICSharpCode.NRefactory.Xml\ICSharpCode.NRefactory.Xml.csproj", "{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSharp.AstVerifier", "ICSharpCode.NRefactory.CSharp.AstVerifier\ICSharpCode.NRefactory.CSharp.AstVerifier.csproj", "{961DADFA-7CE6-429F-BC22-47630D6DB826}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Demo", "ICSharpCode.NRefactory.Demo\ICSharpCode.NRefactory.Demo.csproj", "{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IKVM.Reflection", "..\ikvm\reflect\IKVM.Reflection.csproj", "{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.IKVM", "ICSharpCode.NRefactory.IKVM\ICSharpCode.NRefactory.IKVM.csproj", "{A727169F-D94F-443F-B305-B057D7F3B420}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Cecil", "ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj", "{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSharp.Refactoring", "ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory.CSharp.Refactoring.csproj", "{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
+		net_4_5_Debug|Any CPU = net_4_5_Debug|Any CPU
+		net_4_5_Debug|x86 = net_4_5_Debug|x86
+		net_4_5_Release|Any CPU = net_4_5_Release|Any CPU
+		net_4_5_Release|x86 = net_4_5_Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|x86.Build.0 = Debug|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.net_4_5_Release|x86.Build.0 = net_4_5_Release|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|x86.ActiveCfg = Release|Any CPU
+		{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|x86.Build.0 = Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|x86.Build.0 = Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.net_4_5_Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.net_4_5_Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.net_4_5_Debug|x86.ActiveCfg = Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.net_4_5_Debug|x86.Build.0 = Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.net_4_5_Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.net_4_5_Release|Any CPU.Build.0 = Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.net_4_5_Release|x86.ActiveCfg = Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.net_4_5_Release|x86.Build.0 = Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|x86.ActiveCfg = Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|x86.Build.0 = Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|x86.Build.0 = Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Release|x86.Build.0 = net_4_5_Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|x86.ActiveCfg = Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|x86.Build.0 = Release|Any CPU
+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.Debug|x86.Build.0 = Debug|Any CPU
+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.net_4_5_Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.net_4_5_Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.net_4_5_Debug|x86.ActiveCfg = Debug|Any CPU
+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.net_4_5_Debug|x86.Build.0 = Debug|Any CPU
+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.net_4_5_Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.net_4_5_Release|Any CPU.Build.0 = Release|Any CPU
+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.net_4_5_Release|x86.ActiveCfg = Release|Any CPU
+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.net_4_5_Release|x86.Build.0 = Release|Any CPU
+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.Release|x86.ActiveCfg = Release|Any CPU
+		{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}.Release|x86.Build.0 = Release|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|x86.Build.0 = Debug|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.net_4_5_Release|x86.Build.0 = net_4_5_Release|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|x86.ActiveCfg = Release|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|x86.Build.0 = Release|Any CPU
+		{63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|x86.ActiveCfg = Debug|x86
+		{63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|x86.Build.0 = Debug|x86
+		{63D3B27A-D966-4902-90B3-30290E1692F1}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
+		{63D3B27A-D966-4902-90B3-30290E1692F1}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
+		{63D3B27A-D966-4902-90B3-30290E1692F1}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|x86
+		{63D3B27A-D966-4902-90B3-30290E1692F1}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|x86
+		{63D3B27A-D966-4902-90B3-30290E1692F1}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
+		{63D3B27A-D966-4902-90B3-30290E1692F1}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
+		{63D3B27A-D966-4902-90B3-30290E1692F1}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|x86
+		{63D3B27A-D966-4902-90B3-30290E1692F1}.net_4_5_Release|x86.Build.0 = net_4_5_Release|x86
+		{63D3B27A-D966-4902-90B3-30290E1692F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63D3B27A-D966-4902-90B3-30290E1692F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63D3B27A-D966-4902-90B3-30290E1692F1}.Release|x86.ActiveCfg = Release|x86
+		{63D3B27A-D966-4902-90B3-30290E1692F1}.Release|x86.Build.0 = Release|x86
+		{961DADFA-7CE6-429F-BC22-47630D6DB826}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{961DADFA-7CE6-429F-BC22-47630D6DB826}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{961DADFA-7CE6-429F-BC22-47630D6DB826}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{961DADFA-7CE6-429F-BC22-47630D6DB826}.Debug|x86.Build.0 = Debug|Any CPU
+		{961DADFA-7CE6-429F-BC22-47630D6DB826}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
+		{961DADFA-7CE6-429F-BC22-47630D6DB826}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
+		{961DADFA-7CE6-429F-BC22-47630D6DB826}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|Any CPU
+		{961DADFA-7CE6-429F-BC22-47630D6DB826}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|Any CPU
+		{961DADFA-7CE6-429F-BC22-47630D6DB826}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
+		{961DADFA-7CE6-429F-BC22-47630D6DB826}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
+		{961DADFA-7CE6-429F-BC22-47630D6DB826}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|Any CPU
+		{961DADFA-7CE6-429F-BC22-47630D6DB826}.net_4_5_Release|x86.Build.0 = net_4_5_Release|Any CPU
+		{961DADFA-7CE6-429F-BC22-47630D6DB826}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{961DADFA-7CE6-429F-BC22-47630D6DB826}.Release|Any CPU.Build.0 = Release|Any CPU
+		{961DADFA-7CE6-429F-BC22-47630D6DB826}.Release|x86.ActiveCfg = Release|Any CPU
+		{961DADFA-7CE6-429F-BC22-47630D6DB826}.Release|x86.Build.0 = Release|Any CPU
+		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Debug|x86.ActiveCfg = Debug|x86
+		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Debug|x86.Build.0 = Debug|x86
+		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
+		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
+		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|x86
+		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|x86
+		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
+		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
+		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|x86
+		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.net_4_5_Release|x86.Build.0 = net_4_5_Release|x86
+		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Release|x86.ActiveCfg = Release|x86
+		{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Release|x86.Build.0 = Release|x86
+		{A727169F-D94F-443F-B305-B057D7F3B420}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A727169F-D94F-443F-B305-B057D7F3B420}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A727169F-D94F-443F-B305-B057D7F3B420}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A727169F-D94F-443F-B305-B057D7F3B420}.Debug|x86.Build.0 = Debug|Any CPU
+		{A727169F-D94F-443F-B305-B057D7F3B420}.net_4_5_Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A727169F-D94F-443F-B305-B057D7F3B420}.net_4_5_Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A727169F-D94F-443F-B305-B057D7F3B420}.net_4_5_Debug|x86.ActiveCfg = Debug|Any CPU
+		{A727169F-D94F-443F-B305-B057D7F3B420}.net_4_5_Debug|x86.Build.0 = Debug|Any CPU
+		{A727169F-D94F-443F-B305-B057D7F3B420}.net_4_5_Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A727169F-D94F-443F-B305-B057D7F3B420}.net_4_5_Release|Any CPU.Build.0 = Release|Any CPU
+		{A727169F-D94F-443F-B305-B057D7F3B420}.net_4_5_Release|x86.ActiveCfg = Release|Any CPU
+		{A727169F-D94F-443F-B305-B057D7F3B420}.net_4_5_Release|x86.Build.0 = Release|Any CPU
+		{A727169F-D94F-443F-B305-B057D7F3B420}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A727169F-D94F-443F-B305-B057D7F3B420}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A727169F-D94F-443F-B305-B057D7F3B420}.Release|x86.ActiveCfg = Release|Any CPU
+		{A727169F-D94F-443F-B305-B057D7F3B420}.Release|x86.Build.0 = Release|Any CPU
+		{A7EEF7F8-238F-459D-95A9-96467539641D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7EEF7F8-238F-459D-95A9-96467539641D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7EEF7F8-238F-459D-95A9-96467539641D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A7EEF7F8-238F-459D-95A9-96467539641D}.Debug|x86.Build.0 = Debug|Any CPU
+		{A7EEF7F8-238F-459D-95A9-96467539641D}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
+		{A7EEF7F8-238F-459D-95A9-96467539641D}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
+		{A7EEF7F8-238F-459D-95A9-96467539641D}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|Any CPU
+		{A7EEF7F8-238F-459D-95A9-96467539641D}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|Any CPU
+		{A7EEF7F8-238F-459D-95A9-96467539641D}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
+		{A7EEF7F8-238F-459D-95A9-96467539641D}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
+		{A7EEF7F8-238F-459D-95A9-96467539641D}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|Any CPU
+		{A7EEF7F8-238F-459D-95A9-96467539641D}.net_4_5_Release|x86.Build.0 = net_4_5_Release|Any CPU
+		{A7EEF7F8-238F-459D-95A9-96467539641D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7EEF7F8-238F-459D-95A9-96467539641D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7EEF7F8-238F-459D-95A9-96467539641D}.Release|x86.ActiveCfg = Release|Any CPU
+		{A7EEF7F8-238F-459D-95A9-96467539641D}.Release|x86.Build.0 = Release|Any CPU
+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU
+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|x86.ActiveCfg = net_4_0_Debug|Any CPU
+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|x86.Build.0 = net_4_0_Debug|Any CPU
+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.net_4_5_Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU
+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.net_4_5_Debug|x86.ActiveCfg = net_4_0_Debug|Any CPU
+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.net_4_5_Debug|x86.Build.0 = net_4_0_Debug|Any CPU
+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.net_4_5_Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.net_4_5_Release|Any CPU.Build.0 = net_4_0_Release|Any CPU
+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.net_4_5_Release|x86.ActiveCfg = net_4_0_Release|Any CPU
+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.net_4_5_Release|x86.Build.0 = net_4_0_Release|Any CPU
+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.Build.0 = net_4_0_Release|Any CPU
+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|x86.ActiveCfg = net_4_0_Release|Any CPU
+		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|x86.Build.0 = net_4_0_Release|Any CPU
+		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Debug|x86.ActiveCfg = Debug|x86
+		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Debug|x86.Build.0 = Debug|x86
+		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
+		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
+		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|x86
+		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|x86
+		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
+		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
+		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|x86
+		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.net_4_5_Release|x86.Build.0 = net_4_5_Release|x86
+		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Release|x86.ActiveCfg = Release|x86
+		{D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Release|x86.Build.0 = Release|x86
+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Debug|x86.Build.0 = Debug|Any CPU
+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|Any CPU
+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|Any CPU
+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|Any CPU
+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.net_4_5_Release|x86.Build.0 = net_4_5_Release|Any CPU
+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|x86.ActiveCfg = Release|Any CPU
+		{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = ICSharpCode.NRefactory.Demo\ICSharpCode.NRefactory.Demo.csproj
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.FileWidth = 120
+		$1.TabsToSpaces = False
+		$1.EolMarker = Unix
+		$1.inheritsSet = VisualStudio
+		$1.inheritsScope = text/plain
+		$1.scope = text/plain
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/src/Libraries/NRefactory/Packages/ICSharpCode.NRefactory.nuspec b/src/Libraries/NRefactory/Packages/ICSharpCode.NRefactory.nuspec
index d86a3aee36..4d9560d5f0 100644
--- a/src/Libraries/NRefactory/Packages/ICSharpCode.NRefactory.nuspec
+++ b/src/Libraries/NRefactory/Packages/ICSharpCode.NRefactory.nuspec
@@ -22,6 +22,9 @@
 		<file src="..\bin\Release\ICSharpCode.NRefactory.dll" target="lib\Net40" />
 		<file src="..\bin\Release\ICSharpCode.NRefactory.pdb" target="lib\Net40" />
 		<file src="..\bin\Release\ICSharpCode.NRefactory.xml" target="lib\Net40" />
+		<file src="..\bin\Release\ICSharpCode.NRefactory.Cecil.dll" target="lib\Net40" />
+		<file src="..\bin\Release\ICSharpCode.NRefactory.Cecil.pdb" target="lib\Net40" />
+		<file src="..\bin\Release\ICSharpCode.NRefactory.Cecil.xml" target="lib\Net40" />
 		<file src="..\bin\Release\ICSharpCode.NRefactory.CSharp.dll" target="lib\Net40" />
 		<file src="..\bin\Release\ICSharpCode.NRefactory.CSharp.pdb" target="lib\Net40" />
 		<file src="..\bin\Release\ICSharpCode.NRefactory.CSharp.xml" target="lib\Net40" />
@@ -29,6 +32,7 @@
 		<file src="..\bin\Release\ICSharpCode.NRefactory.Xml.pdb" target="lib\Net40" />
 		<file src="..\bin\Release\ICSharpCode.NRefactory.Xml.xml" target="lib\Net40" />
 		<file src="..\ICSharpCode.NRefactory\**\*.cs" target="src\ICSharpCode.NRefactory" />
+		<file src="..\ICSharpCode.NRefactory.Cecil\**\*.cs" target="src\ICSharpCode.NRefactory" />
 		<file src="..\ICSharpCode.NRefactory.CSharp\**\*.cs" target="src\ICSharpCode.NRefactory.CSharp" />
 		<file src="..\ICSharpCode.NRefactory.CSharp\**\*.jay" target="src\ICSharpCode.NRefactory.CSharp" />
 		<file src="..\ICSharpCode.NRefactory.Xml\**\*.cs" target="src\ICSharpCode.NRefactory.Xml" />
diff --git a/src/Libraries/NRefactory/README b/src/Libraries/NRefactory/README
index 65ac39020e..0b4e587307 100644
--- a/src/Libraries/NRefactory/README
+++ b/src/Libraries/NRefactory/README
@@ -12,7 +12,9 @@ How to compile:
 		Get Cecil from https://github.com/jbevain/cecil ('git clone git://github.com/jbevain/cecil.git')
 		or download Cecil from https://github.com/jbevain/cecil/ and unzip it into a directory named "cecil"
 		next to the directory containing NRefactory.
-	2. Open NRefactory.sln in your favorite .NET IDE and compile.
+	2. If you need the IKVM binding get it from https://github.com/mono/ikvm-fork and put it next to the NRefactory directory
+		like Mono.Cecil - name it "ikvm".
+	3. Open NRefactory.sln in your favorite .NET IDE and compile.
 
 Features:
 	- C# Parser
diff --git a/src/Main/Base/Project/Editor/ITextMarker.cs b/src/Main/Base/Project/Editor/ITextMarker.cs
index 907ee0b110..c70ddae8b9 100644
--- a/src/Main/Base/Project/Editor/ITextMarker.cs
+++ b/src/Main/Base/Project/Editor/ITextMarker.cs
@@ -99,6 +99,10 @@ namespace ICSharpCode.SharpDevelop.Editor
 		/// Normal underline.
 		/// </summary>
 		NormalUnderline = 0x002,
+		/// <summary>
+		/// Dotted underline.
+		/// </summary>
+		DottedUnderline = 0x004,
 		
 		/// <summary>
 		/// Horizontal line in the scroll bar.
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index c576b13e08..99f4c69997 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -884,6 +884,10 @@
       <Name>ICSharpCode.AvalonEdit</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
+      <Project>{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}</Project>
+      <Name>ICSharpCode.NRefactory.Cecil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
diff --git a/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj b/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj
index be4979fbeb..54375397e1 100644
--- a/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj
+++ b/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj
@@ -158,6 +158,10 @@
       <Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
       <Name>ICSharpCode.AvalonEdit</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
+      <Project>{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}</Project>
+      <Name>ICSharpCode.NRefactory.Cecil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
       <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
       <Name>ICSharpCode.NRefactory.CSharp</Name>
diff --git a/src/Main/SharpDevelop/SharpDevelop.csproj b/src/Main/SharpDevelop/SharpDevelop.csproj
index bfa2d7cb57..683295c575 100644
--- a/src/Main/SharpDevelop/SharpDevelop.csproj
+++ b/src/Main/SharpDevelop/SharpDevelop.csproj
@@ -268,6 +268,14 @@
       <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
       <Name>Mono.Cecil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
+      <Project>{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}</Project>
+      <Name>ICSharpCode.NRefactory.Cecil</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory.CSharp.Refactoring.csproj">
+      <Project>{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}</Project>
+      <Name>ICSharpCode.NRefactory.CSharp.Refactoring</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
       <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
       <Name>ICSharpCode.NRefactory.CSharp</Name>
diff --git a/src/Main/SharpDevelop/Workbench/WorkbenchStartup.cs b/src/Main/SharpDevelop/Workbench/WorkbenchStartup.cs
index ec0a3a5bd1..dc037aa46c 100644
--- a/src/Main/SharpDevelop/Workbench/WorkbenchStartup.cs
+++ b/src/Main/SharpDevelop/Workbench/WorkbenchStartup.cs
@@ -12,6 +12,7 @@ using System.Windows.Threading;
 
 using ICSharpCode.Core;
 using ICSharpCode.Core.WinForms;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Parser;
 using ICSharpCode.SharpDevelop.Project;
@@ -200,6 +201,8 @@ class Test {
 			foreach (var node in cu.Descendants) {
 				resolver.Resolve(node);
 			}
+			// load CSharp.Refactoring.dll
+			new RedundantUsingDirectiveIssue();
 			// warm up AvalonEdit (must be done on main thread)
 			SD.MainThread.InvokeAsyncAndForget(
 				delegate {
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index 022674ffab..5d7d6d92c6 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -312,6 +312,12 @@
 							<Component Id="SharpDevelopEnvDteDll" Guid="BEB5529F-D774-4C82-AA5A-AA877A64A79E" DiskId="1">
 								<File Id="SharpDevelop.EnvDTE.dll" Name="SharpDevelop.EnvDTE.dll" Source="..\..\bin\SharpDevelop.EnvDTE.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="SharpDevelop.EnvDTE.dll" AssemblyManifest="SharpDevelop.EnvDTE.dll" />
 							</Component>
+							<Component Id="ICSharpCodeNRefactoryCecilDll" Guid="5F040FEB-33B4-4B4D-ABAC-85683ED55FDF" DiskId="1">
+								<File Id="ICSharpCode.NRefactory.Cecil.dll" Name="ICSharpCode.NRefactory.Cecil.dll" Source="..\..\bin\ICSharpCode.NRefactory.Cecil.dll" KeyPath="yes" />
+							</Component>
+							<Component Id="ICSharpCodeNRefactoryCSharpRefactoringDll" Guid="1A52D4C5-9D69-4FC1-BC63-FD4C13C14267" DiskId="1">
+								<File Id="ICSharpCode.NRefactory.CSharp.Refactoring.dll" Name="ICSharpCode.NRefactory.CSharp.Refactoring.dll" Source="..\..\bin\ICSharpCode.NRefactory.CSharp.Refactoring.dll" KeyPath="yes" />
+							</Component>
 						</Directory>
 						<Directory Id="DocFolder" Name="doc">
 							<Component Guid="9DCED5AC-B771-4A4F-B4FE-69867BF2EBDE" Id="SharpDevelopDocFiles" DiskId="1">
@@ -904,114 +910,114 @@
 									</Directory>
 								</Directory>
 								<!--
-								<Directory Id="PythonBinding" Name="PythonBinding">
-									<Component Guid="AF97A77A-F986-4284-BC0A-9568B1419FC1" Id="IpyExe" DiskId="1">
-										<File Source="..\..\AddIns\BackendBindings\PythonBinding\ipy.exe" Name="ipy.exe" Id="ipy.exe" KeyPath="yes" Assembly=".net" AssemblyApplication="ipy.exe" AssemblyManifest="ipy.exe">
-											<netfx:NativeImage Id="IpyExeNGenImage" Priority="1" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" />
-										</File>
-									</Component>
-									<Component Guid="A7C0416F-8B3F-4C64-A25C-8B48AADD957D" Id="IronPythonDll" DiskId="1">
-										<File Source="..\..\AddIns\BackendBindings\PythonBinding\IronPython.dll" Id="IronPython.dll" Name="IronPython.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="IronPython.dll" AssemblyManifest="IronPython.dll">
-											<netfx:NativeImage Id="IronPythonDllNGenImage" Priority="1" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" />
-										</File>
-									</Component>
-									<Component Guid="ADBB3544-DE83-4676-A95E-3BC497ABC94D" Id="PythonBuildTasksDll" DiskId="1">
-										<File Source="..\..\AddIns\BackendBindings\PythonBinding\Python.Build.Tasks.dll" Id="Python.Build.Tasks.dll" Name="Python.Build.Tasks.dll" Assembly=".net" AssemblyApplication="Python.Build.Tasks.dll" AssemblyManifest="Python.Build.Tasks.dll" KeyPath="yes" />
-									</Component>
-									<Component Guid="CD84F3F1-F3E8-4EF2-A1BD-8092076EBBB8" Id="PythonBindingAddin" DiskId="1">
-										<File Source="..\..\AddIns\BackendBindings\PythonBinding\PythonBinding.addin" Id="PythonBinding.addin" Name="PythonBinding.addin" KeyPath="yes" />
-									</Component>
-									<Component Guid="AE71C296-051C-4C19-90B0-2C261D58CCFA" Id="PythonBindingDll" DiskId="1">
-										<File Source="..\..\AddIns\BackendBindings\PythonBinding\PythonBinding.dll" Id="PythonBinding.dll" Name="PythonBinding.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="PythonBinding.dll" AssemblyManifest="PythonBinding.dll" />
-									</Component>
-									<Component Guid="A74FF259-8D05-4FA5-9664-63F2ECB6E568" Id="SharpDevelopBuildPythonTargets" DiskId="1">
-										<File Source="..\..\AddIns\BackendBindings\PythonBinding\SharpDevelop.Build.Python.targets" Id="SharpDevelop.Build.Python.targets" Name="SharpDevelop.Build.Python.targets" KeyPath="yes" />
-									</Component>
-									<Directory Id="PythonTemplates" Name="Templates">
-										<Component Guid="2F5F1DC5-A04F-4FF2-8B68-BC803B19F80A" Id="PythonConsoleProjectTemplate" DiskId="1">
-											<File Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\ConsoleProject.xpt" Id="Templates.ConsoleProject.xpt" Name="ConsoleProject.xpt" KeyPath="yes" />
-										</Component>
-										<Component Guid="1F303642-32B5-4B95-A8A8-3EEB2ED76F21" Id="PythonEmptyFileTemplate" DiskId="1">
-											<File Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\Empty.xft" Name="Empty.xft" Id="Templates.Empty.xft" KeyPath="yes" />
-										</Component>
-										<Component Guid="99E81C31-321C-4A15-A502-7E5E27891810" Id="PythonEmptyClassTemplate" DiskId="1">
-											<File Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\EmptyClass.xft" Id="Templates.EmptyClass.xft" Name="EmptyClass.xft" KeyPath="yes" />
-										</Component>
-										<Component Guid="C7F4F370-4070-4BFD-9325-2D2FFEC27A5A" Id="PythonEmptyFormTemplate" DiskId="1">
-											<File Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\EmptyForm.xft" Id="EmptyForm.xft" Name="EmptyForm.xft" KeyPath="yes" />
-										</Component>
-										<Component Guid="FBEF6AC5-7658-46C3-9805-239B4223CAB3" Id="PythonEmptyUserControlTemplate" DiskId="1">
-											<File Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\EmptyUserControl.xft" Id="EmptyUserControl.xft" Name="EmptyUserControl.xft" KeyPath="yes" />
-										</Component>
-										<Component Guid="C077D46F-D6EF-4187-9715-3EAD8A43A1EC" Id="PythonFormsProjectTemplate" DiskId="1">
-											<File Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\FormsProject.xpt" Id="Templates.FormsProject.xpt" Name="FormsProject.xpt" KeyPath="yes" />
-										</Component>
-										<Component Guid="6AE9C385-3B6A-4DD6-9CB9-92EDEEEF3FCF" Id="PythonLibraryProjectTemplate" DiskId="1">
-											<File Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\LibraryProject.xpt" Id="Templates.LibraryProject.xpt" Name="LibraryProject.xpt" KeyPath="yes" />
-										</Component>
-										<Component Id="PythonWPFApplicationProjectTemplate" Guid="5453F13D-AF45-464D-859E-A4DD8A66557C" DiskId="1">
-											<File Id="Python.WPFApplication.xpt" Name="WPFApplication.xpt" Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\WPFApplication.xpt" KeyPath="yes" />
-										</Component>
-										<Component Id="PythonWPFWindowFileTemplate" Guid="BCCF7EE5-9A2F-42D2-B1B5-D885D6B51BDF" DiskId="1">
-											<File Id="Python.WPFWindow.xft" Name="WPFWindow.xft" Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\WPFWindow.xft" KeyPath="yes" />
-										</Component>
-										<Component Id="PythonSilverlightApplicationProjectTemplate" Guid="B0A5F30B-ABA7-4482-A928-1A02F8C83FD8" DiskId="1">
-											<File Id="Python.SilverlightApplication.xpt" Name="SilverlightApplication.xpt" Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\SilverlightApplication.xpt" KeyPath="yes" />
-										</Component>
-									</Directory>
-									<Component Guid="DE04B306-0C6D-434C-A6DC-6F450AAFB108" Id="IronPythonModulesDll" DiskId="1">
-										<File Source="..\..\AddIns\BackendBindings\PythonBinding\IronPython.Modules.dll" Name="IronPython.Modules.dll" Id="IronPython.Modules.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="IronPython.Modules.dll" AssemblyManifest="IronPython.Modules.dll">
-											<netfx:NativeImage Id="IronPythonModulesDllNGenImage" Priority="1" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" />
-										</File>
-									</Component>
-									<Component Guid="5849E9E1-39E4-45B5-B2F0-B07F8A21085D" Id="MicrosoftScriptingDll" DiskId="1">
-										<File Source="..\..\AddIns\BackendBindings\PythonBinding\Microsoft.Scripting.dll" Name="Microsoft.Scripting.dll" Id="Microsoft.Scripting.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Microsoft.Scripting.dll" AssemblyManifest="Microsoft.Scripting.dll">
-											<netfx:NativeImage Id="MicrosoftScriptingDllNGenImage" Priority="1" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" />
-										</File>
-									</Component>
-									<Directory Id="PythonLib" Name="Lib">
-										<Component Guid="98D4136A-897A-479A-AD50-E89600C5016D" Id="PythonBindingLibRunpyPy" DiskId="1">
-											<File Source="..\..\AddIns\BackendBindings\PythonBinding\Lib\runpy.py" Name="runpy.py" Id="runpy.py" KeyPath="yes" />
-										</Component>
-										<Component Guid="E091A881-9015-47A6-ADBE-EAA87A5171C3" Id="PythonBindingLibSitePy" DiskId="1">
-											<File Source="..\..\AddIns\BackendBindings\PythonBinding\Lib\site.py" Name="site.py" Id="site.py" KeyPath="yes" />
-										</Component>
-										<Component Guid="240EC6F6-6377-4840-A1C9-BDC15F653669" Id="PythonBindingLibFuturePy" DiskId="1">
-											<File Source="..\..\AddIns\BackendBindings\PythonBinding\Lib\__future__.py" Name="__future__.py" Id="__future__.py" KeyPath="yes" />
-										</Component>
-									</Directory>
-									<Component Guid="6E1D93BF-A105-4526-8BA0-13B69EEB1360" Id="MicrosoftDynamicDll" DiskId="1">
-										<File Source="..\..\AddIns\BackendBindings\PythonBinding\Microsoft.Dynamic.dll" Name="Microsoft.Dynamic.dll" Id="Microsoft.Dynamic.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Microsoft.Dynamic.dll" AssemblyManifest="Microsoft.Dynamic.dll">
-											<netfx:NativeImage Id="MicrosoftDynamicDllNGenImage" Priority="1" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" />
-										</File>
-									</Component>
-									<Directory Id="TestRunner" Name="TestRunner">
-										<Component Id="PythonBindingSdTestPy" Guid="7D87D983-8924-456E-8E66-2C6AC76C16A6" DiskId="1">
-											<File Id="sdtest.py" Name="sdtest.py" Source="..\..\AddIns\BackendBindings\PythonBinding\TestRunner\sdtest.py" KeyPath="yes" />
-										</Component>
-										<Component Id="PythonBindingSdTestRunnerPy" Guid="E15A20D3-BAA0-476F-9380-0B662D5C8D1E" DiskId="1">
-											<File Id="sdtestrunner.py" Name="sdtestrunner.py" Source="..\..\AddIns\BackendBindings\PythonBinding\TestRunner\sdtestrunner.py" KeyPath="yes" />
-										</Component>
-									</Directory>
-									<Component Id="PythonChironExe" Guid="3BF49CCE-0152-41E6-A693-07EF0F9BEBCF" DiskId="1">
-										<File Id="Python.Chiron.exe" Name="Chiron.exe" Source="..\..\AddIns\BackendBindings\PythonBinding\Chiron.exe" KeyPath="yes" Assembly=".net" AssemblyApplication="Python.Chiron.exe" AssemblyManifest="Python.Chiron.exe" />
-									</Component>
-									<Component Id="PythonChironExeConfig" Guid="1078B0F8-3984-45A8-846C-68479D717C03" DiskId="1">
-										<File Id="Python.Chiron.exe.Config" Name="Chiron.exe.Config" Source="..\..\AddIns\BackendBindings\PythonBinding\Chiron.exe.Config" KeyPath="yes" />
-									</Component>
-									<Component Id="IronPythonLicenseRtf" Guid="3F3B30E2-9CD4-4D32-95AF-82799C19ED0A" DiskId="1">
-										<File Id="IronPython.License.Rtf" Name="License.Rtf" Source="..\..\AddIns\BackendBindings\PythonBinding\License.Rtf" KeyPath="yes" />
-									</Component>
-									<Component Id="MicrosoftScriptingMetadataDll" Guid="7FD24C6E-5E64-4CCB-8C1E-2315498F81B1" DiskId="1">
-										<File Id="Microsoft.Scripting.Metadata.dll" Name="Microsoft.Scripting.Metadata.dll" Source="..\..\AddIns\BackendBindings\PythonBinding\Microsoft.Scripting.Metadata.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Microsoft.Scripting.Metadata.dll" AssemblyManifest="Microsoft.Scripting.Metadata.dll" />
-									</Component>
-									<Directory Id="PythonBindingDLLsFolder" Name="DLLs">
-										<Component Id="IronPythonWpfDll" Guid="D7A0FA37-CA4A-4678-8650-A8BF37A5FED0" DiskId="1">
-											<File Id="IronPython.Wpf.dll" Name="IronPython.Wpf.dll" Source="..\..\AddIns\BackendBindings\PythonBinding\DLLs\IronPython.Wpf.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="IronPython.Wpf.dll" AssemblyManifest="IronPython.Wpf.dll" />
-										</Component>
-									</Directory>
-								</Directory>
-								-->
+										<Directory Id="PythonBinding" Name="PythonBinding">
+											<Component Guid="AF97A77A-F986-4284-BC0A-9568B1419FC1" Id="IpyExe" DiskId="1">
+												<File Source="..\..\AddIns\BackendBindings\PythonBinding\ipy.exe" Name="ipy.exe" Id="ipy.exe" KeyPath="yes" Assembly=".net" AssemblyApplication="ipy.exe" AssemblyManifest="ipy.exe">
+													<netfx:NativeImage Id="IpyExeNGenImage" Priority="1" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" />
+												</File>
+											</Component>
+											<Component Guid="A7C0416F-8B3F-4C64-A25C-8B48AADD957D" Id="IronPythonDll" DiskId="1">
+												<File Source="..\..\AddIns\BackendBindings\PythonBinding\IronPython.dll" Id="IronPython.dll" Name="IronPython.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="IronPython.dll" AssemblyManifest="IronPython.dll">
+													<netfx:NativeImage Id="IronPythonDllNGenImage" Priority="1" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" />
+												</File>
+											</Component>
+											<Component Guid="ADBB3544-DE83-4676-A95E-3BC497ABC94D" Id="PythonBuildTasksDll" DiskId="1">
+												<File Source="..\..\AddIns\BackendBindings\PythonBinding\Python.Build.Tasks.dll" Id="Python.Build.Tasks.dll" Name="Python.Build.Tasks.dll" Assembly=".net" AssemblyApplication="Python.Build.Tasks.dll" AssemblyManifest="Python.Build.Tasks.dll" KeyPath="yes" />
+											</Component>
+											<Component Guid="CD84F3F1-F3E8-4EF2-A1BD-8092076EBBB8" Id="PythonBindingAddin" DiskId="1">
+												<File Source="..\..\AddIns\BackendBindings\PythonBinding\PythonBinding.addin" Id="PythonBinding.addin" Name="PythonBinding.addin" KeyPath="yes" />
+											</Component>
+											<Component Guid="AE71C296-051C-4C19-90B0-2C261D58CCFA" Id="PythonBindingDll" DiskId="1">
+												<File Source="..\..\AddIns\BackendBindings\PythonBinding\PythonBinding.dll" Id="PythonBinding.dll" Name="PythonBinding.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="PythonBinding.dll" AssemblyManifest="PythonBinding.dll" />
+											</Component>
+											<Component Guid="A74FF259-8D05-4FA5-9664-63F2ECB6E568" Id="SharpDevelopBuildPythonTargets" DiskId="1">
+												<File Source="..\..\AddIns\BackendBindings\PythonBinding\SharpDevelop.Build.Python.targets" Id="SharpDevelop.Build.Python.targets" Name="SharpDevelop.Build.Python.targets" KeyPath="yes" />
+											</Component>
+											<Directory Id="PythonTemplates" Name="Templates">
+												<Component Guid="2F5F1DC5-A04F-4FF2-8B68-BC803B19F80A" Id="PythonConsoleProjectTemplate" DiskId="1">
+													<File Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\ConsoleProject.xpt" Id="Templates.ConsoleProject.xpt" Name="ConsoleProject.xpt" KeyPath="yes" />
+												</Component>
+												<Component Guid="1F303642-32B5-4B95-A8A8-3EEB2ED76F21" Id="PythonEmptyFileTemplate" DiskId="1">
+													<File Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\Empty.xft" Name="Empty.xft" Id="Templates.Empty.xft" KeyPath="yes" />
+												</Component>
+												<Component Guid="99E81C31-321C-4A15-A502-7E5E27891810" Id="PythonEmptyClassTemplate" DiskId="1">
+													<File Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\EmptyClass.xft" Id="Templates.EmptyClass.xft" Name="EmptyClass.xft" KeyPath="yes" />
+												</Component>
+												<Component Guid="C7F4F370-4070-4BFD-9325-2D2FFEC27A5A" Id="PythonEmptyFormTemplate" DiskId="1">
+													<File Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\EmptyForm.xft" Id="EmptyForm.xft" Name="EmptyForm.xft" KeyPath="yes" />
+												</Component>
+												<Component Guid="FBEF6AC5-7658-46C3-9805-239B4223CAB3" Id="PythonEmptyUserControlTemplate" DiskId="1">
+													<File Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\EmptyUserControl.xft" Id="EmptyUserControl.xft" Name="EmptyUserControl.xft" KeyPath="yes" />
+												</Component>
+												<Component Guid="C077D46F-D6EF-4187-9715-3EAD8A43A1EC" Id="PythonFormsProjectTemplate" DiskId="1">
+													<File Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\FormsProject.xpt" Id="Templates.FormsProject.xpt" Name="FormsProject.xpt" KeyPath="yes" />
+												</Component>
+												<Component Guid="6AE9C385-3B6A-4DD6-9CB9-92EDEEEF3FCF" Id="PythonLibraryProjectTemplate" DiskId="1">
+													<File Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\LibraryProject.xpt" Id="Templates.LibraryProject.xpt" Name="LibraryProject.xpt" KeyPath="yes" />
+												</Component>
+												<Component Id="PythonWPFApplicationProjectTemplate" Guid="5453F13D-AF45-464D-859E-A4DD8A66557C" DiskId="1">
+													<File Id="Python.WPFApplication.xpt" Name="WPFApplication.xpt" Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\WPFApplication.xpt" KeyPath="yes" />
+												</Component>
+												<Component Id="PythonWPFWindowFileTemplate" Guid="BCCF7EE5-9A2F-42D2-B1B5-D885D6B51BDF" DiskId="1">
+													<File Id="Python.WPFWindow.xft" Name="WPFWindow.xft" Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\WPFWindow.xft" KeyPath="yes" />
+												</Component>
+												<Component Id="PythonSilverlightApplicationProjectTemplate" Guid="B0A5F30B-ABA7-4482-A928-1A02F8C83FD8" DiskId="1">
+													<File Id="Python.SilverlightApplication.xpt" Name="SilverlightApplication.xpt" Source="..\..\AddIns\BackendBindings\PythonBinding\Templates\SilverlightApplication.xpt" KeyPath="yes" />
+												</Component>
+											</Directory>
+											<Component Guid="DE04B306-0C6D-434C-A6DC-6F450AAFB108" Id="IronPythonModulesDll" DiskId="1">
+												<File Source="..\..\AddIns\BackendBindings\PythonBinding\IronPython.Modules.dll" Name="IronPython.Modules.dll" Id="IronPython.Modules.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="IronPython.Modules.dll" AssemblyManifest="IronPython.Modules.dll">
+													<netfx:NativeImage Id="IronPythonModulesDllNGenImage" Priority="1" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" />
+												</File>
+											</Component>
+											<Component Guid="5849E9E1-39E4-45B5-B2F0-B07F8A21085D" Id="MicrosoftScriptingDll" DiskId="1">
+												<File Source="..\..\AddIns\BackendBindings\PythonBinding\Microsoft.Scripting.dll" Name="Microsoft.Scripting.dll" Id="Microsoft.Scripting.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Microsoft.Scripting.dll" AssemblyManifest="Microsoft.Scripting.dll">
+													<netfx:NativeImage Id="MicrosoftScriptingDllNGenImage" Priority="1" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" />
+												</File>
+											</Component>
+											<Directory Id="PythonLib" Name="Lib">
+												<Component Guid="98D4136A-897A-479A-AD50-E89600C5016D" Id="PythonBindingLibRunpyPy" DiskId="1">
+													<File Source="..\..\AddIns\BackendBindings\PythonBinding\Lib\runpy.py" Name="runpy.py" Id="runpy.py" KeyPath="yes" />
+												</Component>
+												<Component Guid="E091A881-9015-47A6-ADBE-EAA87A5171C3" Id="PythonBindingLibSitePy" DiskId="1">
+													<File Source="..\..\AddIns\BackendBindings\PythonBinding\Lib\site.py" Name="site.py" Id="site.py" KeyPath="yes" />
+												</Component>
+												<Component Guid="240EC6F6-6377-4840-A1C9-BDC15F653669" Id="PythonBindingLibFuturePy" DiskId="1">
+													<File Source="..\..\AddIns\BackendBindings\PythonBinding\Lib\__future__.py" Name="__future__.py" Id="__future__.py" KeyPath="yes" />
+												</Component>
+											</Directory>
+											<Component Guid="6E1D93BF-A105-4526-8BA0-13B69EEB1360" Id="MicrosoftDynamicDll" DiskId="1">
+												<File Source="..\..\AddIns\BackendBindings\PythonBinding\Microsoft.Dynamic.dll" Name="Microsoft.Dynamic.dll" Id="Microsoft.Dynamic.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Microsoft.Dynamic.dll" AssemblyManifest="Microsoft.Dynamic.dll">
+													<netfx:NativeImage Id="MicrosoftDynamicDllNGenImage" Priority="1" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" />
+												</File>
+											</Component>
+											<Directory Id="TestRunner" Name="TestRunner">
+												<Component Id="PythonBindingSdTestPy" Guid="7D87D983-8924-456E-8E66-2C6AC76C16A6" DiskId="1">
+													<File Id="sdtest.py" Name="sdtest.py" Source="..\..\AddIns\BackendBindings\PythonBinding\TestRunner\sdtest.py" KeyPath="yes" />
+												</Component>
+												<Component Id="PythonBindingSdTestRunnerPy" Guid="E15A20D3-BAA0-476F-9380-0B662D5C8D1E" DiskId="1">
+													<File Id="sdtestrunner.py" Name="sdtestrunner.py" Source="..\..\AddIns\BackendBindings\PythonBinding\TestRunner\sdtestrunner.py" KeyPath="yes" />
+												</Component>
+											</Directory>
+											<Component Id="PythonChironExe" Guid="3BF49CCE-0152-41E6-A693-07EF0F9BEBCF" DiskId="1">
+												<File Id="Python.Chiron.exe" Name="Chiron.exe" Source="..\..\AddIns\BackendBindings\PythonBinding\Chiron.exe" KeyPath="yes" Assembly=".net" AssemblyApplication="Python.Chiron.exe" AssemblyManifest="Python.Chiron.exe" />
+											</Component>
+											<Component Id="PythonChironExeConfig" Guid="1078B0F8-3984-45A8-846C-68479D717C03" DiskId="1">
+												<File Id="Python.Chiron.exe.Config" Name="Chiron.exe.Config" Source="..\..\AddIns\BackendBindings\PythonBinding\Chiron.exe.Config" KeyPath="yes" />
+											</Component>
+											<Component Id="IronPythonLicenseRtf" Guid="3F3B30E2-9CD4-4D32-95AF-82799C19ED0A" DiskId="1">
+												<File Id="IronPython.License.Rtf" Name="License.Rtf" Source="..\..\AddIns\BackendBindings\PythonBinding\License.Rtf" KeyPath="yes" />
+											</Component>
+											<Component Id="MicrosoftScriptingMetadataDll" Guid="7FD24C6E-5E64-4CCB-8C1E-2315498F81B1" DiskId="1">
+												<File Id="Microsoft.Scripting.Metadata.dll" Name="Microsoft.Scripting.Metadata.dll" Source="..\..\AddIns\BackendBindings\PythonBinding\Microsoft.Scripting.Metadata.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Microsoft.Scripting.Metadata.dll" AssemblyManifest="Microsoft.Scripting.Metadata.dll" />
+											</Component>
+											<Directory Id="PythonBindingDLLsFolder" Name="DLLs">
+												<Component Id="IronPythonWpfDll" Guid="D7A0FA37-CA4A-4678-8650-A8BF37A5FED0" DiskId="1">
+													<File Id="IronPython.Wpf.dll" Name="IronPython.Wpf.dll" Source="..\..\AddIns\BackendBindings\PythonBinding\DLLs\IronPython.Wpf.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="IronPython.Wpf.dll" AssemblyManifest="IronPython.Wpf.dll" />
+												</Component>
+											</Directory>
+										</Directory>
+										-->
 								<Directory Id="FSharpBinding" Name="FSharpBinding">
 									<Component Guid="6B4F28AF-133C-4FEB-98DB-67A5405AEB12" Id="FSharpBindingAddin" DiskId="1">
 										<File Source="..\..\AddIns\BackendBindings\FSharpBinding\FSharpBinding.addin" Name="FSharpBinding.addin" Id="FSharpBinding.addin" KeyPath="yes" />
@@ -1021,91 +1027,91 @@
 									</Component>
 								</Directory>
 								<!--
-								<Directory Id="RubyBinding" Name="RubyBinding">
-									<Component Guid="7CB6802E-BC09-4796-904C-45EEAD91A5CF" Id="IrExe" DiskId="1">
-										<File Source="..\..\AddIns\BackendBindings\RubyBinding\ir.exe" Name="ir.exe" Id="ir.exe" KeyPath="yes" Assembly=".net" AssemblyApplication="ir.exe" AssemblyManifest="ir.exe" />
-									</Component>
-									<Component Guid="1CE0CC65-3534-4357-BFB7-CB9F0C4E1495" Id="IronRubyDll" DiskId="1">
-										<File Source="..\..\AddIns\BackendBindings\RubyBinding\IronRuby.dll" Name="IronRuby.dll" Id="IronRuby.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="IronRuby.dll" AssemblyManifest="IronRuby.dll" />
-									</Component>
-									<Component Guid="2B7F1625-2BAA-4A55-B186-75F7ADCF3BA8" Id="IronRubyLibrariesDll" DiskId="1">
-										<File Source="..\..\AddIns\BackendBindings\RubyBinding\IronRuby.Libraries.dll" Name="IronRuby.Libraries.dll" Id="IronRuby.Libraries.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="IronRuby.Libraries.dll" AssemblyManifest="IronRuby.Libraries.dll" />
-									</Component>
-									<Component Guid="626C0C34-EF24-443F-8A0E-6CBF0047A50A" Id="IronRubyLicenseApacheHtml" DiskId="1">
-										<File Source="..\..\AddIns\BackendBindings\RubyBinding\LICENSE.APACHE.html" Name="LICENSE.APACHE.html" Id="IronRuby.License.Apache.html" KeyPath="yes" />
-									</Component>
-									<Component Guid="09FCB2E9-FA7E-40B2-8FCF-182C7DF2F5EC" Id="RubyMicrosoftDynamicDll" DiskId="1">
-										<File Source="..\..\AddIns\BackendBindings\RubyBinding\Microsoft.Dynamic.dll" Name="Microsoft.Dynamic.dll" Id="RubyBinding.Microsoft.Dynamic.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="RubyBinding.Microsoft.Dynamic.dll" AssemblyManifest="RubyBinding.Microsoft.Dynamic.dll" />
-									</Component>
-									<Component Guid="3E1BAAE7-D366-43B4-88CE-8D2ED5731CC6" Id="RubyMicrosoftScriptingDll" DiskId="1">
-										<File Source="..\..\AddIns\BackendBindings\RubyBinding\Microsoft.Scripting.dll" Name="Microsoft.Scripting.dll" Id="RubyBinding.Microsoft.Scripting.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="RubyBinding.Microsoft.Scripting.dll" AssemblyManifest="RubyBinding.Microsoft.Scripting.dll" />
-									</Component>
-									<Component Guid="6877EFD9-7005-4BDD-80E6-FB4790436E23" Id="RubyBindingAddin" DiskId="1">
-										<File Source="..\..\AddIns\BackendBindings\RubyBinding\RubyBinding.addin" Name="RubyBinding.addin" Id="RubyBinding.addin" KeyPath="yes" />
-									</Component>
-									<Component Guid="C1185288-280B-4006-8592-6F4FAD69498D" Id="RubyBindingDll" DiskId="1">
-										<File Source="..\..\AddIns\BackendBindings\RubyBinding\RubyBinding.dll" Name="RubyBinding.dll" Id="RubyBinding.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="RubyBinding.dll" AssemblyManifest="RubyBinding.dll" />
-									</Component>
-									<Component Id="RubyMicrosoftScriptingMetadataDll" Guid="43F7B715-2726-4E35-B9AC-28D5B4C33180" DiskId="1">
-										<File Id="RubyBinding.Microsoft.Scripting.Metadata.dll" Name="Microsoft.Scripting.Metadata.dll" Source="..\..\AddIns\BackendBindings\RubyBinding\Microsoft.Scripting.Metadata.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="RubyBinding.Microsoft.Scripting.Metadata.dll" AssemblyManifest="RubyBinding.Microsoft.Scripting.Metadata.dll" />
-									</Component>
-									<Directory Id="RubyTemplates" Name="Templates">
-										<Component Guid="6BF44E09-3910-444C-9A49-C6C811B41CFE" Id="RubyConsoleProjectTemplate" DiskId="1">
-											<File Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\ConsoleProject.xpt" Name="ConsoleProject.xpt" Id="RubyConsoleProject.xpt" KeyPath="yes" />
-										</Component>
-										<Component Guid="215E4AF7-C1D3-473F-90A2-A621B42BB2CD" Id="RubyEmptyFileTemplate" DiskId="1">
-											<File Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\Empty.xft" Name="Empty.xft" Id="RubyEmptyFile.xft" KeyPath="yes" />
-										</Component>
-										<Component Guid="B0D712C8-DCC0-48C6-B0DC-F8D6B7AF6351" Id="RubyEmptyClassFileTemplate" DiskId="1">
-											<File Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\EmptyClass.xft" Name="EmptyClass.xft" Id="Templates.EmptyClass2.xft" KeyPath="yes" />
-										</Component>
-										<Component Guid="B11F038D-F71E-409C-AEB9-ED54EBA299F9" Id="RubyEmptyFormFileTemplate" DiskId="1">
-											<File Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\EmptyForm.xft" Name="EmptyForm.xft" Id="Templates.EmptyForm.xft" KeyPath="yes" />
-										</Component>
-										<Component Guid="3F5329F7-72DE-4E44-B36C-F2EF8EED4183" Id="RubyEmptyUserControlFileTemplate" DiskId="1">
-											<File Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\EmptyUserControl.xft" Name="EmptyUserControl.xft" Id="Templates.EmptyUserControl.xft" KeyPath="yes" />
-										</Component>
-										<Component Guid="6096D8DC-E9AE-41D2-82E3-6284E4878545" Id="RubyFormsProjectTemplate" DiskId="1">
-											<File Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\FormsProject.xpt" Name="FormsProject.xpt" Id="Templates.FormsProject1.xpt" KeyPath="yes" />
-										</Component>
-										<Component Guid="BDB0208E-B04F-42F5-B3FB-97F77D6C4C7B" Id="RubyLibraryProjectTemplate" DiskId="1">
-											<File Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\LibraryProject.xpt" Name="LibraryProject.xpt" Id="LibraryProject.xpt" KeyPath="yes" />
-										</Component>
-										<Component Id="RubyWPFApplicationProjectTemplate" Guid="758A30A3-10EF-44A8-BD05-F55043D8CCC5" DiskId="1">
-											<File Id="Ruby.WPFApplication.xpt" Name="WPFApplication.xpt" Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\WPFApplication.xpt" KeyPath="yes" />
-										</Component>
-										<Component Id="RubyWPFWindowFileTemplate" Guid="F2CD996D-B165-4F30-B70F-33DC1841610D" DiskId="1">
-											<File Id="Ruby.WPFWindow.xft" Name="WPFWindow.xft" Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\WPFWindow.xft" KeyPath="yes" />
-										</Component>
-										<Component Id="RubySilverlightApplicationProjectTemplate" Guid="8FB9E6F2-4096-4593-9B57-D18D29B1AE1E" DiskId="1">
-											<File Id="Ruby.SilverlightApplication.xpt" Name="SilverlightApplication.xpt" Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\SilverlightApplication.xpt" KeyPath="yes" />
-										</Component>
-									</Directory>
-									<Directory Id="RubyBindingTestRunner" Name="TestRunner">
-										<Component Id="RubyBindingSdSelectedTestsFileRb" Guid="8F37FDB9-ED10-4A13-857A-FD0BD7231D13" DiskId="1">
-											<File Id="RubyBinding.sdselectedtestsfile.rb" Name="sdselectedtestsfile.rb" Source="..\..\AddIns\BackendBindings\RubyBinding\TestRunner\sdselectedtestsfile.rb" KeyPath="yes" />
-										</Component>
-										<Component Id="RubyBindingSdTestRb" Guid="2666C77A-AB65-4142-AE13-4216FA2E4AAC" DiskId="1">
-											<File Id="RubyBinding.sdtest.rb" Name="sdtest.rb" Source="..\..\AddIns\BackendBindings\RubyBinding\TestRunner\sdtest.rb" KeyPath="yes" />
-										</Component>
-										<Component Id="RubyBindingSdTestResultRb" Guid="618BB1E1-FCC2-452E-A244-21AD73ED480F" DiskId="1">
-											<File Id="RubyBinding.sdtestresult.rb" Name="sdtestresult.rb" Source="..\..\AddIns\BackendBindings\RubyBinding\TestRunner\sdtestresult.rb" KeyPath="yes" />
-										</Component>
-										<Component Id="RubyBindingSdTestResultWriterRb" Guid="0E12860F-23C3-4A15-85D5-7FFAC0D243FC" DiskId="1">
-											<File Id="RubyBinding.sdtestresultwriter.rb" Name="sdtestresultwriter.rb" Source="..\..\AddIns\BackendBindings\RubyBinding\TestRunner\sdtestresultwriter.rb" KeyPath="yes" />
-										</Component>
-										<Component Id="RubyBindingSdTestRunnerRb" Guid="4F6D3229-6A2F-4505-B0C5-9286853C19AA" DiskId="1">
-											<File Id="RubyBinding.sdtestrunner.rb" Name="sdtestrunner.rb" Source="..\..\AddIns\BackendBindings\RubyBinding\TestRunner\sdtestrunner.rb" KeyPath="yes" />
-										</Component>
-									</Directory>
-									<Component Id="RubyChironExe" Guid="2ACC66D7-B47B-4F14-A0D6-7C3737E781C8" DiskId="1">
-										<File Id="Ruby.Chiron.exe" Name="Chiron.exe" Source="..\..\AddIns\BackendBindings\RubyBinding\Chiron.exe" KeyPath="yes" Assembly=".net" AssemblyApplication="Ruby.Chiron.exe" AssemblyManifest="Ruby.Chiron.exe" />
-									</Component>
-									<Component Id="RubyChironExeConfig" Guid="6D992ECC-18C1-492B-BCF7-E61913E1C947" DiskId="1">
-										<File Id="Ruby.Chiron.exe.config" Name="Chiron.exe.config" Source="..\..\AddIns\BackendBindings\RubyBinding\Chiron.exe.config" KeyPath="yes" />
-									</Component>
-								</Directory>
-								-->
+										<Directory Id="RubyBinding" Name="RubyBinding">
+											<Component Guid="7CB6802E-BC09-4796-904C-45EEAD91A5CF" Id="IrExe" DiskId="1">
+												<File Source="..\..\AddIns\BackendBindings\RubyBinding\ir.exe" Name="ir.exe" Id="ir.exe" KeyPath="yes" Assembly=".net" AssemblyApplication="ir.exe" AssemblyManifest="ir.exe" />
+											</Component>
+											<Component Guid="1CE0CC65-3534-4357-BFB7-CB9F0C4E1495" Id="IronRubyDll" DiskId="1">
+												<File Source="..\..\AddIns\BackendBindings\RubyBinding\IronRuby.dll" Name="IronRuby.dll" Id="IronRuby.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="IronRuby.dll" AssemblyManifest="IronRuby.dll" />
+											</Component>
+											<Component Guid="2B7F1625-2BAA-4A55-B186-75F7ADCF3BA8" Id="IronRubyLibrariesDll" DiskId="1">
+												<File Source="..\..\AddIns\BackendBindings\RubyBinding\IronRuby.Libraries.dll" Name="IronRuby.Libraries.dll" Id="IronRuby.Libraries.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="IronRuby.Libraries.dll" AssemblyManifest="IronRuby.Libraries.dll" />
+											</Component>
+											<Component Guid="626C0C34-EF24-443F-8A0E-6CBF0047A50A" Id="IronRubyLicenseApacheHtml" DiskId="1">
+												<File Source="..\..\AddIns\BackendBindings\RubyBinding\LICENSE.APACHE.html" Name="LICENSE.APACHE.html" Id="IronRuby.License.Apache.html" KeyPath="yes" />
+											</Component>
+											<Component Guid="09FCB2E9-FA7E-40B2-8FCF-182C7DF2F5EC" Id="RubyMicrosoftDynamicDll" DiskId="1">
+												<File Source="..\..\AddIns\BackendBindings\RubyBinding\Microsoft.Dynamic.dll" Name="Microsoft.Dynamic.dll" Id="RubyBinding.Microsoft.Dynamic.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="RubyBinding.Microsoft.Dynamic.dll" AssemblyManifest="RubyBinding.Microsoft.Dynamic.dll" />
+											</Component>
+											<Component Guid="3E1BAAE7-D366-43B4-88CE-8D2ED5731CC6" Id="RubyMicrosoftScriptingDll" DiskId="1">
+												<File Source="..\..\AddIns\BackendBindings\RubyBinding\Microsoft.Scripting.dll" Name="Microsoft.Scripting.dll" Id="RubyBinding.Microsoft.Scripting.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="RubyBinding.Microsoft.Scripting.dll" AssemblyManifest="RubyBinding.Microsoft.Scripting.dll" />
+											</Component>
+											<Component Guid="6877EFD9-7005-4BDD-80E6-FB4790436E23" Id="RubyBindingAddin" DiskId="1">
+												<File Source="..\..\AddIns\BackendBindings\RubyBinding\RubyBinding.addin" Name="RubyBinding.addin" Id="RubyBinding.addin" KeyPath="yes" />
+											</Component>
+											<Component Guid="C1185288-280B-4006-8592-6F4FAD69498D" Id="RubyBindingDll" DiskId="1">
+												<File Source="..\..\AddIns\BackendBindings\RubyBinding\RubyBinding.dll" Name="RubyBinding.dll" Id="RubyBinding.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="RubyBinding.dll" AssemblyManifest="RubyBinding.dll" />
+											</Component>
+											<Component Id="RubyMicrosoftScriptingMetadataDll" Guid="43F7B715-2726-4E35-B9AC-28D5B4C33180" DiskId="1">
+												<File Id="RubyBinding.Microsoft.Scripting.Metadata.dll" Name="Microsoft.Scripting.Metadata.dll" Source="..\..\AddIns\BackendBindings\RubyBinding\Microsoft.Scripting.Metadata.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="RubyBinding.Microsoft.Scripting.Metadata.dll" AssemblyManifest="RubyBinding.Microsoft.Scripting.Metadata.dll" />
+											</Component>
+											<Directory Id="RubyTemplates" Name="Templates">
+												<Component Guid="6BF44E09-3910-444C-9A49-C6C811B41CFE" Id="RubyConsoleProjectTemplate" DiskId="1">
+													<File Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\ConsoleProject.xpt" Name="ConsoleProject.xpt" Id="RubyConsoleProject.xpt" KeyPath="yes" />
+												</Component>
+												<Component Guid="215E4AF7-C1D3-473F-90A2-A621B42BB2CD" Id="RubyEmptyFileTemplate" DiskId="1">
+													<File Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\Empty.xft" Name="Empty.xft" Id="RubyEmptyFile.xft" KeyPath="yes" />
+												</Component>
+												<Component Guid="B0D712C8-DCC0-48C6-B0DC-F8D6B7AF6351" Id="RubyEmptyClassFileTemplate" DiskId="1">
+													<File Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\EmptyClass.xft" Name="EmptyClass.xft" Id="Templates.EmptyClass2.xft" KeyPath="yes" />
+												</Component>
+												<Component Guid="B11F038D-F71E-409C-AEB9-ED54EBA299F9" Id="RubyEmptyFormFileTemplate" DiskId="1">
+													<File Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\EmptyForm.xft" Name="EmptyForm.xft" Id="Templates.EmptyForm.xft" KeyPath="yes" />
+												</Component>
+												<Component Guid="3F5329F7-72DE-4E44-B36C-F2EF8EED4183" Id="RubyEmptyUserControlFileTemplate" DiskId="1">
+													<File Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\EmptyUserControl.xft" Name="EmptyUserControl.xft" Id="Templates.EmptyUserControl.xft" KeyPath="yes" />
+												</Component>
+												<Component Guid="6096D8DC-E9AE-41D2-82E3-6284E4878545" Id="RubyFormsProjectTemplate" DiskId="1">
+													<File Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\FormsProject.xpt" Name="FormsProject.xpt" Id="Templates.FormsProject1.xpt" KeyPath="yes" />
+												</Component>
+												<Component Guid="BDB0208E-B04F-42F5-B3FB-97F77D6C4C7B" Id="RubyLibraryProjectTemplate" DiskId="1">
+													<File Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\LibraryProject.xpt" Name="LibraryProject.xpt" Id="LibraryProject.xpt" KeyPath="yes" />
+												</Component>
+												<Component Id="RubyWPFApplicationProjectTemplate" Guid="758A30A3-10EF-44A8-BD05-F55043D8CCC5" DiskId="1">
+													<File Id="Ruby.WPFApplication.xpt" Name="WPFApplication.xpt" Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\WPFApplication.xpt" KeyPath="yes" />
+												</Component>
+												<Component Id="RubyWPFWindowFileTemplate" Guid="F2CD996D-B165-4F30-B70F-33DC1841610D" DiskId="1">
+													<File Id="Ruby.WPFWindow.xft" Name="WPFWindow.xft" Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\WPFWindow.xft" KeyPath="yes" />
+												</Component>
+												<Component Id="RubySilverlightApplicationProjectTemplate" Guid="8FB9E6F2-4096-4593-9B57-D18D29B1AE1E" DiskId="1">
+													<File Id="Ruby.SilverlightApplication.xpt" Name="SilverlightApplication.xpt" Source="..\..\AddIns\BackendBindings\RubyBinding\Templates\SilverlightApplication.xpt" KeyPath="yes" />
+												</Component>
+											</Directory>
+											<Directory Id="RubyBindingTestRunner" Name="TestRunner">
+												<Component Id="RubyBindingSdSelectedTestsFileRb" Guid="8F37FDB9-ED10-4A13-857A-FD0BD7231D13" DiskId="1">
+													<File Id="RubyBinding.sdselectedtestsfile.rb" Name="sdselectedtestsfile.rb" Source="..\..\AddIns\BackendBindings\RubyBinding\TestRunner\sdselectedtestsfile.rb" KeyPath="yes" />
+												</Component>
+												<Component Id="RubyBindingSdTestRb" Guid="2666C77A-AB65-4142-AE13-4216FA2E4AAC" DiskId="1">
+													<File Id="RubyBinding.sdtest.rb" Name="sdtest.rb" Source="..\..\AddIns\BackendBindings\RubyBinding\TestRunner\sdtest.rb" KeyPath="yes" />
+												</Component>
+												<Component Id="RubyBindingSdTestResultRb" Guid="618BB1E1-FCC2-452E-A244-21AD73ED480F" DiskId="1">
+													<File Id="RubyBinding.sdtestresult.rb" Name="sdtestresult.rb" Source="..\..\AddIns\BackendBindings\RubyBinding\TestRunner\sdtestresult.rb" KeyPath="yes" />
+												</Component>
+												<Component Id="RubyBindingSdTestResultWriterRb" Guid="0E12860F-23C3-4A15-85D5-7FFAC0D243FC" DiskId="1">
+													<File Id="RubyBinding.sdtestresultwriter.rb" Name="sdtestresultwriter.rb" Source="..\..\AddIns\BackendBindings\RubyBinding\TestRunner\sdtestresultwriter.rb" KeyPath="yes" />
+												</Component>
+												<Component Id="RubyBindingSdTestRunnerRb" Guid="4F6D3229-6A2F-4505-B0C5-9286853C19AA" DiskId="1">
+													<File Id="RubyBinding.sdtestrunner.rb" Name="sdtestrunner.rb" Source="..\..\AddIns\BackendBindings\RubyBinding\TestRunner\sdtestrunner.rb" KeyPath="yes" />
+												</Component>
+											</Directory>
+											<Component Id="RubyChironExe" Guid="2ACC66D7-B47B-4F14-A0D6-7C3737E781C8" DiskId="1">
+												<File Id="Ruby.Chiron.exe" Name="Chiron.exe" Source="..\..\AddIns\BackendBindings\RubyBinding\Chiron.exe" KeyPath="yes" Assembly=".net" AssemblyApplication="Ruby.Chiron.exe" AssemblyManifest="Ruby.Chiron.exe" />
+											</Component>
+											<Component Id="RubyChironExeConfig" Guid="6D992ECC-18C1-492B-BCF7-E61913E1C947" DiskId="1">
+												<File Id="Ruby.Chiron.exe.config" Name="Chiron.exe.config" Source="..\..\AddIns\BackendBindings\RubyBinding\Chiron.exe.config" KeyPath="yes" />
+											</Component>
+										</Directory>
+										-->
 								<Directory Id="XamlBinding" Name="XamlBinding">
 									<Component Guid="34D119F8-F7C8-40DD-B354-FA50A3349033" Id="ICSharpCodeXamlBindingDll" DiskId="1">
 										<File Source="..\..\AddIns\BackendBindings\XamlBinding\ICSharpCode.XamlBinding.dll" Name="ICSharpCode.XamlBinding.dll" Id="ICSharpCode.XamlBinding.dll" KeyPath="yes" />
@@ -1244,18 +1250,18 @@
 									</Directory>
 								</Directory>
 								<!--
-								<Directory Id="JavaScriptBinding" Name="JavaScriptBinding">
-									<Component Id="Antlr3RuntimeDll" Guid="CD73166D-0ACB-4A3D-8023-06DAC6CB903A" DiskId="1">
-										<File Id="Antlr3.Runtime.dll" Name="Antlr3.Runtime.dll" Source="..\..\AddIns\BackendBindings\JavaScriptBinding\Antlr3.Runtime.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Antlr3.Runtime.dll" AssemblyManifest="Antlr3.Runtime.dll" />
-									</Component>
-									<Component Id="JavaScriptBindingAddin" Guid="36874185-9C8E-4E3D-BC22-FAF59EA52B1A" DiskId="1">
-										<File Id="JavaScriptBinding.addin" Name="JavaScriptBinding.addin" Source="..\..\AddIns\BackendBindings\JavaScriptBinding\JavaScriptBinding.addin" KeyPath="yes" />
-									</Component>
-									<Component Id="JavaScriptBindingDll" Guid="A1EC7B85-0DFB-4CCD-8A60-49A481F0FAEC" DiskId="1">
-										<File Id="JavaScriptBinding.dll" Name="JavaScriptBinding.dll" Source="..\..\AddIns\BackendBindings\JavaScriptBinding\JavaScriptBinding.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="JavaScriptBinding.dll" AssemblyManifest="JavaScriptBinding.dll" />
-									</Component>
-								</Directory>
-								-->
+										<Directory Id="JavaScriptBinding" Name="JavaScriptBinding">
+											<Component Id="Antlr3RuntimeDll" Guid="CD73166D-0ACB-4A3D-8023-06DAC6CB903A" DiskId="1">
+												<File Id="Antlr3.Runtime.dll" Name="Antlr3.Runtime.dll" Source="..\..\AddIns\BackendBindings\JavaScriptBinding\Antlr3.Runtime.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Antlr3.Runtime.dll" AssemblyManifest="Antlr3.Runtime.dll" />
+											</Component>
+											<Component Id="JavaScriptBindingAddin" Guid="36874185-9C8E-4E3D-BC22-FAF59EA52B1A" DiskId="1">
+												<File Id="JavaScriptBinding.addin" Name="JavaScriptBinding.addin" Source="..\..\AddIns\BackendBindings\JavaScriptBinding\JavaScriptBinding.addin" KeyPath="yes" />
+											</Component>
+											<Component Id="JavaScriptBindingDll" Guid="A1EC7B85-0DFB-4CCD-8A60-49A481F0FAEC" DiskId="1">
+												<File Id="JavaScriptBinding.dll" Name="JavaScriptBinding.dll" Source="..\..\AddIns\BackendBindings\JavaScriptBinding\JavaScriptBinding.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="JavaScriptBinding.dll" AssemblyManifest="JavaScriptBinding.dll" />
+											</Component>
+										</Directory>
+										-->
 							</Directory>
 							<Directory Id="DisplayBindingsFolder" Name="DisplayBindings">
 								<Directory Id="FormsDesignerFolder" Name="FormsDesigner">
@@ -1283,24 +1289,24 @@
 									</Component>
 								</Directory>
 								<!--
-								<Directory Id="ClassDiagram" Name="ClassDiagram">
-									<Directory Id="Resources" Name="Resources">
-										<Component Guid="75152D8C-5D9A-4728-AB18-62637C785A7D" Id="ClassDiagramResources" DiskId="1">
-											<File Source="..\..\AddIns\DisplayBindings\ClassDiagram\Resources\Bitmaps.resources" Id="Bitmaps.resources" Name="Bitmaps.resources" />
-										</Component>
-									</Directory>
-									<Component Guid="A8619065-03F6-4AF0-A1F2-81D5C810D8A3" Id="ClassDiagramAddInFiles" DiskId="1">
-										<File Source="..\..\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin.addin" Id="ClassDiagram.ClassDiagramAddin.addin" Name="ClassDiagramAddin.addin" />
-										<File Source="..\..\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin.dll" Id="ClassDiagram.ClassDiagramAddin.dll" Name="ClassDiagramAddin.dll" Assembly=".net" AssemblyApplication="ClassDiagram.ClassDiagramAddin.dll" AssemblyManifest="ClassDiagram.ClassDiagramAddin.dll" KeyPath="yes" />
-									</Component>
-									<Component Guid="5F09F966-5605-4381-B346-8231DA0B1C6B" Id="ClassCanvasDll" DiskId="1">
-										<File Source="..\..\AddIns\DisplayBindings\ClassDiagram\ClassCanvas.dll" Id="ClassDiagram.ClassCanvas.dll" Name="ClassCanvas.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="ClassDiagram.ClassCanvas.dll" AssemblyManifest="ClassDiagram.ClassCanvas.dll" />
-									</Component>
-									<Component Guid="EF2B150B-B0C4-4884-800C-BE904E520CF4" Id="DiagramsDll" DiskId="1">
-										<File Source="..\..\AddIns\DisplayBindings\ClassDiagram\Diagrams.dll" Id="ClassDiagram.Diagrams.dll" Name="Diagrams.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="ClassDiagram.Diagrams.dll" AssemblyManifest="ClassDiagram.Diagrams.dll" />
-									</Component>
-								</Directory>
-								-->
+										<Directory Id="ClassDiagram" Name="ClassDiagram">
+											<Directory Id="Resources" Name="Resources">
+												<Component Guid="75152D8C-5D9A-4728-AB18-62637C785A7D" Id="ClassDiagramResources" DiskId="1">
+													<File Source="..\..\AddIns\DisplayBindings\ClassDiagram\Resources\Bitmaps.resources" Id="Bitmaps.resources" Name="Bitmaps.resources" />
+												</Component>
+											</Directory>
+											<Component Guid="A8619065-03F6-4AF0-A1F2-81D5C810D8A3" Id="ClassDiagramAddInFiles" DiskId="1">
+												<File Source="..\..\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin.addin" Id="ClassDiagram.ClassDiagramAddin.addin" Name="ClassDiagramAddin.addin" />
+												<File Source="..\..\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin.dll" Id="ClassDiagram.ClassDiagramAddin.dll" Name="ClassDiagramAddin.dll" Assembly=".net" AssemblyApplication="ClassDiagram.ClassDiagramAddin.dll" AssemblyManifest="ClassDiagram.ClassDiagramAddin.dll" KeyPath="yes" />
+											</Component>
+											<Component Guid="5F09F966-5605-4381-B346-8231DA0B1C6B" Id="ClassCanvasDll" DiskId="1">
+												<File Source="..\..\AddIns\DisplayBindings\ClassDiagram\ClassCanvas.dll" Id="ClassDiagram.ClassCanvas.dll" Name="ClassCanvas.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="ClassDiagram.ClassCanvas.dll" AssemblyManifest="ClassDiagram.ClassCanvas.dll" />
+											</Component>
+											<Component Guid="EF2B150B-B0C4-4884-800C-BE904E520CF4" Id="DiagramsDll" DiskId="1">
+												<File Source="..\..\AddIns\DisplayBindings\ClassDiagram\Diagrams.dll" Id="ClassDiagram.Diagrams.dll" Name="Diagrams.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="ClassDiagram.Diagrams.dll" AssemblyManifest="ClassDiagram.Diagrams.dll" />
+											</Component>
+										</Directory>
+										-->
 								<Directory Id="AvalonEdit" Name="AvalonEdit">
 									<Component Guid="A3376E4E-F07D-4554-ABF5-E91F2DA918E3" Id="AvalonEditAddInAddin" DiskId="1">
 										<File Source="..\..\AddIns\DisplayBindings\AvalonEdit\AvalonEdit.AddIn.addin" Name="AvalonEdit.AddIn.addin" Id="AvalonEdit.AddIn.addin" KeyPath="yes" />
@@ -1417,12 +1423,12 @@
 									</Component>
 								</Directory>
 								<!--
-								<Directory Id="ResourceToolkitFolder" Name="ResourceToolkit">
-									<Component Guid="E36C699F-353D-41CC-975B-E18BEB885BA0" Id="ResourceToolkitFiles" DiskId="1">
-										<File Source="..\..\AddIns\Misc\ResourceToolkit\Hornung.ResourceToolkit.addin" Id="Hornung.ResourceToolkit.addin" Name="Hornung.ResourceToolkit.addin" />
-										<File Source="..\..\AddIns\Misc\ResourceToolkit\Hornung.ResourceToolkit.dll" Id="Hornung.ResourceToolkit.dll" Name="Hornung.ResourceToolkit.dll" Assembly=".net" AssemblyApplication="Hornung.ResourceToolkit.dll" AssemblyManifest="Hornung.ResourceToolkit.dll" KeyPath="yes" />
-									</Component>
-								</Directory>-->
+										<Directory Id="ResourceToolkitFolder" Name="ResourceToolkit">
+											<Component Guid="E36C699F-353D-41CC-975B-E18BEB885BA0" Id="ResourceToolkitFiles" DiskId="1">
+												<File Source="..\..\AddIns\Misc\ResourceToolkit\Hornung.ResourceToolkit.addin" Id="Hornung.ResourceToolkit.addin" Name="Hornung.ResourceToolkit.addin" />
+												<File Source="..\..\AddIns\Misc\ResourceToolkit\Hornung.ResourceToolkit.dll" Id="Hornung.ResourceToolkit.dll" Name="Hornung.ResourceToolkit.dll" Assembly=".net" AssemblyApplication="Hornung.ResourceToolkit.dll" AssemblyManifest="Hornung.ResourceToolkit.dll" KeyPath="yes" />
+											</Component>
+										</Directory>-->
 								<Directory Id="StartPageAddInFolder" Name="StartPage">
 									<Component Guid="220967E5-D5AA-4207-9757-79599222D5CF" Id="StartPageAddInFiles" DiskId="1">
 										<File Source="..\..\AddIns\Misc\StartPage\StartPage.dll" Id="StartPage.dll" Name="StartPage.dll" Assembly=".net" AssemblyApplication="StartPage.dll" AssemblyManifest="StartPage.dll" KeyPath="yes" />
@@ -1528,8 +1534,8 @@
 										<File Id="NuGet.Console.Types.dll" Name="NuGet.Console.Types.dll" Source="..\..\AddIns\Misc\PackageManagement\NuGet.Console.Types.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="NuGet.Console.Types.dll" AssemblyManifest="NuGet.Console.Types.dll" />
 									</Component>
 									<!--<Component Id="PackageManagementICSharpCodeSharpDevelopDomDll" Guid="70460742-D237-4742-B563-7127376C56CB" DiskId="1">
-										<File Id="PackageManagement.ICSharpCode.SharpDevelop.Dom.dll" Name="ICSharpCode.SharpDevelop.Dom.dll" Source="..\..\AddIns\Misc\PackageManagement\ICSharpCode.SharpDevelop.Dom.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="PackageManagement.ICSharpCode.SharpDevelop.Dom.dll" AssemblyManifest="PackageManagement.ICSharpCode.SharpDevelop.Dom.dll" />
-									</Component>-->
+												<File Id="PackageManagement.ICSharpCode.SharpDevelop.Dom.dll" Name="ICSharpCode.SharpDevelop.Dom.dll" Source="..\..\AddIns\Misc\PackageManagement\ICSharpCode.SharpDevelop.Dom.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="PackageManagement.ICSharpCode.SharpDevelop.Dom.dll" AssemblyManifest="PackageManagement.ICSharpCode.SharpDevelop.Dom.dll" />
+											</Component>-->
 									<Component Id="MicrosoftWebXmlTransformDll" Guid="0A82C51B-E2D1-4817-8704-2CB390B4E833" DiskId="1">
 										<File Id="Microsoft.Web.XmlTransform.dll" Name="Microsoft.Web.XmlTransform.dll" Source="..\..\AddIns\Misc\PackageManagement\Microsoft.Web.XmlTransform.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Microsoft.Web.XmlTransform.dll" AssemblyManifest="Microsoft.Web.XmlTransform.dll" />
 									</Component>
@@ -1589,50 +1595,50 @@
 						</Directory>
 						<Component Guid="542E5AE1-286C-4CE6-8800-F3AFBB24531D" Id="SharpDevelopWebsiteShortcut" DiskId="1">
 							<!--
-								The choice here is to either useW the IniFile element to
- 								generate the two website shortcuts or create a 
-								SharpDevelop.url file on disk and use a File element and
-								link to the file instead. We will use a file otherwise an
-								upgrade will not remove the existing website shortcut.
-							-->
+										The choice here is to either useW the IniFile element to
+		 								generate the two website shortcuts or create a 
+										SharpDevelop.url file on disk and use a File element and
+										link to the file instead. We will use a file otherwise an
+										upgrade will not remove the existing website shortcut.
+									-->
 							<File Id="SharpDevelop.url" KeyPath="yes" Name="SharpDevelop.url" Source="Files\SharpDevelop.url" />
 							<!--
-								ICE18 - Force the empty folder to be created. Even though it
-								has sub folders the validator flags this as an error.
-	
-								http://msdn.microsoft.com/library/en-us/msi/setup/ice18.asp
-							-->
+										ICE18 - Force the empty folder to be created. Even though it
+										has sub folders the validator flags this as an error.
+			
+										http://msdn.microsoft.com/library/en-us/msi/setup/ice18.asp
+									-->
 							<CreateFolder />
 						</Component>
 						<Component Id="SharpDevelopAppPathRegistrySetting" Guid="E812C3C9-1753-4535-80B9-BD8BCE7DB1A5">
 							<!--
-								App Path registry setting lives in HKLM so only add it if the
-								user has admin rights. 
-							-->
+										App Path registry setting lives in HKLM so only add it if the
+										user has admin rights. 
+									-->
 							<Condition>Privileged</Condition>
 							<RegistryValue Id="SharpDevelopAppPathRegistryKey" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\SharpDevelop.exe" Root="HKLM" Value="[!SharpDevelop.exe]" Type="string" Action="write" />
 						</Component>
 						<!--
-							Dummy components that are empty. These are used so
-							the feature tree does not show the Network installation
-							as an option.
-						-->
+									Dummy components that are empty. These are used so
+									the feature tree does not show the Network installation
+									as an option.
+								-->
 						<Component Id="DummyCompleteFeatureComponent" Guid="22AB4C49-89FD-413F-8A1D-456AFB1AD611">
 							<!--
-								Fix ICE18 error. The validator thinks that the install folder
- 								could be empty so we have to use CreateFolder in this component.
-
-								http://msdn.microsoft.com/library/en-us/msi/setup/ice18.asp
-							-->
+										Fix ICE18 error. The validator thinks that the install folder
+		 								could be empty so we have to use CreateFolder in this component.
+		
+										http://msdn.microsoft.com/library/en-us/msi/setup/ice18.asp
+									-->
 							<CreateFolder />
 						</Component>
 						<Component Id="DummyFileAssocationFeatureComponent" Guid="F0390EC4-6B66-4823-B4F4-7F29E3D6AB54">
 							<!--
-								Fix ICE18 error. The validator thinks that the install folder
- 								could be empty so we have to use CreateFolder in this component.
-
-								http://msdn.microsoft.com/library/en-us/msi/setup/ice18.asp
-							-->
+										Fix ICE18 error. The validator thinks that the install folder
+		 								could be empty so we have to use CreateFolder in this component.
+		
+										http://msdn.microsoft.com/library/en-us/msi/setup/ice18.asp
+									-->
 							<CreateFolder />
 						</Component>
 					</Directory>
@@ -1642,9 +1648,9 @@
 			<Directory Id="ProgramMenuFolder" Name="Programs">
 				<Component Id="SharpDevelopProgramMenuItems" Guid="0DFD59B1-7D98-48B2-9369-E6EA8B71B4B6">
 					<!--
-						Fix ICE 38 by adding a dummy registry key that is the key for this shortcut.
-						http://msdn.microsoft.com/library/en-us/msi/setup/ice38.asp
-					-->
+								Fix ICE 38 by adding a dummy registry key that is the key for this shortcut.
+								http://msdn.microsoft.com/library/en-us/msi/setup/ice38.asp
+							-->
 					<RegistryValue Id="SharpDevelopExeStartMenuShortcutRegistryKey" Root="HKCU" Type="string" KeyPath="yes" Key="Software\SharpDevelop\$(var.PRODUCTMAJORVERSION)" Name="ProgramFilesShortcut" Value="1" />
 					<Shortcut Name="SharpDevelop $(var.PRODUCTDISPLAYVERSION)" Target="[!SharpDevelop.exe]" Id="SharpDevelopExeStartMenuShortcut" WorkingDirectory="BinFolder" Icon="SharpDevelopIcon.exe" Directory="ProgramMenuFolder" />
 				</Component>
@@ -1653,9 +1659,9 @@
 			<Directory Id="DesktopFolder" Name="Desktop">
 				<Component Id="DesktopFolderItems" Guid="FB3DF01F-7F7F-47C3-AF61-C998DDFAE55D">
 					<!--
-						Fix ICE 38 by adding a dummy registry key that is the key for this shortcut.
-						http://msdn.microsoft.com/library/en-us/msi/setup/ice38.asp
-					-->
+								Fix ICE 38 by adding a dummy registry key that is the key for this shortcut.
+								http://msdn.microsoft.com/library/en-us/msi/setup/ice38.asp
+							-->
 					<RegistryValue Id="SharpDevelopExeDesktopShortcutRegistryKey" Type="string" Root="HKCU" KeyPath="yes" Key="Software\SharpDevelop\$(var.PRODUCTMAJORVERSION)" Name="DesktopShortcut" Value="1" />
 					<Shortcut Id="SharpDevelopExeDesktopShortcut" Directory="DesktopFolder" Target="[!SharpDevelop.exe]" Name="SharpDevelop $(var.PRODUCTDISPLAYVERSION)" Icon="SharpDevelopIcon.exe" WorkingDirectory="BinFolder" />
 				</Component>
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index 5daaa38dcc..df0c910306 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -184,6 +184,8 @@
 				<ComponentRef Id="ICSharpCodeNRefactoryDll"/>
 				<ComponentRef Id="ICSharpCodeNRefactoryCSharpDll"/>
 				<ComponentRef Id="ICSharpCodeNRefactoryXmlDll"/>
+				<ComponentRef Id="ICSharpCodeNRefactoryCecilDll"/>
+				<ComponentRef Id="ICSharpCodeNRefactoryCSharpRefactoringDll"/>
 				<ComponentRef Id="ICSharpCodeSharpDevelopDll"/>
 				<ComponentRef Id="ICSharpCodeSharpDevelopWidgets"/>
 				<ComponentRef Id="ICSharpCodeAvalonEditDll"/>